Merge "Refactor security group rule create to use SDK"

2 files changed, 3 insertions, 269 deletions

diff --git a/openstackclient/tests/compute/v2/fakes.py b/openstackclient/tests/compute/v2/fakes.py
index 809825d0..fe9b3c75 100644
--- a/openstackclient/tests/compute/v2/fakes.py
+++ b/openstackclient/tests/compute/v2/fakes.py
@@ -393,13 +393,13 @@ class FakeSecurityGroupRule(object):
 
         # Set default attributes.
         security_group_rule_attrs = {
-            'from_port': -1,
+            'from_port': 0,
             'group': {},
             'id': 'security-group-rule-id-' + uuid.uuid4().hex,
-            'ip_protocol': 'icmp',
+            'ip_protocol': 'tcp',
             'ip_range': {'cidr': '0.0.0.0/0'},
             'parent_group_id': 'security-group-id-' + uuid.uuid4().hex,
-            'to_port': -1,
+            'to_port': 0,
         }
 
         # Overwrite default attributes.
diff --git a/openstackclient/tests/compute/v2/test_security_group_rule.py b/openstackclient/tests/compute/v2/test_security_group_rule.py
index 9a8003f3..42bf2c26 100644
--- a/openstackclient/tests/compute/v2/test_security_group_rule.py
+++ b/openstackclient/tests/compute/v2/test_security_group_rule.py
@@ -17,7 +17,6 @@ from openstackclient.compute.v2 import security_group
 from openstackclient.tests.compute.v2 import fakes as compute_fakes
 from openstackclient.tests import fakes
 from openstackclient.tests.identity.v2_0 import fakes as identity_fakes
-from openstackclient.tests import utils
 
 
 security_group_id = '11'
@@ -111,271 +110,6 @@ class TestSecurityGroupRule(compute_fakes.TestComputev2):
         self.sg_rules_mock.reset_mock()
 
 
-class TestSecurityGroupRuleCreate(TestSecurityGroupRule):
-
-    columns = (
-        'id',
-        'ip_protocol',
-        'ip_range',
-        'parent_group_id',
-        'port_range',
-        'remote_security_group',
-    )
-
-    def setUp(self):
-        super(TestSecurityGroupRuleCreate, self).setUp()
-
-        self.secgroups_mock.get.return_value = FakeSecurityGroupRuleResource(
-            None,
-            copy.deepcopy(SECURITY_GROUP),
-            loaded=True,
-        )
-
-        # Get the command object to test
-        self.cmd = security_group.CreateSecurityGroupRule(self.app, None)
-
-    def test_security_group_rule_create_no_options(self):
-        self.sg_rules_mock.create.return_value = FakeSecurityGroupRuleResource(
-            None,
-            copy.deepcopy(SECURITY_GROUP_RULE),
-            loaded=True,
-        )
-
-        arglist = [
-            security_group_name,
-        ]
-        verifylist = [
-            ('group', security_group_name),
-        ]
-        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
-
-        # In base command class ShowOne in cliff, abstract method take_action()
-        # returns a two-part tuple with a tuple of column names and a tuple of
-        # data to be shown.
-        columns, data = self.cmd.take_action(parsed_args)
-
-        # SecurityGroupManager.create(name, description)
-        self.sg_rules_mock.create.assert_called_with(
-            security_group_id,
-            'tcp',
-            0,
-            0,
-            security_group_rule_cidr,
-            None,
-        )
-
-        self.assertEqual(self.columns, columns)
-        datalist = (
-            security_group_rule_id,
-            'tcp',
-            security_group_rule_cidr,
-            security_group_id,
-            '0:0',
-            '',
-        )
-        self.assertEqual(datalist, data)
-
-    def test_security_group_rule_create_ftp(self):
-        sg_rule = copy.deepcopy(SECURITY_GROUP_RULE)
-        sg_rule['from_port'] = 20
-        sg_rule['to_port'] = 21
-        self.sg_rules_mock.create.return_value = FakeSecurityGroupRuleResource(
-            None,
-            sg_rule,
-            loaded=True,
-        )
-
-        arglist = [
-            security_group_name,
-            '--dst-port', '20:21',
-        ]
-        verifylist = [
-            ('group', security_group_name),
-            ('dst_port', (20, 21)),
-        ]
-        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
-
-        # In base command class ShowOne in cliff, abstract method take_action()
-        # returns a two-part tuple with a tuple of column names and a tuple of
-        # data to be shown.
-        columns, data = self.cmd.take_action(parsed_args)
-
-        # SecurityGroupManager.create(name, description)
-        self.sg_rules_mock.create.assert_called_with(
-            security_group_id,
-            'tcp',
-            20,
-            21,
-            security_group_rule_cidr,
-            None,
-        )
-
-        self.assertEqual(self.columns, columns)
-        datalist = (
-            security_group_rule_id,
-            'tcp',
-            security_group_rule_cidr,
-            security_group_id,
-            '20:21',
-            '',
-        )
-        self.assertEqual(datalist, data)
-
-    def test_security_group_rule_create_ssh(self):
-        sg_rule = copy.deepcopy(SECURITY_GROUP_RULE)
-        sg_rule['from_port'] = 22
-        sg_rule['to_port'] = 22
-        sg_rule['ip_range'] = {}
-        sg_rule['group'] = {'name': security_group_name}
-        self.sg_rules_mock.create.return_value = FakeSecurityGroupRuleResource(
-            None,
-            sg_rule,
-            loaded=True,
-        )
-
-        arglist = [
-            security_group_name,
-            '--dst-port', '22',
-            '--src-group', security_group_id,
-        ]
-        verifylist = [
-            ('group', security_group_name),
-            ('dst_port', (22, 22)),
-            ('src_group', security_group_id),
-        ]
-        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
-
-        # In base command class ShowOne in cliff, abstract method take_action()
-        # returns a two-part tuple with a tuple of column names and a tuple of
-        # data to be shown.
-        columns, data = self.cmd.take_action(parsed_args)
-
-        # SecurityGroupManager.create(name, description)
-        self.sg_rules_mock.create.assert_called_with(
-            security_group_id,
-            'tcp',
-            22,
-            22,
-            security_group_rule_cidr,
-            security_group_id,
-        )
-
-        self.assertEqual(self.columns, columns)
-        datalist = (
-            security_group_rule_id,
-            'tcp',
-            '',
-            security_group_id,
-            '22:22',
-            security_group_name,
-        )
-        self.assertEqual(datalist, data)
-
-    def test_security_group_rule_create_udp(self):
-        sg_rule = copy.deepcopy(SECURITY_GROUP_RULE)
-        sg_rule['ip_protocol'] = 'udp'
-        self.sg_rules_mock.create.return_value = FakeSecurityGroupRuleResource(
-            None,
-            sg_rule,
-            loaded=True,
-        )
-
-        arglist = [
-            security_group_name,
-            '--proto', 'udp',
-        ]
-        verifylist = [
-            ('group', security_group_name),
-            ('proto', 'udp'),
-        ]
-        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
-
-        # In base command class ShowOne in cliff, abstract method take_action()
-        # returns a two-part tuple with a tuple of column names and a tuple of
-        # data to be shown.
-        columns, data = self.cmd.take_action(parsed_args)
-
-        # SecurityGroupManager.create(name, description)
-        self.sg_rules_mock.create.assert_called_with(
-            security_group_id,
-            'udp',
-            0,
-            0,
-            security_group_rule_cidr,
-            None,
-        )
-
-        self.assertEqual(self.columns, columns)
-        datalist = (
-            security_group_rule_id,
-            'udp',
-            security_group_rule_cidr,
-            security_group_id,
-            '0:0',
-            '',
-        )
-        self.assertEqual(datalist, data)
-
-    def test_security_group_rule_create_icmp(self):
-        sg_rule_cidr = '10.0.2.0/24'
-        sg_rule = copy.deepcopy(SECURITY_GROUP_RULE_ICMP)
-        sg_rule['ip_range'] = {'cidr': sg_rule_cidr}
-        self.sg_rules_mock.create.return_value = FakeSecurityGroupRuleResource(
-            None,
-            sg_rule,
-            loaded=True,
-        )
-
-        arglist = [
-            security_group_name,
-            '--proto', 'ICMP',
-            '--src-ip', sg_rule_cidr,
-        ]
-        verifylist = [
-            ('group', security_group_name),
-            ('proto', 'ICMP'),
-            ('src_ip', sg_rule_cidr)
-        ]
-        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
-
-        # In base command class ShowOne in cliff, abstract method take_action()
-        # returns a two-part tuple with a tuple of column names and a tuple of
-        # data to be shown.
-        columns, data = self.cmd.take_action(parsed_args)
-
-        # SecurityGroupManager.create(name, description)
-        self.sg_rules_mock.create.assert_called_with(
-            security_group_id,
-            'ICMP',
-            -1,
-            -1,
-            sg_rule_cidr,
-            None,
-        )
-
-        self.assertEqual(self.columns, columns)
-        datalist = (
-            security_group_rule_id,
-            'icmp',
-            sg_rule_cidr,
-            security_group_id,
-            '',
-            '',
-        )
-        self.assertEqual(datalist, data)
-
-    def test_security_group_rule_create_src_invalid(self):
-        arglist = [
-            security_group_name,
-            '--proto', 'ICMP',
-            '--src-ip', security_group_rule_cidr,
-            '--src-group', security_group_id,
-        ]
-
-        self.assertRaises(utils.ParserException,
-                          self.check_parser, self.cmd, arglist, [])
-
-
 class TestSecurityGroupRuleList(TestSecurityGroupRule):
 
     def setUp(self):