4a07e63e7e
Updated the service name to be optional, mostly matching the cli arguments with v3 service create. Implemented the following changes on service create: - if only a single positional is present, it's a <type>. This is not currently legal so it is considered a new case. - if --type option is present the positional is handled as <name>; display deprecation message - if --name option is present the positional is handled as <type>. Making --type optional is new, but back-compatible - Made --name and --type mutually exclusive. - only '--name <service-name> <type>' shall appear in the help output Change-Id: I8fd4adba3d8cd00d5a8cacc2c494d99d492c45a3 Closes-Bug: #1404073
311 lines
9.7 KiB
Python
311 lines
9.7 KiB
Python
# Copyright 2013 Nebula Inc.
|
|
#
|
|
# 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.identity.v2_0 import service
|
|
from openstackclient.tests import fakes
|
|
from openstackclient.tests.identity.v2_0 import fakes as identity_fakes
|
|
|
|
|
|
class TestService(identity_fakes.TestIdentityv2):
|
|
|
|
def setUp(self):
|
|
super(TestService, self).setUp()
|
|
|
|
# Get a shortcut to the ServiceManager Mock
|
|
self.services_mock = self.app.client_manager.identity.services
|
|
self.services_mock.reset_mock()
|
|
|
|
|
|
class TestServiceCreate(TestService):
|
|
|
|
def setUp(self):
|
|
super(TestServiceCreate, self).setUp()
|
|
|
|
self.services_mock.create.return_value = fakes.FakeResource(
|
|
None,
|
|
copy.deepcopy(identity_fakes.SERVICE),
|
|
loaded=True,
|
|
)
|
|
|
|
# Get the command object to test
|
|
self.cmd = service.CreateService(self.app, None)
|
|
|
|
def test_service_create_with_type_positional(self):
|
|
arglist = [
|
|
identity_fakes.service_type,
|
|
]
|
|
verifylist = [
|
|
('type_or_name', identity_fakes.service_type),
|
|
('type', None),
|
|
('description', None),
|
|
('name', None),
|
|
]
|
|
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
|
|
|
# DisplayCommandBase.take_action() returns two tuples
|
|
columns, data = self.cmd.take_action(parsed_args)
|
|
|
|
# ServiceManager.create(name, service_type, description)
|
|
self.services_mock.create.assert_called_with(
|
|
None,
|
|
identity_fakes.service_type,
|
|
None,
|
|
)
|
|
|
|
collist = ('description', 'id', 'name', 'type')
|
|
self.assertEqual(columns, collist)
|
|
datalist = (
|
|
identity_fakes.service_description,
|
|
identity_fakes.service_id,
|
|
identity_fakes.service_name,
|
|
identity_fakes.service_type,
|
|
)
|
|
self.assertEqual(data, datalist)
|
|
|
|
def test_service_create_with_type_option(self):
|
|
arglist = [
|
|
'--type', identity_fakes.service_type,
|
|
identity_fakes.service_name,
|
|
]
|
|
verifylist = [
|
|
('type_or_name', identity_fakes.service_name),
|
|
('type', identity_fakes.service_type),
|
|
('description', None),
|
|
('name', None),
|
|
]
|
|
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
|
|
|
# DisplayCommandBase.take_action() returns two tuples
|
|
columns, data = self.cmd.take_action(parsed_args)
|
|
|
|
# ServiceManager.create(name, service_type, description)
|
|
self.services_mock.create.assert_called_with(
|
|
identity_fakes.service_name,
|
|
identity_fakes.service_type,
|
|
None,
|
|
)
|
|
|
|
collist = ('description', 'id', 'name', 'type')
|
|
self.assertEqual(columns, collist)
|
|
datalist = (
|
|
identity_fakes.service_description,
|
|
identity_fakes.service_id,
|
|
identity_fakes.service_name,
|
|
identity_fakes.service_type,
|
|
)
|
|
self.assertEqual(data, datalist)
|
|
|
|
def test_service_create_with_name_option(self):
|
|
arglist = [
|
|
'--name', identity_fakes.service_name,
|
|
identity_fakes.service_type,
|
|
]
|
|
verifylist = [
|
|
('type_or_name', identity_fakes.service_type),
|
|
('type', None),
|
|
('description', None),
|
|
('name', identity_fakes.service_name),
|
|
]
|
|
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
|
|
|
# DisplayCommandBase.take_action() returns two tuples
|
|
columns, data = self.cmd.take_action(parsed_args)
|
|
|
|
# ServiceManager.create(name, service_type, description)
|
|
self.services_mock.create.assert_called_with(
|
|
identity_fakes.service_name,
|
|
identity_fakes.service_type,
|
|
None,
|
|
)
|
|
|
|
collist = ('description', 'id', 'name', 'type')
|
|
self.assertEqual(columns, collist)
|
|
datalist = (
|
|
identity_fakes.service_description,
|
|
identity_fakes.service_id,
|
|
identity_fakes.service_name,
|
|
identity_fakes.service_type,
|
|
)
|
|
self.assertEqual(data, datalist)
|
|
|
|
def test_service_create_description(self):
|
|
arglist = [
|
|
'--name', identity_fakes.service_name,
|
|
'--description', identity_fakes.service_description,
|
|
identity_fakes.service_type,
|
|
]
|
|
verifylist = [
|
|
('type_or_name', identity_fakes.service_type),
|
|
('type', None),
|
|
('description', identity_fakes.service_description),
|
|
('name', identity_fakes.service_name),
|
|
]
|
|
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
|
|
|
# DisplayCommandBase.take_action() returns two tuples
|
|
columns, data = self.cmd.take_action(parsed_args)
|
|
|
|
# ServiceManager.create(name, service_type, description)
|
|
self.services_mock.create.assert_called_with(
|
|
identity_fakes.service_name,
|
|
identity_fakes.service_type,
|
|
identity_fakes.service_description,
|
|
)
|
|
|
|
collist = ('description', 'id', 'name', 'type')
|
|
self.assertEqual(columns, collist)
|
|
datalist = (
|
|
identity_fakes.service_description,
|
|
identity_fakes.service_id,
|
|
identity_fakes.service_name,
|
|
identity_fakes.service_type,
|
|
)
|
|
self.assertEqual(data, datalist)
|
|
|
|
|
|
class TestServiceDelete(TestService):
|
|
|
|
def setUp(self):
|
|
super(TestServiceDelete, self).setUp()
|
|
|
|
self.services_mock.get.return_value = fakes.FakeResource(
|
|
None,
|
|
copy.deepcopy(identity_fakes.SERVICE),
|
|
loaded=True,
|
|
)
|
|
self.services_mock.delete.return_value = None
|
|
|
|
# Get the command object to test
|
|
self.cmd = service.DeleteService(self.app, None)
|
|
|
|
def test_service_delete_no_options(self):
|
|
arglist = [
|
|
identity_fakes.service_name,
|
|
]
|
|
verifylist = [
|
|
('service', identity_fakes.service_name),
|
|
]
|
|
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
|
|
|
# DisplayCommandBase.take_action() returns two tuples
|
|
self.cmd.take_action(parsed_args)
|
|
|
|
self.services_mock.delete.assert_called_with(
|
|
identity_fakes.service_id,
|
|
)
|
|
|
|
|
|
class TestServiceList(TestService):
|
|
|
|
def setUp(self):
|
|
super(TestServiceList, self).setUp()
|
|
|
|
self.services_mock.list.return_value = [
|
|
fakes.FakeResource(
|
|
None,
|
|
copy.deepcopy(identity_fakes.SERVICE),
|
|
loaded=True,
|
|
),
|
|
]
|
|
|
|
# Get the command object to test
|
|
self.cmd = service.ListService(self.app, None)
|
|
|
|
def test_service_list_no_options(self):
|
|
arglist = []
|
|
verifylist = []
|
|
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
|
|
|
# DisplayCommandBase.take_action() returns two tuples
|
|
columns, data = self.cmd.take_action(parsed_args)
|
|
|
|
self.services_mock.list.assert_called_with()
|
|
|
|
collist = ('ID', 'Name')
|
|
self.assertEqual(columns, collist)
|
|
datalist = ((
|
|
identity_fakes.service_id,
|
|
identity_fakes.service_name,
|
|
), )
|
|
self.assertEqual(tuple(data), datalist)
|
|
|
|
def test_service_list_long(self):
|
|
arglist = [
|
|
'--long',
|
|
]
|
|
verifylist = [
|
|
('long', True),
|
|
]
|
|
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
|
|
|
# DisplayCommandBase.take_action() returns two tuples
|
|
columns, data = self.cmd.take_action(parsed_args)
|
|
|
|
self.services_mock.list.assert_called_with()
|
|
|
|
collist = ('ID', 'Name', 'Type', 'Description')
|
|
self.assertEqual(columns, collist)
|
|
datalist = ((
|
|
identity_fakes.service_id,
|
|
identity_fakes.service_name,
|
|
identity_fakes.service_type,
|
|
identity_fakes.service_description,
|
|
), )
|
|
self.assertEqual(tuple(data), datalist)
|
|
|
|
|
|
class TestServiceShow(TestService):
|
|
|
|
def setUp(self):
|
|
super(TestServiceShow, self).setUp()
|
|
|
|
self.services_mock.get.return_value = fakes.FakeResource(
|
|
None,
|
|
copy.deepcopy(identity_fakes.SERVICE),
|
|
loaded=True,
|
|
)
|
|
|
|
# Get the command object to test
|
|
self.cmd = service.ShowService(self.app, None)
|
|
|
|
def test_service_show(self):
|
|
arglist = [
|
|
identity_fakes.service_name,
|
|
]
|
|
verifylist = [
|
|
('service', identity_fakes.service_name),
|
|
]
|
|
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
|
|
|
# DisplayCommandBase.take_action() returns two tuples
|
|
columns, data = self.cmd.take_action(parsed_args)
|
|
|
|
# ServiceManager.get(id)
|
|
self.services_mock.get.assert_called_with(
|
|
identity_fakes.service_name,
|
|
)
|
|
|
|
collist = ('description', 'id', 'name', 'type')
|
|
self.assertEqual(columns, collist)
|
|
datalist = (
|
|
identity_fakes.service_description,
|
|
identity_fakes.service_id,
|
|
identity_fakes.service_name,
|
|
identity_fakes.service_type,
|
|
)
|
|
self.assertEqual(data, datalist)
|