Merge "Now we can add description for role creation in OSC"

2 files changed, 26 insertions, 1 deletions

diff --git a/openstackclient/tests/functional/identity/v3/common.py b/openstackclient/tests/functional/identity/v3/common.py
index 86f090bc..a5edd9a5 100644
--- a/openstackclient/tests/functional/identity/v3/common.py
+++ b/openstackclient/tests/functional/identity/v3/common.py
@@ -33,7 +33,7 @@ class IdentityTests(base.TestCase):
                    'password_expires_at']
     PROJECT_FIELDS = ['description', 'id', 'domain_id', 'is_domain',
                       'enabled', 'name', 'parent_id']
-    ROLE_FIELDS = ['id', 'name', 'domain_id']
+    ROLE_FIELDS = ['id', 'name', 'domain_id', 'description']
     SERVICE_FIELDS = ['id', 'enabled', 'name', 'type', 'description']
     REGION_FIELDS = ['description', 'enabled', 'parent_region', 'region']
     ENDPOINT_FIELDS = ['id', 'region', 'region_id', 'service_id',
diff --git a/openstackclient/tests/functional/identity/v3/test_role.py b/openstackclient/tests/functional/identity/v3/test_role.py
index 38bfff71..3954c4e3 100644
--- a/openstackclient/tests/functional/identity/v3/test_role.py
+++ b/openstackclient/tests/functional/identity/v3/test_role.py
@@ -20,6 +20,21 @@ class RoleTests(common.IdentityTests):
     def test_role_create(self):
         self._create_dummy_role()
 
+    def test_role_create_with_description(self):
+        role_name = data_utils.rand_name('TestRole')
+        description = data_utils.rand_name('description')
+        raw_output = self.openstack(
+            'role create '
+            '--description %(description)s '
+            '%(name)s' % {'description': description,
+                          'name': role_name})
+        role = self.parse_show_as_object(raw_output)
+        self.addCleanup(self.openstack, 'role delete %s' % role['id'])
+        items = self.parse_show(raw_output)
+        self.assert_show_fields(items, self.ROLE_FIELDS)
+        self.assertEqual(description, role['description'])
+        return role_name
+
     def test_role_delete(self):
         role_name = self._create_dummy_role(add_clean_up=False)
         raw_output = self.openstack('role delete %s' % role_name)
@@ -47,6 +62,16 @@ class RoleTests(common.IdentityTests):
         role = self.parse_show_as_object(raw_output)
         self.assertEqual(new_role_name, role['name'])
 
+    def test_role_set_description(self):
+        role_name = self._create_dummy_role()
+        description = data_utils.rand_name("NewDescription")
+        raw_output = self.openstack('role set --description %s %s'
+                                    % (description, role_name))
+        self.assertEqual(0, len(raw_output))
+        raw_output = self.openstack('role show %s' % role_name)
+        role = self.parse_show_as_object(raw_output)
+        self.assertEqual(description, role['description'])
+
     def test_role_add(self):
         role_name = self._create_dummy_role()
         username = self._create_dummy_user()