Merge "Added functional tests for 'service provider' v3 commands"

2 files changed, 78 insertions, 0 deletions

diff --git a/functional/tests/identity/v3/test_identity.py b/functional/tests/identity/v3/test_identity.py
index 88f5196b..d0eec6f7 100644
--- a/functional/tests/identity/v3/test_identity.py
+++ b/functional/tests/identity/v3/test_identity.py
@@ -44,6 +44,11 @@ class IdentityTests(test.TestCase):
     IDENTITY_PROVIDER_FIELDS = ['description', 'enabled', 'id', 'remote_ids']
     IDENTITY_PROVIDER_LIST_HEADERS = ['ID', 'Enabled', 'Description']
 
+    SERVICE_PROVIDER_FIELDS = ['auth_url', 'description', 'enabled',
+                               'id', 'relay_state_prefix', 'sp_url']
+    SERVICE_PROVIDER_LIST_HEADERS = ['ID', 'Enabled', 'Description',
+                                     'Auth URL']
+
     @classmethod
     def setUpClass(cls):
         if hasattr(super(IdentityTests, cls), 'setUpClass'):
@@ -269,3 +274,22 @@ class IdentityTests(test.TestCase):
                 self.openstack,
                 'identity provider delete %s' % identity_provider)
         return identity_provider
+
+    def _create_dummy_sp(self, add_clean_up=True):
+        service_provider = data_utils.rand_name('ServiceProvider')
+        description = data_utils.rand_name('description')
+        raw_output = self.openstack(
+            'service provider create '
+            ' %(name)s '
+            '--description %(description)s '
+            '--auth-url https://sp.example.com:35357 '
+            '--service-provider-url https://sp.example.com:5000 '
+            '--enable ' % {'name': service_provider,
+                           'description': description})
+        items = self.parse_show(raw_output)
+        self.assert_show_fields(items, self.SERVICE_PROVIDER_FIELDS)
+        if add_clean_up:
+            self.addCleanup(
+                self.openstack,
+                'service provider delete %s' % service_provider)
+        return service_provider
diff --git a/functional/tests/identity/v3/test_service_provider.py b/functional/tests/identity/v3/test_service_provider.py
new file mode 100644
index 00000000..eed9fccb
--- /dev/null
+++ b/functional/tests/identity/v3/test_service_provider.py
@@ -0,0 +1,54 @@
+#    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.
+
+from functional.tests.identity.v3 import test_identity
+from tempest_lib.common.utils import data_utils
+
+
+class ServiceProviderTests(test_identity.IdentityTests):
+    # Introduce functional test cases for command 'Service Provider'
+
+    def test_sp_create(self):
+        self._create_dummy_sp(add_clean_up=True)
+
+    def test_sp_delete(self):
+        service_provider = self._create_dummy_sp(add_clean_up=False)
+        raw_output = self.openstack('service provider delete %s'
+                                    % service_provider)
+        self.assertEqual(0, len(raw_output))
+
+    def test_sp_show(self):
+        service_provider = self._create_dummy_sp(add_clean_up=True)
+        raw_output = self.openstack('service provider show %s'
+                                    % service_provider)
+        items = self.parse_show(raw_output)
+        self.assert_show_fields(items, self.SERVICE_PROVIDER_FIELDS)
+
+    def test_sp_list(self):
+        self._create_dummy_sp(add_clean_up=True)
+        raw_output = self.openstack('service provider list')
+        items = self.parse_listing(raw_output)
+        self.assert_table_structure(items, self.SERVICE_PROVIDER_LIST_HEADERS)
+
+    def test_sp_set(self):
+        service_provider = self._create_dummy_sp(add_clean_up=True)
+        new_description = data_utils.rand_name('newDescription')
+        raw_output = self.openstack('service provider set '
+                                    '%(service-provider)s '
+                                    '--description %(description)s '
+                                    % {'service-provider': service_provider,
+                                       'description': new_description})
+        self.assertEqual(0, len(raw_output))
+        raw_output = self.openstack('service provider show %s'
+                                    % service_provider)
+        updated_value = self.parse_show_as_object(raw_output)
+        self.assertIn(new_description, updated_value['description'])