##############
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
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
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
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
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 }
# 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:
__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 }