diff --git a/tempest/scenario/manager.py b/tempest/scenario/manager.py index fc0a7307a5..86e501714b 100644 --- a/tempest/scenario/manager.py +++ b/tempest/scenario/manager.py @@ -1493,10 +1493,11 @@ class NetworkScenarioTest(ScenarioTest): raise Exception("Neither of 'public_router_id' or " "'public_network_id' has been defined.") - def create_networks(self, networks_client=None, - routers_client=None, subnets_client=None, - project_id=None, dns_nameservers=None, - port_security_enabled=True, **net_dict): + def setup_network_subnet_with_router( + self, networks_client=None, + routers_client=None, subnets_client=None, + project_id=None, dns_nameservers=None, + port_security_enabled=True, **net_dict): """Create a network with a subnet connected to a router. The baremetal driver is a special case since all nodes are diff --git a/tempest/scenario/test_minbw_allocation_placement.py b/tempest/scenario/test_minbw_allocation_placement.py index 8c2752d2c3..55b8d157f2 100644 --- a/tempest/scenario/test_minbw_allocation_placement.py +++ b/tempest/scenario/test_minbw_allocation_placement.py @@ -128,7 +128,7 @@ class MinBwAllocationPlacementTest(manager.NetworkScenarioTest): base_segm = \ CONF.network_feature_enabled.provider_net_base_segmentation_id - self.prov_network, _, _ = self.create_networks( + self.prov_network, _, _ = self.setup_network_subnet_with_router( networks_client=self.networks_client, routers_client=self.routers_client, subnets_client=self.subnets_client, diff --git a/tempest/scenario/test_network_advanced_server_ops.py b/tempest/scenario/test_network_advanced_server_ops.py index 20d2e80a5c..b48ac3c864 100644 --- a/tempest/scenario/test_network_advanced_server_ops.py +++ b/tempest/scenario/test_network_advanced_server_ops.py @@ -62,7 +62,7 @@ class TestNetworkAdvancedServerOps(manager.NetworkScenarioTest): if utils.is_extension_enabled('security-group', 'network'): security_group = self.create_security_group() security_groups = [{'name': security_group['name']}] - network, _, _ = self.create_networks() + network, _, _ = self.setup_network_subnet_with_router() server = self.create_server( networks=[{'uuid': network['id']}], key_name=keypair['name'], diff --git a/tempest/scenario/test_network_basic_ops.py b/tempest/scenario/test_network_basic_ops.py index e359c712fd..9590eb4212 100644 --- a/tempest/scenario/test_network_basic_ops.py +++ b/tempest/scenario/test_network_basic_ops.py @@ -106,7 +106,8 @@ class TestNetworkBasicOps(manager.NetworkScenarioTest): def _setup_network_and_servers(self, **kwargs): boot_with_port = kwargs.pop('boot_with_port', False) - self.network, self.subnet, self.router = self.create_networks(**kwargs) + self.network, self.subnet, self.router = ( + self.setup_network_subnet_with_router(**kwargs)) self.check_networks() self.ports = [] diff --git a/tempest/scenario/test_security_groups_basic_ops.py b/tempest/scenario/test_security_groups_basic_ops.py index e078f23761..aff7509811 100644 --- a/tempest/scenario/test_security_groups_basic_ops.py +++ b/tempest/scenario/test_security_groups_basic_ops.py @@ -326,7 +326,7 @@ class TestSecurityGroupsBasicOps(manager.NetworkScenarioTest): self.floating_ips.setdefault(server['id'], floating_ip) def _create_tenant_network(self, tenant, port_security_enabled=True): - network, subnet, router = self.create_networks( + network, subnet, router = self.setup_network_subnet_with_router( networks_client=tenant.manager.networks_client, routers_client=tenant.manager.routers_client, subnets_client=tenant.manager.subnets_client,