Merge "SDK refactor: Set "is_admin_state_up" for network agent"

Author: Jenkins

openstackclient/network/v2/network_agent.py

@@ -282,11 +282,11 @@ def take_action(self, parsed_args):
         attrs = {}
         if parsed_args.description is not None:
             attrs['description'] = str(parsed_args.description)
-        # TODO(huanxuan): Also update by the new attribute name
-        # "is_admin_state_up" after sdk 0.9.12
         if parsed_args.enable:
+            attrs['is_admin_state_up'] = True
             attrs['admin_state_up'] = True
         if parsed_args.disable:
+            attrs['is_admin_state_up'] = False
             attrs['admin_state_up'] = False
         client.update_agent(obj, **attrs)
 

openstackclient/tests/unit/network/v2/test_network_agent.py

@@ -322,8 +322,6 @@ def test_network_from_dhcp_agent(self):
             self.agent, self.net)
 
 
-# TODO(huanxuan): Also update by the new attribute name
-# "is_admin_state_up" after sdk 0.9.12
 class TestSetNetworkAgent(TestNetworkAgent):
 
     _network_agent = (
@@ -372,6 +370,7 @@ def test_set_all(self):
         attrs = {
             'description': 'new_description',
             'admin_state_up': True,
+            'is_admin_state_up': True,
         }
         self.network.update_agent.assert_called_once_with(
             self._network_agent, **attrs)
@@ -393,6 +392,7 @@ def test_set_with_disable(self):
 
         attrs = {
             'admin_state_up': False,
+            'is_admin_state_up': False,
         }
         self.network.update_agent.assert_called_once_with(
             self._network_agent, **attrs)