loxi-prep: move header fields into the message classes
diff --git a/src/python/of10/error.py b/src/python/of10/error.py
index c69b70d..700338b 100644
--- a/src/python/of10/error.py
+++ b/src/python/of10/error.py
@@ -17,30 +17,28 @@
"""
def __init__(self):
ofp_error_msg.__init__(self)
- self.header = ofp_header()
- self.header.type = OFPT_ERROR
- self.type = OFPET_HELLO_FAILED
+ self.version = OFP_VERSION
+ self.type = OFPT_ERROR
+ self.err_type = OFPET_HELLO_FAILED
self.data = ""
def pack(self, assertstruct=True):
self.header.length = self.__len__()
- packed = self.header.pack()
+ packed = ""
packed += ofp_error_msg.pack(self)
packed += self.data
return packed
def unpack(self, binary_string):
- binary_string = self.header.unpack(binary_string)
binary_string = ofp_error_msg.unpack(self, binary_string)
self.data = binary_string
return ""
def __len__(self):
- return OFP_HEADER_BYTES + OFP_ERROR_MSG_BYTES + len(self.data)
+ return OFP_ERROR_MSG_BYTES + len(self.data)
def show(self, prefix=''):
outstr = prefix + "hello_failed_error_msg\m"
- outstr += self.header.show(prefix + ' ')
outstr += ofp_error_msg.show(self, prefix + ' ')
outstr += prefix + "data is of length " + str(len(self.data)) + '\n'
##@todo Consider trying to parse the string
@@ -48,8 +46,7 @@
def __eq__(self, other):
if type(self) != type(other): return False
- return (self.header == other.header and
- ofp_error_msg.__eq__(self, other) and
+ return (ofp_error_msg.__eq__(self, other) and
self.data == other.data)
def __ne__(self, other): return not self.__eq__(other)
@@ -67,30 +64,28 @@
"""
def __init__(self):
ofp_error_msg.__init__(self)
- self.header = ofp_header()
- self.header.type = OFPT_ERROR
- self.type = OFPET_BAD_REQUEST
+ self.version = OFP_VERSION
+ self.type = OFPT_ERROR
+ self.err_type = OFPET_BAD_REQUEST
self.data = ""
def pack(self, assertstruct=True):
self.header.length = self.__len__()
- packed = self.header.pack()
+ packed = ""
packed += ofp_error_msg.pack(self)
packed += self.data
return packed
def unpack(self, binary_string):
- binary_string = self.header.unpack(binary_string)
binary_string = ofp_error_msg.unpack(self, binary_string)
self.data = binary_string
return ""
def __len__(self):
- return OFP_HEADER_BYTES + OFP_ERROR_MSG_BYTES + len(self.data)
+ return OFP_ERROR_MSG_BYTES + len(self.data)
def show(self, prefix=''):
outstr = prefix + "bad_request_error_msg\m"
- outstr += self.header.show(prefix + ' ')
outstr += ofp_error_msg.show(self, prefix + ' ')
outstr += prefix + "data is of length " + str(len(self.data)) + '\n'
##@todo Consider trying to parse the string
@@ -98,8 +93,7 @@
def __eq__(self, other):
if type(self) != type(other): return False
- return (self.header == other.header and
- ofp_error_msg.__eq__(self, other) and
+ return (ofp_error_msg.__eq__(self, other) and
self.data == other.data)
def __ne__(self, other): return not self.__eq__(other)
@@ -117,30 +111,28 @@
"""
def __init__(self):
ofp_error_msg.__init__(self)
- self.header = ofp_header()
- self.header.type = OFPT_ERROR
- self.type = OFPET_BAD_ACTION
+ self.version = OFP_VERSION
+ self.type = OFPT_ERROR
+ self.err_type = OFPET_BAD_ACTION
self.data = ""
def pack(self, assertstruct=True):
self.header.length = self.__len__()
- packed = self.header.pack()
+ packed = ""
packed += ofp_error_msg.pack(self)
packed += self.data
return packed
def unpack(self, binary_string):
- binary_string = self.header.unpack(binary_string)
binary_string = ofp_error_msg.unpack(self, binary_string)
self.data = binary_string
return ""
def __len__(self):
- return OFP_HEADER_BYTES + OFP_ERROR_MSG_BYTES + len(self.data)
+ return OFP_ERROR_MSG_BYTES + len(self.data)
def show(self, prefix=''):
outstr = prefix + "bad_action_error_msg\m"
- outstr += self.header.show(prefix + ' ')
outstr += ofp_error_msg.show(self, prefix + ' ')
outstr += prefix + "data is of length " + str(len(self.data)) + '\n'
##@todo Consider trying to parse the string
@@ -148,8 +140,7 @@
def __eq__(self, other):
if type(self) != type(other): return False
- return (self.header == other.header and
- ofp_error_msg.__eq__(self, other) and
+ return (ofp_error_msg.__eq__(self, other) and
self.data == other.data)
def __ne__(self, other): return not self.__eq__(other)
@@ -167,30 +158,28 @@
"""
def __init__(self):
ofp_error_msg.__init__(self)
- self.header = ofp_header()
- self.header.type = OFPT_ERROR
- self.type = OFPET_FLOW_MOD_FAILED
+ self.version = OFP_VERSION
+ self.type = OFPT_ERROR
+ self.err_type = OFPET_FLOW_MOD_FAILED
self.data = ""
def pack(self, assertstruct=True):
self.header.length = self.__len__()
- packed = self.header.pack()
+ packed = ""
packed += ofp_error_msg.pack(self)
packed += self.data
return packed
def unpack(self, binary_string):
- binary_string = self.header.unpack(binary_string)
binary_string = ofp_error_msg.unpack(self, binary_string)
self.data = binary_string
return ""
def __len__(self):
- return OFP_HEADER_BYTES + OFP_ERROR_MSG_BYTES + len(self.data)
+ return OFP_ERROR_MSG_BYTES + len(self.data)
def show(self, prefix=''):
outstr = prefix + "flow_mod_failed_error_msg\m"
- outstr += self.header.show(prefix + ' ')
outstr += ofp_error_msg.show(self, prefix + ' ')
outstr += prefix + "data is of length " + str(len(self.data)) + '\n'
##@todo Consider trying to parse the string
@@ -198,8 +187,7 @@
def __eq__(self, other):
if type(self) != type(other): return False
- return (self.header == other.header and
- ofp_error_msg.__eq__(self, other) and
+ return (ofp_error_msg.__eq__(self, other) and
self.data == other.data)
def __ne__(self, other): return not self.__eq__(other)
@@ -217,30 +205,28 @@
"""
def __init__(self):
ofp_error_msg.__init__(self)
- self.header = ofp_header()
- self.header.type = OFPT_ERROR
- self.type = OFPET_PORT_MOD_FAILED
+ self.version = OFP_VERSION
+ self.type = OFPT_ERROR
+ self.err_type = OFPET_PORT_MOD_FAILED
self.data = ""
def pack(self, assertstruct=True):
self.header.length = self.__len__()
- packed = self.header.pack()
+ packed = ""
packed += ofp_error_msg.pack(self)
packed += self.data
return packed
def unpack(self, binary_string):
- binary_string = self.header.unpack(binary_string)
binary_string = ofp_error_msg.unpack(self, binary_string)
self.data = binary_string
return ""
def __len__(self):
- return OFP_HEADER_BYTES + OFP_ERROR_MSG_BYTES + len(self.data)
+ return OFP_ERROR_MSG_BYTES + len(self.data)
def show(self, prefix=''):
outstr = prefix + "port_mod_failed_error_msg\m"
- outstr += self.header.show(prefix + ' ')
outstr += ofp_error_msg.show(self, prefix + ' ')
outstr += prefix + "data is of length " + str(len(self.data)) + '\n'
##@todo Consider trying to parse the string
@@ -248,8 +234,7 @@
def __eq__(self, other):
if type(self) != type(other): return False
- return (self.header == other.header and
- ofp_error_msg.__eq__(self, other) and
+ return (ofp_error_msg.__eq__(self, other) and
self.data == other.data)
def __ne__(self, other): return not self.__eq__(other)
@@ -267,30 +252,28 @@
"""
def __init__(self):
ofp_error_msg.__init__(self)
- self.header = ofp_header()
- self.header.type = OFPT_ERROR
- self.type = OFPET_QUEUE_OP_FAILED
+ self.version = OFP_VERSION
+ self.type = OFPT_ERROR
+ self.err_type = OFPET_QUEUE_OP_FAILED
self.data = ""
def pack(self, assertstruct=True):
self.header.length = self.__len__()
- packed = self.header.pack()
+ packed = ""
packed += ofp_error_msg.pack(self)
packed += self.data
return packed
def unpack(self, binary_string):
- binary_string = self.header.unpack(binary_string)
binary_string = ofp_error_msg.unpack(self, binary_string)
self.data = binary_string
return ""
def __len__(self):
- return OFP_HEADER_BYTES + OFP_ERROR_MSG_BYTES + len(self.data)
+ return OFP_ERROR_MSG_BYTES + len(self.data)
def show(self, prefix=''):
outstr = prefix + "queue_op_failed_error_msg\m"
- outstr += self.header.show(prefix + ' ')
outstr += ofp_error_msg.show(self, prefix + ' ')
outstr += prefix + "data is of length " + str(len(self.data)) + '\n'
##@todo Consider trying to parse the string
@@ -298,8 +281,7 @@
def __eq__(self, other):
if type(self) != type(other): return False
- return (self.header == other.header and
- ofp_error_msg.__eq__(self, other) and
+ return (ofp_error_msg.__eq__(self, other) and
self.data == other.data)
def __ne__(self, other): return not self.__eq__(other)