summaryrefslogtreecommitdiffstats
path: root/nova/tests
diff options
context:
space:
mode:
authorDan Prince <dan.prince@rackspace.com>2011-05-26 18:14:38 -0400
committerDan Prince <dan.prince@rackspace.com>2011-05-26 18:14:38 -0400
commit2819681b762fe8a23f3af68f1c1cbed0a113c08e (patch)
treee2ac038793686f658a50576a0106286569166b80 /nova/tests
parent995a65ac42b4e36679ad0708a227139cdd3bc06e (diff)
Rename instances.image_id to instances.image_ref.
Diffstat (limited to 'nova/tests')
-rw-r--r--nova/tests/test_cloud.py6
-rw-r--r--nova/tests/test_compute.py2
2 files changed, 4 insertions, 4 deletions
diff --git a/nova/tests/test_cloud.py b/nova/tests/test_cloud.py
index 54c0454de..eefab58d0 100644
--- a/nova/tests/test_cloud.py
+++ b/nova/tests/test_cloud.py
@@ -191,10 +191,10 @@ class CloudTestCase(test.TestCase):
def test_describe_instances(self):
"""Makes sure describe_instances works and filters results."""
inst1 = db.instance_create(self.context, {'reservation_id': 'a',
- 'image_id': 1,
+ 'image_ref': 1,
'host': 'host1'})
inst2 = db.instance_create(self.context, {'reservation_id': 'a',
- 'image_id': 1,
+ 'image_ref': 1,
'host': 'host2'})
comp1 = db.service_create(self.context, {'host': 'host1',
'availability_zone': 'zone1',
@@ -390,7 +390,7 @@ class CloudTestCase(test.TestCase):
def test_terminate_instances(self):
inst1 = db.instance_create(self.context, {'reservation_id': 'a',
- 'image_id': 1,
+ 'image_ref': 1,
'host': 'host1'})
terminate_instances = self.cloud.terminate_instances
# valid instance_id
diff --git a/nova/tests/test_compute.py b/nova/tests/test_compute.py
index b4097660f..25454087d 100644
--- a/nova/tests/test_compute.py
+++ b/nova/tests/test_compute.py
@@ -84,7 +84,7 @@ class ComputeTestCase(test.TestCase):
def _create_instance(self, params={}):
"""Create a test instance"""
inst = {}
- inst['image_id'] = 1
+ inst['image_ref'] = 1
inst['reservation_id'] = 'r-fakeres'
inst['launch_time'] = '10'
inst['user_id'] = self.user.id