Merge pull request #443 from renanrodrigo/fix_inits

Fix inits

Author: beraldoleal

pyof/foundation/base.py

@@ -121,6 +121,9 @@ def __lshift__(self, shift):
     def __rshift__(self, shift):
         return self.value >> shift
 
+    def __len__(self):
+        return self.get_size()
+
     @property
     def value(self):
         """Return this type's value.

pyof/foundation/network_types.py

@@ -201,7 +201,7 @@ class Ethernet(GenericStruct):
     ether_type = UBInt16()
     data = BinaryData()
 
-    def __init__(self, destination=None, source=None, vlan=VLAN(),
+    def __init__(self, destination=None, source=None, vlan=None,
                  ether_type=None, data=b''):
         """Create an instance and set its attributes.
 
@@ -218,7 +218,7 @@ def __init__(self, destination=None, source=None, vlan=VLAN(),
         super().__init__()
         self.destination = destination
         self.source = source
-        self.vlan = vlan
+        self.vlan = VLAN() if vlan is None else vlan
         self.ether_type = ether_type
         self.data = data
 
@@ -271,7 +271,7 @@ class GenericTLV(GenericStruct):
     type and value.
     """
 
-    def __init__(self, tlv_type=127, value=BinaryData()):
+    def __init__(self, tlv_type=127, value=None):
         """Create an instance and set its attributes.
 
         Args:
@@ -281,7 +281,7 @@ def __init__(self, tlv_type=127, value=BinaryData()):
         """
         super().__init__()
         self.tlv_type = tlv_type
-        self._value = value
+        self._value = BinaryData() if value is None else value
 
     @property
     def value(self):
@@ -547,7 +547,7 @@ class TLVWithSubType(GenericTLV):
     :attr:`sub_type` field and a new :attr:`sub_value` field.
     """
 
-    def __init__(self, tlv_type=1, sub_type=7, sub_value=BinaryData()):
+    def __init__(self, tlv_type=1, sub_type=7, sub_value=None):
         """Create an instance and set its attributes.
 
         Args:
@@ -558,7 +558,7 @@ def __init__(self, tlv_type=1, sub_type=7, sub_value=BinaryData()):
         """
         super().__init__(tlv_type)
         self.sub_type = sub_type
-        self.sub_value = sub_value
+        self.sub_value = BinaryData() if sub_value is None else sub_value
 
     @property
     def value(self):

pyof/v0x01/controller2switch/common.py

@@ -249,7 +249,7 @@ class FlowStatsRequest(GenericStruct):
     pad = Pad(1)
     out_port = UBInt16()
 
-    def __init__(self, match=Match(), table_id=0xff, out_port=Port.OFPP_NONE):
+    def __init__(self, match=None, table_id=0xff, out_port=Port.OFPP_NONE):
         """Create a FlowStatsRequest with the optional parameters below.
 
         Args:
@@ -262,7 +262,7 @@ def __init__(self, match=Match(), table_id=0xff, out_port=Port.OFPP_NONE):
                 A value of :attr:`.Port.OFPP_NONE` indicates no restriction.
         """
         super().__init__()
-        self.match = match
+        self.match = Match() if match is None else match
         self.table_id = table_id
         self.out_port = out_port
 

pyof/v0x04/controller2switch/common.py

@@ -468,7 +468,7 @@ class NextTablesProperty(Property):
     next_table_ids = ListOfInstruction()
 
     def __init__(self, property_type=TableFeaturePropType.OFPTFPT_NEXT_TABLES,
-                 next_table_ids=ListOfInstruction()):
+                 next_table_ids=None):
         """Create a NextTablesProperty with the optional parameters below.
 
         Args:
@@ -478,7 +478,8 @@ def __init__(self, property_type=TableFeaturePropType.OFPTFPT_NEXT_TABLES,
                 List of InstructionGotoTable instances.
         """
         super().__init__(property_type)
-        self.next_table_ids = next_table_ids
+        self.next_table_ids = (ListOfInstruction() if next_table_ids is None
+                               else next_table_ids)
         self.update_length()
 
 
@@ -525,7 +526,7 @@ class OxmProperty(Property):
     oxm_ids = ListOfOxmHeader()
 
     def __init__(self, property_type=TableFeaturePropType.OFPTFPT_MATCH,
-                 oxm_ids=ListOfOxmHeader()):
+                 oxm_ids=None):
         """Create an OxmProperty with the optional parameters below.
 
         Args:
@@ -535,7 +536,7 @@ def __init__(self, property_type=TableFeaturePropType.OFPTFPT_MATCH,
                 List of OxmHeader instances.
         """
         super().__init__(property_type)
-        self.oxm_ids = oxm_ids
+        self.oxm_ids = ListOfOxmHeader() if oxm_ids is None else oxm_ids
         self.update_length()
 
 
@@ -583,7 +584,7 @@ def __init__(self, table_id=Table.OFPTT_ALL, name="",
                  metadata_write=0xFFFFFFFFFFFFFFFF,
                  config=0,
                  max_entries=0,
-                 properties=ListOfProperty()):
+                 properties=None):
         """Create a TableFeatures with the optional parameters below.
 
         Args:
@@ -611,7 +612,8 @@ def __init__(self, table_id=Table.OFPTT_ALL, name="",
         self.metadata_write = metadata_write
         self.config = config
         self.max_entries = max_entries
-        self.properties = properties
+        self.properties = (ListOfProperty() if properties is None else
+                           properties)
         self.update_length()
 
     def pack(self, value=None):