From 751974bddb974e8be0cfe87b5a2070d71e597ed1 Mon Sep 17 00:00:00 2001 From: manchandavishal Date: Tue, 29 Mar 2022 17:42:52 +0530 Subject: [PATCH] Fix Unit tests for trove-dashboard After 196de449b6 merged in openstack/horizon few trove-dashboard unit tests start failing. This patch updates those unit tests to not depend on the internal implementation of the horizon network_list_for_tenant function[1]. So any change in horizon won't break these tests again. [1] https://github.com/openstack/horizon/blob/master/openstack_dashboard/api/neutron.py#L1397 Change-Id: I20dad437b243bd71b017fc876de9fe84b654ee65 --- .../content/database_backups/tests.py | 10 ++-- trove_dashboard/content/databases/tests.py | 52 +++++++------------ 2 files changed, 26 insertions(+), 36 deletions(-) diff --git a/trove_dashboard/content/database_backups/tests.py b/trove_dashboard/content/database_backups/tests.py index b69e4a5..18f00ac 100644 --- a/trove_dashboard/content/database_backups/tests.py +++ b/trove_dashboard/content/database_backups/tests.py @@ -189,7 +189,7 @@ class DatabasesBackupsTests(test.TestCase): 'datastore_flavors', 'datastore_list', 'datastore_version_list', 'instance_list'), dash_api.cinder: ('volume_type_list',), - dash_api.neutron: ('network_list',), + dash_api.neutron: ('network_list_for_tenant',), dash_api.nova: ('availability_zone_list',), policy: ('check',), }) @@ -207,7 +207,8 @@ class DatabasesBackupsTests(test.TestCase): self.mock_instance_list.return_value = ( common.Paginated(self.databases.list())) self.mock_volume_type_list.return_vlue = [] - self.mock_network_list.return_value = self.networks.list()[:1] + self.mock_network_list_for_tenant.return_value = ( + self.networks.list()[:1]) self.mock_availability_zone_list.return_value = ( self.availability_zones.list()) @@ -228,8 +229,9 @@ class DatabasesBackupsTests(test.TestCase): self.mock_instance_list.assert_called_once_with(test.IsHttpRequest()) self.mock_volume_type_list.assert_called_once_with( test.IsHttpRequest()) - self.mock_network_list.assert_any_call( - test.IsHttpRequest(), tenant_id=self.tenant.id, shared=False) + self.mock_network_list_for_tenant.assert_called_once_with( + test.IsHttpRequest(), self.tenant.id, + include_pre_auto_allocate=True) self.mock_availability_zone_list.assert_called_once_with( test.IsHttpRequest()) self.assertTemplateUsed(res, 'project/databases/launch.html') diff --git a/trove_dashboard/content/databases/tests.py b/trove_dashboard/content/databases/tests.py index 6bafaae..21289a3 100644 --- a/trove_dashboard/content/databases/tests.py +++ b/trove_dashboard/content/databases/tests.py @@ -137,7 +137,7 @@ class DatabaseTests(test.TestCase): 'datastore_list', 'datastore_version_list', 'flavor_list', 'instance_list'), dash_api.cinder: ('volume_type_list',), - dash_api.neutron: ('network_list',), + dash_api.neutron: ('network_list_for_tenant',), dash_api.nova: ('availability_zone_list',), policy: ('check',), }) @@ -155,8 +155,7 @@ class DatabaseTests(test.TestCase): self.mock_volume_type_list.return_value = [] - self.mock_network_list.side_effect = [self.networks.list()[:1], - self.networks.list()[1:]] + self.mock_network_list_for_tenant.return_value = self.networks.list() self.mock_availability_zone_list.return_value = ( self.availability_zones.list()) @@ -179,11 +178,9 @@ class DatabaseTests(test.TestCase): mock.call(test.IsHttpRequest(), test.IsA(str))) self.mock_volume_type_list.assert_called_once_with( test.IsHttpRequest()) - self.mock_network_list.assert_has_calls([ - mock.call(test.IsHttpRequest(), - tenant_id=self.tenant.id, - shared=False), - mock.call(test.IsHttpRequest(), shared=True)]) + self.mock_network_list_for_tenant.assert_called_once_with( + test.IsHttpRequest(), self.tenant.id, + include_pre_auto_allocate=True) self.mock_availability_zone_list.assert_called_once_with( test.IsHttpRequest()) self.assertTemplateUsed(res, 'project/databases/launch.html') @@ -225,7 +222,7 @@ class DatabaseTests(test.TestCase): 'datastore_list', 'datastore_version_list', 'flavor_list', 'instance_create', 'instance_list'), dash_api.cinder: ('volume_type_list',), - dash_api.neutron: ('network_list',), + dash_api.neutron: ('network_list_for_tenant',), dash_api.nova: ('availability_zone_list',), policy: ('check',), }) @@ -242,8 +239,7 @@ class DatabaseTests(test.TestCase): self.mock_volume_type_list.return_value = [] - self.mock_network_list.side_effect = [self.networks.list()[:1], - self.networks.list()[1:]] + self.mock_network_list_for_tenant.return_value = self.networks.list() nics = [{"net-id": self.networks.first().id}] @@ -283,11 +279,9 @@ class DatabaseTests(test.TestCase): mock.call(test.IsHttpRequest(), test.IsA(str))) self.mock_volume_type_list.assert_called_once_with( test.IsHttpRequest()) - self.mock_network_list.assert_has_calls([ - mock.call(test.IsHttpRequest(), - tenant_id=self.tenant.id, - shared=False), - mock.call(test.IsHttpRequest(), shared=True)]) + self.mock_network_list_for_tenant.assert_called_once_with( + test.IsHttpRequest(), self.tenant.id, + include_pre_auto_allocate=True) self.mock_availability_zone_list.assert_called_once_with( test.IsHttpRequest()) self.mock_instance_create.assert_called_once_with( @@ -315,7 +309,7 @@ class DatabaseTests(test.TestCase): 'datastore_list', 'datastore_version_list', 'flavor_list', 'instance_create', 'instance_list'), dash_api.cinder: ('volume_type_list',), - dash_api.neutron: ('network_list',), + dash_api.neutron: ('network_list_for_tenant',), dash_api.nova: ('availability_zone_list',), policy: ('check',), }) @@ -333,8 +327,7 @@ class DatabaseTests(test.TestCase): self.mock_volume_type_list.return_value = [] - self.mock_network_list.side_effect = [self.networks.list()[:1], - self.networks.list()[1:]] + self.mock_network_list_for_tenant.return_value = self.networks.list() nics = [{"net-id": self.networks.first().id}] @@ -374,11 +367,9 @@ class DatabaseTests(test.TestCase): mock.call(test.IsHttpRequest(), test.IsA(str))) self.mock_volume_type_list.assert_called_once_with( test.IsHttpRequest()) - self.mock_network_list.assert_has_calls([ - mock.call(test.IsHttpRequest(), - tenant_id=self.tenant.id, - shared=False), - mock.call(test.IsHttpRequest(), shared=True)]) + self.mock_network_list_for_tenant.assert_called_once_with( + test.IsHttpRequest(), self.tenant.id, + include_pre_auto_allocate=True) self.mock_availability_zone_list.assert_called_once_with( test.IsHttpRequest()) self.mock_instance_create.assert_called_once_with( @@ -1048,7 +1039,7 @@ class DatabaseTests(test.TestCase): 'datastore_list', 'datastore_version_list', 'flavor_list', 'instance_create', 'instance_get', 'instance_list_all'), dash_api.cinder: ('volume_type_list',), - dash_api.neutron: ('network_list',), + dash_api.neutron: ('network_list_for_tenant',), dash_api.nova: ('availability_zone_list',), policy: ('check',), }) @@ -1063,8 +1054,7 @@ class DatabaseTests(test.TestCase): self.mock_volume_type_list.return_value = [] - self.mock_network_list.side_effect = [self.networks.list()[:1], - self.networks.list()[1:]] + self.mock_network_list_for_tenant.return_value = self.networks.list() nics = [{"net-id": self.networks.first().id}] @@ -1110,11 +1100,9 @@ class DatabaseTests(test.TestCase): mock.call(test.IsHttpRequest(), test.IsA(str))) self.mock_volume_type_list.assert_called_once_with( test.IsHttpRequest()) - self.mock_network_list.assert_has_calls([ - mock.call(test.IsHttpRequest(), - tenant_id=self.tenant.id, - shared=False), - mock.call(test.IsHttpRequest(), shared=True)]) + self.mock_network_list_for_tenant.assert_called_once_with( + test.IsHttpRequest(), self.tenant.id, + include_pre_auto_allocate=True) self.mock_availability_zone_list.assert_called_once_with( test.IsHttpRequest()) self.mock_instance_get.assert_called_once_with(