diff options
| author |   shangxdy <shang.xiaodong@zte.com.cn> | 2016-07-10 01:44:07 +0800 |
|---|---|---|
| committer | shangxdy <shang.xiaodong@zte.com.cn> | 2016-07-10 01:44:07 +0800 |
| commit | 2323c9da55a018b1b1995abd5d05f4cdf2be31d5 (patch) | |
| tree | 3271642c73b07788a6c4a1256fbf3636b852f311 /tosca2heat/tosca-parser/toscaparser/extensions/nfv | |
| parent | 0997552722dc4845a854e0e6f8d7f18058e26380 (diff) | |
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 <shang.xiaodong@zte.com.cn>
Diffstat (limited to 'tosca2heat/tosca-parser/toscaparser/extensions/nfv')
| -rw-r--r-- | tosca2heat/tosca-parser/toscaparser/extensions/nfv/tests/data/vRNC/Definitions/vRNC.yaml | 4 |
1 files changed, 2 insertions, 2 deletions
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 |