Fixups after rebasing from development.

Author: Paul Breaux

f5/bigip/resource.py

@@ -568,6 +568,30 @@ def _produce_instance(self, response):
         new_instance._activate_URI(new_instance.selfLink)
         return new_instance
 
+    def _reduce_boolean_pair(self, config_dict, key1, key2):
+        '''Ensure only one key with a boolean value is present in dict.
+
+        :param config_dict: dict -- dictionary of config or kwargs
+        :param key1: string -- first key name
+        :param key2: string -- second key name
+        :raises: BooleansToReduceHaveSameValue
+        '''
+
+        if key1 in config_dict and key2 in config_dict \
+                and config_dict[key1] == config_dict[key2]:
+            msg = 'Boolean pair, %s and %s, have same value: %s. If both ' \
+                'are given to this method, they cannot be the same, as this ' \
+                'method cannot decide which one should be True.' \
+                % (key1, key2, config_dict[key1])
+            raise BooleansToReduceHaveSameValue(msg)
+        elif key1 in config_dict and not config_dict[key1]:
+            config_dict[key2] = True
+            config_dict.pop(key1)
+        elif key2 in config_dict and not config_dict[key2]:
+            config_dict[key1] = True
+            config_dict.pop(key2)
+        return config_dict
+
 
 class OrganizingCollection(ResourceBase):
     """Base class for objects that collect resources under them.
@@ -762,30 +786,6 @@ def _activate_URI(self, selfLinkuri):
                                 'creation_uri_frag': frag,
                                 'allowed_lazy_attributes': attrs})
 
-    def _reduce_boolean_pair(self, config_dict, key1, key2):
-        '''Ensure only one key with a boolean value is present in dict.
-
-        :param config_dict: dict -- dictionary of config or kwargs
-        :param key1: string -- first key name
-        :param key2: string -- second key name
-        :raises: BooleansToReduceHaveSameValue
-        '''
-
-        if key1 in config_dict and key2 in config_dict \
-                and config_dict[key1] == config_dict[key2]:
-            msg = 'Boolean pair, %s and %s, have same value: %s. If both ' \
-                'are given to this method, they cannot be the same, as this ' \
-                'method cannot decide which one should be True.' \
-                % (key1, key2, config_dict[key1])
-            raise BooleansToReduceHaveSameValue(msg)
-        elif key1 in config_dict and not config_dict[key1]:
-            config_dict[key2] = True
-            config_dict.pop(key1)
-        elif key2 in config_dict and not config_dict[key2]:
-            config_dict[key1] = True
-            config_dict.pop(key2)
-        return config_dict
-
     def _create(self, **kwargs):
         """wrapped by `create` override that in subclasses to customize"""
         if 'uri' in self._meta_data:

f5/bigip/tm/sys/failover.py

@@ -27,13 +27,10 @@
 """
 
 from f5.bigip.mixins import CommandExecutionMixin
-from f5.bigip.mixins import ReduceBooleanPairToTrueMixin
 from f5.bigip.resource import UnnamedResource
 
 
-class Failover(
-        UnnamedResource, CommandExecutionMixin, ReduceBooleanPairToTrueMixin
-):
+class Failover(UnnamedResource, CommandExecutionMixin):
     '''BIG-IP® Failover stats and state change.
 
     The failover object only supports load, update, and refresh because it is
@@ -93,7 +90,7 @@ def exec_cmd(self, command, **kwargs):
         :: raises InvalidParameterValue
         """
 
-        self._reduce_boolean_pair(kwargs, 'online', 'offline')
+        kwargs = self._reduce_boolean_pair(kwargs, 'online', 'offline')
         if 'offline' in kwargs:
             self._meta_data['exclusive_attributes'].append(
                 ('offline', 'standby'))

test/functional/tm/sys/test_failover.py

@@ -13,7 +13,7 @@
 # limitations under the License.
 #
 
-from f5.bigip.mixins import BooleansToReduceHaveSameValue
+from f5.bigip.resource import BooleansToReduceHaveSameValue
 from f5.multi_device.utils import get_device_info
 from f5.multi_device.utils import pollster
 from pprint import pprint as pp