Merge "Delete unused codes in rbd.retype"

diff --cc cinder/tests/unit/test_rbd.py
index 91eeebe7d8194fbd07b0dbcbe8757a1fbf4b0fc1,c92c984ccb4c2ead875477bfe6d512a2a5099b25..a163dfb352b16fc0325701801dba4a98024bd800
--- 1/cinder/tests/unit/test_rbd.py
--- 2/cinder/tests/unit/test_rbd.py
+++ b/cinder/tests/unit/test_rbd.py
@@@ -26,8 -27,9 +26,9 @@@ from oslo_utils import unit
  from cinder import exception
  from cinder.i18n import _
  from cinder.image import image_utils
 +from cinder import objects
  from cinder import test
+ from cinder.tests.unit import fake_volume
  from cinder.tests.unit.image import fake as fake_image
  from cinder.tests.unit import test_volume
  from cinder.tests.unit import utils

diff --cc cinder/volume/drivers/rbd.py
Simple merge