move wimax tests to new framework

diff --git a/src/tests/keywords/all.mk b/src/tests/keywords/all.mk
index 855961574235465c2b9a25066548446858085939..bcbc361bab0ae0589668cbb8655891ee429e24b0 100644 (file)
--- a/src/tests/keywords/all.mk
+++ b/src/tests/keywords/all.mk
@@ -80,7 +80,7 @@ KEYWORD_UPDATE_TMPL_TESTS     := foreach-regex xlat-dhcpv4
 ifneq "$(findstring ${1}, paircmp if-paircmp)" ""
 $(OUTPUT)/${1}: NEW_COND=-S use_new_conditions=no
 
-else ifneq "$(findstring ${1}, comments update-to-edit if-regex-multivalue smash wimax unknown $(KEYWORD_UPDATE_TESTS) vendor_specific vendor_specific.raw xlat-unknown update-proto update-proto-error)" ""
+else ifneq "$(findstring ${1}, comments update-to-edit if-regex-multivalue smash unknown $(KEYWORD_UPDATE_TESTS) vendor_specific vendor_specific.raw xlat-unknown update-proto update-proto-error)" ""
 $(OUTPUT)/${1}: NEW_COND=-S use_new_conditions=yes
 
 else ifneq "$(findstring ${1}, $(KEYWORD_UPDATE_REWRITE_TESTS))" ""

diff --git a/src/tests/keywords/wimax b/src/tests/keywords/wimax
index f6857a1b9443dba45ecdf6f85bd93da1568ab1cf..edb2c8b46d86eaa53fcb3b99eff3a77892de63ce 100644 (file)
--- a/src/tests/keywords/wimax
+++ b/src/tests/keywords/wimax
@@ -1,17 +1,10 @@
-update request {
-       &Vendor-Specific.WiMAX.Packet-Flow-Descriptor-v2.Classifier.Src-Spec.Port = 6809
-}
+&Vendor-Specific.WiMAX.Packet-Flow-Descriptor-v2.Classifier.Src-Spec.Port := 6809
 
 if (!(&Vendor-Specific.WiMAX.Packet-Flow-Descriptor-v2.Classifier.Src-Spec.Port == 6809)) {
        test_fail
 }
 
-#
-#  This is known, and should be renamed
-update request {
-       &26.24757.84.9.5.7 = 0x01
-}
-
+&26.24757.84.9.5.7 := 0x01
 if (!(&Vendor-Specific.WiMAX.Packet-Flow-Descriptor-v2.Classifier.Src-Spec.Assigned == 1)) {
        test_fail
 }