commit 45e4c45209bc8d1c6664a0a3fc1530183dfd951a
author Zuul <zuul@review.openstack.org> Sat Nov 18 08:25:50 2017 +0000
committer Gerrit Code Review <review@openstack.org> Sat Nov 18 08:25:50 2017 +0000
tree 32c017fca78149c96b8eea2d3d22b28e79e96df3
parent 12c20f6e8f56ec0d029ab738424e5747b122cf2b
parent 7b4a720f0d0e673a0db7e17469e525601adcceee

Merge "Use get_tenant_network in get_server_ip"

tempest/scenario/manager.py

diff --git a/tempest/scenario/manager.py b/tempest/scenario/manager.py
index 98c5722..06b4b59 100644
--- a/tempest/scenario/manager.py
+++ b/tempest/scenario/manager.py
@@ -649,9 +649,7 @@
                 addresses = server['addresses'][
                     CONF.validation.network_for_ssh]
             else:
-                creds_provider = self._get_credentials_provider()
-                net_creds = creds_provider.get_primary_creds()
-                network = getattr(net_creds, 'network', None)
+                network = self.get_tenant_network()
                 addresses = (server['addresses'][network['name']]
                              if network else [])
             for address in addresses: