X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=heat%2FvCPE%2Fvgmux%2Fbase_vcpe_vgmux.yaml;h=43bbb98656a247174c64945844666c0b633412dd;hb=d6c485daf4f093f23709c2e0e359854540c41af9;hp=4f12c64e1da4da9dc98967b115d425ad61d1b0f3;hpb=005b9f8c91c3e2f2a01b2d605a325968e42d5205;p=demo.git

diff --git a/heat/vCPE/vgmux/base_vcpe_vgmux.yaml b/heat/vCPE/vgmux/base_vcpe_vgmux.yaml
index 4f12c64e..43bbb986 100644
--- a/heat/vCPE/vgmux/base_vcpe_vgmux.yaml
+++ b/heat/vCPE/vgmux/base_vcpe_vgmux.yaml
@@ -69,6 +69,10 @@ parameters:
     type: string
     label: vGMUX private network CIDR
     description: The CIDR of the vGMUX private network
+  brgemu_bng_private_net_cidr:
+    type: string
+    label: vBRG vBNG private network CIDR
+    description: The CIDR of the vBRG-vBNG private network
   onap_private_net_id:
     type: string
     label: ONAP management network name or ID
@@ -105,6 +109,10 @@ parameters:
     type: string
     label: vCPE module ID
     description: The vCPE Module ID is provided by ONAP
+  bng_gmux_private_ip:
+    type: string
+    label: vBNG private IP address towards the vBNG-vGMUX private network
+    description: Private IP address that is assigned to the vBNG to communicate with the vGMUX
   dcae_collector_ip:
     type: string
     label: DCAE collector IP address
@@ -165,6 +173,10 @@ parameters:
     type: string
     label: Honeycomb Patch URL
     description: URL for Honeycomb patch for vG-MUX
+  libevel_patch_url:
+    type: string
+    label: libevel Patch URL
+    description: URL for libevel patch for vG-MUX
 
 #############
 #           #
@@ -228,12 +240,14 @@ resources:
       user_data:
         str_replace:
           params:
-            __bng_mux_net_ipaddr__ : { get_param: vgmux_private_ip_0 }
+            __mux_to_bng_net_ipaddr__ : { get_param: vgmux_private_ip_0 }
             __oam_ipaddr__ : { get_param: vgmux_private_ip_1 }
             __mux_gw_net_ipaddr__ : { get_param: vgmux_private_ip_2 }
+            __bng_to_mux_ipaddr__ : { get_param: bng_gmux_private_ip }
             __bng_mux_net_cidr__ : { get_param: bng_gmux_private_net_cidr }
             __oam_cidr__ : { get_param: onap_private_net_cidr }
             __mux_gw_net_cidr__ : { get_param: mux_gw_private_net_cidr }
+            __brg_bng_net_cidr__ : { get_param: brgemu_bng_private_net_cidr }
             __repo_url_blob__ : { get_param: repo_url_blob }
             __repo_url_artifacts__ : { get_param: repo_url_artifacts }
             __demo_artifacts_version__ : { get_param: demo_artifacts_version }
@@ -245,17 +259,20 @@ resources:
             __hc2vpp_source_repo_branch__ : { get_param: hc2vpp_source_repo_branch }
             __vpp_patch_url__ : { get_param: vpp_patch_url }
             __hc2vpp_patch_url__ : { get_param: hc2vpp_patch_url }
+            __libevel_patch_url__ : { get_param: libevel_patch_url }
           template: |
             #!/bin/bash
 
             # Create configuration files
             mkdir /opt/config
-            echo "__bng_mux_net_ipaddr__" > /opt/config/bng_mux_net_ipaddr.txt
+            echo "__mux_to_bng_net_ipaddr__" > /opt/config/mux_to_bng_net_ipaddr.txt
             echo "__oam_ipaddr__" > /opt/config/oam_ipaddr.txt
             echo "__mux_gw_net_ipaddr__" > /opt/config/mux_gw_net_ipaddr.txt
+            echo "__bng_to_mux_ipaddr__ " > /opt/config/bng_to_mux_net_ipaddr.txt
             echo "__bng_mux_net_cidr__" > /opt/config/bng_mux_net_cidr.txt
             echo "__oam_cidr__" > /opt/config/oam_cidr.txt
             echo "__mux_gw_net_cidr__" > /opt/config/mux_gw_net_cidr.txt
+            echo "__brg_bng_net_cidr__" > /opt/config/brg_bng_net_cidr.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
@@ -267,6 +284,7 @@ resources:
             echo "__hc2vpp_source_repo_url__" > /opt/config/hc2vpp_source_repo_url.txt
             echo "__hc2vpp_source_repo_branch__" > /opt/config/hc2vpp_source_repo_branch.txt
             echo "__hc2vpp_patch_url__" > /opt/config/hc2vpp_patch_url.txt
+            echo "__libevel_patch_url__" > /opt/config/libevel_patch_url.txt
 
             # Download and run install script
             curl -k __repo_url_blob__/org.onap.demo/vnfs/vcpe/__install_script_version__/v_gmux_install.sh -o /opt/v_gmux_install.sh