openstack/nova
Code Issues Proposed changes

Revert "Pass host when call attach to Cinder"

Browse Source 
Older Cinder blows up because of the extra parameter in the detach call
to Cinder. We need to find another way to pass the info.

This reverts commit d31bb4be8e.

Closes-Bug: #1538620
Change-Id: I99335827ee6492d3f5629850be8e7cbe19371830
This commit is contained in:
Ildiko Vancsa
2016-01-27 15:17:46 +00:00
committed by Matt Riedemann
parent d31bb4be8e
commit ed5958d552
6 changed files with 17 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
nova/tests/unit/virt/test_block_device.py
View File

@@ -450,14 +450,11 @@ class TestDriverBlockDevice(test.NoDBTestCase):
if not fail_volume_attach:
self.volume_api.attach(elevated_context, fake_volume['id'],
'fake_uuid', bdm_dict['device_name'],
mode=access_mode,
host=connector['host']).AndReturn(
None)
mode=access_mode).AndReturn(None)
else:
self.volume_api.attach(elevated_context, fake_volume['id'],
'fake_uuid', bdm_dict['device_name'],
mode=access_mode,
host=connector['host']).AndRaise(
mode=access_mode).AndRaise(
test.TestingException)
if driver_attach:
self.virt_driver.detach_volume(