Update for OOM DMaaP Port

Issue-ID: INT-522
Change-Id: I7d29fee829312559554dd8c95b39dce1aabe0f3b
Signed-off-by: Brian Freeman <bf1936@att.com>

diff --git a/heat/vCPE/infra/base_vcpe_infra.env b/heat/vCPE/infra/base_vcpe_infra.env
index 43e05f7..71454ff 100644 (file)
--- a/heat/vCPE/infra/base_vcpe_infra.env
+++ b/heat/vCPE/infra/base_vcpe_infra.env
@@ -20,6 +20,7 @@ parameters:
   vweb_private_ip_0: 10.2.0.10
   vweb_private_ip_1: 10.0.101.40
   mr_ip_addr: 10.0.11.1
+  mr_ip_port: 3904
   vaaa_name_0: zdcpe1cpe01aaa01
   vdns_name_0: zdcpe1cpe01dns01
   vdhcp_name_0: zdcpe1cpe01dhcp01

diff --git a/heat/vCPE/infra/base_vcpe_infra.yaml b/heat/vCPE/infra/base_vcpe_infra.yaml
index c634958..1f409f2 100644 (file)
--- a/heat/vCPE/infra/base_vcpe_infra.yaml
+++ b/heat/vCPE/infra/base_vcpe_infra.yaml
@@ -149,6 +149,10 @@ parameters:
     type: string
     label: Message Router IP address
     description: IP address of the Message Router that for vDHCP configuration 
+  mr_ip_port:
+    type: string
+    label: Message Router Port 
+    description: IP port of the Message Router that for vDHCP configuration 
   key_name:
     type: string
     label: Key pair name
@@ -362,6 +366,7 @@ resources:
             __oam_cidr__ : { get_param: onap_private_net_cidr }
             __cpe_signal_net_cidr__ : { get_param: cpe_signal_net_cidr }
             __mr_ip_addr__ : { get_param: mr_ip_addr }
+            __mr_ip_port__ : { get_param: mr_ip_port }
             __repo_url_blob__ : { get_param: repo_url_blob }
             __repo_url_artifacts__ : { get_param: repo_url_artifacts }
             __demo_artifacts_version__ : { get_param: demo_artifacts_version }
@@ -377,6 +382,7 @@ resources:
             echo "__oam_cidr__" > /opt/config/oam_cidr.txt
             echo "__cpe_signal_net_cidr__" > /opt/config/cpe_signal_net_cidr.txt
             echo "__mr_ip_addr__" > /opt/config/mr_ip_addr.txt
+            echo "__mr_ip_port__" > /opt/config/mr_ip_port.txt
             echo "__repo_url_blob__" > /opt/config/repo_url_blob.txt
             echo "__repo_url_artifacts__" > /opt/config/repo_url_artifacts.txt
             echo "__demo_artifacts_version__" > /opt/config/demo_artifacts_version.txt

diff --git a/vnfs/vCPE/kea-sdnc-notify-mod/etc/kea-sdnc-notify.conf b/vnfs/vCPE/kea-sdnc-notify-mod/etc/kea-sdnc-notify.conf
index 6fd0984..6085a63 100644 (file)
--- a/vnfs/vCPE/kea-sdnc-notify-mod/etc/kea-sdnc-notify.conf
+++ b/vnfs/vCPE/kea-sdnc-notify-mod/etc/kea-sdnc-notify.conf
@@ -1,4 +1,4 @@
 {
- "url": "http://DMAAP_IPADDR:3904/events/VCPE-DHCP-EVENT/",
+ "url": "http://DMAAP_IPADDR:DMAAP_IPPORT/events/VCPE-DHCP-EVENT/",
  "siaddr": "siaddr"
 }

diff --git a/vnfs/vCPE/scripts/kea-sdnc-notify.conf b/vnfs/vCPE/scripts/kea-sdnc-notify.conf
index 6fd0984..6085a63 100644 (file)
--- a/vnfs/vCPE/scripts/kea-sdnc-notify.conf
+++ b/vnfs/vCPE/scripts/kea-sdnc-notify.conf
@@ -1,4 +1,4 @@
 {
- "url": "http://DMAAP_IPADDR:3904/events/VCPE-DHCP-EVENT/",
+ "url": "http://DMAAP_IPADDR:DMAAP_IPPORT/events/VCPE-DHCP-EVENT/",
  "siaddr": "siaddr"
 }

diff --git a/vnfs/vCPE/scripts/v_dhcp_install.sh b/vnfs/vCPE/scripts/v_dhcp_install.sh
index f369704..0365882 100644 (file)
--- a/vnfs/vCPE/scripts/v_dhcp_install.sh
+++ b/vnfs/vCPE/scripts/v_dhcp_install.sh
@@ -6,6 +6,7 @@ DEMO_ARTIFACTS_VERSION=$(cat /opt/config/demo_artifacts_version.txt)
 INSTALL_SCRIPT_VERSION=$(cat /opt/config/install_script_version.txt)
 CLOUD_ENV=$(cat /opt/config/cloud_env.txt)
 MR_IP_ADDR=$(cat /opt/config/mr_ip_addr.txt)
+MR_IP_PORT=$(cat /opt/config/mr_ip_port.txt)
 
 # Convert Network CIDR to Netmask
 cdr2mask () {
@@ -81,6 +82,7 @@ update-rc.d v_dhcp.sh defaults
 cp kea-dhcp4.conf /etc/kea-dhcp4-server.conf
 mv kea-dhcp4.conf /etc/kea/kea-dhcp4.conf
 sed -i "s/DMAAP_IPADDR/"$MR_IP_ADDR"/g" kea-sdnc-notify.conf
+sed -i "s/DMAAP_IPPORT/"$MR_IP_PORT"/g" kea-sdnc-notify.conf
 mv kea-sdnc-notify.conf /etc/kea/kea-sdnc-notify.conf
 sleep 1
 
@@ -107,4 +109,4 @@ then
        reboot
 fi
 
-./v_dhcp_init.sh
\ No newline at end of file
+./v_dhcp_init.sh