From 165b50d9f0c3b6d3c1c9a9e6fc3be26263ce146a Mon Sep 17 00:00:00 2001
From: Artem Goncharov <artem.goncharov@gmail.com>
Date: Thu, 4 May 2023 14:07:06 +0200
Subject: [PATCH] add extended neutron job

We are currently not testing fwaas at all and not seeing it is not
working at all as seen by an attempt to add ansible module. Same is true
for vpnaas.
Hopefully fix flaking auto_allocated_topology which tried to idenfity
projects by available networks.

Change-Id: Iaf62662ca3dc4415737369f676109cccf7090e5a
---
 .../v2/test_auto_allocated_topology.py        |  4 +-
 zuul.d/functional-jobs.yaml                   | 73 +++++++++++++++++++
 zuul.d/project.yaml                           |  2 +
 3 files changed, 76 insertions(+), 3 deletions(-)

diff --git a/openstack/tests/functional/network/v2/test_auto_allocated_topology.py b/openstack/tests/functional/network/v2/test_auto_allocated_topology.py
index 73c070bfb..800bfcac2 100644
--- a/openstack/tests/functional/network/v2/test_auto_allocated_topology.py
+++ b/openstack/tests/functional/network/v2/test_auto_allocated_topology.py
@@ -31,9 +31,7 @@ class TestAutoAllocatedTopology(base.BaseFunctionalTest):
                 "required for this test"
             )
 
-        projects = [
-            o.project_id for o in self.operator_cloud.network.networks()
-        ]
+        projects = [o.id for o in self.operator_cloud.identity.projects()]
         self.PROJECT_ID = projects[0]
 
     def tearDown(self):
diff --git a/zuul.d/functional-jobs.yaml b/zuul.d/functional-jobs.yaml
index 794711ccf..b0933a8f9 100644
--- a/zuul.d/functional-jobs.yaml
+++ b/zuul.d/functional-jobs.yaml
@@ -143,6 +143,79 @@
         OPENSTACKSDK_HAS_SWIFT: 0
         OPENSTACKSDK_HAS_HEAT: 0
 
+- job:
+    name: openstacksdk-functional-devstack-networking-ext
+    parent: openstacksdk-functional-devstack-networking
+    description: |
+      Run openstacksdk functional tests against a devstack with super advanced
+      networking services enabled (VPNaas, FWaas) which still require ovs.
+    required-projects:
+      - openstack/neutron-fwaas
+      - openstack/neutron-vpnaas
+    vars:
+      INSTALL_OVN: False
+      configure_swap_size: 4096
+      devstack_local_conf:
+        post-config:
+          $OCTAVIA_CONF:
+            DEFAULT:
+              debug: true
+            controller_worker:
+              amphora_driver: amphora_noop_driver
+              compute_driver: compute_noop_driver
+              network_driver: network_noop_driver
+            certificates:
+              cert_manager: local_cert_manager
+          $NEUTRON_CONF:
+            DEFAULT:
+              router_distributed: True
+              l3_ha: True
+          "/$NEUTRON_CORE_PLUGIN_CONF":
+            ovs:
+              tunnel_bridge: br-tun
+              bridge_mappings: public:br-ex
+          $NEUTRON_L3_CONF:
+            DEFAULT:
+              agent_mode: dvr_snat
+            agent:
+              availability_zone: nova
+              debug_iptables_rules: True
+          $NEUTRON_DHCP_CONF:
+            agent:
+              availability_zone: nova
+      devstack_localrc:
+        Q_SERVICE_PLUGIN_CLASSES: qos,trunk
+        NETWORK_API_EXTENSIONS: "agent,binding,dhcp_agent_scheduler,external-net,ext-gw-mode,extra_dhcp_opts,quotas,router,security-group,subnet_allocation,network-ip-availability,auto-allocated-topology,timestamp_core,tag,service-type,rbac-policies,standard-attr-description,pagination,sorting,project-id,fwaas_v2,vpnaas"
+        Q_AGENT: openvswitch
+        Q_ML2_TENANT_NETWORK_TYPE: vxlan
+        Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch
+        IPSEC_PACKAGE: libreswan
+      devstack_plugins:
+        designate: https://opendev.org/openstack/designate
+        octavia: https://opendev.org/openstack/octavia
+        neutron-fwaas: https://opendev.org/openstack/neutron-fwaas.git
+        neutron-vpnaas: https://opendev.org/openstack/neutron-vpnaas.git
+      devstack_services:
+        designate: true
+        octavia: true
+        o-api: true
+        o-cw: true
+        o-hm: true
+        o-hk: true
+        neutron-dns: true
+        s-account: false
+        s-container: false
+        s-object: false
+        s-proxy: false
+        h-eng: false
+        h-api: false
+        h-api-cfn: false
+        q-fwaas-v2: true
+      tox_environment:
+        OPENSTACKSDK_HAS_DESIGNATE: 1
+        OPENSTACKSDK_HAS_SWIFT: 0
+        OPENSTACKSDK_HAS_HEAT: 0
+
 - job:
     name: openstacksdk-functional-devstack-tips
     parent: openstacksdk-functional-devstack
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 6f9cb948b..284d200a2 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -21,6 +21,7 @@
             voting: false
         - openstacksdk-functional-devstack
         - openstacksdk-functional-devstack-networking
+        - openstacksdk-functional-devstack-networking-ext
         - openstacksdk-functional-devstack-senlin
         - openstacksdk-functional-devstack-magnum:
             voting: false
@@ -43,4 +44,5 @@
             voting: false
         - openstacksdk-functional-devstack
         - openstacksdk-functional-devstack-networking
+        - openstacksdk-functional-devstack-networking-ext
         - openstacksdk-functional-devstack-senlin