update pyloxi to 026ff024585f1588a7f11fa4c1a9a48d44dc098d
diff --git a/src/python/loxi/of11/action.py b/src/python/loxi/of11/action.py
index 644319d..06f6695 100644
--- a/src/python/loxi/of11/action.py
+++ b/src/python/loxi/of11/action.py
@@ -3,27 +3,60 @@
# Copyright (c) 2012, 2013 Big Switch Networks, Inc.
# See the file LICENSE.pyloxi which should have been included in the source distribution
-# Automatically generated by LOXI from template action.py
+# Automatically generated by LOXI from template module.py
# Do not modify
import struct
+import loxi
import const
+import common
+import action
+import instruction
import util
import loxi.generic_util
-import loxi
-def unpack_list(reader):
- def deserializer(reader, typ):
- parser = parsers.get(typ)
- if not parser: raise loxi.ProtocolError("unknown action type %d" % typ)
- return parser(reader)
- return loxi.generic_util.unpack_list_tlv16(reader, deserializer)
+class action(loxi.OFObject):
+ subtypes = {}
-class Action(object):
- type = None # override in subclass
- pass
+ @staticmethod
+ def unpack(reader):
+ subtype, = reader.peek('!H', 0)
+ try:
+ subclass = action.subtypes[subtype]
+ except KeyError:
+ raise loxi.ProtocolError("unknown action subtype %#x" % subtype)
+ return subclass.unpack(reader)
-class bsn_mirror(Action):
+
+class experimenter(action):
+ subtypes = {}
+
+ @staticmethod
+ def unpack(reader):
+ subtype, = reader.peek('!L', 4)
+ try:
+ subclass = experimenter.subtypes[subtype]
+ except KeyError:
+ raise loxi.ProtocolError("unknown experimenter action subtype %#x" % subtype)
+ return subclass.unpack(reader)
+
+action.subtypes[65535] = experimenter
+
+class bsn(experimenter):
+ subtypes = {}
+
+ @staticmethod
+ def unpack(reader):
+ subtype, = reader.peek('!L', 8)
+ try:
+ subclass = bsn.subtypes[subtype]
+ except KeyError:
+ raise loxi.ProtocolError("unknown bsn experimenter action subtype %#x" % subtype)
+ return subclass.unpack(reader)
+
+experimenter.subtypes[6035143] = bsn
+
+class bsn_mirror(bsn):
type = 65535
experimenter = 6035143
subtype = 1
@@ -58,15 +91,13 @@
return ''.join(packed)
@staticmethod
- def unpack(buf):
+ def unpack(reader):
obj = bsn_mirror()
- if type(buf) == loxi.generic_util.OFReader:
- reader = buf
- else:
- reader = loxi.generic_util.OFReader(buf)
_type = reader.read("!H")[0]
assert(_type == 65535)
_len = reader.read("!H")[0]
+ orig_reader = reader
+ reader = orig_reader.slice(_len - (2 + 2))
_experimenter = reader.read("!L")[0]
assert(_experimenter == 6035143)
_subtype = reader.read("!L")[0]
@@ -84,13 +115,6 @@
if self.copy_stage != other.copy_stage: return False
return True
- def __ne__(self, other):
- return not self.__eq__(other)
-
- def show(self):
- import loxi.pp
- return loxi.pp.pp(self)
-
def pretty_print(self, q):
q.text("bsn_mirror {")
with q.group():
@@ -107,7 +131,9 @@
q.breakable()
q.text('}')
-class bsn_set_tunnel_dst(Action):
+bsn.subtypes[1] = bsn_mirror
+
+class bsn_set_tunnel_dst(bsn):
type = 65535
experimenter = 6035143
subtype = 2
@@ -131,15 +157,13 @@
return ''.join(packed)
@staticmethod
- def unpack(buf):
+ def unpack(reader):
obj = bsn_set_tunnel_dst()
- if type(buf) == loxi.generic_util.OFReader:
- reader = buf
- else:
- reader = loxi.generic_util.OFReader(buf)
_type = reader.read("!H")[0]
assert(_type == 65535)
_len = reader.read("!H")[0]
+ orig_reader = reader
+ reader = orig_reader.slice(_len - (2 + 2))
_experimenter = reader.read("!L")[0]
assert(_experimenter == 6035143)
_subtype = reader.read("!L")[0]
@@ -152,13 +176,6 @@
if self.dst != other.dst: return False
return True
- def __ne__(self, other):
- return not self.__eq__(other)
-
- def show(self):
- import loxi.pp
- return loxi.pp.pp(self)
-
def pretty_print(self, q):
q.text("bsn_set_tunnel_dst {")
with q.group():
@@ -169,7 +186,9 @@
q.breakable()
q.text('}')
-class copy_ttl_in(Action):
+bsn.subtypes[2] = bsn_set_tunnel_dst
+
+class copy_ttl_in(action):
type = 12
def __init__(self):
@@ -185,15 +204,13 @@
return ''.join(packed)
@staticmethod
- def unpack(buf):
+ def unpack(reader):
obj = copy_ttl_in()
- if type(buf) == loxi.generic_util.OFReader:
- reader = buf
- else:
- reader = loxi.generic_util.OFReader(buf)
_type = reader.read("!H")[0]
assert(_type == 12)
_len = reader.read("!H")[0]
+ orig_reader = reader
+ reader = orig_reader.slice(_len - (2 + 2))
reader.skip(4)
return obj
@@ -201,13 +218,6 @@
if type(self) != type(other): return False
return True
- def __ne__(self, other):
- return not self.__eq__(other)
-
- def show(self):
- import loxi.pp
- return loxi.pp.pp(self)
-
def pretty_print(self, q):
q.text("copy_ttl_in {")
with q.group():
@@ -216,7 +226,9 @@
q.breakable()
q.text('}')
-class copy_ttl_out(Action):
+action.subtypes[12] = copy_ttl_in
+
+class copy_ttl_out(action):
type = 11
def __init__(self):
@@ -232,15 +244,13 @@
return ''.join(packed)
@staticmethod
- def unpack(buf):
+ def unpack(reader):
obj = copy_ttl_out()
- if type(buf) == loxi.generic_util.OFReader:
- reader = buf
- else:
- reader = loxi.generic_util.OFReader(buf)
_type = reader.read("!H")[0]
assert(_type == 11)
_len = reader.read("!H")[0]
+ orig_reader = reader
+ reader = orig_reader.slice(_len - (2 + 2))
reader.skip(4)
return obj
@@ -248,13 +258,6 @@
if type(self) != type(other): return False
return True
- def __ne__(self, other):
- return not self.__eq__(other)
-
- def show(self):
- import loxi.pp
- return loxi.pp.pp(self)
-
def pretty_print(self, q):
q.text("copy_ttl_out {")
with q.group():
@@ -263,7 +266,9 @@
q.breakable()
q.text('}')
-class dec_mpls_ttl(Action):
+action.subtypes[11] = copy_ttl_out
+
+class dec_mpls_ttl(action):
type = 16
def __init__(self):
@@ -279,15 +284,13 @@
return ''.join(packed)
@staticmethod
- def unpack(buf):
+ def unpack(reader):
obj = dec_mpls_ttl()
- if type(buf) == loxi.generic_util.OFReader:
- reader = buf
- else:
- reader = loxi.generic_util.OFReader(buf)
_type = reader.read("!H")[0]
assert(_type == 16)
_len = reader.read("!H")[0]
+ orig_reader = reader
+ reader = orig_reader.slice(_len - (2 + 2))
reader.skip(4)
return obj
@@ -295,13 +298,6 @@
if type(self) != type(other): return False
return True
- def __ne__(self, other):
- return not self.__eq__(other)
-
- def show(self):
- import loxi.pp
- return loxi.pp.pp(self)
-
def pretty_print(self, q):
q.text("dec_mpls_ttl {")
with q.group():
@@ -310,7 +306,9 @@
q.breakable()
q.text('}')
-class dec_nw_ttl(Action):
+action.subtypes[16] = dec_mpls_ttl
+
+class dec_nw_ttl(action):
type = 24
def __init__(self):
@@ -326,15 +324,13 @@
return ''.join(packed)
@staticmethod
- def unpack(buf):
+ def unpack(reader):
obj = dec_nw_ttl()
- if type(buf) == loxi.generic_util.OFReader:
- reader = buf
- else:
- reader = loxi.generic_util.OFReader(buf)
_type = reader.read("!H")[0]
assert(_type == 24)
_len = reader.read("!H")[0]
+ orig_reader = reader
+ reader = orig_reader.slice(_len - (2 + 2))
reader.skip(4)
return obj
@@ -342,13 +338,6 @@
if type(self) != type(other): return False
return True
- def __ne__(self, other):
- return not self.__eq__(other)
-
- def show(self):
- import loxi.pp
- return loxi.pp.pp(self)
-
def pretty_print(self, q):
q.text("dec_nw_ttl {")
with q.group():
@@ -357,7 +346,9 @@
q.breakable()
q.text('}')
-class group(Action):
+action.subtypes[24] = dec_nw_ttl
+
+class group(action):
type = 22
def __init__(self, group_id=None):
@@ -377,15 +368,13 @@
return ''.join(packed)
@staticmethod
- def unpack(buf):
+ def unpack(reader):
obj = group()
- if type(buf) == loxi.generic_util.OFReader:
- reader = buf
- else:
- reader = loxi.generic_util.OFReader(buf)
_type = reader.read("!H")[0]
assert(_type == 22)
_len = reader.read("!H")[0]
+ orig_reader = reader
+ reader = orig_reader.slice(_len - (2 + 2))
obj.group_id = reader.read("!L")[0]
return obj
@@ -394,13 +383,6 @@
if self.group_id != other.group_id: return False
return True
- def __ne__(self, other):
- return not self.__eq__(other)
-
- def show(self):
- import loxi.pp
- return loxi.pp.pp(self)
-
def pretty_print(self, q):
q.text("group {")
with q.group():
@@ -411,7 +393,23 @@
q.breakable()
q.text('}')
-class nicira_dec_ttl(Action):
+action.subtypes[22] = group
+
+class nicira(experimenter):
+ subtypes = {}
+
+ @staticmethod
+ def unpack(reader):
+ subtype, = reader.peek('!H', 8)
+ try:
+ subclass = nicira.subtypes[subtype]
+ except KeyError:
+ raise loxi.ProtocolError("unknown nicira experimenter action subtype %#x" % subtype)
+ return subclass.unpack(reader)
+
+experimenter.subtypes[8992] = nicira
+
+class nicira_dec_ttl(nicira):
type = 65535
experimenter = 8992
subtype = 18
@@ -432,15 +430,13 @@
return ''.join(packed)
@staticmethod
- def unpack(buf):
+ def unpack(reader):
obj = nicira_dec_ttl()
- if type(buf) == loxi.generic_util.OFReader:
- reader = buf
- else:
- reader = loxi.generic_util.OFReader(buf)
_type = reader.read("!H")[0]
assert(_type == 65535)
_len = reader.read("!H")[0]
+ orig_reader = reader
+ reader = orig_reader.slice(_len - (2 + 2))
_experimenter = reader.read("!L")[0]
assert(_experimenter == 8992)
_subtype = reader.read("!H")[0]
@@ -453,13 +449,6 @@
if type(self) != type(other): return False
return True
- def __ne__(self, other):
- return not self.__eq__(other)
-
- def show(self):
- import loxi.pp
- return loxi.pp.pp(self)
-
def pretty_print(self, q):
q.text("nicira_dec_ttl {")
with q.group():
@@ -468,7 +457,9 @@
q.breakable()
q.text('}')
-class output(Action):
+nicira.subtypes[18] = nicira_dec_ttl
+
+class output(action):
type = 0
def __init__(self, port=None, max_len=None):
@@ -494,15 +485,13 @@
return ''.join(packed)
@staticmethod
- def unpack(buf):
+ def unpack(reader):
obj = output()
- if type(buf) == loxi.generic_util.OFReader:
- reader = buf
- else:
- reader = loxi.generic_util.OFReader(buf)
_type = reader.read("!H")[0]
assert(_type == 0)
_len = reader.read("!H")[0]
+ orig_reader = reader
+ reader = orig_reader.slice(_len - (2 + 2))
obj.port = util.unpack_port_no(reader)
obj.max_len = reader.read("!H")[0]
reader.skip(6)
@@ -514,13 +503,6 @@
if self.max_len != other.max_len: return False
return True
- def __ne__(self, other):
- return not self.__eq__(other)
-
- def show(self):
- import loxi.pp
- return loxi.pp.pp(self)
-
def pretty_print(self, q):
q.text("output {")
with q.group():
@@ -534,7 +516,9 @@
q.breakable()
q.text('}')
-class pop_mpls(Action):
+action.subtypes[0] = output
+
+class pop_mpls(action):
type = 20
def __init__(self, ethertype=None):
@@ -555,15 +539,13 @@
return ''.join(packed)
@staticmethod
- def unpack(buf):
+ def unpack(reader):
obj = pop_mpls()
- if type(buf) == loxi.generic_util.OFReader:
- reader = buf
- else:
- reader = loxi.generic_util.OFReader(buf)
_type = reader.read("!H")[0]
assert(_type == 20)
_len = reader.read("!H")[0]
+ orig_reader = reader
+ reader = orig_reader.slice(_len - (2 + 2))
obj.ethertype = reader.read("!H")[0]
reader.skip(2)
return obj
@@ -573,13 +555,6 @@
if self.ethertype != other.ethertype: return False
return True
- def __ne__(self, other):
- return not self.__eq__(other)
-
- def show(self):
- import loxi.pp
- return loxi.pp.pp(self)
-
def pretty_print(self, q):
q.text("pop_mpls {")
with q.group():
@@ -590,7 +565,9 @@
q.breakable()
q.text('}')
-class pop_vlan(Action):
+action.subtypes[20] = pop_mpls
+
+class pop_vlan(action):
type = 18
def __init__(self):
@@ -606,15 +583,13 @@
return ''.join(packed)
@staticmethod
- def unpack(buf):
+ def unpack(reader):
obj = pop_vlan()
- if type(buf) == loxi.generic_util.OFReader:
- reader = buf
- else:
- reader = loxi.generic_util.OFReader(buf)
_type = reader.read("!H")[0]
assert(_type == 18)
_len = reader.read("!H")[0]
+ orig_reader = reader
+ reader = orig_reader.slice(_len - (2 + 2))
reader.skip(4)
return obj
@@ -622,13 +597,6 @@
if type(self) != type(other): return False
return True
- def __ne__(self, other):
- return not self.__eq__(other)
-
- def show(self):
- import loxi.pp
- return loxi.pp.pp(self)
-
def pretty_print(self, q):
q.text("pop_vlan {")
with q.group():
@@ -637,7 +605,9 @@
q.breakable()
q.text('}')
-class push_mpls(Action):
+action.subtypes[18] = pop_vlan
+
+class push_mpls(action):
type = 19
def __init__(self, ethertype=None):
@@ -658,15 +628,13 @@
return ''.join(packed)
@staticmethod
- def unpack(buf):
+ def unpack(reader):
obj = push_mpls()
- if type(buf) == loxi.generic_util.OFReader:
- reader = buf
- else:
- reader = loxi.generic_util.OFReader(buf)
_type = reader.read("!H")[0]
assert(_type == 19)
_len = reader.read("!H")[0]
+ orig_reader = reader
+ reader = orig_reader.slice(_len - (2 + 2))
obj.ethertype = reader.read("!H")[0]
reader.skip(2)
return obj
@@ -676,13 +644,6 @@
if self.ethertype != other.ethertype: return False
return True
- def __ne__(self, other):
- return not self.__eq__(other)
-
- def show(self):
- import loxi.pp
- return loxi.pp.pp(self)
-
def pretty_print(self, q):
q.text("push_mpls {")
with q.group():
@@ -693,7 +654,9 @@
q.breakable()
q.text('}')
-class push_vlan(Action):
+action.subtypes[19] = push_mpls
+
+class push_vlan(action):
type = 17
def __init__(self, ethertype=None):
@@ -714,15 +677,13 @@
return ''.join(packed)
@staticmethod
- def unpack(buf):
+ def unpack(reader):
obj = push_vlan()
- if type(buf) == loxi.generic_util.OFReader:
- reader = buf
- else:
- reader = loxi.generic_util.OFReader(buf)
_type = reader.read("!H")[0]
assert(_type == 17)
_len = reader.read("!H")[0]
+ orig_reader = reader
+ reader = orig_reader.slice(_len - (2 + 2))
obj.ethertype = reader.read("!H")[0]
reader.skip(2)
return obj
@@ -732,13 +693,6 @@
if self.ethertype != other.ethertype: return False
return True
- def __ne__(self, other):
- return not self.__eq__(other)
-
- def show(self):
- import loxi.pp
- return loxi.pp.pp(self)
-
def pretty_print(self, q):
q.text("push_vlan {")
with q.group():
@@ -749,7 +703,9 @@
q.breakable()
q.text('}')
-class set_dl_dst(Action):
+action.subtypes[17] = push_vlan
+
+class set_dl_dst(action):
type = 4
def __init__(self, dl_addr=None):
@@ -770,15 +726,13 @@
return ''.join(packed)
@staticmethod
- def unpack(buf):
+ def unpack(reader):
obj = set_dl_dst()
- if type(buf) == loxi.generic_util.OFReader:
- reader = buf
- else:
- reader = loxi.generic_util.OFReader(buf)
_type = reader.read("!H")[0]
assert(_type == 4)
_len = reader.read("!H")[0]
+ orig_reader = reader
+ reader = orig_reader.slice(_len - (2 + 2))
obj.dl_addr = list(reader.read('!6B'))
reader.skip(6)
return obj
@@ -788,13 +742,6 @@
if self.dl_addr != other.dl_addr: return False
return True
- def __ne__(self, other):
- return not self.__eq__(other)
-
- def show(self):
- import loxi.pp
- return loxi.pp.pp(self)
-
def pretty_print(self, q):
q.text("set_dl_dst {")
with q.group():
@@ -805,7 +752,9 @@
q.breakable()
q.text('}')
-class set_dl_src(Action):
+action.subtypes[4] = set_dl_dst
+
+class set_dl_src(action):
type = 3
def __init__(self, dl_addr=None):
@@ -826,15 +775,13 @@
return ''.join(packed)
@staticmethod
- def unpack(buf):
+ def unpack(reader):
obj = set_dl_src()
- if type(buf) == loxi.generic_util.OFReader:
- reader = buf
- else:
- reader = loxi.generic_util.OFReader(buf)
_type = reader.read("!H")[0]
assert(_type == 3)
_len = reader.read("!H")[0]
+ orig_reader = reader
+ reader = orig_reader.slice(_len - (2 + 2))
obj.dl_addr = list(reader.read('!6B'))
reader.skip(6)
return obj
@@ -844,13 +791,6 @@
if self.dl_addr != other.dl_addr: return False
return True
- def __ne__(self, other):
- return not self.__eq__(other)
-
- def show(self):
- import loxi.pp
- return loxi.pp.pp(self)
-
def pretty_print(self, q):
q.text("set_dl_src {")
with q.group():
@@ -861,7 +801,9 @@
q.breakable()
q.text('}')
-class set_mpls_label(Action):
+action.subtypes[3] = set_dl_src
+
+class set_mpls_label(action):
type = 13
def __init__(self, mpls_label=None):
@@ -881,15 +823,13 @@
return ''.join(packed)
@staticmethod
- def unpack(buf):
+ def unpack(reader):
obj = set_mpls_label()
- if type(buf) == loxi.generic_util.OFReader:
- reader = buf
- else:
- reader = loxi.generic_util.OFReader(buf)
_type = reader.read("!H")[0]
assert(_type == 13)
_len = reader.read("!H")[0]
+ orig_reader = reader
+ reader = orig_reader.slice(_len - (2 + 2))
obj.mpls_label = reader.read("!L")[0]
return obj
@@ -898,13 +838,6 @@
if self.mpls_label != other.mpls_label: return False
return True
- def __ne__(self, other):
- return not self.__eq__(other)
-
- def show(self):
- import loxi.pp
- return loxi.pp.pp(self)
-
def pretty_print(self, q):
q.text("set_mpls_label {")
with q.group():
@@ -915,7 +848,9 @@
q.breakable()
q.text('}')
-class set_mpls_tc(Action):
+action.subtypes[13] = set_mpls_label
+
+class set_mpls_tc(action):
type = 14
def __init__(self, mpls_tc=None):
@@ -936,15 +871,13 @@
return ''.join(packed)
@staticmethod
- def unpack(buf):
+ def unpack(reader):
obj = set_mpls_tc()
- if type(buf) == loxi.generic_util.OFReader:
- reader = buf
- else:
- reader = loxi.generic_util.OFReader(buf)
_type = reader.read("!H")[0]
assert(_type == 14)
_len = reader.read("!H")[0]
+ orig_reader = reader
+ reader = orig_reader.slice(_len - (2 + 2))
obj.mpls_tc = reader.read("!B")[0]
reader.skip(3)
return obj
@@ -954,13 +887,6 @@
if self.mpls_tc != other.mpls_tc: return False
return True
- def __ne__(self, other):
- return not self.__eq__(other)
-
- def show(self):
- import loxi.pp
- return loxi.pp.pp(self)
-
def pretty_print(self, q):
q.text("set_mpls_tc {")
with q.group():
@@ -971,7 +897,9 @@
q.breakable()
q.text('}')
-class set_mpls_ttl(Action):
+action.subtypes[14] = set_mpls_tc
+
+class set_mpls_ttl(action):
type = 15
def __init__(self, mpls_ttl=None):
@@ -992,15 +920,13 @@
return ''.join(packed)
@staticmethod
- def unpack(buf):
+ def unpack(reader):
obj = set_mpls_ttl()
- if type(buf) == loxi.generic_util.OFReader:
- reader = buf
- else:
- reader = loxi.generic_util.OFReader(buf)
_type = reader.read("!H")[0]
assert(_type == 15)
_len = reader.read("!H")[0]
+ orig_reader = reader
+ reader = orig_reader.slice(_len - (2 + 2))
obj.mpls_ttl = reader.read("!B")[0]
reader.skip(3)
return obj
@@ -1010,13 +936,6 @@
if self.mpls_ttl != other.mpls_ttl: return False
return True
- def __ne__(self, other):
- return not self.__eq__(other)
-
- def show(self):
- import loxi.pp
- return loxi.pp.pp(self)
-
def pretty_print(self, q):
q.text("set_mpls_ttl {")
with q.group():
@@ -1027,7 +946,9 @@
q.breakable()
q.text('}')
-class set_nw_dst(Action):
+action.subtypes[15] = set_mpls_ttl
+
+class set_nw_dst(action):
type = 6
def __init__(self, nw_addr=None):
@@ -1047,15 +968,13 @@
return ''.join(packed)
@staticmethod
- def unpack(buf):
+ def unpack(reader):
obj = set_nw_dst()
- if type(buf) == loxi.generic_util.OFReader:
- reader = buf
- else:
- reader = loxi.generic_util.OFReader(buf)
_type = reader.read("!H")[0]
assert(_type == 6)
_len = reader.read("!H")[0]
+ orig_reader = reader
+ reader = orig_reader.slice(_len - (2 + 2))
obj.nw_addr = reader.read("!L")[0]
return obj
@@ -1064,13 +983,6 @@
if self.nw_addr != other.nw_addr: return False
return True
- def __ne__(self, other):
- return not self.__eq__(other)
-
- def show(self):
- import loxi.pp
- return loxi.pp.pp(self)
-
def pretty_print(self, q):
q.text("set_nw_dst {")
with q.group():
@@ -1081,7 +993,9 @@
q.breakable()
q.text('}')
-class set_nw_ecn(Action):
+action.subtypes[6] = set_nw_dst
+
+class set_nw_ecn(action):
type = 8
def __init__(self, nw_ecn=None):
@@ -1102,15 +1016,13 @@
return ''.join(packed)
@staticmethod
- def unpack(buf):
+ def unpack(reader):
obj = set_nw_ecn()
- if type(buf) == loxi.generic_util.OFReader:
- reader = buf
- else:
- reader = loxi.generic_util.OFReader(buf)
_type = reader.read("!H")[0]
assert(_type == 8)
_len = reader.read("!H")[0]
+ orig_reader = reader
+ reader = orig_reader.slice(_len - (2 + 2))
obj.nw_ecn = reader.read("!B")[0]
reader.skip(3)
return obj
@@ -1120,13 +1032,6 @@
if self.nw_ecn != other.nw_ecn: return False
return True
- def __ne__(self, other):
- return not self.__eq__(other)
-
- def show(self):
- import loxi.pp
- return loxi.pp.pp(self)
-
def pretty_print(self, q):
q.text("set_nw_ecn {")
with q.group():
@@ -1137,7 +1042,9 @@
q.breakable()
q.text('}')
-class set_nw_src(Action):
+action.subtypes[8] = set_nw_ecn
+
+class set_nw_src(action):
type = 5
def __init__(self, nw_addr=None):
@@ -1157,15 +1064,13 @@
return ''.join(packed)
@staticmethod
- def unpack(buf):
+ def unpack(reader):
obj = set_nw_src()
- if type(buf) == loxi.generic_util.OFReader:
- reader = buf
- else:
- reader = loxi.generic_util.OFReader(buf)
_type = reader.read("!H")[0]
assert(_type == 5)
_len = reader.read("!H")[0]
+ orig_reader = reader
+ reader = orig_reader.slice(_len - (2 + 2))
obj.nw_addr = reader.read("!L")[0]
return obj
@@ -1174,13 +1079,6 @@
if self.nw_addr != other.nw_addr: return False
return True
- def __ne__(self, other):
- return not self.__eq__(other)
-
- def show(self):
- import loxi.pp
- return loxi.pp.pp(self)
-
def pretty_print(self, q):
q.text("set_nw_src {")
with q.group():
@@ -1191,7 +1089,9 @@
q.breakable()
q.text('}')
-class set_nw_tos(Action):
+action.subtypes[5] = set_nw_src
+
+class set_nw_tos(action):
type = 7
def __init__(self, nw_tos=None):
@@ -1212,15 +1112,13 @@
return ''.join(packed)
@staticmethod
- def unpack(buf):
+ def unpack(reader):
obj = set_nw_tos()
- if type(buf) == loxi.generic_util.OFReader:
- reader = buf
- else:
- reader = loxi.generic_util.OFReader(buf)
_type = reader.read("!H")[0]
assert(_type == 7)
_len = reader.read("!H")[0]
+ orig_reader = reader
+ reader = orig_reader.slice(_len - (2 + 2))
obj.nw_tos = reader.read("!B")[0]
reader.skip(3)
return obj
@@ -1230,13 +1128,6 @@
if self.nw_tos != other.nw_tos: return False
return True
- def __ne__(self, other):
- return not self.__eq__(other)
-
- def show(self):
- import loxi.pp
- return loxi.pp.pp(self)
-
def pretty_print(self, q):
q.text("set_nw_tos {")
with q.group():
@@ -1247,7 +1138,9 @@
q.breakable()
q.text('}')
-class set_nw_ttl(Action):
+action.subtypes[7] = set_nw_tos
+
+class set_nw_ttl(action):
type = 23
def __init__(self, nw_ttl=None):
@@ -1268,15 +1161,13 @@
return ''.join(packed)
@staticmethod
- def unpack(buf):
+ def unpack(reader):
obj = set_nw_ttl()
- if type(buf) == loxi.generic_util.OFReader:
- reader = buf
- else:
- reader = loxi.generic_util.OFReader(buf)
_type = reader.read("!H")[0]
assert(_type == 23)
_len = reader.read("!H")[0]
+ orig_reader = reader
+ reader = orig_reader.slice(_len - (2 + 2))
obj.nw_ttl = reader.read("!B")[0]
reader.skip(3)
return obj
@@ -1286,13 +1177,6 @@
if self.nw_ttl != other.nw_ttl: return False
return True
- def __ne__(self, other):
- return not self.__eq__(other)
-
- def show(self):
- import loxi.pp
- return loxi.pp.pp(self)
-
def pretty_print(self, q):
q.text("set_nw_ttl {")
with q.group():
@@ -1303,7 +1187,9 @@
q.breakable()
q.text('}')
-class set_queue(Action):
+action.subtypes[23] = set_nw_ttl
+
+class set_queue(action):
type = 21
def __init__(self, queue_id=None):
@@ -1323,15 +1209,13 @@
return ''.join(packed)
@staticmethod
- def unpack(buf):
+ def unpack(reader):
obj = set_queue()
- if type(buf) == loxi.generic_util.OFReader:
- reader = buf
- else:
- reader = loxi.generic_util.OFReader(buf)
_type = reader.read("!H")[0]
assert(_type == 21)
_len = reader.read("!H")[0]
+ orig_reader = reader
+ reader = orig_reader.slice(_len - (2 + 2))
obj.queue_id = reader.read("!L")[0]
return obj
@@ -1340,13 +1224,6 @@
if self.queue_id != other.queue_id: return False
return True
- def __ne__(self, other):
- return not self.__eq__(other)
-
- def show(self):
- import loxi.pp
- return loxi.pp.pp(self)
-
def pretty_print(self, q):
q.text("set_queue {")
with q.group():
@@ -1357,7 +1234,9 @@
q.breakable()
q.text('}')
-class set_tp_dst(Action):
+action.subtypes[21] = set_queue
+
+class set_tp_dst(action):
type = 10
def __init__(self, tp_port=None):
@@ -1378,15 +1257,13 @@
return ''.join(packed)
@staticmethod
- def unpack(buf):
+ def unpack(reader):
obj = set_tp_dst()
- if type(buf) == loxi.generic_util.OFReader:
- reader = buf
- else:
- reader = loxi.generic_util.OFReader(buf)
_type = reader.read("!H")[0]
assert(_type == 10)
_len = reader.read("!H")[0]
+ orig_reader = reader
+ reader = orig_reader.slice(_len - (2 + 2))
obj.tp_port = reader.read("!H")[0]
reader.skip(2)
return obj
@@ -1396,13 +1273,6 @@
if self.tp_port != other.tp_port: return False
return True
- def __ne__(self, other):
- return not self.__eq__(other)
-
- def show(self):
- import loxi.pp
- return loxi.pp.pp(self)
-
def pretty_print(self, q):
q.text("set_tp_dst {")
with q.group():
@@ -1413,7 +1283,9 @@
q.breakable()
q.text('}')
-class set_tp_src(Action):
+action.subtypes[10] = set_tp_dst
+
+class set_tp_src(action):
type = 9
def __init__(self, tp_port=None):
@@ -1434,15 +1306,13 @@
return ''.join(packed)
@staticmethod
- def unpack(buf):
+ def unpack(reader):
obj = set_tp_src()
- if type(buf) == loxi.generic_util.OFReader:
- reader = buf
- else:
- reader = loxi.generic_util.OFReader(buf)
_type = reader.read("!H")[0]
assert(_type == 9)
_len = reader.read("!H")[0]
+ orig_reader = reader
+ reader = orig_reader.slice(_len - (2 + 2))
obj.tp_port = reader.read("!H")[0]
reader.skip(2)
return obj
@@ -1452,13 +1322,6 @@
if self.tp_port != other.tp_port: return False
return True
- def __ne__(self, other):
- return not self.__eq__(other)
-
- def show(self):
- import loxi.pp
- return loxi.pp.pp(self)
-
def pretty_print(self, q):
q.text("set_tp_src {")
with q.group():
@@ -1469,7 +1332,9 @@
q.breakable()
q.text('}')
-class set_vlan_pcp(Action):
+action.subtypes[9] = set_tp_src
+
+class set_vlan_pcp(action):
type = 2
def __init__(self, vlan_pcp=None):
@@ -1490,15 +1355,13 @@
return ''.join(packed)
@staticmethod
- def unpack(buf):
+ def unpack(reader):
obj = set_vlan_pcp()
- if type(buf) == loxi.generic_util.OFReader:
- reader = buf
- else:
- reader = loxi.generic_util.OFReader(buf)
_type = reader.read("!H")[0]
assert(_type == 2)
_len = reader.read("!H")[0]
+ orig_reader = reader
+ reader = orig_reader.slice(_len - (2 + 2))
obj.vlan_pcp = reader.read("!B")[0]
reader.skip(3)
return obj
@@ -1508,13 +1371,6 @@
if self.vlan_pcp != other.vlan_pcp: return False
return True
- def __ne__(self, other):
- return not self.__eq__(other)
-
- def show(self):
- import loxi.pp
- return loxi.pp.pp(self)
-
def pretty_print(self, q):
q.text("set_vlan_pcp {")
with q.group():
@@ -1525,7 +1381,9 @@
q.breakable()
q.text('}')
-class set_vlan_vid(Action):
+action.subtypes[2] = set_vlan_pcp
+
+class set_vlan_vid(action):
type = 1
def __init__(self, vlan_vid=None):
@@ -1546,15 +1404,13 @@
return ''.join(packed)
@staticmethod
- def unpack(buf):
+ def unpack(reader):
obj = set_vlan_vid()
- if type(buf) == loxi.generic_util.OFReader:
- reader = buf
- else:
- reader = loxi.generic_util.OFReader(buf)
_type = reader.read("!H")[0]
assert(_type == 1)
_len = reader.read("!H")[0]
+ orig_reader = reader
+ reader = orig_reader.slice(_len - (2 + 2))
obj.vlan_vid = reader.read("!H")[0]
reader.skip(2)
return obj
@@ -1564,13 +1420,6 @@
if self.vlan_vid != other.vlan_vid: return False
return True
- def __ne__(self, other):
- return not self.__eq__(other)
-
- def show(self):
- import loxi.pp
- return loxi.pp.pp(self)
-
def pretty_print(self, q):
q.text("set_vlan_vid {")
with q.group():
@@ -1581,56 +1430,6 @@
q.breakable()
q.text('}')
+action.subtypes[1] = set_vlan_vid
-def parse_experimenter(reader):
- experimenter, = reader.peek("!4xL")
- if experimenter == 0x005c16c7: # Big Switch Networks
- subtype, = reader.peek("!8xL")
- elif experimenter == 0x00002320: # Nicira
- subtype, = reader.peek("!8xH")
- else:
- raise loxi.ProtocolError("unexpected experimenter id %#x" % experimenter)
- if subtype in experimenter_parsers[experimenter]:
- return experimenter_parsers[experimenter][subtype](reader)
- else:
- raise loxi.ProtocolError("unexpected BSN experimenter subtype %#x" % subtype)
-
-parsers = {
- const.OFPAT_OUTPUT : output.unpack,
- const.OFPAT_SET_VLAN_VID : set_vlan_vid.unpack,
- const.OFPAT_SET_VLAN_PCP : set_vlan_pcp.unpack,
- const.OFPAT_SET_DL_SRC : set_dl_src.unpack,
- const.OFPAT_SET_DL_DST : set_dl_dst.unpack,
- const.OFPAT_SET_NW_SRC : set_nw_src.unpack,
- const.OFPAT_SET_NW_DST : set_nw_dst.unpack,
- const.OFPAT_SET_NW_TOS : set_nw_tos.unpack,
- const.OFPAT_SET_NW_ECN : set_nw_ecn.unpack,
- const.OFPAT_SET_TP_SRC : set_tp_src.unpack,
- const.OFPAT_SET_TP_DST : set_tp_dst.unpack,
- const.OFPAT_COPY_TTL_OUT : copy_ttl_out.unpack,
- const.OFPAT_COPY_TTL_IN : copy_ttl_in.unpack,
- const.OFPAT_SET_MPLS_LABEL : set_mpls_label.unpack,
- const.OFPAT_SET_MPLS_TC : set_mpls_tc.unpack,
- const.OFPAT_SET_MPLS_TTL : set_mpls_ttl.unpack,
- const.OFPAT_DEC_MPLS_TTL : dec_mpls_ttl.unpack,
- const.OFPAT_PUSH_VLAN : push_vlan.unpack,
- const.OFPAT_POP_VLAN : pop_vlan.unpack,
- const.OFPAT_PUSH_MPLS : push_mpls.unpack,
- const.OFPAT_POP_MPLS : pop_mpls.unpack,
- const.OFPAT_SET_QUEUE : set_queue.unpack,
- const.OFPAT_GROUP : group.unpack,
- const.OFPAT_SET_NW_TTL : set_nw_ttl.unpack,
- const.OFPAT_DEC_NW_TTL : dec_nw_ttl.unpack,
- const.OFPAT_EXPERIMENTER : parse_experimenter,
-}
-
-experimenter_parsers = {
- 8992 : {
- 18: nicira_dec_ttl.unpack,
- },
- 6035143 : {
- 1: bsn_mirror.unpack,
- 2: bsn_set_tunnel_dst.unpack,
- },
-}