auto-convert to new syntax

perl -p -i -e 's/%{([a-zA-Z0-9._-]+):%{([a-zA-Z0-9._-]+)}}/%$1(%{$2})/g'  $(git grep -lE '%\{[a-z]+:' src/tests/keywords/)

diff --git a/src/tests/keywords/if-regex-match-named b/src/tests/keywords/if-regex-match-named
index 8af16d1ffb9fe3f9290b32ceb54eb0b06fe85485..955cfc64f914794d6ca4c35be67776b8bd106b26 100644 (file)
--- a/src/tests/keywords/if-regex-match-named
+++ b/src/tests/keywords/if-regex-match-named
@@ -29,7 +29,7 @@ if (!(&Module-Failure-Message[*] == "No previous named regex capture group")) {
 &request -= &Module-Failure-Message[*]
 
 # Check failure when no previous capture - numbered group
-if ("%{regex:%{Tmp-Integer-1}}") {
+if ("%regex(%{Tmp-Integer-1})") {
        test_fail
 }
 
@@ -117,7 +117,7 @@ if (&User-Name =~ /^(?<one>[0-9])_(?<two>[0-9])?_(?<three>[0-9]*)_(?<four>[0-9]+
        &Tmp-Integer-6 := 6
        &Tmp-Integer-7 := 7
 
-       &Tmp-String-0 := "%{regex:%{Tmp-Integer-7}}_%{regex:%{Tmp-Integer-6}}_%{regex:%{Tmp-Integer-5}}_%{regex:%{Tmp-Integer-4}}_%{regex:%{Tmp-Integer-3}}_%{regex:%{Tmp-Integer-2}}_%{regex:%{Tmp-Integer-1}}_%{regex:%{Tmp-Integer-0}}"
+       &Tmp-String-0 := "%regex(%{Tmp-Integer-7})_%regex(%{Tmp-Integer-6})_%regex(%{Tmp-Integer-5})_%regex(%{Tmp-Integer-4})_%regex(%{Tmp-Integer-3})_%regex(%{Tmp-Integer-2})_%regex(%{Tmp-Integer-1})_%regex(%{Tmp-Integer-0})"
        if (!(&Tmp-String-0 == '7_6_5_4_3_2_1_1_2_3_4_5_6_7')) {
                test_fail
        }

diff --git a/src/tests/keywords/map-arg3-xlat b/src/tests/keywords/map-arg3-xlat
index 7311c4503a4b885839483105b46ba3880870c888..3c993001157aa1649b336b36e71cba474eba65e5 100644 (file)
--- a/src/tests/keywords/map-arg3-xlat
+++ b/src/tests/keywords/map-arg3-xlat
@@ -7,6 +7,6 @@
 #  value of the field, but does allow us to test that
 #  arg3 can be an xlat
 #
-map csv "%{tolower:%{User-Name}}" {
+map csv "%tolower(%{User-Name})" {
        &reply.Result-Status := 'field3'
 }

diff --git a/src/tests/keywords/map-csv-lhs b/src/tests/keywords/map-csv-lhs
index 1a9dd1b7c4d6cd2708a246d237cac42762b4a51e..ec3a674307e08899f0b3f0ad911c3bc3e2afbcd3 100644 (file)
--- a/src/tests/keywords/map-csv-lhs
+++ b/src/tests/keywords/map-csv-lhs
@@ -2,6 +2,6 @@
 #  PRE: map
 #
 
-map csv "%{tolower:%{User-Name}}" {
+map csv "%tolower(%{User-Name})" {
        &reply.Result-Status := 'field3'
 }

diff --git a/src/tests/keywords/map-xlat b/src/tests/keywords/map-xlat
index eb02eee7d418ea27c2a17a876b7677ff2ed9e781..8f96a7bd936e3296d5d06b6d6fbfe375bb8728dd 100644 (file)
--- a/src/tests/keywords/map-xlat
+++ b/src/tests/keywords/map-xlat
@@ -9,7 +9,7 @@
        &Tmp-String-1 = "request.Vendor-Specific.Nokia-SR.MSAP-Interface += 'UNICAST_7360OLT4'"
 }
 
-if (!("%{map:%{Tmp-String-0}}" == 1)) {
+if (!("%map(%{Tmp-String-0})" == 1)) {
        test_fail
 }
 
@@ -18,7 +18,7 @@ if (!(&control.Tmp-String-0 == 'testing123')) {
 }
 
 foreach &Tmp-String-1[*] {
-       if (!("%{map:%{Foreach-Variable-0}}" == 1)) {
+       if (!("%map(%{Foreach-Variable-0})" == 1)) {
                test_fail
        }
 }

diff --git a/src/tests/keywords/map-xlat-nested b/src/tests/keywords/map-xlat-nested
index 01e51856d8761c9cb5f04acc3b54571a05d3d073..1dd72bf7a92f8096c5985b5f63e65f773294d4c3 100644 (file)
--- a/src/tests/keywords/map-xlat-nested
+++ b/src/tests/keywords/map-xlat-nested
@@ -5,7 +5,7 @@
 #
 &Tmp-String-0 := "request.Tmp-Group-0.Tmp-String-1 = 'testing123'"
 
-if (!("%{map:%{Tmp-String-0}}" == 1)) {
+if (!("%map(%{Tmp-String-0})" == 1)) {
        test_fail
 }
 

diff --git a/src/tests/keywords/map-xlat-nested-overwrite b/src/tests/keywords/map-xlat-nested-overwrite
index 986b16022d84a2bcd98d78d2aa3e496a92bdda3a..312770f84df142a82795f374749d9aea1e93c5b4 100644 (file)
--- a/src/tests/keywords/map-xlat-nested-overwrite
+++ b/src/tests/keywords/map-xlat-nested-overwrite
@@ -5,11 +5,11 @@
 #
 &Tmp-String-0 := "request.Tmp-Group-0.Tmp-String-0 := 'testing123'"
 
-if (!("%{map:%{Tmp-String-0}}" == 1)) {
+if (!("%map(%{Tmp-String-0})" == 1)) {
        test_fail
 }
 
-if (!("%{map:%{Tmp-String-0}}" == 1)) {
+if (!("%map(%{Tmp-String-0})" == 1)) {
        test_fail
 }
 

diff --git a/src/tests/keywords/map-xlat-struct b/src/tests/keywords/map-xlat-struct
index f2725470a2287f19de16231e1eafff824cc5c129..d798227598827b7a70989a835510ac77174da86c 100644 (file)
--- a/src/tests/keywords/map-xlat-struct
+++ b/src/tests/keywords/map-xlat-struct
@@ -6,7 +6,7 @@
 #
 &Tmp-String-0 := "IA-PD.IAID = 11"
 
-if (!("%{map:%{Tmp-String-0}}" == 1)) {
+if (!("%map(%{Tmp-String-0})" == 1)) {
        test_fail
 }
 

diff --git a/src/tests/keywords/pap b/src/tests/keywords/pap
index ed6d147314589e613512f7cfe975a46b70c7cba1..411cd550009ea15fd0452e8f15f5cfaddb1b2229 100644 (file)
--- a/src/tests/keywords/pap
+++ b/src/tests/keywords/pap
@@ -39,7 +39,7 @@ if (reject) {
 #  Hex encoded SSHA password
 #
 &control := {
-       &Password.With-Header = "{ssha}%{hex:%{sha1:%{User-Password}%{Tmp-String-0}}}%{hex:%{Tmp-String-0}}"
+       &Password.With-Header = "{ssha}%{hex:%{sha1:%{User-Password}%{Tmp-String-0}}}%hex(%{Tmp-String-0})"
 }
 
 pap.authorize
@@ -54,11 +54,11 @@ if (reject) {
 #  Base64 encoded SSHA password
 #
 &control := {
-        &Tmp-String-1 = "%{hex:%{sha1:%{User-Password}%{Tmp-String-0}}}%{hex:%{Tmp-String-0}}"
+        &Tmp-String-1 = "%{hex:%{sha1:%{User-Password}%{Tmp-String-0}}}%hex(%{Tmp-String-0})"
 }
 
 # To Binary
-&control.Tmp-Octets-0 := "%{bin:%{control.Tmp-String-1}}"
+&control.Tmp-Octets-0 := "%bin(%{control.Tmp-String-1})"
 
 # To Base64
 &control.Tmp-String-1 := "%(base64.encode:%{control.Tmp-Octets-0})"
@@ -76,11 +76,11 @@ if (reject) {
 #  Base64 of Base64 encoded SSHA password
 #
 &control := {
-       &Tmp-String-1 = "%{hex:%{sha1:%{User-Password}%{Tmp-String-0}}}%{hex:%{Tmp-String-0}}"
+       &Tmp-String-1 = "%{hex:%{sha1:%{User-Password}%{Tmp-String-0}}}%hex(%{Tmp-String-0})"
 }
 
 # To Binary
-&control.Tmp-Octets-0 := "%{bin:%{control.Tmp-String-1}}"
+&control.Tmp-Octets-0 := "%bin(%{control.Tmp-String-1})"
 
 # To Base64
 &control.Tmp-String-1 := "{ssha}%(base64.encode:%{control.Tmp-Octets-0})"

diff --git a/src/tests/keywords/pap-ssha2 b/src/tests/keywords/pap-ssha2
index 9dd85ca050eeaa8329e829c47757fa87d3546fdd..76902d94564a1fd4b7cafc624ebec28892fe0004 100644 (file)
--- a/src/tests/keywords/pap-ssha2
+++ b/src/tests/keywords/pap-ssha2
@@ -21,7 +21,7 @@ if (!('${feature.tls}' == 'yes')) {
 #  Hex encoded SSHA2-512 password
 #
 &control += {
-       &Password.With-Header = "{ssha512}%{hex:%{sha2_512:%{User-Password}%{Tmp-String-0}}}%{hex:%{Tmp-String-0}}"
+       &Password.With-Header = "{ssha512}%{hex:%{sha2_512:%{User-Password}%{Tmp-String-0}}}%hex(%{Tmp-String-0})"
 }
 
 pap.authorize
@@ -37,10 +37,10 @@ if (reject) {
 #
 #  Base64 encoded SSHA2-512 password
 #
-&control.Tmp-String-1 := "%{hex:%{sha2_512:%{User-Password}%{Tmp-String-0}}}%{hex:%{Tmp-String-0}}"
+&control.Tmp-String-1 := "%{hex:%{sha2_512:%{User-Password}%{Tmp-String-0}}}%hex(%{Tmp-String-0})"
 
 # To Binary
-&control.Tmp-Octets-0 := "%{bin:%{control.Tmp-String-1}}"
+&control.Tmp-Octets-0 := "%bin(%{control.Tmp-String-1})"
 
 # To Base64
 &control.Tmp-String-1 := "%(base64.encode:%{control.Tmp-Octets-0})"
@@ -62,10 +62,10 @@ if (reject) {
 #
 #  Base64 of Base64 encoded SSHA2-512 password
 #
-&control.Tmp-String-1 := "%{hex:%{sha2_512:%{User-Password}%{Tmp-String-0}}}%{hex:%{Tmp-String-0}}"
+&control.Tmp-String-1 := "%{hex:%{sha2_512:%{User-Password}%{Tmp-String-0}}}%hex(%{Tmp-String-0})"
 
 # To Binary
-&control.Tmp-Octets-0 := "%{bin:%{control.Tmp-String-1}}"
+&control.Tmp-Octets-0 := "%bin(%{control.Tmp-String-1})"
 
 # To Base64
 &control.Tmp-String-1 := "{ssha512}%(base64.encode:%{control.Tmp-Octets-0})"
@@ -87,7 +87,7 @@ if (reject) {
 #
 #  Base64 of SHA2-384 password (in SHA2-Password)
 #
-&control.Password.SHA2 := "%{hex:%{sha2_384:%{User-Password}}}"
+&control.Password.SHA2 := "%{hex:%sha2_384(%{User-Password})}"
 
 pap.authorize
 pap.authenticate {
@@ -104,7 +104,7 @@ if (reject) {
 #
 #  Base64 of SHA2-256 password (in SHA2-256-Password)
 #
-&control.Password.SHA2-256 := "%{hex:%{sha2_256:%{User-Password}}}"
+&control.Password.SHA2-256 := "%{hex:%sha2_256(%{User-Password})}"
 
 pap.authorize
 pap.authenticate {
@@ -119,7 +119,7 @@ if (reject) {
 #
 #  Base64 of SHA2-224 password (in SHA2-224-Password - No hex armour)
 #
-&control.Password.SHA2-224 := "%{sha2_224:%{User-Password}}"
+&control.Password.SHA2-224 := "%sha2_224(%{User-Password})"
 
 pap.authorize
 pap.authenticate {

diff --git a/src/tests/keywords/radius.conf b/src/tests/keywords/radius.conf
index f4ea9f7f7df64f236df2f4e58d0d2361d08f8ca0..037e4ce7999618eff57cec5e9fb492965b74cb34 100644 (file)
--- a/src/tests/keywords/radius.conf
+++ b/src/tests/keywords/radius.conf
@@ -23,7 +23,7 @@ modules {
 
 
        csv {
-               key = "%{tolower:%{User-Name}}"
+               key = "%tolower(%{User-Name})"
                filename = ${keyword}/csv.conf
                fields = "field1,,field3"
                index_field = 'field1'

diff --git a/src/tests/keywords/switch-escape b/src/tests/keywords/switch-escape
index 708e187f5e853b6550736d9f228d04b4699ff676..c511904401a0c03d6fb0695b71cbf80241a8c55f 100644 (file)
--- a/src/tests/keywords/switch-escape
+++ b/src/tests/keywords/switch-escape
@@ -1,6 +1,6 @@
 &Tmp-String-0 := 'foo'
 
-switch "%{tolower:%{Tmp-String-0}}" {
+switch "%tolower(%{Tmp-String-0})" {
        case 'foo' {
                success
        }

diff --git a/src/tests/keywords/truncation b/src/tests/keywords/truncation
index e95c98e4c03be0666ecaa55fc13b4dcd65af995a..ce70b12130575b8e82e359b6d1b07073d880da63 100644 (file)
--- a/src/tests/keywords/truncation
+++ b/src/tests/keywords/truncation
@@ -78,7 +78,7 @@ if (!(%(length:%{Tmp-Octets-0}) == 4083)) {
 }
 
 # Octets are expanded to 8168 hexits
-if !("0x%{hex:%{Tmp-Octets-0}}" =~ /^0x([0-9a-f]+)$/) {
+if !("0x%hex(%{Tmp-Octets-0})" =~ /^0x([0-9a-f]+)$/) {
        test_fail
 }
 

diff --git a/src/tests/keywords/urlquote b/src/tests/keywords/urlquote
index 5345dca93a7018bb3554ad608bb47f511a5d0a5f..98e8df8de8be38ac5272180aba573485b9f06409 100644 (file)
--- a/src/tests/keywords/urlquote
+++ b/src/tests/keywords/urlquote
@@ -11,11 +11,11 @@
 }
 
 &request += {
-       &Tmp-String-1 = "%{urlquote:%{Tmp-String-0}}"
-       &Tmp-String-3 = "%{urlquote:%{Tmp-String-2}}"
-       &Tmp-String-5 = "%{urlquote:%{Tmp-String-4}}"
-       &Tmp-String-7 = "%{urlunquote:%{Tmp-String-6}}"
-       &Tmp-String-9 = "%{urlunquote:%{Tmp-String-8}}"
+       &Tmp-String-1 = "%urlquote(%{Tmp-String-0})"
+       &Tmp-String-3 = "%urlquote(%{Tmp-String-2})"
+       &Tmp-String-5 = "%urlquote(%{Tmp-String-4})"
+       &Tmp-String-7 = "%urlunquote(%{Tmp-String-6})"
+       &Tmp-String-9 = "%urlunquote(%{Tmp-String-8})"
 }
 
 
@@ -39,7 +39,7 @@ if (!(&Tmp-String-9 == &Tmp-String-4)) {
        test_fail
 }
 
-&Tmp-String-1 := "%{urlunquote:%{Tmp-String-0}}"
+&Tmp-String-1 := "%urlunquote(%{Tmp-String-0})"
 
 &request -= &Tmp-String-2[*]
 &Tmp-String-2 := "%{urlunquote:%%E,123}"

diff --git a/src/tests/keywords/xlat-eval b/src/tests/keywords/xlat-eval
index 85de15171b7f3eb7a189c727252eb2e77cbb2155..1e40cbd3a129b2ce2ee3a16ba2e85ee0f41d33fc 100644 (file)
--- a/src/tests/keywords/xlat-eval
+++ b/src/tests/keywords/xlat-eval
@@ -11,7 +11,7 @@
 #
 #  Verify non string types are treated as literals
 #
-if (!("%{eval:%{Tmp-Integer-0}}" == 4)) {
+if (!("%eval(%{Tmp-Integer-0})" == 4)) {
        test_fail
 }
 
@@ -22,7 +22,7 @@ if (!("%{eval:%{Tmp-Integer-0[1]}}" == 8)) {
 #
 #  Check double expansion works
 #
-if (!("%{eval:%{Tmp-String-0}}" == 'foo')) {
+if (!("%eval(%{Tmp-String-0})" == 'foo')) {
        test_fail
 }
 

diff --git a/src/tests/modules/exec/module.conf b/src/tests/modules/exec/module.conf
index d439f90dd1ca1556a6bf1d3048b72c254104f84e..c4fcd49ad6dbcabf5a3f0541a93031e2cfd98363 100644 (file)
--- a/src/tests/modules/exec/module.conf
+++ b/src/tests/modules/exec/module.conf
@@ -49,5 +49,5 @@ exec exec_sync_xlat_args {
        wait = yes
        output_pairs = &control
        timeout = 10
-       program = "/bin/sh $ENV{MODULE_TEST_DIR}/attrs.sh %{toupper:%{User-Name}}"
+       program = "/bin/sh $ENV{MODULE_TEST_DIR}/attrs.sh %toupper(%{User-Name})"
 }

diff --git a/src/tests/modules/ldap/xlat.unlang b/src/tests/modules/ldap/xlat.unlang
index e60c3c8df6640b38aeed3a053c67ce03dd3df83f..da809471a647d8826b98a625cd535b8905686239 100644 (file)
--- a/src/tests/modules/ldap/xlat.unlang
+++ b/src/tests/modules/ldap/xlat.unlang
@@ -7,39 +7,39 @@
 &Tmp-String-2 := ',+"\<>;*=()'
 
 # String with no escaping
-&control.Tmp-String-0 := "%{ldap_escape:%{Tmp-String-0}}"
+&control.Tmp-String-0 := "%ldap_escape(%{Tmp-String-0})"
 
 if (!(&control.Tmp-String-0 == "safe string")) {
         test_fail
 }
 
 # String with some characters to escape
-&control.Tmp-String-1 := "%{ldap_escape:%{Tmp-String-1}}"
+&control.Tmp-String-1 := "%ldap_escape(%{Tmp-String-1})"
 
 if (!(&control.Tmp-String-1 == 'non safe\2c\2b\22\5c\3c\3e\3b\2a\3d\28\29 string')) {
         test_fail
 }
 
 # String where all characters require escaping
-&control.Tmp-String-2 := "%{ldap_escape:%{Tmp-String-2}}"
+&control.Tmp-String-2 := "%ldap_escape(%{Tmp-String-2})"
 
 if (!(&control.Tmp-String-2 == '\2c\2b\22\5c\3c\3e\3b\2a\3d\28\29')) {
         test_fail
 }
 
-&Tmp-String-3 := "%{ldap_unescape:%{control.Tmp-String-0}}"
+&Tmp-String-3 := "%ldap_unescape(%{control.Tmp-String-0})"
 
 if (!(&Tmp-String-3 == 'safe string')) {
         test_fail
 }
 
-&Tmp-String-4 := "%{ldap_unescape:%{control.Tmp-String-1}}"
+&Tmp-String-4 := "%ldap_unescape(%{control.Tmp-String-1})"
 
 if (!(&Tmp-String-4 == 'non safe,+"\<>;*=() string')) {
         test_fail
 }
 
-&Tmp-String-5 := "%{ldap_unescape:%{control.Tmp-String-2}}"
+&Tmp-String-5 := "%ldap_unescape(%{control.Tmp-String-2})"
 
 if (!(&Tmp-String-5 == ',+"\<>;*=()')) {
         test_fail

diff --git a/src/tests/modules/linelog/linelog-escapes.unlang b/src/tests/modules/linelog/linelog-escapes.unlang
index d1226cedff0c2873181e75860e7e8676f652678a..cb93aac3ec6fcd6e97df20cbaa9696762f03f15f 100644 (file)
--- a/src/tests/modules/linelog/linelog-escapes.unlang
+++ b/src/tests/modules/linelog/linelog-escapes.unlang
@@ -21,7 +21,7 @@ if (fail) {
 
 linelog_escapes
 &Tmp-String-0 := `/bin/sh -c "tail -n2 $ENV{MODULE_TEST_DIR}/test_escapes.log"`
-&Tmp-String-1 := "%{hex:%{Tmp-String-0}}"
+&Tmp-String-1 := "%hex(%{Tmp-String-0})"
 
 #
 #  Note that there's a '5f6e' here, which is "\n"
@@ -53,7 +53,7 @@ else {
 
 linelog_escapes
 &Tmp-String-0 := `/bin/sh -c "tail -n2 $ENV{MODULE_TEST_DIR}/test_escapes.log"`
-&Tmp-String-1 := "%{hex:%{Tmp-String-0}}"
+&Tmp-String-1 := "%hex(%{Tmp-String-0})"
 
 if (&Tmp-String-1 == '666f6f0a626172') {
        test_pass

diff --git a/src/tests/modules/sql/groups.unlang b/src/tests/modules/sql/groups.unlang
index 1b6832dd011f9ddb1d11ddb75eff4361dd177c11..a23d43b32e0b5c52a679d83c6f1c933d46a502cb 100644 (file)
--- a/src/tests/modules/sql/groups.unlang
+++ b/src/tests/modules/sql/groups.unlang
@@ -76,7 +76,7 @@ if (%{sql.group:groups_group_d} != false) {
 #
 &Tmp-String-0 := 'groups_group_b'
 
-if !(%{sql.group:%{Tmp-String-0}} == yes) {
+if !(%sql.group(%{Tmp-String-0}) == yes) {
        test_fail
 }
 

diff --git a/src/tests/modules/yubikey/yubikey_xlat.unlang b/src/tests/modules/yubikey/yubikey_xlat.unlang
index f97d493f42e77ecae3aec2eb3887fc68b2780568..3633ffabcad2628f49c249adab51568678b9ec0e 100644 (file)
--- a/src/tests/modules/yubikey/yubikey_xlat.unlang
+++ b/src/tests/modules/yubikey/yubikey_xlat.unlang
@@ -1,5 +1,5 @@
 &Tmp-String-0 := "vvrbuctetdhc"
-&Tmp-String-1 := "%{modhextohex:%{Tmp-String-0}}"
+&Tmp-String-1 := "%modhextohex(%{Tmp-String-0})"
 
 if (&Tmp-String-1 != "ffc1e0d3d260") {
        test_fail
@@ -8,7 +8,7 @@ if (&Tmp-String-1 != "ffc1e0d3d260") {
 #  Invalid modhex string - not even length
 &Tmp-String-0 := "vvrbuctetdh"
 
-&Tmp-String-1 := "%{modhextohex:%{Tmp-String-0}}"
+&Tmp-String-1 := "%modhextohex(%{Tmp-String-0})"
 
 if (ok) {
        test_fail
@@ -25,7 +25,7 @@ if (&Module-Failure-Message != "Modhex string invalid") {
 #  Invalid modhex string - invalid characters
 &Tmp-String-0 := "vxrbmctetdhc"
 
-&Tmp-String-1 := "%{modhextohex:%{Tmp-String-0}}"
+&Tmp-String-1 := "%modhextohex(%{Tmp-String-0})"
 
 if (ok) {
        test_fail