update pyloxi to floodlight/loxigen-artifacts @ cb7d6d4063ed4d311d105e20f0844a54c4bd9916
diff --git a/src/python/loxi/of12/instruction.py b/src/python/loxi/of12/instruction.py
index 915035d..38f8670 100644
--- a/src/python/loxi/of12/instruction.py
+++ b/src/python/loxi/of12/instruction.py
@@ -8,15 +8,12 @@
import struct
import loxi
-import const
-import action
-import oxm
-import message
-import instruction
-import common
import util
import loxi.generic_util
+import sys
+ofp = sys.modules['loxi.of12']
+
class instruction(loxi.OFObject):
subtypes = {}
@@ -95,7 +92,7 @@
orig_reader = reader
reader = orig_reader.slice(_len, 4)
reader.skip(4)
- 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):
@@ -294,7 +291,7 @@
orig_reader = reader
reader = orig_reader.slice(_len, 4)
reader.skip(4)
- 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):