Use identity fake classes instead of old unit tests data

Use FakeProject, FakeDomain and FakeUser classes instead
of old test data in image, compute and volume. (This work
has done in network)

Change-Id: Ic37d5d9db98f0f2acc6c714a9646063dcbde4ff3
Partially-Implements: blueprint use-fake-project

3 files changed, 65 insertions, 110 deletions

diff --git a/openstackclient/tests/volume/v1/test_volume.py b/openstackclient/tests/volume/v1/test_volume.py
index 380bc632..e41c2a72 100644
--- a/openstackclient/tests/volume/v1/test_volume.py
+++ b/openstackclient/tests/volume/v1/test_volume.py
@@ -50,6 +50,9 @@ class TestVolume(volume_fakes.TestVolumev1):
 
 class TestVolumeCreate(TestVolume):
 
+    project = identity_fakes.FakeProject.create_one_project()
+    user = identity_fakes.FakeUser.create_one_user()
+
     columns = (
         'attach_status',
         'availability_zone',
@@ -168,28 +171,20 @@ class TestVolumeCreate(TestVolume):
 
     def test_volume_create_user_project_id(self):
         # Return a project
-        self.projects_mock.get.return_value = fakes.FakeResource(
-            None,
-            copy.deepcopy(identity_fakes.PROJECT),
-            loaded=True,
-        )
+        self.projects_mock.get.return_value = self.project
         # Return a user
-        self.users_mock.get.return_value = fakes.FakeResource(
-            None,
-            copy.deepcopy(identity_fakes.USER),
-            loaded=True,
-        )
+        self.users_mock.get.return_value = self.user
 
         arglist = [
             '--size', str(volume_fakes.volume_size),
-            '--project', identity_fakes.project_id,
-            '--user', identity_fakes.user_id,
+            '--project', self.project.id,
+            '--user', self.user.id,
             volume_fakes.volume_name,
         ]
         verifylist = [
             ('size', volume_fakes.volume_size),
-            ('project', identity_fakes.project_id),
-            ('user', identity_fakes.user_id),
+            ('project', self.project.id),
+            ('user', self.user.id),
             ('name', volume_fakes.volume_name),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -211,8 +206,8 @@ class TestVolumeCreate(TestVolume):
             volume_fakes.volume_name,
             None,
             None,
-            identity_fakes.user_id,
-            identity_fakes.project_id,
+            self.user.id,
+            self.project.id,
             None,
             None,
             None,
@@ -223,28 +218,20 @@ class TestVolumeCreate(TestVolume):
 
     def test_volume_create_user_project_name(self):
         # Return a project
-        self.projects_mock.get.return_value = fakes.FakeResource(
-            None,
-            copy.deepcopy(identity_fakes.PROJECT),
-            loaded=True,
-        )
+        self.projects_mock.get.return_value = self.project
         # Return a user
-        self.users_mock.get.return_value = fakes.FakeResource(
-            None,
-            copy.deepcopy(identity_fakes.USER),
-            loaded=True,
-        )
+        self.users_mock.get.return_value = self.user
 
         arglist = [
             '--size', str(volume_fakes.volume_size),
-            '--project', identity_fakes.project_name,
-            '--user', identity_fakes.user_name,
+            '--project', self.project.name,
+            '--user', self.user.name,
             volume_fakes.volume_name,
         ]
         verifylist = [
             ('size', volume_fakes.volume_size),
-            ('project', identity_fakes.project_name),
-            ('user', identity_fakes.user_name),
+            ('project', self.project.name),
+            ('user', self.user.name),
             ('name', volume_fakes.volume_name),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -266,8 +253,8 @@ class TestVolumeCreate(TestVolume):
             volume_fakes.volume_name,
             None,
             None,
-            identity_fakes.user_id,
-            identity_fakes.project_id,
+            self.user.id,
+            self.project.id,
             None,
             None,
             None,
diff --git a/openstackclient/tests/volume/v2/test_type.py b/openstackclient/tests/volume/v2/test_type.py
index e148bba4..238b098f 100644
--- a/openstackclient/tests/volume/v2/test_type.py
+++ b/openstackclient/tests/volume/v2/test_type.py
@@ -12,13 +12,11 @@
 #   under the License.
 #
 
-import copy
 import mock
 
 from osc_lib import exceptions
 from osc_lib import utils
 
-from openstackclient.tests import fakes
 from openstackclient.tests.identity.v3 import fakes as identity_fakes
 from openstackclient.tests import utils as tests_utils
 from openstackclient.tests.volume.v2 import fakes as volume_fakes
@@ -219,6 +217,7 @@ class TestTypeList(TestType):
 
 class TestTypeSet(TestType):
 
+    project = identity_fakes.FakeProject.create_one_project()
     volume_type = volume_fakes.FakeType.create_one_type(
         methods={'set_keys': None})
 
@@ -228,11 +227,7 @@ class TestTypeSet(TestType):
         self.types_mock.get.return_value = self.volume_type
 
         # Return a project
-        self.projects_mock.get.return_value = fakes.FakeResource(
-            None,
-            copy.deepcopy(identity_fakes.PROJECT),
-            loaded=True,
-        )
+        self.projects_mock.get.return_value = self.project
         # Get the command object to test
         self.cmd = volume_type.SetVolumeType(self.app, None)
 
@@ -339,11 +334,11 @@ class TestTypeSet(TestType):
 
     def test_type_set_project_access(self):
         arglist = [
-            '--project', identity_fakes.project_id,
+            '--project', self.project.id,
             self.volume_type.id,
         ]
         verifylist = [
-            ('project', identity_fakes.project_id),
+            ('project', self.project.id),
             ('volume_type', self.volume_type.id),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -353,7 +348,7 @@ class TestTypeSet(TestType):
 
         self.types_access_mock.add_project_access.assert_called_with(
             self.volume_type.id,
-            identity_fakes.project_id,
+            self.project.id,
         )
 
 
@@ -469,6 +464,7 @@ class TestTypeShow(TestType):
 
 class TestTypeUnset(TestType):
 
+    project = identity_fakes.FakeProject.create_one_project()
     volume_type = volume_fakes.FakeType.create_one_type(
         methods={'unset_keys': None})
 
@@ -478,11 +474,7 @@ class TestTypeUnset(TestType):
         self.types_mock.get.return_value = self.volume_type
 
         # Return a project
-        self.projects_mock.get.return_value = fakes.FakeResource(
-            None,
-            copy.deepcopy(identity_fakes.PROJECT),
-            loaded=True,
-        )
+        self.projects_mock.get.return_value = self.project
 
         # Get the command object to test
         self.cmd = volume_type.UnsetVolumeType(self.app, None)
@@ -507,11 +499,11 @@ class TestTypeUnset(TestType):
 
     def test_type_unset_project_access(self):
         arglist = [
-            '--project', identity_fakes.project_id,
+            '--project', self.project.id,
             self.volume_type.id,
         ]
         verifylist = [
-            ('project', identity_fakes.project_id),
+            ('project', self.project.id),
             ('volume_type', self.volume_type.id),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -521,7 +513,7 @@ class TestTypeUnset(TestType):
 
         self.types_access_mock.remove_project_access.assert_called_with(
             self.volume_type.id,
-            identity_fakes.project_id,
+            self.project.id,
         )
 
     def test_type_unset_not_called_without_project_argument(self):
diff --git a/openstackclient/tests/volume/v2/test_volume.py b/openstackclient/tests/volume/v2/test_volume.py
index db65c3bd..25d0e92f 100644
--- a/openstackclient/tests/volume/v2/test_volume.py
+++ b/openstackclient/tests/volume/v2/test_volume.py
@@ -12,14 +12,12 @@
 #   under the License.
 #
 
-import copy
 import mock
 from mock import call
 
 from osc_lib import exceptions
 from osc_lib import utils
 
-from openstackclient.tests import fakes
 from openstackclient.tests.identity.v3 import fakes as identity_fakes
 from openstackclient.tests.image.v2 import fakes as image_fakes
 from openstackclient.tests.volume.v2 import fakes as volume_fakes
@@ -57,6 +55,9 @@ class TestVolume(volume_fakes.TestVolume):
 
 class TestVolumeCreate(TestVolume):
 
+    project = identity_fakes.FakeProject.create_one_project()
+    user = identity_fakes.FakeUser.create_one_user()
+
     columns = (
         'attachments',
         'availability_zone',
@@ -168,28 +169,20 @@ class TestVolumeCreate(TestVolume):
 
     def test_volume_create_user_project_id(self):
         # Return a project
-        self.projects_mock.get.return_value = fakes.FakeResource(
-            None,
-            copy.deepcopy(identity_fakes.PROJECT),
-            loaded=True,
-        )
+        self.projects_mock.get.return_value = self.project
         # Return a user
-        self.users_mock.get.return_value = fakes.FakeResource(
-            None,
-            copy.deepcopy(identity_fakes.USER),
-            loaded=True,
-        )
+        self.users_mock.get.return_value = self.user
 
         arglist = [
             '--size', str(self.new_volume.size),
-            '--project', identity_fakes.project_id,
-            '--user', identity_fakes.user_id,
+            '--project', self.project.id,
+            '--user', self.user.id,
             self.new_volume.name,
         ]
         verifylist = [
             ('size', self.new_volume.size),
-            ('project', identity_fakes.project_id),
-            ('user', identity_fakes.user_id),
+            ('project', self.project.id),
+            ('user', self.user.id),
             ('name', self.new_volume.name),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -205,8 +198,8 @@ class TestVolumeCreate(TestVolume):
             name=self.new_volume.name,
             description=None,
             volume_type=None,
-            user_id=identity_fakes.user_id,
-            project_id=identity_fakes.project_id,
+            user_id=self.user.id,
+            project_id=self.project.id,
             availability_zone=None,
             metadata=None,
             imageRef=None,
@@ -218,28 +211,20 @@ class TestVolumeCreate(TestVolume):
 
     def test_volume_create_user_project_name(self):
         # Return a project
-        self.projects_mock.get.return_value = fakes.FakeResource(
-            None,
-            copy.deepcopy(identity_fakes.PROJECT),
-            loaded=True,
-        )
+        self.projects_mock.get.return_value = self.project
         # Return a user
-        self.users_mock.get.return_value = fakes.FakeResource(
-            None,
-            copy.deepcopy(identity_fakes.USER),
-            loaded=True,
-        )
+        self.users_mock.get.return_value = self.user
 
         arglist = [
             '--size', str(self.new_volume.size),
-            '--project', identity_fakes.project_name,
-            '--user', identity_fakes.user_name,
+            '--project', self.project.name,
+            '--user', self.user.name,
             self.new_volume.name,
         ]
         verifylist = [
             ('size', self.new_volume.size),
-            ('project', identity_fakes.project_name),
-            ('user', identity_fakes.user_name),
+            ('project', self.project.name),
+            ('user', self.user.name),
             ('name', self.new_volume.name),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -255,8 +240,8 @@ class TestVolumeCreate(TestVolume):
             name=self.new_volume.name,
             description=None,
             volume_type=None,
-            user_id=identity_fakes.user_id,
-            project_id=identity_fakes.project_id,
+            user_id=self.user.id,
+            project_id=self.project.id,
             availability_zone=None,
             metadata=None,
             imageRef=None,
@@ -492,6 +477,9 @@ class TestVolumeDelete(TestVolume):
 
 class TestVolumeList(TestVolume):
 
+    project = identity_fakes.FakeProject.create_one_project()
+    user = identity_fakes.FakeUser.create_one_user()
+
     columns = [
         'ID',
         'Display Name',
@@ -506,21 +494,9 @@ class TestVolumeList(TestVolume):
         self.mock_volume = volume_fakes.FakeVolume.create_one_volume()
         self.volumes_mock.list.return_value = [self.mock_volume]
 
-        self.users_mock.get.return_value = [
-            fakes.FakeResource(
-                None,
-                copy.deepcopy(identity_fakes.USER),
-                loaded=True,
-            ),
-        ]
+        self.users_mock.get.return_value = self.user
 
-        self.projects_mock.get.return_value = [
-            fakes.FakeResource(
-                None,
-                copy.deepcopy(identity_fakes.PROJECT),
-                loaded=True,
-            ),
-        ]
+        self.projects_mock.get.return_value = self.project
 
         # Get the command object to test
         self.cmd = volume.ListVolume(self.app, None)
@@ -553,10 +529,10 @@ class TestVolumeList(TestVolume):
 
     def test_volume_list_project(self):
         arglist = [
-            '--project', identity_fakes.project_name,
+            '--project', self.project.name,
         ]
         verifylist = [
-            ('project', identity_fakes.project_name),
+            ('project', self.project.name),
             ('long', False),
             ('all_projects', False),
             ('status', None),
@@ -581,12 +557,12 @@ class TestVolumeList(TestVolume):
 
     def test_volume_list_project_domain(self):
         arglist = [
-            '--project', identity_fakes.project_name,
-            '--project-domain', identity_fakes.domain_name,
+            '--project', self.project.name,
+            '--project-domain', self.project.domain_id,
         ]
         verifylist = [
-            ('project', identity_fakes.project_name),
-            ('project_domain', identity_fakes.domain_name),
+            ('project', self.project.name),
+            ('project_domain', self.project.domain_id),
             ('long', False),
             ('all_projects', False),
             ('status', None),
@@ -611,10 +587,10 @@ class TestVolumeList(TestVolume):
 
     def test_volume_list_user(self):
         arglist = [
-            '--user', identity_fakes.user_name,
+            '--user', self.user.name,
         ]
         verifylist = [
-            ('user', identity_fakes.user_name),
+            ('user', self.user.name),
             ('long', False),
             ('all_projects', False),
             ('status', None),
@@ -638,12 +614,12 @@ class TestVolumeList(TestVolume):
 
     def test_volume_list_user_domain(self):
         arglist = [
-            '--user', identity_fakes.user_name,
-            '--user-domain', identity_fakes.domain_name,
+            '--user', self.user.name,
+            '--user-domain', self.user.domain_id,
         ]
         verifylist = [
-            ('user', identity_fakes.user_name),
-            ('user_domain', identity_fakes.domain_name),
+            ('user', self.user.name),
+            ('user_domain', self.user.domain_id),
             ('long', False),
             ('all_projects', False),
             ('status', None),