Fix tempest tests

The neutron plugins are now in a new repository, and therefore
the path to the whitelist has changed.

On top of that, the "when:" condition on the include playbook
naturally didn't trigger. There is no when on play(book)s!
Due to the fact this was ignored, we were running the tempest role
twice for a while. It didn't break, because the facts were properly
gathered, but it was suboptimal. If facts failed to gather, the
os_tempest role that gets included in the dragonflow play would fail,
and that would break the functional test (not only the dragonflow test).

The "when:" condition on plays should be removed with ansible 2.4 coming
soon anyway.

Change-Id: I4e4110683182310ca662de49ca4437ca56f9ca4c

tests/neutron-overrides-calico.yml

@@ -19,9 +19,12 @@ tempest_plugins:
   - name: neutron
     repo: https://git.openstack.org/openstack/neutron
     branch: master
+  - name: neutron-plugins
+    repo: https://git.openstack.org/openstack/neutron-tempest-plugin
+    branch: master
 
 tempest_test_whitelist:
-  - neutron.tests.tempest.api.test_networks*
+  - "neutron_tempest_plugin.api.test_networks*"
 
 tempest_private_net_provider_type: "local"
 tempest_private_net_seg_id: ''

tests/neutron-overrides-dragonflow.yml

@@ -29,9 +29,12 @@ tempest_plugins:
   - name: dragonflow
     repo: https://git.openstack.org/openstack/dragonflow
     branch: master
+  - name: neutron-plugins
+    repo: https://git.openstack.org/openstack/neutron-tempest-plugin
+    branch: master
 
 tempest_test_whitelist:
-  - neutron.tests.tempest.api.test_networks*
+  - "neutron_tempest_plugin.api.test_networks*"
 
 dragonflow_fullstack_failing_tests:
   - dragonflow.tests.fullstack.test_db_consistent.TestDbConsistent.test_db_consistent

tests/neutron-overrides-opendaylight.yml

@@ -35,6 +35,9 @@ tempest_plugins:
   - name: neutron
     repo: https://git.openstack.org/openstack/neutron
     branch: master
+  - name: neutron-plugins
+    repo: https://git.openstack.org/openstack/neutron-tempest-plugin
+    branch: master
 
 tempest_test_whitelist:
-  - neutron.tests.tempest.api.test_networks*
+  - "neutron_tempest_plugin.api.test_networks*"

tests/neutron-overrides-ovs-nsh.yml

@@ -31,6 +31,9 @@ tempest_plugins:
   - name: neutron
     repo: https://git.openstack.org/openstack/neutron
     branch: master
+  - name: neutron-plugins
+    repo: https://git.openstack.org/openstack/neutron-tempest-plugin
+    branch: master
 
 tempest_test_whitelist:
-  - neutron.tests.tempest.api.test_networks*
+  - "neutron_tempest_plugin.api.test_networks*"

tests/neutron-overrides-ovs.yml

@@ -10,9 +10,12 @@ tempest_plugins:
   - name: neutron
     repo: https://git.openstack.org/openstack/neutron
     branch: master
+  - name: neutron-plugins
+    repo: https://git.openstack.org/openstack/neutron-tempest-plugin
+    branch: master
 
 tempest_test_whitelist:
-  - neutron.tests.tempest.api.test_networks*
+  - "neutron_tempest_plugin.api.test_networks*"
 
 neutron_plugin_type: ml2.ovs
 neutron_local_ip: "{{ ansible_host }}"

tests/os_neutron-overrides.yml

@@ -19,9 +19,12 @@ tempest_plugins:
   - name: neutron
     repo: https://git.openstack.org/openstack/neutron
     branch: master
+  - name: neutron-plugins
+    repo: https://git.openstack.org/openstack/neutron-tempest-plugin
+    branch: master
 
 tempest_test_whitelist:
-  - neutron.tests.tempest.api.test_networks*
+  - "neutron_tempest_plugin.api.test_networks*"
 
 haproxy_ssl: false
 external_lb_vip_address: 10.1.0.1

tests/test-calico-functional.yml

@@ -25,6 +25,8 @@
         - calico-dhcp-age
       tags:
         - skip_ansible_lint
+      when:
+        - "neutron_plugin_type == 'ml2.calico'"
 
     - name: Ensure that the Calico Felix agent is alive
       command: openstack --os-cloud default network agent list -f json
@@ -41,6 +43,8 @@
       run_once: yes
       tags:
         - skip_ansible_lint
+      when:
+        - "neutron_plugin_type == 'ml2.calico'"
 
   vars_files:
     - common/test-vars.yml

tests/test-dragonflow-functional.yml

@@ -17,8 +17,6 @@
   hosts: physical_host
   user: root
   gather_facts: true
-  roles:
-    - role: "{{ tempest_rolename | default('os_tempest') }}"
   post_tasks:
     - name: Run Dragonflow fullstack tests
       shell: |
@@ -33,11 +31,15 @@
       register: dragonflow_fullstack_tests
       tags:
         - skip_ansible_lint
+      when:
+        - "neutron_plugin_type == 'ml2.dragonflow'"
 
     - name: Ensure etc folder exists in logs
       file:
         path: /var/log/etc
         state: directory
+      when:
+        - "neutron_plugin_type == 'ml2.dragonflow'"
 
     - name: Copy config files
       shell: |
@@ -45,6 +47,8 @@
       register: dragonflow_fullstack_log_copy
       tags:
         - skip_ansible_lint
+      when:
+        - "neutron_plugin_type == 'ml2.dragonflow'"
 
     - name: Verify tests have passed
       shell: |
@@ -53,6 +57,8 @@
         exit $?
       tags:
         - skip_ansible_lint
+      when:
+        - "neutron_plugin_type == 'ml2.dragonflow'"
 
   vars_files:
     - common/test-vars.yml

tests/test.yml

@@ -35,9 +35,5 @@
 - include: common/test-install-tempest.yml
 
 - include: test-calico-functional.yml
-  when:
-    - "neutron_plugin_type == 'ml2.calico'"
 
 - include: test-dragonflow-functional.yml
-  when:
-    - "neutron_plugin_type == 'ml2.dragonflow'"