From 8bf7f7ab2d61fae5b07e52b4a39340eba68086d9 Mon Sep 17 00:00:00 2001 From: shangxdy Date: Thu, 1 Sep 2016 21:41:27 +0800 Subject: Fix parser run error when attach blockstorage. The error is below: CREATE_FAILED Error: resources.tosca.relationships.attachesto_1: Failed to attach volume dc1cd8fb-9cf3-42c2-bb3e-6a24ba354003 to server fded0b07-9da2-4d9c-aedc-fefd22ee1efb - Invalid input for field/attribute device. Value: /data. u'/data' does not match '(^/dev/x{0,1}[a-z]{0,1}d{0,1})([a-z]+)[0-9]*$' JIRA:PARSER-102 Change-Id: Ie30c669ab5eeddbcd8bc33d648b8cd33d9942333 Signed-off-by: shangxdy (cherry picked from commit 843b0222bc3171db78d8f5fcf45ff1d0c4a72731) --- .../translator/tests/data/hot_output/hot_nfv_sample.yaml | 4 ++-- .../heat-translator/translator/tests/data/test_tosca_nfv_sample.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 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 d67f022..44647c6 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 @@ -29,14 +29,14 @@ resources: BlockStorage: type: OS::Cinder::Volume properties: - size: 10 + size: 1 tosca.relationships.attachesto_1: type: OS::Cinder::VolumeAttachment properties: instance_uuid: get_resource: VDU1 - mountpoint: /data + mountpoint: /dev/vdb1 volume_id: get_resource: BlockStorage 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 edbbbe5..d953fe7 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 @@ -28,12 +28,12 @@ topology_template: relationship: type: tosca.relationships.AttachesTo properties: - location: /data + location: /dev/vdb1 BlockStorage: type: tosca.nodes.BlockStorage properties: - size: 10 GB + size: 1 GB VDU2: type: tosca.nodes.nfv.VDU -- cgit 1.2.3-korg