From c3b7cce8101548428b64abb23ab88482bc79c36e Mon Sep 17 00:00:00 2001 From: Brian Waldon Date: Wed, 7 Dec 2011 11:59:14 -0500 Subject: Clean up snapshot metadata - Removed image_state from compute api snapshot (only needed by ec2/s3) - Only set backup_type when image_type is 'backup' - Add testing to verify snapshots/backups get the correct metadata Change-Id: Ib5461f9aa790d7ed5629c591bbe1510443dbc2aa --- nova/tests/test_compute.py | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) (limited to 'nova/tests') diff --git a/nova/tests/test_compute.py b/nova/tests/test_compute.py index 6c4540094..6ad3565ef 100644 --- a/nova/tests/test_compute.py +++ b/nova/tests/test_compute.py @@ -1504,13 +1504,32 @@ class ComputeAPITestCase(BaseTestCase): def test_snapshot(self): """Can't backup an instance which is already being backed up.""" instance = self._create_fake_instance() - self.compute_api.snapshot(self.context, instance, None, None) + image = self.compute_api.snapshot(self.context, instance, 'snap1', + {'extra_param': 'value1'}) + + self.assertEqual(image['name'], 'snap1') + properties = image['properties'] + self.assertTrue('backup_type' not in properties) + self.assertEqual(properties['image_type'], 'snapshot') + self.assertEqual(properties['instance_uuid'], instance['uuid']) + self.assertEqual(properties['extra_param'], 'value1') + db.instance_destroy(self.context, instance['id']) def test_backup(self): """Can't backup an instance which is already being backed up.""" instance = self._create_fake_instance() - self.compute_api.backup(self.context, instance, None, None, None) + image = self.compute_api.backup(self.context, instance, + 'backup1', 'DAILY', None, + {'extra_param': 'value1'}) + + self.assertEqual(image['name'], 'backup1') + properties = image['properties'] + self.assertEqual(properties['backup_type'], 'DAILY') + self.assertEqual(properties['image_type'], 'backup') + self.assertEqual(properties['instance_uuid'], instance['uuid']) + self.assertEqual(properties['extra_param'], 'value1') + db.instance_destroy(self.context, instance['id']) def test_backup_conflict(self): -- cgit