From: shangxdy Date: Wed, 20 Jul 2016 16:04:19 +0000 (+0800) Subject: Substitution mappings doesn't supports properties X-Git-Tag: colorado.1.0~53 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F41%2F17241%2F2;p=parser.git 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 --- 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 ]