quote bare words in redis ippool tool tests

alandekok · alandekok · commit f96ae19f7e6f · 2025-04-14T14:35:41.000-04:00
diff --git a/src/tests/modules/redis_ippool/alloc.unlang b/src/tests/modules/redis_ippool/alloc.unlang
@@ -8,7 +8,7 @@ control.IP-Pool.Name := 'test_alloc'
 #
 #  Add IP addresses
 #
-%exec(./build/bin/local/rlm_redis_ippool_tool, -a, 192.168.0.1/32, $ENV{REDIS_IPPOOL_TEST_SERVER}:30001, %{control.IP-Pool.Name}, 192.168.0.0)
+%exec('./build/bin/local/rlm_redis_ippool_tool', '-a', '192.168.0.1/32', '$ENV{REDIS_IPPOOL_TEST_SERVER}:30001', %{control.IP-Pool.Name}, '192.168.0.0')
 
 #
 #  Check allocation
@@ -75,7 +75,7 @@ reply := {}
 #
 #  Add IP addresses
 #
-%exec(./build/bin/local/rlm_redis_ippool_tool, -a, 192.168.1.1/32, $ENV{REDIS_IPPOOL_TEST_SERVER}:30001, %{control.IP-Pool.Name}, 192.168.1.0)
+%exec('./build/bin/local/rlm_redis_ippool_tool', '-a', '192.168.1.1/32', '$ENV{REDIS_IPPOOL_TEST_SERVER}:30001', %{control.IP-Pool.Name}, '192.168.1.0')
 
 #
 #  Check we get the same lease, with the same lease time
diff --git a/src/tests/modules/redis_ippool/pool_tool_delete.unlang b/src/tests/modules/redis_ippool/pool_tool_delete.unlang
@@ -8,7 +8,7 @@ control.IP-Pool.Name := 'test_delete'
 #
 #  Add IP addresses
 #
-%exec(./build/bin/local/rlm_redis_ippool_tool, -a, 192.168.0.1/32, $ENV{REDIS_IPPOOL_TEST_SERVER}:30001, %{control.IP-Pool.Name}, 192.168.0.0)
+%exec('./build/bin/local/rlm_redis_ippool_tool', '-a', '192.168.0.1/32', '$ENV{REDIS_IPPOOL_TEST_SERVER}:30001', %{control.IP-Pool.Name}, '192.168.0.0')
 
 #
 #  Check allocation
@@ -27,24 +27,24 @@ if !(reply.Framed-IP-Address == 192.168.0.1) {
 #
 #  Delete the IP address
 #
-%exec(./build/bin/local/rlm_redis_ippool_tool, -d, 192.168.0.1/32, $ENV{REDIS_IPPOOL_TEST_SERVER}:30001, %{control.IP-Pool.Name}, 192.168.0.0)
+%exec('./build/bin/local/rlm_redis_ippool_tool', '-d', '192.168.0.1/32', '$ENV{REDIS_IPPOOL_TEST_SERVER}:30001', %{control.IP-Pool.Name}, '192.168.0.0')
 
 #
 #  Verify the association with the device has been removed
 #
-if !(%redis(EXISTS, {%{control.IP-Pool.Name}}:device:%{Calling-Station-ID}) == '0') {
+if !(%redis('EXISTS', "{%{control.IP-Pool.Name}}:device:%{Calling-Station-ID}") == '0') {
 	test_fail
 }
 
 #
 #  Verify the hash information is removed
 #
-if !(%redis(EXISTS, {%{control.IP-Pool.Name}}:ip:%{reply.Framed-IP-Address}) == '0') {
+if !(%redis('EXISTS', "{%{control.IP-Pool.Name}}:ip:%{reply.Framed-IP-Address}") == '0') {
 	test_fail
 }
 
 # Check the ZSCORE
-if !(%redis(ZCOUNT, {%{control.IP-Pool.Name}%}:pool, -inf, +inf) == 0) {
+if !(%redis('ZCOUNT', "{%{control.IP-Pool.Name}%}:pool", '-inf', '+inf') == 0) {
 	test_fail
 }
 
diff --git a/src/tests/modules/redis_ippool/pool_tool_modify.unlang b/src/tests/modules/redis_ippool/pool_tool_modify.unlang
@@ -8,24 +8,24 @@ control.IP-Pool.Name := 'test_tool_modify'
 #
 #  Add IP addresses
 #
-%exec(./build/bin/local/rlm_redis_ippool_tool, -a, 192.168.0.1/32, $ENV{REDIS_IPPOOL_TEST_SERVER}:30001, %{control.IP-Pool.Name}, 192.168.0.0)
+%exec('./build/bin/local/rlm_redis_ippool_tool', '-a', '192.168.0.1/32', '$ENV{REDIS_IPPOOL_TEST_SERVER}:30001', %{control.IP-Pool.Name}, '192.168.0.0')
 
 #
 #  Verify the range was set OK
 #
-if !(%redis(HGET, {%{control.IP-Pool.Name}}:ip:192.168.0.1, range) == '192.168.0.0') {
+if !(%redis('HGET', "{%{control.IP-Pool.Name}}:ip:192.168.0.1", 'range') == '192.168.0.0') {
 	test_fail
 }
 
 #
 #  Modify the range
 #
-%exec(./build/bin/local/rlm_redis_ippool_tool, -m, 192.168.0.1/32, $ENV{REDIS_IPPOOL_TEST_SERVER}:30001, %{control.IP-Pool.Name}, 10.0.0.0)
+%exec('./build/bin/local/rlm_redis_ippool_tool', '-m', '192.168.0.1/32', '$ENV{REDIS_IPPOOL_TEST_SERVER}:30001', %{control.IP-Pool.Name}, '10.0.0.0')
 
 #
 #  Check it was updated
 #
-if !(%redis(HGET, {%{control.IP-Pool.Name}}:ip:192.168.0.1, range) == '10.0.0.0') {
+if !(%redis('HGET', "{%{control.IP-Pool.Name}}:ip:192.168.0.1", 'range') == '10.0.0.0') {
 	test_fail
 }
 
diff --git a/src/tests/modules/redis_ippool/pool_tool_release.unlang b/src/tests/modules/redis_ippool/pool_tool_release.unlang
@@ -8,7 +8,7 @@ control.IP-Pool.Name := 'test_tool_release'
 #
 #  Add IP addresses
 #
-%exec(./build/bin/local/rlm_redis_ippool_tool, -a, 192.168.0.1/32, $ENV{REDIS_IPPOOL_TEST_SERVER}:30001, %{control.IP-Pool.Name}, 192.168.0.0)
+%exec('./build/bin/local/rlm_redis_ippool_tool', '-a', '192.168.0.1/32', '$ENV{REDIS_IPPOOL_TEST_SERVER}:30001', %{control.IP-Pool.Name}, '192.168.0.0')
 
 #
 #  Check allocation
@@ -27,32 +27,32 @@ if !(reply.Framed-IP-Address == 192.168.0.1) {
 #
 #  Release the IP address
 #
-%exec(./build/bin/local/rlm_redis_ippool_tool, -r, 192.168.0.1/32, $ENV{REDIS_IPPOOL_TEST_SERVER}:30001, %{control.IP-Pool.Name}, 192.168.0.0)
+%exec('./build/bin/local/rlm_redis_ippool_tool', '-r', '192.168.0.1/32', '$ENV{REDIS_IPPOOL_TEST_SERVER}:30001', %{control.IP-Pool.Name}, '192.168.0.0')
 
 #
 #  Verify the association with the device has been removed
 #
-if !(%redis(EXISTS, {%{control.IP-Pool.Name}}:device:%{Calling-Station-ID}) == '0') {
+if !(%redis('EXISTS', "{%{control.IP-Pool.Name}}:device:%{Calling-Station-ID}") == '0') {
 	test_fail
 }
 
 #
 #  Verify the hash information is retained
 #
-if !(%redis(HGET, {%{control.IP-Pool.Name}}:ip:%{reply.Framed-IP-Address}, device) == '00:11:22:33:44:55') {
+if !(%redis('HGET', "{%{control.IP-Pool.Name}}:ip:%{reply.Framed-IP-Address}", 'device') == '00:11:22:33:44:55') {
 	test_fail
 }
 
-if !(%redis(HGET, {%{control.IP-Pool.Name}}:ip:%{reply.Framed-IP-Address}, gateway) == '127.0.0.1') {
+if !(%redis('HGET', "{%{control.IP-Pool.Name}}:ip:%{reply.Framed-IP-Address}", 'gateway') == '127.0.0.1') {
 	test_fail
 }
 
-if !(%redis(HGET, {%{control.IP-Pool.Name}}:ip:%{reply.Framed-IP-Address}, range) == '192.168.0.0') {
+if !(%redis('HGET', "{%{control.IP-Pool.Name}}:ip:%{reply.Framed-IP-Address}", 'range') == '192.168.0.0') {
 	test_fail
 }
 
 # Check the ZSCORE
-if !(%redis(ZSCORE, {%{control.IP-Pool.Name}}:pool, %{reply.Framed-IP-Address}) == 0) {
+if !(%redis('ZSCORE', "{%{control.IP-Pool.Name}}:pool", %{reply.Framed-IP-Address}) == 0) {
 	test_fail
 }
 
diff --git a/src/tests/modules/redis_ippool/pool_tool_static.unlang b/src/tests/modules/redis_ippool/pool_tool_static.unlang
@@ -9,12 +9,12 @@ control.IP-Pool.Name := 'test_tool_static'
 #
 #  Add a dynamic IP addresses
 #
-%exec(./build/bin/local/rlm_redis_ippool_tool, -a, 192.168.0.1/32, $ENV{REDIS_IPPOOL_TEST_SERVER}:30001, %{control.IP-Pool.Name}, 192.168.0.0)
+%exec('./build/bin/local/rlm_redis_ippool_tool', '-a', '192.168.0.1/32', '$ENV{REDIS_IPPOOL_TEST_SERVER}:30001', %{control.IP-Pool.Name}, '192.168.0.0')
 
 #
 #  Add a static IP assigned to the calling station in the request
 #
-%exec(./build/bin/local/rlm_redis_ippool_tool, -A, 192.168.0.10/32, -O, aa:bb:cc:dd:ee:ff, $ENV{REDIS_IPPOOL_TEST_SERVER}:30001, %{control.IP-Pool.Name}, 192.168.0.0)
+%exec('./build/bin/local/rlm_redis_ippool_tool', '-A', '192.168.0.10/32', '-O', 'aa:bb:cc:dd:ee:ff', '$ENV{REDIS_IPPOOL_TEST_SERVER}:30001', %{control.IP-Pool.Name}, '192.168.0.0')
 
 #
 #  Check allocation
@@ -33,37 +33,37 @@ if !(reply.Framed-IP-Address == 192.168.0.10) {
 #
 #  Fetch the ZSCORE now on the address
 #
-zscore := %redis(ZSCORE, {%{control.IP-Pool.Name}}:pool, %{reply.Framed-IP-Address})
+zscore := %redis('ZSCORE', "{%{control.IP-Pool.Name}}:pool", %{reply.Framed-IP-Address})
 
 #
 #  Attempt to re-assign static lease
 #
-%exec(./build/bin/local/rlm_redis_ippool_tool, -A, 192.168.0.10/32, -O, aa:bb:cc:dd:ee:ff, $ENV{REDIS_IPPOOL_TEST_SERVER}:30001, %{control.IP-Pool.Name}, 192.168.0.0)
+%exec('./build/bin/local/rlm_redis_ippool_tool', '-A', '192.168.0.10/32', '-O', 'aa:bb:cc:dd:ee:ff', '$ENV{REDIS_IPPOOL_TEST_SERVER}:30001', %{control.IP-Pool.Name}, '192.168.0.0')
 
 #
 #  Check the ZSCORE hasn't changed
 #
-if !(%redis(ZSCORE, {%{control.IP-Pool.Name}}:pool, %{reply.Framed-IP-Address}) == %{zscore}) {
+if !(%redis('ZSCORE', "{%{control.IP-Pool.Name}}:pool", %{reply.Framed-IP-Address}) == %{zscore}) {
 	test_fail
 }
 
 #
 #  Remove the static assignment - leaves the lease with its remaining time to expire
 #
-%exec(./build/bin/local/rlm_redis_ippool_tool, -U, 192.168.0.10/32, -O, aa:bb:cc:dd:ee:ff, $ENV{REDIS_IPPOOL_TEST_SERVER}:30001, %{control.IP-Pool.Name})
+%exec('./build/bin/local/rlm_redis_ippool_tool', '-U', '192.168.0.10/32', '-O', 'aa:bb:cc:dd:ee:ff', '$ENV{REDIS_IPPOOL_TEST_SERVER}:30001', %{control.IP-Pool.Name})
 
 #
 #  Attempt to assign the address to another device - should fail
 #
-%exec(./build/bin/local/rlm_redis_ippool_tool, -A, 192.168.0.10/32, -O, aa:bb:cc:dd:ee:00, $ENV{REDIS_IPPOOL_TEST_SERVER}:30001, %{control.IP-Pool.Name}, 192.168.0.0)
+%exec('./build/bin/local/rlm_redis_ippool_tool', '-A', '192.168.0.10/32', '-O', 'aa:bb:cc:dd:ee:00', '$ENV{REDIS_IPPOOL_TEST_SERVER}:30001', %{control.IP-Pool.Name}, '192.168.0.0')
 
 #
 #  Check the original device is still assigned to the address
 #
-if !(%redis(HGET, {%{control.IP-Pool.Name}}:ip:192.168.0.10, 'device') == 'aa:bb:cc:dd:ee:ff') {
+if !(%redis('HGET', "{%{control.IP-Pool.Name}}:ip:192.168.0.10", 'device') == 'aa:bb:cc:dd:ee:ff') {
 	test_fail
 }
-if !(%redis(GET, {%{control.IP-Pool.Name}}:device:aa:bb:cc:dd:ee:ff) == '192.168.0.10') {
+if !(%redis('GET', "{%{control.IP-Pool.Name}}:device:aa:bb:cc:dd:ee:ff") == '192.168.0.10') {
 	test_fail
 }
 
@@ -86,39 +86,39 @@ if !(reply.Framed-IP-Address == 192.168.0.1) {
 #
 #  Attempt to statically assign this to another device
 #
-%exec(./build/bin/local/rlm_redis_ippool_tool, -A, 192.168.0.1/32, -O, aa:bb:cc:dd:ee:00, $ENV{REDIS_IPPOOL_TEST_SERVER}:30001, %{control.IP-Pool.Name}, 192.168.0.0)
+%exec('./build/bin/local/rlm_redis_ippool_tool', '-A', '192.168.0.1/32', '-O', 'aa:bb:cc:dd:ee:00', '$ENV{REDIS_IPPOOL_TEST_SERVER}:30001', %{control.IP-Pool.Name}, '192.168.0.0')
 
 #
 #  Check the original device is still assigned to the address and the lease is dynamic
 #
-if !(%redis(HGET, {%{control.IP-Pool.Name}}:ip:192.168.0.1, 'device') == %{Calling-Station-Id}) {
+if !(%redis('HGET', "{%{control.IP-Pool.Name}}:ip:192.168.0.1", 'device') == %{Calling-Station-Id}) {
 	test_fail
 }
-if !(%redis(GET, {%{control.IP-Pool.Name}}:device:11:22:33:44:55:66) == '192.168.0.1') {
+if !(%redis('GET', "{%{control.IP-Pool.Name}}:device:11:22:33:44:55:66") == '192.168.0.1') {
 	test_fail
 }
 
-zscore := %redis(ZSCORE, {%{control.IP-Pool.Name}}:pool, 192.168.0.1)
+zscore := %redis('ZSCORE', "{%{control.IP-Pool.Name}}:pool", '192.168.0.1')
 if !(zscore < (uint64)0x10000000000000) {
 	test_fail
 }
 
 #
 #  Now assign it as a static lease for the current device
 #
-%exec(./build/bin/local/rlm_redis_ippool_tool, -A, 192.168.0.1/32, -O, %{Calling-Station-Id}, $ENV{REDIS_IPPOOL_TEST_SERVER}:30001, %{control.IP-Pool.Name}, 192.168.0.0)
+%exec('./build/bin/local/rlm_redis_ippool_tool', '-A', '192.168.0.1/32', '-O', %{Calling-Station-Id}, '$ENV{REDIS_IPPOOL_TEST_SERVER}:30001', %{control.IP-Pool.Name}, '192.168.0.0')
 
 #
 #  Check that the ZSCORE is maintained, simply with the static bit set
 #
-if !(%redis(ZSCORE, {%{control.IP-Pool.Name}}:pool, 192.168.0.1) == (zscore + (uint64) 0x10000000000000)) {
+if !(%redis('ZSCORE', "{%{control.IP-Pool.Name}}:pool", '192.168.0.1') == (zscore + (uint64) 0x10000000000000)) {
 	test_fail
 }
 
 #
 #  And that the expiry is now removed on the device
 #
-if (%redis(TTL, {%{control.IP-Pool.Name}}:device:%{Calling-Station-Id}) != '-1') {
+if (%redis('TTL', "{%{control.IP-Pool.Name}}:device:%{Calling-Station-Id}") != '-1') {
 	test_fail
 }
 
diff --git a/src/tests/modules/redis_ippool/release.unlang b/src/tests/modules/redis_ippool/release.unlang
@@ -8,7 +8,7 @@ control.IP-Pool.Name := 'test_release'
 #
 #  Add IP addresses
 #
-%exec(./build/bin/local/rlm_redis_ippool_tool, -a, 192.168.0.1/32, $ENV{REDIS_IPPOOL_TEST_SERVER}:30001, %{control.IP-Pool.Name}, 192.168.0.0)
+%exec('./build/bin/local/rlm_redis_ippool_tool', '-a', '192.168.0.1/32', '$ENV{REDIS_IPPOOL_TEST_SERVER}:30001', %{control.IP-Pool.Name}, '192.168.0.0')
 
 #
 #  Check allocation
@@ -39,31 +39,31 @@ if (!(updated)) {
 #
 #  Verify the association with the device has been removed
 #
-if (!(%redis(EXISTS, {%{control.IP-Pool.Name}}:device:%{Calling-Station-ID}) == '0')) {
+if (!(%redis('EXISTS', "{%{control.IP-Pool.Name}}:device:%{Calling-Station-ID}") == '0')) {
 	test_fail
 }
 
 #
 #  Verify the hash information is retained
 #
-if (!(%redis(HGET, {%{control.IP-Pool.Name}}:ip:%{reply.Framed-IP-Address}, device) == '00:11:22:33:44:55')) {
+if (!(%redis('HGET', "{%{control.IP-Pool.Name}}:ip:%{reply.Framed-IP-Address}", 'device') == '00:11:22:33:44:55')) {
 	test_fail
 }
 
-if (!(%redis(HGET, {%{control.IP-Pool.Name}}:ip:%{reply.Framed-IP-Address}, gateway) == '127.0.0.1')) {
+if (!(%redis('HGET', "{%{control.IP-Pool.Name}}:ip:%{reply.Framed-IP-Address}", 'gateway') == '127.0.0.1')) {
 	test_fail
 }
 
-if (!(%redis(HGET, {%{control.IP-Pool.Name}}:ip:%{reply.Framed-IP-Address}, range) == '192.168.0.0')) {
+if (!(%redis('HGET', "{%{control.IP-Pool.Name}}:ip:%{reply.Framed-IP-Address}", 'range') == '192.168.0.0')) {
 	test_fail
 }
 
 # Check the ZSCORE - releasing an address sets the ZSCORE to now - 1
-if (%redis(ZSCORE, {%{control.IP-Pool.Name}}:pool, %{reply.Framed-IP-Address}) > %c) {
+if (%redis('ZSCORE', "{%{control.IP-Pool.Name}}:pool", %{reply.Framed-IP-Address}) > %c) {
 	test_fail
 }
 
-if ((%c - %redis(ZSCORE, {%{control.IP-Pool.Name}}:pool, %{reply.Framed-IP-Address}) > 10)) {
+if ((%c - %redis('ZSCORE', "{%{control.IP-Pool.Name}}:pool", %{reply.Framed-IP-Address}) > 10)) {
 	test_fail
 }
 
diff --git a/src/tests/modules/redis_ippool/static.unlang b/src/tests/modules/redis_ippool/static.unlang
@@ -8,12 +8,12 @@ control.IP-Pool.Name := 'test_static'
 #
 #  Add a dynamic IP addresses
 #
-%exec(./build/bin/local/rlm_redis_ippool_tool, -a, 192.168.0.1/32, $ENV{REDIS_IPPOOL_TEST_SERVER}:30001, %{control.IP-Pool.Name}, 192.168.0.0)
+%exec('./build/bin/local/rlm_redis_ippool_tool', '-a', '192.168.0.1/32', '$ENV{REDIS_IPPOOL_TEST_SERVER}:30001', %{control.IP-Pool.Name}, '192.168.0.0')
 
 #
 #  Add a static IP assigned to the calling station in the request
 #
-%exec(./build/bin/local/rlm_redis_ippool_tool, -A, 192.168.0.10/32, -O, aa:bb:cc:dd:ee:ff, $ENV{REDIS_IPPOOL_TEST_SERVER}:30001, %{control.IP-Pool.Name}, 192.168.0.0)
+%exec('./build/bin/local/rlm_redis_ippool_tool', '-A', '192.168.0.10/32', '-O', 'aa:bb:cc:dd:ee:ff', '$ENV{REDIS_IPPOOL_TEST_SERVER}:30001', %{control.IP-Pool.Name}, '192.168.0.0')
 
 #
 #  Check allocation
@@ -49,7 +49,7 @@ redis_ippool.renew {
 #
 #  Verify no expiry has been set on device
 #
-if (%redis(TTL, {%{control.IP-Pool.Name}}:device:%{Calling-Station-Id}) != '-1') {
+if (%redis('TTL', "{%{control.IP-Pool.Name}}:device:%{Calling-Station-Id}") != '-1') {
 	test_fail
 }
 
@@ -73,19 +73,19 @@ if (!(updated)) {
 #
 #  Verify the association with the device remains
 #
-if (%redis(EXISTS, {%{control.IP-Pool.Name}}:device:%{Calling-Station-ID}) == '0') {
+if (%redis('EXISTS', "{%{control.IP-Pool.Name}}:device:%{Calling-Station-ID}") == '0') {
 	test_fail
 }
 
 #
 #  Verify the hash information is retained
 #
-if (%redis(EXISTS, {%{control.IP-Pool.Name}}:ip:%{reply.Framed-IP-Address}) == '0') {
+if (%redis('EXISTS', "{%{control.IP-Pool.Name}}:ip:%{reply.Framed-IP-Address}") == '0') {
 	test_fail
 }
 
 # Check the ZSCORE
-if (%redis(ZSCORE, {%{control.IP-Pool.Name}%}:pool, %{reply.Framed-IP-Address}) <= %l) {
+if (%redis('ZSCORE', "{%{control.IP-Pool.Name}%}:pool", %{reply.Framed-IP-Address}) <= %l) {
 	test_fail
 }
 
diff --git a/src/tests/modules/redis_ippool/static_dynamic.unlang b/src/tests/modules/redis_ippool/static_dynamic.unlang
@@ -8,7 +8,7 @@ control.IP-Pool.Name := 'test_static_dynamic'
 #
 #  Add a static IP assigned to a calling station not in the request
 #
-%exec(./build/bin/local/rlm_redis_ippool_tool, -A, 192.168.0.10/32, -O, aa:bb:cc:dd:ee:ff, $ENV{REDIS_IPPOOL_TEST_SERVER}:30001, %{control.IP-Pool.Name}, 192.168.0.0)
+%exec('./build/bin/local/rlm_redis_ippool_tool', '-A', '192.168.0.10/32', '-O', 'aa:bb:cc:dd:ee:ff', '$ENV{REDIS_IPPOOL_TEST_SERVER}:30001', %{control.IP-Pool.Name}, '192.168.0.0')
 
 #
 #  Check allocation fails - pool only contains an address assigned to another owner
@@ -23,7 +23,7 @@ if (!notfound) {
 #
 #  Add a dynamic IP addresses
 #
-%exec(./build/bin/local/rlm_redis_ippool_tool, -a, 192.168.0.1/32, $ENV{REDIS_IPPOOL_TEST_SERVER}:30001, %{control.IP-Pool.Name}, 192.168.0.0)
+%exec('./build/bin/local/rlm_redis_ippool_tool', '-a', '192.168.0.1/32', '$ENV{REDIS_IPPOOL_TEST_SERVER}:30001', %{control.IP-Pool.Name}, '192.168.0.0')
 
 #
 #  Check allocation
diff --git a/src/tests/modules/redis_ippool/static_unassign.unlang b/src/tests/modules/redis_ippool/static_unassign.unlang
diff --git a/src/tests/modules/redis_ippool/update.unlang b/src/tests/modules/redis_ippool/update.unlang
diff --git a/src/tests/modules/redis_ippool/update_alloc.unlang b/src/tests/modules/redis_ippool/update_alloc.unlang

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ control.IP-Pool.Name := 'test_alloc'`
`8`	`8`	`#`
`9`	`9`	`# Add IP addresses`
`10`	`10`	`#`
`11`		`-%exec(./build/bin/local/rlm_redis_ippool_tool, -a, 192.168.0.1/32, $ENV{REDIS_IPPOOL_TEST_SERVER}:30001, %{control.IP-Pool.Name}, 192.168.0.0)`
	`11`	`+%exec('./build/bin/local/rlm_redis_ippool_tool', '-a', '192.168.0.1/32', '$ENV{REDIS_IPPOOL_TEST_SERVER}:30001', %{control.IP-Pool.Name}, '192.168.0.0')`
`12`	`12`
`13`	`13`	`#`
`14`	`14`	`# Check allocation`
`@@ -75,7 +75,7 @@ reply := {}`
`75`	`75`	`#`
`76`	`76`	`# Add IP addresses`
`77`	`77`	`#`
`78`		`-%exec(./build/bin/local/rlm_redis_ippool_tool, -a, 192.168.1.1/32, $ENV{REDIS_IPPOOL_TEST_SERVER}:30001, %{control.IP-Pool.Name}, 192.168.1.0)`
	`78`	`+%exec('./build/bin/local/rlm_redis_ippool_tool', '-a', '192.168.1.1/32', '$ENV{REDIS_IPPOOL_TEST_SERVER}:30001', %{control.IP-Pool.Name}, '192.168.1.0')`
`79`	`79`
`80`	`80`	`#`
`81`	`81`	`# Check we get the same lease, with the same lease time`
Original file line number	Diff line number	Diff line change
`@@ -8,24 +8,24 @@ control.IP-Pool.Name := 'test_tool_modify'`
`8`	`8`	`#`
`9`	`9`	`# Add IP addresses`
`10`	`10`	`#`
`11`		`-%exec(./build/bin/local/rlm_redis_ippool_tool, -a, 192.168.0.1/32, $ENV{REDIS_IPPOOL_TEST_SERVER}:30001, %{control.IP-Pool.Name}, 192.168.0.0)`
	`11`	`+%exec('./build/bin/local/rlm_redis_ippool_tool', '-a', '192.168.0.1/32', '$ENV{REDIS_IPPOOL_TEST_SERVER}:30001', %{control.IP-Pool.Name}, '192.168.0.0')`
`12`	`12`
`13`	`13`	`#`
`14`	`14`	`# Verify the range was set OK`
`15`	`15`	`#`
`16`		`-if !(%redis(HGET, {%{control.IP-Pool.Name}}:ip:192.168.0.1, range) == '192.168.0.0') {`
	`16`	`+if !(%redis('HGET', "{%{control.IP-Pool.Name}}:ip:192.168.0.1", 'range') == '192.168.0.0') {`
`17`	`17`	`test_fail`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`#`
`21`	`21`	`# Modify the range`
`22`	`22`	`#`
`23`		`-%exec(./build/bin/local/rlm_redis_ippool_tool, -m, 192.168.0.1/32, $ENV{REDIS_IPPOOL_TEST_SERVER}:30001, %{control.IP-Pool.Name}, 10.0.0.0)`
	`23`	`+%exec('./build/bin/local/rlm_redis_ippool_tool', '-m', '192.168.0.1/32', '$ENV{REDIS_IPPOOL_TEST_SERVER}:30001', %{control.IP-Pool.Name}, '10.0.0.0')`
`24`	`24`
`25`	`25`	`#`
`26`	`26`	`# Check it was updated`
`27`	`27`	`#`
`28`		`-if !(%redis(HGET, {%{control.IP-Pool.Name}}:ip:192.168.0.1, range) == '10.0.0.0') {`
	`28`	`+if !(%redis('HGET', "{%{control.IP-Pool.Name}}:ip:192.168.0.1", 'range') == '10.0.0.0') {`
`29`	`29`	`test_fail`
`30`	`30`	`}`
`31`	`31`
Original file line number	Diff line number	Diff line change
`@@ -9,12 +9,12 @@ control.IP-Pool.Name := 'test_tool_static'`
`9`	`9`	`#`
`10`	`10`	`# Add a dynamic IP addresses`
`11`	`11`	`#`
`12`		`-%exec(./build/bin/local/rlm_redis_ippool_tool, -a, 192.168.0.1/32, $ENV{REDIS_IPPOOL_TEST_SERVER}:30001, %{control.IP-Pool.Name}, 192.168.0.0)`
	`12`	`+%exec('./build/bin/local/rlm_redis_ippool_tool', '-a', '192.168.0.1/32', '$ENV{REDIS_IPPOOL_TEST_SERVER}:30001', %{control.IP-Pool.Name}, '192.168.0.0')`
`13`	`13`
`14`	`14`	`#`
`15`	`15`	`# Add a static IP assigned to the calling station in the request`
`16`	`16`	`#`
`17`		`-%exec(./build/bin/local/rlm_redis_ippool_tool, -A, 192.168.0.10/32, -O, aa:bb:cc:dd:ee:ff, $ENV{REDIS_IPPOOL_TEST_SERVER}:30001, %{control.IP-Pool.Name}, 192.168.0.0)`
	`17`	`+%exec('./build/bin/local/rlm_redis_ippool_tool', '-A', '192.168.0.10/32', '-O', 'aa:bb:cc:dd:ee:ff', '$ENV{REDIS_IPPOOL_TEST_SERVER}:30001', %{control.IP-Pool.Name}, '192.168.0.0')`
`18`	`18`
`19`	`19`	`#`
`20`	`20`	`# Check allocation`
`@@ -33,37 +33,37 @@ if !(reply.Framed-IP-Address == 192.168.0.10) {`
`33`	`33`	`#`
`34`	`34`	`# Fetch the ZSCORE now on the address`
`35`	`35`	`#`
`36`		`-zscore := %redis(ZSCORE, {%{control.IP-Pool.Name}}:pool, %{reply.Framed-IP-Address})`
	`36`	`+zscore := %redis('ZSCORE', "{%{control.IP-Pool.Name}}:pool", %{reply.Framed-IP-Address})`
`37`	`37`
`38`	`38`	`#`
`39`	`39`	`# Attempt to re-assign static lease`
`40`	`40`	`#`
`41`		`-%exec(./build/bin/local/rlm_redis_ippool_tool, -A, 192.168.0.10/32, -O, aa:bb:cc:dd:ee:ff, $ENV{REDIS_IPPOOL_TEST_SERVER}:30001, %{control.IP-Pool.Name}, 192.168.0.0)`
	`41`	`+%exec('./build/bin/local/rlm_redis_ippool_tool', '-A', '192.168.0.10/32', '-O', 'aa:bb:cc:dd:ee:ff', '$ENV{REDIS_IPPOOL_TEST_SERVER}:30001', %{control.IP-Pool.Name}, '192.168.0.0')`
`42`	`42`
`43`	`43`	`#`
`44`	`44`	`# Check the ZSCORE hasn't changed`
`45`	`45`	`#`
`46`		`-if !(%redis(ZSCORE, {%{control.IP-Pool.Name}}:pool, %{reply.Framed-IP-Address}) == %{zscore}) {`
	`46`	`+if !(%redis('ZSCORE', "{%{control.IP-Pool.Name}}:pool", %{reply.Framed-IP-Address}) == %{zscore}) {`
`47`	`47`	`test_fail`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`#`
`51`	`51`	`# Remove the static assignment - leaves the lease with its remaining time to expire`
`52`	`52`	`#`
`53`		`-%exec(./build/bin/local/rlm_redis_ippool_tool, -U, 192.168.0.10/32, -O, aa:bb:cc:dd:ee:ff, $ENV{REDIS_IPPOOL_TEST_SERVER}:30001, %{control.IP-Pool.Name})`
	`53`	`+%exec('./build/bin/local/rlm_redis_ippool_tool', '-U', '192.168.0.10/32', '-O', 'aa:bb:cc:dd:ee:ff', '$ENV{REDIS_IPPOOL_TEST_SERVER}:30001', %{control.IP-Pool.Name})`
`54`	`54`
`55`	`55`	`#`
`56`	`56`	`# Attempt to assign the address to another device - should fail`
`57`	`57`	`#`
`58`		`-%exec(./build/bin/local/rlm_redis_ippool_tool, -A, 192.168.0.10/32, -O, aa:bb:cc:dd:ee:00, $ENV{REDIS_IPPOOL_TEST_SERVER}:30001, %{control.IP-Pool.Name}, 192.168.0.0)`
	`58`	`+%exec('./build/bin/local/rlm_redis_ippool_tool', '-A', '192.168.0.10/32', '-O', 'aa:bb:cc:dd:ee:00', '$ENV{REDIS_IPPOOL_TEST_SERVER}:30001', %{control.IP-Pool.Name}, '192.168.0.0')`
`59`	`59`
`60`	`60`	`#`
`61`	`61`	`# Check the original device is still assigned to the address`
`62`	`62`	`#`
`63`		`-if !(%redis(HGET, {%{control.IP-Pool.Name}}:ip:192.168.0.10, 'device') == 'aa:bb:cc:dd:ee:ff') {`
	`63`	`+if !(%redis('HGET', "{%{control.IP-Pool.Name}}:ip:192.168.0.10", 'device') == 'aa:bb:cc:dd:ee:ff') {`
`64`	`64`	`test_fail`
`65`	`65`	`}`
`66`		`-if !(%redis(GET, {%{control.IP-Pool.Name}}:device:aa:bb:cc:dd:ee:ff) == '192.168.0.10') {`
	`66`	`+if !(%redis('GET', "{%{control.IP-Pool.Name}}:device:aa:bb:cc:dd:ee:ff") == '192.168.0.10') {`
`67`	`67`	`test_fail`
`68`	`68`	`}`
`69`	`69`
`@@ -86,39 +86,39 @@ if !(reply.Framed-IP-Address == 192.168.0.1) {`
`86`	`86`	`#`
`87`	`87`	`# Attempt to statically assign this to another device`
`88`	`88`	`#`
`89`		`-%exec(./build/bin/local/rlm_redis_ippool_tool, -A, 192.168.0.1/32, -O, aa:bb:cc:dd:ee:00, $ENV{REDIS_IPPOOL_TEST_SERVER}:30001, %{control.IP-Pool.Name}, 192.168.0.0)`
	`89`	`+%exec('./build/bin/local/rlm_redis_ippool_tool', '-A', '192.168.0.1/32', '-O', 'aa:bb:cc:dd:ee:00', '$ENV{REDIS_IPPOOL_TEST_SERVER}:30001', %{control.IP-Pool.Name}, '192.168.0.0')`
`90`	`90`
`91`	`91`	`#`
`92`	`92`	`# Check the original device is still assigned to the address and the lease is dynamic`
`93`	`93`	`#`
`94`		`-if !(%redis(HGET, {%{control.IP-Pool.Name}}:ip:192.168.0.1, 'device') == %{Calling-Station-Id}) {`
	`94`	`+if !(%redis('HGET', "{%{control.IP-Pool.Name}}:ip:192.168.0.1", 'device') == %{Calling-Station-Id}) {`
`95`	`95`	`test_fail`
`96`	`96`	`}`
`97`		`-if !(%redis(GET, {%{control.IP-Pool.Name}}:device:11:22:33:44:55:66) == '192.168.0.1') {`
	`97`	`+if !(%redis('GET', "{%{control.IP-Pool.Name}}:device:11:22:33:44:55:66") == '192.168.0.1') {`
`98`	`98`	`test_fail`
`99`	`99`	`}`
`100`	`100`
`101`		`-zscore := %redis(ZSCORE, {%{control.IP-Pool.Name}}:pool, 192.168.0.1)`
	`101`	`+zscore := %redis('ZSCORE', "{%{control.IP-Pool.Name}}:pool", '192.168.0.1')`
`102`	`102`	`if !(zscore < (uint64)0x10000000000000) {`
`103`	`103`	`test_fail`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`#`
`107`	`107`	`# Now assign it as a static lease for the current device`
`108`	`108`	`#`
`109`		`-%exec(./build/bin/local/rlm_redis_ippool_tool, -A, 192.168.0.1/32, -O, %{Calling-Station-Id}, $ENV{REDIS_IPPOOL_TEST_SERVER}:30001, %{control.IP-Pool.Name}, 192.168.0.0)`
	`109`	`+%exec('./build/bin/local/rlm_redis_ippool_tool', '-A', '192.168.0.1/32', '-O', %{Calling-Station-Id}, '$ENV{REDIS_IPPOOL_TEST_SERVER}:30001', %{control.IP-Pool.Name}, '192.168.0.0')`
`110`	`110`
`111`	`111`	`#`
`112`	`112`	`# Check that the ZSCORE is maintained, simply with the static bit set`
`113`	`113`	`#`
`114`		`-if !(%redis(ZSCORE, {%{control.IP-Pool.Name}}:pool, 192.168.0.1) == (zscore + (uint64) 0x10000000000000)) {`
	`114`	`+if !(%redis('ZSCORE', "{%{control.IP-Pool.Name}}:pool", '192.168.0.1') == (zscore + (uint64) 0x10000000000000)) {`
`115`	`115`	`test_fail`
`116`	`116`	`}`
`117`	`117`
`118`	`118`	`#`
`119`	`119`	`# And that the expiry is now removed on the device`
`120`	`120`	`#`
`121`		`-if (%redis(TTL, {%{control.IP-Pool.Name}}:device:%{Calling-Station-Id}) != '-1') {`
	`121`	`+if (%redis('TTL', "{%{control.IP-Pool.Name}}:device:%{Calling-Station-Id}") != '-1') {`
`122`	`122`	`test_fail`
`123`	`123`	`}`
`124`	`124`
Original file line number	Diff line number	Diff line change
`@@ -8,12 +8,12 @@ control.IP-Pool.Name := 'test_static'`
`8`	`8`	`#`
`9`	`9`	`# Add a dynamic IP addresses`
`10`	`10`	`#`
`11`		`-%exec(./build/bin/local/rlm_redis_ippool_tool, -a, 192.168.0.1/32, $ENV{REDIS_IPPOOL_TEST_SERVER}:30001, %{control.IP-Pool.Name}, 192.168.0.0)`
	`11`	`+%exec('./build/bin/local/rlm_redis_ippool_tool', '-a', '192.168.0.1/32', '$ENV{REDIS_IPPOOL_TEST_SERVER}:30001', %{control.IP-Pool.Name}, '192.168.0.0')`
`12`	`12`
`13`	`13`	`#`
`14`	`14`	`# Add a static IP assigned to the calling station in the request`
`15`	`15`	`#`
`16`		`-%exec(./build/bin/local/rlm_redis_ippool_tool, -A, 192.168.0.10/32, -O, aa:bb:cc:dd:ee:ff, $ENV{REDIS_IPPOOL_TEST_SERVER}:30001, %{control.IP-Pool.Name}, 192.168.0.0)`
	`16`	`+%exec('./build/bin/local/rlm_redis_ippool_tool', '-A', '192.168.0.10/32', '-O', 'aa:bb:cc:dd:ee:ff', '$ENV{REDIS_IPPOOL_TEST_SERVER}:30001', %{control.IP-Pool.Name}, '192.168.0.0')`
`17`	`17`
`18`	`18`	`#`
`19`	`19`	`# Check allocation`
`@@ -49,7 +49,7 @@ redis_ippool.renew {`
`49`	`49`	`#`
`50`	`50`	`# Verify no expiry has been set on device`
`51`	`51`	`#`
`52`		`-if (%redis(TTL, {%{control.IP-Pool.Name}}:device:%{Calling-Station-Id}) != '-1') {`
	`52`	`+if (%redis('TTL', "{%{control.IP-Pool.Name}}:device:%{Calling-Station-Id}") != '-1') {`
`53`	`53`	`test_fail`
`54`	`54`	`}`
`55`	`55`
`@@ -73,19 +73,19 @@ if (!(updated)) {`
`73`	`73`	`#`
`74`	`74`	`# Verify the association with the device remains`
`75`	`75`	`#`
`76`		`-if (%redis(EXISTS, {%{control.IP-Pool.Name}}:device:%{Calling-Station-ID}) == '0') {`
	`76`	`+if (%redis('EXISTS', "{%{control.IP-Pool.Name}}:device:%{Calling-Station-ID}") == '0') {`
`77`	`77`	`test_fail`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`#`
`81`	`81`	`# Verify the hash information is retained`
`82`	`82`	`#`
`83`		`-if (%redis(EXISTS, {%{control.IP-Pool.Name}}:ip:%{reply.Framed-IP-Address}) == '0') {`
	`83`	`+if (%redis('EXISTS', "{%{control.IP-Pool.Name}}:ip:%{reply.Framed-IP-Address}") == '0') {`
`84`	`84`	`test_fail`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`# Check the ZSCORE`
`88`		`-if (%redis(ZSCORE, {%{control.IP-Pool.Name}%}:pool, %{reply.Framed-IP-Address}) <= %l) {`
	`88`	`+if (%redis('ZSCORE', "{%{control.IP-Pool.Name}%}:pool", %{reply.Framed-IP-Address}) <= %l) {`
`89`	`89`	`test_fail`
`90`	`90`	`}`
`91`	`91`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ control.IP-Pool.Name := 'test_static_dynamic'`
`8`	`8`	`#`
`9`	`9`	`# Add a static IP assigned to a calling station not in the request`
`10`	`10`	`#`
`11`		`-%exec(./build/bin/local/rlm_redis_ippool_tool, -A, 192.168.0.10/32, -O, aa:bb:cc:dd:ee:ff, $ENV{REDIS_IPPOOL_TEST_SERVER}:30001, %{control.IP-Pool.Name}, 192.168.0.0)`
	`11`	`+%exec('./build/bin/local/rlm_redis_ippool_tool', '-A', '192.168.0.10/32', '-O', 'aa:bb:cc:dd:ee:ff', '$ENV{REDIS_IPPOOL_TEST_SERVER}:30001', %{control.IP-Pool.Name}, '192.168.0.0')`
`12`	`12`
`13`	`13`	`#`
`14`	`14`	`# Check allocation fails - pool only contains an address assigned to another owner`
`@@ -23,7 +23,7 @@ if (!notfound) {`
`23`	`23`	`#`
`24`	`24`	`# Add a dynamic IP addresses`
`25`	`25`	`#`
`26`		`-%exec(./build/bin/local/rlm_redis_ippool_tool, -a, 192.168.0.1/32, $ENV{REDIS_IPPOOL_TEST_SERVER}:30001, %{control.IP-Pool.Name}, 192.168.0.0)`
	`26`	`+%exec('./build/bin/local/rlm_redis_ippool_tool', '-a', '192.168.0.1/32', '$ENV{REDIS_IPPOOL_TEST_SERVER}:30001', %{control.IP-Pool.Name}, '192.168.0.0')`
`27`	`27`
`28`	`28`	`#`
`29`	`29`	`# Check allocation`