update pyloxi to floodlight/loxigen-artifacts @ cb7d6d4063ed4d311d105e20f0844a54c4bd9916
diff --git a/src/python/loxi/of10/common.py b/src/python/loxi/of10/common.py
index 82916d6..98eb158 100644
--- a/src/python/loxi/of10/common.py
+++ b/src/python/loxi/of10/common.py
@@ -8,13 +8,12 @@
import struct
import loxi
-import const
-import action
-import message
-import common
import util
import loxi.generic_util
+import sys
+ofp = sys.modules['loxi.of10']
+
class bsn_interface(loxi.OFObject):
def __init__(self, hw_addr=None, name=None, ipv4_addr=None, ipv4_netmask=None):
@@ -396,7 +395,7 @@
if match != None:
self.match = match
else:
- self.match = common.match()
+ self.match = ofp.match()
if duration_sec != None:
self.duration_sec = duration_sec
else:
@@ -463,7 +462,7 @@
reader = orig_reader.slice(_length, 2)
obj.table_id = reader.read("!B")[0]
reader.skip(1)
- obj.match = common.match.unpack(reader)
+ obj.match = ofp.match.unpack(reader)
obj.duration_sec = reader.read("!L")[0]
obj.duration_nsec = reader.read("!L")[0]
obj.priority = reader.read("!H")[0]
@@ -473,7 +472,7 @@
obj.cookie = reader.read("!Q")[0]
obj.packet_count = reader.read("!Q")[0]
obj.byte_count = reader.read("!Q")[0]
- obj.actions = loxi.generic_util.unpack_list(reader, action.action.unpack)
+ obj.actions = loxi.generic_util.unpack_list(reader, ofp.action.action.unpack)
return obj
def __eq__(self, other):
@@ -723,7 +722,7 @@
orig_reader = reader
reader = orig_reader.slice(_len, 6)
reader.skip(2)
- obj.properties = loxi.generic_util.unpack_list(reader, common.queue_prop.unpack)
+ obj.properties = loxi.generic_util.unpack_list(reader, ofp.common.queue_prop.unpack)
return obj
def __eq__(self, other):