loxi-prep: rename users of ofp_match
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
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
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]
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,