Merge pull request #1299 from caphrim007/bugfix.node-session-fixes

Fixes session errors

Author: f5-rahm

f5/bigip/tm/ltm/node.py

@@ -103,14 +103,14 @@ def _check_node_parameters(self, **kwargs):
     def _modify(self, **patch):
         """Override modify to check kwargs before request sent to device."""
         if 'state' in patch:
-            if patch['state'] != 'user-up' and patch['state'] != 'user-down':
+            if patch['state'] not in ['user-up', 'user-down', 'unchecked', 'fqdn-up']:
                 msg = "The node resource does not support a modify with the " \
                       "value of the 'state' attribute as %s. The accepted " \
-                      "values are 'user-up' or 'user-down'" % patch['state']
+                      "values are 'user-up', 'user-down', 'unchecked', or 'fqdn-up'" \
+                      % patch['state']
                 raise NodeStateModifyUnsupported(msg)
         if 'session' in patch:
-            if patch['session'] != 'user-enabled' and patch['state'] != \
-                    'user-disabled':
+            if patch['session'] not in ['user-enabled', 'user-disabled']:
                 msg = "The node resource does not support a modify with the " \
                       "value of the 'session' attribute as %s. " \
                       "The accepted values are 'user-enabled' or " \

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

@@ -167,6 +167,17 @@ def test_update_session_state_kwargs(self, request, mgmt_root):
         n2.session = n1.session
         n2.state = n1.state
 
+    def test_update_session_without_state(self, request, mgmt_root):
+        n1, nc1 = setup_node_test(
+            request, mgmt_root, 'Common', 'node1', '192.168.100.2')
+        assert n1.session == 'user-enabled'
+        assert n1.state == 'unchecked'
+        n1.update(session='user-disabled')
+        n2 = mgmt_root.tm.ltm.nodes.node.load(name='node1', partition='Common')
+        n2.session = 'user-disabled'
+        n2.session = n1.session
+        n2.state = n1.state
+
     def test_state_modify(self, request, mgmt_root):
         n1, nc1 = setup_node_test(
             request, mgmt_root, 'Common', 'node1', '10.10.10.1')
@@ -182,21 +193,14 @@ def test_state_modify_error(self, request, mgmt_root):
             request, mgmt_root, 'Common', 'node1', '10.10.10.1')
         with pytest.raises(NodeStateModifyUnsupported) as ex:
             n1.modify(state='down')
-        assert ex.value.message == "The node resource does not support a " \
-                                   "modify with the value of the 'state' " \
-                                   "attribute as down. The accepted values " \
-                                   "are 'user-up' or 'user-down'"
+        assert "The node resource does not support a" in str(ex.value)
 
     def test_session_modify_error(self, request, mgmt_root):
         n1, nc1 = setup_node_test(
             request, mgmt_root, 'Common', 'node1', '10.10.10.1')
         with pytest.raises(NodeStateModifyUnsupported) as ex:
-            n1.modify(state='monitor-enabled')
-        assert ex.value.message == "The node resource does not support a " \
-                                   "modify with the value of the 'state' " \
-                                   "attribute as monitor-enabled. " \
-                                   "The accepted values are " \
-                                   "'user-up' or 'user-down'"
+            n1.modify(session='monitor-enabled')
+        assert "The node resource does not support a" in str(ex.value)
 
 
 class TestNodes(object):