summaryrefslogtreecommitdiff
path: root/openstackclient/network
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2020-04-10 00:18:56 +0000
committerGerrit Code Review <review@openstack.org>2020-04-10 00:18:56 +0000
commit347c5b9df45c8caf55ed5328bb65abb4ee8f0d28 (patch)
treebc008749df43c4c0806824a4a666402330e98a22 /openstackclient/network
parent78b18030b5aaa42d7b438d73cb8d1170869ec758 (diff)
parentf03cb68ad89dcc856fdad1a46fee36b7d68c5ba2 (diff)
downloadpython-openstackclient-347c5b9df45c8caf55ed5328bb65abb4ee8f0d28.tar.gz
Merge "Add 'address_scope' type support to network rbac commands"
Diffstat (limited to 'openstackclient/network')
-rw-r--r--openstackclient/network/v2/network_rbac.py17
1 files changed, 12 insertions, 5 deletions
diff --git a/openstackclient/network/v2/network_rbac.py b/openstackclient/network/v2/network_rbac.py
index 1781193f..0d6e0792 100644
--- a/openstackclient/network/v2/network_rbac.py
+++ b/openstackclient/network/v2/network_rbac.py
@@ -58,6 +58,10 @@ def _get_attrs(client_manager, parsed_args):
object_id = network_client.find_security_group(
parsed_args.rbac_object,
ignore_missing=False).id
+ if parsed_args.type == 'address_scope':
+ object_id = network_client.find_address_scope(
+ parsed_args.rbac_object,
+ ignore_missing=False).id
attrs['object_id'] = object_id
identity_client = client_manager.identity
@@ -97,9 +101,11 @@ class CreateNetworkRBAC(command.ShowOne):
'--type',
metavar="<type>",
required=True,
- choices=['security_group', 'qos_policy', 'network'],
+ choices=['address_scope', 'security_group',
+ 'qos_policy', 'network'],
help=_('Type of the object that RBAC policy '
- 'affects ("security_group", "qos_policy" or "network")')
+ 'affects ("address_scope", "security_group", '
+ '"qos_policy" or "network")')
)
parser.add_argument(
'--action',
@@ -188,10 +194,11 @@ class ListNetworkRBAC(command.Lister):
parser.add_argument(
'--type',
metavar='<type>',
- choices=['security_group', 'qos_policy', 'network'],
+ choices=['address_scope', 'security_group',
+ 'qos_policy', 'network'],
help=_('List network RBAC policies according to '
- 'given object type ("security_group", "qos_policy" '
- 'or "network")')
+ 'given object type ("address_scope", "security_group", '
+ '"qos_policy" or "network")')
)
parser.add_argument(
'--action',