summaryrefslogtreecommitdiffstats
path: root/nova/tests
diff options
context:
space:
mode:
authorThierry Carrez <thierry@openstack.org>2011-06-17 20:47:23 +0000
committerTarmac <>2011-06-17 20:47:23 +0000
commita854d4e17214269b729777967e028600fdf4ee50 (patch)
tree83c1a750b1f271b068a5fa1aa970c9929a078970 /nova/tests
parent2e6c26fcc8967192e35e0d2b2473bae578eb5b04 (diff)
parenta0ab4e7f141ccf14caca23f15eed5408079a58d0 (diff)
Make EC2 update_instance() only update updatable_fields, rather than all
fields. Patch courtesy of Vladimir Popovski.
Diffstat (limited to 'nova/tests')
-rw-r--r--nova/tests/test_cloud.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/nova/tests/test_cloud.py b/nova/tests/test_cloud.py
index 8ba2164e7..cbb6233ac 100644
--- a/nova/tests/test_cloud.py
+++ b/nova/tests/test_cloud.py
@@ -544,7 +544,9 @@ class CloudTestCase(test.TestCase):
def test_update_of_instance_wont_update_private_fields(self):
inst = db.instance_create(self.context, {})
- self.cloud.update_instance(self.context, inst['id'],
+ ec2_id = ec2utils.id_to_ec2_id(inst['id'])
+ self.cloud.update_instance(self.context, ec2_id,
+ display_name='c00l 1m4g3',
mac_address='DE:AD:BE:EF')
inst = db.instance_get(self.context, inst['id'])
self.assertEqual(None, inst['mac_address'])