loxi-prep: rename stats reply 'stats' field to 'entries' to match PyLoxi
diff --git a/src/python/of10/message.py b/src/python/of10/message.py
index 849c15a..76d7d30 100644
--- a/src/python/of10/message.py
+++ b/src/python/of10/message.py
@@ -2749,13 +2749,13 @@
self.header.type = OFPT_STATS_REPLY
self.type = OFPST_AGGREGATE
# stats: Array of type aggregate_stats_entry
- self.stats = []
+ self.entries = []
def pack(self, assertstruct=True):
self.header.length = len(self)
packed = self.header.pack()
packed += ofp_stats_reply.pack(self)
- for obj in self.stats:
+ for obj in self.entries:
packed += obj.pack()
return packed
@@ -2766,14 +2766,14 @@
while len(binary_string) >= len(dummy):
obj = aggregate_stats_entry()
binary_string = obj.unpack(binary_string)
- self.stats.append(obj)
+ self.entries.append(obj)
if len(binary_string) != 0:
print "ERROR unpacking aggregate stats string: extra bytes"
return binary_string
def __len__(self):
length = len(self.header) + OFP_STATS_REPLY_BYTES
- for obj in self.stats:
+ for obj in self.entries:
length += len(obj)
return length
@@ -2782,8 +2782,8 @@
outstr += prefix + "ofp header:\n"
outstr += self.header.show(prefix + ' ')
outstr += ofp_stats_reply.show(self)
- outstr += prefix + "Stats array of length " + str(len(self.stats)) + '\n'
- for obj in self.stats:
+ outstr += prefix + "Stats array of length " + str(len(self.entries)) + '\n'
+ for obj in self.entries:
outstr += obj.show()
return outstr
@@ -2791,7 +2791,7 @@
if type(self) != type(other): return False
return (self.header == other.header and
ofp_stats_reply.__eq__(self, other) and
- self.stats == other.stats)
+ self.entries == other.entries)
def __ne__(self, other): return not self.__eq__(other)
@@ -2858,13 +2858,13 @@
self.header.type = OFPT_STATS_REPLY
self.type = OFPST_DESC
# stats: Array of type desc_stats_entry
- self.stats = []
+ self.entries = []
def pack(self, assertstruct=True):
self.header.length = len(self)
packed = self.header.pack()
packed += ofp_stats_reply.pack(self)
- for obj in self.stats:
+ for obj in self.entries:
packed += obj.pack()
return packed
@@ -2875,14 +2875,14 @@
while len(binary_string) >= len(dummy):
obj = desc_stats_entry()
binary_string = obj.unpack(binary_string)
- self.stats.append(obj)
+ self.entries.append(obj)
if len(binary_string) != 0:
print "ERROR unpacking desc stats string: extra bytes"
return binary_string
def __len__(self):
length = len(self.header) + OFP_STATS_REPLY_BYTES
- for obj in self.stats:
+ for obj in self.entries:
length += len(obj)
return length
@@ -2891,8 +2891,8 @@
outstr += prefix + "ofp header:\n"
outstr += self.header.show(prefix + ' ')
outstr += ofp_stats_reply.show(self)
- outstr += prefix + "Stats array of length " + str(len(self.stats)) + '\n'
- for obj in self.stats:
+ outstr += prefix + "Stats array of length " + str(len(self.entries)) + '\n'
+ for obj in self.entries:
outstr += obj.show()
return outstr
@@ -2900,7 +2900,7 @@
if type(self) != type(other): return False
return (self.header == other.header and
ofp_stats_reply.__eq__(self, other) and
- self.stats == other.stats)
+ self.entries == other.entries)
def __ne__(self, other): return not self.__eq__(other)
@@ -2967,13 +2967,13 @@
self.header.type = OFPT_STATS_REPLY
self.type = OFPST_FLOW
# stats: Array of type flow_stats_entry
- self.stats = []
+ self.entries = []
def pack(self, assertstruct=True):
self.header.length = len(self)
packed = self.header.pack()
packed += ofp_stats_reply.pack(self)
- for obj in self.stats:
+ for obj in self.entries:
packed += obj.pack()
return packed
@@ -2984,14 +2984,14 @@
while len(binary_string) >= len(dummy):
obj = flow_stats_entry()
binary_string = obj.unpack(binary_string)
- self.stats.append(obj)
+ self.entries.append(obj)
if len(binary_string) != 0:
print "ERROR unpacking flow stats string: extra bytes"
return binary_string
def __len__(self):
length = len(self.header) + OFP_STATS_REPLY_BYTES
- for obj in self.stats:
+ for obj in self.entries:
length += len(obj)
return length
@@ -3000,8 +3000,8 @@
outstr += prefix + "ofp header:\n"
outstr += self.header.show(prefix + ' ')
outstr += ofp_stats_reply.show(self)
- outstr += prefix + "Stats array of length " + str(len(self.stats)) + '\n'
- for obj in self.stats:
+ outstr += prefix + "Stats array of length " + str(len(self.entries)) + '\n'
+ for obj in self.entries:
outstr += obj.show()
return outstr
@@ -3009,7 +3009,7 @@
if type(self) != type(other): return False
return (self.header == other.header and
ofp_stats_reply.__eq__(self, other) and
- self.stats == other.stats)
+ self.entries == other.entries)
def __ne__(self, other): return not self.__eq__(other)
@@ -3076,13 +3076,13 @@
self.header.type = OFPT_STATS_REPLY
self.type = OFPST_PORT
# stats: Array of type port_stats_entry
- self.stats = []
+ self.entries = []
def pack(self, assertstruct=True):
self.header.length = len(self)
packed = self.header.pack()
packed += ofp_stats_reply.pack(self)
- for obj in self.stats:
+ for obj in self.entries:
packed += obj.pack()
return packed
@@ -3093,14 +3093,14 @@
while len(binary_string) >= len(dummy):
obj = port_stats_entry()
binary_string = obj.unpack(binary_string)
- self.stats.append(obj)
+ self.entries.append(obj)
if len(binary_string) != 0:
print "ERROR unpacking port stats string: extra bytes"
return binary_string
def __len__(self):
length = len(self.header) + OFP_STATS_REPLY_BYTES
- for obj in self.stats:
+ for obj in self.entries:
length += len(obj)
return length
@@ -3109,8 +3109,8 @@
outstr += prefix + "ofp header:\n"
outstr += self.header.show(prefix + ' ')
outstr += ofp_stats_reply.show(self)
- outstr += prefix + "Stats array of length " + str(len(self.stats)) + '\n'
- for obj in self.stats:
+ outstr += prefix + "Stats array of length " + str(len(self.entries)) + '\n'
+ for obj in self.entries:
outstr += obj.show()
return outstr
@@ -3118,7 +3118,7 @@
if type(self) != type(other): return False
return (self.header == other.header and
ofp_stats_reply.__eq__(self, other) and
- self.stats == other.stats)
+ self.entries == other.entries)
def __ne__(self, other): return not self.__eq__(other)
@@ -3185,13 +3185,13 @@
self.header.type = OFPT_STATS_REPLY
self.type = OFPST_QUEUE
# stats: Array of type queue_stats_entry
- self.stats = []
+ self.entries = []
def pack(self, assertstruct=True):
self.header.length = len(self)
packed = self.header.pack()
packed += ofp_stats_reply.pack(self)
- for obj in self.stats:
+ for obj in self.entries:
packed += obj.pack()
return packed
@@ -3202,14 +3202,14 @@
while len(binary_string) >= len(dummy):
obj = queue_stats_entry()
binary_string = obj.unpack(binary_string)
- self.stats.append(obj)
+ self.entries.append(obj)
if len(binary_string) != 0:
print "ERROR unpacking queue stats string: extra bytes"
return binary_string
def __len__(self):
length = len(self.header) + OFP_STATS_REPLY_BYTES
- for obj in self.stats:
+ for obj in self.entries:
length += len(obj)
return length
@@ -3218,8 +3218,8 @@
outstr += prefix + "ofp header:\n"
outstr += self.header.show(prefix + ' ')
outstr += ofp_stats_reply.show(self)
- outstr += prefix + "Stats array of length " + str(len(self.stats)) + '\n'
- for obj in self.stats:
+ outstr += prefix + "Stats array of length " + str(len(self.entries)) + '\n'
+ for obj in self.entries:
outstr += obj.show()
return outstr
@@ -3227,7 +3227,7 @@
if type(self) != type(other): return False
return (self.header == other.header and
ofp_stats_reply.__eq__(self, other) and
- self.stats == other.stats)
+ self.entries == other.entries)
def __ne__(self, other): return not self.__eq__(other)
@@ -3294,13 +3294,13 @@
self.header.type = OFPT_STATS_REPLY
self.type = OFPST_TABLE
# stats: Array of type table_stats_entry
- self.stats = []
+ self.entries = []
def pack(self, assertstruct=True):
self.header.length = len(self)
packed = self.header.pack()
packed += ofp_stats_reply.pack(self)
- for obj in self.stats:
+ for obj in self.entries:
packed += obj.pack()
return packed
@@ -3311,14 +3311,14 @@
while len(binary_string) >= len(dummy):
obj = table_stats_entry()
binary_string = obj.unpack(binary_string)
- self.stats.append(obj)
+ self.entries.append(obj)
if len(binary_string) != 0:
print "ERROR unpacking table stats string: extra bytes"
return binary_string
def __len__(self):
length = len(self.header) + OFP_STATS_REPLY_BYTES
- for obj in self.stats:
+ for obj in self.entries:
length += len(obj)
return length
@@ -3327,8 +3327,8 @@
outstr += prefix + "ofp header:\n"
outstr += self.header.show(prefix + ' ')
outstr += ofp_stats_reply.show(self)
- outstr += prefix + "Stats array of length " + str(len(self.stats)) + '\n'
- for obj in self.stats:
+ outstr += prefix + "Stats array of length " + str(len(self.entries)) + '\n'
+ for obj in self.entries:
outstr += obj.show()
return outstr
@@ -3336,7 +3336,7 @@
if type(self) != type(other): return False
return (self.header == other.header and
ofp_stats_reply.__eq__(self, other) and
- self.stats == other.stats)
+ self.entries == other.entries)
def __ne__(self, other): return not self.__eq__(other)
diff --git a/src/python/oftest/testutils.py b/src/python/oftest/testutils.py
index 1aacf63..a14eab1 100644
--- a/src/python/oftest/testutils.py
+++ b/src/python/oftest/testutils.py
@@ -1011,9 +1011,9 @@
rv = {}
(reply, pkt) = parent.controller.transact(stat_req)
- parent.assertTrue(len(reply.stats) == 1, "Did not receive flow stats reply")
+ parent.assertTrue(len(reply.entries) == 1, "Did not receive flow stats reply")
- for obj in reply.stats:
+ for obj in reply.entries:
(rv["flows"], rv["packets"], rv["bytes"]) = (obj.flow_count,
obj.packet_count, obj.byte_count)
break
@@ -1023,7 +1023,7 @@
(rv["active"], rv["lookups"], rv["matched"]) = (0,0,0)
- for obj in reply.stats:
+ for obj in reply.entries:
rv["active"] += obj.active_count
rv["lookups"] += obj.lookup_count
rv["matched"] += obj.matched_count
@@ -1147,11 +1147,11 @@
stats = []
reply, _ = test.controller.transact(req)
test.assertTrue(reply is not None, "No response to stats request")
- stats.extend(reply.stats)
+ stats.extend(reply.entries)
while reply.flags & of10.OFPSF_REPLY_MORE != 0:
reply, pkt = self.controller.poll(exp_msg=of10.OFPT_STATS_REPLY)
test.assertTrue(reply is not None, "No response to stats request")
- stats.extend(reply.stats)
+ stats.extend(reply.entries)
return stats
def get_flow_stats(test, match, table_id=0xff, out_port=of10.OFPP_NONE):