arif/zaza-openstack-tests
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make provider-router name variable

Browse Source
This commit is contained in:
Bas de Bruijne
2023-01-11 12:53:39 +00:00
parent d3c9be2f84
commit feb667206b
6 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
zaza/openstack/charm_tests/dragent/configure.py
View File

@@ -34,7 +34,7 @@ DEFAULT_PEER_APPLICATION_NAME = "quagga"
# These are the network configuration settings under test.
OVERCLOUD_NETWORK_CONFIG = {
"network_type": "gre",
"router_name": "provider-router",
"router_name": openstack_utils.PROVIDER_ROUTER,
"ip_version": "4",
"address_scope": "public",
"external_net_name": openstack_utils.EXT_NET,

2
zaza/openstack/charm_tests/neutron/setup.py
View File

@@ -35,7 +35,7 @@ import zaza.charm_lifecycle.utils as lifecycle_utils
# These are the network configuration settings under test.
OVERCLOUD_NETWORK_CONFIG = {
"network_type": "gre",
"router_name": "provider-router",
"router_name": openstack_utils.PROVIDER_ROUTER,
"ip_version": "4",
"address_scope": "public",
"external_net_name": openstack_utils.EXT_NET,

2
zaza/openstack/charm_tests/neutron/tests.py
View File

@@ -1199,7 +1199,7 @@ class NeutronNetworkingVRRPTests(NeutronNetworkingBase):
self.check_connectivity(instance_1, instance_2)
routers = self.neutron_client.list_routers(
name='provider-router')['routers']
name=openstack_utils.PROVIDER_ROUTER)['routers']
assert len(routers) == 1, "Unexpected router count {}".format(
len(routers))
provider_router = routers[0]

3
zaza/openstack/charm_tests/octavia/tests.py
View File

@@ -510,7 +510,8 @@ class LBAASv2Test(test_utils.OpenStackBaseTest):
lb_fp = openstack_utils.create_floating_ip(
self.neutron_client,
openstack_utils.EXT_NET, port={'id': lb['vip_port_id']})
openstack_utils.EXT_NET,
port={'id': lb['vip_port_id']})
snippet = 'This is the default welcome page'
assert snippet in self._get_payload(lb_fp['floating_ip_address'])

3
zaza/openstack/charm_tests/tempest/utils.py
View File

@@ -251,7 +251,8 @@ def _add_neutron_config(ctxt, keystone_session, missing_fatal=True):
try:
net = neutron_client.find_resource("network", "ext_net")
ctxt['ext_net'] = net['id']
router = neutron_client.find_resource("router", "provider-router")
router = neutron_client.find_resource("router",
openstack_utils.PROVIDER_ROUTER)
ctxt['provider_router_id'] = router['id']
except neutronexceptions.NotFound:
if missing_fatal:

10
zaza/openstack/utilities/openstack.py
View File

@@ -194,11 +194,15 @@ KEYSTONE_CACERT = "keystone_juju_ca_cert.crt"
KEYSTONE_REMOTE_CACERT = (
"/usr/local/share/ca-certificates/{}".format(KEYSTONE_CACERT))
# Network/router names
EXT_NET = os.environ.get('TEST_EXT_NET', 'ext_net')
EXT_NET_SUBNET = os.environ.get('TEST_EXT_NET_SUBNET', 'ext_net_subnet')
PRIVATE_NET = os.environ.get('TEST_PRIVATE_NET', 'private')
PRIVATE_NET_SUBNET = os.environ.get('TEST_PRIVATE_NET_SUBNET',
'private_subnet')
PROVIDER_ROUTER = os.environ.get('TEST_PROVIDER_ROUTER', 'provider-router')
# Image names
CIRROS_IMAGE_NAME = os.environ.get('TEST_CIRROS_IMAGE_NAME', 'cirros')
BIONIC_IMAGE_NAME = os.environ.get('TEST_BIONIC_IMAGE_NAME', 'bionic')
FOCAL_IMAGE_NAME = os.environ.get('TEST_FOCAL_IMAGE_NAME', 'focal')
@@ -1397,19 +1401,19 @@ def create_provider_router(neutron_client, project_id):
:returns: Router object
:rtype: dict
"""
routers = neutron_client.list_routers(name='provider-router')
routers = neutron_client.list_routers(name=PROVIDER_ROUTER)
if len(routers['routers']) == 0:
logging.info('Creating provider router for external network access')
router_info = {
'router': {
'name': 'provider-router',
'name': PROVIDER_ROUTER,
'tenant_id': project_id
}
}
router = neutron_client.create_router(router_info)['router']
logging.info('New router created: %s', (router['id']))
else:
logging.warning('Router provider-router already exists.')
logging.warning('Router %s already exists.', (PROVIDER_ROUTER))
router = routers['routers'][0]
return router