commit 609194f68f8f99507aa75293fe364d5f5c4a268a
author Rich Lane <rlane@bigswitch.com> Mon Oct 21 06:17:37 2013 -0700
committer Rich Lane <rlane@bigswitch.com> Mon Oct 21 06:17:37 2013 -0700
tree e1d34ee98afca996b9edfcd1b6cc1cddc9616b95
parent 6f4978cd8387de7eb3a650a3d3a87264acf31efb

update uses of renamed pyloxi constants

src/python/oftest/testutils.py

diff --git a/src/python/oftest/testutils.py b/src/python/oftest/testutils.py
index 8a5a563..6892b39 100644
--- a/src/python/oftest/testutils.py
+++ b/src/python/oftest/testutils.py
@@ -1313,12 +1313,8 @@
     """
     Retrieve a list of stats entries. Handles OFPSF_REPLY_MORE.
     """
-    if ofp.OFP_VERSION <= 3:
-        msgtype = ofp.OFPT_STATS_REPLY
-        more_flag = ofp.OFPSF_REPLY_MORE
-    else:
-        msgtype = ofp.OFPT_MULTIPART_REPLY
-        more_flag = ofp.OFPMPF_REPLY_MORE
+    msgtype = ofp.OFPT_STATS_REPLY
+    more_flag = ofp.OFPSF_REPLY_MORE
     stats = []
     reply, _ = test.controller.transact(req)
     test.assertTrue(reply is not None, "No response to stats request")

tests/actions.py

diff --git a/tests/actions.py b/tests/actions.py
index 1a99deb..334062c 100644
--- a/tests/actions.py
+++ b/tests/actions.py
@@ -108,8 +108,8 @@
             supported_actions.append('OFPAT_SET_TP_SRC')
         if(reply.actions &1<<ofp.OFPAT_SET_TP_DST):
             supported_actions.append('OFPAT_SET_TP_DST')
-        if(reply.actions &1<<ofp.OFPAT_VENDOR):
-            supported_actions.append('OFPAT_VENDOR')
+        if(reply.actions &1<<ofp.OFPAT_EXPERIMENTER):
+            supported_actions.append('OFPAT_EXPERIMENTER')
         if(reply.actions &1<<ofp.OFPAT_ENQUEUE):
             supported_actions.append('OFPAT_ENQUEUE')
         

tests/message_types.py

diff --git a/tests/message_types.py b/tests/message_types.py
index 743dae1..872520f 100644
--- a/tests/message_types.py
+++ b/tests/message_types.py
@@ -150,8 +150,8 @@
             supported_actions.append('OFPAT_SET_TP_SRC')
         if(reply.actions &1<<ofp.OFPAT_SET_TP_DST):
             supported_actions.append('OFPAT_SET_TP_DST')
-        if(reply.actions &1<<ofp.OFPAT_VENDOR):
-            supported_actions.append('OFPAT_VENDOR')
+        if(reply.actions &1<<ofp.OFPAT_EXPERIMENTER):
+            supported_actions.append('OFPAT_EXPERIMENTER')
         if(reply.actions &1<<ofp.OFPAT_ENQUEUE):
             supported_actions.append('OFPAT_ENQUEUE')