diff options
| author | Zuul <zuul@review.opendev.org> | 2020-04-22 15:40:21 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-04-22 15:40:21 +0000 |
| commit | af1ffc456f0c403da5be979f8d4daab706b38f3a (patch) | |
| tree | cc27c88141bd598b186e9b28c127edc2becab5b5 /openstackclient/network | |
| parent | 4886b023805c06cd2bd5d7beb47c6c4f63beb058 (diff) | |
| parent | bdaebeb508a65f778b1230cc6f112f34745d6351 (diff) | |
| download | python-openstackclient-af1ffc456f0c403da5be979f8d4daab706b38f3a.tar.gz | |
Merge "Revert "Disallow setting default on internal network""
Diffstat (limited to 'openstackclient/network')
| -rw-r--r-- | openstackclient/network/v2/network.py | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/openstackclient/network/v2/network.py b/openstackclient/network/v2/network.py index 3f579b6d..00cb782b 100644 --- a/openstackclient/network/v2/network.py +++ b/openstackclient/network/v2/network.py @@ -16,7 +16,6 @@ from cliff import columns as cliff_columns from osc_lib.cli import format_columns from osc_lib.command import command -from osc_lib import exceptions from osc_lib import utils from osc_lib.utils import tags as _tag @@ -126,9 +125,6 @@ def _get_attrs_network(client_manager, parsed_args): attrs['is_default'] = False if parsed_args.default: attrs['is_default'] = True - if attrs.get('is_default') and not attrs.get('router:external'): - msg = _("Cannot set default for internal network") - raise exceptions.CommandError(msg) # Update Provider network options if parsed_args.provider_network_type: attrs['provider:network_type'] = parsed_args.provider_network_type @@ -706,8 +702,7 @@ class SetNetwork(command.Command): default_router_grp.add_argument( '--default', action='store_true', - help=_("Set the network as the default external network " - "(cannot be used with internal network).") + help=_("Set the network as the default external network") ) default_router_grp.add_argument( '--no-default', |
