X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=tosca%2FvCPE%2Finfra%2FMainServiceTemplate.yaml;h=0aca66a60f350b71e6eba8380f04ba39616ecec8;hb=8d9ae22976d022e2da392ecb48e4c0c38eaa6d9f;hp=22c3ad9ef63dcc1d984120463018f6bcc4bd129e;hpb=a5105e9a8ca5604c56edf19e8c970aca01c30441;p=demo.git

diff --git a/tosca/vCPE/infra/MainServiceTemplate.yaml b/tosca/vCPE/infra/MainServiceTemplate.yaml
index 22c3ad9e..0aca66a6 100644
--- 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 that for vDHCP configuration
       default: 10.0.11.1
+    mr_ip_port:
+      type: string
+      description: IP port of the Message Router that for vDHCP configuration 
+      default: "3904"
     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 }