heat tests : functional tests align eip output with Folsom

Folsom novaclient floating_ips.list() returns the instance ID as
instance_id not resource_id

Change-Id: Ie958ada0984f9927cd490f01bd4db3102c53090a
Signed-off-by: Steven Hardy <shardy@redhat.com>

diff --git a/heat/tests/functional/test_WordPress_Single_Instance_With_EBS_EIP.py b/heat/tests/functional/test_WordPress_Single_Instance_With_EBS_EIP.py
index a155e4ef29776df0991c77d47535fedc5deb2203..d4f733b8e4b3f92a7e154abeef3ed6864a20e776 100644 (file)
--- a/heat/tests/functional/test_WordPress_Single_Instance_With_EBS_EIP.py
+++ b/heat/tests/functional/test_WordPress_Single_Instance_With_EBS_EIP.py
@@ -57,7 +57,7 @@ class WordPressEBSEIPFunctionalTest(unittest.TestCase):
             found = 0
             mylist = self.stack.novaclient.floating_ips.list()
             for item in mylist:
-                if item.resource_id == self.stack.instance_phys_ids()[0]:
+                if item.instance_id == self.stack.instance_phys_ids()[0]:
                     print 'floating IP found', item.ip
                     found = 1
                     break

diff --git a/heat/tests/functional/test_WordPress_Single_Instance_With_EIP.py b/heat/tests/functional/test_WordPress_Single_Instance_With_EIP.py
index 8194fe4d4078b790b6f236d14820bff537a90a92..fb18d87db50b405c1f9b1eb942beafbd0324e247 100644 (file)
--- a/heat/tests/functional/test_WordPress_Single_Instance_With_EIP.py
+++ b/heat/tests/functional/test_WordPress_Single_Instance_With_EIP.py
@@ -57,7 +57,7 @@ class WordPressEIPFunctionalTest(unittest.TestCase):
             found = 0
             mylist = self.stack.novaclient.floating_ips.list()
             for item in mylist:
-                if item.resource_id == self.stack.instance_phys_ids()[0]:
+                if item.instance_id == self.stack.instance_phys_ids()[0]:
                     print 'floating IP found', item.ip
                     found = 1
                     break