Separate VF templates for vFW 09/69609/1
authorMarco Platania <platania@research.att.com>
Mon, 1 Oct 2018 18:30:43 +0000 (14:30 -0400)
committerMarco Platania <platania@research.att.com>
Mon, 1 Oct 2018 18:34:25 +0000 (14:34 -0400)
- Create a new set of Heat templates for the vFW:
  - One base template with the definition of common resources
  - Three add-on modules (VF modules) that describe vFW, vPacketGen, and vSink
  - Examples of env files in the examples directory

For Casablanca, this new template structure will be used for testing CDS capabilities.

Change-Id: Ic6c555074490d9d78f90cb347bc56a01a397ca06
Issue-ID: INT-659
Signed-off-by: Marco Platania <platania@research.att.com>
12 files changed:
heat/vFW_NextGen/examples/vfw.env [new file with mode: 0644]
heat/vFW_NextGen/examples/vpg.env [new file with mode: 0644]
heat/vFW_NextGen/examples/vsn.env [new file with mode: 0644]
heat/vFW_NextGen/templates/MANIFEST.json [new file with mode: 0644]
heat/vFW_NextGen/templates/base_template.env [new file with mode: 0644]
heat/vFW_NextGen/templates/base_template.yaml [new file with mode: 0644]
heat/vFW_NextGen/templates/vfw.env [new file with mode: 0644]
heat/vFW_NextGen/templates/vfw.yaml [new file with mode: 0644]
heat/vFW_NextGen/templates/vpg.env [new file with mode: 0644]
heat/vFW_NextGen/templates/vpg.yaml [new file with mode: 0644]
heat/vFW_NextGen/templates/vsn.env [new file with mode: 0644]
heat/vFW_NextGen/templates/vsn.yaml [new file with mode: 0644]

diff --git a/heat/vFW_NextGen/examples/vfw.env b/heat/vFW_NextGen/examples/vfw.env
new file mode 100644 (file)
index 0000000..4744e87
--- /dev/null
@@ -0,0 +1,30 @@
+parameters:
+  image_name: ubuntu-14-04-cloud-amd64
+  flavor_name: m1.medium
+  public_net_id: public
+  unprotected_private_net_id: zdfw1fwl01_unprotected
+  unprotected_private_subnet_id: zdfw1fwl01_unprotected_sub
+  protected_private_net_id: zdfw1fwl01_protected
+  protected_private_subnet_id: zdfw1fwl01_protected_sub
+  onap_private_net_id: oam_onap_vnf_test
+  onap_private_subnet_id: oam_onap_vnf_test
+  unprotected_private_net_cidr: 192.168.10.0/24
+  protected_private_net_cidr: 192.168.20.0/24
+  onap_private_net_cidr: 10.0.0.0/16
+  private_ip_0: 192.168.10.100
+  private_ip_1: 192.168.20.100
+  private_ip_2: 10.0.100.1
+  vpg_private_ip_0: 192.168.10.200
+  name_0: zdfw1fwl01fwl01
+  vnf_id: vFirewall_demo_app
+  vf_module_id: vFirewall
+  dcae_collector_ip: 10.0.4.1
+  dcae_collector_port: 8081
+  demo_artifacts_version: 1.3.0-SNAPSHOT
+  install_script_version: 1.3.0-SNAPSHOT
+  key_name: vfw_key
+  cloud_env: openstack
+  sec_group: default
+  sdnc_model_name: vFW_spinup
+  sdnc_model_version: 1.0.0
+  sdnc_artifact_name: vFW_vNF_Artifact
diff --git a/heat/vFW_NextGen/examples/vpg.env b/heat/vFW_NextGen/examples/vpg.env
new file mode 100644 (file)
index 0000000..02a8896
--- /dev/null
@@ -0,0 +1,27 @@
+parameters:
+  image_name: ubuntu-14-04-cloud-amd64
+  flavor_name: m1.medium
+  public_net_id: public
+  unprotected_private_net_id: zdfw1fwl01_unprotected
+  unprotected_private_subnet_id: zdfw1fwl01_unprotected_sub
+  unprotected_private_net_cidr: 192.168.10.0/24
+  onap_private_net_id: oam_onap_vnf_test
+  onap_private_subnet_id: oam_onap_vnf_test
+  onap_private_net_cidr: 10.0.0.0/16
+  protected_private_net_cidr: 192.168.20.0/24
+  vfw_private_ip_0: 192.168.10.100
+  private_ip_0: 192.168.10.200
+  private_ip_1: 10.0.100.2
+  vsn_private_ip_0: 192.168.20.250
+  name_0: zdfw1fwl01pgn01
+  vnf_id: vPacketGen_demo_app
+  vf_module_id: vTrafficPNG
+  demo_artifacts_version: 1.3.0-SNAPSHOT
+  install_script_version: 1.3.0-SNAPSHOT
+  key_name: vpg_key
+  pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN
+  cloud_env: openstack
+  sec_group: default
+  sdnc_model_name: vFW_spinup
+  sdnc_model_version: 1.0.0
+  sdnc_artifact_name: vFW_vNF_Artifact
\ No newline at end of file
diff --git a/heat/vFW_NextGen/examples/vsn.env b/heat/vFW_NextGen/examples/vsn.env
new file mode 100644 (file)
index 0000000..20c5021
--- /dev/null
@@ -0,0 +1,26 @@
+parameters:
+  image_name: ubuntu-14-04-cloud-amd64
+  flavor_name: m1.medium
+  public_net_id: public
+  unprotected_private_net_cidr: 192.168.10.0/24
+  protected_private_net_id: zdfw1fwl01_protected
+  protected_private_subnet_id: zdfw1fwl01_protected_sub
+  protected_private_net_cidr: 192.168.20.0/24
+  onap_private_net_id: oam_onap_vnf_test
+  onap_private_subnet_id: oam_onap_vnf_test
+  onap_private_net_cidr: 10.0.0.0/16
+  vfw_private_ip_1: 192.168.20.100
+  private_ip_0: 192.168.20.250
+  private_ip_1: 10.0.100.3
+  name_0: zdfw1fwl01snk01
+  vnf_id: vSink_demo_app
+  vf_module_id: vFirewallCL
+  demo_artifacts_version: 1.3.0-SNAPSHOT
+  install_script_version: 1.3.0-SNAPSHOT
+  key_name: vsn_key
+  pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN
+  cloud_env: openstack
+  sec_group: default
+  sdnc_model_name: vFW_spinup
+  sdnc_model_version: 1.0.0
+  sdnc_artifact_name: vFW_vNF_Artifact
\ No newline at end of file
diff --git a/heat/vFW_NextGen/templates/MANIFEST.json b/heat/vFW_NextGen/templates/MANIFEST.json
new file mode 100644 (file)
index 0000000..3e67748
--- /dev/null
@@ -0,0 +1,50 @@
+{
+    "name": "virtualFirewall",
+    "description": "",
+    "data": [
+        {
+            "file": "base_template.yaml",
+            "type": "HEAT",
+            "isBase": "true",
+            "data": [
+                {
+                    "file": "base_template.env",
+                    "type": "HEAT_ENV"
+                }
+            ]
+        },
+        {
+            "file": "vfw.yaml",
+            "type": "HEAT",
+            "isBase": "false",
+            "data": [
+                {
+                    "file": "vfw.env",
+                    "type": "HEAT_ENV"
+                }
+            ]
+        },
+        {
+            "file": "vpg.yaml",
+            "type": "HEAT",
+            "isBase": "false",
+            "data": [
+                {
+                    "file": "vpg.env",
+                    "type": "HEAT_ENV"
+                }
+            ]
+        },
+        {
+            "file": "vsn.yaml",
+            "type": "HEAT",
+            "isBase": "false",
+            "data": [
+                {
+                    "file": "vsn.env",
+                    "type": "HEAT_ENV"
+                }
+            ]
+        }
+    ]
+}
diff --git a/heat/vFW_NextGen/templates/base_template.env b/heat/vFW_NextGen/templates/base_template.env
new file mode 100644 (file)
index 0000000..960c1b2
--- /dev/null
@@ -0,0 +1,9 @@
+parameters:
+  unprotected_private_net_id: zdfw1fwl01_unprotected
+  unprotected_private_subnet_id: zdfw1fwl01_unprotected_sub
+  unprotected_private_net_cidr: 192.168.10.0/24
+  protected_private_net_id: zdfw1fwl01_protected
+  protected_private_subnet_id: zdfw1fwl01_protected_sub
+  protected_private_net_cidr: 192.168.20.0/24
+  key_name: vfw_key
+  pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN
\ No newline at end of file
diff --git a/heat/vFW_NextGen/templates/base_template.yaml b/heat/vFW_NextGen/templates/base_template.yaml
new file mode 100644 (file)
index 0000000..1804fdd
--- /dev/null
@@ -0,0 +1,116 @@
+##########################################################################
+#
+#==================LICENSE_START==========================================
+#
+#
+# Copyright (c) 2018 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 that deploys a private network for ONAP VNFs
+
+##############
+#            #
+# PARAMETERS #
+#            #
+##############
+
+parameters:
+  unprotected_private_net_id:
+    type: string
+    label: Unprotected private network name or ID
+    description: Private network that connects vPacketGenerator with vFirewall
+  unprotected_private_subnet_id:
+    type: string
+    label: Unprotected private subnetwork name or ID
+    description: Private subnetwork of the protected network
+  unprotected_private_net_cidr:
+    type: string
+    label: Unprotected private network CIDR
+    description: The CIDR of the unprotected private network
+  protected_private_net_id:
+    type: string
+    label: Protected private network name or ID
+    description: Private network that connects vFirewall with vSink
+  protected_private_subnet_id:
+    type: string
+    label: Protected private subnetwork name or ID
+    description: Private subnetwork of the unprotected network
+  protected_private_net_cidr:
+    type: string
+    label: Protected private network CIDR
+    description: The CIDR of the protected private network
+  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
+
+
+#############
+#           #
+# 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
+
+  unprotected_private_network:
+    type: OS::Neutron::Net
+    properties:
+      name: { get_param: unprotected_private_net_id }
+
+  unprotected_private_subnet:
+    type: OS::Neutron::Subnet
+    properties:
+      name: { get_param: unprotected_private_subnet_id }
+      network_id: { get_resource: unprotected_private_network }
+      cidr: { get_param: unprotected_private_net_cidr }
+
+  protected_private_network:
+    type: OS::Neutron::Net
+    properties:
+      name: { get_param: protected_private_net_id }
+
+  protected_private_subnet:
+    type: OS::Neutron::Subnet
+    properties:
+      name: { get_param: protected_private_subnet_id }
+      network_id: { get_resource: protected_private_network }
+      cidr: { get_param: protected_private_net_cidr }
\ No newline at end of file
diff --git a/heat/vFW_NextGen/templates/vfw.env b/heat/vFW_NextGen/templates/vfw.env
new file mode 100644 (file)
index 0000000..fc6deb8
--- /dev/null
@@ -0,0 +1,30 @@
+parameters:
+  image_name: PUT THE VM IMAGE NAME HERE (UBUNTU 1404)
+  flavor_name: PUT THE VM FLAVOR NAME HERE (m1.medium suggested)
+  public_net_id: PUT THE PUBLIC NETWORK ID HERE
+  unprotected_private_net_id: zdfw1fwl01_unprotected
+  unprotected_private_subnet_id: zdfw1fwl01_unprotected_sub
+  unprotected_private_net_cidr: 192.168.10.0/24
+  protected_private_net_id: zdfw1fwl01_protected
+  protected_private_subnet_id: zdfw1fwl01_protected_sub
+  protected_private_net_cidr: 192.168.20.0/24
+  onap_private_net_id: PUT THE ONAP PRIVATE NETWORK NAME HERE
+  onap_private_subnet_id: PUT THE ONAP PRIVATE NETWORK NAME HERE
+  onap_private_net_cidr: 10.0.0.0/16
+  vfw_private_ip_0: 192.168.10.100
+  vfw_private_ip_1: 192.168.20.100
+  vfw_private_ip_2: 10.0.100.1
+  vpg_private_ip_0: 192.168.10.200
+  vfw_name_0: zdfw1fwl01fwl01
+  vnf_id: vFirewall_demo_app
+  vf_module_id: vFirewallCL
+  dcae_collector_ip: 10.0.4.1
+  dcae_collector_port: 8081
+  demo_artifacts_version: 1.3.0-SNAPSHOT
+  install_script_version: 1.3.0-SNAPSHOT
+  key_name: vfw_key
+  cloud_env: PUT openstack OR rackspace HERE
+  sec_group: PUT THE ONAP SECURITY GROUP HERE
+  sdnc_model_name: vFW_spinup
+  sdnc_model_version: 1.0.0
+  sdnc_artifact_name: vFW_vNF_Artifact
diff --git a/heat/vFW_NextGen/templates/vfw.yaml b/heat/vFW_NextGen/templates/vfw.yaml
new file mode 100644 (file)
index 0000000..61871df
--- /dev/null
@@ -0,0 +1,243 @@
+##########################################################################
+#
+#==================LICENSE_START==========================================
+#
+#
+# Copyright (c) 2018 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 that deploys vFirewall for ONAP
+
+##############
+#            #
+# PARAMETERS #
+#            #
+##############
+
+parameters:
+  image_name:
+    type: string
+    label: Image name or ID
+    description: Image to be used for compute instance
+  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
+  unprotected_private_net_id:
+    type: string
+    label: Unprotected private network name or ID
+    description: Private network that connects vPacketGenerator with vFirewall
+  unprotected_private_subnet_id:
+    type: string
+    label: Unprotected private subnetwork name or ID
+    description: Private subnetwork of the protected network
+  unprotected_private_net_cidr:
+    type: string
+    label: Unprotected private network CIDR
+    description: The CIDR of the unprotected private network
+  protected_private_net_id:
+    type: string
+    label: Protected private network name or ID
+    description: Private network that connects vFirewall with vSink
+  protected_private_subnet_id:
+    type: string
+    label: Protected private subnetwork name or ID
+    description: Private subnetwork of the unprotected network
+  protected_private_net_cidr:
+    type: string
+    label: Protected private network CIDR
+    description: The CIDR of the protected 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
+  vfw_private_ip_0:
+    type: string
+    label: vFirewall private IP address towards the unprotected network
+    description: Private IP address that is assigned to the vFirewall to communicate with the vPacketGenerator
+  vfw_private_ip_1:
+    type: string
+    label: vFirewall private IP address towards the protected network
+    description: Private IP address that is assigned to the vFirewall to communicate with the vSink
+  vfw_private_ip_2:
+    type: string
+    label: vFirewall private IP address towards the ONAP management network
+    description: Private IP address that is assigned to the vFirewall to communicate with ONAP components
+  vpg_private_ip_0:
+    type: string
+    label: vPacketGenerator private IP address towards the unprotected network
+    description: Private IP address that is assigned to the vPacketGenerator to communicate with the vFirewall
+  vfw_name_0:
+    type: string
+    label: vFirewall name
+    description: Name of the vFirewall
+  vnf_id:
+    type: string
+    label: VNF ID
+    description: The VNF ID is provided by ONAP
+  vf_module_id:
+    type: string
+    label: VF Module ID
+    description: The VF 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
+  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
+  nexus_artifact_repo:
+    type: string
+    description: Root URL for the Nexus repository for Maven artifacts.
+    default: "https://nexus.onap.org"
+  cloud_env:
+    type: string
+    label: Cloud environment
+    description: Cloud environment (e.g., openstack, rackspace)
+  sec_group:
+    type: string
+    description: ONAP Security Group
+  sdnc_model_name:
+    type: string
+    description: SDNC Model Name metatada
+  sdnc_model_version:
+    type: string
+    description: SDNC Model Version metatada
+  sdnc_artifact_name:
+    type: string
+    description: SDNC Artifact Name metatada
+
+
+#############
+#           #
+# RESOURCES #
+#           #
+#############
+
+resources:
+
+  # Virtual Firewall instantiation
+  vfw_private_0_port:
+    type: OS::Neutron::Port
+    properties:
+      network: { get_param: unprotected_private_net_id }
+      fixed_ips: [{"subnet": { get_param: unprotected_private_subnet_id }, "ip_address": { get_param: vfw_private_ip_0 }}]
+      security_groups:
+      - { get_param: sec_group }
+
+  vfw_private_1_port:
+    type: OS::Neutron::Port
+    properties:
+      allowed_address_pairs: [{ "ip_address": { get_param: vpg_private_ip_0 }}]
+      network: { get_param: protected_private_net_id }
+      fixed_ips: [{"subnet": { get_param: protected_private_subnet_id }, "ip_address": { get_param: vfw_private_ip_1 }}]
+      security_groups:
+      - { get_param: sec_group }
+
+  vfw_private_2_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: vfw_private_ip_2 }}]
+      security_groups:
+      - { get_param: sec_group }
+
+  vfw_0:
+    type: OS::Nova::Server
+    properties:
+      image: { get_param: image_name }
+      flavor: { get_param: flavor_name }
+      name: { get_param: vfw_name_0 }
+      key_name: { get_param: key_name }
+      networks:
+        - network: { get_param: public_net_id }
+        - port: { get_resource: vfw_private_0_port }
+        - port: { get_resource: vfw_private_1_port }
+        - port: { get_resource: vfw_private_2_port }
+      metadata: {vnf_id: { get_param: vnf_id }, vf_module_id: { get_param: vf_module_id }, sdnc_model_name: { get_param: sdnc_model_name }, sdnc_model_version: { get_param: sdnc_model_version }, sdnc_artifact_name: { get_param: sdnc_artifact_name }}
+      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 }
+            __demo_artifacts_version__ : { get_param: demo_artifacts_version }
+            __install_script_version__ : { get_param: install_script_version }
+            __vfw_private_ip_0__ : { get_param: vfw_private_ip_0 }
+            __vfw_private_ip_1__ : { get_param: vfw_private_ip_1 }
+            __vfw_private_ip_2__ : { get_param: vfw_private_ip_2 }
+            __unprotected_private_net_cidr__ : { get_param: unprotected_private_net_cidr }
+            __protected_private_net_cidr__ : { get_param: protected_private_net_cidr }
+            __onap_private_net_cidr__ : { get_param: onap_private_net_cidr }
+            __cloud_env__ : { get_param: cloud_env }
+            __nexus_artifact_repo__: { get_param: nexus_artifact_repo }
+          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 "__demo_artifacts_version__" > /opt/config/demo_artifacts_version.txt
+            echo "__install_script_version__" > /opt/config/install_script_version.txt
+            echo "__vfw_private_ip_0__" > /opt/config/vfw_private_ip_0.txt
+            echo "__vfw_private_ip_1__" > /opt/config/vfw_private_ip_1.txt
+            echo "__vfw_private_ip_2__" > /opt/config/vfw_private_ip_2.txt
+            echo "__unprotected_private_net_cidr__" > /opt/config/unprotected_private_net_cidr.txt
+            echo "__protected_private_net_cidr__" > /opt/config/protected_private_net_cidr.txt
+            echo "__onap_private_net_cidr__" > /opt/config/onap_private_net_cidr.txt
+            echo "__cloud_env__" > /opt/config/cloud_env.txt
+            echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt
+
+            # Download and run install script
+            apt-get update
+            apt-get -y install unzip
+            if [[ "__install_script_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
+            curl -k -L "__nexus_artifact_repo__/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo.vnf.vfw&a=vfw-scripts&e=zip&v=__install_script_version__" -o /opt/vfw-scripts-__install_script_version__.zip
+            unzip -j /opt/vfw-scripts-__install_script_version__.zip -d /opt v_firewall_install.sh
+            cd /opt
+            chmod +x v_firewall_install.sh
+            ./v_firewall_install.sh
diff --git a/heat/vFW_NextGen/templates/vpg.env b/heat/vFW_NextGen/templates/vpg.env
new file mode 100644 (file)
index 0000000..b6592dc
--- /dev/null
@@ -0,0 +1,26 @@
+parameters:
+  image_name: PUT THE VM IMAGE NAME HERE (UBUNTU 1404)
+  flavor_name: PUT THE VM FLAVOR NAME HERE (m1.medium suggested)
+  public_net_id: PUT THE PUBLIC NETWORK ID HERE
+  unprotected_private_net_id: zdfw1fwl01_unprotected
+  unprotected_private_subnet_id: zdfw1fwl01_unprotected_sub
+  unprotected_private_net_cidr: 192.168.10.0/24
+  onap_private_net_id: PUT THE ONAP PRIVATE NETWORK NAME HERE
+  onap_private_subnet_id: PUT THE ONAP PRIVATE NETWORK NAME HERE
+  onap_private_net_cidr: 10.0.0.0/16
+  protected_private_net_cidr: 192.168.20.0/24
+  vfw_private_ip_0: 192.168.10.100
+  vpg_private_ip_0: 192.168.10.200
+  vpg_private_ip_1: 10.0.100.2
+  vsn_private_ip_0: 192.168.20.250
+  vpg_name_0: zdfw1fwl01pgn01
+  vnf_id: vPacketGen_demo_app
+  vf_module_id: vTrafficPNG
+  demo_artifacts_version: 1.3.0-SNAPSHOT
+  install_script_version: 1.3.0-SNAPSHOT
+  key_name: vfw_key
+  cloud_env: PUT openstack OR rackspace HERE
+  sec_group: PUT THE ONAP SECURITY GROUP HERE
+  sdnc_model_name: vFW_spinup
+  sdnc_model_version: 1.0.0
+  sdnc_artifact_name: vFW_vNF_Artifact
\ No newline at end of file
diff --git a/heat/vFW_NextGen/templates/vpg.yaml b/heat/vFW_NextGen/templates/vpg.yaml
new file mode 100644 (file)
index 0000000..b6ef534
--- /dev/null
@@ -0,0 +1,215 @@
+##########################################################################
+#
+#==================LICENSE_START==========================================
+#
+#
+# Copyright (c) 2018 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 that deploys the vFirewall Traffic Generator demo app for ONAP
+
+##############
+#            #
+# PARAMETERS #
+#            #
+##############
+
+parameters:
+  image_name:
+    type: string
+    label: Image name or ID
+    description: Image to be used for compute instance
+  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
+  unprotected_private_net_id:
+    type: string
+    label: Unprotected private network name or ID
+    description: Private network that connects vPacketGenerator with vFirewall
+  unprotected_private_subnet_id:
+    type: string
+    label: Unprotected private sub-network name or ID
+    description: Private subnetwork for the unprotected network
+  unprotected_private_net_cidr:
+    type: string
+    label: Unprotected private network CIDR
+    description: The CIDR of the unprotected private network
+  protected_private_net_cidr:
+    type: string
+    label: Protected private network CIDR
+    description: The CIDR of the protected 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
+  vfw_private_ip_0:
+    type: string
+    label: vFirewall private IP address towards the unprotected network
+    description: Private IP address that is assigned to the vFirewall to communicate with the vPacketGenerator
+  vsn_private_ip_0:
+    type: string
+    label: vSink private IP address towards the protected network
+    description: Private IP address that is assigned to the vSink to communicate with the vFirewall
+  vpg_private_ip_0:
+    type: string
+    label: vPacketGenerator private IP address towards the unprotected network
+    description: Private IP address that is assigned to the vPacketGenerator to communicate with the vFirewall
+  vpg_private_ip_1:
+    type: string
+    label: vPacketGenerator private IP address towards the ONAP management network
+    description: Private IP address that is assigned to the vPacketGenerator to communicate with ONAP components
+  vpg_name_0:
+    type: string
+    label: vPacketGenerator name
+    description: Name of the vPacketGenerator
+  vnf_id:
+    type: string
+    label: VNF ID
+    description: The VNF ID is provided by ONAP
+  vf_module_id:
+    type: string
+    label: VF Module ID
+    description: The VF Module ID is provided by ONAP
+  key_name:
+    type: string
+    label: Key pair name
+    description: Public/Private key pair name
+  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
+  nexus_artifact_repo:
+    type: string
+    description: Root URL for the Nexus repository for Maven artifacts.
+    default: "https://nexus.onap.org"
+  cloud_env:
+    type: string
+    label: Cloud environment
+    description: Cloud environment (e.g., openstack, rackspace)
+  sec_group:
+    type: string
+    description: ONAP Security Group
+  sdnc_model_name:
+    type: string
+    description: SDNC Model Name metatada
+  sdnc_model_version:
+    type: string
+    description: SDNC Model Version metatada
+  sdnc_artifact_name:
+    type: string
+    description: SDNC Artifact Name metatada
+
+
+#############
+#           #
+# RESOURCES #
+#           #
+#############
+
+resources:
+
+  # Virtual Packet Generator instantiation
+  vpg_private_0_port:
+    type: OS::Neutron::Port
+    properties:
+      network: { get_param: unprotected_private_net_id }
+      fixed_ips: [{"subnet": { get_param: unprotected_private_subnet_id }, "ip_address": { get_param: vpg_private_ip_0 }}]
+      security_groups:
+      - { get_param: sec_group }
+
+  vpg_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: vpg_private_ip_1 }}]
+      security_groups:
+      - { get_param: sec_group }
+
+  vpg_0:
+    type: OS::Nova::Server
+    properties:
+      image: { get_param: image_name }
+      flavor: { get_param: flavor_name }
+      name: { get_param: vpg_name_0 }
+      key_name: { get_param: key_name }
+      networks:
+        - network: { get_param: public_net_id }
+        - port: { get_resource: vpg_private_0_port }
+        - port: { get_resource: vpg_private_1_port }
+      metadata: {vnf_id: { get_param: vnf_id }, vf_module_id: { get_param: vf_module_id }, sdnc_model_name: { get_param: sdnc_model_name }, sdnc_model_version: { get_param: sdnc_model_version }, sdnc_artifact_name: { get_param: sdnc_artifact_name }}
+      user_data_format: RAW
+      user_data:
+        str_replace:
+          params:
+            __fw_ipaddr__: { get_param: vfw_private_ip_0 }
+            __protected_net_cidr__: { get_param: protected_private_net_cidr }
+            __sink_ipaddr__: { get_param: vsn_private_ip_0 }
+            __demo_artifacts_version__ : { get_param: demo_artifacts_version }
+            __install_script_version__ : { get_param: install_script_version }
+            __vpg_private_ip_0__ : { get_param: vpg_private_ip_0 }
+            __vpg_private_ip_1__ : { get_param: vpg_private_ip_1 }
+            __unprotected_private_net_cidr__ : { get_param: unprotected_private_net_cidr }
+            __onap_private_net_cidr__ : { get_param: onap_private_net_cidr }
+            __cloud_env__ : { get_param: cloud_env }
+            __nexus_artifact_repo__: { get_param: nexus_artifact_repo }
+          template: |
+            #!/bin/bash
+
+            # Create configuration files
+            mkdir /opt/config
+            echo "__fw_ipaddr__" > /opt/config/fw_ipaddr.txt
+            echo "__protected_net_cidr__" > /opt/config/protected_net_cidr.txt
+            echo "__sink_ipaddr__" > /opt/config/sink_ipaddr.txt
+            echo "__demo_artifacts_version__" > /opt/config/demo_artifacts_version.txt
+            echo "__install_script_version__" > /opt/config/install_script_version.txt
+            echo "__vpg_private_ip_0__" > /opt/config/vpg_private_ip_0.txt
+            echo "__vpg_private_ip_1__" > /opt/config/vpg_private_ip_1.txt
+            echo "__unprotected_private_net_cidr__" > /opt/config/unprotected_private_net_cidr.txt
+            echo "__onap_private_net_cidr__" > /opt/config/onap_private_net_cidr.txt
+            echo "__cloud_env__" > /opt/config/cloud_env.txt
+            echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt
+
+            # Download and run install script
+            apt-get update
+            apt-get -y install unzip
+            if [[ "__install_script_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
+            curl -k -L "__nexus_artifact_repo__/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo.vnf.vfw&a=vfw-scripts&e=zip&v=__install_script_version__" -o /opt/vfw-scripts-__install_script_version__.zip
+            unzip -j /opt/vfw-scripts-__install_script_version__.zip -d /opt v_packetgen_install.sh
+            cd /opt
+            chmod +x v_packetgen_install.sh
+            ./v_packetgen_install.sh
diff --git a/heat/vFW_NextGen/templates/vsn.env b/heat/vFW_NextGen/templates/vsn.env
new file mode 100644 (file)
index 0000000..1109969
--- /dev/null
@@ -0,0 +1,25 @@
+parameters:
+  image_name: PUT THE VM IMAGE NAME HERE (UBUNTU 1404)
+  flavor_name: PUT THE VM FLAVOR NAME HERE (m1.medium suggested)
+  public_net_id: PUT THE PUBLIC NETWORK ID HERE
+  unprotected_private_net_cidr: 192.168.10.0/24
+  protected_private_net_id: zdfw1fwl01_protected
+  protected_private_subnet_id: zdfw1fwl01_protected_sub
+  protected_private_net_cidr: 192.168.20.0/24
+  onap_private_net_id: PUT THE ONAP PRIVATE NETWORK NAME HERE
+  onap_private_subnet_id: PUT THE ONAP PRIVATE NETWORK NAME HERE
+  onap_private_net_cidr: 10.0.0.0/16
+  vfw_private_ip_1: 192.168.20.100
+  vsn_private_ip_0: 192.168.20.250
+  vsn_private_ip_1: 10.0.100.3
+  vsn_name_0: zdfw1fwl01snk01
+  vnf_id: vSink_demo_app
+  vf_module_id: vFirewallCL
+  demo_artifacts_version: 1.3.0-SNAPSHOT
+  install_script_version: 1.3.0-SNAPSHOT
+  key_name: vfw_key
+  cloud_env: PUT openstack OR rackspace HERE
+  sec_group: PUT THE ONAP SECURITY GROUP HERE
+  sdnc_model_name: vFW_spinup
+  sdnc_model_version: 1.0.0
+  sdnc_artifact_name: vFW_vNF_Artifact
\ No newline at end of file
diff --git a/heat/vFW_NextGen/templates/vsn.yaml b/heat/vFW_NextGen/templates/vsn.yaml
new file mode 100644 (file)
index 0000000..88bf267
--- /dev/null
@@ -0,0 +1,207 @@
+##########################################################################
+#
+#==================LICENSE_START==========================================
+#
+#
+# Copyright (c) 2018 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 that deploys vSink for ONAP
+
+##############
+#            #
+# PARAMETERS #
+#            #
+##############
+
+parameters:
+  image_name:
+    type: string
+    label: Image name or ID
+    description: Image to be used for compute instance
+  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
+  unprotected_private_net_cidr:
+    type: string
+    label: Unprotected private network CIDR
+    description: The CIDR of the unprotected private network
+  protected_private_net_id:
+    type: string
+    label: Protected private network name or ID
+    description: Private network that connects vFirewall with vSink
+  protected_private_subnet_id:
+    type: string
+    label: Protected private subnetwork name or ID
+    description: Private subnetwork of the unprotected network
+  protected_private_net_cidr:
+    type: string
+    label: Protected private network CIDR
+    description: The CIDR of the protected 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
+  vfw_private_ip_1:
+    type: string
+    label: vFirewall private IP address towards the protected network
+    description: Private IP address that is assigned to the vFirewall to communicate with the vSink
+  vsn_private_ip_0:
+    type: string
+    label: vSink private IP address towards the protected network
+    description: Private IP address that is assigned to the vSink to communicate with the vFirewall
+  vsn_private_ip_1:
+    type: string
+    label: vSink private IP address towards the ONAP management network
+    description: Private IP address that is assigned to the vSink to communicate with ONAP components
+  vsn_name_0:
+    type: string
+    label: vSink name
+    description: Name of the vSink
+  vnf_id:
+    type: string
+    label: VNF ID
+    description: The VNF ID is provided by ONAP
+  vf_module_id:
+    type: string
+    label: VF Module ID
+    description: The VF Module ID is provided by ONAP
+  key_name:
+    type: string
+    label: Key pair name
+    description: Public/Private key pair name
+  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
+  nexus_artifact_repo:
+    type: string
+    description: Root URL for the Nexus repository for Maven artifacts.
+    default: "https://nexus.onap.org"
+  cloud_env:
+    type: string
+    label: Cloud environment
+    description: Cloud environment (e.g., openstack, rackspace)
+  sec_group:
+    type: string
+    description: ONAP Security Group
+  sdnc_model_name:
+    type: string
+    description: SDNC Model Name metatada
+  sdnc_model_version:
+    type: string
+    description: SDNC Model Version metatada
+  sdnc_artifact_name:
+    type: string
+    description: SDNC Artifact Name metatada
+
+
+#############
+#           #
+# RESOURCES #
+#           #
+#############
+
+resources:
+
+  # Virtual Sink instantiation
+  vsn_private_0_port:
+    type: OS::Neutron::Port
+    properties:
+      network: { get_param: protected_private_net_id }
+      fixed_ips: [{"subnet": { get_param: protected_private_subnet_id }, "ip_address": { get_param: vsn_private_ip_0 }}]
+      security_groups:
+      - { get_param: sec_group }
+
+  vsn_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: vsn_private_ip_1 }}]
+      security_groups:
+      - { get_param: sec_group }
+
+  vsn_0:
+    type: OS::Nova::Server
+    properties:
+      image: { get_param: image_name }
+      flavor: { get_param: flavor_name }
+      name: { get_param: vsn_name_0 }
+      key_name: { get_param: key_name }
+      networks:
+        - network: { get_param: public_net_id }
+        - port: { get_resource: vsn_private_0_port }
+        - port: { get_resource: vsn_private_1_port }
+      metadata: {vnf_id: { get_param: vnf_id }, vf_module_id: { get_param: vf_module_id }, sdnc_model_name: { get_param: sdnc_model_name }, sdnc_model_version: { get_param: sdnc_model_version }, sdnc_artifact_name: { get_param: sdnc_artifact_name }}
+      user_data_format: RAW
+      user_data:
+        str_replace:
+          params:
+            __protected_net_gw__: { get_param: vfw_private_ip_1 }
+            __unprotected_net__: { get_param: unprotected_private_net_cidr }
+            __install_script_version__ : { get_param: install_script_version }
+            __vsn_private_ip_0__ : { get_param: vsn_private_ip_0 }
+            __vsn_private_ip_1__ : { get_param: vsn_private_ip_1 }
+            __protected_private_net_cidr__ : { get_param: protected_private_net_cidr }
+            __onap_private_net_cidr__ : { get_param: onap_private_net_cidr }
+            __cloud_env__ : { get_param: cloud_env }
+            __nexus_artifact_repo__: { get_param: nexus_artifact_repo }
+          template: |
+            #!/bin/bash
+
+            # Create configuration files
+            mkdir /opt/config
+            echo "__protected_net_gw__" > /opt/config/protected_net_gw.txt
+            echo "__unprotected_net__" > /opt/config/unprotected_net.txt
+            echo "__install_script_version__" > /opt/config/install_script_version.txt
+            echo "__vsn_private_ip_0__" > /opt/config/vsn_private_ip_0.txt
+            echo "__vsn_private_ip_1__" > /opt/config/vsn_private_ip_1.txt
+            echo "__protected_private_net_cidr__" > /opt/config/protected_private_net_cidr.txt
+            echo "__onap_private_net_cidr__" > /opt/config/onap_private_net_cidr.txt
+            echo "__cloud_env__" > /opt/config/cloud_env.txt
+            echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt
+
+            # Download and run install script
+            apt-get update
+            apt-get -y install unzip
+            if [[ "__install_script_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
+            curl -k -L "__nexus_artifact_repo__/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo.vnf.vfw&a=vfw-scripts&e=zip&v=__install_script_version__" -o /opt/vfw-scripts-__install_script_version__.zip
+            unzip -j /opt/vfw-scripts-__install_script_version__.zip -d /opt v_sink_install.sh
+            cd /opt
+            chmod +x v_sink_install.sh
+            ./v_sink_install.sh