diff options
Diffstat (limited to 'openstackclient/network')
| -rw-r--r-- | openstackclient/network/v2/network.py | 16 | ||||
| -rw-r--r-- | openstackclient/network/v2/network_rbac.py | 15 |
2 files changed, 25 insertions, 6 deletions
diff --git a/openstackclient/network/v2/network.py b/openstackclient/network/v2/network.py index d7b37ebe..54e2821c 100644 --- a/openstackclient/network/v2/network.py +++ b/openstackclient/network/v2/network.py @@ -271,14 +271,16 @@ class CreateNetwork(common.NetworkAndComputeShowOne, '--external', action='store_true', help=self.enhance_help_neutron( - _("Set this network as an external network " + _("The network has an external routing facility that's not " + "managed by Neutron and can be used as in: " + "openstack router set --external-gateway NETWORK " "(external-net extension required)")) ) external_router_grp.add_argument( '--internal', action='store_true', help=self.enhance_help_neutron( - _("Set this network as an internal network (default)")) + _("Opposite of '--external' (default)")) ) default_router_grp = parser.add_mutually_exclusive_group() default_router_grp.add_argument( @@ -665,12 +667,12 @@ class SetNetwork(common.NeutronCommandWithExtraArgs): ) parser.add_argument( '--description', - metavar="<description", + metavar="<description>", help=_("Set network description") ) parser.add_argument( '--mtu', - metavar="<mtu", + metavar="<mtu>", help=_("Set network mtu") ) port_security_group = parser.add_mutually_exclusive_group() @@ -690,13 +692,15 @@ class SetNetwork(common.NeutronCommandWithExtraArgs): external_router_grp.add_argument( '--external', action='store_true', - help=_("Set this network as an external network " + help=_("The network has an external routing facility that's not " + "managed by Neutron and can be used as in: " + "openstack router set --external-gateway NETWORK " "(external-net extension required)") ) external_router_grp.add_argument( '--internal', action='store_true', - help=_("Set this network as an internal network") + help=_("Opposite of '--external'") ) default_router_grp = parser.add_mutually_exclusive_group() default_router_grp.add_argument( diff --git a/openstackclient/network/v2/network_rbac.py b/openstackclient/network/v2/network_rbac.py index 91cd9dc3..fa4fca7c 100644 --- a/openstackclient/network/v2/network_rbac.py +++ b/openstackclient/network/v2/network_rbac.py @@ -218,6 +218,11 @@ class ListNetworkRBAC(command.Lister): 'action ("access_as_external" or "access_as_shared")') ) parser.add_argument( + '--target-project', + metavar='<target-project>', + help=_('List network RBAC policies for a specific target project') + ) + parser.add_argument( '--long', action='store_true', default=False, @@ -247,6 +252,16 @@ class ListNetworkRBAC(command.Lister): query['object_type'] = parsed_args.type if parsed_args.action is not None: query['action'] = parsed_args.action + if parsed_args.target_project is not None: + project_id = "*" + + if parsed_args.target_project != "*": + identity_client = self.app.client_manager.identity + project_id = identity_common.find_project( + identity_client, + parsed_args.target_project, + ).id + query['target_project_id'] = project_id data = client.rbac_policies(**query) |