From 9c315484782e8eb0373970f179a6f5c40de5cf39 Mon Sep 17 00:00:00 2001 From: Eyal Date: Mon, 11 May 2020 08:27:29 +0300 Subject: [PATCH] Calculate the number of resources based on number of networks Can have 2 (public,shared) or 1 (public) Change-Id: Id6dd338fe32b5fb7d838525551fa876e40ceb604 --- vitrage_tempest_plugin/tests/api/resources/test_resources.py | 5 ++++- vitrage_tempest_plugin/tests/common/neutron_utils.py | 5 +++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/vitrage_tempest_plugin/tests/api/resources/test_resources.py b/vitrage_tempest_plugin/tests/api/resources/test_resources.py index da029db..55625c9 100644 --- a/vitrage_tempest_plugin/tests/api/resources/test_resources.py +++ b/vitrage_tempest_plugin/tests/api/resources/test_resources.py @@ -25,6 +25,7 @@ from vitrage_tempest_plugin.tests.common.constants import \ NOVA_INSTANCE_DATASOURCE from vitrage_tempest_plugin.tests.common.constants import VertexProperties as \ VProps +from vitrage_tempest_plugin.tests.common import neutron_utils from vitrage_tempest_plugin.tests.common import nova_utils from vitrage_tempest_plugin.tests import utils from vitrageclient.exceptions import ClientException @@ -75,7 +76,9 @@ class TestResource(BaseVitrageTempest): # TODO(e0ne): split this test to verify that only network, # instance and port are returned to non-admin user. resources = self.vitrage_client.resource.list(all_tenants=False) - self.assertThat(resources, matchers.HasLength(7)) + has_shared_network = neutron_utils.get_shared_network() + num_resources = 7 if has_shared_network else 6 + self.assertThat(resources, matchers.HasLength(num_resources)) @utils.tempest_logger def test_resource_list_with_all_tenants(self): diff --git a/vitrage_tempest_plugin/tests/common/neutron_utils.py b/vitrage_tempest_plugin/tests/common/neutron_utils.py index 2ea5a16..6dc29d7 100644 --- a/vitrage_tempest_plugin/tests/common/neutron_utils.py +++ b/vitrage_tempest_plugin/tests/common/neutron_utils.py @@ -18,3 +18,8 @@ from vitrage_tempest_plugin.tests.common.tempest_clients import TempestClients def get_public_network(): nets = TempestClients.neutron().list_networks() return g_utils.first_match(nets['networks'], name='public') + + +def get_shared_network(): + nets = TempestClients.neutron().list_networks() + return g_utils.first_match(nets['networks'], name='shared')