more cleanups

perl -p -i -e 's/&request\./&/' src/tests/keywords/*

except for "comments", because &Reply-Message is likely parsed
as &Reply - &Message.  We'll have to track that down again

diff --git a/src/tests/keywords/3gpp b/src/tests/keywords/3gpp
index b70b7b53d559dbb6623aaf60464e2fcd782d32a2..becd900abff7f4b0cf37ec8090ec53eb45476953 100644 (file)
--- a/src/tests/keywords/3gpp
+++ b/src/tests/keywords/3gpp
@@ -1,10 +1,10 @@
-&request.Vendor-Specific.3GPP.IMSI := "hello"
+&Vendor-Specific.3GPP.IMSI := "hello"
 
 #
 #  "request.[0-9]" should be parsed as a list followed
 #  by an attribute.
 #
 &control.Tmp-String-0 := &Vendor-Specific.3GPP.IMSI
-&control.Tmp-String-1 := &request.Vendor-Specific.3GPP.IMSI
+&control.Tmp-String-1 := &Vendor-Specific.3GPP.IMSI
 
 success

diff --git a/src/tests/keywords/case-empty-string b/src/tests/keywords/case-empty-string
index 209697abdf36a0b1babbab37a24de46d9059ab9e..9f93b024caa8981cbe08b825d490aa129efb7d6a 100644 (file)
--- a/src/tests/keywords/case-empty-string
+++ b/src/tests/keywords/case-empty-string
@@ -1,6 +1,6 @@
 # PRE: switch
 #
-&request.Filter-Id := ""
+&Filter-Id := ""
 
 switch &Filter-Id {
        case "" {

diff --git a/src/tests/keywords/cast-byte b/src/tests/keywords/cast-byte
index 496b854c59370dd6ec5bb03e3e8e2362660845a6..119e124ccc482b60a79cf7e2d67411d1a925f822 100644 (file)
--- a/src/tests/keywords/cast-byte
+++ b/src/tests/keywords/cast-byte
@@ -1,7 +1,7 @@
 #
 #  PRE: if
 #
-&request.Class := 0xad
+&Class := 0xad
 
 if (<byte>&Class == 173) {
        success

diff --git a/src/tests/keywords/cast-integer b/src/tests/keywords/cast-integer
index 9b111f94db992dbc013be010735f01b1c5d1268f..e3081bcd7e580a12ad11ef3fb2982d981e804407 100644 (file)
--- a/src/tests/keywords/cast-integer
+++ b/src/tests/keywords/cast-integer
@@ -1,7 +1,7 @@
 #
 #  PRE: if
 #
-&request.Class := 0x00000101
+&Class := 0x00000101
 
 if (<integer>&Class[0] == 257) {
        success

diff --git a/src/tests/keywords/cast-ipaddr b/src/tests/keywords/cast-ipaddr
index 15609733b72aebcfef44229bb3183936421f97a5..c17c0ef339aa377006e0f3a34dea242ff24b3a78 100644 (file)
--- a/src/tests/keywords/cast-ipaddr
+++ b/src/tests/keywords/cast-ipaddr
@@ -1,7 +1,7 @@
 #
 #  PRE: if redundant
 #
-&request.NAS-IP-Address                := 127.0.0.1
+&NAS-IP-Address                := 127.0.0.1
 &Tmp-Integer-0         := 0x7f000001
 
 &Tmp-String-0                  := &NAS-IP-Address

diff --git a/src/tests/keywords/cast-short b/src/tests/keywords/cast-short
index c7c0bee88c41c619bfe628ca5302dde83a4c1d5a..f4ff7629aa3b57f901691a7c20f6b87f0c393299 100644 (file)
--- a/src/tests/keywords/cast-short
+++ b/src/tests/keywords/cast-short
@@ -1,7 +1,7 @@
 #
 #  PRE: if
 #
-&request.Class := 0x0101
+&Class := 0x0101
 
 if (<short>&Class == 257) {
        success

diff --git a/src/tests/keywords/cmp b/src/tests/keywords/cmp
index df1daa95df9af9e413658f5b772f10975b3891a5..8ce2d0047ab19bb1c167292bc229505065bae3df 100644 (file)
--- a/src/tests/keywords/cmp
+++ b/src/tests/keywords/cmp
@@ -1,5 +1,5 @@
-&request.Called-Station-Id  := "This is a test"
-&request.Calling-Station-Id := "This is a test"
+&Called-Station-Id  := "This is a test"
+&Calling-Station-Id := "This is a test"
 
 #
 #  Check attribute references

diff --git a/src/tests/keywords/edit-leaf-multivalue b/src/tests/keywords/edit-leaf-multivalue
index a67efad2752bdb27bcce5174b0ca467ad8dfa2fc..617c05d82020911a0fade967363b50015b8d3aa9 100644 (file)
--- a/src/tests/keywords/edit-leaf-multivalue
+++ b/src/tests/keywords/edit-leaf-multivalue
@@ -5,7 +5,7 @@
        "foo",
        "bar",
        "baz",
-       &request.User-Name
+       &User-Name
 }
 
 if (%{request.Tmp-String-0[#]} != 4) {

diff --git a/src/tests/keywords/foreach-break b/src/tests/keywords/foreach-break
index 784da75179ba507547370d4f82bc9342924e97fa..200add83ecf32f67b6871495f550e404eea7024a 100644 (file)
--- a/src/tests/keywords/foreach-break
+++ b/src/tests/keywords/foreach-break
@@ -31,7 +31,7 @@ foreach &Filter-Id {
        &Filter-Id = "2"
 }
 
-foreach &request.Reply-Message {
+foreach &Reply-Message {
        if ("%{Foreach-Variable-0}" == "1") {
                &request += {
                        &Filter-Id = "3"
@@ -51,7 +51,7 @@ foreach &request.Reply-Message {
        &Filter-Id = "2"
 }
 
-foreach &request.Reply-Message {
+foreach &Reply-Message {
        if ("%{Foreach-Variable-0}" == "1") {
                &request += {
                        &Filter-Id = "3"

diff --git a/src/tests/keywords/foreach-break-3 b/src/tests/keywords/foreach-break-3
index b3a7b43c212fc7663ef02abe35664d5d7ed93cb2..9ed231f5096ff7293753ca3cfd33142a4d1988dc 100644 (file)
--- a/src/tests/keywords/foreach-break-3
+++ b/src/tests/keywords/foreach-break-3
@@ -6,7 +6,7 @@
 &control.Calling-Station-Id := { "0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "a", "b", "c", "d", "e", "f", "g" }
 
 foreach &control.Calling-Station-Id {
-       if (&request.Calling-Station-Id == "%{Foreach-Variable-0}") {
+       if (&Calling-Station-Id == "%{Foreach-Variable-0}") {
                success
                break
        }

diff --git a/src/tests/keywords/foreach-return b/src/tests/keywords/foreach-return
index 11b4e035c8152c70a53329808088454e4da8dc34..95c98ba6aafad9f771e34bd4d331f07aa72e0187 100644 (file)
--- a/src/tests/keywords/foreach-return
+++ b/src/tests/keywords/foreach-return
@@ -4,7 +4,7 @@
 #
 # Adding attribute during request and immediately returning should still work
 #
-&request.Filter-Id := { "1", "2", "3", "4", "5" }
+&Filter-Id := { "1", "2", "3", "4", "5" }
 
 foreach &Filter-Id {
        if ("%{Foreach-Variable-0}" == "3") {

diff --git a/src/tests/keywords/map-xlat b/src/tests/keywords/map-xlat
index 0cb53f48dfe99dcd30a6a5ca18c7bd33d48332b1..126db42f325e34a25118d143afd969249fbca890 100644 (file)
--- a/src/tests/keywords/map-xlat
+++ b/src/tests/keywords/map-xlat
@@ -23,11 +23,11 @@ foreach &Tmp-String-1[*] {
        }
 }
 
-if (&request.Vendor-Specific.Nokia-SR.MSAP-Interface[0] != 'UNICAST_7360OLT3') {
+if (&Vendor-Specific.Nokia-SR.MSAP-Interface[0] != 'UNICAST_7360OLT3') {
        test_fail
 }
 
-if (&request.Vendor-Specific.Nokia-SR.MSAP-Interface[1] != 'UNICAST_7360OLT4') {
+if (&Vendor-Specific.Nokia-SR.MSAP-Interface[1] != 'UNICAST_7360OLT4') {
        test_fail
 }
 

diff --git a/src/tests/keywords/module-failure-message b/src/tests/keywords/module-failure-message
index c528e876b63787ac3d89f71af54b28a46c0a391b..597adbd9d362be62d5182da7acfc18f74aff72fe 100644 (file)
--- a/src/tests/keywords/module-failure-message
+++ b/src/tests/keywords/module-failure-message
@@ -4,23 +4,23 @@
 
 test
 
-if (&request.Module-Failure-Message[4] != 'test: RERROR error message') {
+if (&Module-Failure-Message[4] != 'test: RERROR error message') {
        test_fail
 }
 
-if (&request.Module-Failure-Message[3] != 'test: RDEBUG error message') {
+if (&Module-Failure-Message[3] != 'test: RDEBUG error message') {
        test_fail
 }
 
-if (&request.Module-Failure-Message[2] != 'test: RDEBUG2 error message') {
+if (&Module-Failure-Message[2] != 'test: RDEBUG2 error message') {
        test_fail
 }
 
-if (&request.Module-Failure-Message[1] != 'test: RDEBUG3 error message') {
+if (&Module-Failure-Message[1] != 'test: RDEBUG3 error message') {
        test_fail
 }
 
-if (&request.Module-Failure-Message[0] != 'test: RDEBUG4 error message') {
+if (&Module-Failure-Message[0] != 'test: RDEBUG4 error message') {
        test_fail
 }
 

diff --git a/src/tests/keywords/smash b/src/tests/keywords/smash
index 703692dfdde5792d464fdde4f3a58273b73603b8..3b79a13d09897cefc369904b1fb67ef910e3fda7 100644 (file)
--- a/src/tests/keywords/smash
+++ b/src/tests/keywords/smash
@@ -3,6 +3,6 @@
 #
 #  This gives the game away.
 #
-update { &control.User-Name := 'bob', &request.Reply-Message := "foo" }
+update { &control.User-Name := 'bob', &Reply-Message := "foo" }
 
 success

diff --git a/src/tests/keywords/subrequest-if b/src/tests/keywords/subrequest-if
index 489fde7d4c9509d0ade401e17f9b8b8ab772cd75..557407066dc9af7681f6c4c6a79f35eb3a45bc8b 100644 (file)
--- a/src/tests/keywords/subrequest-if
+++ b/src/tests/keywords/subrequest-if
@@ -2,7 +2,7 @@
 #  PRE: subrequest
 #
 subrequest Access-Request {
-       &request.User-Name := &parent.request.User-Name
+       &User-Name := &parent.request.User-Name
 
        if (!&User-Name) {
                test_fail

diff --git a/src/tests/keywords/unknown b/src/tests/keywords/unknown
index edd40f54e1a75598d80faedffe3e5af3bc911f97..94ade08f031a4d9034cb7b37d7b71cd4b7959d02 100644 (file)
--- a/src/tests/keywords/unknown
+++ b/src/tests/keywords/unknown
@@ -8,7 +8,7 @@ update request {
 #
 #  Check that a known but malformed attr is malformed
 #
-&request.26.24757.84.9.5.7 := 0xab
+&26.24757.84.9.5.7 := 0xab
 
 if (&26.24757.84.9.5.7 != 0xab) {
        test_fail
@@ -17,7 +17,7 @@ if (&26.24757.84.9.5.7 != 0xab) {
 #
 #  Check that an unknown attr is OK
 #
-&request.26.24757.84.9.5.15 := 0xabcdef
+&26.24757.84.9.5.15 := 0xabcdef
 
 if (&26.24757.84.9.5.15 != 0xabcdef) {
        test_fail
@@ -35,7 +35,7 @@ if (&26.11344.1 != 127.0.0.2) {
        test_fail
 }
 
-&request.26.11344.1 := 0x7f000001
+&26.11344.1 := 0x7f000001
 
 if (&Vendor-Specific.FreeRADIUS.Proxied-To == 127.0.0.2) {
        test_fail
@@ -53,7 +53,7 @@ if (&26.11344.1 != 127.0.0.1) {
        test_fail
 }
 
-&request.26.66.1 = 0x01020304
+&26.66.1 = 0x01020304
 
 if (&26.66.1 != 0x01020304) {
        test_fail