summaryrefslogtreecommitdiff
path: root/openstackclient/tests/compute
diff options
context:
space:
mode:
authorRichard Theis <rtheis@us.ibm.com>2016-03-01 15:34:35 -0600
committerRichard Theis <rtheis@us.ibm.com>2016-03-10 10:18:52 -0600
commitea2dd8e141ef1cf446a42ee93992d8fb44f4ba05 (patch)
tree81212e681eb41a7e40bf432e1e4a7bec41da87dc /openstackclient/tests/compute
parent564c8ff2403da87b96562076865f42426a4f8eac (diff)
downloadpython-openstackclient-ea2dd8e141ef1cf446a42ee93992d8fb44f4ba05.tar.gz
Refactor security group create to use SDK
Refactored the 'os security group create' command to use the SDK when neutron is enabled, but continue to use the nova client when nova network is enabled. Added a release note for the change in security group rules output due to Network v2. The tenant_id column name was fixed to align with the 'os security group show' command. Change-Id: Ib29df42edcddcc73a123fff6a64743a6bfcb7fbf Partial-Bug: #1519511 Implements: blueprint neutron-client
Diffstat (limited to 'openstackclient/tests/compute')
-rw-r--r--openstackclient/tests/compute/v2/test_security_group.py127
1 files changed, 0 insertions, 127 deletions
diff --git a/openstackclient/tests/compute/v2/test_security_group.py b/openstackclient/tests/compute/v2/test_security_group.py
deleted file mode 100644
index 01e27b82..00000000
--- a/openstackclient/tests/compute/v2/test_security_group.py
+++ /dev/null
@@ -1,127 +0,0 @@
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-#
-
-import copy
-
-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
-
-
-security_group_id = '11'
-security_group_name = 'wide-open'
-security_group_description = 'nothing but net'
-
-SECURITY_GROUP = {
- 'id': security_group_id,
- 'name': security_group_name,
- 'description': security_group_description,
- 'tenant_id': identity_fakes.project_id,
-}
-
-
-class FakeSecurityGroupResource(fakes.FakeResource):
-
- def get_keys(self):
- return {'property': 'value'}
-
-
-class TestSecurityGroup(compute_fakes.TestComputev2):
-
- def setUp(self):
- super(TestSecurityGroup, self).setUp()
-
- # Get a shortcut compute client security_groups mock
- self.secgroups_mock = self.app.client_manager.compute.security_groups
- self.secgroups_mock.reset_mock()
-
- # Get a shortcut identity client projects mock
- self.projects_mock = self.app.client_manager.identity.projects
- self.projects_mock.reset_mock()
-
-
-class TestSecurityGroupCreate(TestSecurityGroup):
-
- columns = (
- 'description',
- 'id',
- 'name',
- 'tenant_id',
- )
- data = (
- security_group_description,
- security_group_id,
- security_group_name,
- identity_fakes.project_id,
- )
-
- def setUp(self):
- super(TestSecurityGroupCreate, self).setUp()
-
- self.secgroups_mock.create.return_value = FakeSecurityGroupResource(
- None,
- copy.deepcopy(SECURITY_GROUP),
- loaded=True,
- )
-
- # Get the command object to test
- self.cmd = security_group.CreateSecurityGroup(self.app, None)
-
- def test_security_group_create_no_options(self):
- arglist = [
- security_group_name,
- ]
- verifylist = [
- ('name', 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.secgroups_mock.create.assert_called_with(
- security_group_name,
- security_group_name,
- )
-
- self.assertEqual(self.columns, columns)
- self.assertEqual(self.data, data)
-
- def test_security_group_create_description(self):
- arglist = [
- security_group_name,
- '--description', security_group_description,
- ]
- verifylist = [
- ('name', security_group_name),
- ('description', security_group_description),
- ]
- 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.secgroups_mock.create.assert_called_with(
- security_group_name,
- security_group_description,
- )
-
- self.assertEqual(self.columns, columns)
- self.assertEqual(self.data, data)