From feb667206bf7278ee742e110cdbd4507734bae30 Mon Sep 17 00:00:00 2001 From: Bas de Bruijne Date: Wed, 11 Jan 2023 12:53:39 +0000 Subject: [PATCH] make provider-router name variable --- zaza/openstack/charm_tests/dragent/configure.py | 2 +- zaza/openstack/charm_tests/neutron/setup.py | 2 +- zaza/openstack/charm_tests/neutron/tests.py | 2 +- zaza/openstack/charm_tests/octavia/tests.py | 3 ++- zaza/openstack/charm_tests/tempest/utils.py | 3 ++- zaza/openstack/utilities/openstack.py | 10 +++++++--- 6 files changed, 14 insertions(+), 8 deletions(-) diff --git a/zaza/openstack/charm_tests/dragent/configure.py b/zaza/openstack/charm_tests/dragent/configure.py index e7edbbf..4efe16a 100644 --- a/zaza/openstack/charm_tests/dragent/configure.py +++ b/zaza/openstack/charm_tests/dragent/configure.py @@ -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, diff --git a/zaza/openstack/charm_tests/neutron/setup.py b/zaza/openstack/charm_tests/neutron/setup.py index 6aa9b90..d6a1ab2 100644 --- a/zaza/openstack/charm_tests/neutron/setup.py +++ b/zaza/openstack/charm_tests/neutron/setup.py @@ -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, diff --git a/zaza/openstack/charm_tests/neutron/tests.py b/zaza/openstack/charm_tests/neutron/tests.py index cf925b0..4777456 100644 --- a/zaza/openstack/charm_tests/neutron/tests.py +++ b/zaza/openstack/charm_tests/neutron/tests.py @@ -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] diff --git a/zaza/openstack/charm_tests/octavia/tests.py b/zaza/openstack/charm_tests/octavia/tests.py index 789c2af..925f886 100644 --- a/zaza/openstack/charm_tests/octavia/tests.py +++ b/zaza/openstack/charm_tests/octavia/tests.py @@ -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']) diff --git a/zaza/openstack/charm_tests/tempest/utils.py b/zaza/openstack/charm_tests/tempest/utils.py index 7463e11..d1ef96c 100644 --- a/zaza/openstack/charm_tests/tempest/utils.py +++ b/zaza/openstack/charm_tests/tempest/utils.py @@ -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: diff --git a/zaza/openstack/utilities/openstack.py b/zaza/openstack/utilities/openstack.py index c5c5ee7..1f5125b 100644 --- a/zaza/openstack/utilities/openstack.py +++ b/zaza/openstack/utilities/openstack.py @@ -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