vFW templates for OpenStack 01/3601/1
authorMarco Platania <platania@research.att.com>
Fri, 21 Apr 2017 20:52:06 +0000 (16:52 -0400)
committerMarco Platania <platania@research.att.com>
Fri, 21 Apr 2017 20:52:06 +0000 (16:52 -0400)
Change-Id: I601d534e4c8c8273df780a7d932e288193ccb541
Signed-off-by: Marco Platania <platania@research.att.com>
heat/vFW/.DS_Store
heat/vFW/base_vfw.yaml [deleted file]
heat/vFW/base_vfw_openstack.env [new file with mode: 0644]
heat/vFW/base_vfw_openstack.yaml [new file with mode: 0644]
heat/vFW/base_vfw_rackspace.env [moved from heat/vFW/base_vfw.env with 100% similarity]
heat/vFW/base_vfw_rackspace.yaml [new file with mode: 0644]
vnfs/vFW/scripts/v_firewall_install.sh
vnfs/vFW/scripts/v_packetgen_install.sh
vnfs/vFW/scripts/v_sink_install.sh

index 5008ddf..e2759ef 100644 (file)
Binary files a/heat/vFW/.DS_Store and b/heat/vFW/.DS_Store differ
diff --git a/heat/vFW/base_vfw.yaml b/heat/vFW/base_vfw.yaml
deleted file mode 100644 (file)
index a7df854..0000000
+++ /dev/null
@@ -1,423 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: Heat template to deploy vFirewall demo app for OpenECOMP
-
-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
-  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
-  protected_private_net_id:
-    type: string
-    label: Protected private network name or ID
-    description: Private network that connects vFirewall with vSink
-  ecomp_private_net_id:
-    type: string
-    label: ECOMP management network name or ID
-    description: Private network that connects ECOMP component and the VNF
-  ecomp_private_subnet_id:
-    type: string
-    label: ECOMP management sub-network name or ID
-    description: Private sub-network that connects ECOMP component and the VNF
-  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
-  ecomp_private_net_cidr:
-    type: string
-    label: ECOMP 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 ECOMP management network
-    description: Private IP address that is assigned to the vFirewall to communicate with ECOMP 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
-  vpg_private_ip_1:
-    type: string
-    label: vPacketGenerator private IP address towards the ECOMP management network
-    description: Private IP address that is assigned to the vPacketGenerator to communicate with ECOMP components
-  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 ECOMP management network
-    description: Private IP address that is assigned to the vSink to communicate with ECOMP components
-  vfw_name_0:
-    type: string
-    label: vFirewall name
-    description: Name of the vFirewall
-  vpg_name_0:
-    type: string
-    label: vPacketGenerator name
-    description: Name of the vPacketGenerator
-  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 ECOMP
-  vf_module_id:
-    type: string
-    label: vFirewall module ID
-    description: The vFirewall Module ID is provided by ECOMP
-  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
-  demo_artifacts_version:
-    type: string
-    label: Artifacts version used in demo vnfs
-    description: Artifacts (jar, tar.gz) version used in demo vnfs
-
-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 }
-
-  protected_private_network:
-    type: OS::Neutron::Net
-    properties:
-      name: { get_param: protected_private_net_id }
-
-  unprotected_private_subnet:
-    type: OS::Neutron::Subnet
-    properties:
-      network_id: { get_resource: unprotected_private_network }
-      cidr: { get_param: unprotected_private_net_cidr }
-
-  protected_private_subnet:
-    type: OS::Neutron::Subnet
-    properties:
-      network_id: { get_resource: protected_private_network }
-      cidr: { get_param: protected_private_net_cidr }
-
-  vfw_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_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 }}
-      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 }
-            __repo_url_blob__ : { get_param: repo_url_blob }
-            __repo_url_artifacts__ : { get_param: repo_url_artifacts }
-            __demo_artifacts_version__ : { get_param: demo_artifacts_version }
-          template: |
-            #!/bin/bash
-
-            DCAE_COLLECTOR_IP=__dcae_collector_ip__
-            DCAE_COLLECTOR_PORT=__dcae_collector_port__
-            REPO_URL_BLOB=__repo_url_blob__
-            REPO_URL_ARTIFACTS=__repo_url_artifacts__
-            DEMO_ARTIFACTS_VERSION=__demo_artifacts_version__
-
-            # Download required dependencies
-            add-apt-repository -y ppa:openjdk-r/ppa
-            apt-get update
-            apt-get install -y make wget openjdk-8-jdk gcc libcurl4-openssl-dev python-pip bridge-utils apt-transport-https ca-certificates
-            apt-get install -y maven
-            pip install jsonschema
-
-            # Download vFirewall code for virtual firewall
-            mkdir /opt/config
-            mkdir /opt/honeycomb
-            cd /opt
-            wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vfw/$DEMO_ARTIFACTS_VERSION/v_firewall_init.sh
-            wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vfw/$DEMO_ARTIFACTS_VERSION/vfirewall.sh
-
-            mvn org.apache.maven.plugins:maven-dependency-plugin:2.10:get -DremoteRepositories=$REPO_URL_ARTIFACTS -Dartifact=org.openecomp.demo.vnf:sample-distribution:$DEMO_ARTIFACTS_VERSION:tar.gz:hc -Dtransitive=false -Ddest=.
-            mvn org.apache.maven.plugins:maven-dependency-plugin:2.10:get -DremoteRepositories=$REPO_URL_ARTIFACTS -Dartifact=org.openecomp.demo.vnf.ves:ves:$DEMO_ARTIFACTS_VERSION:tar.gz:demo -Dtransitive=false -Ddest=.
-            mvn org.apache.maven.plugins:maven-dependency-plugin:2.10:get -DremoteRepositories=$REPO_URL_ARTIFACTS -Dartifact=org.openecomp.demo.vnf.ves:ves_vfw_reporting:$DEMO_ARTIFACTS_VERSION:tar.gz:demo -Dtransitive=false -Ddest=.
-
-            
-            tar -zxvf ves-$DEMO_ARTIFACTS_VERSION-demo.tar.gz
-            mv ves-$DEMO_ARTIFACTS_VERSION VES
-            tar -zxvf ves_vfw_reporting-$DEMO_ARTIFACTS_VERSION-demo.tar.gz
-            mv ves_vfw_reporting-$DEMO_ARTIFACTS_VERSION VESreporting_vFW
-            tar -zxvf sample-distribution-$DEMO_ARTIFACTS_VERSION-hc.tar.gz
-            mv sample-distribution-$DEMO_ARTIFACTS_VERSION honeycomb
-            sed -i 's/"restconf-binding-address": "127.0.0.1",/"restconf-binding-address": "0.0.0.0",/g' honeycomb/sample-distribution-$DEMO_ARTIFACTS_VERSION/config/honeycomb.json
-            mv VESreporting_vFW /opt/VES/code/evel_training/VESreporting
-            rm *.tar.gz
-            chmod +x v_firewall_init.sh
-            chmod +x vfirewall.sh
-            echo $DCAE_COLLECTOR_IP > config/dcae_collector_ip.txt
-            echo $DCAE_COLLECTOR_PORT > config/dcae_collector_port.txt
-            echo $DEMO_ARTIFACTS_VERSION > config/artifacts_version.txt
-
-            # Install VPP
-            export UBUNTU="trusty"
-            export RELEASE=".stable.1609"
-            rm /etc/apt/sources.list.d/99fd.io.list
-            echo "deb [trusted=yes] https://nexus.fd.io/content/repositories/fd.io$RELEASE.ubuntu.$UBUNTU.main/ ./" | sudo tee -a /etc/apt/sources.list.d/99fd.io.list
-            apt-get update
-            apt-get install -y vpp vpp-dpdk-dkms vpp-lib vpp-dbg vpp-plugins vpp-dev
-            sleep 1
-
-            # Install VES
-            cd /opt/VES/bldjobs/
-            make clean
-            make
-            sleep 1
-
-            # Run instantiation script
-            cd /opt
-            mv vfirewall.sh /etc/init.d
-            update-rc.d vfirewall.sh defaults
-            ./v_firewall_init.sh
-
-  vfw_private_0_port:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_resource: unprotected_private_network }
-      fixed_ips: [{"subnet": { get_resource: unprotected_private_subnet }, "ip_address": { get_param: vfw_private_ip_0 }}]
-
-  vfw_private_1_port:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_resource: protected_private_network }
-      fixed_ips: [{"subnet": { get_resource: protected_private_subnet }, "ip_address": { get_param: vfw_private_ip_1 }}]
-
-  vfw_private_2_port:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_param: ecomp_private_net_id }
-      fixed_ips: [{"subnet": { get_param: ecomp_private_subnet_id }, "ip_address": { get_param: vfw_private_ip_2 }}]
-
-  vpg_0:
-    type: OS::Nova::Server
-    properties:
-      image: { get_param: vfw_image_name }
-      flavor: { get_param: vfw_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_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 }}
-      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 }
-            __repo_url_blob__ : { get_param: repo_url_blob }
-            __repo_url_artifacts__ : { get_param: repo_url_artifacts }
-            __demo_artifacts_version__ : { get_param: demo_artifacts_version }
-          template: |
-            #!/bin/bash
-
-            FW_IPADDR=__fw_ipaddr__
-            PROTECTED_NET_CIDR=__protected_net_cidr__
-            SINK_IPADDR=__sink_ipaddr__
-            REPO_URL_BLOB=__repo_url_blob__
-            REPO_URL_ARTIFACTS=__repo_url_artifacts__
-            DEMO_ARTIFACTS_VERSION=__demo_artifacts_version__
-
-            # Download required dependencies
-            add-apt-repository -y ppa:openjdk-r/ppa
-            apt-get update
-            apt-get install -y make wget openjdk-8-jdk gcc libcurl4-openssl-dev python-pip bridge-utils apt-transport-https ca-certificates
-            apt-get install -y maven
-            pip install jsonschema
-
-            # Download vFirewall demo code for packet generator
-            mkdir /opt/config
-            mkdir /opt/honeycomb
-            cd /opt
-
-            wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vfw/$DEMO_ARTIFACTS_VERSION/v_packetgen_init.sh
-            wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vfw/$DEMO_ARTIFACTS_VERSION/vpacketgen.sh
-            wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vfw/$DEMO_ARTIFACTS_VERSION/run_traffic_fw_demo.sh
-
-            mvn org.apache.maven.plugins:maven-dependency-plugin:2.10:get -DremoteRepositories=$REPO_URL_ARTIFACTS -Dartifact=org.openecomp.demo.vnf:sample-distribution:$DEMO_ARTIFACTS_VERSION:tar.gz:hc -Dtransitive=false -Ddest=.
-            mvn org.apache.maven.plugins:maven-dependency-plugin:2.10:get -DremoteRepositories=$REPO_URL_ARTIFACTS -Dartifact=org.openecomp.demo.vnf.vfw:vfw_pg_streams:$DEMO_ARTIFACTS_VERSION:tar.gz:demo -Dtransitive=false -Ddest=.
-
-
-            tar -zxvf sample-distribution-$DEMO_ARTIFACTS_VERSION-hc.tar.gz
-            tar -zxvf vfw_pg_streams-$DEMO_ARTIFACTS_VERSION-demo.tar.gz 
-            mv vfw_pg_streams-$DEMO_ARTIFACTS_VERSION pg_streams
-            mv sample-distribution-$DEMO_ARTIFACTS_VERSION honeycomb
-            sed -i 's/"restconf-binding-address": "127.0.0.1",/"restconf-binding-address": "0.0.0.0",/g' honeycomb/sample-distribution-$DEMO_ARTIFACTS_VERSION/config/honeycomb.json
-            rm *.tar.gz
-            chmod +x v_packetgen_init.sh
-            chmod +x vpacketgen.sh
-            echo $FW_IPADDR > config/fw_ipaddr.txt
-            echo $PROTECTED_NET_CIDR > config/protected_net_cidr.txt
-            echo $SINK_IPADDR > config/sink_ipaddr.txt
-            echo $DEMO_ARTIFACTS_VERSION > config/artifacts_version.txt
-
-            # Install VPP
-            export UBUNTU="trusty"
-            export RELEASE=".stable.1609"
-            rm /etc/apt/sources.list.d/99fd.io.list
-            echo "deb [trusted=yes] https://nexus.fd.io/content/repositories/fd.io$RELEASE.ubuntu.$UBUNTU.main/ ./" | sudo tee -a /etc/apt/sources.list.d/99fd.io.list
-            apt-get update
-            apt-get install -y vpp vpp-dpdk-dkms vpp-lib vpp-dbg vpp-plugins vpp-dev
-            sleep 1
-
-            # Run instantiation script
-            cd /opt
-            mv vpacketgen.sh /etc/init.d
-            update-rc.d vpacketgen.sh defaults
-            ./v_packetgen_init.sh
-
-  vpg_private_0_port:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_resource: unprotected_private_network }
-      fixed_ips: [{"subnet": { get_resource: unprotected_private_subnet }, "ip_address": { get_param: vpg_private_ip_0 }}]
-
-  vpg_private_1_port:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_param: ecomp_private_net_id }
-      fixed_ips: [{"subnet": { get_param: ecomp_private_subnet_id }, "ip_address": { get_param: vpg_private_ip_1 }}]
-
-  vsn_0:
-    type: OS::Nova::Server
-    properties:
-      image: { get_param: vfw_image_name }
-      flavor: { get_param: vfw_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_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 }}
-      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 }
-            __repo_url_blob__ : { get_param: repo_url_blob }
-            __repo_url_artifacts__ : { get_param: repo_url_artifacts }
-            __demo_artifacts_version__ : { get_param: demo_artifacts_version }
-          template: |
-            #!/bin/bash
-
-            PROTECTED_NET_GW=__protected_net_gw__
-            UNPROTECTED_NET=__unprotected_net__
-            UNPROTECTED_NET=$(echo $UNPROTECTED_NET | cut -d'/' -f1)
-            REPO_URL_BLOB=__repo_url_blob__
-            REPO_URL_ARTIFACTS=__repo_url_artifacts__
-            DEMO_ARTIFACTS_VERSION=__demo_artifacts_version__
-
-            # Download required dependencies
-            add-apt-repository -y ppa:openjdk-r/ppa
-            apt-get update
-            apt-get install -y make wget openjdk-8-jdk apt-transport-https ca-certificates darkstat
-
-            # Configure and run darkstat
-            sed -i "s/START_DARKSTAT=.*/START_DARKSTAT=yes/g" /etc/darkstat/init.cfg
-            sed -i "s/INTERFACE=.*/INTERFACE=\"-i eth1\"/g" /etc/darkstat/init.cfg
-            /etc/init.d/darkstat start
-
-            mkdir /opt/config
-            cd /opt
-            wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vfw/$DEMO_ARTIFACTS_VERSION/v_sink_init.sh
-            wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vfw/$DEMO_ARTIFACTS_VERSION/vsink.sh
-            chmod +x v_sink_init.sh
-            chmod +x vsink.sh
-            echo $PROTECTED_NET_GW > config/protected_net_gw.txt
-            echo $UNPROTECTED_NET > config/unprotected_net.txt
-            mv vsink.sh /etc/init.d
-            update-rc.d vsink.sh defaults
-            ./v_sink_init.sh
-
-  vsn_private_0_port:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_resource: protected_private_network }
-      fixed_ips: [{"subnet": { get_resource: protected_private_subnet }, "ip_address": { get_param: vsn_private_ip_0 }}]
-
-  vsn_private_1_port:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_param: ecomp_private_net_id }
-      fixed_ips: [{"subnet": { get_param: ecomp_private_subnet_id }, "ip_address": { get_param: vsn_private_ip_1 }}]
diff --git a/heat/vFW/base_vfw_openstack.env b/heat/vFW/base_vfw_openstack.env
new file mode 100644 (file)
index 0000000..e9ceb48
--- /dev/null
@@ -0,0 +1,32 @@
+parameters:\r
+  vfw_image_name: PUT THE VM IMAGE NAME HERE\r
+  vfw_flavor_name: PUT THE VM FLAVOR NAME HERE\r
+  public_net_id: PUT THE PUBLIC NETWORK ID HERE\r
+  unprotected_private_net_id: zdfw1fwl01_unprotected\r
+  protected_private_net_id: zdfw1fwl01_protected\r
+  onap_private_net_id: PUT THE ONAP PRIVATE NETWORK NAME HERE\r
+  onap_private_subnet_id: PUT THE ONAP PRIVATE NETWORK NAME HERE\r
+  unprotected_private_net_cidr: 192.168.10.0/24\r
+  protected_private_net_cidr: 192.168.20.0/24\r
+  onap_private_net_cidr: 10.0.0.0/8\r
+  vfw_private_ip_0: 192.168.10.100\r
+  vfw_private_ip_1: 192.168.20.100\r
+  vfw_private_ip_2: 10.1.0.1\r
+  vpg_private_ip_0: 192.168.10.200\r
+  vpg_private_ip_1: 10.1.0.2\r
+  vsn_private_ip_0: 192.168.20.250\r
+  vsn_private_ip_1: 10.1.0.3\r
+  vfw_name_0: zdfw1fwl01fwl01\r
+  vpg_name_0: zdfw1fwl01pgn01\r
+  vsn_name_0: zdfw1fwl01snk01\r
+  vnf_id: vFirewall_demo_app\r
+  vf_module_id: vFirewall\r
+  dcae_collector_ip: 10.0.4.102\r
+  dcae_collector_port: 8080\r
+  repo_url_blob: https://nexus.onap.org/content/sites/raw\r
+  repo_url_artifacts: https://nexus.onap.org/content/groups/staging\r
+  demo_artifacts_version: 1.1.0
+  install_script_version: 1.1.0-SNAPSHOT\r
+  key_name: vfw_key\r
+  pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN\r
+  cloud_env: openstack\r
diff --git a/heat/vFW/base_vfw_openstack.yaml b/heat/vFW/base_vfw_openstack.yaml
new file mode 100644 (file)
index 0000000..27ebb22
--- /dev/null
@@ -0,0 +1,369 @@
+heat_template_version: 2013-05-23\r
+\r
+description: Heat template that deploys vFirewall demo app for ONAP\r
+\r
+parameters:\r
+  vfw_image_name:\r
+    type: string\r
+    label: Image name or ID\r
+    description: Image to be used for compute instance\r
+  vfw_flavor_name:\r
+    type: string\r
+    label: Flavor\r
+    description: Type of instance (flavor) to be used\r
+  public_net_id:\r
+    type: string\r
+    label: Public network name or ID\r
+    description: Public network that enables remote connection to VNF\r
+  unprotected_private_net_id:\r
+    type: string\r
+    label: Unprotected private network name or ID\r
+    description: Private network that connects vPacketGenerator with vFirewall\r
+  protected_private_net_id:\r
+    type: string\r
+    label: Protected private network name or ID\r
+    description: Private network that connects vFirewall with vSink\r
+  onap_private_net_id:\r
+    type: string\r
+    label: ONAP management network name or ID\r
+    description: Private network that connects ONAP components and the VNF\r
+  onap_private_subnet_id:\r
+    type: string\r
+    label: ONAP management sub-network name or ID\r
+    description: Private sub-network that connects ONAP components and the VNF\r
+  unprotected_private_net_cidr:\r
+    type: string\r
+    label: Unprotected private network CIDR\r
+    description: The CIDR of the unprotected private network\r
+  protected_private_net_cidr:\r
+    type: string\r
+    label: Protected private network CIDR\r
+    description: The CIDR of the protected private network\r
+  onap_private_net_cidr:\r
+    type: string\r
+    label: ONAP private network CIDR\r
+    description: The CIDR of the protected private network\r
+  vfw_private_ip_0:\r
+    type: string\r
+    label: vFirewall private IP address towards the unprotected network\r
+    description: Private IP address that is assigned to the vFirewall to communicate with the vPacketGenerator\r
+  vfw_private_ip_1:\r
+    type: string\r
+    label: vFirewall private IP address towards the protected network\r
+    description: Private IP address that is assigned to the vFirewall to communicate with the vSink\r
+  vfw_private_ip_2:\r
+    type: string\r
+    label: vFirewall private IP address towards the ONAP management network\r
+    description: Private IP address that is assigned to the vFirewall to communicate with ONAP components\r
+  vpg_private_ip_0:\r
+    type: string\r
+    label: vPacketGenerator private IP address towards the unprotected network\r
+    description: Private IP address that is assigned to the vPacketGenerator to communicate with the vFirewall\r
+  vpg_private_ip_1:\r
+    type: string\r
+    label: vPacketGenerator private IP address towards the ONAP management network\r
+    description: Private IP address that is assigned to the vPacketGenerator to communicate with ONAP components\r
+  vsn_private_ip_0:\r
+    type: string\r
+    label: vSink private IP address towards the protected network\r
+    description: Private IP address that is assigned to the vSink to communicate with the vFirewall\r
+  vsn_private_ip_1:\r
+    type: string\r
+    label: vSink private IP address towards the ONAP management network\r
+    description: Private IP address that is assigned to the vSink to communicate with ONAP components\r
+  vfw_name_0:\r
+    type: string\r
+    label: vFirewall name\r
+    description: Name of the vFirewall\r
+  vpg_name_0:\r
+    type: string\r
+    label: vPacketGenerator name\r
+    description: Name of the vPacketGenerator\r
+  vsn_name_0:\r
+    type: string\r
+    label: vSink name\r
+    description: Name of the vSink\r
+  vnf_id:\r
+    type: string\r
+    label: VNF ID\r
+    description: The VNF ID is provided by ONAP\r
+  vf_module_id:\r
+    type: string\r
+    label: vFirewall module ID\r
+    description: The vFirewall Module ID is provided by ONAP\r
+  dcae_collector_ip:\r
+    type: string\r
+    label: DCAE collector IP address\r
+    description: IP address of the DCAE collector\r
+  dcae_collector_port:\r
+    type: string\r
+    label: DCAE collector port\r
+    description: Port of the DCAE collector\r
+  key_name:\r
+    type: string\r
+    label: Key pair name\r
+    description: Public/Private key pair name\r
+  pub_key:\r
+    type: string\r
+    label: Public key\r
+    description: Public key to be installed on the compute instance\r
+  repo_url_blob:\r
+    type: string\r
+    label: Repository URL\r
+    description: URL of the repository that hosts the demo packages\r
+  repo_url_artifacts:\r
+    type: string\r
+    label: Repository URL\r
+    description: URL of the repository that hosts the demo packages\r
+  install_script_version:\r
+    type: string\r
+    label: Installation script version number\r
+    description: Version number of the scripts that install the vFW demo app\r
+  demo_artifacts_version:\r
+    type: string\r
+    label: Artifacts version used in demo vnfs\r
+    description: Artifacts (jar, tar.gz) version used in demo vnfs\r
+  cloud_env:\r
+    type: string\r
+    label: Cloud environment\r
+    description: Cloud environment (e.g., openstack, rackspace)\r
+\r
+resources:\r
+  random-str:\r
+    type: OS::Heat::RandomString\r
+    properties:\r
+      length: 4\r
+\r
+  my_keypair:\r
+    type: OS::Nova::KeyPair\r
+    properties:\r
+      name:\r
+        str_replace:\r
+          template: base_rand\r
+          params:\r
+            base: { get_param: key_name }\r
+            rand: { get_resource: random-str }\r
+      public_key: { get_param: pub_key }\r
+      save_private_key: false\r
+\r
+  unprotected_private_network:\r
+    type: OS::Neutron::Net\r
+    properties:\r
+      name: { get_param: unprotected_private_net_id }\r
+\r
+  protected_private_network:\r
+    type: OS::Neutron::Net\r
+    properties:\r
+      name: { get_param: protected_private_net_id }\r
+\r
+  unprotected_private_subnet:\r
+    type: OS::Neutron::Subnet\r
+    properties:\r
+      network_id: { get_resource: unprotected_private_network }\r
+      cidr: { get_param: unprotected_private_net_cidr }\r
+\r
+  protected_private_subnet:\r
+    type: OS::Neutron::Subnet\r
+    properties:\r
+      network_id: { get_resource: protected_private_network }\r
+      cidr: { get_param: protected_private_net_cidr }\r
+\r
+  # Virtual Firewall instantiation\r
+  vfw_private_0_port:\r
+    type: OS::Neutron::Port\r
+    properties:\r
+      security_groups: []\r
+      port_security_enabled: False\r
+      network: { get_resource: unprotected_private_network }\r
+      fixed_ips: [{"subnet": { get_resource: unprotected_private_subnet }, "ip_address": { get_param: vfw_private_ip_0 }}]\r
+\r
+  vfw_private_1_port:\r
+    type: OS::Neutron::Port\r
+    properties:\r
+      security_groups: []\r
+      port_security_enabled: False\r
+      network: { get_resource: protected_private_network }\r
+      fixed_ips: [{"subnet": { get_resource: protected_private_subnet }, "ip_address": { get_param: vfw_private_ip_1 }}]\r
+\r
+  vfw_private_2_port:\r
+    type: OS::Neutron::Port\r
+    properties:\r
+      network: { get_param: onap_private_net_id }\r
+      fixed_ips: [{"subnet": { get_param: onap_private_subnet_id }, "ip_address": { get_param: vfw_private_ip_2 }}]\r
+\r
+  vfw_floating_ip:\r
+    type: OS::Neutron::FloatingIP\r
+    properties:\r
+      floating_network_id: { get_param: public_net_id }\r
+      port_id: { get_resource: vfw_private_2_port }\r
+\r
+  vfw_0:\r
+    type: OS::Nova::Server\r
+    properties:\r
+      image: { get_param: vfw_image_name }\r
+      flavor: { get_param: vfw_flavor_name }\r
+      name: { get_param: vfw_name_0 }\r
+      key_name: { get_resource: my_keypair }\r
+      networks:\r
+        - port: { get_resource: vfw_private_2_port }\r
+        - port: { get_resource: vfw_private_0_port }\r
+        - port: { get_resource: vfw_private_1_port }\r
+      metadata: {vnf_id: { get_param: vnf_id }, vf_module_id: { get_param: vf_module_id }}\r
+      user_data_format: RAW\r
+      user_data:\r
+        str_replace:\r
+          params:\r
+            __dcae_collector_ip__ : { get_param: dcae_collector_ip }\r
+            __dcae_collector_port__ : { get_param: dcae_collector_port }\r
+            __repo_url_blob__ : { get_param: repo_url_blob }\r
+            __repo_url_artifacts__ : { get_param: repo_url_artifacts }\r
+            __demo_artifacts_version__ : { get_param: demo_artifacts_version }\r
+            __install_script_version__ : { get_param: install_script_version }\r
+            __vfw_private_ip_0__ : { get_param: vfw_private_ip_0 }\r
+            __vfw_private_ip_1__ : { get_param: vfw_private_ip_1 }\r
+            __cloud_env__ : { get_param: cloud_env }\r
+          template: |\r
+            #!/bin/bash\r
+            \r
+            # Create configuration files\r
+            mkdir /opt/config\r
+            echo "__dcae_collector_ip__" > /opt/config/dcae_collector_ip.txt\r
+            echo "__dcae_collector_port__" > /opt/config/dcae_collector_port.txt\r
+            echo "__repo_url_blob__" > /opt/config/repo_url_blob.txt\r
+            echo "__repo_url_artifacts__" > /opt/config/repo_url_artifacts.txt\r
+            echo "__demo_artifacts_version__" > /opt/config/demo_artifacts_version.txt\r
+            echo "__install_script_version__" > /opt/config/install_script_version.txt\r
+            echo "__vfw_private_ip_0__" > /opt/config/vfw_private_ip_0.txt\r
+            echo "__vfw_private_ip_1__" > /opt/config/vfw_private_ip_1.txt\r
+            echo "__cloud_env__" > /opt/config/cloud_env.txt\r
+            \r
+            # Download and run install script\r
+            curl -k __repo_url_blob__/org.openecomp.demo/vnfs/vfw/__install_script_version__/v_firewall_install.sh -o /opt/v_firewall_install.sh\r
+            cd /opt\r
+            chmod +x v_firewall_install.sh\r
+            ./v_firewall_install.sh\r
+\r
+\r
+  # Virtual Packet Generator instantiation\r
+  vpg_floating_ip:\r
+    type: OS::Neutron::FloatingIP\r
+    properties:\r
+      floating_network_id: { get_param: public_net_id }\r
+      port_id: { get_resource: vpg_private_1_port }\r
+\r
+  vpg_private_0_port:\r
+    type: OS::Neutron::Port\r
+    properties:\r
+      network: { get_resource: unprotected_private_network }\r
+      fixed_ips: [{"subnet": { get_resource: unprotected_private_subnet }, "ip_address": { get_param: vpg_private_ip_0 }}]\r
+\r
+  vpg_private_1_port:\r
+    type: OS::Neutron::Port\r
+    properties:\r
+      network: { get_param: onap_private_net_id }\r
+      fixed_ips: [{"subnet": { get_param: onap_private_subnet_id }, "ip_address": { get_param: vpg_private_ip_1 }}]\r
+\r
+  vpg_0:\r
+    type: OS::Nova::Server\r
+    properties:\r
+      image: { get_param: vfw_image_name }\r
+      flavor: { get_param: vfw_flavor_name }\r
+      name: { get_param: vpg_name_0 }\r
+      key_name: { get_resource: my_keypair }\r
+      networks:\r
+        - port: { get_resource: vpg_private_1_port }\r
+        - port: { get_resource: vpg_private_0_port }\r
+      metadata: {vnf_id: { get_param: vnf_id }, vf_module_id: { get_param: vf_module_id }}\r
+      user_data_format: RAW\r
+      user_data:\r
+        str_replace:\r
+          params:\r
+            __fw_ipaddr__: { get_param: vfw_private_ip_0 }\r
+            __protected_net_cidr__: { get_param: protected_private_net_cidr }\r
+            __sink_ipaddr__: { get_param: vsn_private_ip_0 }\r
+            __repo_url_blob__ : { get_param: repo_url_blob }\r
+            __repo_url_artifacts__ : { get_param: repo_url_artifacts }\r
+            __demo_artifacts_version__ : { get_param: demo_artifacts_version }\r
+            __install_script_version__ : { get_param: install_script_version }\r
+            __vpg_private_ip_0__ : { get_param: vpg_private_ip_0 }\r
+            __cloud_env__ : { get_param: cloud_env }\r
+          template: |\r
+            #!/bin/bash\r
+            \r
+            # Create configuration files\r
+            mkdir /opt/config\r
+            echo "__fw_ipaddr__" > /opt/config/fw_ipaddr.txt\r
+            echo "__protected_net_cidr__" > /opt/config/protected_net_cidr.txt\r
+            echo "__sink_ipaddr__" > /opt/config/sink_ipaddr.txt\r
+            echo "__repo_url_blob__" > /opt/config/repo_url_blob.txt\r
+            echo "__repo_url_artifacts__" > /opt/config/repo_url_artifacts.txt\r
+            echo "__demo_artifacts_version__" > /opt/config/demo_artifacts_version.txt\r
+            echo "__install_script_version__" > /opt/config/install_script_version.txt\r
+            echo "__vpg_private_ip_0__" > /opt/config/vpg_private_ip_0.txt\r
+            echo "__cloud_env__" > /opt/config/cloud_env.txt\r
+            \r
+            # Download and run install script\r
+            curl -k __repo_url_blob__/org.openecomp.demo/vnfs/vfw/__install_script_version__/v_packetgen_install.sh -o /opt/v_packetgen_install.sh\r
+            cd /opt\r
+            chmod +x v_packetgen_install.sh\r
+            ./v_packetgen_install.sh\r
+\r
+\r
+  # Virtual Sink instantiation\r
+  vsn_private_0_port:\r
+    type: OS::Neutron::Port\r
+    properties:\r
+      network: { get_resource: protected_private_network }\r
+      fixed_ips: [{"subnet": { get_resource: protected_private_subnet }, "ip_address": { get_param: vsn_private_ip_0 }}]\r
+\r
+  vsn_private_1_port:\r
+    type: OS::Neutron::Port\r
+    properties:\r
+      network: { get_param: onap_private_net_id }\r
+      fixed_ips: [{"subnet": { get_param: onap_private_subnet_id }, "ip_address": { get_param: vsn_private_ip_1 }}]\r
+\r
+  vsn_floating_ip:\r
+    type: OS::Neutron::FloatingIP\r
+    properties:\r
+      floating_network_id: { get_param: public_net_id }\r
+      port_id: { get_resource: vsn_private_1_port }\r
+\r
+  vsn_0:\r
+    type: OS::Nova::Server\r
+    properties:\r
+      image: { get_param: vfw_image_name }\r
+      flavor: { get_param: vfw_flavor_name }\r
+      name: { get_param: vsn_name_0 }\r
+      key_name: { get_resource: my_keypair }\r
+      networks:\r
+        - port: { get_resource: vsn_private_1_port }\r
+        - port: { get_resource: vsn_private_0_port }\r
+      metadata: {vnf_id: { get_param: vnf_id }, vf_module_id: { get_param: vf_module_id }}\r
+      user_data_format: RAW\r
+      user_data:\r
+        str_replace:\r
+          params:\r
+            __protected_net_gw__: { get_param: vfw_private_ip_1 }\r
+            __unprotected_net__: { get_param: unprotected_private_net_cidr }\r
+            __repo_url_blob__ : { get_param: repo_url_blob }\r
+            __repo_url_artifacts__ : { get_param: repo_url_artifacts }\r
+            __install_script_version__ : { get_param: install_script_version }\r
+            __vsn_private_ip_0__ : { get_param: vsn_private_ip_0 }\r
+            __cloud_env__ : { get_param: cloud_env }\r
+          template: |\r
+            #!/bin/bash\r
+            \r
+            # Create configuration files\r
+            mkdir /opt/config\r
+            echo "__protected_net_gw__" > /opt/config/protected_net_gw.txt\r
+            echo "__unprotected_net__" > /opt/config/unprotected_net.txt\r
+            echo "__repo_url_blob__" > /opt/config/repo_url_blob.txt\r
+            echo "__install_script_version__" > /opt/config/install_script_version.txt\r
+            echo "__vsn_private_ip_0__" > /opt/config/vsn_private_ip_0.txt\r
+            echo "__cloud_env__" > /opt/config/cloud_env.txt\r
+            \r
+            # Download and run install script\r
+            curl -k __repo_url_blob__/org.openecomp.demo/vnfs/vfw/__install_script_version__/v_sink_install.sh -o /opt/v_sink_install.sh\r
+            cd /opt\r
+            chmod +x v_sink_install.sh\r
+            ./v_sink_install.sh
\ No newline at end of file
diff --git a/heat/vFW/base_vfw_rackspace.yaml b/heat/vFW/base_vfw_rackspace.yaml
new file mode 100644 (file)
index 0000000..868ebc3
--- /dev/null
@@ -0,0 +1,341 @@
+heat_template_version: 2013-05-23
+
+description: Heat template that deploys vFirewall demo app for ONAP
+
+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
+  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
+  protected_private_net_id:
+    type: string
+    label: Protected private network name or ID
+    description: Private network that connects vFirewall with vSink
+  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
+  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_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
+  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
+  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
+  vfw_name_0:
+    type: string
+    label: vFirewall name
+    description: Name of the vFirewall
+  vpg_name_0:
+    type: string
+    label: vPacketGenerator name
+    description: Name of the vPacketGenerator
+  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 ECOMP
+  vf_module_id:
+    type: string
+    label: vFirewall module ID
+    description: The vFirewall Module ID is provided by ECOMP
+  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:
+  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 }
+
+  protected_private_network:
+    type: OS::Neutron::Net
+    properties:
+      name: { get_param: protected_private_net_id }
+
+  unprotected_private_subnet:
+    type: OS::Neutron::Subnet
+    properties:
+      network_id: { get_resource: unprotected_private_network }
+      cidr: { get_param: unprotected_private_net_cidr }
+
+  protected_private_subnet:
+    type: OS::Neutron::Subnet
+    properties:
+      network_id: { get_resource: protected_private_network }
+      cidr: { get_param: protected_private_net_cidr }
+
+  # Virtual Firewall instantiation
+  vfw_private_0_port:
+    type: OS::Neutron::Port
+    properties:
+      network: { get_resource: unprotected_private_network }
+      fixed_ips: [{"subnet": { get_resource: unprotected_private_subnet }, "ip_address": { get_param: vfw_private_ip_0 }}]
+
+  vfw_private_1_port:
+    type: OS::Neutron::Port
+    properties:
+      network: { get_resource: protected_private_network }
+      fixed_ips: [{"subnet": { get_resource: protected_private_subnet }, "ip_address": { get_param: vfw_private_ip_1 }}]
+
+  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 }}]
+
+  vfw_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_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 }}
+      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 }
+            __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 "__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.openecomp.demo/vnfs/vfw/__install_script_version__/v_firewall_install.sh -o /opt/v_firewall_install.sh
+            cd /opt
+            chmod +x v_firewall_install.sh
+            ./v_firewall_install.sh
+
+
+  # Virtual Packet Generator instantiation
+  vpg_private_0_port:
+    type: OS::Neutron::Port
+    properties:
+      network: { get_resource: unprotected_private_network }
+      fixed_ips: [{"subnet": { get_resource: unprotected_private_subnet }, "ip_address": { get_param: vpg_private_ip_0 }}]
+
+  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 }}]
+
+  vpg_0:
+    type: OS::Nova::Server
+    properties:
+      image: { get_param: vfw_image_name }
+      flavor: { get_param: vfw_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_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 }}
+      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 }
+            __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 "__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 "__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.openecomp.demo/vnfs/vfw/__install_script_version__/v_packetgen_install.sh -o /opt/v_packetgen_install.sh
+            cd /opt
+            chmod +x v_packetgen_install.sh
+            ./v_packetgen_install.sh
+
+
+  # Virtual Sink instantiation
+  vsn_private_0_port:
+    type: OS::Neutron::Port
+    properties:
+      network: { get_resource: protected_private_network }
+      fixed_ips: [{"subnet": { get_resource: protected_private_subnet }, "ip_address": { get_param: vsn_private_ip_0 }}]
+
+  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 }}]
+
+  vsn_0:
+    type: OS::Nova::Server
+    properties:
+      image: { get_param: vfw_image_name }
+      flavor: { get_param: vfw_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_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 }}
+      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 }
+            __repo_url_blob__ : { get_param: repo_url_blob }
+            __install_script_version__ : { get_param: install_script_version }
+            __cloud_env__ : { get_param: cloud_env }
+          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 "__repo_url_blob__" > /opt/config/repo_url_blob.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.openecomp.demo/vnfs/vfw/__install_script_version__/v_sink_install.sh -o /opt/v_sink_install.sh
+            cd /opt
+            chmod +x v_sink_install.sh
+            ./v_sink_install.sh
\ No newline at end of file
index 7d17871..63ee38b 100644 (file)
@@ -5,9 +5,7 @@ DCAE_COLLECTOR_PORT=$(cat /opt/config/dcae_collector_port.txt)
 REPO_URL_BLOB=$(cat /opt/config/repo_url_blob.txt)
 REPO_URL_ARTIFACTS=$(cat /opt/config/repo_url_artifacts.txt)
 DEMO_ARTIFACTS_VERSION=$(cat /opt/config/demo_artifacts_version.txt)
-VFW_PRIVATE_IP_O=$(cat /opt/config/vfw_private_ip_0.txt)
-VFW_PRIVATE_IP_1=$(cat /opt/config/vfw_private_ip_1.txt)
-VFW_PRIVATE_IP_2=$(cat /opt/config/vfw_private_ip_2.txt)
+INSTALL_SCRIPT_VERSION=$(cat /opt/config/install_script_version.txt)
 CLOUD_ENV=$(cat /opt/config/cloud_env.txt)
 
 # OpenStack network configuration 
@@ -15,11 +13,13 @@ if [[ $CLOUD_ENV == "openstack" ]]
 then
        echo 127.0.0.1 $(hostname) >> /etc/hosts
 
+       VFW_PRIVATE_IP_O=$(cat /opt/config/vfw_private_ip_0.txt)
        echo "auto eth1" >> /etc/network/interfaces
        echo "iface eth1 inet static" >> /etc/network/interfaces
        echo "    address $VFW_PRIVATE_IP_O" >> /etc/network/interfaces
        echo "    netmask 255.255.255.0" >> /etc/network/interfaces
 
+       VFW_PRIVATE_IP_1=$(cat /opt/config/vfw_private_ip_1.txt)
        echo "auto eth2" >> /etc/network/interfaces
        echo "iface eth2 inet static" >> /etc/network/interfaces
        echo "    address $VFW_PRIVATE_IP_1" >> /etc/network/interfaces
@@ -40,8 +40,8 @@ pip install jsonschema
 mkdir /opt/honeycomb
 cd /opt
 
-wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vfw/$DEMO_ARTIFACTS_VERSION/v_firewall_init.sh
-wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vfw/$DEMO_ARTIFACTS_VERSION/vfirewall.sh
+wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vfw/$INSTALL_SCRIPT_VERSION/v_firewall_init.sh
+wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vfw/$INSTALL_SCRIPT_VERSION/vfirewall.sh
 wget $REPO_URL_ARTIFACTS/org/openecomp/demo/vnf/sample-distribution/$DEMO_ARTIFACTS_VERSION/sample-distribution-$DEMO_ARTIFACTS_VERSION-hc.tar.gz
 wget $REPO_URL_ARTIFACTS/org/openecomp/demo/vnf/ves/ves/$DEMO_ARTIFACTS_VERSION/ves-$DEMO_ARTIFACTS_VERSION-demo.tar.gz
 wget $REPO_URL_ARTIFACTS/org/openecomp/demo/vnf/ves/ves_vfw_reporting/$DEMO_ARTIFACTS_VERSION/ves_vfw_reporting-$DEMO_ARTIFACTS_VERSION-demo.tar.gz
index 840e7bf..54a26a4 100644 (file)
@@ -6,8 +6,7 @@ SINK_IPADDR=$(cat /opt/config/sink_ipaddr.txt)
 REPO_URL_BLOB=$(cat /opt/config/repo_url_blob.txt)
 REPO_URL_ARTIFACTS=$(cat /opt/config/repo_url_artifacts.txt)
 DEMO_ARTIFACTS_VERSION=$(cat /opt/config/demo_artifacts_version.txt)
-VPG_PRIVATE_IP_O=$(cat /opt/config/vpg_private_ip_0.txt)
-VPG_PRIVATE_IP_1=$(cat /opt/config/vpg_private_ip_1.txt)
+INSTALL_SCRIPT_VERSION=$(cat /opt/config/install_script_version.txt)
 CLOUD_ENV=$(cat /opt/config/cloud_env.txt)
 
 # Network configuration
@@ -15,6 +14,7 @@ if [[ $CLOUD_ENV == "openstack" ]]
 then
        echo 127.0.0.1 $(hostname) >> /etc/hosts
 
+       VPG_PRIVATE_IP_O=$(cat /opt/config/vpg_private_ip_0.txt)
        echo "auto eth1" >> /etc/network/interfaces
        echo "iface eth1 inet static" >> /etc/network/interfaces
        echo "    address $VPG_PRIVATE_IP_O" >> /etc/network/interfaces
@@ -34,9 +34,9 @@ pip install jsonschema
 mkdir /opt/honeycomb
 cd /opt
 
-wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vfw/$DEMO_ARTIFACTS_VERSION/v_packetgen_init.sh
-wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vfw/$DEMO_ARTIFACTS_VERSION/vpacketgen.sh
-wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vfw/$DEMO_ARTIFACTS_VERSION/run_traffic_fw_demo.sh
+wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vfw/$INSTALL_SCRIPT_VERSION/v_packetgen_init.sh
+wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vfw/$INSTALL_SCRIPT_VERSION/vpacketgen.sh
+wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vfw/$INSTALL_SCRIPT_VERSION/run_traffic_fw_demo.sh
 wget $REPO_URL_ARTIFACTS/org/openecomp/demo/vnf/sample-distribution/$DEMO_ARTIFACTS_VERSION/sample-distribution-$DEMO_ARTIFACTS_VERSION-hc.tar.gz
 wget $REPO_URL_ARTIFACTS/org/openecomp/demo/vnf/vfw/vfw_pg_streams/$DEMO_ARTIFACTS_VERSION/vfw_pg_streams-$DEMO_ARTIFACTS_VERSION-demo.tar.gz 
 
index c5eb120..748545e 100644 (file)
@@ -3,18 +3,15 @@
 PROTECTED_NET_GW=$(cat /opt/config/protected_net_gw.txt)
 UNPROTECTED_NET=$(cat /opt/config/unprotected_net.txt | cut -d'/' -f1)
 REPO_URL_BLOB=$(cat /opt/config/repo_url_blob.txt)
-REPO_URL_ARTIFACTS=$(cat /opt/config/repo_url_artifacts.txt)
-DEMO_ARTIFACTS_VERSION=$(cat /opt/config/demo_artifacts_version.txt)
-VSN_PRIVATE_IP_O=$(cat /opt/config/vsn_private_ip_0.txt)
-VSN_PRIVATE_IP_1=$(cat /opt/config/vsn_private_ip_1.txt)
+INSTALL_SCRIPT_VERSION=$(cat /opt/config/install_script_version.txt)
 CLOUD_ENV=$(cat /opt/config/cloud_env.txt)
 
-
-# Network configuration
+# OpenStack network configuration
 if [[ $CLOUD_ENV == "openstack" ]]
 then
        echo 127.0.0.1 $(hostname) >> /etc/hosts
 
+       VSN_PRIVATE_IP_O=$(cat /opt/config/vsn_private_ip_0.txt)
        echo "auto eth1" >> /etc/network/interfaces
        echo "iface eth1 inet static" >> /etc/network/interfaces
        echo "    address $VSN_PRIVATE_IP_O" >> /etc/network/interfaces
@@ -28,15 +25,15 @@ add-apt-repository -y ppa:openjdk-r/ppa
 apt-get update
 apt-get install -y make wget openjdk-8-jdk apt-transport-https ca-certificates darkstat
 
-# Configure and run darkstat
+# Configure and run Darkstat
 sed -i "s/START_DARKSTAT=.*/START_DARKSTAT=yes/g" /etc/darkstat/init.cfg
 sed -i "s/INTERFACE=.*/INTERFACE=\"-i eth1\"/g" /etc/darkstat/init.cfg
 /etc/init.d/darkstat start
 
-# Download code for virtual sink
+# Download scripts for virtual sink
 cd /opt
-wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vfw/$DEMO_ARTIFACTS_VERSION/v_sink_init.sh
-wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vfw/$DEMO_ARTIFACTS_VERSION/vsink.sh
+wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vfw/$INSTALL_SCRIPT_VERSION/v_sink_init.sh
+wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vfw/$INSTALL_SCRIPT_VERSION/vsink.sh
 chmod +x v_sink_init.sh
 chmod +x vsink.sh