Merge pull request #1374 from jasonrahm/bug.virtual_server

Fixing exclusive attributes bug in the Virtual Server resource

Author: f5-rahm

f5/bigip/test/unit/test_resource.py

@@ -291,16 +291,15 @@ def test_reduce_boolean_removes_nothing(self, fake_vs):
         assert 'disabled' not in kwargs['json']
 
     def test_reduce_boolean_same_value(self, fake_vs):
-        with pytest.raises(BooleansToReduceHaveSameValue) as ex:
+        with pytest.raises(ExclusiveAttributesPresent) as ex:
             fake_vs.create(
                 partition='Common',
                 name='test_create',
                 enabled=True,
                 disabled=True
             )
-        msg = 'Boolean pair, enabled and disabled, have same value: True. ' \
-            'If both are given to this method, they cannot be the same, as ' \
-            'this method cannot decide which one should be True.'
+        msg = 'Mutually exclusive arguments submitted. The following ' \
+              'arguments cannot be set together: "disabled, enabled".'
         assert msg == str(ex.value)
 
 

f5/bigip/tm/ltm/test/functional/test_virtual.py

@@ -34,6 +34,16 @@ def basic_rule(mgmt_root):
     rule1.delete()
 
 
+@pytest.fixture
+def basic_vlan(mgmt_root):
+    vlan1 = mgmt_root.tm.net.vlans.vlan.create(
+        name='testvlan',
+        partition='Common'
+    )
+    yield vlan1
+    vlan1.delete()
+
+
 @pytest.fixture
 def virtual_setup(mgmt_root):
     vs_kwargs = {'name': 'vs', 'partition': 'Common'}
@@ -117,6 +127,35 @@ def test_virtual_modify(self, request, mgmt_root):
     def test_virtual_no_rules(self, virtual_setup, basic_rule):
         assert len(virtual_setup.rules) == 0
 
+    def test_virtual_state_toggle(self, virtual_setup):
+        virtual_setup.disabled = True
+        virtual_setup.update()
+        assert hasattr(virtual_setup, 'disabled')
+        assert not hasattr(virtual_setup, 'enabled')
+
+        virtual_setup.enabled = True
+        virtual_setup.update()
+        assert hasattr(virtual_setup, 'enabled')
+        assert not hasattr(virtual_setup, 'disabled')
+
+    def test_virtual_vlan_toggle(self, virtual_setup, basic_vlan):
+        virtual_setup.vlansEnabled = True
+        virtual_setup.update()
+        assert hasattr(virtual_setup, 'vlansEnabled')
+        assert not hasattr(virtual_setup, 'vlansDisabled')
+        assert not hasattr(virtual_setup, 'vlans')
+
+        virtual_setup.vlans = ['/Common/testvlan']
+        virtual_setup.update()
+        assert hasattr(virtual_setup, 'vlans')
+
+        virtual_setup.vlansDisabled = True
+        virtual_setup.vlans = []
+        virtual_setup.update()
+        assert hasattr(virtual_setup, 'vlansDisabled')
+        assert not hasattr(virtual_setup, 'vlansEnabled')
+        assert not hasattr(virtual_setup, 'vlans')
+
     def test_virtual_modify2(self, virtual_setup, basic_rule):
         virtual_setup.modify(rules=[basic_rule.name])
         virtual_setup.refresh()

f5/bigip/tm/ltm/virtual.py

@@ -30,6 +30,7 @@
 from distutils.version import LooseVersion
 
 from f5.bigip.mixins import CheckExistenceMixin
+from f5.bigip.mixins import ExclusiveAttributesMixin
 from f5.bigip.resource import Collection
 from f5.bigip.resource import Resource
 from f5.sdk_exception import NonExtantVirtualPolicy
@@ -48,7 +49,7 @@ def __init__(self, ltm):
             {'tm:ltm:virtual:virtualstate': Virtual}
 
 
-class Virtual(Resource):
+class Virtual(Resource, ExclusiveAttributesMixin):
     """BIG-IP® LTM virtual resource"""
     def __init__(self, virtual_s):
         super(Virtual, self).__init__(virtual_s)
@@ -57,6 +58,8 @@ def __init__(self, virtual_s):
         self._meta_data['attribute_registry'] =\
             {'tm:ltm:virtual:profiles:profilescollectionstate': Profiles_s,
              'tm:ltm:virtual:policies:policiescollectionstate': Policies_s}
+        self._meta_data['exclusive_attributes'].append(('enabled', 'disabled'))
+        self._meta_data['exclusive_attributes'].append(('vlansEnabled', 'vlansDisabled'))
 
     def load(self, **kwargs):
         result = self._load(**kwargs)