diff options
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novaservergroups')
10 files changed, 1979 insertions, 45 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novaservergroups/dynamicPolicy/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novaservergroups/dynamicPolicy/expectedoutputfiles/MainServiceTemplate.yaml new file mode 100644 index 0000000000..a8514c2921 --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novaservergroups/dynamicPolicy/expectedoutputfiles/MainServiceTemplate.yaml @@ -0,0 +1,621 @@ +tosca_definitions_version: tosca_simple_yaml_1_0_0 +metadata: + template_name: Main +imports: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +node_types: + org.openecomp.resource.vfc.nodes.heat.smp: + derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server +topology_template: + inputs: + hostid_fe1: + hidden: false + immutable: false + type: string + description: FE1 Hostid (from Ulticom license) + ip_address_stp2: + hidden: false + immutable: false + type: string + description: STP2 IP address + Mobility_OAM_protected_net_id: + hidden: false + immutable: false + type: string + description: Network name for OAM + hostid_fe2: + hidden: false + immutable: false + type: string + description: FE2 Hostid (from Ulticom license) + flavor_scp_fe_name: + hidden: false + immutable: false + type: string + description: SCP FE Flavor + default: a1.Small + ip_address_stp1: + hidden: false + immutable: false + type: string + description: STP1 IP address + int_vscp_ce_network_net_id: + hidden: false + immutable: false + type: string + description: Inter-CE Network + int_vscp_ce_network_cidr: + hidden: false + immutable: false + type: string + description: Private Network Address (CIDR notation) + cluster_type: + hidden: false + immutable: false + type: string + constraints: + - valid_values: + - Test + - Prod + be_Mobility_OAM_protected_ip_1: + label: be_1 OAM ip address + hidden: false + immutable: false + type: string + description: be_1 OAM ip address + be_Mobility_OAM_protected_ip_2: + label: be_2 OAM ip address + hidden: false + immutable: false + type: string + description: be_2 OAM ip address + be_Mobility_OAM_protected_ip_0: + label: be_0 OAM ip address + hidden: false + immutable: false + type: string + description: be_0 OAM ip address + ip_address_dra: + hidden: false + immutable: false + type: string + description: DRA VIP address + image_smp_name: + hidden: false + immutable: false + type: string + description: SCP SMP image + default: asc_base_image_smp + fe_connectivity: + hidden: false + immutable: false + type: string + constraints: + - valid_values: + - NEE + - STP + lab_name: + hidden: false + immutable: false + type: string + description: Lab name + smp_Mobility_OAM_protected_ip_1: + label: smp_1 OAM ip address + hidden: false + immutable: false + type: string + description: smp_1 OAM ip address + fe_SIGNET_vrf_B1_direct_ip_0: + label: fe1 SIGTRAN ip address + hidden: false + immutable: false + type: string + description: fe1 SIGTRAN ip address + smp_Mobility_OAM_protected_ip_0: + label: smp_0 OAM ip address + hidden: false + immutable: false + type: string + description: smp_0 OAM ip address + int_vscp_cluster_net_id: + hidden: false + immutable: false + type: string + description: LAN3 Cluster + be_Mobility_OAM_protected_ip_3: + label: be_3 OAM ip address + hidden: false + immutable: false + type: string + description: be_3 OAM ip address + be_Mobility_OAM_protected_ip_4: + label: be_4 OAM ip address + hidden: false + immutable: false + type: string + description: be_4 OAM ip address + hostname_nee1: + hidden: false + immutable: false + type: string + description: NEE1 Hostname (from Ulticom license) + int_vscp_fe_cluster_net_id: + hidden: false + immutable: false + type: string + description: LAN2 FE Cluster/KA + SIGNET_vrf_A1_direct_net_id: + hidden: false + immutable: false + type: string + description: Network name for SIGTRAN_A + key_name: + hidden: false + immutable: false + type: string + description: keypair to enable SSH access to the instance. + default: vSCP-keypair + int_vscp_fe_cluster_cidr: + hidden: false + immutable: false + type: string + description: Private Network2 Address (CIDR notation) + fe_name_1: + hidden: false + immutable: false + type: string + description: name of VM + default: vSCP_FE2 + fe_name_0: + hidden: false + immutable: false + type: string + description: name of VM + default: vSCP_FE1 + policy_value: + hidden: false + immutable: false + type: string + be_name_0: + hidden: false + immutable: false + type: string + description: name of VM + default: vSCP_BE1 + int_vscp_cluster_cidr: + hidden: false + immutable: false + type: string + description: Private Network3 Address (CIDR notation) + be_name_1: + hidden: false + immutable: false + type: string + description: name of VM + default: vSCP_BE2 + be_name_2: + hidden: false + immutable: false + type: string + description: name of VM + default: vSCP_BE3 + point_code_stp: + hidden: false + immutable: false + type: string + description: STP virtual point code (in "zone-cluster-member" format) + be_name_3: + hidden: false + immutable: false + type: string + description: name of VM + default: vSCP_BE4 + be_name_4: + hidden: false + immutable: false + type: string + description: name of VM + default: vSCP_BE5 + global_title_scp: + hidden: false + immutable: false + type: string + description: vSCP Global Title address + vnf_name: + hidden: false + immutable: false + type: string + description: Unique name for this VNF instance + default: This_is_the_SCP_name + be_Cricket_OCS_protected_ip_2: + label: be3 Cricket_OCS ip address + hidden: false + immutable: false + type: string + description: be3 Cricket_OCS ip address + fe_Mobility_OAM_protected_ip_0: + label: fe_0 OAM ip address + hidden: false + immutable: false + type: string + description: fe_0 OAM ip address + hostname_fe1: + hidden: false + immutable: false + type: string + description: FE1 Hostname (from Ulticom license) + be_Cricket_OCS_protected_ip_1: + label: be2 Cricket_OCS ip address + hidden: false + immutable: false + type: string + description: be2 Cricket_OCS ip address + hostname_fe2: + hidden: false + immutable: false + type: string + description: FE2 Hostname (from Ulticom license) + be_Cricket_OCS_protected_ip_4: + label: be5 Cricket_OCS ip address + hidden: false + immutable: false + type: string + description: be5 Cricket_OCS ip address + be_Cricket_OCS_protected_ip_3: + label: be4 Cricket_OCS ip address + hidden: false + immutable: false + type: string + description: be4 Cricket_OCS ip address + fe_Mobility_OAM_protected_ip_1: + label: fe_1 OAM ip address + hidden: false + immutable: false + type: string + description: fe_1 OAM ip address + be_Cricket_OCS_protected_ip_0: + label: be1 Cricket_OCS ip address + hidden: false + immutable: false + type: string + description: be1 Cricket_OCS ip address + route_table_fe1: + hidden: false + immutable: false + type: string + description: Additional route table for FE1 + Cricket_OCS_protected_net_id: + hidden: false + immutable: false + type: string + description: Network name for CRICKET_OCS + smp_name_2: + hidden: false + immutable: false + type: string + description: name of VM + default: vSMP2 + vnf_id: + hidden: false + immutable: false + type: string + description: Unique ID for this VNF instance + default: This_is_ths_SCP_id + smp_name_1: + hidden: false + immutable: false + type: string + description: name of VM + default: vSMP2 + flavor_smp_name: + hidden: false + immutable: false + type: string + description: SCP SMP Flavor + default: a1.Small + image_scp_be_name: + hidden: false + immutable: false + type: string + description: SCP BE image + default: asc_base_image_be + smp_name_0: + hidden: false + immutable: false + type: string + description: name of VM + default: vSMP1 + route_table_fe2: + hidden: false + immutable: false + type: string + description: Additional route table for FE2 + hostid_nee1: + hidden: false + immutable: false + type: string + description: NEE1 Hostid (from Ulticom license) + SIGNET_vrf_B1_direct_net_id: + hidden: false + immutable: false + type: string + description: Network name for SIGTRAN_B + fe_SIGNET_vrf_A1_direct_ip_0: + label: fe2 SIGTRAN ip address + hidden: false + immutable: false + type: string + description: fe2 SIGTRAN ip address + availability_zone_0: + hidden: false + immutable: false + type: string + nee_name_0: + hidden: false + immutable: false + type: string + description: name of VM + default: vNEE + ip_port_stp1: + hidden: false + immutable: false + type: string + description: STP1 IP port + ip_port_stp2: + hidden: false + immutable: false + type: string + description: STP2 IP port + image_scp_fe_name: + hidden: false + immutable: false + type: string + description: SCP FE image + default: asc_base_image_fe + flavor_scp_be_name: + hidden: false + immutable: false + type: string + description: SCP BE Flavor + default: a1.Small + policyListParam: + hidden: false + immutable: false + type: list + description: Policy server group. affinity/anti-affinity + constraints: + - valid_values: + - affinity + - anti-affinity + entry_schema: + type: string + security_group_name: + label: vSCP security group name + hidden: false + immutable: false + type: string + description: vSCP security group name + ip_port_fe2: + hidden: false + immutable: false + type: string + description: FE2 IP port in SIGTRAN network + route_table_be: + hidden: false + immutable: false + type: string + description: Additional route table for BEs + ip_port_fe1: + hidden: false + immutable: false + type: string + description: FE1 IP port in SIGTRAN network + port_name: + hidden: false + immutable: false + type: string + description: port name + default: port_name + point_code_scp: + hidden: false + immutable: false + type: string + description: vSCP point code (in "zone-cluster-member" format) + global_title_stp: + hidden: false + immutable: false + type: string + description: STP Global Title address + point_code_stp1: + hidden: false + immutable: false + type: string + description: STP1 point code (in "zone-cluster-member" format) + point_code_stp2: + hidden: false + immutable: false + type: string + description: STP2 point code (in "zone-cluster-member" format) + node_templates: + server_smp2: + type: org.openecomp.resource.vfc.nodes.heat.smp + properties: + flavor: + get_input: flavor_smp_name + availability_zone: + get_input: availability_zone_0 + image: + get_input: image_smp_name + metadata: + jx_vm_role: smp2 + vnf_id: + get_input: vnf_id + jx_lab_name: + get_input: lab_name + user_data_format: RAW + name: + get_input: smp_name_2 + scheduler_hints: + group: FE_SMP_Affinity_group + server_smp3: + type: org.openecomp.resource.vfc.nodes.heat.smp + properties: + flavor: + get_input: flavor_smp_name + availability_zone: + get_input: availability_zone_0 + image: + get_input: image_smp_name + metadata: + jx_vm_role: smp2 + vnf_id: + get_input: vnf_id + jx_lab_name: + get_input: lab_name + user_data_format: RAW + name: + get_input: smp_name_2 + scheduler_hints: + group4: UNSUPPORTED_RESOURCE_dynamicPolicy3 + group3: UNSUPPORTED_RESOURCE_dynamicPolicy2 + group2: UNSUPPORTED_RESOURCE_dynamicPolicy1 + group1: FE_SMP_Affinity_group + port3: + type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port + properties: + replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + mac_requirements: + mac_count_required: + is_required: false + network: + get_input: port_name + requirements: + - binding: + capability: tosca.capabilities.network.Bindable + node: server_smp3 + relationship: tosca.relationships.network.BindsTo + port4: + type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port + properties: + replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + mac_requirements: + mac_count_required: + is_required: false + network: + get_input: port_name + requirements: + - binding: + capability: tosca.capabilities.network.Bindable + node: server_smp3 + relationship: tosca.relationships.network.BindsTo + port1: + type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port + properties: + replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + mac_requirements: + mac_count_required: + is_required: false + network: + get_input: port_name + requirements: + - binding: + capability: tosca.capabilities.network.Bindable + node: server_smp1 + relationship: tosca.relationships.network.BindsTo + server_smp1: + type: org.openecomp.resource.vfc.nodes.heat.smp + properties: + flavor: + get_input: flavor_smp_name + availability_zone: + get_input: availability_zone_0 + image: + get_input: image_smp_name + metadata: + jx_vm_role: smp2 + vnf_id: + get_input: vnf_id + jx_lab_name: + get_input: lab_name + user_data_format: RAW + name: + get_input: smp_name_1 + scheduler_hints: + group: BE_Affinity_group + port2: + type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port + properties: + replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + mac_requirements: + mac_count_required: + is_required: false + network: + get_input: port_name + requirements: + - binding: + capability: tosca.capabilities.network.Bindable + node: server_smp2 + relationship: tosca.relationships.network.BindsTo + groups: + FE_SMP_Affinity_group: + type: tosca.groups.Root + members: + - server_smp2 + - server_smp3 + hot_template_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/hot_template.yml + description: ASC Template + members: + - server_smp2 + - server_smp3 + - port3 + - port4 + - port1 + - server_smp1 + - port2 + BE_Affinity_group: + type: tosca.groups.Root + members: + - server_smp1 + policies: + BE_Affinity_policy: + type: org.openecomp.policies.placement.Colocate + properties: + name: def + affinity: host + targets: + - BE_Affinity_group + FE_SMP_Affinity_policy: + type: org.openecomp.policies.placement.Colocate + properties: + name: abc + affinity: host + targets: + - FE_SMP_Affinity_group
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novaservergroups/inputfiles/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novaservergroups/dynamicPolicy/inputfiles/MANIFEST.json index b2916ccf9c..b2916ccf9c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novaservergroups/inputfiles/MANIFEST.json +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novaservergroups/dynamicPolicy/inputfiles/MANIFEST.json diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novaservergroups/dynamicPolicy/inputfiles/hot_template.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novaservergroups/dynamicPolicy/inputfiles/hot_template.yml new file mode 100644 index 0000000000..6d27a511dc --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novaservergroups/dynamicPolicy/inputfiles/hot_template.yml @@ -0,0 +1,403 @@ +heat_template_version: 2013-05-23 + +description: ASC Template + +parameters: + cluster_type: + type: string + constraints: + - allowed_values: [ Test, Prod ] + fe_connectivity: + type: string + constraints: + - allowed_values: [ NEE, STP ] + key_name: + type: string + description: keypair to enable SSH access to the instance. + default: vSCP-keypair + policy_value: + type: string + policyListParam: + constraints: + - allowed_values: + - affinity + - anti-affinity + description: Policy server group. affinity/anti-affinity + type: comma_delimited_list + +# Availability Zone information may need to be updated and the specifications under Nova server capabilities uncommented + availability_zone_0: + type: string + + vnf_name: + type: string + description: Unique name for this VNF instance + default: This_is_the_SCP_name + vnf_id: + type: string + description: Unique ID for this VNF instance + default: This_is_ths_SCP_id + + port_name: + type: string + description: port name + default: port_name + + flavor_scp_be_name: + type: string + description: SCP BE Flavor + default: a1.Small + flavor_scp_fe_name: + type: string + description: SCP FE Flavor + default: a1.Small + flavor_smp_name: + type: string + description: SCP SMP Flavor + default: a1.Small + image_scp_be_name: + type: string + description: SCP BE image + default: asc_base_image_be + image_scp_fe_name: + type: string + description: SCP FE image + default: asc_base_image_fe + image_smp_name: + type: string + description: SCP SMP image + default: asc_base_image_smp + int_vscp_fe_cluster_net_id: + type: string + description: LAN2 FE Cluster/KA + int_vscp_fe_cluster_cidr: + type: string + description: Private Network2 Address (CIDR notation) + int_vscp_cluster_net_id: + type: string + description: LAN3 Cluster + int_vscp_cluster_cidr: + type: string + description: Private Network3 Address (CIDR notation) + int_vscp_ce_network_net_id: + type: string + description: Inter-CE Network + int_vscp_ce_network_cidr: + type: string + description: Private Network Address (CIDR notation) + SIGNET_vrf_A1_direct_net_id: + type: string + description: Network name for SIGTRAN_A + SIGNET_vrf_B1_direct_net_id: + type: string + description: Network name for SIGTRAN_B + Cricket_OCS_protected_net_id: + type: string + description: Network name for CRICKET_OCS + Mobility_OAM_protected_net_id: + type: string + description: Network name for OAM + be_Cricket_OCS_protected_ip_0: + type: string + label: be1 Cricket_OCS ip address + description: be1 Cricket_OCS ip address + be_Cricket_OCS_protected_ip_1: + type: string + label: be2 Cricket_OCS ip address + description: be2 Cricket_OCS ip address + be_Cricket_OCS_protected_ip_2: + type: string + label: be3 Cricket_OCS ip address + description: be3 Cricket_OCS ip address + be_Cricket_OCS_protected_ip_3: + type: string + label: be4 Cricket_OCS ip address + description: be4 Cricket_OCS ip address + be_Cricket_OCS_protected_ip_4: + type: string + label: be5 Cricket_OCS ip address + description: be5 Cricket_OCS ip address + fe_SIGNET_vrf_B1_direct_ip_0: + type: string + label: fe1 SIGTRAN ip address + description: fe1 SIGTRAN ip address + fe_SIGNET_vrf_A1_direct_ip_0: + type: string + label: fe2 SIGTRAN ip address + description: fe2 SIGTRAN ip address + be_Mobility_OAM_protected_ip_0: + type: string + label: be_0 OAM ip address + description: be_0 OAM ip address + be_Mobility_OAM_protected_ip_1: + type: string + label: be_1 OAM ip address + description: be_1 OAM ip address + be_Mobility_OAM_protected_ip_2: + type: string + label: be_2 OAM ip address + description: be_2 OAM ip address + be_Mobility_OAM_protected_ip_3: + type: string + label: be_3 OAM ip address + description: be_3 OAM ip address + be_Mobility_OAM_protected_ip_4: + type: string + label: be_4 OAM ip address + description: be_4 OAM ip address + fe_Mobility_OAM_protected_ip_0: + type: string + label: fe_0 OAM ip address + description: fe_0 OAM ip address + fe_Mobility_OAM_protected_ip_1: + type: string + label: fe_1 OAM ip address + description: fe_1 OAM ip address + smp_Mobility_OAM_protected_ip_0: + type: string + label: smp_0 OAM ip address + description: smp_0 OAM ip address + smp_Mobility_OAM_protected_ip_1: + type: string + label: smp_1 OAM ip address + description: smp_1 OAM ip address + be_name_0: + type: string + default: vSCP_BE1 + description: name of VM + be_name_1: + type: string + default: vSCP_BE2 + description: name of VM + be_name_2: + type: string + default: vSCP_BE3 + description: name of VM + be_name_3: + type: string + default: vSCP_BE4 + description: name of VM + be_name_4: + type: string + default: vSCP_BE5 + description: name of VM + fe_name_0: + type: string + default: vSCP_FE1 + description: name of VM + fe_name_1: + type: string + default: vSCP_FE2 + description: name of VM + smp_name_0: + type: string + default: vSMP1 + description: name of VM + smp_name_1: + type: string + default: vSMP2 + description: name of VM + smp_name_2: + type: string + default: vSMP2 + description: name of VM + ##smp_name_2: + ##type: string + ##default: vSMP2 + ##description: name of VM + nee_name_0: + type: string + default: vNEE + description: name of VM + + hostname_fe1: + type: string + description: FE1 Hostname (from Ulticom license) + hostid_fe1: + type: string + description: FE1 Hostid (from Ulticom license) + + hostname_fe2: + type: string + description: FE2 Hostname (from Ulticom license) + hostid_fe2: + type: string + description: FE2 Hostid (from Ulticom license) + + hostname_nee1: + type: string + description: NEE1 Hostname (from Ulticom license) + hostid_nee1: + type: string + description: NEE1 Hostid (from Ulticom license) + + point_code_scp: + type: string + description: vSCP point code (in "zone-cluster-member" format) + point_code_stp: + type: string + description: STP virtual point code (in "zone-cluster-member" format) + point_code_stp1: + type: string + description: STP1 point code (in "zone-cluster-member" format) + point_code_stp2: + type: string + description: STP2 point code (in "zone-cluster-member" format) + ip_address_stp1: + type: string + description: STP1 IP address + ip_port_stp1: + type: string + description: STP1 IP port + ip_address_stp2: + type: string + description: STP2 IP address + ip_port_stp2: + type: string + description: STP2 IP port + ip_port_fe1: + type: string + description: FE1 IP port in SIGTRAN network + ip_port_fe2: + type: string + description: FE2 IP port in SIGTRAN network + + global_title_scp: + type: string + description: vSCP Global Title address + global_title_stp: + type: string + description: STP Global Title address + + security_group_name: + type: string + label: vSCP security group name + description: vSCP security group name + + route_table_be: + type: string + description: Additional route table for BEs + + route_table_fe1: + type: string + description: Additional route table for FE1 + + route_table_fe2: + type: string + description: Additional route table for FE2 + + ip_address_dra: + type: string + description: DRA VIP address + + lab_name: + type: string + description: Lab name + +resources: + + server_smp1: + type: OS::Nova::Server + properties: + name: { get_param: smp_name_1 } + image: { get_param: image_smp_name } + # key_name: { get_param: key_name } + availability_zone: { get_param: availability_zone_0 } + flavor: { get_param: flavor_smp_name } + scheduler_hints: { group: { get_resource: BE_Affinity } } + networks: + - port: { get_resource: port1 } + metadata: + vnf_id: { get_param: vnf_id } + jx_lab_name: {get_param: lab_name} + jx_vm_role: smp2 + user_data_format: RAW + server_smp2: + type: OS::Nova::Server + properties: + name: { get_param: smp_name_2 } + image: { get_param: image_smp_name } + # key_name: { get_param: key_name } + availability_zone: { get_param: availability_zone_0 } + flavor: { get_param: flavor_smp_name } + scheduler_hints: { group: { get_resource: FE_SMP_Affinity } } + networks: + - port: { get_resource: port2 } + metadata: + vnf_id: { get_param: vnf_id } + jx_lab_name: {get_param: lab_name} + jx_vm_role: smp2 + user_data_format: RAW + + server_smp3: + type: OS::Nova::Server + properties: + name: { get_param: smp_name_2 } + image: { get_param: image_smp_name } + # key_name: { get_param: key_name } + availability_zone: { get_param: availability_zone_0 } + flavor: { get_param: flavor_smp_name } + scheduler_hints: { group1: { get_resource: FE_SMP_Affinity }, group2: { get_resource: + dynamicPolicy1 }, group3: { get_resource: dynamicPolicy2 }, group4: { get_resource: dynamicPolicy3 } } + networks: + - port: { get_resource: port3 } + - port: { get_resource: port4 } + metadata: + vnf_id: { get_param: vnf_id } + jx_lab_name: {get_param: lab_name} + jx_vm_role: smp2 + user_data_format: RAW + + port1: + type: OS::Neutron::Port + properties: + network: {get_param: port_name} + replacement_policy: AUTO + + port2: + type: OS::Neutron::Port + properties: + network: {get_param: port_name} + replacement_policy: AUTO + + port3: + type: OS::Neutron::Port + properties: + network: {get_param: port_name} + replacement_policy: AUTO + + port4: + type: OS::Neutron::Port + properties: + network: {get_param: port_name} + replacement_policy: AUTO + + FE_SMP_Affinity: + type: OS::Nova::ServerGroup + properties: + policies: ["affinity"] + name: abc + BE_Affinity: + type: OS::Nova::ServerGroup + properties: + policies: ["affinity"] + name: def + dynamicPolicy1: + type: OS::Nova::ServerGroup + properties: + policies: [{ get_param: policy_value }] + name: def + dynamicPolicy2: + type: OS::Nova::ServerGroup + properties: + policies: [{ get_attr: [port4, show]}] + name: def + dynamicPolicy3: + type: OS::Nova::ServerGroup + properties: + policies: { get_param: policyListParam} + name: def + + + + diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novaservergroups/sharedServerGroup/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novaservergroups/sharedServerGroup/expectedoutputfiles/MainServiceTemplate.yaml new file mode 100644 index 0000000000..b6c5471953 --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novaservergroups/sharedServerGroup/expectedoutputfiles/MainServiceTemplate.yaml @@ -0,0 +1,509 @@ +tosca_definitions_version: tosca_simple_yaml_1_0_0 +metadata: + template_name: Main +imports: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +node_types: + org.openecomp.resource.vfc.nodes.heat.smp: + derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server +topology_template: + inputs: + hostid_fe1: + hidden: false + immutable: false + type: string + description: FE1 Hostid (from Ulticom license) + ip_address_stp2: + hidden: false + immutable: false + type: string + description: STP2 IP address + Mobility_OAM_protected_net_id: + hidden: false + immutable: false + type: string + description: Network name for OAM + hostid_fe2: + hidden: false + immutable: false + type: string + description: FE2 Hostid (from Ulticom license) + flavor_scp_fe_name: + hidden: false + immutable: false + type: string + description: SCP FE Flavor + default: a1.Small + ip_address_stp1: + hidden: false + immutable: false + type: string + description: STP1 IP address + int_vscp_ce_network_net_id: + hidden: false + immutable: false + type: string + description: Inter-CE Network + shared_server_group: + hidden: false + immutable: false + type: string + int_vscp_ce_network_cidr: + hidden: false + immutable: false + type: string + description: Private Network Address (CIDR notation) + cluster_type: + hidden: false + immutable: false + type: string + constraints: + - valid_values: + - Test + - Prod + be_Mobility_OAM_protected_ip_1: + label: be_1 OAM ip address + hidden: false + immutable: false + type: string + description: be_1 OAM ip address + be_Mobility_OAM_protected_ip_2: + label: be_2 OAM ip address + hidden: false + immutable: false + type: string + description: be_2 OAM ip address + be_Mobility_OAM_protected_ip_0: + label: be_0 OAM ip address + hidden: false + immutable: false + type: string + description: be_0 OAM ip address + ip_address_dra: + hidden: false + immutable: false + type: string + description: DRA VIP address + image_smp_name: + hidden: false + immutable: false + type: string + fe_connectivity: + hidden: false + immutable: false + type: string + constraints: + - valid_values: + - NEE + - STP + lab_name: + hidden: false + immutable: false + type: string + description: Lab name + smp_Mobility_OAM_protected_ip_1: + label: smp_1 OAM ip address + hidden: false + immutable: false + type: string + description: smp_1 OAM ip address + fe_SIGNET_vrf_B1_direct_ip_0: + label: fe1 SIGTRAN ip address + hidden: false + immutable: false + type: string + description: fe1 SIGTRAN ip address + smp_Mobility_OAM_protected_ip_0: + label: smp_0 OAM ip address + hidden: false + immutable: false + type: string + description: smp_0 OAM ip address + int_vscp_cluster_net_id: + hidden: false + immutable: false + type: string + description: LAN3 Cluster + be_Mobility_OAM_protected_ip_3: + label: be_3 OAM ip address + hidden: false + immutable: false + type: string + description: be_3 OAM ip address + be_Mobility_OAM_protected_ip_4: + label: be_4 OAM ip address + hidden: false + immutable: false + type: string + description: be_4 OAM ip address + hostname_nee1: + hidden: false + immutable: false + type: string + description: NEE1 Hostname (from Ulticom license) + int_vscp_fe_cluster_net_id: + hidden: false + immutable: false + type: string + description: LAN2 FE Cluster/KA + SIGNET_vrf_A1_direct_net_id: + hidden: false + immutable: false + type: string + description: Network name for SIGTRAN_A + key_name: + hidden: false + immutable: false + type: string + description: keypair to enable SSH access to the instance. + default: vSCP-keypair + int_vscp_fe_cluster_cidr: + hidden: false + immutable: false + type: string + description: Private Network2 Address (CIDR notation) + fe_name_1: + hidden: false + immutable: false + type: string + description: name of VM + default: vSCP_FE2 + fe_name_0: + hidden: false + immutable: false + type: string + description: name of VM + default: vSCP_FE1 + be_name_0: + hidden: false + immutable: false + type: string + description: name of VM + default: vSCP_BE1 + int_vscp_cluster_cidr: + hidden: false + immutable: false + type: string + description: Private Network3 Address (CIDR notation) + be_name_1: + hidden: false + immutable: false + type: string + description: name of VM + default: vSCP_BE2 + be_name_2: + hidden: false + immutable: false + type: string + description: name of VM + default: vSCP_BE3 + point_code_stp: + hidden: false + immutable: false + type: string + description: STP virtual point code (in "zone-cluster-member" format) + be_name_3: + hidden: false + immutable: false + type: string + description: name of VM + default: vSCP_BE4 + be_name_4: + hidden: false + immutable: false + type: string + description: name of VM + default: vSCP_BE5 + global_title_scp: + hidden: false + immutable: false + type: string + description: vSCP Global Title address + vnf_name: + hidden: false + immutable: false + type: string + description: Unique name for this VNF instance + default: This_is_the_SCP_name + be_Cricket_OCS_protected_ip_2: + label: be3 Cricket_OCS ip address + hidden: false + immutable: false + type: string + description: be3 Cricket_OCS ip address + fe_Mobility_OAM_protected_ip_0: + label: fe_0 OAM ip address + hidden: false + immutable: false + type: string + description: fe_0 OAM ip address + hostname_fe1: + hidden: false + immutable: false + type: string + description: FE1 Hostname (from Ulticom license) + be_Cricket_OCS_protected_ip_1: + label: be2 Cricket_OCS ip address + hidden: false + immutable: false + type: string + description: be2 Cricket_OCS ip address + hostname_fe2: + hidden: false + immutable: false + type: string + description: FE2 Hostname (from Ulticom license) + be_Cricket_OCS_protected_ip_4: + label: be5 Cricket_OCS ip address + hidden: false + immutable: false + type: string + description: be5 Cricket_OCS ip address + be_Cricket_OCS_protected_ip_3: + label: be4 Cricket_OCS ip address + hidden: false + immutable: false + type: string + description: be4 Cricket_OCS ip address + fe_Mobility_OAM_protected_ip_1: + label: fe_1 OAM ip address + hidden: false + immutable: false + type: string + description: fe_1 OAM ip address + be_Cricket_OCS_protected_ip_0: + label: be1 Cricket_OCS ip address + hidden: false + immutable: false + type: string + description: be1 Cricket_OCS ip address + route_table_fe1: + hidden: false + immutable: false + type: string + description: Additional route table for FE1 + Cricket_OCS_protected_net_id: + hidden: false + immutable: false + type: string + description: Network name for CRICKET_OCS + smp_name_2: + hidden: false + immutable: false + type: string + vnf_id: + hidden: false + immutable: false + type: string + description: Unique ID for this VNF instance + default: This_is_ths_SCP_id + smp_name_1: + hidden: false + immutable: false + type: string + description: name of VM + default: vSMP2 + flavor_smp_name: + hidden: false + immutable: false + type: string + image_scp_be_name: + hidden: false + immutable: false + type: string + description: SCP BE image + default: asc_base_image_be + smp_name_0: + hidden: false + immutable: false + type: string + description: name of VM + default: vSMP1 + route_table_fe2: + hidden: false + immutable: false + type: string + description: Additional route table for FE2 + hostid_nee1: + hidden: false + immutable: false + type: string + description: NEE1 Hostid (from Ulticom license) + SIGNET_vrf_B1_direct_net_id: + hidden: false + immutable: false + type: string + description: Network name for SIGTRAN_B + fe_SIGNET_vrf_A1_direct_ip_0: + label: fe2 SIGTRAN ip address + hidden: false + immutable: false + type: string + description: fe2 SIGTRAN ip address + availability_zone_0: + hidden: false + immutable: false + type: string + nee_name_0: + hidden: false + immutable: false + type: string + description: name of VM + default: vNEE + ip_port_stp1: + hidden: false + immutable: false + type: string + description: STP1 IP port + ip_port_stp2: + hidden: false + immutable: false + type: string + description: STP2 IP port + image_scp_fe_name: + hidden: false + immutable: false + type: string + description: SCP FE image + default: asc_base_image_fe + flavor_scp_be_name: + hidden: false + immutable: false + type: string + description: SCP BE Flavor + default: a1.Small + shared_nova: + hidden: false + immutable: false + type: string + security_group_name: + label: vSCP security group name + hidden: false + immutable: false + type: string + description: vSCP security group name + ip_port_fe2: + hidden: false + immutable: false + type: string + description: FE2 IP port in SIGTRAN network + route_table_be: + hidden: false + immutable: false + type: string + description: Additional route table for BEs + ip_port_fe1: + hidden: false + immutable: false + type: string + description: FE1 IP port in SIGTRAN network + port_name: + hidden: false + immutable: false + type: string + description: port name + default: port_name + point_code_scp: + hidden: false + immutable: false + type: string + description: vSCP point code (in "zone-cluster-member" format) + global_title_stp: + hidden: false + immutable: false + type: string + description: STP Global Title address + point_code_stp1: + hidden: false + immutable: false + type: string + description: STP1 point code (in "zone-cluster-member" format) + point_code_stp2: + hidden: false + immutable: false + type: string + description: STP2 point code (in "zone-cluster-member" format) + node_templates: + server_smp_base: + type: org.openecomp.resource.vfc.nodes.heat.smp + properties: + flavor: + get_input: flavor_smp_name + availability_zone: + get_input: availability_zone_0 + image: + get_input: image_smp_name + metadata: + vnf_id: + get_input: vnf_id + name: + get_input: smp_name_2 + scheduler_hints: + group2: Multi_Anti_Affinity_group + group1: FE_SMP_Affinity_group + server_smp_addOn: + type: org.openecomp.resource.vfc.nodes.heat.smp + properties: + flavor: + get_input: flavor_smp_name + availability_zone: + get_input: availability_zone_0 + image: + get_input: image_smp_name + name: + get_input: smp_name_2 + scheduler_hints: + group2: + get_input: shared_nova + group1: + get_input: shared_server_group + groups: + FE_SMP_Affinity_group: + type: tosca.groups.Root + members: + - server_smp_base + Multi_Anti_Affinity_group: + type: tosca.groups.Root + members: + - server_smp_base + shared_Server_group_group: + type: tosca.groups.Root + members: + - server_smp_addOn + addOn_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/addOn.yml + description: ASC Template + members: + - server_smp_addOn + hot_template_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/hot_template.yml + description: ASC Template + members: + - server_smp_base + policies: + shared_Server_group_policy: + type: org.openecomp.policies.placement.Antilocate + properties: + name: def + container_type: host + targets: + - shared_Server_group_group + FE_SMP_Affinity_policy: + type: org.openecomp.policies.placement.Colocate + properties: + name: abc + affinity: host + targets: + - FE_SMP_Affinity_group + Multi_Anti_Affinity_policy: + type: org.openecomp.policies.placement.Antilocate + properties: + name: def + container_type: host + targets: + - Multi_Anti_Affinity_group
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novaservergroups/sharedServerGroup/inputfiles/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novaservergroups/sharedServerGroup/inputfiles/MANIFEST.json new file mode 100644 index 0000000000..30d1f18a26 --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novaservergroups/sharedServerGroup/inputfiles/MANIFEST.json @@ -0,0 +1,17 @@ +{ + "name": "vMME_Small", + "description": "HOT template to create 2 cinder volume attachment", + "version": "2013-05-23", + "data": [ + { + "file": "hot_template.yml", + "type": "HEAT", + "isBase": "true" + }, + { + "file": "addOn.yml", + "type": "HEAT", + "isBase": "false" + } + ] +} diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novaservergroups/sharedServerGroup/inputfiles/addOn.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novaservergroups/sharedServerGroup/inputfiles/addOn.yml new file mode 100644 index 0000000000..9e17ca4837 --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novaservergroups/sharedServerGroup/inputfiles/addOn.yml @@ -0,0 +1,33 @@ +heat_template_version: 2013-05-23 + +description: ASC Template + +parameters: + smp_name_2: + type: string + image_smp_name: + type: string + availability_zone_0: + type: string + flavor_smp_name: + type: string + shared_server_group: + type: string + shared_nova: + type: string + + +resources: + server_smp_addOn: + type: OS::Nova::Server + properties: + name: { get_param: smp_name_2 } + image: { get_param: image_smp_name } + availability_zone: { get_param: availability_zone_0 } + flavor: { get_param: flavor_smp_name } + scheduler_hints: { group1: { get_param: shared_server_group }, group2: { get_param: shared_nova }} + + + + + diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novaservergroups/sharedServerGroup/inputfiles/hot_template.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novaservergroups/sharedServerGroup/inputfiles/hot_template.yml new file mode 100644 index 0000000000..04bb491a01 --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novaservergroups/sharedServerGroup/inputfiles/hot_template.yml @@ -0,0 +1,328 @@ +heat_template_version: 2013-05-23 + +description: ASC Template + +parameters: + cluster_type: + type: string + constraints: + - allowed_values: [ Test, Prod ] + fe_connectivity: + type: string + constraints: + - allowed_values: [ NEE, STP ] + key_name: + type: string + description: keypair to enable SSH access to the instance. + default: vSCP-keypair + +# Availability Zone information may need to be updated and the specifications under Nova server capabilities uncommented + availability_zone_0: + type: string + + vnf_name: + type: string + description: Unique name for this VNF instance + default: This_is_the_SCP_name + vnf_id: + type: string + description: Unique ID for this VNF instance + default: This_is_ths_SCP_id + + port_name: + type: string + description: port name + default: port_name + + flavor_scp_be_name: + type: string + description: SCP BE Flavor + default: a1.Small + flavor_scp_fe_name: + type: string + description: SCP FE Flavor + default: a1.Small + flavor_smp_name: + type: string + description: SCP SMP Flavor + default: a1.Small + image_scp_be_name: + type: string + description: SCP BE image + default: asc_base_image_be + image_scp_fe_name: + type: string + description: SCP FE image + default: asc_base_image_fe + image_smp_name: + type: string + description: SCP SMP image + default: asc_base_image_smp + int_vscp_fe_cluster_net_id: + type: string + description: LAN2 FE Cluster/KA + int_vscp_fe_cluster_cidr: + type: string + description: Private Network2 Address (CIDR notation) + int_vscp_cluster_net_id: + type: string + description: LAN3 Cluster + int_vscp_cluster_cidr: + type: string + description: Private Network3 Address (CIDR notation) + int_vscp_ce_network_net_id: + type: string + description: Inter-CE Network + int_vscp_ce_network_cidr: + type: string + description: Private Network Address (CIDR notation) + SIGNET_vrf_A1_direct_net_id: + type: string + description: Network name for SIGTRAN_A + SIGNET_vrf_B1_direct_net_id: + type: string + description: Network name for SIGTRAN_B + Cricket_OCS_protected_net_id: + type: string + description: Network name for CRICKET_OCS + Mobility_OAM_protected_net_id: + type: string + description: Network name for OAM + be_Cricket_OCS_protected_ip_0: + type: string + label: be1 Cricket_OCS ip address + description: be1 Cricket_OCS ip address + be_Cricket_OCS_protected_ip_1: + type: string + label: be2 Cricket_OCS ip address + description: be2 Cricket_OCS ip address + be_Cricket_OCS_protected_ip_2: + type: string + label: be3 Cricket_OCS ip address + description: be3 Cricket_OCS ip address + be_Cricket_OCS_protected_ip_3: + type: string + label: be4 Cricket_OCS ip address + description: be4 Cricket_OCS ip address + be_Cricket_OCS_protected_ip_4: + type: string + label: be5 Cricket_OCS ip address + description: be5 Cricket_OCS ip address + fe_SIGNET_vrf_B1_direct_ip_0: + type: string + label: fe1 SIGTRAN ip address + description: fe1 SIGTRAN ip address + fe_SIGNET_vrf_A1_direct_ip_0: + type: string + label: fe2 SIGTRAN ip address + description: fe2 SIGTRAN ip address + be_Mobility_OAM_protected_ip_0: + type: string + label: be_0 OAM ip address + description: be_0 OAM ip address + be_Mobility_OAM_protected_ip_1: + type: string + label: be_1 OAM ip address + description: be_1 OAM ip address + be_Mobility_OAM_protected_ip_2: + type: string + label: be_2 OAM ip address + description: be_2 OAM ip address + be_Mobility_OAM_protected_ip_3: + type: string + label: be_3 OAM ip address + description: be_3 OAM ip address + be_Mobility_OAM_protected_ip_4: + type: string + label: be_4 OAM ip address + description: be_4 OAM ip address + fe_Mobility_OAM_protected_ip_0: + type: string + label: fe_0 OAM ip address + description: fe_0 OAM ip address + fe_Mobility_OAM_protected_ip_1: + type: string + label: fe_1 OAM ip address + description: fe_1 OAM ip address + smp_Mobility_OAM_protected_ip_0: + type: string + label: smp_0 OAM ip address + description: smp_0 OAM ip address + smp_Mobility_OAM_protected_ip_1: + type: string + label: smp_1 OAM ip address + description: smp_1 OAM ip address + be_name_0: + type: string + default: vSCP_BE1 + description: name of VM + be_name_1: + type: string + default: vSCP_BE2 + description: name of VM + be_name_2: + type: string + default: vSCP_BE3 + description: name of VM + be_name_3: + type: string + default: vSCP_BE4 + description: name of VM + be_name_4: + type: string + default: vSCP_BE5 + description: name of VM + fe_name_0: + type: string + default: vSCP_FE1 + description: name of VM + fe_name_1: + type: string + default: vSCP_FE2 + description: name of VM + smp_name_0: + type: string + default: vSMP1 + description: name of VM + smp_name_1: + type: string + default: vSMP2 + description: name of VM + smp_name_2: + type: string + default: vSMP2 + description: name of VM + ##smp_name_2: + ##type: string + ##default: vSMP2 + ##description: name of VM + nee_name_0: + type: string + default: vNEE + description: name of VM + + hostname_fe1: + type: string + description: FE1 Hostname (from Ulticom license) + hostid_fe1: + type: string + description: FE1 Hostid (from Ulticom license) + + hostname_fe2: + type: string + description: FE2 Hostname (from Ulticom license) + hostid_fe2: + type: string + description: FE2 Hostid (from Ulticom license) + + hostname_nee1: + type: string + description: NEE1 Hostname (from Ulticom license) + hostid_nee1: + type: string + description: NEE1 Hostid (from Ulticom license) + + point_code_scp: + type: string + description: vSCP point code (in "zone-cluster-member" format) + point_code_stp: + type: string + description: STP virtual point code (in "zone-cluster-member" format) + point_code_stp1: + type: string + description: STP1 point code (in "zone-cluster-member" format) + point_code_stp2: + type: string + description: STP2 point code (in "zone-cluster-member" format) + ip_address_stp1: + type: string + description: STP1 IP address + ip_port_stp1: + type: string + description: STP1 IP port + ip_address_stp2: + type: string + description: STP2 IP address + ip_port_stp2: + type: string + description: STP2 IP port + ip_port_fe1: + type: string + description: FE1 IP port in SIGTRAN network + ip_port_fe2: + type: string + description: FE2 IP port in SIGTRAN network + + global_title_scp: + type: string + description: vSCP Global Title address + global_title_stp: + type: string + description: STP Global Title address + + security_group_name: + type: string + label: vSCP security group name + description: vSCP security group name + + route_table_be: + type: string + description: Additional route table for BEs + + route_table_fe1: + type: string + description: Additional route table for FE1 + + route_table_fe2: + type: string + description: Additional route table for FE2 + + ip_address_dra: + type: string + description: DRA VIP address + + lab_name: + type: string + description: Lab name + +resources: + server_smp_base: + type: OS::Nova::Server + properties: + name: { get_param: smp_name_2 } + image: { get_param: image_smp_name } + # key_name: { get_param: key_name } + availability_zone: { get_param: availability_zone_0 } + flavor: { get_param: flavor_smp_name } + scheduler_hints: { group1: { get_resource: FE_SMP_Affinity }, group2: { get_resource: Multi_Anti_Affinity } } + metadata: + vnf_id: { get_param: vnf_id } + + FE_SMP_Affinity: + type: OS::Nova::ServerGroup + properties: + policies: ["affinity"] + name: abc + + Multi_Anti_Affinity: + type: OS::Nova::ServerGroup + properties: + policies: ["anti-affinity"] + name: def + + shared_Server_group: + type: OS::Nova::ServerGroup + properties: + policies: ["anti-affinity"] + name: def + + +outputs: + shared_server_group: + value: {get_resource: shared_Server_group} + shared_nova: + value: {get_resource: server_smp_base} + + + + diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novaservergroups/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novaservergroups/staticPolicy/expectedoutputfiles/MainServiceTemplate.yaml index 94f731985b..299ad49955 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novaservergroups/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novaservergroups/staticPolicy/expectedoutputfiles/MainServiceTemplate.yaml @@ -2,32 +2,8 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0 metadata: template_name: Main imports: - ContrailComputeGlobalTypes: - file: ContrailComputeGlobalTypesServiceTemplate.yaml - CinderVolumeGlobalTypes: - file: CinderVolumeGlobalTypesServiceTemplate.yaml - ContrailVirtualNetworkGlobalType: - file: ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml - AbstractSubstituteGlobalTypes: - file: AbstractSubstituteGlobalTypesServiceTemplate.yaml - ContrailPortGlobalTypes: - file: ContrailPortGlobalTypesServiceTemplate.yaml - NeutronPortGlobalTypes: - file: NeutronPortGlobalTypesServiceTemplate.yaml - NeutronNetGlobalTypes: - file: NeutronNetGlobalTypesServiceTemplate.yaml - CommonGlobalTypes: - file: CommonGlobalTypesServiceTemplate.yaml - ContrailAbstractSubstituteGlobalTypes: - file: ContrailAbstractSubstituteGlobalTypesServiceTemplate.yaml - ContrailNetworkRuleGlobalType: - file: ContrailNetworkRuleGlobalTypeServiceTemplate.yaml - NeutronSecurityRulesGlobalTypes: - file: NeutronSecurityRulesGlobalTypesServiceTemplate.yaml - NovaServerGlobalTypes: - file: NovaServerGlobalTypesServiceTemplate.yaml - ContrailV2VirtualMachineInterfaceGlobalType: - file: ContrailV2VirtualMachineInterfaceGlobalTypeServiceTemplate.yaml +- openecomp_heat_index: + file: openecomp-heat/_index.yml node_types: org.openecomp.resource.vfc.nodes.heat.smp: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server @@ -466,7 +442,7 @@ topology_template: name: get_input: smp_name_2 scheduler_hints: - group: FE_SMP_Affinity + group: FE_SMP_Affinity_group server_smp3: type: org.openecomp.resource.vfc.nodes.heat.smp properties: @@ -486,12 +462,21 @@ topology_template: name: get_input: smp_name_2 scheduler_hints: - group2: Multi_Anti_Affinity - group1: FE_SMP_Affinity + group2: Multi_Anti_Affinity_group + group1: FE_SMP_Affinity_group port3: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + mac_requirements: + mac_count_required: + is_required: false network: get_input: port_name requirements: @@ -503,6 +488,15 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + mac_requirements: + mac_count_required: + is_required: false network: get_input: port_name requirements: @@ -514,6 +508,15 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + mac_requirements: + mac_count_required: + is_required: false network: get_input: port_name requirements: @@ -540,11 +543,20 @@ topology_template: name: get_input: smp_name_1 scheduler_hints: - group: BE_Affinity + group: BE_Affinity_group port2: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + mac_requirements: + mac_count_required: + is_required: false network: get_input: port_name requirements: @@ -553,16 +565,16 @@ topology_template: node: server_smp2 relationship: tosca.relationships.network.BindsTo groups: - FE_SMP_Affinity: + FE_SMP_Affinity_group: type: tosca.groups.Root members: - server_smp2 - server_smp3 - Multi_Anti_Affinity: + Multi_Anti_Affinity_group: type: tosca.groups.Root members: - server_smp3 - hot_template: + hot_template_group: type: org.openecomp.groups.heat.HeatStack properties: heat_file: ../Artifacts/hot_template.yml @@ -575,29 +587,29 @@ topology_template: - port1 - server_smp1 - port2 - BE_Affinity: + BE_Affinity_group: type: tosca.groups.Root members: - server_smp1 policies: - FE_SMP_Affinity: + BE_Affinity_policy: + type: org.openecomp.policies.placement.Colocate + properties: + name: def + affinity: host + targets: + - BE_Affinity_group + FE_SMP_Affinity_policy: type: org.openecomp.policies.placement.Colocate properties: name: abc affinity: host targets: - - FE_SMP_Affinity - Multi_Anti_Affinity: + - FE_SMP_Affinity_group + Multi_Anti_Affinity_policy: type: org.openecomp.policies.placement.Antilocate properties: name: def container_type: host targets: - - Multi_Anti_Affinity - BE_Affinity: - type: org.openecomp.policies.placement.Colocate - properties: - name: def - affinity: host - targets: - - BE_Affinity
\ No newline at end of file + - Multi_Anti_Affinity_group
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novaservergroups/staticPolicy/inputfiles/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novaservergroups/staticPolicy/inputfiles/MANIFEST.json new file mode 100644 index 0000000000..b2916ccf9c --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novaservergroups/staticPolicy/inputfiles/MANIFEST.json @@ -0,0 +1,11 @@ +{ + "name": "vMME_Small", + "description": "HOT template to create 2 cinder volume attachment", + "version": "2013-05-23", + "data": [ + { + "file": "hot_template.yml", + "type": "HEAT" + } + ] +} diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novaservergroups/inputfiles/hot_template.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novaservergroups/staticPolicy/inputfiles/hot_template.yml index 8dcbe20043..8dcbe20043 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novaservergroups/inputfiles/hot_template.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novaservergroups/staticPolicy/inputfiles/hot_template.yml |