summaryrefslogtreecommitdiff
path: root/openstackclient
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-04-26 18:50:35 +0000
committerGerrit Code Review <review@openstack.org>2017-04-26 18:50:35 +0000
commit95736cebc3b32464c77fe1173d623f0be25d1d25 (patch)
treef90bd483574666df1b3196dc8ed5b01cd6bee1a9 /openstackclient
parentbf1f47c1be5bf9f6b25eab21eb06c3b0473bf34f (diff)
parentf8e8ace88abeb8f10f12805732688ff76f5de61c (diff)
downloadpython-openstackclient-95736cebc3b32464c77fe1173d623f0be25d1d25.tar.gz
Merge "SDK refactor: Set "is_admin_state_up" for network agent"
Diffstat (limited to 'openstackclient')
-rw-r--r--openstackclient/network/v2/network_agent.py4
-rw-r--r--openstackclient/tests/unit/network/v2/test_network_agent.py4
2 files changed, 4 insertions, 4 deletions
diff --git a/openstackclient/network/v2/network_agent.py b/openstackclient/network/v2/network_agent.py
index dd3fdc24..1334f77e 100644
--- a/openstackclient/network/v2/network_agent.py
+++ b/openstackclient/network/v2/network_agent.py
@@ -282,11 +282,11 @@ class SetNetworkAgent(command.Command):
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)
diff --git a/openstackclient/tests/unit/network/v2/test_network_agent.py b/openstackclient/tests/unit/network/v2/test_network_agent.py
index 0d741e06..9bb3f090 100644
--- a/openstackclient/tests/unit/network/v2/test_network_agent.py
+++ b/openstackclient/tests/unit/network/v2/test_network_agent.py
@@ -322,8 +322,6 @@ class TestRemoveNetworkFromAgent(TestNetworkAgent):
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 @@ class TestSetNetworkAgent(TestNetworkAgent):
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 @@ class TestSetNetworkAgent(TestNetworkAgent):
attrs = {
'admin_state_up': False,
+ 'is_admin_state_up': False,
}
self.network.update_agent.assert_called_once_with(
self._network_agent, **attrs)