openstack
/
tempest
Code Issues Proposed changes

Merge "Make _create_network() non-private"

This commit is contained in:
Zuul 2021-02-26 00:26:46 +00:00 committed by Gerrit Code Review
parent 35bc9bef6a 3bdafd8979
commit ed0a1bbbb0
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tempest/scenario/manager.py
View File

@ -1060,10 +1060,10 @@ class NetworkScenarioTest(ScenarioTest):
if not CONF.service_available.neutron:
raise cls.skipException('Neutron not available')
def _create_network(self, networks_client=None,
project_id=None,
namestart='network-smoke-',
port_security_enabled=True, **net_dict):
def create_network(self, networks_client=None,
project_id=None,
namestart='network-smoke-',
port_security_enabled=True, **net_dict):
if not networks_client:
networks_client = self.networks_client
if not project_id:
@ -1594,7 +1594,7 @@ class NetworkScenarioTest(ScenarioTest):
router = None
subnet = None
else:
network = self._create_network(
network = self.create_network(
networks_client=networks_client,
project_id=project_id,
port_security_enabled=port_security_enabled,

2
tempest/scenario/test_network_basic_ops.py
View File

@ -230,7 +230,7 @@ class TestNetworkBasicOps(manager.NetworkScenarioTest):
self.floating_ip_tuple = Floating_IP_tuple(floating_ip, server)
def _create_new_network(self, create_gateway=False):
self.new_net = self._create_network()
self.new_net = self.create_network()
if create_gateway:
self.new_subnet = self.create_subnet(
network=self.new_net)

4
tempest/scenario/test_network_v6.py
View File

@ -77,9 +77,9 @@ class TestGettingAddress(manager.NetworkScenarioTest):
if dualnet - create IPv6 subnets on a different network
:return: list of created networks
"""
network = self._create_network()
network = self.create_network()
if dualnet:
network_v6 = self._create_network()
network_v6 = self.create_network()
sub4 = self.create_subnet(network=network,
namestart='sub4',