[v0x02] Updated Header version

kytos · Aug 31, 2016 · 1634da3 · diraol · Sep 2, 2016 · diraol
1 parent 987b3fb
commit 1634da3
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 58 deletions.
diff --git a/pyof/v0x02/common/header.py b/pyof/v0x02/common/header.py
@@ -1,2 +1,16 @@
-"""Defines Header classes and related items."""
-from pyof.v0x01.common.header import Header, Type
+"""Defines Header classes and related items.
+
+Only differences between versions.
+"""
+from pyof.v0x01.common.header import Header as Header0x01, Type
+from pyof.v0x02.foundation.base import OFP_VERSION
+from pyof.v0x02.foundation.basic_types import UBInt8
+
+
+__all__ = ('Header', 'Type')
+
+
+class Header(Header0x01):
+    """v0x02 Header differences."""
+
+    version = UBInt8(OFP_VERSION)
diff --git a/pyof/v0x02/foundation/base.py b/pyof/v0x02/foundation/base.py
@@ -13,6 +13,11 @@
 :class:`GenericMessage`, :class:`GenericBitMask` and :class:`GenericType`.
 These classes are used in all parts of this library.
 """
-from pyof.v0x01.foundation.base import (GenericBitMask, GenericMessage,
+from pyof.v0x01.foundation.base import (DESC_STR_LEN, OFP_ETH_ALEN,
+                                        OFP_MAX_PORT_NAME_LEN,
+                                        OFP_MAX_TABLE_NAME_LEN, SERIAL_NUM_LEN,
+                                        GenericBitMask, GenericMessage,
                                         GenericStruct, GenericType,
                                         MetaBitMask, MetaStruct)
+
+OFP_VERSION = 0x02
diff --git a/setup.py b/setup.py
@@ -73,7 +73,7 @@ def __init__(self, *args, **kwargs):
       author_email='[email protected]',
       license='MIT',
       test_suite='tests',
-      packages=find_packages(exclude=['tests', '*v0x02*']),
+      packages=find_packages(exclude=['tests']),
       cmdclass={
           'lint': Linter,
           'quick_lint': FastLinter

diff --git a/tests/v0x02/__init__.py b/tests/v0x02/__init__.py
diff --git a/tests/v0x02/test_common/test_flow_instruction.py b/tests/v0x02/test_common/test_flow_instruction.py
diff --git a/tests/v0x02/test_common/test_header.py b/tests/v0x02/test_common/test_header.py
@@ -0,0 +1,13 @@
+"""Header testing."""
+import unittest
+
+from pyof.v0x02.common.header import Header
+
+
+class TestHeader(unittest.TestCase):
+    """Test Header changes between v0x01 and v0x02."""
+
+    def test_version(self):
+        """Version must be 0x02 for OF 1.1.0."""
+        header = Header()
+        self.assertEqual(0x02, header.version)