Added fixes for: #489 and #490

Author: wojtek0806

f5/bigip/tm/shared/bigip_failover_state.py

@@ -27,6 +27,7 @@
 """
 
 from f5.bigip.mixins import UnnamedResourceMixin
+from f5.bigip.mixins import UnsupportedMethod
 from f5.bigip.resource import ResourceBase
 
 
@@ -47,12 +48,13 @@ def __init__(self, shared):
         super(Bigip_Failover_State, self).__init__(shared)
         self._meta_data['required_load_parameters'] = set()
         self._meta_data['required_json_kind'] = ''
+        self._meta_data['supported_versions'].discard('11.6.0')
 
     def update(self, **kwargs):
         '''Update is not supported for BIG-IP® failover state.
 
         :raises: UnsupportedOperation
         '''
-        raise self.UnsupportedMethod(
+        raise UnsupportedMethod(
             "%s does not support the update method" % self.__class__.__name__
         )

test/functional/cm/test_device_group.py

@@ -13,8 +13,10 @@
 # limitations under the License.
 #
 
+import pytest
 from requests import HTTPError
 
+
 TEST_DESCR = "TEST DESCRIPTION"
 
 
@@ -67,7 +69,9 @@ def test_add_device(self, request, bigip):
         d1 = dg1.devices_s.devices.create(
             name=this_device.name, partition=this_device.partition)
         assert len(dg1.devices_s.get_collection()) == 1
-        assert d1.name == this_device.name
+        # This needs to be in this format due to the change between
+        # 11.6.0 Final and other versions.
+        assert this_device.name in d1.name
 
     def test_cm_sync_to_group(self, request, bigip):
         dg1, dgs = setup_device_group_test(
@@ -76,6 +80,10 @@ def test_cm_sync_to_group(self, request, bigip):
         cm_obj = bigip.cm.exec_cmd('run', utilCmdArgs=sync_cmd)
         assert cm_obj.utilCmdArgs == sync_cmd
 
+
+@pytest.mark.skipif(pytest.config.getoption('--release') == '12.0.0',
+                    reason='Behavior change in v12, causing this to fail')
+class TestSyncFromGroup(object):
     def test_cm_sync_from_group(self, request, bigip):
         dg1, dgs = setup_device_group_test(
             request, bigip, name='test-group', partition='Common')

test/functional/tm/sys/test_httpd.py

@@ -21,7 +21,9 @@ def cleaner(request, bigip):
     initial_httpd = bigip.sys.httpd.load()
 
     def teardown():
-        initial_httpd.update()
+        # There is a difference in 11.6.0 and 12.0.0 default for max clients.
+        # Added explicit maxClient to facilitate this change.
+        initial_httpd.update(maxClients=10)
     request.addfinalizer(teardown)