Add Neutron Role Testing Overrides

This patch is part of a set that implements integrated tests for metal and
lxc deployments on Ubuntu and CentOS.

Change-Id: Ie2a2c0942e32ab33043e302c76cbdea5a1416c32

etc/openstack_deploy/openstack_user_config.yml.aio.j2

@@ -58,6 +58,29 @@ global_overrides:
           # neutron public networks, nspawn
           - cidr: 172.29.240.0/22
             gateway: 172.29.236.100
+{% if 'ovn' in bootstrap_host_scenarios_expanded %}
+    - network:
+        container_bridge: "br-vxlan"
+        container_type: "veth"
+        container_interface: "eth10"
+        ip_from_q: "tunnel"
+        type: "geneve"
+        range: "1:1000"
+        net_name: "geneve"
+        group_binds:
+          - neutron_ovn_controller
+{% elif 'ovs' in bootstrap_host_scenarios_expanded %}
+    - network:
+        container_bridge: "br-vxlan"
+        container_type: "veth"
+        container_interface: "eth10"
+        ip_from_q: "tunnel"
+        type: "vxlan"
+        range: "1:1000"
+        net_name: "vxlan"
+        group_binds:
+          - neutron_openvswitch_agent
+{% else %}
     - network:
         container_bridge: "br-vxlan"
         container_type: "veth"
@@ -68,6 +91,7 @@ global_overrides:
         net_name: "vxlan"
         group_binds:
           - neutron_linuxbridge_agent
+{% endif %}
 {% if 'trove' in bootstrap_host_scenarios_expanded %}
     - network:
         container_bridge: "br-dbaas"
@@ -96,6 +120,43 @@ global_overrides:
           - octavia-housekeeping
           - octavia-health-manager
 {% endif %}
+{% if 'ovn' in bootstrap_host_scenarios_expanded %}
+    - network:
+        container_bridge: "br-provider"
+        container_type: "veth"
+        container_interface: "eth12"
+        network_interface: "eth12"
+        type: "vlan"
+        range: "101:200,301:400"
+        net_name: "vlan"
+        group_binds:
+          - neutron_ovn_controller
+    - network:
+        container_bridge: "br-provider"
+        container_type: "veth"
+        net_name: "vlan"
+        type: "flat"
+        group_binds:
+          - neutron_ovn_controller
+{% elif 'ovs' in bootstrap_host_scenarios_expanded %}
+    - network:
+        container_bridge: "br-provider"
+        container_type: "veth"
+        container_interface: "eth12"
+        network_interface: "eth12"
+        type: "vlan"
+        range: "101:200,301:400"
+        net_name: "vlan"
+        group_binds:
+          - neutron_openvswitch_agent
+    - network:
+        container_bridge: "br-provider"
+        container_type: "veth"
+        net_name: "vlan"
+        type: "flat"
+        group_binds:
+          - neutron_openvswitch_agent
+{% else %}
     - network:
         container_bridge: "br-vlan"
         container_type: "veth"
@@ -114,6 +175,7 @@ global_overrides:
         net_name: "vlan"
         group_binds:
           - neutron_linuxbridge_agent
+{% endif %}
     - network:
         container_bridge: "br-storage"
         container_type: "veth"

tests/roles/bootstrap-host/tasks/prepare_aio_config.yml

@@ -182,7 +182,9 @@
     - src: user_variables_neutron_ovn.yml.j2
       dest: user_variables_neutron_ovn.yml
       condition: "{{ 'ovn' in bootstrap_host_scenarios_expanded }}"
-
+    - src: user_variables_neutron_ovs.yml.j2
+      dest: user_variables_neutron_ovs.yml
+      condition: "{{ 'ovs' in bootstrap_host_scenarios_expanded }}"
 
 - name: Copy modified cinder-volume env.d file for ceph scenario
   copy:

tests/roles/bootstrap-host/templates/user_variables_neutron_ovn.yml.j2

@@ -1,3 +1,5 @@
+# Copyright 2018, Rackspace
+#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -11,16 +13,11 @@
 # limitations under the License.
 
 neutron_plugin_type: ml2.ovn
-neutron_local_ip: "{{ ansible_host }}"
+
 neutron_plugin_base:
   - neutron.services.ovn_l3.plugin.OVNL3RouterPlugin
+
 neutron_ml2_drivers_type: "geneve,vlan,flat"
-neutron_provider_networks:
-  network_types: "geneve"
-  network_geneve_ranges: "1:1000"
-  network_vlan_ranges: "vlan"
-  network_mappings: "vlan:br-provider,flat:br-flat"
-  network_interface_mappings: "br-flat:eth12"
 
 tempest_run_concurrency: 0
 tempest_plugins:
@@ -32,3 +29,4 @@ tempest_test_whitelist:
   - "tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_network_basic_ops"
 tempest_private_net_provider_type: geneve
 tempest_network_ping_gateway: True
+tempest_public_net_physical_name: vlan

tests/roles/bootstrap-host/templates/user_variables_neutron_ovs.yml.j2

@@ -0,0 +1,27 @@
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+neutron_plugin_type: ml2.ovs
+
+neutron_ml2_drivers_type: "vxlan,vlan,flat"
+
+tempest_run_concurrency: 0
+tempest_plugins:
+  - name: neutron-tempest-plugin
+    repo: https://opendev.org/openstack/neutron-tempest-plugin
+    branch: master
+tempest_test_whitelist:
+  - "neutron_tempest_plugin.api.test_networks*"
+  - "tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_network_basic_ops"
+tempest_private_net_provider_type: vxlan
+tempest_network_ping_gateway: True
+tempest_public_net_physical_name: vlan

zuul.d/jobs.yaml

@@ -334,17 +334,6 @@
     parent: openstack-ansible-deploy-aio
     nodeset: ubuntu-focal
 
-# ubuntu
-- job:
-    name: openstack-ansible-deploy-aio_ovn_lxc-ubuntu-focal
-    parent: openstack-ansible-deploy-aio
-    nodeset: ubuntu-focal
-
-- job:
-    name: openstack-ansible-deploy-aio_metal_ovn-ubuntu-focal
-    parent: openstack-ansible-deploy-aio
-    nodeset: ubuntu-focal
-
 # ubuntu bionic
 - job:
     name: openstack-ansible-deploy-aio_lxc-ubuntu-bionic
@@ -356,11 +345,6 @@
     parent: openstack-ansible-deploy-aio
     nodeset: ubuntu-bionic
 
-- job:
-    name: openstack-ansible-deploy-aio_ovn_lxc-ubuntu-bionic
-    parent: openstack-ansible-deploy-aio
-    nodeset: ubuntu-bionic
-
 - job:
     name: openstack-ansible-deploy-aio_proxy-ubuntu-bionic
     parent: openstack-ansible-deploy-aio
@@ -371,11 +355,6 @@
     parent: openstack-ansible-deploy-aio
     nodeset: ubuntu-bionic
 
-- job:
-    name: openstack-ansible-deploy-aio_metal_ovn-ubuntu-bionic
-    parent: openstack-ansible-deploy-aio
-    nodeset: ubuntu-bionic
-
 - job:
     name: openstack-ansible-deploy-aio_telemetry_metal-ubuntu-bionic
     parent: openstack-ansible-deploy-aio

zuul.d/project-templates.yaml

@@ -41,7 +41,6 @@
         - openstack-ansible-deploy-aio_lxc-centos-8
         - openstack-ansible-deploy-aio_lxc-debian-buster
         - openstack-ansible-deploy-aio_lxc-ubuntu-focal
-        - openstack-ansible-deploy-aio_ovn_lxc-ubuntu-focal
     gate:
       jobs:
         - openstack-ansible-deploy-aio_lxc-centos-8