update pyloxi to floodlight/loxigen-artifacts @ cb7d6d4063ed4d311d105e20f0844a54c4bd9916
diff --git a/src/python/loxi/of14/action.py b/src/python/loxi/of14/action.py
index 21a00b9..5a9317a 100644
--- a/src/python/loxi/of14/action.py
+++ b/src/python/loxi/of14/action.py
@@ -8,28 +8,12 @@
import struct
import loxi
-import const
-import port_desc_prop
-import bsn_tlv
-import meter_band
-import table_mod_prop
-import instruction
-import queue_desc_prop
-import oxm
-import bundle_prop
-import common
-import instruction_id
-import action
-import role_prop
-import message
-import queue_stats_prop
-import port_stats_prop
-import port_mod_prop
-import async_config_prop
-import action_id
import util
import loxi.generic_util
+import sys
+ofp = sys.modules['loxi.of14']
+
class action(loxi.OFObject):
subtypes = {}
@@ -296,7 +280,7 @@
_subtype = reader.read("!L")[0]
assert(_subtype == 5)
obj.table_id = reader.read("!L")[0]
- obj.key = loxi.generic_util.unpack_list(reader, bsn_tlv.bsn_tlv.unpack)
+ obj.key = loxi.generic_util.unpack_list(reader, ofp.bsn_tlv.bsn_tlv.unpack)
return obj
def __eq__(self, other):
@@ -1133,7 +1117,7 @@
_len = reader.read("!H")[0]
orig_reader = reader
reader = orig_reader.slice(_len, 4)
- obj.field = oxm.oxm.unpack(reader)
+ obj.field = ofp.oxm.oxm.unpack(reader)
return obj
def __eq__(self, other):