openstack/python-openstackclient
Code Issues Proposed changes

Merge "Fix can not set is_default in network"

Browse Source
This commit is contained in:
Jenkins 2017-02-24 04:13:38 +00:00 committed by Gerrit Code Review
commit 1450e8ff4f
3 changed files with 25 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
openstackclient/network/v2/network.py
View File

@ -111,10 +111,10 @@ def _get_attrs(client_manager, parsed_args):
attrs['router:external'] = False
if parsed_args.external:
attrs['router:external'] = True
if parsed_args.no_default:
attrs['is_default'] = False
if parsed_args.default:
attrs['is_default'] = True
if parsed_args.no_default:
attrs['is_default'] = False
if parsed_args.default:
attrs['is_default'] = True
# Update Provider network options
if parsed_args.provider_network_type:
attrs['provider:network_type'] = parsed_args.provider_network_type

68
openstackclient/tests/functional/network/v2/test_network.py
View File

@ -126,6 +126,7 @@ class NetworkTests(base.TestCase):
cmd_output = json.loads(self.openstack(
'network create -f json ' +
'--description aaaa ' +
'--no-default ' +
name1
))
self.addCleanup(self.openstack, 'network delete ' + name1)
@ -147,17 +148,11 @@ class NetworkTests(base.TestCase):
'Internal',
cmd_output["router:external"],
)
# NOTE(dtroyer): is_default is not present in the create output
# so make sure it stays that way.
# NOTE(stevemar): is_default *is* present in SDK 0.9.11 and newer,
# but the value seems to always be None, regardless
# of the --default or --no-default value.
# self.assertEqual('x', cmd_output)
if ('is_default' in cmd_output):
self.assertEqual(
None,
cmd_output["is_default"],
)
self.assertEqual(
False,
cmd_output["is_default"],
)
self.assertEqual(
True,
cmd_output["port_security_enabled"],
@ -185,11 +180,10 @@ class NetworkTests(base.TestCase):
True,
cmd_output["shared"],
)
if ('is_default' in cmd_output):
self.assertEqual(
None,
cmd_output["is_default"],
)
self.assertEqual(
None,
cmd_output["is_default"],
)
self.assertEqual(
True,
cmd_output["port_security_enabled"],
@ -275,16 +269,11 @@ class NetworkTests(base.TestCase):
'Internal',
cmd_output["router:external"],
)
# NOTE(dtroyer): is_default is not present in the create output
# so make sure it stays that way.
# NOTE(stevemar): is_default *is* present in SDK 0.9.11 and newer,
# but the value seems to always be None, regardless
# of the --default or --no-default value.
if ('is_default' in cmd_output):
self.assertEqual(
None,
cmd_output["is_default"],
)
self.assertEqual(
False,
cmd_output["is_default"],
)
self.assertEqual(
True,
cmd_output["port_security_enabled"],
@ -321,7 +310,6 @@ class NetworkTests(base.TestCase):
'External',
cmd_output["router:external"],
)
# why not 'None' like above??
self.assertEqual(
False,
cmd_output["is_default"],
@ -330,29 +318,3 @@ class NetworkTests(base.TestCase):
False,
cmd_output["port_security_enabled"],
)
# NOTE(dtroyer): There is ambiguity around is_default in that
# it is not in the API docs and apparently can
# not be set when the network is --external,
# although the option handling code only looks at
# the value of is_default when external is True.
raw_output = self.openstack(
'network set ' +
'--default ' +
name
)
self.assertOutput('', raw_output)
cmd_output = json.loads(self.openstack(
'network show -f json ' + name
))
self.assertEqual(
'cccc',
cmd_output["description"],
)
# NOTE(dtroyer): This should be 'True'
self.assertEqual(
False,
cmd_output["port_security_enabled"],
)

6
releasenotes/notes/bug-1665231-3df6d090d137fe4f.yaml Normal file
View File

@ -0,0 +1,6 @@
---
fixes:
- |
Allow ``--default`` and ``--no-default`` options in ``network create`` command to
be recognized when ``--external`` is not present.
[Bug `1665231 <https://bugs.launchpad.net/python-openstackclient/+bug/1665231>`_]