summaryrefslogtreecommitdiffstats
path: root/tosca2heat/tosca-parser/toscaparser
diff options
context:
space:
mode:
authorxiaodong shang <shang.xiaodong@zte.com.cn>2016-12-09 15:21:33 +0000
committerGerrit Code Review <gerrit@opnfv.org>2016-12-09 15:21:33 +0000
commitc72383042c976022d8b49b3fc77a4c1a1b735ec0 (patch)
treebbc34b42db156e767c50a9a6f3428ae5bdec3488 /tosca2heat/tosca-parser/toscaparser
parentbfa17e5ccf685e3fa5d6661c72397bf3e6953fe4 (diff)
parentf4bd2f371d6afa92c804b3b3a6eccba9e931484b (diff)
Merge "Add output in vRNC for substitution mappings"
Diffstat (limited to 'tosca2heat/tosca-parser/toscaparser')
-rw-r--r--tosca2heat/tosca-parser/toscaparser/extensions/nfv/tests/data/vRNC/Definitions/rnc_definition.yaml13
-rw-r--r--tosca2heat/tosca-parser/toscaparser/extensions/nfv/tests/data/vRNC/Definitions/vRNC.yaml8
2 files changed, 17 insertions, 4 deletions
diff --git a/tosca2heat/tosca-parser/toscaparser/extensions/nfv/tests/data/vRNC/Definitions/rnc_definition.yaml b/tosca2heat/tosca-parser/toscaparser/extensions/nfv/tests/data/vRNC/Definitions/rnc_definition.yaml
index 62ed2ad..52fbd4c 100644
--- a/tosca2heat/tosca-parser/toscaparser/extensions/nfv/tests/data/vRNC/Definitions/rnc_definition.yaml
+++ b/tosca2heat/tosca-parser/toscaparser/extensions/nfv/tests/data/vRNC/Definitions/rnc_definition.yaml
@@ -42,6 +42,19 @@ node_types:
required: false
constraints:
- valid_values: [ TDS-CDMA, UMTS, CDMA ]
+ attributes:
+ private_ip_of_MM:
+ type: string
+ description: IP of master MM
+ private_ip_of_CM:
+ type: string
+ description: IP of master CM
+ private_ip_of_DM:
+ type: string
+ description: IP of master DM
+ private_ip_of_LB:
+ type: string
+ description: IP of master LB
requirements:
- virtualLink_VNFM:
capability: tosca.capabilities.nfv.VirtualLinkable
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 921301b..4441372 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
@@ -487,19 +487,19 @@ topology_template:
# definition of output parameters for the topology template
outputs:
private_ip_of_MM:
- description: The private IP address of the MM.
+ description: The Inner(CtrPlane) IP address of the MM.
value: { get_attribute: [ MM_Active_Host, private_address ] }
private_ip_of_CM:
- description: The private IP address of the CM.
+ description: The Inner(CtrPlane) IP address of the CM.
value: { get_attribute: [ CM_Active_Host, private_address ] }
private_ip_of_DM:
- description: The private IP address of the DM.
+ description: The Inner(CtrPlane) IP address of the DM.
value: { get_attribute: [ DM_Host, private_address ] }
private_ip_of_LB:
- description: The private IP address of the LB.
+ description: The Inner(CtrPlane) IP address of the LB.
value: { get_attribute: [ LB_Host, private_address ] }
# definition of logical groups of node templates within the topology