This commit is contained in:
Isaku Yamahata
2011-06-15 23:11:03 +09:00
parent 817bc926b2
commit 496365f12a

View File

@@ -669,7 +669,7 @@ class CloudTestCase(test.TestCase):
'max_count': 1, 'max_count': 1,
'block_device_mapping': [{'device_name': '/dev/vdb', 'block_device_mapping': [{'device_name': '/dev/vdb',
'volume_id': vol1['id'], 'volume_id': vol1['id'],
'delete_on_termination': True,},]} 'delete_on_termination': True}]}
ec2_instance_id = self._run_instance_wait(**kwargs) ec2_instance_id = self._run_instance_wait(**kwargs)
instance_id = ec2utils.ec2_id_to_id(ec2_instance_id) instance_id = ec2utils.ec2_id_to_id(ec2_instance_id)
@@ -750,7 +750,7 @@ class CloudTestCase(test.TestCase):
'delete_on_termination': False, }, 'delete_on_termination': False, },
{'device_name': '/dev/vdc', {'device_name': '/dev/vdc',
'snapshot_id': snapshot2_id, 'snapshot_id': snapshot2_id,
'delete_on_termination': True,},],} 'delete_on_termination': True}]}
ec2_instance_id = self._run_instance_wait(**kwargs) ec2_instance_id = self._run_instance_wait(**kwargs)
instance_id = ec2utils.ec2_id_to_id(ec2_instance_id) instance_id = ec2utils.ec2_id_to_id(ec2_instance_id)