X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=tosca2heat%2Fheat-translator%2Ftranslator%2Fhot%2Ftosca%2Ftosca_block_storage_attachment.py;h=f471b8324749f60cde3b1460e5e820c928177550;hb=HEAD;hp=715d5b3d67aeb1364b1d0b7989a62dfa30bb8424;hpb=e126507c0b70bbc27ddc9b46e4dcfee4663c2c38;p=parser.git

diff --git a/tosca2heat/heat-translator/translator/hot/tosca/tosca_block_storage_attachment.py b/tosca2heat/heat-translator/translator/hot/tosca/tosca_block_storage_attachment.py
index 715d5b3..f471b83 100644
--- a/tosca2heat/heat-translator/translator/hot/tosca/tosca_block_storage_attachment.py
+++ b/tosca2heat/heat-translator/translator/hot/tosca/tosca_block_storage_attachment.py
@@ -23,9 +23,11 @@ class ToscaBlockStorageAttachment(HotResource):
 
     toscatype = 'tosca.nodes.BlockStorageAttachment'
 
-    def __init__(self, template, nodetemplates, instance_uuid, volume_id):
+    def __init__(self, template, nodetemplates, instance_uuid, volume_id,
+                 csar_dir=None):
         super(ToscaBlockStorageAttachment,
-              self).__init__(template, type='OS::Cinder::VolumeAttachment')
+              self).__init__(template, type='OS::Cinder::VolumeAttachment',
+                             csar_dir=csar_dir)
         self.nodetemplates = nodetemplates
         self.instance_uuid = {'get_resource': instance_uuid}
         self.volume_id = {'get_resource': volume_id}
@@ -44,5 +46,10 @@ class ToscaBlockStorageAttachment(HotResource):
         if 'location' in self.properties:
             self.properties['mountpoint'] = self.properties.pop('location')
 
+        # TOSCA type can have a device name specified,
+        # this is unsupported by Heat
+        if 'device' in self.properties:
+            self.properties.pop('device')
+
     def handle_life_cycle(self):
-        pass
+        return None, None, None