summaryrefslogtreecommitdiffstats
path: root/smoketests
diff options
context:
space:
mode:
authorSoren Hansen <soren@linux2go.dk>2011-03-20 20:04:51 +0100
committerSoren Hansen <soren@linux2go.dk>2011-03-20 20:04:51 +0100
commit049e895beaf862ee0af89a9c465220f1fc44b404 (patch)
tree9f9b2c2f74cfbf278b3fa6fbfe4a4dbe924943bd /smoketests
parent4b18488223d2c51958855456cb4f5877f331aaa1 (diff)
parent3e255ad1bc685c0d39631540e664bde49e0670db (diff)
downloadnova-049e895beaf862ee0af89a9c465220f1fc44b404.tar.gz
nova-049e895beaf862ee0af89a9c465220f1fc44b404.tar.xz
nova-049e895beaf862ee0af89a9c465220f1fc44b404.zip
Merge trunk
Diffstat (limited to 'smoketests')
-rw-r--r--smoketests/test_sysadmin.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/smoketests/test_sysadmin.py b/smoketests/test_sysadmin.py
index 15c3b9d57..9bed1e092 100644
--- a/smoketests/test_sysadmin.py
+++ b/smoketests/test_sysadmin.py
@@ -156,7 +156,8 @@ class InstanceTests(base.UserSmokeTestCase):
self.fail('could not ping instance')
if FLAGS.use_ipv6:
- if not self.wait_for_ping(self.data['instance'].ip_v6, "ping6"):
+ if not self.wait_for_ping(self.data['instance'].dns_name_v6,
+ "ping6"):
self.fail('could not ping instance v6')
def test_005_can_ssh_to_private_ip(self):
@@ -165,7 +166,7 @@ class InstanceTests(base.UserSmokeTestCase):
self.fail('could not ssh to instance')
if FLAGS.use_ipv6:
- if not self.wait_for_ssh(self.data['instance'].ip_v6,
+ if not self.wait_for_ssh(self.data['instance'].dns_name_v6,
TEST_KEY):
self.fail('could not ssh to instance v6')