summaryrefslogtreecommitdiff
path: root/openstackclient/network/v2
diff options
context:
space:
mode:
authorVasyl Saienko <vsaienko@mirantis.com>2020-04-06 11:16:22 +0000
committerVasyl Saienko <vsaienko@mirantis.com>2020-04-08 07:14:52 +0000
commitbdaebeb508a65f778b1230cc6f112f34745d6351 (patch)
treefbead9103f8ec964aafb42c40a75b8dad81af153 /openstackclient/network/v2
parent74a7c1d9d6efc545676cec1d9efeb2a86c5bc548 (diff)
downloadpython-openstackclient-bdaebeb508a65f778b1230cc6f112f34745d6351.tar.gz
Revert "Disallow setting default on internal network"
The original patch assumes that both --external and --is-default are set in the same request and broke case when --is-default is set as an network update. The validation logic have to be moved on API side to avoid extra API calls from openstackclient. This reverts commit 962efd949feb461283a9bb4a668fbd310f80ba40. Related-Bug: #1745658 Change-Id: Idf08abb0e08a6880f89c3e9df9dd2ac82f36c432
Diffstat (limited to 'openstackclient/network/v2')
-rw-r--r--openstackclient/network/v2/network.py7
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',