commit 0237baf6057179131cc929af1cee4e46667b76a0
author Rich Lane <rlane@bigswitch.com> Mon Mar 11 22:34:59 2013 -0700
committer Rich Lane <rlane@bigswitch.com> Tue Mar 12 11:04:30 2013 -0700
tree 03f230bf6dddd94ea0bab08bf171ad1ba1f18bff
parent e6b794f4ac4cbe0bea1c312e5135e0cc29227fec

loxi-prep: rename users of ofp_match

src/python/of10/__init__.py

diff --git a/src/python/of10/__init__.py b/src/python/of10/__init__.py
index 1de296a..26dbd76 100644
--- a/src/python/of10/__init__.py
+++ b/src/python/of10/__init__.py
@@ -13,3 +13,5 @@
 # Allow accessing submodules without additional imports
 import action
 import message
+
+match = ofp_match

src/python/oftest/parse.py

diff --git a/src/python/oftest/parse.py b/src/python/oftest/parse.py
index 0005313..17a3573 100644
--- a/src/python/oftest/parse.py
+++ b/src/python/oftest/parse.py
@@ -126,7 +126,7 @@
         logging.error("packet_to_flow_match: Classify error")
         return None
 
-    match = ofp.ofp_match()
+    match = ofp.match()
     match.wildcards = ofp.OFPFW_ALL
     #@todo Check if packet is other than L2 format
     match.eth_dst = parse_mac(ether.dst)

src/python/oftest/testutils.py

diff --git a/src/python/oftest/testutils.py b/src/python/oftest/testutils.py
index 684703d..969fdc4 100644
--- a/src/python/oftest/testutils.py
+++ b/src/python/oftest/testutils.py
@@ -1002,7 +1002,7 @@
     lookups, matched
     """
     stat_req = of10.message.aggregate_stats_request()
-    stat_req.match = of10.ofp_match()
+    stat_req.match = of10.match()
     stat_req.match.wildcards = of10.OFPFW_ALL
     stat_req.table_id = 0xff
     stat_req.out_port = of10.OFPP_NONE

tests/flow_query.py

diff --git a/tests/flow_query.py b/tests/flow_query.py
index 49b1a9b..e7f1718 100644
--- a/tests/flow_query.py
+++ b/tests/flow_query.py
@@ -336,7 +336,7 @@
 
     def __init__(self):
         self.priority        = 0
-        self.match           = ofp.ofp_match()
+        self.match           = ofp.match()
         self.match.wildcards = ofp.OFPFW_ALL
         self.idle_timeout    = 0
         self.hard_timeout    = 0
@@ -1319,7 +1319,7 @@
 
     def flow_stats_get(self, limit = 10000):
         request = ofp.message.flow_stats_request()
-        query_match           = ofp.ofp_match()
+        query_match           = ofp.match()
         query_match.wildcards = ofp.OFPFW_ALL
         request.match    = query_match
         request.table_id = 0xff

tests/flow_stats.py

diff --git a/tests/flow_stats.py b/tests/flow_stats.py
index 906ad4e..63911e6 100644
--- a/tests/flow_stats.py
+++ b/tests/flow_stats.py
@@ -411,7 +411,7 @@
     """
     def runTest(self):
         delete_all_flows(self.controller)
-        match = ofp.ofp_match()
+        match = ofp.match()
         match.wildcards = 0
         stat_req = ofp.message.flow_stats_request()
         stat_req.match = match
@@ -431,7 +431,7 @@
     """
     def runTest(self):
         delete_all_flows(self.controller)
-        match = ofp.ofp_match()
+        match = ofp.match()
         match.wildcards = 0
         stat_req = ofp.message.aggregate_stats_request()
         stat_req.match = match

tests/load.py

diff --git a/tests/load.py b/tests/load.py
index 58471e4..51d8661 100644
--- a/tests/load.py
+++ b/tests/load.py
@@ -209,7 +209,7 @@
 
         requests = []
         for i in range(num_flows):
-            match = ofp.ofp_match()
+            match = ofp.match()
             match.wildcards = ofp.OFPFW_ALL & ~ofp.OFPFW_DL_VLAN & ~ofp.OFPFW_DL_DST
             match.vlan_vid = ofp.OFP_VLAN_NONE
             match.eth_dst = [0, 1, 2, 3, i / 256, i % 256]

tests/pktact.py

diff --git a/tests/pktact.py b/tests/pktact.py
index 09f4d4b..829a90e 100644
--- a/tests/pktact.py
+++ b/tests/pktact.py
@@ -2014,7 +2014,7 @@
         # - action
 
     def createMatch(self, **kwargs):
-        match = ofp.ofp_match()
+        match = ofp.match()
         match.wildcards = ofp.OFPFW_ALL
         fields = {
             'eth_dst': ofp.OFPFW_DL_DST,