1 files changed, 34 insertions, 20 deletions

diff --git a/notes/projects/radius/sql/ippool-demo.sql b/notes/projects/radius/sql/ippool-demo.sql
index 41fb90c..3875eed 100644
--- a/notes/projects/radius/sql/ippool-demo.sql
+++ b/notes/projects/radius/sql/ippool-demo.sql
@@ -8,7 +8,7 @@
  */
 
 
-SET ROLE radius_ippool;
+SET ROLE radius;
 
 
 -- create example pools
@@ -34,37 +34,51 @@ SELECT nas_add( nasName := 'br1.sol',  regionName := 'Soldotna' );
 SELECT              netblock_add
                     ( netAddress    := '209.193.4.0/28',
                       poolName      := 'DHCP',
-                      regionName    := 'Soldotna',
-                      netActive     := TRUE,
-                      addIpEntries  := TRUE
+                      regionName    := 'Soldotna'
                     );
 SELECT              netblock_add
                     ( netAddress    := '209.193.4.0/29',
                       poolName      := 'DHCP',
                       regionName    := 'Soldotna',
                       netDesc       := 'Reserved for engineering test accounts',
-                      netActive     := FALSE,
-                      addIpEntries  := TRUE
+                      netActive     := FALSE
                     );
 SELECT              netblock_add
-                    ( netAddress    := '209.193.4.16/28',
+                    ( netAddress    := '209.193.4.4/30',
                       poolName      := 'DHCP',
-                      netActive     := TRUE,
-                      addIpEntries  := TRUE
+                      regionName    := 'Soldotna'
+                    );
+--
+SELECT              netblock_add
+                    ( netAddress    := '209.193.4.16/28',
+                      poolName      := 'DHCP'
                     );
 SELECT              netblock_add
                     ( netAddress    := '209.193.4.32/28',
                       poolName      := 'DHCP',
-                      regionName    := 'Anchorage',
-                      netActive     := FALSE,
-                      addIpEntries  := TRUE
+                      regionName    := 'Anchorage'
                     );
 SELECT              netblock_add
                     ( netAddress    := '209.193.4.48/28',
                       poolName      := 'DHCP',
-                      regionName    := 'Fairbanks',
+                      regionName    := 'Fairbanks'
+                    );
+SELECT              netblock_add
+                    ( netAddress    := '209.193.4.64/26',
+                      poolName      := 'DHCP',
+                      netDesc       := 'Reserved for documentation',
                       netActive     := FALSE,
-                      addIpEntries  := TRUE
+                      addIpEntries  := FALSE
+                    );
+SELECT              netblock_add
+                    ( netAddress    := '209.193.4.128/26',
+                      poolName      := 'PPPoE',
+                      regionName    := 'Soldotna'
+                    );
+SELECT              netblock_add
+                    ( netAddress    := '209.193.4.192/26',
+                      poolName      := 'PPPoE',
+                      regionName    := 'Anchorage'
                     );
 
 
@@ -72,34 +86,34 @@ SELECT              netblock_add
 SELECT              ip_assign
                     ( assignIp      := '209.193.4.8/32',
                       assignNas     := 'br1.sol',
-                      assignUser    := 'jdoe8@acsalaska.net',
+                      assignUser    := 'jdoe8@example.net',
                       assignSess    := 'aqaqqaasdqweaasdqa8'
                     );
 SELECT              ip_assign
                     ( assignIp      := '209.193.4.9/32',
                       assignNas     := 'br1.sol',
-                      assignUser    := 'jdoe9@acsalaska.net',
+                      assignUser    := 'jdoe9@aexample.net',
                       assignSess    := 'qweadszcxqweasdzcx9'
                     );
 SELECT              ip_assign
                     ( assignIp      := '209.193.4.10/32',
                       assignNas     := 'br1.sol',
-                      assignUser    := 'jdoe10@acsalaska.net'
+                      assignUser    := 'jdoe10@example.net'
                     );
 SELECT              ip_assign
                     ( assignIp      := '209.193.4.11/32',
                       assignNas     := 'br1.sol',
-                      assignUser    := 'jdoe11@acsalaska.net'
+                      assignUser    := 'jdoe11@example.net'
                     );
 SELECT              ip_assign
                     ( assignIp      := '209.193.4.12/32',
                       assignNas     := 'br1.sol',
-                      assignUser    := 'jdoe12@acsalaska.net'
+                      assignUser    := 'jdoe12@example.net'
                     );
 SELECT              ip_assign
                     ( assignIp      := '209.193.4.13/32',
                       assignNas     := 'br1.sol',
-                      assignUser    := 'jdoe13@acsalaska.net'
+                      assignUser    := 'jdoe13@example.net'
                     );