X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=heat%2FvFWCL%2FvPKG%2Fbase_vpkg.yaml;h=032001c16a769a7d25ce18560cf3e1c4b3545398;hb=314c0c1e45bc6a4c1ae0e7c030ebbf51b80abb35;hp=160331bf807b95d6f86b20118a15b26abfeb7153;hpb=c7568d108813e95161412d907145721fedb6470c;p=demo.git

diff --git a/heat/vFWCL/vPKG/base_vpkg.yaml b/heat/vFWCL/vPKG/base_vpkg.yaml
index 160331bf..032001c1 100644
--- a/heat/vFWCL/vPKG/base_vpkg.yaml
+++ b/heat/vFWCL/vPKG/base_vpkg.yaml
@@ -33,11 +33,11 @@ description: Heat template that deploys the vFirewall Traffic Generator demo app
 ##############
 
 parameters:
-  image_name:
+  vpg_image_name:
     type: string
     label: Image name or ID
     description: Image to be used for compute instance
-  flavor_name:
+  vpg_flavor_name:
     type: string
     label: Flavor
     description: Type of instance (flavor) to be used
@@ -81,11 +81,11 @@ parameters:
     type: string
     label: vSink private IP address towards the protected network
     description: Private IP address that is assigned to the vSink to communicate with the vFirewall
-  vpg_private_ip_0:
+  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_private_ip_1:
+  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
@@ -93,6 +93,10 @@ parameters:
     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
@@ -109,14 +113,6 @@ parameters:
     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
@@ -125,10 +121,16 @@ parameters:
     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
 
 #############
 #           #
@@ -147,8 +149,9 @@ resources:
     properties:
       name:
         str_replace:
-          template: base_rand
+          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 }
@@ -156,30 +159,37 @@ resources:
 
 
   # Virtual Packet Generator instantiation
-  vpg_private_0_port:
+  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_private_ip_0 }}]
+      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_private_1_port:
+  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_private_ip_1 }}]
+      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_0:
+  vpg_server_0:
     type: OS::Nova::Server
     properties:
-      image: { get_param: image_name }
-      flavor: { get_param: flavor_name }
+      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_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 }}
+        - 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:
@@ -187,15 +197,14 @@ resources:
             __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 }
-            __vpg_private_ip_0__ : { get_param: vpg_private_ip_0 }
-            __vpg_private_ip_1__ : { get_param: vpg_private_ip_1 }
-            __unprotected_private_net_cidr__ : { get_param: unprotected_private_net_cidr }
-            __onap_private_net_cidr__ : { get_param: onap_private_net_cidr }
-            __cloud_env__ : { get_param: cloud_env }
+            __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
 
@@ -204,8 +213,6 @@ resources:
             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 "__vpg_private_ip_0__" > /opt/config/vpg_private_ip_0.txt
@@ -213,9 +220,14 @@ resources:
             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
-            curl -k __repo_url_blob__/org.onap.demo/vnfs/vfw/__install_script_version__/v_packetgen_install.sh -o /opt/v_packetgen_install.sh
+            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