From 8ec41570a97e137b77748582f78bfd063155b0e7 Mon Sep 17 00:00:00 2001 From: Lucas Alvares Gomes Date: Mon, 20 Apr 2020 13:50:57 +0100 Subject: [PATCH] [OVN] Enable test_multicast_between_vms_on_same_network This patch is adding support on DevStack and zuul job to enable the test_multicast_between_vms_on_same_network test in the upstream gate. Depends-On: https://review.opendev.org/#/c/721262 Change-Id: I0ee5c3daceb34b6810165c1e8a20aa3d5f21c74b Signed-off-by: Lucas Alvares Gomes --- devstack/lib/ovn_agent | 4 ++++ zuul.d/tempest-multinode.yaml | 6 ++++++ zuul.d/tempest-singlenode.yaml | 6 ++++++ 3 files changed, 16 insertions(+) diff --git a/devstack/lib/ovn_agent b/devstack/lib/ovn_agent index 42bd05257bf..aae07cb605d 100644 --- a/devstack/lib/ovn_agent +++ b/devstack/lib/ovn_agent @@ -96,6 +96,8 @@ if [[ "$SERVICE_IP_VERSION" == 6 ]]; then OVSDB_SERVER_LOCAL_HOST=[$OVSDB_SERVER_LOCAL_HOST] fi +OVN_IGMP_SNOOPING_ENABLE=$(trueorfalse False OVN_IGMP_SNOOPING_ENABLE) + OVS_PREFIX=/usr/local OVS_SBINDIR=$OVS_PREFIX/sbin OVS_BINDIR=$OVS_PREFIX/bin @@ -525,6 +527,8 @@ function configure_ovn_plugin { iniset $NEUTRON_CONF DEFAULT dns_domain openstackgate.local populate_ml2_config /$Q_PLUGIN_CONF_FILE ovn dns_servers="$OVN_DNS_SERVERS" fi + + iniset $NEUTRON_CONF ovs igmp_snooping_enable $OVN_IGMP_SNOOPING_ENABLE fi if is_service_enabled q-dhcp neutron-dhcp ; then diff --git a/zuul.d/tempest-multinode.yaml b/zuul.d/tempest-multinode.yaml index 44cb5aa3488..674e1364de1 100644 --- a/zuul.d/tempest-multinode.yaml +++ b/zuul.d/tempest-multinode.yaml @@ -100,6 +100,11 @@ - zuul: openstack/neutron-tempest-plugin pre-run: playbooks/multinode-setup.yaml vars: + devstack_local_conf: + test-config: + $TEMPEST_CONFIG: + neutron_plugin_options: + is_igmp_snooping_enabled: True devstack_localrc: Q_AGENT: ovn Q_ML2_PLUGIN_MECHANISM_DRIVERS: ovn,logger @@ -118,6 +123,7 @@ ADVANCED_INSTANCE_USER: ubuntu BUILD_TIMEOUT: 784 ENABLE_TLS: True + OVN_IGMP_SNOOPING_ENABLE: True devstack_plugins: neutron: https://opendev.org/openstack/neutron neutron-tempest-plugin: https://opendev.org/openstack/neutron-tempest-plugin diff --git a/zuul.d/tempest-singlenode.yaml b/zuul.d/tempest-singlenode.yaml index d60f05fb292..8e508151722 100644 --- a/zuul.d/tempest-singlenode.yaml +++ b/zuul.d/tempest-singlenode.yaml @@ -189,6 +189,11 @@ (^neutron_tempest_plugin.scenario)|\ (tempest.(api|scenario|thirdparty))).*$" tempest_concurrency: 4 + devstack_local_conf: + test-config: + $TEMPEST_CONFIG: + neutron_plugin_options: + is_igmp_snooping_enabled: True devstack_localrc: Q_AGENT: ovn Q_ML2_PLUGIN_MECHANISM_DRIVERS: ovn,logger @@ -209,6 +214,7 @@ ADVANCED_INSTANCE_USER: ubuntu BUILD_TIMEOUT: 784 ENABLE_TLS: True + OVN_IGMP_SNOOPING_ENABLE: True devstack_plugins: neutron: https://opendev.org/openstack/neutron neutron-tempest-plugin: https://opendev.org/openstack/neutron-tempest-plugin