842882f3cb
Refactored the 'os security group list' command to use the SDK when neutron is enabled, but continue to use the nova client when nova network is enabled. This refactor also removes the logic for displaying project names instead of project IDs when the --all-projects option is specified. This logic was removed because it is inconsistent with the other network commands. Since neutron will always display security groups across all projects for an admin, the --all-projects option is now hidden when neutron is enabled and the Project column is always displayed. Change-Id: I934a1f5084ef3c5f929d0ffd38ebf5064d799941 Partial-Bug: #1519511 Related-to: blueprint neutron-client
128 lines
3.9 KiB
Python
128 lines
3.9 KiB
Python
# 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)
|