From ce1eae500b446868b80d5d9ab0b2a4b9cd5f0b26 Mon Sep 17 00:00:00 2001 From: Steven Hardy Date: Fri, 4 Jan 2013 15:18:47 +0000 Subject: [PATCH] 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 --- .../functional/test_WordPress_Single_Instance_With_EBS_EIP.py | 2 +- .../tests/functional/test_WordPress_Single_Instance_With_EIP.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 a155e4ef29..d4f733b8e4 100644 --- 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 8194fe4d40..fb18d87db5 100644 --- 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