diff options
| author | qtang <qtang@vmware.com> | 2016-07-13 17:28:45 +0800 |
|---|---|---|
| committer | qtang <qtang@vmware.com> | 2016-07-19 16:35:36 +0800 |
| commit | 34435d9ca2e35ff02651a5fe715fc36694ecb8b1 (patch) | |
| tree | ac2f49917b701cf667f4283b7d74fe3dc32041a7 /openstackclient | |
| parent | 60639d76a742852e18f9e2889c480be95596c268 (diff) | |
| download | python-openstackclient-34435d9ca2e35ff02651a5fe715fc36694ecb8b1.tar.gz | |
Exchange the check order for the dhcp and no-dhcp
The dhcp is setting with True by default and progress always
jump into the first if check.
So the no-dhcp option always ignored there.
Check the no-dhcp option first and then the dhcp option value
to avoid this.
Change-Id: Ide640e2cab3936d419ca62105304ff5d4a8a2074
Closes-Bug: #1602588
Diffstat (limited to 'openstackclient')
| -rw-r--r-- | openstackclient/network/v2/subnet.py | 3 | ||||
| -rw-r--r-- | openstackclient/tests/network/v2/test_subnet.py | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/openstackclient/network/v2/subnet.py b/openstackclient/network/v2/subnet.py index 45d3442d..f26f6804 100644 --- a/openstackclient/network/v2/subnet.py +++ b/openstackclient/network/v2/subnet.py @@ -168,7 +168,7 @@ def _get_attrs(client_manager, parsed_args, is_create=True): attrs['allocation_pools'] = parsed_args.allocation_pools if parsed_args.dhcp: attrs['enable_dhcp'] = True - elif parsed_args.no_dhcp: + if parsed_args.no_dhcp: attrs['enable_dhcp'] = False if ('dns_nameservers' in parsed_args and parsed_args.dns_nameservers is not None): @@ -223,7 +223,6 @@ class CreateSubnet(command.ShowOne): dhcp_enable_group.add_argument( '--dhcp', action='store_true', - default=True, help=_("Enable DHCP (default)") ) dhcp_enable_group.add_argument( diff --git a/openstackclient/tests/network/v2/test_subnet.py b/openstackclient/tests/network/v2/test_subnet.py index 46af44fb..e24b49e8 100644 --- a/openstackclient/tests/network/v2/test_subnet.py +++ b/openstackclient/tests/network/v2/test_subnet.py @@ -236,7 +236,6 @@ class TestCreateSubnet(TestSubnet): self.network.create_subnet.assert_called_once_with(**{ 'cidr': self._subnet.cidr, - 'enable_dhcp': self._subnet.enable_dhcp, 'ip_version': self._subnet.ip_version, 'name': self._subnet.name, 'network_id': self._subnet.network_id, @@ -410,7 +409,6 @@ class TestCreateSubnet(TestSubnet): self.network.create_subnet.assert_called_once_with(**{ 'cidr': self._subnet.cidr, - 'enable_dhcp': self._subnet.enable_dhcp, 'ip_version': self._subnet.ip_version, 'name': self._subnet.name, 'network_id': self._subnet.network_id, |