commit 7c7342aacc146b200e3c4def63c5280ed7adb4b9
author Rich Lane <rlane@bigswitch.com> Mon Mar 11 14:16:58 2013 -0700
committer Rich Lane <rlane@bigswitch.com> Tue Mar 12 10:45:56 2013 -0700
tree a8c2c9f4e92e0a5efb278b579d882d6e42a6120b
parent 4e361bb5b280268aab5cab94fadfc01e0d94555e

loxi-prep: rename stats request/type field 'type' to 'stats_type'

src/python/of10/cstruct.py

diff --git a/src/python/of10/cstruct.py b/src/python/of10/cstruct.py
index eb341a4..3d2c638 100644
--- a/src/python/of10/cstruct.py
+++ b/src/python/of10/cstruct.py
@@ -797,7 +797,7 @@
         """Initialize
         Declare members and default values
         """
-        self.type = 0
+        self.stats_type = 0
         self.flags = 0
 
     def __assert(self):
@@ -813,7 +813,7 @@
             if(not self.__assert()[0]):
                 return None
         packed = ""
-        packed += struct.pack("!HH", self.type, self.flags)
+        packed += struct.pack("!HH", self.stats_type, self.flags)
         return packed
 
     def unpack(self, binaryString):
@@ -826,7 +826,7 @@
         fmt = '!HH'
         start = 0
         end = start + struct.calcsize(fmt)
-        (self.type, self.flags) = struct.unpack(fmt,  binaryString[start:end])
+        (self.stats_type, self.flags) = struct.unpack(fmt,  binaryString[start:end])
         return binaryString[4:]
 
     def __len__(self):
@@ -839,7 +839,7 @@
         """Return True if self and other have same values
         """
         if type(self) != type(other): return False
-        if self.type !=  other.type: return False
+        if self.stats_type !=  other.stats_type: return False
         if self.flags !=  other.flags: return False
         return True
 
@@ -849,7 +849,7 @@
         """Generate string showing basic members of structure
         """
         outstr = ''
-        outstr += prefix + 'type: ' + str(self.type) + '\n'
+        outstr += prefix + 'stats_type: ' + str(self.stats_type) + '\n'
         outstr += prefix + 'flags: ' + str(self.flags) + '\n'
         return outstr
 
@@ -2010,7 +2010,7 @@
         """Initialize
         Declare members and default values
         """
-        self.type = 0
+        self.stats_type = 0
         self.flags = 0
 
     def __assert(self):
@@ -2026,7 +2026,7 @@
             if(not self.__assert()[0]):
                 return None
         packed = ""
-        packed += struct.pack("!HH", self.type, self.flags)
+        packed += struct.pack("!HH", self.stats_type, self.flags)
         return packed
 
     def unpack(self, binaryString):
@@ -2039,7 +2039,7 @@
         fmt = '!HH'
         start = 0
         end = start + struct.calcsize(fmt)
-        (self.type, self.flags) = struct.unpack(fmt,  binaryString[start:end])
+        (self.stats_type, self.flags) = struct.unpack(fmt,  binaryString[start:end])
         return binaryString[4:]
 
     def __len__(self):
@@ -2052,7 +2052,7 @@
         """Return True if self and other have same values
         """
         if type(self) != type(other): return False
-        if self.type !=  other.type: return False
+        if self.stats_type !=  other.stats_type: return False
         if self.flags !=  other.flags: return False
         return True
 
@@ -2062,7 +2062,7 @@
         """Generate string showing basic members of structure
         """
         outstr = ''
-        outstr += prefix + 'type: ' + str(self.type) + '\n'
+        outstr += prefix + 'stats_type: ' + str(self.stats_type) + '\n'
         outstr += prefix + 'flags: ' + str(self.flags) + '\n'
         return outstr