Changed the abstract columns and datalists from test cases of common and Identity

columns and datalist has been set in each test case in compute,
which is not necessary. This patch abstract it out and remove
all redundant code.

Change-Id: I45a3582088161f12e60e7c933da8e7dcc0ae8e7b
Closes-Bug: #1532384

5 files changed, 126 insertions, 225 deletions

diff --git a/openstackclient/tests/identity/v2_0/test_catalog.py b/openstackclient/tests/identity/v2_0/test_catalog.py
index 7f1835d6..ff1d993e 100644
--- a/openstackclient/tests/identity/v2_0/test_catalog.py
+++ b/openstackclient/tests/identity/v2_0/test_catalog.py
@@ -55,6 +55,12 @@ class TestCatalog(utils.TestCommand):
 
 class TestCatalogList(TestCatalog):
 
+    columns = (
+        'Name',
+        'Type',
+        'Endpoints',
+    )
+
     def setUp(self):
         super(TestCatalogList, self).setUp()
 
@@ -70,8 +76,7 @@ class TestCatalogList(TestCatalog):
         columns, data = self.cmd.take_action(parsed_args)
         self.sc_mock.service_catalog.get_data.assert_called_with()
 
-        collist = ('Name', 'Type', 'Endpoints')
-        self.assertEqual(collist, columns)
+        self.assertEqual(self.columns, columns)
         datalist = ((
             'supernova',
             'compute',
@@ -113,8 +118,7 @@ class TestCatalogList(TestCatalog):
         columns, data = self.cmd.take_action(parsed_args)
         self.sc_mock.service_catalog.get_data.assert_called_with()
 
-        collist = ('Name', 'Type', 'Endpoints')
-        self.assertEqual(collist, columns)
+        self.assertEqual(self.columns, columns)
         datalist = ((
             'supernova',
             'compute',
diff --git a/openstackclient/tests/identity/v2_0/test_project.py b/openstackclient/tests/identity/v2_0/test_project.py
index 16ab1957..78e5dff7 100644
--- a/openstackclient/tests/identity/v2_0/test_project.py
+++ b/openstackclient/tests/identity/v2_0/test_project.py
@@ -34,6 +34,19 @@ class TestProject(identity_fakes.TestIdentityv2):
 
 class TestProjectCreate(TestProject):
 
+    columns = (
+        'description',
+        'enabled',
+        'id',
+        'name',
+    )
+    datalist = (
+        identity_fakes.project_description,
+        True,
+        identity_fakes.project_id,
+        identity_fakes.project_name,
+    )
+
     def setUp(self):
         super(TestProjectCreate, self).setUp()
 
@@ -69,16 +82,8 @@ class TestProjectCreate(TestProject):
             identity_fakes.project_name,
             **kwargs
         )
-
-        collist = ('description', 'enabled', 'id', 'name')
-        self.assertEqual(collist, columns)
-        datalist = (
-            identity_fakes.project_description,
-            True,
-            identity_fakes.project_id,
-            identity_fakes.project_name,
-        )
-        self.assertEqual(datalist, data)
+        self.assertEqual(self.columns, columns)
+        self.assertEqual(self.datalist, data)
 
     def test_project_create_description(self):
         arglist = [
@@ -104,15 +109,8 @@ class TestProjectCreate(TestProject):
             **kwargs
         )
 
-        collist = ('description', 'enabled', 'id', 'name')
-        self.assertEqual(collist, columns)
-        datalist = (
-            identity_fakes.project_description,
-            True,
-            identity_fakes.project_id,
-            identity_fakes.project_name,
-        )
-        self.assertEqual(datalist, data)
+        self.assertEqual(self.columns, columns)
+        self.assertEqual(self.datalist, data)
 
     def test_project_create_enable(self):
         arglist = [
@@ -139,15 +137,8 @@ class TestProjectCreate(TestProject):
             **kwargs
         )
 
-        collist = ('description', 'enabled', 'id', 'name')
-        self.assertEqual(collist, columns)
-        datalist = (
-            identity_fakes.project_description,
-            True,
-            identity_fakes.project_id,
-            identity_fakes.project_name,
-        )
-        self.assertEqual(datalist, data)
+        self.assertEqual(self.columns, columns)
+        self.assertEqual(self.datalist, data)
 
     def test_project_create_disable(self):
         arglist = [
@@ -174,15 +165,8 @@ class TestProjectCreate(TestProject):
             **kwargs
         )
 
-        collist = ('description', 'enabled', 'id', 'name')
-        self.assertEqual(collist, columns)
-        datalist = (
-            identity_fakes.project_description,
-            True,
-            identity_fakes.project_id,
-            identity_fakes.project_name,
-        )
-        self.assertEqual(datalist, data)
+        self.assertEqual(self.columns, columns)
+        self.assertEqual(self.datalist, data)
 
     def test_project_create_property(self):
         arglist = [
@@ -211,15 +195,8 @@ class TestProjectCreate(TestProject):
             **kwargs
         )
 
-        collist = ('description', 'enabled', 'id', 'name')
-        self.assertEqual(collist, columns)
-        datalist = (
-            identity_fakes.project_description,
-            True,
-            identity_fakes.project_id,
-            identity_fakes.project_name,
-        )
-        self.assertEqual(datalist, data)
+        self.assertEqual(self.columns, columns)
+        self.assertEqual(self.datalist, data)
 
     def test_project_create_or_show_exists(self):
         def _raise_conflict(*args, **kwargs):
@@ -260,15 +237,8 @@ class TestProjectCreate(TestProject):
             **kwargs
         )
 
-        collist = ('description', 'enabled', 'id', 'name')
-        self.assertEqual(collist, columns)
-        datalist = (
-            identity_fakes.project_description,
-            True,
-            identity_fakes.project_id,
-            identity_fakes.project_name,
-        )
-        self.assertEqual(datalist, data)
+        self.assertEqual(self.columns, columns)
+        self.assertEqual(self.datalist, data)
 
     def test_project_create_or_show_not_exists(self):
         arglist = [
@@ -294,15 +264,8 @@ class TestProjectCreate(TestProject):
             **kwargs
         )
 
-        collist = ('description', 'enabled', 'id', 'name')
-        self.assertEqual(collist, columns)
-        datalist = (
-            identity_fakes.project_description,
-            True,
-            identity_fakes.project_id,
-            identity_fakes.project_name,
-        )
-        self.assertEqual(datalist, data)
+        self.assertEqual(self.columns, columns)
+        self.assertEqual(self.datalist, data)
 
 
 class TestProjectDelete(TestProject):
diff --git a/openstackclient/tests/identity/v2_0/test_role.py b/openstackclient/tests/identity/v2_0/test_role.py
index ec484333..c2bacc52 100644
--- a/openstackclient/tests/identity/v2_0/test_role.py
+++ b/openstackclient/tests/identity/v2_0/test_role.py
@@ -107,6 +107,15 @@ class TestRoleAdd(TestRole):
 
 class TestRoleCreate(TestRole):
 
+    columns = (
+        'id',
+        'name'
+    )
+    datalist = (
+        identity_fakes.role_id,
+        identity_fakes.role_name,
+    )
+
     def setUp(self):
         super(TestRoleCreate, self).setUp()
 
@@ -136,13 +145,8 @@ class TestRoleCreate(TestRole):
             identity_fakes.role_name,
         )
 
-        collist = ('id', 'name')
-        self.assertEqual(collist, columns)
-        datalist = (
-            identity_fakes.role_id,
-            identity_fakes.role_name,
-        )
-        self.assertEqual(datalist, data)
+        self.assertEqual(self.columns, columns)
+        self.assertEqual(self.datalist, data)
 
     def test_role_create_or_show_exists(self):
         def _raise_conflict(*args, **kwargs):
@@ -178,13 +182,8 @@ class TestRoleCreate(TestRole):
             identity_fakes.role_name,
         )
 
-        collist = ('id', 'name')
-        self.assertEqual(collist, columns)
-        datalist = (
-            identity_fakes.role_id,
-            identity_fakes.role_name,
-        )
-        self.assertEqual(datalist, data)
+        self.assertEqual(self.columns, columns)
+        self.assertEqual(self.datalist, data)
 
     def test_role_create_or_show_not_exists(self):
         arglist = [
@@ -205,13 +204,8 @@ class TestRoleCreate(TestRole):
             identity_fakes.role_name,
         )
 
-        collist = ('id', 'name')
-        self.assertEqual(collist, columns)
-        datalist = (
-            identity_fakes.role_id,
-            identity_fakes.role_name,
-        )
-        self.assertEqual(datalist, data)
+        self.assertEqual(self.columns, columns)
+        self.assertEqual(self.datalist, data)
 
 
 class TestRoleDelete(TestRole):
@@ -283,6 +277,13 @@ class TestRoleList(TestRole):
 
 class TestUserRoleList(TestRole):
 
+    columns = (
+        'ID',
+        'Name',
+        'Project',
+        'User'
+    )
+
     def setUp(self):
         super(TestUserRoleList, self).setUp()
 
@@ -395,8 +396,7 @@ class TestUserRoleList(TestRole):
             identity_fakes.PROJECT_2['id'],
         )
 
-        collist = ('ID', 'Name', 'Project', 'User')
-        self.assertEqual(collist, columns)
+        self.assertEqual(columns, columns)
         datalist = ((
             identity_fakes.role_id,
             identity_fakes.role_name,
diff --git a/openstackclient/tests/identity/v2_0/test_service.py b/openstackclient/tests/identity/v2_0/test_service.py
index 26a9716f..b97786b4 100644
--- a/openstackclient/tests/identity/v2_0/test_service.py
+++ b/openstackclient/tests/identity/v2_0/test_service.py
@@ -32,6 +32,19 @@ class TestService(identity_fakes.TestIdentityv2):
 
 class TestServiceCreate(TestService):
 
+    columns = (
+        'description',
+        'id',
+        'name',
+        'type',
+    )
+    datalist = (
+        identity_fakes.service_description,
+        identity_fakes.service_id,
+        identity_fakes.service_name,
+        identity_fakes.service_type,
+    )
+
     def setUp(self):
         super(TestServiceCreate, self).setUp()
 
@@ -66,15 +79,8 @@ class TestServiceCreate(TestService):
             None,
         )
 
-        collist = ('description', 'id', 'name', 'type')
-        self.assertEqual(collist, columns)
-        datalist = (
-            identity_fakes.service_description,
-            identity_fakes.service_id,
-            identity_fakes.service_name,
-            identity_fakes.service_type,
-        )
-        self.assertEqual(datalist, data)
+        self.assertEqual(self.columns, columns)
+        self.assertEqual(self.datalist, data)
 
     def test_service_create_with_type_option(self):
         arglist = [
@@ -99,15 +105,8 @@ class TestServiceCreate(TestService):
             None,
         )
 
-        collist = ('description', 'id', 'name', 'type')
-        self.assertEqual(collist, columns)
-        datalist = (
-            identity_fakes.service_description,
-            identity_fakes.service_id,
-            identity_fakes.service_name,
-            identity_fakes.service_type,
-        )
-        self.assertEqual(datalist, data)
+        self.assertEqual(self.columns, columns)
+        self.assertEqual(self.datalist, data)
 
     def test_service_create_with_name_option(self):
         arglist = [
@@ -132,15 +131,8 @@ class TestServiceCreate(TestService):
             None,
         )
 
-        collist = ('description', 'id', 'name', 'type')
-        self.assertEqual(collist, columns)
-        datalist = (
-            identity_fakes.service_description,
-            identity_fakes.service_id,
-            identity_fakes.service_name,
-            identity_fakes.service_type,
-        )
-        self.assertEqual(datalist, data)
+        self.assertEqual(self.columns, columns)
+        self.assertEqual(self.datalist, data)
 
     def test_service_create_description(self):
         arglist = [
@@ -166,15 +158,8 @@ class TestServiceCreate(TestService):
             identity_fakes.service_description,
         )
 
-        collist = ('description', 'id', 'name', 'type')
-        self.assertEqual(collist, columns)
-        datalist = (
-            identity_fakes.service_description,
-            identity_fakes.service_id,
-            identity_fakes.service_name,
-            identity_fakes.service_type,
-        )
-        self.assertEqual(datalist, data)
+        self.assertEqual(self.columns, columns)
+        self.assertEqual(self.datalist, data)
 
 
 class TestServiceDelete(TestService):
diff --git a/openstackclient/tests/identity/v2_0/test_user.py b/openstackclient/tests/identity/v2_0/test_user.py
index bf25681e..a25def87 100644
--- a/openstackclient/tests/identity/v2_0/test_user.py
+++ b/openstackclient/tests/identity/v2_0/test_user.py
@@ -39,6 +39,21 @@ class TestUser(identity_fakes.TestIdentityv2):
 
 class TestUserCreate(TestUser):
 
+    columns = (
+        'email',
+        'enabled',
+        'id',
+        'name',
+        'project_id',
+    )
+    datalist = (
+        identity_fakes.user_email,
+        True,
+        identity_fakes.user_id,
+        identity_fakes.user_name,
+        identity_fakes.project_id,
+    )
+
     def setUp(self):
         super(TestUserCreate, self).setUp()
 
@@ -84,16 +99,8 @@ class TestUserCreate(TestUser):
             **kwargs
         )
 
-        collist = ('email', 'enabled', 'id', 'name', 'project_id')
-        self.assertEqual(collist, columns)
-        datalist = (
-            identity_fakes.user_email,
-            True,
-            identity_fakes.user_id,
-            identity_fakes.user_name,
-            identity_fakes.project_id,
-        )
-        self.assertEqual(datalist, data)
+        self.assertEqual(self.columns, columns)
+        self.assertEqual(self.datalist, data)
 
     def test_user_create_password(self):
         arglist = [
@@ -122,17 +129,8 @@ class TestUserCreate(TestUser):
             None,
             **kwargs
         )
-
-        collist = ('email', 'enabled', 'id', 'name', 'project_id')
-        self.assertEqual(collist, columns)
-        datalist = (
-            identity_fakes.user_email,
-            True,
-            identity_fakes.user_id,
-            identity_fakes.user_name,
-            identity_fakes.project_id,
-        )
-        self.assertEqual(datalist, data)
+        self.assertEqual(self.columns, columns)
+        self.assertEqual(self.datalist, data)
 
     def test_user_create_password_prompt(self):
         arglist = [
@@ -164,16 +162,8 @@ class TestUserCreate(TestUser):
             **kwargs
         )
 
-        collist = ('email', 'enabled', 'id', 'name', 'project_id')
-        self.assertEqual(collist, columns)
-        datalist = (
-            identity_fakes.user_email,
-            True,
-            identity_fakes.user_id,
-            identity_fakes.user_name,
-            identity_fakes.project_id,
-        )
-        self.assertEqual(datalist, data)
+        self.assertEqual(self.columns, columns)
+        self.assertEqual(self.datalist, data)
 
     def test_user_create_email(self):
         arglist = [
@@ -202,16 +192,8 @@ class TestUserCreate(TestUser):
             **kwargs
         )
 
-        collist = ('email', 'enabled', 'id', 'name', 'project_id')
-        self.assertEqual(collist, columns)
-        datalist = (
-            identity_fakes.user_email,
-            True,
-            identity_fakes.user_id,
-            identity_fakes.user_name,
-            identity_fakes.project_id,
-        )
-        self.assertEqual(datalist, data)
+        self.assertEqual(self.columns, columns)
+        self.assertEqual(self.datalist, data)
 
     def test_user_create_project(self):
         # Return the new project
@@ -255,8 +237,7 @@ class TestUserCreate(TestUser):
             **kwargs
         )
 
-        collist = ('email', 'enabled', 'id', 'name', 'project_id')
-        self.assertEqual(collist, columns)
+        self.assertEqual(self.columns, columns)
         datalist = (
             identity_fakes.user_email,
             True,
@@ -294,16 +275,8 @@ class TestUserCreate(TestUser):
             **kwargs
         )
 
-        collist = ('email', 'enabled', 'id', 'name', 'project_id')
-        self.assertEqual(collist, columns)
-        datalist = (
-            identity_fakes.user_email,
-            True,
-            identity_fakes.user_id,
-            identity_fakes.user_name,
-            identity_fakes.project_id,
-        )
-        self.assertEqual(datalist, data)
+        self.assertEqual(self.columns, columns)
+        self.assertEqual(self.datalist, data)
 
     def test_user_create_disable(self):
         arglist = [
@@ -333,16 +306,8 @@ class TestUserCreate(TestUser):
             **kwargs
         )
 
-        collist = ('email', 'enabled', 'id', 'name', 'project_id')
-        self.assertEqual(collist, columns)
-        datalist = (
-            identity_fakes.user_email,
-            True,
-            identity_fakes.user_id,
-            identity_fakes.user_name,
-            identity_fakes.project_id,
-        )
-        self.assertEqual(datalist, data)
+        self.assertEqual(self.columns, columns)
+        self.assertEqual(self.datalist, data)
 
     def test_user_create_or_show_exists(self):
         def _raise_conflict(*args, **kwargs):
@@ -373,16 +338,8 @@ class TestUserCreate(TestUser):
         # UserManager.create(name, password, email, tenant_id=, enabled=)
         self.users_mock.get.assert_called_with(identity_fakes.user_name)
 
-        collist = ('email', 'enabled', 'id', 'name', 'project_id')
-        self.assertEqual(collist, columns)
-        datalist = (
-            identity_fakes.user_email,
-            True,
-            identity_fakes.user_id,
-            identity_fakes.user_name,
-            identity_fakes.project_id,
-        )
-        self.assertEqual(datalist, data)
+        self.assertEqual(self.columns, columns)
+        self.assertEqual(self.datalist, data)
 
     def test_user_create_or_show_not_exists(self):
         arglist = [
@@ -410,17 +367,8 @@ class TestUserCreate(TestUser):
             None,
             **kwargs
         )
-
-        collist = ('email', 'enabled', 'id', 'name', 'project_id')
-        self.assertEqual(collist, columns)
-        datalist = (
-            identity_fakes.user_email,
-            True,
-            identity_fakes.user_id,
-            identity_fakes.user_name,
-            identity_fakes.project_id,
-        )
-        self.assertEqual(datalist, data)
+        self.assertEqual(self.columns, columns)
+        self.assertEqual(self.datalist, data)
 
 
 class TestUserDelete(TestUser):
@@ -458,6 +406,17 @@ class TestUserDelete(TestUser):
 
 class TestUserList(TestUser):
 
+    columns = (
+        'ID',
+        'Name',
+    )
+    datalist = (
+        (
+            identity_fakes.user_id,
+            identity_fakes.user_name,
+        ),
+    )
+
     def setUp(self):
         super(TestUserList, self).setUp()
 
@@ -495,13 +454,8 @@ class TestUserList(TestUser):
 
         self.users_mock.list.assert_called_with(tenant_id=None)
 
-        collist = ('ID', 'Name')
-        self.assertEqual(collist, columns)
-        datalist = ((
-            identity_fakes.user_id,
-            identity_fakes.user_name,
-        ), )
-        self.assertEqual(datalist, tuple(data))
+        self.assertEqual(self.columns, columns)
+        self.assertEqual(self.datalist, tuple(data))
 
     def test_user_list_project(self):
         arglist = [
@@ -518,13 +472,8 @@ class TestUserList(TestUser):
 
         self.users_mock.list.assert_called_with(tenant_id=project_id)
 
-        collist = ('ID', 'Name')
-        self.assertEqual(collist, columns)
-        datalist = ((
-            identity_fakes.user_id,
-            identity_fakes.user_name,
-        ), )
-        self.assertEqual(datalist, tuple(data))
+        self.assertEqual(self.columns, columns)
+        self.assertEqual(self.datalist, tuple(data))
 
     def test_user_list_long(self):
         arglist = [