From d66358ce41fc706128573ab464d1a9bd6567c4ea Mon Sep 17 00:00:00 2001 From: Frode Nordahl Date: Tue, 4 Feb 2020 09:16:44 +0100 Subject: [PATCH] policyd/octavia: Use correct network for vips Which network to use for vips depend on deployment configuration. --- zaza/openstack/charm_tests/policyd/tests.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/zaza/openstack/charm_tests/policyd/tests.py b/zaza/openstack/charm_tests/policyd/tests.py index 532495f..f332765 100644 --- a/zaza/openstack/charm_tests/policyd/tests.py +++ b/zaza/openstack/charm_tests/policyd/tests.py @@ -679,7 +679,11 @@ class OctaviaTests(BasePolicydSpecialization): octavia_client = openstack_utils.get_octavia_session_client(sess) neutron_client = openstack_utils.get_neutron_session_client(sess) - resp = neutron_client.list_networks(name="private_lb_fip_network") + if openstack_utils.dvr_enabled(): + network_name = 'private_lb_fip_network' + else: + network_name = 'private' + resp = neutron_client.list_networks(name=network_name) vip_subnet_id = resp['networks'][0]['subnets'][0]