Add output in vRNC for substitution mappings

Add attributes in rnc.nodes.VNF definition.

JIRA:PARSER-114

Change-Id: I8578cc89dc58202893370d367dc9923ddc1c111a
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>

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 (file)
--- 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 (file)
--- 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