Fix Tosca csar with error variable

[demo.git] / tosca / vCPE / infra / MainServiceTemplate.yaml

diff --git a/tosca/vCPE/infra/MainServiceTemplate.yaml b/tosca/vCPE/infra/MainServiceTemplate.yaml
index 22c3ad9..bfb4c7e 100644 (file)
--- a/tosca/vCPE/infra/MainServiceTemplate.yaml
+++ b/tosca/vCPE/infra/MainServiceTemplate.yaml
@@ -77,8 +77,12 @@ topology_template:
       default: 10.0.0.0/16
     mr_ip_addr:
       type: string
-      description: message router ip that for vDHCP configuration 
+      description: message router ip for vDHCP configuration
       default: 10.0.11.1
+    mr_ip_port:
+      type: string
+      label: Message Router Port
+      description: message router port for vDHCP configuration
     dcae_collector_ip:
       type: string
       description: dcae collector ip
@@ -327,7 +331,7 @@ topology_template:
           dcae_collector_port: { get_input: dcae_collector_port }
           cpe_signal_net_ipaddr: { get_input: vaaa_private_ip_0 }
           oam_ipaddr: { get_input: vaaa_private_ip_1 }
-          oam_cidr: { get_input: oam_private_net_cidr }
+          oam_cidr: { get_input: onap_private_net_cidr }
           cpe_signal_net_cidr: { get_input: cpe_signal_net_cidr }
           demo_artifacts_version: { get_input: demo_artifacts_version }
           install_script_version: { get_input: install_script_version }
@@ -453,7 +457,7 @@ topology_template:
           vf_module_id: { get_input: vf_module_id }
           oam_ipaddr: { get_input: vdns_private_ip_1 }
           cpe_public_net_ipaddr: { get_input: vdns_private_ip_0 }
-          oam_cidr: { get_input: oam_private_net_cidr }
+          oam_cidr: { get_input: onap_private_net_cidr }
           cpe_public_net_cidr: { get_input: cpe_public_net_cidr }
           demo_artifacts_version: { get_input: demo_artifacts_version }
           install_script_version: { get_input: install_script_version }
@@ -577,7 +581,7 @@ topology_template:
           vf_module_id: { get_input: vf_module_id }
           oam_ipaddr: { get_input: vdhcp_private_ip_1 }
           cpe_signal_ipaddr: { get_input: vdhcp_private_ip_0 }
-          oam_cidr: { get_input: oam_private_net_cidr }
+          oam_cidr: { get_input: onap_private_net_cidr }
           cpe_signal_net_cidr: { get_input: cpe_signal_net_cidr }
           mr_ip_addr: { get_input: mr_ip_addr }
           mr_ip_port: { get_input: mr_ip_port }
@@ -705,7 +709,7 @@ topology_template:
           vf_module_id: { get_input: vf_module_id }
           oam_ipaddr: { get_input: vweb_private_ip_1 }
           cpe_public_ipaddr: { get_input: vweb_private_ip_0 }
-          oam_cidr: { get_input: oam_private_net_cidr }
+          oam_cidr: { get_input: onap_private_net_cidr }
           cpe_public_net_cidr: { get_input: cpe_public_net_cidr }
           demo_artifacts_version: { get_input: demo_artifacts_version }
           install_script_version: { get_input: install_script_version }