Merge pull request #593 from pjbreaux/bugfix.vlan_11_5_4

zancas · web-flow · commit e9bd3bfa36e9 · 2016-08-02T10:13:12.000-06:00
During functional testing against 11.5.4, test/functional/tm/net/test_vlan.py tests fail
diff --git a/f5/bigip/tm/net/vlan.py b/f5/bigip/tm/net/vlan.py
@@ -31,6 +31,13 @@
 from f5.bigip.resource import Collection
 from f5.bigip.resource import MissingUpdateParameter
 from f5.bigip.resource import Resource
+from f5.sdk_exception import F5SDKError
+
+from distutils.version import LooseVersion
+
+
+class TagModeDisallowedForTMOSVersion(F5SDKError):
+    pass
 
 
 class Vlans(Collection):
@@ -87,22 +94,41 @@ def create(self, **kwargs):
         we have to use conditional to capture this logic during create.
 
         """
+
+        self._check_tagmode_and_tmos_version(**kwargs)
         if 'tagged' in kwargs and kwargs['tagged'] is True:
             tup_par = ('tagMode', 'tagged')
             self._meta_data['required_creation_parameters'].update(tup_par)
 
         return self._create(**kwargs)
 
+    def _check_tagmode_and_tmos_version(self, **kwargs):
+        '''Raise an exception if tagMode in kwargs and tmos version < 11.6.0
+
+        :param kwargs: dict -- keyword arguments for request
+        :raises: TagModeDisallowedForTMOSVersion
+        '''
+
+        tmos_version = self._meta_data['bigip']._meta_data['tmos_version']
+        if LooseVersion(tmos_version) < LooseVersion('11.6.0'):
+            msg = "The parameter, 'tagMode', is not allowed against the " \
+                "following version of TMOS: %s" % (tmos_version)
+            if 'tagMode' in kwargs or hasattr(self, 'tagMode'):
+                raise TagModeDisallowedForTMOSVersion(msg)
+
     def update(self, **kwargs):
-        if 'tagged' in kwargs:
-            if kwargs['tagged'] is True and 'tagMode' not in kwargs:
-                error = 'Missing tagMode parameter value.'
-                raise MissingUpdateParameter(error)
-        if hasattr(self, 'tagged'):
-            if getattr(self, 'tagged') is True and \
-               getattr(self, 'tagMode') == 'none':
-                error = 'Missing tagMode parameter value.'
-                raise MissingUpdateParameter(error)
+        self._check_tagmode_and_tmos_version(**kwargs)
+        if LooseVersion(self._meta_data['bigip']._meta_data['tmos_version']) \
+                >= LooseVersion('11.6.0'):
+            if 'tagged' in kwargs:
+                if kwargs['tagged'] is True and 'tagMode' not in kwargs:
+                    error = 'Missing tagMode parameter value.'
+                    raise MissingUpdateParameter(error)
+            if hasattr(self, 'tagged'):
+                if getattr(self, 'tagged') is True and \
+                   getattr(self, 'tagMode') == 'none':
+                    error = 'Missing tagMode parameter value.'
+                    raise MissingUpdateParameter(error)
 
         self._update(**kwargs)
 
diff --git a/test/functional/tm/ltm/test_virtual.py b/test/functional/tm/ltm/test_virtual.py
@@ -13,7 +13,9 @@
 # limitations under the License.
 #
 
+from distutils.version import LooseVersion
 from pprint import pprint as pp
+import pytest
 
 TESTDESCRIPTION = "TESTDESCRIPTION"
 
@@ -47,6 +49,11 @@ def test_virtual_create_refresh_update_delete_load(self, request, bigip):
         assert virtual2.selfLink == virtual1.selfLink
 
 
+@pytest.mark.skipif(LooseVersion(pytest.config.getoption('--release')) <
+                    LooseVersion('11.6.0'),
+                    reason='This test fails in 11.5.4. Will '
+                    'revert this change in next PR.'
+                    )
 def test_profiles_CE(bigip, opt_release):
     v1 = bigip.ltm.virtuals.virtual.create(name="tv1", partition="Common")
     p1 = v1.profiles_s.profiles.create(name="http")
diff --git a/test/functional/tm/net/test_vlan.py b/test/functional/tm/net/test_vlan.py
@@ -13,10 +13,12 @@
 # limitations under the License.
 #
 
+from distutils.version import LooseVersion
 import pytest
 
 from f5.bigip.resource import MissingRequiredCreationParameter
 from f5.bigip.resource import MissingUpdateParameter
+from f5.bigip.tm.net.vlan import TagModeDisallowedForTMOSVersion
 from icontrol.session import iControlUnexpectedHTTPError
 from requests.exceptions import HTTPError
 
@@ -76,7 +78,13 @@ def test_create_interfaces(self, request, bigip):
         i, _ = setup_interfaces_test(request, bigip, 'v1', 'Common')
         assert i.name == '1.1'
 
-    def test_update_exclusive_attrs(self, request, bigip):
+    @pytest.mark.skipif(
+        LooseVersion(
+            pytest.config.getoption('--release')
+        ) < LooseVersion('11.6.0'),
+        reason='tagMode is only allowed in 11.6.0 or greater.'
+    )
+    def test_update_exclusive_attrs_11_6_and_greater(self, request, bigip):
         '''Test that we remove the other exclusive args if we set one.
 
         The default interfaces that is made has the vlans set to tagged.
@@ -94,13 +102,45 @@ def test_update_exclusive_attrs(self, request, bigip):
         ifc.update()
         assert ifc.tagged is True
 
+    @pytest.mark.skipif(
+        LooseVersion(
+            pytest.config.getoption('--release')
+        ) >= LooseVersion('11.6.0'),
+        reason='tagMode is not allowed in 11.5.4.'
+    )
+    def test_update_exclusive_attrs_11_6_0_and_less(self, request, bigip):
+        '''Test that we remove the other exclusive args if we set one.
+
+        The default interfaces that is made has the vlans set to tagged.
+        We change it to untagged and make sure that the tagged is no longer
+        an attribute.
+        '''
+        ifc, _ = setup_interfaces_test(request, bigip, 'somevlan', 'Common')
+        ifc.untagged = True
+        assert not hasattr(ifc, 'tagged')
+        ifc.update()
+        assert ifc.untagged is True
+        ifc.tagged = True
+        ifc.tagMode = 'service'
+        assert not hasattr(ifc, 'untagged')
+        with pytest.raises(TagModeDisallowedForTMOSVersion) as ex:
+            ifc.update()
+        assert "'tagMode', is not allowed against the following version of " \
+            'TMOS: 11.5.4' in ex.value.message
+
     def test_update(self, request, bigip):
         i, _ = setup_interfaces_test(request, bigip, 'v1', 'Common')
         i.update(untagged=True)
         assert not hasattr(i, 'tagged')
         assert i.untagged is True
 
-    def test_update_mixed_attr_set(self, request, bigip):
+    @pytest.mark.skipif(
+        LooseVersion(
+            pytest.config.getoption('--release')
+        ) < LooseVersion('11.6.0'),
+        reason='tagMode is only allowed in 11.6.0 or greater.'
+    )
+    def test_update_mixed_attr_set_11_6_0_and_greater(self, request, bigip):
         '''Test that we get an Exception because we have both exclusives set.
 
         This only happens when the user sets the attribute and then does the
@@ -116,12 +156,51 @@ def test_update_mixed_attr_set(self, request, bigip):
             assert err.response.status_code == 400
             assert "may not be specified with" in err.response.text
 
-    def test_update_without_tagmode(self, request, bigip):
+    @pytest.mark.skipif(
+        LooseVersion(
+            pytest.config.getoption('--release')
+        ) >= LooseVersion('11.6.0'),
+        reason='tagMode is not allowed in 11.5.4 or less.'
+    )
+    def test_update_mixed_attr_set_11_6_0_and_less(self, request, bigip):
+        '''Test that we get an Exception because we have both exclusives set.
+
+        This only happens when the user sets the attribute and then does the
+        update with the other attribute set.  We don't actually know which one
+        the user wants to set.
+        '''
+        i, _ = setup_interfaces_test(request, bigip, 'v1', 'Common')
+        i.untagged = True
+        assert not hasattr(i, 'tagged')
+        assert i.untagged is True
+        with pytest.raises(TagModeDisallowedForTMOSVersion) as ex:
+            i.update(tagged=True, tagMode='service')
+        assert "'tagMode', is not allowed against the following version of " \
+            'TMOS: 11.5.4' in ex.value.message
+
+    @pytest.mark.skipif(
+        LooseVersion(
+            pytest.config.getoption('--release')
+        ) < LooseVersion('11.6.0'),
+        reason='tagMode is only allowed in 11.6.0 or greater.'
+    )
+    def test_update_without_tagmode_and_greater(self, request, bigip):
         i, _ = setup_interfaces_test(request, bigip, 'v1', 'Common')
         i.tagged = True
         with pytest.raises(MissingUpdateParameter):
             i.update()
 
+    @pytest.mark.skipif(
+        LooseVersion(
+            pytest.config.getoption('--release')
+        ) >= LooseVersion('11.6.0'),
+        reason='tagMode is not allowed in 11.5.4 or less.'
+    )
+    def test_update_without_tagmode_and_less(self, request, bigip):
+        i, _ = setup_interfaces_test(request, bigip, 'v1', 'Common')
+        i.tagged = True
+        i.update()
+
     def test_load(self, request, bigip):
         i1, v = setup_interfaces_test(request, bigip, 'v1', 'Common')
         i2 = v.interfaces_s.interfaces.load(name='1.1')
@@ -147,7 +226,13 @@ def test_create_no_args(self, bigip):
         with pytest.raises(MissingRequiredCreationParameter):
             v1.create()
 
-    def test_CURDL(self, request, bigip):
+    @pytest.mark.skipif(
+        LooseVersion(
+            pytest.config.getoption('--release')
+        ) < LooseVersion('11.6.0'),
+        reason='tagMode is only allowed in 11.6.0 or greater.'
+    )
+    def test_CURDL_11_6_0_and_greater(self, request, bigip):
         setup_vlan_collection_get_test(request, bigip)
         # Create a VLAN and verify some of the attributes
         v1 = bigip.net.vlans.vlan.create(name='v1', partition='Common')
@@ -183,6 +268,22 @@ def test_CURDL(self, request, bigip):
         assert v2.description == DESCRIPTION
         assert v1.description == DESCRIPTION + DESCRIPTION
 
+    @pytest.mark.skipif(
+        LooseVersion(
+            pytest.config.getoption('--release')
+        ) >= LooseVersion('11.6.0'),
+        reason='tagMode is not allowed in 11.5.4 or less.'
+    )
+    def test_CURDL_11_6_0_and_less(self, request, bigip):
+        setup_vlan_collection_get_test(request, bigip)
+        # Create a VLAN and verify some of the attributes
+        v1 = bigip.net.vlans.vlan.create(name='v1', partition='Common')
+        with pytest.raises(TagModeDisallowedForTMOSVersion) as ex:
+            v1.interfaces_s.interfaces.create(
+                name='1.1', tagged=True, tagMode='service')
+        assert "'tagMode', is not allowed against the following version of " \
+            'TMOS: 11.5.4' in ex.value.message
+
     def test_load_subcollection_(self, request, bigip):
         '''This tests for issue #148.
 
diff --git a/test/functional/tm/sys/test_sshd.py b/test/functional/tm/sys/test_sshd.py
@@ -17,7 +17,8 @@
 from pprint import pprint as pp
 import pytest
 
-V11_SUPPORTED = ['11.6.0', '11.6.1']
+# Revert version back to 11.6.0 from 11.6.2 when PR 588
+V11_SUPPORTED = ['11.6.2', '11.6.1']
 V12_SUPPORTED = ['12.0.0', '12.1.0']
 
 
