ec2: clean up in test_cinder_cloud
_fake_bdm_get() is never been called in this unit test case. remove it. Change-Id: I2f4646f0938f92882850f294a97114ecbc920b20
This commit is contained in:
parent
e5ed57dc3f
commit
d5e10543a6
|
@ -1101,49 +1101,3 @@ class CinderCloudTestCase(test.TestCase):
|
|||
|
||||
self.cloud.terminate_instances(self.context, [ec2_instance_id])
|
||||
self._restart_compute_service()
|
||||
|
||||
@staticmethod
|
||||
def _fake_bdm_get(ctxt, id):
|
||||
return [{'volume_id': 87654321,
|
||||
'snapshot_id': None,
|
||||
'no_device': None,
|
||||
'virtual_name': None,
|
||||
'delete_on_termination': True,
|
||||
'device_name': '/dev/sdh'},
|
||||
{'volume_id': None,
|
||||
'snapshot_id': 98765432,
|
||||
'no_device': None,
|
||||
'virtual_name': None,
|
||||
'delete_on_termination': True,
|
||||
'device_name': '/dev/sdi'},
|
||||
{'volume_id': None,
|
||||
'snapshot_id': None,
|
||||
'no_device': True,
|
||||
'virtual_name': None,
|
||||
'delete_on_termination': None,
|
||||
'device_name': None},
|
||||
{'volume_id': None,
|
||||
'snapshot_id': None,
|
||||
'no_device': None,
|
||||
'virtual_name': 'ephemeral0',
|
||||
'delete_on_termination': None,
|
||||
'device_name': '/dev/sdb'},
|
||||
{'volume_id': None,
|
||||
'snapshot_id': None,
|
||||
'no_device': None,
|
||||
'virtual_name': 'swap',
|
||||
'delete_on_termination': None,
|
||||
'device_name': '/dev/sdc'},
|
||||
{'volume_id': None,
|
||||
'snapshot_id': None,
|
||||
'no_device': None,
|
||||
'virtual_name': 'ephemeral1',
|
||||
'delete_on_termination': None,
|
||||
'device_name': '/dev/sdd'},
|
||||
{'volume_id': None,
|
||||
'snapshot_id': None,
|
||||
'no_device': None,
|
||||
'virtual_name': 'ephemeral2',
|
||||
'delete_on_termination': None,
|
||||
'device_name': '/dev/sd3'},
|
||||
]
|
||||
|
|
Loading…
Reference in New Issue