Merge "Fix the `role implies list` command." into stable/queensqueens-eolstable/queens

2 files changed, 38 insertions, 0 deletions

diff --git a/openstackclient/tests/functional/identity/v3/common.py b/openstackclient/tests/functional/identity/v3/common.py
index 33cb5d86..54132be5 100644
--- a/openstackclient/tests/functional/identity/v3/common.py
+++ b/openstackclient/tests/functional/identity/v3/common.py
@@ -52,6 +52,8 @@ class IdentityTests(base.TestCase):
                                'id', 'relay_state_prefix', 'sp_url']
     SERVICE_PROVIDER_LIST_HEADERS = ['ID', 'Enabled', 'Description',
                                      'Auth URL']
+    IMPLIED_ROLE_LIST_HEADERS = ['Prior Role ID', 'Prior Role Name',
+                                 'Implied Role ID', 'Implied Role Name']
 
     @classmethod
     def setUpClass(cls):
@@ -149,6 +151,17 @@ class IdentityTests(base.TestCase):
         self.assertEqual(role_name, role['name'])
         return role_name
 
+    def _create_dummy_implied_role(self, add_clean_up=True):
+        role_name = self._create_dummy_role(add_clean_up)
+        implied_role_name = self._create_dummy_role(add_clean_up)
+        self.openstack(
+            'implied role create '
+            '--implied-role %(implied_role)s '
+            '%(role)s' % {'implied_role': implied_role_name,
+                          'role': role_name})
+
+        return implied_role_name, role_name
+
     def _create_dummy_group(self, add_clean_up=True):
         group_name = data_utils.rand_name('TestGroup')
         description = data_utils.rand_name('description')
diff --git a/openstackclient/tests/functional/identity/v3/test_role.py b/openstackclient/tests/functional/identity/v3/test_role.py
index ab8af9c0..9ce5fe51 100644
--- a/openstackclient/tests/functional/identity/v3/test_role.py
+++ b/openstackclient/tests/functional/identity/v3/test_role.py
@@ -143,3 +143,28 @@ class RoleTests(common.IdentityTests):
                           'role': role_name})
         self.assertEqual(0, len(add_raw_output))
         self.assertEqual(0, len(remove_raw_output))
+
+    def test_implied_role_list(self):
+        self._create_dummy_implied_role()
+        raw_output = self.openstack('implied role list')
+        items = self.parse_listing(raw_output)
+        self.assert_table_structure(items, self.IMPLIED_ROLE_LIST_HEADERS)
+        self.assertEqual(1, len(items))
+
+    def test_implied_role_create(self):
+        role_name = self._create_dummy_role()
+        implied_role_name = self._create_dummy_role()
+        self.openstack(
+            'implied role create '
+            '--implied-role %(implied_role)s '
+            '%(role)s' % {'implied_role': implied_role_name,
+                          'role': role_name})
+
+    def test_implied_role_delete(self):
+        implied_role_name, role_name = self._create_dummy_implied_role()
+        raw_output = self.openstack(
+            'implied role delete '
+            '--implied-role %(implied_role)s '
+            '%(role)s' % {'implied_role': implied_role_name,
+                          'role': role_name})
+        self.assertEqual(0, len(raw_output))