Add OVN Controller Gateway agent in neutron_bind_l2_agent_types

It avoids blacklisting NeutronNetworks.create_and_bind_ports in case of
OVN. It conforms with the upstream testing [1] and then reverts the
previous change [2].

[1] https://github.com/openstack/networking-ovn/blob/master/zuul.d/networking-ovn-jobs.yaml#L299
[2] https://git.opnfv.org/functest/commit/?id=8e297c49c481961959b29c2080cc059fcc84e9ee

This reverts commit 8e297c49c481961959b29c2080cc059fcc84e9ee.

Change-Id: I95f1b7146e636ae3ebe9f995733e53ad1b276d26
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit 397ef4366cb3067c1a25999eab0e928937cc6e04)

diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile
index 85bd349..1e6e8ae 100644 (file)
--- a/docker/core/Dockerfile
+++ b/docker/core/Dockerfile
@@ -31,6 +31,7 @@ RUN apk --no-cache add --update \
     ln -s /var/lib/xtesting /home/opnfv/functest && \
     bash -c "mkdir -p /home/opnfv/functest{/conf,/data,/images,/results} /home/opnfv/repos/vnfs" && \
     mkdir -p /etc/rally && \
-    printf "[database]\nconnection = 'sqlite:////var/lib/rally/database/rally.sqlite'" > /etc/rally/rally.conf && \
+    printf "[database]\nconnection = 'sqlite:////var/lib/rally/database/rally.sqlite'\n" > /etc/rally/rally.conf && \
+    printf "\n[openstack]\nneutron_bind_l2_agent_types = Open vSwitch agent,Linux bridge agent,OVN Controller Gateway agent\n" >> /etc/rally/rally.conf && \
     mkdir -p /var/lib/rally/database && rally db create && \
     apk del .build-deps

diff --git a/functest/opnfv_tests/openstack/rally/blacklist.yaml b/functest/opnfv_tests/openstack/rally/blacklist.yaml
index b9c30f8..bc41bb6 100644 (file)
--- a/functest/opnfv_tests/openstack/rally/blacklist.yaml
+++ b/functest/opnfv_tests/openstack/rally/blacklist.yaml
@@ -1,10 +1,5 @@
 ---
 scenario:
-    -
-        scenarios:
-            - '^os-ovn-'
-        tests:
-            - 'NeutronNetworks.create_and_bind_ports'
 
 functionality:
     -