2 files changed, 32 insertions, 6 deletions
diff --git a/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_nfv_sample.yaml b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_nfv_sample.yaml
index d66569d..79750d4 100644
--- a/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_nfv_sample.yaml
+++ b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_nfv_sample.yaml
@@ -8,23 +8,38 @@ resources:
   VDU1:
     type: OS::Nova::Server
     properties:
-      flavor: m1.medium
+      flavor: m1.tiny
       image: rhel-6.5-test-image
       networks:
       - port: { get_resource: CP1 }
       user_data_format: SOFTWARE_CONFIG
     depends_on:
       - VDU2
+      - BlockStorage
 
   VDU2:
     type: OS::Nova::Server
     properties:
-      flavor: m1.medium
+      flavor: m1.tiny
       image: rhel-6.5-test-image
       networks:
       - port: { get_resource: CP2 }
       user_data_format: SOFTWARE_CONFIG
 
+  BlockStorage:
+    type: OS::Cinder::Volume
+    properties:
+      size: 1
+
+  tosca.relationships.attachesto_1:
+    type: OS::Cinder::VolumeAttachment
+    properties:
+      instance_uuid:
+        get_resource: VDU1
+      mountpoint: /dev/vdb1
+      volume_id:
+        get_resource: BlockStorage
+
   CP1:
     type: OS::Neutron::Port
     properties:
diff --git a/tosca2heat/heat-translator/translator/tests/data/test_tosca_nfv_sample.yaml b/tosca2heat/heat-translator/translator/tests/data/test_tosca_nfv_sample.yaml
index e5c8d3c..5803bd2 100644
--- a/tosca2heat/heat-translator/translator/tests/data/test_tosca_nfv_sample.yaml
+++ b/tosca2heat/heat-translator/translator/tests/data/test_tosca_nfv_sample.yaml
@@ -10,8 +10,8 @@ topology_template:
       capabilities:
         host:
          properties:
-           num_cpus: 2
-           disk_size: 10 GB
+           num_cpus: 1
+           disk_size: 1 GB
            mem_size: 512 MB
         # Guest Operating System properties
         os:
@@ -23,14 +23,25 @@ topology_template:
             version: 6.5
       requirements:
         - high_availability: VDU2
+        - local_storage:
+            node: BlockStorage
+            relationship:
+              type: tosca.relationships.AttachesTo
+              properties:
+                location: /dev/vdb1
+
+    BlockStorage:
+      type: tosca.nodes.BlockStorage
+      properties:
+        size: 1 GB
 
     VDU2:
       type: tosca.nodes.nfv.VDU
       capabilities:
         host:
          properties:
-           num_cpus: 2
-           disk_size: 10 GB
+           num_cpus: 1
+           disk_size: 1 GB
            mem_size: 512 MB
         # Guest Operating System properties
         os: