X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=heat%2FvFWCL%2FvPKG%2Fbase_vpkg.yaml;h=7efb2e9c854c350f008cbe698b17c590ae232147;hb=c7022a1a9b26b5a9fe9729faf827d6f04de8be01;hp=e06a83fb24909dd0688c5659aebeabe04a75b787;hpb=a56a8b70689c4a74d56d7c534f32c83886c71317;p=demo.git

diff --git a/heat/vFWCL/vPKG/base_vpkg.yaml b/heat/vFWCL/vPKG/base_vpkg.yaml
index e06a83fb..7efb2e9c 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
@@ -120,7 +124,7 @@ parameters:
   nexus_artifact_repo:
     type: string
     description: Root URL for the Nexus repository for Maven artifacts.
-    default: "https://nexus.onap.org"
+    #default: "https://nexus.onap.org"
   cloud_env:
     type: string
     label: Cloud environment
@@ -146,8 +150,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 }
@@ -155,34 +160,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:
@@ -192,8 +200,8 @@ resources:
             __sink_ipaddr__: { get_param: vsn_private_ip_0 }
             __demo_artifacts_version__ : { get_param: demo_artifacts_version }
             __install_script_version__ : { get_param: install_script_version }
-            __vpg_private_ip_0__ : { get_param: vpg_private_ip_0 }
-            __vpg_private_ip_1__ : { get_param: vpg_private_ip_1 }
+            __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 }