commit 414598f04ac99c405381fe978e13a55397340a4a
author Jenkins <jenkins@review.openstack.org> Tue Nov 08 07:22:21 2016 +0000
committer Gerrit Code Review <review@openstack.org> Tue Nov 08 07:22:21 2016 +0000
tree f05f0bf81c31e9e4645e320f4d8da8e37e927824
parent 9bc2926dcb8ff3e9eeac1cbd4ff41209f93d8f11
parent 3787e4c234f0a3e7cec8f2933a873ad5786e52bd

Merge "Move cred_client to tempest.lib"

tempest/api/compute/admin/test_networks.py

diff --git a/tempest/api/compute/admin/test_networks.py b/tempest/api/compute/admin/test_networks.py
index e5c8790..8504840 100644
--- a/tempest/api/compute/admin/test_networks.py
+++ b/tempest/api/compute/admin/test_networks.py
@@ -42,8 +42,12 @@
                              "{0} networks with label {1}".format(
                                  len(configured_network),
                                  CONF.compute.fixed_network_name))
+        elif CONF.network.public_network_id:
+            configured_network = [x for x in networks if x['id'] ==
+                                  CONF.network.public_network_id]
         else:
-            configured_network = networks
+            raise self.skipException(
+                "Environment has no known-for-sure existing network.")
         configured_network = configured_network[0]
         network = (self.client.show_network(configured_network['id'])
                    ['network'])