X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=heat%2FvFW_NextGen%2Ftemplates%2Fvpg.yaml;h=6555aa7ab2f8538a5650c0a330d4a3efbd35b1f0;hb=e3c21ddc5076521fb35aa757a3507ef38ff1d0b5;hp=b6ef5346adf5f8c898da3620a24c78062b7c87ca;hpb=659cfffac71940e453f415271f23965de53c049e;p=demo.git diff --git a/heat/vFW_NextGen/templates/vpg.yaml b/heat/vFW_NextGen/templates/vpg.yaml index b6ef5346..6555aa7a 100644 --- a/heat/vFW_NextGen/templates/vpg.yaml +++ b/heat/vFW_NextGen/templates/vpg.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 @@ -45,19 +45,19 @@ parameters: type: string label: Public network name or ID description: Public network that enables remote connection to VNF - unprotected_private_net_id: + int_private1_net_id: type: string label: Unprotected private network name or ID description: Private network that connects vPacketGenerator with vFirewall - unprotected_private_subnet_id: + int_private1_subnet_id: type: string label: Unprotected private sub-network name or ID description: Private subnetwork for the unprotected network - unprotected_private_net_cidr: + int_private1_net_cidr: type: string label: Unprotected private network CIDR description: The CIDR of the unprotected private network - protected_private_net_cidr: + int_private2_net_cidr: type: string label: Protected private network CIDR description: The CIDR of the protected private network @@ -73,19 +73,19 @@ parameters: type: string label: ONAP private network CIDR description: The CIDR of the protected private network - vfw_private_ip_0: + vfw_int_private1_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: + vsn_int_private2_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_private_ip_0: + vpg_int_private1_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 @@ -116,7 +120,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 @@ -124,15 +128,6 @@ parameters: sec_group: type: string description: ONAP Security Group - sdnc_model_name: - type: string - description: SDNC Model Name metatada - sdnc_model_version: - type: string - description: SDNC Model Version metatada - sdnc_artifact_name: - type: string - description: SDNC Artifact Name metatada ############# @@ -144,46 +139,49 @@ parameters: resources: # Virtual Packet Generator instantiation - vpg_private_0_port: + vpg_0_int_private1_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 }}] + network: { get_param: int_private1_net_id } + fixed_ips: [{"subnet": { get_param: int_private1_subnet_id }, "ip_address": { get_param: vpg_int_private1_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_param: key_name } 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 }, sdnc_model_name: { get_param: sdnc_model_name }, sdnc_model_version: { get_param: sdnc_model_version }, sdnc_artifact_name: { get_param: sdnc_artifact_name }} + - port: { get_resource: vpg_0_int_private1_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 } + __fw_ipaddr__: { get_param: vfw_int_private1_ip_0 } + __protected_net_cidr__: { get_param: int_private2_net_cidr } + __sink_ipaddr__: { get_param: vsn_int_private2_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 } - __unprotected_private_net_cidr__ : { get_param: unprotected_private_net_cidr } + __vpg_private_ip_0__ : { get_param: vpg_int_private1_ip_0 } + __vpg_private_ip_1__ : { get_param: vpg_onap_private_ip_0 } + __unprotected_private_net_cidr__ : { get_param: int_private1_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 }