commit 9231eccf57547fb9e63491d54ff59c412429ea27
author mcp-jenkins <mcp-jenkins@mirantis.com> Wed Apr 04 14:08:55 2018 +0000
committer Gerrit Code Review <gerrit2@7e698601da6d> Wed Apr 04 14:08:55 2018 +0000
tree 89ecb4a3f16851334c2c4f7dfa27b9dc1f1556b0
parent 94c2f6c3dc13b146ea2af64ed255ac68ac9773aa
parent 4300acef5087972796e3cef28200ea31808e7289

Merge "Revert "Change getting public net from pillar""

_modules/runtest/tempest_sections/network.py

diff --git a/_modules/runtest/tempest_sections/network.py b/_modules/runtest/tempest_sections/network.py
index d12a871..68d4fea 100644
--- a/_modules/runtest/tempest_sections/network.py
+++ b/_modules/runtest/tempest_sections/network.py
@@ -84,10 +84,8 @@
         c = conditions.BaseRule(field='keystone.client.enabled', op='eq',
                                 val=True)
         nodes = self.get_nodes_where_condition_match(c)
-        runtest_enable = conditions.BaseRule('runtest.enabled', 'eq', True)
-        network_name = self.get_item_when_condition_match(
-            'runtest.tempest.convert_to_uuid.network.public_network_id',
-            runtest_enable)
+        network_name = self.runtest_opts.get(
+            'convert_to_uuid', {}).get('public_network_id')
 
         if not network_name:
           return