commit 20e9861d51182ad53873244039f3cdeae114185f
author Sean Dague <sean@dague.net> Wed Jan 06 14:33:28 2016 -0500
committer Joseph Lanoux <joseph.lanoux@hpe.com> Fri Jan 29 08:50:21 2016 +0000
tree 54ab90f1f487cc8f534096afa6c2b01fbd48bcd5
parent 5576f740b245c8b364cd6624de4c5d2b4b0de792

Consolidate the ssh code

The entire mechanism for ssh validation is a mess. The fact that there
is a parameter which is server_or_ip, so you never know if it's an
object or an address, and that every one of 7 layers need to handle
either case, makes doing any enhancements here for failure detection
impossible.

This change implements a get_server_ip method that gets the fixed or
floating IP address before passing it to the remote client.

Change-Id: I76d818bf9e1bd26b1e499464fc9213764afee279

tempest/scenario/test_shelve_instance.py

diff --git a/tempest/scenario/test_shelve_instance.py b/tempest/scenario/test_shelve_instance.py
index 378ae9d..a91f9c5 100644
--- a/tempest/scenario/test_shelve_instance.py
+++ b/tempest/scenario/test_shelve_instance.py
@@ -80,7 +80,7 @@
                 security_groups=security_groups,
                 wait_until='ACTIVE')
 
-        instance_ip = self.get_server_or_ip(server)
+        instance_ip = self.get_server_ip(server)
         timestamp = self.create_timestamp(instance_ip,
                                           private_key=keypair['private_key'])