commit 20f04d4f4b66eaf88aadce59d0bfff5ff92b7d12
author Mykyta Karpin <mkarpin@mirantis.com> Thu Sep 20 11:30:41 2018 +0000
committer Mykyta Karpin <mkarpin@mirantis.com> Thu Sep 20 11:30:41 2018 +0000
tree 23c26b2aaf86f52b4f31c06311c5aeeb29ba4ab8
parent 8afe766aa3fceab441314cd9fe55d962a1f30ecc

Teach runtest to recognize neutronv2 networks

Change-Id: I27400af296803592f51a8b801ef2ad2b3c4e83f7
Related-Prod: https://mirantis.jira.com/browse/PROD-23188

_modules/runtest/tempest_sections/heat_plugin.py

diff --git a/_modules/runtest/tempest_sections/heat_plugin.py b/_modules/runtest/tempest_sections/heat_plugin.py
index ec9c089..7379b9a 100644
--- a/_modules/runtest/tempest_sections/heat_plugin.py
+++ b/_modules/runtest/tempest_sections/heat_plugin.py
@@ -142,7 +142,8 @@
     def floating_network_name(self):
         c = conditions.BaseRule('neutron.client.enabled', 'eq', True)
         networks = self.get_item_when_condition_match(
-            'neutron.client.server.admin_identity.network', c)
+            'neutron.client.server.admin_identity.network', c) or self.get_item_when_condition_match(
+            'neutron.client.resources.v2.admin_identity.network', c)
         if not networks:
             return
         for network_name, network in networks.items():

_modules/runtest/tempest_sections/network.py

diff --git a/_modules/runtest/tempest_sections/network.py b/_modules/runtest/tempest_sections/network.py
index b66d510..ff89744 100644
--- a/_modules/runtest/tempest_sections/network.py
+++ b/_modules/runtest/tempest_sections/network.py
@@ -55,7 +55,8 @@
     def floating_network_name(self):
         c = conditions.BaseRule('neutron.client.enabled', 'eq', True)
         networks = self.get_item_when_condition_match(
-            'neutron.client.server.admin_identity.network', c)
+            'neutron.client.server.admin_identity.network', c) or self.get_item_when_condition_match(
+            'neutron.client.resources.v2.admin_identity.network', c)
         if not networks:
             return
         for network_name, network in networks.items():