Merge pull request #659 from caphrim007/bugfix.11.6.1-test-fixes

Fixes some 11.6.1 test issues

Author: pjbreaux

test/functional/tm/sys/test_ntp.py

@@ -13,6 +13,9 @@
 #   limitations under the License.
 #
 
+import pytest
+
+from distutils.version import LooseVersion
 from requests.exceptions import HTTPError
 
 
@@ -70,8 +73,13 @@ def test_create_base(self, request, mgmt_root):
 
         ntp1 = ntp.restrict.create(name='r1', partition='Common')
 
-        assert ntp1.name == 'r1'
-        assert ntp1.partition == 'Common'
+        if pytest.config.getoption('--release') < LooseVersion('11.6.1'):
+            assert ntp1.name == 'r1'
+            assert ntp1.partition == 'Common'
+        else:
+            assert ntp1.name == '/Common/r1'
+            # The 'partition' attribute was removed in 11.6.1?
+
         assert ntp1.defaultEntry == "disabled"
         assert ntp1.ignore == "disabled"
         assert ntp1.kod == "disabled"
@@ -114,8 +122,18 @@ def test_create_full(self, request, mgmt_root):
         )
         ntp1 = ntp.restrict.create(name='r2', partition='Common', **params)
 
-        assert ntp1.name == 'r2'
-        assert ntp1.partition == 'Common'
+        # In 11.6.1 and later they started prepending the partition name
+        # to the name attribute here. So we handle this case for our tests.
+        #
+        # According to Narendra, they should always have behaved this way
+        # so this must have been a bugfix
+        if pytest.config.getoption('--release') < LooseVersion('11.6.1'):
+            assert ntp1.name == 'r2'
+            assert ntp1.partition == 'Common'
+        else:
+            assert ntp1.name == '/Common/r2'
+            # The 'partition' attribute was removed in 11.6.1?
+
         assert ntp1.address == "192.168.1.0"
         assert ntp1.defaultEntry == "enabled"
         assert ntp1.ignore == "enabled"

test/functional/tm/sys/test_snmp.py

@@ -338,7 +338,17 @@ def test_community_create_refresh_update_delete_load(
         )
 
         assert comm1.communityName == 'commtest1'
-        assert comm1.name == 'commtest1'
+
+        # In 11.6.1 and later they started prepending the partition name
+        # to the name attribute here. So we handle this case for our tests.
+        #
+        # According to Narendra, they should always have behaved this way
+        # so this must have been a bugfix
+        if pytest.config.getoption('--release') < LooseVersion('11.6.1'):
+            assert comm1.name == 'commtest1'
+        else:
+            assert comm1.name == '/Common/commtest1'
+
         assert comm1.access == 'ro'
         assert comm1.ipv6 == 'disabled'