identity: Migrate 'service provider' commands to SDK
Change-Id: I7f5fba408b7c350bb0a279f8dd17bd7bae451774
This commit is contained in:
Antonia Gaete
parent
58d1b06fdc
commit
56baf50655
@ -25,6 +25,29 @@ from openstackclient.i18n import _
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
|
||||
def _format_service_provider(sp):
|
||||
column_headers = (
|
||||
'id',
|
||||
'enabled',
|
||||
'description',
|
||||
'auth_url',
|
||||
'sp_url',
|
||||
'relay_state_prefix',
|
||||
)
|
||||
columns = (
|
||||
'id',
|
||||
'is_enabled',
|
||||
'description',
|
||||
'auth_url',
|
||||
'sp_url',
|
||||
'relay_state_prefix',
|
||||
)
|
||||
return (
|
||||
column_headers,
|
||||
utils.get_item_properties(sp, columns),
|
||||
)
|
||||
|
||||
|
||||
class CreateServiceProvider(command.ShowOne):
|
||||
_description = _("Create new service provider")
|
||||
|
||||
@ -62,14 +85,14 @@ class CreateServiceProvider(command.ShowOne):
|
||||
enable_service_provider = parser.add_mutually_exclusive_group()
|
||||
enable_service_provider.add_argument(
|
||||
'--enable',
|
||||
dest='enabled',
|
||||
dest='is_enabled',
|
||||
action='store_true',
|
||||
default=True,
|
||||
help=_('Enable the service provider (default)'),
|
||||
)
|
||||
enable_service_provider.add_argument(
|
||||
'--disable',
|
||||
dest='enabled',
|
||||
dest='is_enabled',
|
||||
action='store_false',
|
||||
help=_('Disable the service provider'),
|
||||
)
|
||||
@ -77,17 +100,27 @@ class CreateServiceProvider(command.ShowOne):
|
||||
return parser
|
||||
|
||||
def take_action(self, parsed_args):
|
||||
service_client = self.app.client_manager.identity
|
||||
sp = service_client.federation.service_providers.create(
|
||||
id=parsed_args.service_provider_id,
|
||||
auth_url=parsed_args.auth_url,
|
||||
description=parsed_args.description,
|
||||
enabled=parsed_args.enabled,
|
||||
sp_url=parsed_args.service_provider_url,
|
||||
)
|
||||
service_client = self.app.client_manager.sdk_connection.identity
|
||||
|
||||
sp._info.pop('links', None)
|
||||
return zip(*sorted(sp._info.items()))
|
||||
kwargs = {}
|
||||
|
||||
kwargs = {'id': parsed_args.service_provider_id}
|
||||
|
||||
if parsed_args.is_enabled is not None:
|
||||
kwargs['is_enabled'] = parsed_args.is_enabled
|
||||
|
||||
if parsed_args.description:
|
||||
kwargs['description'] = parsed_args.description
|
||||
|
||||
if parsed_args.auth_url:
|
||||
kwargs['auth_url'] = parsed_args.auth_url
|
||||
|
||||
if parsed_args.service_provider_url:
|
||||
kwargs['sp_url'] = parsed_args.service_provider_url
|
||||
|
||||
sp = service_client.create_service_provider(**kwargs)
|
||||
|
||||
return _format_service_provider(sp)
|
||||
|
||||
|
||||
class DeleteServiceProvider(command.Command):
|
||||
@ -104,11 +137,11 @@ class DeleteServiceProvider(command.Command):
|
||||
return parser
|
||||
|
||||
def take_action(self, parsed_args):
|
||||
service_client = self.app.client_manager.identity
|
||||
service_client = self.app.client_manager.sdk_connection.identity
|
||||
result = 0
|
||||
for i in parsed_args.service_provider:
|
||||
try:
|
||||
service_client.federation.service_providers.delete(i)
|
||||
service_client.delete_service_provider(i)
|
||||
except Exception as e:
|
||||
result += 1
|
||||
LOG.error(
|
||||
@ -132,24 +165,32 @@ class ListServiceProvider(command.Lister):
|
||||
_description = _("List service providers")
|
||||
|
||||
def take_action(self, parsed_args):
|
||||
service_client = self.app.client_manager.identity
|
||||
data = service_client.federation.service_providers.list()
|
||||
service_client = self.app.client_manager.sdk_connection.identity
|
||||
data = service_client.service_providers()
|
||||
|
||||
column_headers = ('ID', 'Enabled', 'Description', 'Auth URL')
|
||||
column_headers = (
|
||||
'ID',
|
||||
'Enabled',
|
||||
'Description',
|
||||
'Auth URL',
|
||||
'Service Provider URL',
|
||||
'Relay State Prefix',
|
||||
)
|
||||
columns = (
|
||||
'id',
|
||||
'is_enabled',
|
||||
'description',
|
||||
'auth_url',
|
||||
'sp_url',
|
||||
'relay_state_prefix',
|
||||
)
|
||||
return (
|
||||
column_headers,
|
||||
(
|
||||
utils.get_item_properties(
|
||||
s,
|
||||
column_headers,
|
||||
formatters={},
|
||||
)
|
||||
for s in data
|
||||
),
|
||||
(utils.get_item_properties(s, columns) for s in data),
|
||||
)
|
||||
|
||||
|
||||
class SetServiceProvider(command.Command):
|
||||
class SetServiceProvider(command.ShowOne):
|
||||
_description = _("Set service provider properties")
|
||||
|
||||
def get_parser(self, prog_name):
|
||||
@ -181,33 +222,44 @@ class SetServiceProvider(command.Command):
|
||||
enable_service_provider = parser.add_mutually_exclusive_group()
|
||||
enable_service_provider.add_argument(
|
||||
'--enable',
|
||||
dest='is_enabled',
|
||||
action='store_true',
|
||||
default=None,
|
||||
help=_('Enable the service provider'),
|
||||
)
|
||||
enable_service_provider.add_argument(
|
||||
'--disable',
|
||||
action='store_true',
|
||||
dest='is_enabled',
|
||||
action='store_false',
|
||||
default=None,
|
||||
help=_('Disable the service provider'),
|
||||
)
|
||||
return parser
|
||||
|
||||
def take_action(self, parsed_args):
|
||||
federation_client = self.app.client_manager.identity.federation
|
||||
service_client = self.app.client_manager.sdk_connection.identity
|
||||
|
||||
enabled = None
|
||||
if parsed_args.enable is True:
|
||||
enabled = True
|
||||
elif parsed_args.disable is True:
|
||||
enabled = False
|
||||
kwargs = {}
|
||||
|
||||
federation_client.service_providers.update(
|
||||
if parsed_args.is_enabled is not None:
|
||||
kwargs['is_enabled'] = parsed_args.is_enabled
|
||||
|
||||
if parsed_args.description:
|
||||
kwargs['description'] = parsed_args.description
|
||||
|
||||
if parsed_args.auth_url:
|
||||
kwargs['auth_url'] = parsed_args.auth_url
|
||||
|
||||
if parsed_args.service_provider_url:
|
||||
kwargs['sp_url'] = parsed_args.service_provider_url
|
||||
|
||||
service_provider = service_client.update_service_provider(
|
||||
parsed_args.service_provider,
|
||||
enabled=enabled,
|
||||
description=parsed_args.description,
|
||||
auth_url=parsed_args.auth_url,
|
||||
sp_url=parsed_args.service_provider_url,
|
||||
**kwargs,
|
||||
)
|
||||
|
||||
return _format_service_provider(service_provider)
|
||||
|
||||
|
||||
class ShowServiceProvider(command.ShowOne):
|
||||
_description = _("Display service provider details")
|
||||
@ -222,12 +274,10 @@ class ShowServiceProvider(command.ShowOne):
|
||||
return parser
|
||||
|
||||
def take_action(self, parsed_args):
|
||||
service_client = self.app.client_manager.identity
|
||||
service_provider = utils.find_resource(
|
||||
service_client.federation.service_providers,
|
||||
service_client = self.app.client_manager.sdk_connection.identity
|
||||
service_provider = service_client.find_service_provider(
|
||||
parsed_args.service_provider,
|
||||
id=parsed_args.service_provider,
|
||||
ignore_missing=False,
|
||||
)
|
||||
|
||||
service_provider._info.pop('links', None)
|
||||
return zip(*sorted(service_provider._info.items()))
|
||||
return _format_service_provider(service_provider)
|
||||
|
||||
@ -60,9 +60,5 @@ class ServiceProviderTests(common.IdentityTests):
|
||||
'description': new_description,
|
||||
}
|
||||
)
|
||||
self.assertEqual(0, len(raw_output))
|
||||
raw_output = self.openstack(
|
||||
f'service provider show {service_provider}'
|
||||
)
|
||||
updated_value = self.parse_show_as_object(raw_output)
|
||||
self.assertIn(new_description, updated_value['description'])
|
||||
self.assertEqual(new_description, updated_value.get('description'))
|
||||
|
||||
@ -12,92 +12,88 @@
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
import copy
|
||||
|
||||
from openstack.identity.v3 import service_provider as _service_provider
|
||||
from openstack.test import fakes as sdk_fakes
|
||||
|
||||
from openstackclient.identity.v3 import service_provider
|
||||
from openstackclient.tests.unit import fakes
|
||||
from openstackclient.tests.unit.identity.v3 import fakes as service_fakes
|
||||
|
||||
|
||||
class TestServiceProvider(service_fakes.TestFederatedIdentity):
|
||||
def setUp(self):
|
||||
super().setUp()
|
||||
|
||||
federation_lib = self.identity_client.federation
|
||||
self.service_providers_mock = federation_lib.service_providers
|
||||
self.service_providers_mock.reset_mock()
|
||||
|
||||
|
||||
class TestServiceProviderCreate(TestServiceProvider):
|
||||
class TestServiceProviderCreate(service_fakes.TestFederatedIdentity):
|
||||
columns = (
|
||||
'auth_url',
|
||||
'description',
|
||||
'enabled',
|
||||
'id',
|
||||
'enabled',
|
||||
'description',
|
||||
'auth_url',
|
||||
'sp_url',
|
||||
)
|
||||
datalist = (
|
||||
service_fakes.sp_auth_url,
|
||||
service_fakes.sp_description,
|
||||
True,
|
||||
service_fakes.sp_id,
|
||||
service_fakes.service_provider_url,
|
||||
'relay_state_prefix',
|
||||
)
|
||||
|
||||
def setUp(self):
|
||||
super().setUp()
|
||||
|
||||
copied_sp = copy.deepcopy(service_fakes.SERVICE_PROVIDER)
|
||||
resource = fakes.FakeResource(None, copied_sp, loaded=True)
|
||||
self.service_providers_mock.create.return_value = resource
|
||||
self.service_provider = sdk_fakes.generate_fake_resource(
|
||||
_service_provider.ServiceProvider
|
||||
)
|
||||
self.identity_sdk_client.create_service_provider.return_value = (
|
||||
self.service_provider
|
||||
)
|
||||
self.data = (
|
||||
self.service_provider.id,
|
||||
self.service_provider.is_enabled,
|
||||
self.service_provider.description,
|
||||
self.service_provider.auth_url,
|
||||
self.service_provider.sp_url,
|
||||
self.service_provider.relay_state_prefix,
|
||||
)
|
||||
self.cmd = service_provider.CreateServiceProvider(self.app, None)
|
||||
|
||||
def test_create_service_provider_required_options_only(self):
|
||||
arglist = [
|
||||
'--auth-url',
|
||||
service_fakes.sp_auth_url,
|
||||
self.service_provider.auth_url,
|
||||
'--service-provider-url',
|
||||
service_fakes.service_provider_url,
|
||||
service_fakes.sp_id,
|
||||
self.service_provider.sp_url,
|
||||
self.service_provider.id,
|
||||
]
|
||||
verifylist = [
|
||||
('auth_url', service_fakes.sp_auth_url),
|
||||
('service_provider_url', service_fakes.service_provider_url),
|
||||
('service_provider_id', service_fakes.sp_id),
|
||||
('auth_url', self.service_provider.auth_url),
|
||||
('service_provider_url', self.service_provider.sp_url),
|
||||
('service_provider_id', self.service_provider.id),
|
||||
]
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
columns, data = self.cmd.take_action(parsed_args)
|
||||
|
||||
# Set expected values
|
||||
kwargs = {
|
||||
'enabled': True,
|
||||
'description': None,
|
||||
'auth_url': service_fakes.sp_auth_url,
|
||||
'sp_url': service_fakes.service_provider_url,
|
||||
'is_enabled': True,
|
||||
'auth_url': self.service_provider.auth_url,
|
||||
'sp_url': self.service_provider.sp_url,
|
||||
}
|
||||
|
||||
self.service_providers_mock.create.assert_called_with(
|
||||
id=service_fakes.sp_id, **kwargs
|
||||
self.identity_sdk_client.create_service_provider.assert_called_with(
|
||||
id=self.service_provider.id, **kwargs
|
||||
)
|
||||
|
||||
self.assertEqual(self.columns, columns)
|
||||
self.assertEqual(self.datalist, data)
|
||||
self.assertEqual(self.data, data)
|
||||
|
||||
def test_create_service_provider_description(self):
|
||||
arglist = [
|
||||
'--description',
|
||||
service_fakes.sp_description,
|
||||
self.service_provider.description,
|
||||
'--auth-url',
|
||||
service_fakes.sp_auth_url,
|
||||
self.service_provider.auth_url,
|
||||
'--service-provider-url',
|
||||
service_fakes.service_provider_url,
|
||||
service_fakes.sp_id,
|
||||
self.service_provider.sp_url,
|
||||
self.service_provider.id,
|
||||
]
|
||||
verifylist = [
|
||||
('description', service_fakes.sp_description),
|
||||
('auth_url', service_fakes.sp_auth_url),
|
||||
('service_provider_url', service_fakes.service_provider_url),
|
||||
('service_provider_id', service_fakes.sp_id),
|
||||
('description', self.service_provider.description),
|
||||
('auth_url', self.service_provider.auth_url),
|
||||
('service_provider_url', self.service_provider.sp_url),
|
||||
('service_provider_id', self.service_provider.id),
|
||||
]
|
||||
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
@ -105,111 +101,85 @@ class TestServiceProviderCreate(TestServiceProvider):
|
||||
|
||||
# Set expected values
|
||||
kwargs = {
|
||||
'description': service_fakes.sp_description,
|
||||
'auth_url': service_fakes.sp_auth_url,
|
||||
'sp_url': service_fakes.service_provider_url,
|
||||
'enabled': True,
|
||||
'description': self.service_provider.description,
|
||||
'auth_url': self.service_provider.auth_url,
|
||||
'sp_url': self.service_provider.sp_url,
|
||||
'is_enabled': self.service_provider.is_enabled,
|
||||
}
|
||||
|
||||
self.service_providers_mock.create.assert_called_with(
|
||||
id=service_fakes.sp_id, **kwargs
|
||||
self.identity_sdk_client.create_service_provider.assert_called_with(
|
||||
id=self.service_provider.id, **kwargs
|
||||
)
|
||||
|
||||
self.assertEqual(self.columns, columns)
|
||||
self.assertEqual(self.datalist, data)
|
||||
self.assertEqual(self.data, data)
|
||||
|
||||
def test_create_service_provider_disabled(self):
|
||||
# Prepare FakeResource object
|
||||
service_provider = copy.deepcopy(service_fakes.SERVICE_PROVIDER)
|
||||
service_provider['enabled'] = False
|
||||
service_provider['description'] = None
|
||||
|
||||
resource = fakes.FakeResource(None, service_provider, loaded=True)
|
||||
self.service_providers_mock.create.return_value = resource
|
||||
|
||||
arglist = [
|
||||
'--auth-url',
|
||||
service_fakes.sp_auth_url,
|
||||
self.service_provider.auth_url,
|
||||
'--service-provider-url',
|
||||
service_fakes.service_provider_url,
|
||||
self.service_provider.sp_url,
|
||||
'--disable',
|
||||
service_fakes.sp_id,
|
||||
self.service_provider.id,
|
||||
]
|
||||
verifylist = [
|
||||
('auth_url', service_fakes.sp_auth_url),
|
||||
('service_provider_url', service_fakes.service_provider_url),
|
||||
('service_provider_id', service_fakes.sp_id),
|
||||
('auth_url', self.service_provider.auth_url),
|
||||
('service_provider_url', self.service_provider.sp_url),
|
||||
('service_provider_id', self.service_provider.id),
|
||||
]
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
columns, data = self.cmd.take_action(parsed_args)
|
||||
# Set expected values
|
||||
kwargs = {
|
||||
'auth_url': service_fakes.sp_auth_url,
|
||||
'sp_url': service_fakes.service_provider_url,
|
||||
'enabled': False,
|
||||
'description': None,
|
||||
'auth_url': self.service_provider.auth_url,
|
||||
'sp_url': self.service_provider.sp_url,
|
||||
'is_enabled': False,
|
||||
}
|
||||
|
||||
self.service_providers_mock.create.assert_called_with(
|
||||
id=service_fakes.sp_id, **kwargs
|
||||
self.identity_sdk_client.create_service_provider.assert_called_with(
|
||||
id=self.service_provider.id, **kwargs
|
||||
)
|
||||
self.assertEqual(self.columns, columns)
|
||||
datalist = (
|
||||
service_fakes.sp_auth_url,
|
||||
None,
|
||||
False,
|
||||
service_fakes.sp_id,
|
||||
service_fakes.service_provider_url,
|
||||
)
|
||||
self.assertEqual(datalist, data)
|
||||
self.assertEqual(self.data, data)
|
||||
|
||||
|
||||
class TestServiceProviderDelete(TestServiceProvider):
|
||||
class TestServiceProviderDelete(service_fakes.TestFederatedIdentity):
|
||||
def setUp(self):
|
||||
super().setUp()
|
||||
|
||||
# This is the return value for utils.find_resource()
|
||||
self.service_providers_mock.get.return_value = fakes.FakeResource(
|
||||
None,
|
||||
copy.deepcopy(service_fakes.SERVICE_PROVIDER),
|
||||
loaded=True,
|
||||
self.service_provider = sdk_fakes.generate_fake_resource(
|
||||
_service_provider.ServiceProvider
|
||||
)
|
||||
|
||||
self.service_providers_mock.delete.return_value = None
|
||||
self.identity_sdk_client.delete_service_provider.return_value = None
|
||||
self.cmd = service_provider.DeleteServiceProvider(self.app, None)
|
||||
|
||||
def test_delete_service_provider(self):
|
||||
arglist = [
|
||||
service_fakes.sp_id,
|
||||
self.service_provider.id,
|
||||
]
|
||||
verifylist = [
|
||||
('service_provider', [service_fakes.sp_id]),
|
||||
('service_provider', [self.service_provider.id]),
|
||||
]
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
|
||||
result = self.cmd.take_action(parsed_args)
|
||||
|
||||
self.service_providers_mock.delete.assert_called_with(
|
||||
service_fakes.sp_id,
|
||||
self.identity_sdk_client.delete_service_provider.assert_called_with(
|
||||
self.service_provider.id,
|
||||
)
|
||||
self.assertIsNone(result)
|
||||
|
||||
|
||||
class TestServiceProviderList(TestServiceProvider):
|
||||
class TestServiceProviderList(service_fakes.TestFederatedIdentity):
|
||||
def setUp(self):
|
||||
super().setUp()
|
||||
|
||||
self.service_providers_mock.get.return_value = fakes.FakeResource(
|
||||
None,
|
||||
copy.deepcopy(service_fakes.SERVICE_PROVIDER),
|
||||
loaded=True,
|
||||
self.service_provider = sdk_fakes.generate_fake_resource(
|
||||
_service_provider.ServiceProvider
|
||||
)
|
||||
self.service_providers_mock.list.return_value = [
|
||||
fakes.FakeResource(
|
||||
None,
|
||||
copy.deepcopy(service_fakes.SERVICE_PROVIDER),
|
||||
loaded=True,
|
||||
),
|
||||
self.identity_sdk_client.service_providers.return_value = [
|
||||
self.service_provider
|
||||
]
|
||||
|
||||
# Get the command object to test
|
||||
@ -225,39 +195,56 @@ class TestServiceProviderList(TestServiceProvider):
|
||||
# containing the data to be listed.
|
||||
columns, data = self.cmd.take_action(parsed_args)
|
||||
|
||||
self.service_providers_mock.list.assert_called_with()
|
||||
self.identity_sdk_client.service_providers.assert_called_with()
|
||||
|
||||
collist = ('ID', 'Enabled', 'Description', 'Auth URL')
|
||||
collist = (
|
||||
'ID',
|
||||
'Enabled',
|
||||
'Description',
|
||||
'Auth URL',
|
||||
'Service Provider URL',
|
||||
'Relay State Prefix',
|
||||
)
|
||||
self.assertEqual(collist, columns)
|
||||
datalist = (
|
||||
(
|
||||
service_fakes.sp_id,
|
||||
self.service_provider.id,
|
||||
True,
|
||||
service_fakes.sp_description,
|
||||
service_fakes.sp_auth_url,
|
||||
self.service_provider.description,
|
||||
self.service_provider.auth_url,
|
||||
self.service_provider.sp_url,
|
||||
self.service_provider.relay_state_prefix,
|
||||
),
|
||||
)
|
||||
self.assertEqual(tuple(data), datalist)
|
||||
|
||||
|
||||
class TestServiceProviderSet(TestServiceProvider):
|
||||
class TestServiceProviderSet(service_fakes.TestFederatedIdentity):
|
||||
columns = (
|
||||
'auth_url',
|
||||
'description',
|
||||
'enabled',
|
||||
'id',
|
||||
'enabled',
|
||||
'description',
|
||||
'auth_url',
|
||||
'sp_url',
|
||||
)
|
||||
datalist = (
|
||||
service_fakes.sp_auth_url,
|
||||
service_fakes.sp_description,
|
||||
False,
|
||||
service_fakes.sp_id,
|
||||
service_fakes.service_provider_url,
|
||||
'relay_state_prefix',
|
||||
)
|
||||
|
||||
def setUp(self):
|
||||
super().setUp()
|
||||
self.service_provider = sdk_fakes.generate_fake_resource(
|
||||
_service_provider.ServiceProvider
|
||||
)
|
||||
self.identity_sdk_client.update_service_provider.return_value = (
|
||||
self.service_provider
|
||||
)
|
||||
self.data = (
|
||||
self.service_provider.id,
|
||||
self.service_provider.is_enabled,
|
||||
self.service_provider.description,
|
||||
self.service_provider.auth_url,
|
||||
self.service_provider.sp_url,
|
||||
self.service_provider.relay_state_prefix,
|
||||
)
|
||||
self.cmd = service_provider.SetServiceProvider(self.app, None)
|
||||
|
||||
def test_service_provider_disable(self):
|
||||
@ -265,144 +252,107 @@ class TestServiceProviderSet(TestServiceProvider):
|
||||
|
||||
Set Service Provider's ``enabled`` attribute to False.
|
||||
"""
|
||||
|
||||
def prepare(self):
|
||||
"""Prepare fake return objects before the test is executed"""
|
||||
updated_sp = copy.deepcopy(service_fakes.SERVICE_PROVIDER)
|
||||
updated_sp['enabled'] = False
|
||||
resources = fakes.FakeResource(None, updated_sp, loaded=True)
|
||||
self.service_providers_mock.update.return_value = resources
|
||||
|
||||
prepare(self)
|
||||
arglist = [
|
||||
'--disable',
|
||||
service_fakes.sp_id,
|
||||
self.service_provider.id,
|
||||
]
|
||||
verifylist = [
|
||||
('service_provider', service_fakes.sp_id),
|
||||
('enable', False),
|
||||
('disable', True),
|
||||
('service_provider', self.service_provider.id),
|
||||
('is_enabled', False),
|
||||
]
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
self.cmd.take_action(parsed_args)
|
||||
self.service_providers_mock.update.assert_called_with(
|
||||
service_fakes.sp_id,
|
||||
enabled=False,
|
||||
description=None,
|
||||
auth_url=None,
|
||||
sp_url=None,
|
||||
columns, data = self.cmd.take_action(parsed_args)
|
||||
self.identity_sdk_client.update_service_provider.assert_called_with(
|
||||
self.service_provider.id,
|
||||
is_enabled=False,
|
||||
)
|
||||
self.assertEqual(columns, self.columns)
|
||||
self.assertEqual(data, self.data)
|
||||
|
||||
def test_service_provider_enable(self):
|
||||
"""Enable Service Provider.
|
||||
|
||||
Set Service Provider's ``enabled`` attribute to True.
|
||||
"""
|
||||
|
||||
def prepare(self):
|
||||
"""Prepare fake return objects before the test is executed"""
|
||||
resources = fakes.FakeResource(
|
||||
None,
|
||||
copy.deepcopy(service_fakes.SERVICE_PROVIDER),
|
||||
loaded=True,
|
||||
)
|
||||
self.service_providers_mock.update.return_value = resources
|
||||
|
||||
prepare(self)
|
||||
arglist = [
|
||||
'--enable',
|
||||
service_fakes.sp_id,
|
||||
self.service_provider.id,
|
||||
]
|
||||
verifylist = [
|
||||
('service_provider', service_fakes.sp_id),
|
||||
('enable', True),
|
||||
('disable', False),
|
||||
('service_provider', self.service_provider.id),
|
||||
('is_enabled', True),
|
||||
]
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
|
||||
self.cmd.take_action(parsed_args)
|
||||
self.service_providers_mock.update.assert_called_with(
|
||||
service_fakes.sp_id,
|
||||
enabled=True,
|
||||
description=None,
|
||||
auth_url=None,
|
||||
sp_url=None,
|
||||
columns, data = self.cmd.take_action(parsed_args)
|
||||
self.identity_sdk_client.update_service_provider.assert_called_with(
|
||||
self.service_provider.id,
|
||||
is_enabled=True,
|
||||
)
|
||||
self.assertEqual(columns, self.columns)
|
||||
self.assertEqual(data, self.data)
|
||||
|
||||
def test_service_provider_no_options(self):
|
||||
def prepare(self):
|
||||
"""Prepare fake return objects before the test is executed"""
|
||||
resources = fakes.FakeResource(
|
||||
None,
|
||||
copy.deepcopy(service_fakes.SERVICE_PROVIDER),
|
||||
loaded=True,
|
||||
)
|
||||
self.service_providers_mock.get.return_value = resources
|
||||
|
||||
resources = fakes.FakeResource(
|
||||
None,
|
||||
copy.deepcopy(service_fakes.SERVICE_PROVIDER),
|
||||
loaded=True,
|
||||
)
|
||||
self.service_providers_mock.update.return_value = resources
|
||||
|
||||
prepare(self)
|
||||
arglist = [
|
||||
service_fakes.sp_id,
|
||||
self.service_provider.id,
|
||||
]
|
||||
verifylist = [
|
||||
('service_provider', service_fakes.sp_id),
|
||||
('service_provider', self.service_provider.id),
|
||||
('description', None),
|
||||
('enable', False),
|
||||
('disable', False),
|
||||
('is_enabled', None),
|
||||
('auth_url', None),
|
||||
('service_provider_url', None),
|
||||
]
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
|
||||
self.cmd.take_action(parsed_args)
|
||||
columns, data = self.cmd.take_action(parsed_args)
|
||||
self.assertEqual(columns, self.columns)
|
||||
self.assertEqual(data, self.data)
|
||||
|
||||
|
||||
class TestServiceProviderShow(TestServiceProvider):
|
||||
class TestServiceProviderShow(service_fakes.TestFederatedIdentity):
|
||||
def setUp(self):
|
||||
super().setUp()
|
||||
|
||||
ret = fakes.FakeResource(
|
||||
None,
|
||||
copy.deepcopy(service_fakes.SERVICE_PROVIDER),
|
||||
loaded=True,
|
||||
self.service_provider = sdk_fakes.generate_fake_resource(
|
||||
_service_provider.ServiceProvider
|
||||
)
|
||||
self.identity_sdk_client.find_service_provider.return_value = (
|
||||
self.service_provider
|
||||
)
|
||||
self.data = (
|
||||
self.service_provider.id,
|
||||
self.service_provider.is_enabled,
|
||||
self.service_provider.description,
|
||||
self.service_provider.auth_url,
|
||||
self.service_provider.sp_url,
|
||||
self.service_provider.relay_state_prefix,
|
||||
)
|
||||
self.service_providers_mock.get.side_effect = [
|
||||
Exception("Not found"),
|
||||
ret,
|
||||
]
|
||||
self.service_providers_mock.get.return_value = ret
|
||||
|
||||
# Get the command object to test
|
||||
self.cmd = service_provider.ShowServiceProvider(self.app, None)
|
||||
|
||||
def test_service_provider_show(self):
|
||||
arglist = [
|
||||
service_fakes.sp_id,
|
||||
self.service_provider.id,
|
||||
]
|
||||
verifylist = [
|
||||
('service_provider', service_fakes.sp_id),
|
||||
('service_provider', self.service_provider.id),
|
||||
]
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
|
||||
columns, data = self.cmd.take_action(parsed_args)
|
||||
|
||||
self.service_providers_mock.get.assert_called_with(
|
||||
service_fakes.sp_id, id='BETA'
|
||||
self.identity_sdk_client.find_service_provider.assert_called_with(
|
||||
self.service_provider.id,
|
||||
ignore_missing=False,
|
||||
)
|
||||
|
||||
collist = ('auth_url', 'description', 'enabled', 'id', 'sp_url')
|
||||
self.assertEqual(collist, columns)
|
||||
datalist = (
|
||||
service_fakes.sp_auth_url,
|
||||
service_fakes.sp_description,
|
||||
True,
|
||||
service_fakes.sp_id,
|
||||
service_fakes.service_provider_url,
|
||||
collist = (
|
||||
'id',
|
||||
'enabled',
|
||||
'description',
|
||||
'auth_url',
|
||||
'sp_url',
|
||||
'relay_state_prefix',
|
||||
)
|
||||
self.assertEqual(data, datalist)
|
||||
self.assertEqual(collist, columns)
|
||||
self.assertEqual(data, self.data)
|
||||
|
||||
@ -0,0 +1,10 @@
|
||||
---
|
||||
upgrade:
|
||||
- |
|
||||
The following commands have been migrated to SDK:
|
||||
|
||||
- ``service provider create``
|
||||
- ``service provider delete``
|
||||
- ``service provider set``
|
||||
- ``service provider list``
|
||||
- ``service provider show``
|
||||
Loading…
Reference in New Issue
Block a user