summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorshangxdy <shang.xiaodong@zte.com.cn>2016-07-21 00:04:19 +0800
committershangxdy <shang.xiaodong@zte.com.cn>2016-07-21 14:10:25 +0800
commit88f2b2b775c576b36bfceb0c055bd72bff6fd9d0 (patch)
tree16f51b005fa0b28d7acfab619c5ec6f4818e7147
parent9b0aa6ee37e40e98ac1f8c74ac85864af30458da (diff)
Substitution mappings doesn't supports properties
According to the simple tosca specification, substitution mapping only supports key words of node_type, capabilities and requirements, but in the definition of vRNC, add keywords of properties, so it will be deleted Change-Id: I45ca5f6d44410e5a6b8cdb448f3f148d63cc1376 JIRA: PARSER-67 Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
-rw-r--r--docs/parser_docs/tosca2heat/examples/Simple_RNC.yaml2
-rw-r--r--tosca2heat/tosca-parser/toscaparser/extensions/nfv/tests/data/vRNC/Definitions/vRNC.yaml2
2 files changed, 0 insertions, 4 deletions
diff --git a/docs/parser_docs/tosca2heat/examples/Simple_RNC.yaml b/docs/parser_docs/tosca2heat/examples/Simple_RNC.yaml
index 76fd002..83283f3 100644
--- a/docs/parser_docs/tosca2heat/examples/Simple_RNC.yaml
+++ b/docs/parser_docs/tosca2heat/examples/Simple_RNC.yaml
@@ -76,8 +76,6 @@ topology_template:
substitution_mappings:
node_type: rnc.nodes.VNF
- properties:
- vnfmtype: UMTS
requirements:
virtualLink_VNFM: [ MM_Port_CTRL, virtualLink ]
virtualLink_EMS: [ MM_Port_EMS, virtualLink ]
diff --git a/tosca2heat/tosca-parser/toscaparser/extensions/nfv/tests/data/vRNC/Definitions/vRNC.yaml b/tosca2heat/tosca-parser/toscaparser/extensions/nfv/tests/data/vRNC/Definitions/vRNC.yaml
index bdd03c8..21f79e2 100644
--- a/tosca2heat/tosca-parser/toscaparser/extensions/nfv/tests/data/vRNC/Definitions/vRNC.yaml
+++ b/tosca2heat/tosca-parser/toscaparser/extensions/nfv/tests/data/vRNC/Definitions/vRNC.yaml
@@ -74,8 +74,6 @@ topology_template:
substitution_mappings:
node_type: rnc.nodes.VNF
- properties:
- vnfmtype: UMTS
requirements:
virtualLink_VNFM: [ MM_Port_CTRL, virtualLink ]
virtualLink_EMS: [ MM_Port_EMS, virtualLink ]