diff options
| author |   shangxdy <shang.xiaodong@zte.com.cn> | 2016-08-28 17:25:28 +0800 |
|---|---|---|
| committer | shangxdy <shang.xiaodong@zte.com.cn> | 2016-08-28 17:25:28 +0800 |
| commit | aef34ad9a966ca64aa365ee6aaada702b986f68b (patch) | |
| tree | 70978e5e43f052afbfcf615ce0cd45ea1f4349c7 /tosca2heat/heat-translator/translator/tests/data | |
| parent | 654a44a7d3727f7f6d3fb61f70f7e63f9b6d8524 (diff) | |
Fix BlockStorageAttachment bug when translate compute node
Currently, when translate compute node with local_storage and
high_availability, there is not BlockStorageAttache resource created
about block storage, and only BlockStorage created.
If only local_storage requirement in compute node, the result is
correct.
The reason is the function logic of _get_attachment_node is error. and
the patch will fixit.
JIRA:PARSER-100
Change-Id: I36456089ae65102d4b17797d266c850d8c16b29d
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
Diffstat (limited to 'tosca2heat/heat-translator/translator/tests/data')
| -rw-r--r-- | tosca2heat/heat-translator/translator/tests/data/hot_output/hot_nfv_sample.yaml | 15 | ||||
| -rw-r--r-- | tosca2heat/heat-translator/translator/tests/data/test_tosca_nfv_sample.yaml | 11 |
2 files changed, 26 insertions, 0 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..d67f022 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 @@ -15,6 +15,7 @@ resources: user_data_format: SOFTWARE_CONFIG depends_on: - VDU2 + - BlockStorage VDU2: type: OS::Nova::Server @@ -25,6 +26,20 @@ resources: - port: { get_resource: CP2 } user_data_format: SOFTWARE_CONFIG + BlockStorage: + type: OS::Cinder::Volume + properties: + size: 10 + + tosca.relationships.attachesto_1: + type: OS::Cinder::VolumeAttachment + properties: + instance_uuid: + get_resource: VDU1 + mountpoint: /data + 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..edbbbe5 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 @@ -23,6 +23,17 @@ topology_template: version: 6.5 requirements: - high_availability: VDU2 + - local_storage: + node: BlockStorage + relationship: + type: tosca.relationships.AttachesTo + properties: + location: /data + + BlockStorage: + type: tosca.nodes.BlockStorage + properties: + size: 10 GB VDU2: type: tosca.nodes.nfv.VDU |