From 9993c6320d95419601dbcb2d3cb920103c536341 Mon Sep 17 00:00:00 2001 From: Eyal Date: Tue, 2 Apr 2019 16:50:58 +0300 Subject: [PATCH] Always use a public network This is a fix to the new change in gate tempest that creates a shared network so we need to explicitly use a network in our tests and not relay on choosing the network automatically also now we have 2 networks one shared and one public by default in tempest test in gate so we need to update the number of default resources Change-Id: I950501a565c6faf4a7d49ec8a10c683efa05b9ba --- vitrage_tempest_plugin/tests/api/resources/test_resources.py | 2 +- vitrage_tempest_plugin/tests/common/nova_utils.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/vitrage_tempest_plugin/tests/api/resources/test_resources.py b/vitrage_tempest_plugin/tests/api/resources/test_resources.py index b5ac553..b3c7500 100644 --- a/vitrage_tempest_plugin/tests/api/resources/test_resources.py +++ b/vitrage_tempest_plugin/tests/api/resources/test_resources.py @@ -76,7 +76,7 @@ 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(6)) + self.assertThat(resources, matchers.HasLength(7)) @utils.tempest_logger def test_resource_list_with_all_tenants(self): diff --git a/vitrage_tempest_plugin/tests/common/nova_utils.py b/vitrage_tempest_plugin/tests/common/nova_utils.py index ff3a035..f8e8058 100644 --- a/vitrage_tempest_plugin/tests/common/nova_utils.py +++ b/vitrage_tempest_plugin/tests/common/nova_utils.py @@ -24,7 +24,7 @@ from vitrage_tempest_plugin.tests.utils import wait_for_status LOG = logging.getLogger(__name__) -def create_instances(num_instances=1, set_public_network=False, name='vm'): +def create_instances(num_instances=1, set_public_network=True, name='vm'): nics = [] flavor = get_first_flavor() image = glance_utils.get_first_image()