From 647aef6885148bbebf9530c25c3c3fbf651bc6bd Mon Sep 17 00:00:00 2001
From: Roman Safronov <rsafrono@redhat.com>
Date: Sun, 14 Jul 2024 17:40:12 +0300
Subject: [PATCH] Set openstack_type podified as default

Since the plugin is recently used mainly for testing multi-node
podified environments it is worth to set this as default value
to avoid irrelevant failures and simplify podified job definitions.

Also, run_traffic_flow_tests parameter is now enabled by default.

Also, CONF.identity.uri_v3 is now preferred over CONF.identity.uri

Change-Id: Ib73f4fb0f8a465ba1e40137c0237211bb1642ef5
---
 whitebox_neutron_tempest_plugin/config.py              | 8 +++-----
 whitebox_neutron_tempest_plugin/tests/scenario/base.py | 4 +++-
 zuul.d/master_jobs.yaml                                | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/whitebox_neutron_tempest_plugin/config.py b/whitebox_neutron_tempest_plugin/config.py
index 48ba048..287b4e7 100644
--- a/whitebox_neutron_tempest_plugin/config.py
+++ b/whitebox_neutron_tempest_plugin/config.py
@@ -39,7 +39,7 @@ WhiteboxNeutronPluginOptions = [
                default='',
                help='Key file to access host to execute validated commands.'),
     cfg.StrOpt('openstack_type',
-               default='devstack',
+               default='podified',
                help='Type of openstack deployment, '
                'e.g. devstack, podified'),
     cfg.StrOpt('pki_private_key',
@@ -73,10 +73,8 @@ WhiteboxNeutronPluginOptions = [
                help='Time in seconds external igmp querier is sending its '
                     'periodical queries'),
     cfg.BoolOpt('run_traffic_flow_tests',
-                default=False,
-                help='Specify explicitly whether to run traffic flow tests.'
-                     ' This is needed because some ML2 plugins (e.g. ovn ) do '
-                     'not expose api_extensions like dvr for some purposes.'),
+                default=True,
+                help='Specify explicitly whether to run traffic flow tests.'),
     cfg.BoolOpt('provroutednetwork_support',
                 default=False,
                 help='Boolean that specifies if Provider Routed Networks'
diff --git a/whitebox_neutron_tempest_plugin/tests/scenario/base.py b/whitebox_neutron_tempest_plugin/tests/scenario/base.py
index cdcffad..8b79b75 100644
--- a/whitebox_neutron_tempest_plugin/tests/scenario/base.py
+++ b/whitebox_neutron_tempest_plugin/tests/scenario/base.py
@@ -56,7 +56,9 @@ class BaseTempestWhiteboxTestCase(base.BaseTempestTestCase):
     @classmethod
     def resource_setup(cls):
         super(BaseTempestWhiteboxTestCase, cls).resource_setup()
-        uri = CONF.identity.uri
+        uri = (
+            CONF.identity.uri_v3 if CONF.identity.uri_v3
+            else CONF.identity.uri)
         cls.is_ipv6 = True if netaddr.valid_ipv6(
             uri[uri.find("[") + 1:uri.find("]")]) else False
         cls.image_ref = CONF.compute.image_ref
diff --git a/zuul.d/master_jobs.yaml b/zuul.d/master_jobs.yaml
index 42158dd..731af34 100644
--- a/zuul.d/master_jobs.yaml
+++ b/zuul.d/master_jobs.yaml
@@ -212,7 +212,7 @@
               available_type_drivers: flat,geneve,vlan,gre,local,vxlan
               provider_net_base_segm_id: 1
             whitebox_neutron_plugin_options:
-              run_traffic_flow_tests: True
+              openstack_type: devstack
               broadcast_receivers_count: 1
             compute-feature-enabled:
               console_output: false