From 2323c9da55a018b1b1995abd5d05f4cdf2be31d5 Mon Sep 17 00:00:00 2001 From: shangxdy Date: Sun, 10 Jul 2016 01:44:07 +0800 Subject: fix import and vRNC Ctrl_net definition error 1. Currently DM_Port_Ctrl requirement definition requirements: virtualBinding: DM virtualLink: CTRL_Net_Host shall be below: requirements: virtualBinding: DM_Host virtualLink: CTRL_Net 2. In function of _load_import_template when import vRNC definition, it will return "None, None" instead of return Null in case of no value return. Change-Id: I81d2d471eafff8ebd77eef356e6178e1f7701a22 JIRA: PARSER-65 Signed-off-by: shangxdy --- .../toscaparser/extensions/nfv/tests/data/vRNC/Definitions/vRNC.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tosca2heat/tosca-parser/toscaparser/extensions') 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 6517c4a..bdd03c8 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 @@ -441,8 +441,8 @@ topology_template: order: 0 is_default: true requirements: - - virtualBinding: DM - - virtualLink: CTRL_Net_Host + - virtualBinding: DM_Host + - virtualLink: CTRL_Net DM_Port_INTERMEDIA: type: rnc.nodes.CP.DM -- cgit 1.2.3-korg