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