commit c0378a9513300c75865b004b55b6419d23c68d6c
author Harshmeet Singh <harshmeet.singh@bigswitch.com> Tue Jul 22 17:09:36 2014 -0700
committer Harshmeet Singh <harshmeet.singh@bigswitch.com> Tue Jul 22 17:09:36 2014 -0700
tree 90ed328028a4e993eb3a1e8c1107e5440f41af0d
parent 0d2d36e9bf89ec2d4f8d8a68edf874e93e436549

update loxi to include disable_vlan_counters

src/python/loxi/of11/message.py

diff --git a/src/python/loxi/of11/message.py b/src/python/loxi/of11/message.py
index 7a9f74c..d856678 100644
--- a/src/python/loxi/of11/message.py
+++ b/src/python/loxi/of11/message.py
@@ -968,7 +968,7 @@
     version = 2
     type = 4
 
-    def __init__(self, xid=None, experimenter=None, subtype=None, data=None):
+    def __init__(self, xid=None, experimenter=None, data=None):
         if xid != None:
             self.xid = xid
         else:
@@ -977,10 +977,6 @@
             self.experimenter = experimenter
         else:
             self.experimenter = 0
-        if subtype != None:
-            self.subtype = subtype
-        else:
-            self.subtype = 0
         if data != None:
             self.data = data
         else:
@@ -994,7 +990,6 @@
         packed.append(struct.pack("!H", 0)) # placeholder for length at index 2
         packed.append(struct.pack("!L", self.xid))
         packed.append(struct.pack("!L", self.experimenter))
-        packed.append(struct.pack("!L", self.subtype))
         packed.append(self.data)
         length = sum([len(x) for x in packed])
         packed[2] = struct.pack("!H", length)
@@ -1017,7 +1012,6 @@
         reader = orig_reader.slice(_length - (2 + 2))
         obj.xid = reader.read("!L")[0]
         obj.experimenter = reader.read("!L")[0]
-        obj.subtype = reader.read("!L")[0]
         obj.data = str(reader.read_all())
         return obj
 
@@ -1025,7 +1019,6 @@
         if type(self) != type(other): return False
         if self.xid != other.xid: return False
         if self.experimenter != other.experimenter: return False
-        if self.subtype != other.subtype: return False
         if self.data != other.data: return False
         return True
 
@@ -1040,9 +1033,6 @@
                 else:
                     q.text('None')
                 q.text(","); q.breakable()
-                q.text("subtype = ");
-                q.text("%#x" % self.subtype)
-                q.text(","); q.breakable()
                 q.text("data = ");
                 q.pp(self.data)
             q.breakable()