Updatd after network review 2017-08-03

Change-Id: I29e9610c18f3592fe933c247fd97afb6581ba974
Signed-off-by: Brian Freeman <bf1936@att.com>

3 files changed, 358 insertions, 0 deletions

diff --git a/heat/vCPE/vbng/MANIFEST.json b/heat/vCPE/vbng/MANIFEST.json
new file mode 100644
index 00000000..f4fbb305
--- /dev/null
+++ b/heat/vCPE/vbng/MANIFEST.json
@@ -0,0 +1,17 @@
+{
+    "name": "", 
+    "description": "", 
+    "data": [
+        {
+            "file": "base_vcpe_vbng_rackspace.yaml", 
+            "type": "HEAT", 
+            "isBase": "true", 
+            "data": [
+                {
+                    "file": "base_vcpe_vbng_rackspace.env", 
+                    "type": "HEAT_ENV"
+                }
+            ]
+        }
+    ]
+}
diff --git a/heat/vCPE/vbng/base_vcpe_vbng_rackspace.env b/heat/vCPE/vbng/base_vcpe_vbng_rackspace.env
new file mode 100644
index 00000000..2cf43259
--- /dev/null
+++ b/heat/vCPE/vbng/base_vcpe_vbng_rackspace.env
@@ -0,0 +1,26 @@
+ parameters:
+  vcpe_image_name: Ubuntu 14.04 LTS (Trusty Tahr) (PVHVM)
+  vcpe_flavor_name: 4 GB General Purpose v1
+  public_net_id: 00000000-0000-0000-0000-000000000000
+  brgemu_bng_private_net_id: zdfw1bngin01_private
+  bng_gmux_private_net_id: zdfw1bngmux01_private
+  onap_private_net_id: <PUT_YOUR_ONAP_NET_ID_HERE>
+  onap_private_subnet_id: <PUT_YOUR_ONAP_NET_ID_HERE>
+  brgemu_bng_private_net_cidr: 10.3.0.0/24
+  bng_gmux_private_net_cidr: 10.1.0.0/24
+  onap_private_net_cidr: 10.0.0.0/8
+  vbng_private_ip_0: 10.3.0.1
+  vbng_private_ip_1: 10.0.101.10
+  vbng_private_ip_2: 10.1.0.10
+  vbng_name_0: zdcpe1cpe01bng01
+  vnf_id: vCPE_Infrastructure_Metro_vBNG_demo_app
+  vf_module_id: vCPE_Intrastructure_Metro_vBNG
+  dcae_collector_ip: 10.0.4.102
+  dcae_collector_port: 8080
+  repo_url_blob: https://nexus.onap.org/content/sites/raw
+  repo_url_artifacts: https://nexus.onap.org/content/groups/staging
+  demo_artifacts_version: 1.1.0
+  install_script_version: 1.1.0-SNAPSHOT
+  key_name: vbng_key
+  pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN
+  cloud_env: rackspace
diff --git a/heat/vCPE/vbng/base_vcpe_vbng_rackspace.yaml b/heat/vCPE/vbng/base_vcpe_vbng_rackspace.yaml
new file mode 100644
index 00000000..efd2055d
--- /dev/null
+++ b/heat/vCPE/vbng/base_vcpe_vbng_rackspace.yaml
@@ -0,0 +1,315 @@
+##########################################################################
+#
+#==================LICENSE_START==========================================
+#
+#
+# Copyright 2017 AT&T Intellectual Property. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+#==================LICENSE_END============================================
+#
+# ECOMP is a trademark and service mark of AT&T Intellectual Property.
+#
+##########################################################################
+
+heat_template_version: 2013-05-23
+
+description: Heat template to deploy vCPE Infrastructue Metro elements (vBNG, vGMUX ) for ONAP
+
+##############
+#            #
+# PARAMETERS #
+#            #
+##############
+
+parameters:
+  vcpe_image_name:
+    type: string
+    label: Image name or ID
+    description: Image to be used for compute instance
+  vcpe_flavor_name:
+    type: string
+    label: Flavor
+    description: Type of instance (flavor) to be used
+  public_net_id:
+    type: string
+    label: Public network name or ID
+    description: Public network that enables remote connection to VNF
+  brgemu_bng_private_net_id:
+    type: string
+    label: vBNG IN private network name or ID
+    description: Private network that connects vBRG to vBNG
+  brgemu_bng_private_net_cidr:
+    type: string
+    label: vBNG IN private network CIDR
+    description: The CIDR of the input side of vBNG private network
+  bng_gmux_private_net_id:
+    type: string
+    label: vBNG vGMUX private network name or ID
+    description: Private network that connects vBNG to vGMUX
+  bng_gmux_private_net_cidr:
+    type: string
+    label: vGMUX private network CIDR
+    description: The CIDR of the input side of vGMUX private network
+  onap_private_net_id:
+    type: string
+    label: ONAP management network name or ID
+    description: Private network that connects ONAP components and the VNF
+  onap_private_subnet_id:
+    type: string
+    label: ONAP management sub-network name or ID
+    description: Private sub-network that connects ONAP components and the VNF
+  onap_private_net_cidr:
+    type: string
+    label: ONAP private network CIDR
+    description: The CIDR of the protected private network
+  vbng_private_ip_0:
+    type: string
+    label: vBNG IN private IP address
+    description: Private IP address that is assigned to the vBNG IN
+  vbng_private_ip_1:
+    type: string
+    label: vBNG private IP address towards the ONAP management network
+    description: Private IP address that is assigned to the vBNG to communicate with ONAP components
+  vbng_private_ip_2:
+    type: string
+    label: vBNG to vGMUX  private IP address
+    description: Private IP address that is assigned to the vBNG to vGMUX port
+  vbng_name_0:
+    type: string
+    label: vBNG name
+    description: Name of the vBNG
+  vnf_id:
+    type: string
+    label: VNF ID
+    description: The VNF ID is provided by ONAP
+  vf_module_id:
+    type: string
+    label: vCPE module ID
+    description: The vCPE Module ID is provided by ONAP
+  dcae_collector_ip:
+    type: string
+    label: DCAE collector IP address
+    description: IP address of the DCAE collector
+  dcae_collector_port:
+    type: string
+    label: DCAE collector port
+    description: Port of the DCAE collector
+  key_name:
+    type: string
+    label: Key pair name
+    description: Public/Private key pair name
+  pub_key:
+    type: string
+    label: Public key
+    description: Public key to be installed on the compute instance
+  repo_url_blob:
+    type: string
+    label: Repository URL
+    description: URL of the repository that hosts the demo packages
+  repo_url_artifacts:
+    type: string
+    label: Repository URL
+    description: URL of the repository that hosts the demo packages
+  install_script_version:
+    type: string
+    label: Installation script version number
+    description: Version number of the scripts that install the vFW demo app
+  demo_artifacts_version:
+    type: string
+    label: Artifacts version used in demo vnfs
+    description: Artifacts (jar, tar.gz) version used in demo vnfs
+  cloud_env:
+    type: string
+    label: Cloud environment
+    description: Cloud environment (e.g., openstack, rackspace)
+
+#############
+#           #
+# RESOURCES #
+#           #
+#############
+
+resources:
+
+  random-str:
+    type: OS::Heat::RandomString
+    properties:
+      length: 4
+
+  my_keypair:
+    type: OS::Nova::KeyPair
+    properties:
+      name:
+        str_replace:
+          template: base_rand
+          params:
+            base: { get_param: key_name }
+            rand: { get_resource: random-str }
+      public_key: { get_param: pub_key }
+      save_private_key: false
+
+  brgemu_bng_private_network:
+    type: OS::Neutron::Net
+    properties:
+      name: { get_param: brgemu_bng_private_net_id }
+  brgemu_bng_in_private_subnet:
+    type: OS::Neutron::Subnet
+    properties:
+      name: { get_param: brgemu_bng_private_net_id }
+      network_id: { get_resource: brgemu_bng_private_network }
+      cidr: { get_param: brgemu_bng_private_net_cidr }
+  bng_gmux_private_network:
+    type: OS::Neutron::Net
+    properties:
+      name: { get_param: bng_gmux_private_net_id }
+  bng_gmux_private_subnet:
+    type: OS::Neutron::Subnet
+    properties:
+      name: { get_param: bng_gmux_private_net_id }
+      network_id: { get_resource: bng_gmux_private_network }
+      cidr: { get_param: bng_gmux_private_net_cidr }
+
+
+  # Virtual BNG Instantiation
+  vbng_private_0_port:
+    type: OS::Neutron::Port
+    properties:
+      network: { get_resource: brgemu_bng_private_network }
+      fixed_ips: [{"subnet": { get_resource: brgemu_bng_private_subnet}, "ip_address": { get_param: vbng_private_ip_0 }}]
+
+  vbng_private_1_port:
+    type: OS::Neutron::Port
+    properties:
+      network: { get_param: onap_private_net_id }
+      fixed_ips: [{"subnet": { get_param: onap_private_subnet_id }, "ip_address": { get_param: vbng_private_ip_1 }}]
+
+  vbng_private_2_port:
+    type: OS::Neutron::Port
+    properties:
+      network: { get_resource: bng_gmux_private_network }
+      fixed_ips: [{"subnet": { get_resource: bng_gmux_private_subnet}, "ip_address": { get_param: vbng_private_ip_2 }}]
+
+  vbng_0:
+    type: OS::Nova::Server
+    properties:
+      image: { get_param: vcpe_image_name }
+      flavor: { get_param: vcpe_flavor_name }
+      name: { get_param: vbng_name_0 }
+      key_name: { get_resource: my_keypair }
+      networks:
+        - network: { get_param: public_net_id }
+        - port: { get_resource: vbng_private_0_port }
+        - port: { get_resource: vbng_private_1_port }
+        - port: { get_resource: vbng_private_2_port }
+      metadata: {vnf_id: { get_param: vnf_id }, vf_module_id: { get_param: vf_module_id }}
+      user_data_format: RAW
+      user_data:
+        str_replace:
+          params:
+            __dcae_collector_ip__: { get_param: dcae_collector_ip }
+            __dcae_collector_port__: { get_param: dcae_collector_port }
+            __local_private_ipaddr__: { get_param: vbng_private_ip_1 }
+            __repo_url_blob__ : { get_param: repo_url_blob }
+            __repo_url_artifacts__ : { get_param: repo_url_artifacts }
+            __demo_artifacts_version__ : { get_param: demo_artifacts_version }
+            __install_script_version__ : { get_param: install_script_version }
+            __cloud_env__ : { get_param: cloud_env }
+          template: |
+            #!/bin/bash
+
+            # Create configuration files
+            mkdir /opt/config
+            echo "__dcae_collector_ip__" > /opt/config/dcae_collector_ip.txt
+            echo "__dcae_collector_port__" > /opt/config/dcae_collector_port.txt
+            echo "__local_private_ipaddr__" > /opt/config/local_private_ipaddr.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
+            echo "__install_script_version__" > /opt/config/install_script_version.txt
+            echo "__cloud_env__" > /opt/config/cloud_env.txt
+
+            # Download and run install script
+            curl -k __repo_url_blob__/org.onap.demo/vnfs/vbng/__install_script_version__/v_bng_install.sh -o /opt/v_bng_install.sh
+            cd /opt
+            chmod +x v_bng_install.sh
+            ./v_bng_install.sh
+
+
+  # Virtual GMUX Instantiation
+  vgmux_private_0_port:
+    type: OS::Neutron::Port
+    properties:
+      network: { get_resource: vbng_vgmux_private_network }
+      fixed_ips: [{"subnet": { get_resource: vbng_vgmux_private_subnet}, "ip_address": { get_param: vgmux_private_ip_0 }}]
+
+  vgmux_private_1_port:
+    type: OS::Neutron::Port
+    properties:
+      network: { get_param: onap_private_net_id }
+      fixed_ips: [{"subnet": { get_param: onap_private_subnet_id }, "ip_address": { get_param: vgmux_private_ip_1 }}]
+
+  vgmux_private_2_port:
+    type: OS::Neutron::Port
+    properties:
+      network: { get_resource: vgmux_private_network }
+      fixed_ips: [{"subnet": {  get_resource: vgmux_private_subnet}, "ip_address": { get_param: vgmux_private_ip_2 }}]
+
+  vgmux_0:
+    type: OS::Nova::Server
+    properties:
+      image: { get_param: vcpe_image_name }
+      flavor: { get_param: vcpe_flavor_name }
+      name: { get_param: vgmux_name_0 }
+      key_name: { get_resource: my_keypair }
+      networks:
+        - network: { get_param: public_net_id }
+        - port: { get_resource: vgmux_private_0_port }
+        - port: { get_resource: vgmux_private_1_port }
+        - port: { get_resource: vgmux_private_2_port }
+      metadata: {vnf_id: { get_param: vnf_id }, vf_module_id: { get_param: vf_module_id }}
+      user_data_format: RAW
+      user_data:
+        str_replace:
+          params:
+            __gmux_oam_int__ : { get_param: vgmux_private_ip_1 }
+            __gmux_private_ipaddr__: { get_param: vgmux_private_ip_2 }
+            __local_private_ipaddr__: { get_param: vgmux_private_ip_1 }
+            __repo_url_blob__ : { get_param: repo_url_blob }
+            __repo_url_artifacts__ : { get_param: repo_url_artifacts }
+            __demo_artifacts_version__ : { get_param: demo_artifacts_version }
+            __install_script_version__ : { get_param: install_script_version }
+            __cloud_env__ : { get_param: cloud_env }
+          template: |
+            #!/bin/bash
+
+            # Create configuration files
+            mkdir /opt/config
+            echo "__gmux_oam_int__" > /opt/config/gmux_oam_int.txt
+            echo "__gmux_private_ipaddr__" > /opt/config/gmux_private_ipaddr.txt
+            echo "__local_private_ipaddr__" > /opt/config/local_private_ipaddr.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
+            echo "__install_script_version__" > /opt/config/install_script_version.txt
+            echo "__cloud_env__" > /opt/config/cloud_env.txt
+
+            # Download and run install script
+            curl -k __repo_url_blob__/org.onap.demo/vnfs/vgmux/__install_script_version__/v_dns_install.sh -o /opt/v_dns_install.sh
+=======
+            curl -k __repo_url_blob__/org.openecomp.demo/vnfs/vbng/__install_script_version__/v_bng_install.sh -o /opt/v_bng_install.sh
+>>>>>>> 12724d7... Updatd after network review 2017-08-03:heat/vCPE/vbng/base_vcpe_vbng_rackspace.yaml
+            cd /opt
+            chmod +x v_bng_install.sh
+            ./v_bng_install.sh
+