Merge pull request #504 from diraol/fix_header_xid

Fix repeated header XID

Author: diraol

pyof/foundation/base.py

@@ -22,8 +22,9 @@
 from collections import OrderedDict
 from copy import deepcopy
 from enum import Enum, IntEnum
+from random import randint
 
-# Local source tree imports
+from pyof.foundation.constants import UBINT32_MAX_VALUE as MAXID
 from pyof.foundation.exceptions import (
     BadValueException, PackException, UnpackException, ValidationError)
 
@@ -747,8 +748,7 @@ class GenericMessage(GenericStruct):
     def __init__(self, xid=None):
         """Initialize header's xid."""
         super().__init__()
-        if xid is not None:
-            self.header.xid = xid
+        self.header.xid = randint(0, MAXID) if xid is None else xid
 
     def __init_subclass__(cls, **kwargs):
         if cls.header is None or cls.header.__class__.__name__ != 'Header':

pyof/v0x01/common/header.py

@@ -2,12 +2,10 @@
 
 # System imports
 from enum import IntEnum
-from random import randint
 
 # Local source tree imports
 from pyof.foundation.base import GenericStruct
 from pyof.foundation.basic_types import UBInt8, UBInt16, UBInt32
-from pyof.foundation.constants import UBINT32_MAX_VALUE as MAXID
 from pyof.v0x01.common.constants import OFP_VERSION
 
 # Third-party imports
@@ -84,4 +82,4 @@ def __init__(self, message_type=None, length=None, xid=None):
         super().__init__()
         self.message_type = message_type
         self.length = length
-        self.xid = randint(0, MAXID) if xid is None else xid
+        self.xid = xid

pyof/v0x04/common/header.py

@@ -2,12 +2,10 @@
 
 # System imports
 from enum import IntEnum
-from random import randint
 
 # Local source tree imports
 from pyof.foundation.base import GenericStruct
 from pyof.foundation.basic_types import UBInt8, UBInt16, UBInt32
-from pyof.foundation.constants import UBINT32_MAX_VALUE as MAXID
 from pyof.v0x04.common.constants import OFP_VERSION
 
 # Third-party imports
@@ -90,7 +88,7 @@ class Header(GenericStruct):
     length = UBInt16()
     xid = UBInt32()
 
-    def __init__(self, message_type=None, length=None, xid=randint(0, MAXID)):
+    def __init__(self, message_type=None, length=None, xid=None):
         """Create a Header with the optional parameters below.
 
         Args:

tests/v0x01/test_common/test_header.py

@@ -44,9 +44,3 @@ def test_unpack(self):
         self.assertEqual(self.message.version, 1)
 
         f.close()
-
-    @patch('pyof.v0x01.common.header.randint')
-    def test_random_xid(self, m):
-        """Each Header instantiations without xid should call randint."""
-        Header(), Header()  # noqa
-        self.assertEqual(m.call_count, 2)