openstack/python-openstackclient
Code Issues Proposed changes

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

Browse Source
This commit is contained in:
Jenkins 2017-04-26 18:50:35 +00:00 committed by Gerrit Code Review
commit 95736cebc3
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openstackclient/network/v2/network_agent.py
View File

@ -282,11 +282,11 @@ class SetNetworkAgent(command.Command):
attrs = {} attrs = {}
if parsed_args.description is not None: if parsed_args.description is not None:
attrs['description'] = str(parsed_args.description) 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: if parsed_args.enable:
attrs['is_admin_state_up'] = True
attrs['admin_state_up'] = True attrs['admin_state_up'] = True
if parsed_args.disable: if parsed_args.disable:
attrs['is_admin_state_up'] = False
attrs['admin_state_up'] = False attrs['admin_state_up'] = False
client.update_agent(obj, **attrs) client.update_agent(obj, **attrs)

4
openstackclient/tests/unit/network/v2/test_network_agent.py
View File

@ -322,8 +322,6 @@ class TestRemoveNetworkFromAgent(TestNetworkAgent):
self.agent, self.net) 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): class TestSetNetworkAgent(TestNetworkAgent):
_network_agent = ( _network_agent = (
@ -372,6 +370,7 @@ class TestSetNetworkAgent(TestNetworkAgent):
attrs = { attrs = {
'description': 'new_description', 'description': 'new_description',
'admin_state_up': True, 'admin_state_up': True,
'is_admin_state_up': True,
} }
self.network.update_agent.assert_called_once_with( self.network.update_agent.assert_called_once_with(
self._network_agent, **attrs) self._network_agent, **attrs)
@ -393,6 +392,7 @@ class TestSetNetworkAgent(TestNetworkAgent):
attrs = { attrs = {
'admin_state_up': False, 'admin_state_up': False,
'is_admin_state_up': False,
} }
self.network.update_agent.assert_called_once_with( self.network.update_agent.assert_called_once_with(
self._network_agent, **attrs) self._network_agent, **attrs)