x/python-ganttclient
Code Issues Proposed changes

Clean up snapshot metadata

Browse Source 
- 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
This commit is contained in:
Brian Waldon
2011-12-07 11:59:14 -05:00
parent b97ece4a82
commit ac076f309b
1 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
nova/tests/test_compute.py
View File

@@ -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):