Merge "Add attribute 'name' to class RBDVolume."

os_brick/initiator/linuxrbd.py

@@ -110,6 +110,11 @@ class RBDVolume(object):
             client.disconnect()
             raise
 
+        # Ceph provides rbd.so to cinder, but we can't
+        # get volume name from rbd.Image, so, we record
+        # name here, so other modules can easily get
+        # volume name.
+        self.name = name
         self.client = client
 
     def close(self):

os_brick/tests/initiator/test_linuxrbd.py

@@ -207,3 +207,10 @@ class RBDVolumeIOWrapperTestCase(base.TestCase):
             linuxrbd.RBDImageMetadata(rbd_volume, 'pool', 'user', None))
         rbd_handle.close()
         self.assertEqual(1, rbd_disconnect.call_count)
+
+
+class RBDVolumeTestCase(base.TestCase):
+    def test_name_attribute(self):
+        mock_client = mock.Mock()
+        rbd_volume = linuxrbd.RBDVolume(mock_client, 'volume')
+        self.assertEqual('volume', rbd_volume.name)