aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Freeman <bf1936@att.com>2020-05-21 14:54:06 +0000
committerBrian Freeman <bf1936@att.com>2020-05-21 15:29:20 +0000
commit2892dcf9b4d8f11e923d8f11699e0d7e776d31e9 (patch)
treeb47fd34edb1634228322b43a8841a127f4bef12f
parentbbabc30d68b8bf47763d6d8f7b99b95ee6f82900 (diff)
Fix lint and systemctl issues
removed vFWCL_DANOS since it was repalced with shorter VFWCLDN Issue-ID: INT-1566 Change-Id: I3d928795e903b584d4d6ca9f1bf631e692317ee8 Signed-off-by: Brian Freeman <bf1936@att.com>
-rw-r--r--heat/vFWCL_DANOS/vFWSNK/MANIFEST.json17
-rw-r--r--heat/vFWCL_DANOS/vFWSNK/base_vfw.env55
-rw-r--r--heat/vFWCL_DANOS/vFWSNK/base_vfw.yaml389
-rw-r--r--heat/vFWCL_DANOS/vPKG/MANIFEST.json17
-rw-r--r--heat/vFWCL_DANOS/vPKG/base_vpkg.env40
-rw-r--r--heat/vFWCL_DANOS/vPKG/base_vpkg.yaml233
-rw-r--r--preload_data/vFWCL_DANOS/preload_data.json35
-rw-r--r--service_mapping/vFWCL_DANOS/service_mapping.json42
-rw-r--r--vnfs/VESreporting_vFW5.0_DANOS/.gitignore2
-rw-r--r--vnfs/VESreporting_vFW5.0_DANOS/Makefile6
-rw-r--r--vnfs/VESreporting_vFW5.0_DANOS/debian/control4
-rwxr-xr-xvnfs/VESreporting_vFW5.0_DANOS/debian/vpp-measurement-reporter-danos.install2
-rw-r--r--vnfs/VESreporting_vFW5.0_DANOS/debian/vpp-measurement-reporter-danos.lintian-overrides2
-rw-r--r--vnfs/VESreporting_vFW5.0_DANOS/debian/vpp-measurement-reporter-danos.service2
14 files changed, 11 insertions, 835 deletions
diff --git a/heat/vFWCL_DANOS/vFWSNK/MANIFEST.json b/heat/vFWCL_DANOS/vFWSNK/MANIFEST.json
deleted file mode 100644
index 49383787..00000000
--- a/heat/vFWCL_DANOS/vFWSNK/MANIFEST.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
- "name": "",
- "description": "",
- "data": [
- {
- "file": "base_vfw.yaml",
- "type": "HEAT",
- "isBase": "true",
- "data": [
- {
- "file": "base_vfw.env",
- "type": "HEAT_ENV"
- }
- ]
- }
- ]
-}
diff --git a/heat/vFWCL_DANOS/vFWSNK/base_vfw.env b/heat/vFWCL_DANOS/vFWSNK/base_vfw.env
deleted file mode 100644
index cc40ce99..00000000
--- a/heat/vFWCL_DANOS/vFWSNK/base_vfw.env
+++ /dev/null
@@ -1,55 +0,0 @@
-parameters:
-
- # VM_TYPE: vfw
- vfw_image_name: PUT THE VM IMAGE NAME HERE (UBUNTU 1404)
- vfw_flavor_name: PUT THE VM FLAVOR NAME HERE (m1.medium suggested)
- vfw_int_unprotected_private_ip_0: 192.168.10.100
- vfw_int_protected_private_ip_0: 192.168.20.100
- vfw_onap_private_ip_0: 10.0.100.1
- # vpg_private_ip_0: 192.168.10.200
- # this is the private ip 0 for vpg
- vfw_int_protected_private_floating_ip: 192.168.10.200
- vfw_name_0: zdfw1fwl01fwl01
-
- # VM_TYPE: vsn
- vsn_image_name: PUT THE VM IMAGE NAME HERE (UBUNTU 1404)
- vsn_flavor_name: PUT THE VM FLAVOR NAME HERE (m1.medium suggested)
- vsn_int_protected_private_ip_0: 192.168.20.250
- vsn_onap_private_ip_0: 10.0.100.3
- vsn_name_0: zdfw1fwl01snk01
-
- # NETWORK_ROLE: public
- public_net_id: PUT THE PUBLIC NETWORK ID HERE
-
- # NETWORK_ROLE: unprotected_private
- int_unprotected_private_net_id: zdfw1fwl01_unprotected
- int_unprotected_private_subnet_id: zdfw1fwl01_unprotected_sub
- unprotected_private_net_cidr: 192.168.10.0/24
-
- # NETWORK_ROLE: protected_private
- int_protected_private_net_id: zdfw1fwl01_protected
- int_protected_private_subnet_id: zdfw1fwl01_protected_sub
- protected_private_net_cidr: 192.168.20.0/24
-
- # NETWORK_ROLE: onap_private
- 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
-
- # METADATA
- net_prefix: vFWSNK
- vnf_name: vFWSNK
- vnf_id: vFirewall_demo_app
- vf_module_id: vFirewallCL
-
- # APP/USER_DATA
- dcae_collector_ip: 10.0.4.1
- # 30417 is https node port to VES
- dcae_collector_port: 30417
- demo_artifacts_version: 1.6.0-SNAPSHOT
- install_script_version: 1.6.0-SNAPSHOT
- key_name: vfw_key
- pub_key: PUT YOUR KEY HERE
- cloud_env: PUT openstack OR rackspace HERE
- sec_group: PUT THE ONAP SECURITY GROUP HERE
- nexus_artifact_repo: https://nexus.onap.org
diff --git a/heat/vFWCL_DANOS/vFWSNK/base_vfw.yaml b/heat/vFWCL_DANOS/vFWSNK/base_vfw.yaml
deleted file mode 100644
index 686c863e..00000000
--- a/heat/vFWCL_DANOS/vFWSNK/base_vfw.yaml
+++ /dev/null
@@ -1,389 +0,0 @@
-##########################################################################
-#
-#==================LICENSE_START==========================================
-#
-#
-# Copyright (c) 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 that deploys vFirewall Closed Loop demo app (vFW and vSink) for ONAP
-
-##############
-# #
-# PARAMETERS #
-# #
-##############
-
-parameters:
- vfw_image_name:
- type: string
- label: Image name or ID
- description: Image to be used for compute instance
- vfw_flavor_name:
- type: string
- label: Flavor
- description: Type of instance (flavor) to be used
- vsn_image_name:
- type: string
- label: Image name or ID
- description: Image to be used for compute instance
- vsn_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
- int_unprotected_private_net_id:
- type: string
- label: Unprotected private network name or ID
- description: Private network that connects vPacketGenerator with vFirewall
- int_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
- int_protected_private_net_id:
- type: string
- label: Protected private network name or ID
- description: Private network that connects vFirewall with vSink
- int_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_int_unprotected_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_int_protected_private_ip_0:
- 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_onap_private_ip_0:
- 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
- vfw_int_protected_private_floating_ip:
- 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
- vsn_int_protected_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_onap_private_ip_0:
- 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
- vfw_name_0:
- type: string
- label: vFirewall name
- description: Name of the vFirewall
- vsn_name_0:
- type: string
- label: vSink name
- description: Name of the vSink
- vnf_name:
- type: string
- label: VNF NAME
- description: The VNF NAME is provided by ONAP
- net_prefix:
- type: string
- label: Network prefix
- description: Prefix for private network names - Workaround for Dublin
- vnf_id:
- type: string
- label: VNF ID
- description: The VNF ID is provided by ONAP
- vf_module_id:
- type: string
- label: vFirewall module ID
- description: The vFirewall 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
- 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.
- cloud_env:
- type: string
- label: Cloud environment
- description: Cloud environment (e.g., openstack, rackspace)
- sec_group:
- type: string
- description: ONAP Security Group
-
-#############
-# #
-# RESOURCES #
-# #
-#############
-
-resources:
- random-str:
- type: OS::Heat::RandomString
- properties:
- length: 4
-
- my_keypair:
- type: OS::Nova::KeyPair
- properties:
- name:
- str_replace:
- template: vnfname_base_rand
- params:
- base: { get_param: key_name }
- vnfname: { get_param: vnf_name }
- rand: { get_resource: random-str }
- public_key: { get_param: pub_key }
- save_private_key: false
-
- int_unprotected_private_network:
- type: OS::Neutron::Net
- properties:
- name:
- str_replace:
- template: vnfname_netid
- params:
- netid: { get_param: int_unprotected_private_net_id }
- vnfname: { get_param: net_prefix }
-
- int_unprotected_private_subnet:
- type: OS::Neutron::Subnet
- properties:
- name:
- str_replace:
- template: vnfname_subnetid
- params:
- subnetid: { get_param: int_unprotected_private_subnet_id }
- vnfname: { get_param: net_prefix }
- network: { get_resource: int_unprotected_private_network }
- cidr: { get_param: unprotected_private_net_cidr }
-
- int_protected_private_network:
- type: OS::Neutron::Net
- properties:
- name:
- str_replace:
- template: vnfname_netid
- params:
- netid: { get_param: int_protected_private_net_id }
- vnfname: { get_param: net_prefix }
-
- int_protected_private_subnet:
- type: OS::Neutron::Subnet
- properties:
- name:
- str_replace:
- template: vnfname_subnetid
- params:
- subnetid: { get_param: int_protected_private_subnet_id }
- vnfname: { get_param: net_prefix }
- network: { get_resource: int_protected_private_network }
- cidr: { get_param: protected_private_net_cidr }
-
- # DANOS installation as Virtual Firewall instantiation
- vfw_0_int_unprotected_private_port_0:
- type: OS::Neutron::Port
- properties:
- network: { get_resource: int_unprotected_private_network }
- fixed_ips: [{"subnet": { get_resource: int_unprotected_private_subnet }, "ip_address": { get_param: vfw_int_unprotected_private_ip_0 }}]
- security_groups:
- - { get_param: sec_group }
-
- vfw_0_int_protected_private_port_0:
- type: OS::Neutron::Port
- properties:
- allowed_address_pairs: [{ "ip_address": { get_param: vfw_int_protected_private_floating_ip }}]
- network: { get_resource: int_protected_private_network }
- fixed_ips: [{"subnet": { get_resource: int_protected_private_subnet }, "ip_address": { get_param: vfw_int_protected_private_ip_0 }}]
- security_groups:
- - { get_param: sec_group }
-
- vfw_0_onap_private_port_0:
- 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_onap_private_ip_0 }}]
- security_groups:
- - { get_param: sec_group }
-
- vfw_server_0:
- type: OS::Nova::Server
- properties:
- image: { get_param: vfw_image_name }
- flavor: { get_param: vfw_flavor_name }
- name: { get_param: vfw_name_0 }
- key_name: { get_resource: my_keypair }
- networks:
- - network: { get_param: public_net_id }
- - port: { get_resource: vfw_0_int_unprotected_private_port_0 }
- - port: { get_resource: vfw_0_int_protected_private_port_0 }
- - port: { get_resource: vfw_0_onap_private_port_0 }
- metadata:
- vnf_name: { get_param: vnf_name }
- 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 }
- __demo_artifacts_version__: { get_param: demo_artifacts_version }
- __install_script_version__: { get_param: install_script_version }
- __vfw_private_ip_0__: { get_param: vfw_int_unprotected_private_ip_0 }
- __vfw_private_ip_1__: { get_param: vfw_int_protected_private_ip_0 }
- __vfw_private_ip_2__: { get_param: vfw_onap_private_ip_0 }
- __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
-
-
- # Virtual Sink instantiation
- vsn_0_int_protected_private_port_0:
- type: OS::Neutron::Port
- properties:
- network: { get_resource: int_protected_private_network }
- fixed_ips: [{"subnet": { get_resource: int_protected_private_subnet }, "ip_address": { get_param: vsn_int_protected_private_ip_0 }}]
- security_groups:
- - { get_param: sec_group }
-
- vsn_0_onap_private_port_0:
- 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_onap_private_ip_0 }}]
- security_groups:
- - { get_param: sec_group }
-
- vsn_server_0:
- type: OS::Nova::Server
- properties:
- image: { get_param: vsn_image_name }
- flavor: { get_param: vsn_flavor_name }
- name: { get_param: vsn_name_0 }
- key_name: { get_resource: my_keypair }
- networks:
- - network: { get_param: public_net_id }
- - port: { get_resource: vsn_0_int_protected_private_port_0 }
- - port: { get_resource: vsn_0_onap_private_port_0 }
- metadata:
- vnf_name: { get_param: vnf_name }
- vnf_id: { get_param: vnf_id }
- vf_module_id: { get_param: vf_module_id }
- user_data_format: RAW
- user_data:
- str_replace:
- params:
- __protected_net_gw__: { get_param: vfw_int_protected_private_ip_0 }
- __unprotected_net__: { get_param: unprotected_private_net_cidr }
- __install_script_version__: { get_param: install_script_version }
- __vsn_private_ip_0__: { get_param: vsn_int_protected_private_ip_0 }
- __vsn_private_ip_1__: { get_param: vsn_onap_private_ip_0 }
- __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
diff --git a/heat/vFWCL_DANOS/vPKG/MANIFEST.json b/heat/vFWCL_DANOS/vPKG/MANIFEST.json
deleted file mode 100644
index 482b4294..00000000
--- a/heat/vFWCL_DANOS/vPKG/MANIFEST.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
- "name": "",
- "description": "",
- "data": [
- {
- "file": "base_vpkg.yaml",
- "type": "HEAT",
- "isBase": "true",
- "data": [
- {
- "file": "base_vpkg.env",
- "type": "HEAT_ENV"
- }
- ]
- }
- ]
-}
diff --git a/heat/vFWCL_DANOS/vPKG/base_vpkg.env b/heat/vFWCL_DANOS/vPKG/base_vpkg.env
deleted file mode 100644
index 32cb92ea..00000000
--- a/heat/vFWCL_DANOS/vPKG/base_vpkg.env
+++ /dev/null
@@ -1,40 +0,0 @@
-parameters:
-
- # VM_TYPE: vpg
- vpg_image_name: PUT THE VM IMAGE NAME HERE (UBUNTU 1404)
- vpg_flavor_name: PUT THE VM FLAVOR NAME HERE (m1.medium suggested)
- vpg_unprotected_private_ip_0: 192.168.10.200
- vpg_onap_private_ip_0: 10.0.100.2
- vpg_name_0: zdfw1fwl01pgn01
-
- # NETWORK_ROLE: public
- public_net_id: PUT THE PUBLIC NETWORK ID HERE
-
- # NETWORK_ROLE: unprotected_private
- unprotected_private_net_id: vFWSNK_zdfw1fwl01_unprotected
- unprotected_private_subnet_id: vFWSNK_zdfw1fwl01_unprotected_sub
- unprotected_private_net_cidr: 192.168.10.0/24
-
- # NETWORK_ROLE: onap_private
- 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
-
- # NETWORK_ROLE: protected_private
- protected_private_net_cidr: 192.168.20.0/24
-
- # METADATA
- vnf_name: vPGK
- vnf_id: vPNG_Firewall_demo_app
- vf_module_id: vTrafficPNG
-
- # APP/USER_DATA
- vfw_private_ip_0: 192.168.10.100
- vsn_private_ip_0: 192.168.20.250
- demo_artifacts_version: 1.6.0-SNAPSHOT
- install_script_version: 1.6.0-SNAPSHOT
- key_name: vfw_key
- pub_key: PUT YOUR PUBLIC KEY HERE
- cloud_env: PUT openstack OR rackspace HERE
- sec_group: PUT THE ONAP SECURITY GROUP HERE
- nexus_artifact_repo: https://nexus.onap.org \ No newline at end of file
diff --git a/heat/vFWCL_DANOS/vPKG/base_vpkg.yaml b/heat/vFWCL_DANOS/vPKG/base_vpkg.yaml
deleted file mode 100644
index 032001c1..00000000
--- a/heat/vFWCL_DANOS/vPKG/base_vpkg.yaml
+++ /dev/null
@@ -1,233 +0,0 @@
-##########################################################################
-#
-#==================LICENSE_START==========================================
-#
-#
-# Copyright (c) 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 that deploys the vFirewall Traffic Generator demo app for ONAP
-
-##############
-# #
-# PARAMETERS #
-# #
-##############
-
-parameters:
- vpg_image_name:
- type: string
- label: Image name or ID
- description: Image to be used for compute instance
- vpg_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_unprotected_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_onap_private_ip_0:
- 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_name:
- type: string
- label: VNF NAME
- description: The VNF NAME is provided by ONAP
- vnf_id:
- type: string
- label: VNF ID
- description: The VNF ID is provided by ONAP
- vf_module_id:
- type: string
- label: vPNG Traffic Generator module ID
- description: The vPNG Module ID is provided by ONAP
- 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
- 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.
- cloud_env:
- type: string
- label: Cloud environment
- description: Cloud environment (e.g., openstack, rackspace)
- sec_group:
- type: string
- description: ONAP Security Group
-
-#############
-# #
-# RESOURCES #
-# #
-#############
-
-resources:
- random-str:
- type: OS::Heat::RandomString
- properties:
- length: 4
-
- my_keypair:
- type: OS::Nova::KeyPair
- properties:
- name:
- str_replace:
- template: vnfname_base_rand
- params:
- vnfname: { get_param: vnf_name }
- base: { get_param: key_name }
- rand: { get_resource: random-str }
- public_key: { get_param: pub_key }
- save_private_key: false
-
-
- # Virtual Packet Generator instantiation
- vpg_0_unprotected_private_port_0:
- 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_unprotected_private_ip_0 }}]
- security_groups:
- - { get_param: sec_group }
-
- vpg_0_onap_private_port_0:
- 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_onap_private_ip_0 }}]
- security_groups:
- - { get_param: sec_group }
-
- vpg_server_0:
- type: OS::Nova::Server
- properties:
- image: { get_param: vpg_image_name }
- flavor: { get_param: vpg_flavor_name }
- name: { get_param: vpg_name_0 }
- key_name: { get_resource: my_keypair }
- networks:
- - network: { get_param: public_net_id }
- - port: { get_resource: vpg_0_unprotected_private_port_0 }
- - port: { get_resource: vpg_0_onap_private_port_0 }
- metadata:
- vnf_name: { get_param: vnf_name }
- vnf_id: { get_param: vnf_id }
- vf_module_id: { get_param: vf_module_id }
- 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_unprotected_private_ip_0 }
- __vpg_private_ip_1__: { get_param: vpg_onap_private_ip_0 }
- __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/preload_data/vFWCL_DANOS/preload_data.json b/preload_data/vFWCL_DANOS/preload_data.json
deleted file mode 100644
index 1a50b260..00000000
--- a/preload_data/vFWCL_DANOS/preload_data.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
- "vfwsnk_preload.template": {
- "int_unprotected_private_net_id": "vofwlsnk_unprotected${hostid}",
- "int_unprotected_private_subnet_id": "vofwlsnk_unprotected_sub${hostid}",
- "unprotected_private_net_cidr": "192.168.10.0/24",
- "int_protected_private_net_id": "vofwlsnk_protected${hostid}",
- "int_protected_private_subnet_id": "vofwlsnk_protected_sub${hostid}",
- "protected_private_net_cidr": "192.168.20.0/24",
- "vfw_int_unprotected_private_ip_0": "192.168.10.100",
- "vfw_int_protected_private_floating_ip": "192.168.10.200",
- "vfw_int_protected_private_ip_0": "192.168.20.100",
- "vfw_onap_private_ip_0": "${GLOBAL_INJECTED_OPENSTACK_OAM_NETWORK_CIDR_PREFIX}.${ecompnet}.101",
- "vsn_int_protected_private_ip_0": "192.168.20.250",
- "vsn_onap_private_ip_0": "${GLOBAL_INJECTED_OPENSTACK_OAM_NETWORK_CIDR_PREFIX}.${ecompnet}.102",
- "vfw_name_0": "vofwl01fwl${hostid}",
- "vsn_name_0": "vofwl01snk${hostid}",
- "vfw_image_name": "${GLOBAL_INJECTED_DANOS_VES_IMAGE}",
- "vfw_flavor_name": "${GLOBAL_INJECTED_DANOS_VES_FLAVOR}",
- "vsn_image_name": "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
- "vsn_flavor_name": "${GLOBAL_INJECTED_VM_FLAVOR}"
- },
- "vpkg_preload.template": {
- "unprotected_private_net_id": "vFWSNK_vofwlsnk_unprotected${hostid}",
- "unprotected_private_subnet_id": "vFWSNK_vofwlsnk_unprotected_sub${hostid}",
- "unprotected_private_net_cidr": "192.168.10.0/24",
- "protected_private_net_cidr": "192.168.20.0/24",
- "vfw_private_ip_0": "192.168.10.100",
- "vpg_unprotected_private_ip_0": "192.168.10.200",
- "vpg_onap_private_ip_0": "${GLOBAL_INJECTED_OPENSTACK_OAM_NETWORK_CIDR_PREFIX}.${ecompnet}.103",
- "vsn_private_ip_0": "192.168.20.250",
- "vpg_name_0": "vofwl01pgn${hostid}",
- "vpg_image_name": "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
- "vpg_flavor_name": "${GLOBAL_INJECTED_VM_FLAVOR}"
- }
-}
diff --git a/service_mapping/vFWCL_DANOS/service_mapping.json b/service_mapping/vFWCL_DANOS/service_mapping.json
deleted file mode 100644
index b5d27fbd..00000000
--- a/service_mapping/vFWCL_DANOS/service_mapping.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
- "GLOBAL_SERVICE_FOLDER_MAPPING": {
- "vFWCL_DANOS": [
- "vFWCL_DANOS/vFWSNK",
- "vFWCL_DANOS/vPKG"
- ]
- },
- "GLOBAL_SERVICE_VNF_MAPPING": {
- "vFWCL_DANOS": [
- "vFWCL_DANOSvFWSNK",
- "vFWCL_DANOSvPKG"
- ]
- },
- "GLOBAL_SERVICE_GEN_NEUTRON_NETWORK_MAPPING": {
- "vFWCL_DANOS": []
- },
- "GLOBAL_SERVICE_DEPLOYMENT_ARTIFACT_MAPPING": {
- "vFWCL_DANOS": []
- },
- "GLOBAL_SERVICE_TEMPLATE_MAPPING": {
- "vFWCL_DANOSvFWSNK": [
- {
- "isBase": "true",
- "template": "vfwsnk_preload.template",
- "vnf_index": "0",
- "name_pattern": "base_vfw"
- }
- ],
- "vFWCL_DANOSvPKG": [
- {
- "isBase": "true",
- "template": "vpkg_preload.template",
- "vnf_index": "1",
- "name_pattern": "base_vpkg"
- }
- ]
- },
- "GLOBAL_VALIDATE_NAME_MAPPING": {
- "vFWCL_DANOSvFWSNK": "vfw_name_0",
- "vFWCL_DANOSvPKG": "vpg_name_0"
- }
-}
diff --git a/vnfs/VESreporting_vFW5.0_DANOS/.gitignore b/vnfs/VESreporting_vFW5.0_DANOS/.gitignore
new file mode 100644
index 00000000..dc8ecde3
--- /dev/null
+++ b/vnfs/VESreporting_vFW5.0_DANOS/.gitignore
@@ -0,0 +1,2 @@
+**/*.so
+**/*.a
diff --git a/vnfs/VESreporting_vFW5.0_DANOS/Makefile b/vnfs/VESreporting_vFW5.0_DANOS/Makefile
index 160c0264..2fdb368a 100644
--- a/vnfs/VESreporting_vFW5.0_DANOS/Makefile
+++ b/vnfs/VESreporting_vFW5.0_DANOS/Makefile
@@ -37,7 +37,7 @@ all: evel \
clean:
rm -f vpp-measurement-reporter-danos
-vpp-measurement-reporter-danos: evel vpp-measurement-reporter-danos.c
+vpp-measurement-reporter-danos: ${LIBS_DIR}/evel.so vpp-measurement-reporter-danos.c
$(CC) $(CPPFLAGS) $(CFLAGS) -o vpp-measurement-reporter-danos \
-L $(LIBS_DIR) \
-I $(INCLUDE_DIR) \
@@ -47,8 +47,8 @@ vpp-measurement-reporter-danos: evel vpp-measurement-reporter-danos.c
-ljansson \
-lvyatta-config \
-lcurl
- ls -l /build/src/evel/evel-library/libs/x86_64/
+ ls -l ${CODE_ROOT}/evel/evel-library/libs/x86_64/
-evel: ${EVEL_CODE_PATH}/evel.c
+${LIBS_DIR}/evel.so: ${EVEL_CODE_PATH}/evel.c
${MAKE} -C ${EVEL_BUILD_PATH} all
diff --git a/vnfs/VESreporting_vFW5.0_DANOS/debian/control b/vnfs/VESreporting_vFW5.0_DANOS/debian/control
index 0b284738..a07c4f2f 100644
--- a/vnfs/VESreporting_vFW5.0_DANOS/debian/control
+++ b/vnfs/VESreporting_vFW5.0_DANOS/debian/control
@@ -4,9 +4,10 @@ Priority: optional
Maintainer: Brian Freeman <bf1936@att.com>
Build-depends:
debhelper (>= 9),
+ dh-systemd,
dh-exec,
libvyatta-cfg-dev,
- libcurl4-dev,
+ libcurl4-openssl-dev | libcurl4-dev,
libjansson-dev,
Standards-Version: 3.9.8
@@ -14,7 +15,6 @@ Package: vpp-measurement-reporter-danos
Architecture: any
Depends: ${misc:Depends}, dh-exec, libvyatta-cfg1, ${shlibs:Depends}
Pre-Depends: ${misc:Pre-Depends}
-Multi-Arch: same
Description: ONAP VES Event Library for vFW Closed Loop Demonstration
VES reporting library
diff --git a/vnfs/VESreporting_vFW5.0_DANOS/debian/vpp-measurement-reporter-danos.install b/vnfs/VESreporting_vFW5.0_DANOS/debian/vpp-measurement-reporter-danos.install
index 0d81653e..2dbaab85 100755
--- a/vnfs/VESreporting_vFW5.0_DANOS/debian/vpp-measurement-reporter-danos.install
+++ b/vnfs/VESreporting_vFW5.0_DANOS/debian/vpp-measurement-reporter-danos.install
@@ -1,5 +1,5 @@
#!/usr/bin/dh-exec
-dcae_collector.env run/VES/
+dcae_collector.env etc/VES/
evel/evel-library/libs/x86_64/libevel.so usr/lib/${DEB_HOST_MULTIARCH}
onap-ca.crt opt/VES/config
vpp-measurement-reporter-danos opt/VES/bin/
diff --git a/vnfs/VESreporting_vFW5.0_DANOS/debian/vpp-measurement-reporter-danos.lintian-overrides b/vnfs/VESreporting_vFW5.0_DANOS/debian/vpp-measurement-reporter-danos.lintian-overrides
new file mode 100644
index 00000000..eaa16438
--- /dev/null
+++ b/vnfs/VESreporting_vFW5.0_DANOS/debian/vpp-measurement-reporter-danos.lintian-overrides
@@ -0,0 +1,2 @@
+vpp-measurement-reporter-danos: init.d-script-not-included-in-package etc/init.d/vpp-measurement-reporter-danos
+vpp-measurement-reporter-danos: sharedobject-in-library-directory-missing-soname usr/lib/x86_64-linux-gnu/libevel.so
diff --git a/vnfs/VESreporting_vFW5.0_DANOS/debian/vpp-measurement-reporter-danos.service b/vnfs/VESreporting_vFW5.0_DANOS/debian/vpp-measurement-reporter-danos.service
index 7d5b0ba4..3c20a800 100644
--- a/vnfs/VESreporting_vFW5.0_DANOS/debian/vpp-measurement-reporter-danos.service
+++ b/vnfs/VESreporting_vFW5.0_DANOS/debian/vpp-measurement-reporter-danos.service
@@ -2,7 +2,7 @@
Description=ONAP VES Reporting
[Service]
-EnvironmentFile=/run/VES/dcae_collector.env
+EnvironmentFile=/etc/VES/dcae_collector.env
ExecStart=/opt/VES/bin/vpp-measurement-reporter-danos $DCAE_COLLECTOR_IP $DCAE_COLLECTOR_PORT $PORT_TO_REPORT
Restart=always