Merge "Support set 'read_only' access mode for cinder volume"

heat/engine/resources/openstack/cinder/volume.py

@@ -34,11 +34,11 @@ class CinderVolume(vb.BaseVolume):
     PROPERTIES = (
         AVAILABILITY_ZONE, SIZE, SNAPSHOT_ID, BACKUP_ID, NAME,
         DESCRIPTION, VOLUME_TYPE, METADATA, IMAGE_REF, IMAGE,
-        SOURCE_VOLID, CINDER_SCHEDULER_HINTS,
+        SOURCE_VOLID, CINDER_SCHEDULER_HINTS, READ_ONLY,
     ) = (
         'availability_zone', 'size', 'snapshot_id', 'backup_id', 'name',
         'description', 'volume_type', 'metadata', 'imageRef', 'image',
-        'source_volid', 'scheduler_hints',
+        'source_volid', 'scheduler_hints', 'read_only',
     )
 
     ATTRIBUTES = (
@@ -131,6 +131,12 @@ class CinderVolume(vb.BaseVolume):
               'the Cinder scheduler creating a volume.'),
             support_status=support.SupportStatus(version='2015.1')
         ),
+        READ_ONLY: properties.Schema(
+            properties.Schema.BOOLEAN,
+            _('Enables or disables read-only access mode of volume.'),
+            support_status=support.SupportStatus(version='2015.2'),
+            update_allowed=True,
+        ),
     }
 
     attributes_schema = {
@@ -221,6 +227,15 @@ class CinderVolume(vb.BaseVolume):
                 return vol.description
         return six.text_type(getattr(vol, name))
 
+    def handle_create(self):
+        vol_id = super(CinderVolume, self).handle_create()
+        read_only_flag = self.properties.get(self.READ_ONLY)
+        if read_only_flag is not None:
+            self.client().volumes.update_readonly_flag(vol_id,
+                                                       read_only_flag)
+
+        return vol_id
+
     def handle_update(self, json_snippet, tmpl_diff, prop_diff):
         vol = None
         checkers = []
@@ -288,6 +303,10 @@ class CinderVolume(vb.BaseVolume):
                     extend_task = vol_task.VolumeExtendTask(
                         self.stack, vol.id, new_size)
                     checkers.append(scheduler.TaskRunner(extend_task))
+        # update read_only access mode
+        if self.READ_ONLY in prop_diff:
+            flag = prop_diff.get(self.READ_ONLY)
+            cinder.volumes.update_readonly_flag(self.resource_id, flag)
 
         if checkers:
             checkers[0].start()

heat/tests/openstack/test_volume.py

@@ -177,6 +177,37 @@ class CinderVolumeTest(vt_base.BaseVolumeTest):
 
         self.m.VerifyAll()
 
+    def test_cinder_create_with_read_only(self):
+        fv = vt_base.FakeVolume('with_read_only_access_mode')
+        stack_name = 'test_create_with_read_only'
+        cinder.CinderClientPlugin._create().AndReturn(
+            self.cinder_fc)
+
+        self.cinder_fc.volumes.create(
+            size=1, availability_zone='nova',
+            description='ImageVolumeDescription',
+            name='ImageVolume').AndReturn(fv)
+
+        update_readonly_mock = self.patchobject(self.cinder_fc.volumes,
+                                                'update_readonly_flag')
+        update_readonly_mock(fv.id, False).return_value(None)
+        fv_ready = vt_base.FakeVolume('available', id=fv.id)
+        self.cinder_fc.volumes.get(fv.id).AndReturn(fv_ready)
+
+        self.m.ReplayAll()
+
+        self.t['resources']['volume']['properties'] = {
+            'size': '1',
+            'name': 'ImageVolume',
+            'description': 'ImageVolumeDescription',
+            'availability_zone': 'nova',
+            'read_only': False,
+        }
+        stack = utils.parse_stack(self.t, stack_name=stack_name)
+        self.create_volume(self.t, stack, 'volume')
+
+        self.m.VerifyAll()
+
     def test_cinder_default(self):
         fv = vt_base.FakeVolume('creating')
         stack_name = 'test_cvolume_default_stack'
@@ -576,6 +607,38 @@ class CinderVolumeTest(vt_base.BaseVolumeTest):
 
         self.assertEqual((rsrc.UPDATE, rsrc.COMPLETE), rsrc.state)
 
+    def test_cinder_volume_update_read_only(self):
+        # update read only access mode
+        fv = vt_base.FakeVolume('update_read_only_access_mode')
+        stack_name = 'test_update_read_only'
+        cinder.CinderClientPlugin._create().AndReturn(
+            self.cinder_fc)
+
+        self.cinder_fc.volumes.create(
+            size=1, availability_zone='nova',
+            description='test_description',
+            name='test_name',
+            metadata={u'key': u'value'}).AndReturn(fv)
+
+        update_readonly_mock = self.patchobject(self.cinder_fc.volumes,
+                                                'update_readonly_flag')
+        update_readonly_mock(fv.id, True).return_value(None)
+        fv_ready = vt_base.FakeVolume('available', id=fv.id)
+        self.cinder_fc.volumes.get(fv.id).AndReturn(fv_ready)
+
+        self.m.ReplayAll()
+
+        stack = utils.parse_stack(self.t, stack_name=stack_name)
+
+        rsrc = self.create_volume(self.t, stack, 'volume')
+
+        props = copy.deepcopy(rsrc.properties.data)
+        props['read_only'] = True
+        after = rsrc_defn.ResourceDefinition(rsrc.name, rsrc.type(), props)
+        scheduler.TaskRunner(rsrc.update, after)()
+
+        self.assertEqual((rsrc.UPDATE, rsrc.COMPLETE), rsrc.state)
+
     def test_cinder_snapshot(self):
         stack_name = 'test_cvolume_snpsht_stack'