Use FakeProject and FakeDomain classes in unit tests of networkv2

FakeProject and FakeDomain classes have been completed
in identityv2_0 and v3, Now we can use these classes
instead of old test data in networkv2.

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

Author: Huanxuan Ao

openstackclient/tests/network/v2/test_address_scope.py

@@ -11,7 +11,6 @@
 #   under the License.
 #
 
-import copy
 import mock
 
 from mock import call
@@ -35,11 +34,13 @@ def setUp(self):
 
 class TestCreateAddressScope(TestAddressScope):
 
+    project = identity_fakes_v3.FakeProject.create_one_project()
+    domain = identity_fakes_v3.FakeDomain.create_one_domain()
     # The new address scope created.
     new_address_scope = (
         network_fakes.FakeAddressScope.create_one_address_scope(
             attrs={
-                'tenant_id': identity_fakes_v3.project_id,
+                'tenant_id': project.id,
             }
         ))
     columns = (
@@ -75,19 +76,11 @@ def setUp(self):
 
         # Get a shortcut to the ProjectManager Mock
         self.projects_mock = self.identity.projects
-        self.projects_mock.get.return_value = fakes.FakeResource(
-            None,
-            copy.deepcopy(identity_fakes_v3.PROJECT),
-            loaded=True,
-        )
+        self.projects_mock.get.return_value = self.project
 
         # Get a shortcut to the DomainManager Mock
         self.domains_mock = self.identity.domains
-        self.domains_mock.get.return_value = fakes.FakeResource(
-            None,
-            copy.deepcopy(identity_fakes_v3.DOMAIN),
-            loaded=True,
-        )
+        self.domains_mock.get.return_value = self.domain
 
     def test_create_no_options(self):
         arglist = []
@@ -121,15 +114,15 @@ def test_create_all_options(self):
         arglist = [
             '--ip-version', str(self.new_address_scope.ip_version),
             '--share',
-            '--project', identity_fakes_v3.project_name,
-            '--project-domain', identity_fakes_v3.domain_name,
+            '--project', self.project.name,
+            '--project-domain', self.domain.name,
             self.new_address_scope.name,
         ]
         verifylist = [
             ('ip_version', self.new_address_scope.ip_version),
             ('share', True),
-            ('project', identity_fakes_v3.project_name),
-            ('project_domain', identity_fakes_v3.domain_name),
+            ('project', self.project.name),
+            ('project_domain', self.domain.name),
             ('name', self.new_address_scope.name),
         ]
 
@@ -139,7 +132,7 @@ def test_create_all_options(self):
         self.network.create_address_scope.assert_called_once_with(**{
             'ip_version': self.new_address_scope.ip_version,
             'shared': True,
-            'tenant_id': identity_fakes_v3.project_id,
+            'tenant_id': self.project.id,
             'name': self.new_address_scope.name,
         })
         self.assertEqual(self.columns, columns)

openstackclient/tests/network/v2/test_ip_availability.py

@@ -11,7 +11,6 @@
 #   under the License.
 #
 
-import copy
 import mock
 
 from osc_lib import utils as common_utils
@@ -41,11 +40,8 @@ def setUp(self):
 
         # Get a shortcut to the ProjectManager Mock
         self.projects_mock = self.identity.projects
-        self.projects_mock.get.return_value = fakes.FakeResource(
-            None,
-            copy.deepcopy(identity_fakes.PROJECT),
-            loaded=True,
-        )
+        self.project = identity_fakes.FakeProject.create_one_project()
+        self.projects_mock.get.return_value = self.project
 
 
 class TestListIPAvailability(TestIPAvailability):
@@ -109,16 +105,16 @@ def test_list_ip_version(self):
 
     def test_list_project(self):
         arglist = [
-            '--project', identity_fakes.project_name
+            '--project', self.project.name
         ]
         verifylist = [
-            ('project', identity_fakes.project_name)
+            ('project', self.project.name)
         ]
 
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
         columns, data = self.cmd.take_action(parsed_args)
-        filters = {'tenant_id': identity_fakes.project_id,
+        filters = {'tenant_id': self.project.id,
                    'ip_version': 4}
 
         self.network.network_ip_availabilities.assert_called_once_with(

openstackclient/tests/network/v2/test_network.py

@@ -11,7 +11,6 @@
 #   under the License.
 #
 
-import copy
 import mock
 from mock import call
 
@@ -40,10 +39,12 @@ def setUp(self):
 
 class TestCreateNetworkIdentityV3(TestNetwork):
 
+    project = identity_fakes_v3.FakeProject.create_one_project()
+    domain = identity_fakes_v3.FakeDomain.create_one_domain()
     # The new network created.
     _network = network_fakes.FakeNetwork.create_one_network(
         attrs={
-            'tenant_id': identity_fakes_v3.project_id,
+            'tenant_id': project.id,
             'availability_zone_hints': ["nova"],
         }
     )
@@ -96,19 +97,11 @@ def setUp(self):
 
         # Get a shortcut to the ProjectManager Mock
         self.projects_mock = self.identity.projects
-        self.projects_mock.get.return_value = fakes.FakeResource(
-            None,
-            copy.deepcopy(identity_fakes_v3.PROJECT),
-            loaded=True,
-        )
+        self.projects_mock.get.return_value = self.project
 
         # Get a shortcut to the DomainManager Mock
         self.domains_mock = self.identity.domains
-        self.domains_mock.get.return_value = fakes.FakeResource(
-            None,
-            copy.deepcopy(identity_fakes_v3.DOMAIN),
-            loaded=True,
-        )
+        self.domains_mock.get.return_value = self.domain
 
     def test_create_no_options(self):
         arglist = []
@@ -143,8 +136,8 @@ def test_create_all_options(self):
         arglist = [
             "--disable",
             "--share",
-            "--project", identity_fakes_v3.project_name,
-            "--project-domain", identity_fakes_v3.domain_name,
+            "--project", self.project.name,
+            "--project-domain", self.domain.name,
             "--availability-zone-hint", "nova",
             "--external", "--default",
             "--provider-network-type", "vlan",
@@ -156,8 +149,8 @@ def test_create_all_options(self):
         verifylist = [
             ('disable', True),
             ('share', True),
-            ('project', identity_fakes_v3.project_name),
-            ('project_domain', identity_fakes_v3.domain_name),
+            ('project', self.project.name),
+            ('project_domain', self.domain.name),
             ('availability_zone_hints', ["nova"]),
             ('external', True),
             ('default', True),
@@ -176,7 +169,7 @@ def test_create_all_options(self):
             'availability_zone_hints': ["nova"],
             'name': self._network.name,
             'shared': True,
-            'tenant_id': identity_fakes_v3.project_id,
+            'tenant_id': self.project.id,
             'is_default': True,
             'router:external': True,
             'provider:network_type': 'vlan',
@@ -214,9 +207,10 @@ def test_create_other_options(self):
 
 class TestCreateNetworkIdentityV2(TestNetwork):
 
+    project = identity_fakes_v2.FakeProject.create_one_project()
     # The new network created.
     _network = network_fakes.FakeNetwork.create_one_network(
-        attrs={'tenant_id': identity_fakes_v2.project_id}
+        attrs={'tenant_id': project.id}
     )
 
     columns = (
@@ -267,24 +261,20 @@ def setUp(self):
 
         # Get a shortcut to the ProjectManager Mock
         self.projects_mock = self.identity.tenants
-        self.projects_mock.get.return_value = fakes.FakeResource(
-            None,
-            copy.deepcopy(identity_fakes_v2.PROJECT),
-            loaded=True,
-        )
+        self.projects_mock.get.return_value = self.project
 
         # There is no DomainManager Mock in fake identity v2.
 
     def test_create_with_project_identityv2(self):
         arglist = [
-            "--project", identity_fakes_v2.project_name,
+            "--project", self.project.name,
             self._network.name,
         ]
         verifylist = [
             ('enable', True),
             ('share', None),
             ('name', self._network.name),
-            ('project', identity_fakes_v2.project_name),
+            ('project', self.project.name),
             ('external', False),
         ]
 
@@ -294,22 +284,22 @@ def test_create_with_project_identityv2(self):
         self.network.create_network.assert_called_once_with(**{
             'admin_state_up': True,
             'name': self._network.name,
-            'tenant_id': identity_fakes_v2.project_id,
+            'tenant_id': self.project.id,
         })
         self.assertEqual(self.columns, columns)
         self.assertEqual(self.data, data)
 
     def test_create_with_domain_identityv2(self):
         arglist = [
-            "--project", identity_fakes_v3.project_name,
-            "--project-domain", identity_fakes_v3.domain_name,
+            "--project", self.project.name,
+            "--project-domain", "domain-name",
             self._network.name,
         ]
         verifylist = [
             ('enable', True),
             ('share', None),
-            ('project', identity_fakes_v3.project_name),
-            ('project_domain', identity_fakes_v3.domain_name),
+            ('project', self.project.name),
+            ('project_domain', "domain-name"),
             ('name', self._network.name),
             ('external', False),
         ]

openstackclient/tests/network/v2/test_security_group.py

@@ -11,7 +11,6 @@
 #   under the License.
 #
 
-import copy
 import mock
 from mock import call
 
@@ -45,6 +44,8 @@ def setUp(self):
 
 class TestCreateSecurityGroupNetwork(TestSecurityGroupNetwork):
 
+    project = identity_fakes.FakeProject.create_one_project()
+    domain = identity_fakes.FakeDomain.create_one_domain()
     # The security group to be created.
     _security_group = \
         network_fakes.FakeSecurityGroup.create_one_security_group()
@@ -81,19 +82,11 @@ def setUp(self):
 
         # Get a shortcut to the ProjectManager Mock
         self.projects_mock = self.identity.projects
-        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 a shortcut to the DomainManager Mock
         self.domains_mock = self.identity.domains
-        self.domains_mock.get.return_value = fakes.FakeResource(
-            None,
-            copy.deepcopy(identity_fakes.DOMAIN),
-            loaded=True,
-        )
+        self.domains_mock.get.return_value = self.domain
 
         # Get the command object to test
         self.cmd = security_group.CreateSecurityGroup(self.app, self.namespace)
@@ -123,15 +116,15 @@ def test_create_min_options(self):
     def test_create_all_options(self):
         arglist = [
             '--description', self._security_group.description,
-            '--project', identity_fakes.project_name,
-            '--project-domain', identity_fakes.domain_name,
+            '--project', self.project.name,
+            '--project-domain', self.domain.name,
             self._security_group.name,
         ]
         verifylist = [
             ('description', self._security_group.description),
             ('name', self._security_group.name),
-            ('project', identity_fakes.project_name),
-            ('project_domain', identity_fakes.domain_name),
+            ('project', self.project.name),
+            ('project_domain', self.domain.name),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
@@ -140,14 +133,16 @@ def test_create_all_options(self):
         self.network.create_security_group.assert_called_once_with(**{
             'description': self._security_group.description,
             'name': self._security_group.name,
-            'tenant_id': identity_fakes.project_id,
+            'tenant_id': self.project.id,
         })
         self.assertEqual(self.columns, columns)
         self.assertEqual(self.data, data)
 
 
 class TestCreateSecurityGroupCompute(TestSecurityGroupCompute):
 
+    project = identity_fakes.FakeProject.create_one_project()
+    domain = identity_fakes.FakeDomain.create_one_domain()
     # The security group to be shown.
     _security_group = \
         compute_fakes.FakeSecurityGroup.create_one_security_group()
@@ -184,8 +179,8 @@ def test_create_no_options(self):
 
     def test_create_network_options(self):
         arglist = [
-            '--project', identity_fakes.project_name,
-            '--project-domain', identity_fakes.domain_name,
+            '--project', self.project.name,
+            '--project-domain', self.domain.name,
             self._security_group.name,
         ]
         self.assertRaises(tests_utils.ParserException,