diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-03-28 15:57:31 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-03-28 15:57:31 +0000 |
| commit | 5f55e99d464b2ca0a9f1cf879164b2cc2bb23fc5 (patch) | |
| tree | d39eede33be1f0d05f85a70d9421b12ad74f4ca9 /openstackclient | |
| parent | d5596862b1bbd9fa0bcd1aeb8befad7fab4e3d2a (diff) | |
| parent | 2109bce85a40da3e3cbebed1cac661611564ccb2 (diff) | |
| download | python-openstackclient-5f55e99d464b2ca0a9f1cf879164b2cc2bb23fc5.tar.gz | |
Merge "Support security group name for --src-group"
Diffstat (limited to 'openstackclient')
| -rw-r--r-- | openstackclient/network/v2/security_group_rule.py | 12 | ||||
| -rw-r--r-- | openstackclient/tests/network/v2/test_security_group_rule.py | 10 |
2 files changed, 15 insertions, 7 deletions
diff --git a/openstackclient/network/v2/security_group_rule.py b/openstackclient/network/v2/security_group_rule.py index e0244654..f60995ab 100644 --- a/openstackclient/network/v2/security_group_rule.py +++ b/openstackclient/network/v2/security_group_rule.py @@ -69,7 +69,7 @@ class CreateSecurityGroupRule(common.NetworkAndComputeShowOne): source_group.add_argument( "--src-group", metavar="<group>", - help="Source security group (ID only)", + help="Source security group (name or ID)", ) parser.add_argument( "--dst-port", @@ -103,7 +103,10 @@ class CreateSecurityGroupRule(common.NetworkAndComputeShowOne): attrs['port_range_max'] = parsed_args.dst_port[1] attrs['protocol'] = parsed_args.proto if parsed_args.src_group is not None: - attrs['remote_group_id'] = parsed_args.src_group + attrs['remote_group_id'] = client.find_security_group( + parsed_args.src_group, + ignore_missing=False + ).id else: attrs['remote_ip_prefix'] = parsed_args.src_ip attrs['security_group_id'] = security_group_id @@ -123,6 +126,11 @@ class CreateSecurityGroupRule(common.NetworkAndComputeShowOne): from_port, to_port = -1, -1 else: from_port, to_port = parsed_args.dst_port + if parsed_args.src_group is not None: + parsed_args.src_group = utils.find_resource( + client.security_groups, + parsed_args.src_group, + ).id obj = client.security_group_rules.create( group.id, parsed_args.proto, diff --git a/openstackclient/tests/network/v2/test_security_group_rule.py b/openstackclient/tests/network/v2/test_security_group_rule.py index a0d6185c..81b9e18b 100644 --- a/openstackclient/tests/network/v2/test_security_group_rule.py +++ b/openstackclient/tests/network/v2/test_security_group_rule.py @@ -149,13 +149,13 @@ class TestCreateSecurityGroupRuleNetwork(TestSecurityGroupRuleNetwork): }) arglist = [ '--dst-port', str(self._security_group_rule.port_range_min), - '--src-group', self._security_group.id, + '--src-group', self._security_group.name, self._security_group.id, ] verifylist = [ ('dst_port', (self._security_group_rule.port_range_min, self._security_group_rule.port_range_max)), - ('src_group', self._security_group.id), + ('src_group', self._security_group.name), ('group', self._security_group.id), ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) @@ -289,17 +289,17 @@ class TestCreateSecurityGroupRuleCompute(TestSecurityGroupRuleCompute): expected_columns, expected_data = self._setup_security_group_rule({ 'from_port': 22, 'to_port': 22, - 'group': {'name': self._security_group.id}, + 'group': {'name': self._security_group.name}, }) arglist = [ '--dst-port', str(self._security_group_rule.from_port), - '--src-group', self._security_group.id, + '--src-group', self._security_group.name, self._security_group.id, ] verifylist = [ ('dst_port', (self._security_group_rule.from_port, self._security_group_rule.to_port)), - ('src_group', self._security_group.id), + ('src_group', self._security_group.name), ('group', self._security_group.id), ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) |