diff options
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/resources')
7 files changed, 492 insertions, 113 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/resources/OS_Contrail_Network_Rule/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/resources/OS_Contrail_Network_Rule/expectedoutputfiles/MainServiceTemplate.yaml index 0d9ec35ce7..7197964d8b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/resources/OS_Contrail_Network_Rule/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/resources/OS_Contrail_Network_Rule/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 topology_template: inputs: start_src_ports: @@ -185,7 +161,7 @@ topology_template: end: get_input: private_net_2_pool_end groups: - network_policy_chain: + network_policy_chain_group: type: org.openecomp.groups.heat.HeatStack properties: heat_file: ../Artifacts/network_policy_chain.yaml diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/resources/OS_Contrail_VirtualNetwork/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/resources/OS_Contrail_VirtualNetwork/expectedoutputfiles/MainServiceTemplate.yaml index 2b047dd8ae..d1a2daf0ef 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/resources/OS_Contrail_VirtualNetwork/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/resources/OS_Contrail_VirtualNetwork/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.NCB1: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server @@ -646,9 +622,19 @@ topology_template: VLC2_OAM: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false fixed_ips: - ip_address: get_input: vlc2-oam-ip + mac_requirements: + mac_count_required: + is_required: false + network_role_tag: oam network: get_input: oam_net_id requirements: @@ -677,6 +663,15 @@ topology_template: NCB1_Internal1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + 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: true mac_address: get_input: ncb1-Internal1-mac network: Internal1-net @@ -692,6 +687,15 @@ topology_template: VLC2_Internal2: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + 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: true mac_address: get_input: vlc2-Internal2-mac network: Internal2-net @@ -707,6 +711,15 @@ topology_template: NCB1_Internal2: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + 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: true mac_address: get_input: ncb1-Internal2-mac network: Internal2-net @@ -722,6 +735,15 @@ topology_template: VLC2_Internal1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + 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: true mac_address: get_input: vlc2-Internal1-mac network: Internal1-net @@ -737,9 +759,18 @@ topology_template: VLC2_GTP: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false fixed_ips: - ip_address: get_input: vlc2-gtp-ip + mac_requirements: + mac_count_required: + is_required: false network: epc-gtp-net requirements: - link: @@ -788,9 +819,19 @@ topology_template: FSB1_OAM: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false fixed_ips: - ip_address: get_input: fsb1-oam-ip + mac_requirements: + mac_count_required: + is_required: false + network_role_tag: oam network: get_input: oam_net_id requirements: @@ -842,6 +883,15 @@ topology_template: GPB2_Internal1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + 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: true mac_address: get_input: gpb2-Internal1-mac network: Internal1-net @@ -857,6 +907,15 @@ topology_template: GPB2_Internal2: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + 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: true mac_address: get_input: gpb2-Internal2-mac network: Internal2-net @@ -883,6 +942,15 @@ topology_template: NCB2_Internal2: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + 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: true mac_address: get_input: ncb2-Internal2-mac network: Internal2-net @@ -898,6 +966,15 @@ topology_template: NCB2_Internal1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + 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: true mac_address: get_input: ncb2-Internal1-mac network: Internal1-net @@ -952,6 +1029,15 @@ topology_template: VLC1_Internal1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + 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: true mac_address: get_input: vlc1-Internal1-mac network: Internal1-net @@ -985,6 +1071,15 @@ topology_template: VLC1_Internal2: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + 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: true mac_address: get_input: vlc1-Internal2-mac network: Internal2-net @@ -1000,9 +1095,18 @@ topology_template: VLC1_SCTP_B: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false fixed_ips: - ip_address: get_input: vlc1-sctp-b-ip + mac_requirements: + mac_count_required: + is_required: false network: epc-sctp-b-net requirements: - link: @@ -1016,9 +1120,18 @@ topology_template: VLC2_SCTP_B: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false fixed_ips: - ip_address: get_input: vlc2-sctp-b-ip + mac_requirements: + mac_count_required: + is_required: false network: epc-sctp-b-net requirements: - link: @@ -1032,9 +1145,18 @@ topology_template: VLC1_SCTP_A: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false fixed_ips: - ip_address: get_input: vlc1-sctp-a-ip + mac_requirements: + mac_count_required: + is_required: false network: epc-sctp-a-net requirements: - link: @@ -1048,9 +1170,18 @@ topology_template: VLC2_SCTP_A: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false fixed_ips: - ip_address: get_input: vlc2-sctp-a-ip + mac_requirements: + mac_count_required: + is_required: false network: epc-sctp-a-net requirements: - link: @@ -1075,6 +1206,15 @@ topology_template: FSB1_Internal2: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + 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: true mac_address: get_input: fsb1-Internal2-mac network: Internal2-net @@ -1101,6 +1241,15 @@ topology_template: FSB1_Internal1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + 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: true mac_address: get_input: fsb1-Internal1-mac network: Internal1-net @@ -1116,6 +1265,15 @@ topology_template: FSB2_Internal2: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + 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: true mac_address: get_input: fsb2-Internal2-mac network: Internal2-net @@ -1131,6 +1289,15 @@ topology_template: FSB2_Internal1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + 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: true mac_address: get_input: fsb2-Internal1-mac network: Internal1-net @@ -1146,9 +1313,19 @@ topology_template: VLC1_OAM: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false fixed_ips: - ip_address: get_input: vlc1-oam-ip + mac_requirements: + mac_count_required: + is_required: false + network_role_tag: oam network: get_input: oam_net_id requirements: @@ -1199,9 +1376,18 @@ topology_template: VLC1_GTP: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false fixed_ips: - ip_address: get_input: vlc1-gtp-ip + mac_requirements: + mac_count_required: + is_required: false network: epc-gtp-net requirements: - link: @@ -1215,9 +1401,19 @@ topology_template: FSB2_OAM: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false fixed_ips: - ip_address: get_input: fsb2-oam-ip + mac_requirements: + mac_count_required: + is_required: false + network_role_tag: oam network: get_input: oam_net_id requirements: @@ -1228,6 +1424,15 @@ topology_template: GPB1_Internal2: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + 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: true mac_address: get_input: gpb1-Internal2-mac network: Internal2-net @@ -1243,6 +1448,15 @@ topology_template: GPB1_Internal1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + 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: true mac_address: get_input: gpb1-Internal1-mac network: Internal1-net @@ -1256,7 +1470,7 @@ topology_template: node: GPB1 relationship: tosca.relationships.network.BindsTo groups: - vmme_small: + vmme_small_group: type: org.openecomp.groups.heat.HeatStack properties: heat_file: ../Artifacts/vmme_small.yml diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/resources/OS_Neutron_Net/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/resources/OS_Neutron_Net/expectedoutputfiles/MainServiceTemplate.yaml index c93363e850..63d9b08d82 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/resources/OS_Neutron_Net/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/resources/OS_Neutron_Net/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 topology_template: inputs: param_number: @@ -204,7 +180,7 @@ topology_template: key1: spec1 key2: spec2 groups: - ep-jsa_net: + ep-jsa_net_group: type: org.openecomp.groups.heat.HeatStack properties: heat_file: ../Artifacts/ep-jsa_net.yaml diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/resources/OS_Nova_Server/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/resources/OS_Nova_Server/expectedoutputfiles/MainServiceTemplate.yaml index 4eacd2f60a..c97b870219 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/resources/OS_Nova_Server/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/resources/OS_Nova_Server/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.FSB2: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server @@ -342,11 +318,21 @@ topology_template: pcm_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: - ip_address: get_input: oam_net_ip + mac_requirements: + mac_count_required: + is_required: false + network_role_tag: oam network: get_input: oam_net_name requirements: @@ -362,6 +348,15 @@ topology_template: FSB1_Internal2: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + 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: true mac_address: get_input: fsb1-Internal2-mac network: Internal2-net @@ -382,6 +377,15 @@ topology_template: FSB1_Internal1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + 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: true mac_address: get_input: fsb1-Internal1-mac network: Internal1-net @@ -397,9 +401,19 @@ topology_template: FSB1_OAM: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false fixed_ips: - ip_address: get_input: fsb1-oam-ip + mac_requirements: + mac_count_required: + is_required: false + network_role_tag: oam network: get_input: oam_net_id requirements: @@ -410,11 +424,21 @@ topology_template: psm01_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: pcrf_security_group_name fixed_ips: - ip_address: get_input: pcrf_cps_net_ip + mac_requirements: + mac_count_required: + is_required: false + network_role_tag: pcrf_cps network: get_input: pcrf_cps_net_name requirements: @@ -425,11 +449,21 @@ topology_template: pcm_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: - ip_address: get_input: cps_net_ip + mac_requirements: + mac_count_required: + is_required: false + network_role_tag: cps network: get_input: cps_net_name requirements: @@ -451,7 +485,7 @@ topology_template: get_input: availabilityzone_name image: get_input: pcm_image_name - config_drive: 'True' + config_drive: true user_data_format: RAW name: get_input: pcm_server_name @@ -475,10 +509,10 @@ topology_template: get_input: availabilityzone_name image: get_input: pcrf_psm_image_name - config_drive: 'True' metadata: vnf_id: get_input: pcrf_vnf_id + config_drive: true user_data_format: RAW name: get_input: pcrf_psm_server_name @@ -491,7 +525,7 @@ topology_template: get_input: availabilityzone_name image: get_input: pcm_image_name - config_drive: 'True' + config_drive: true user_data_format: RAW name: get_input: pcm_server_name @@ -567,18 +601,18 @@ topology_template: file: ../Artifacts/nimbus-ethernet relationship_templates: server_VolumeTest_4: - type: org.openecomp.relationships.heat.cinder.VolumeAttachesTo + type: org.openecomp.relationships.VolumeAttachesTo properties: volume_id: server_VolumeTest_snapshot01 instance_uuid: server_VolumeTest device: vdb server_VolumeTest_5: - type: org.openecomp.relationships.heat.cinder.VolumeAttachesTo + type: org.openecomp.relationships.VolumeAttachesTo properties: volume_id: server_VolumeTest_snapshot02 instance_uuid: server_VolumeTest groups: - ep-jsa_net: + ep-jsa_net_group: type: org.openecomp.groups.heat.HeatStack properties: heat_file: ../Artifacts/ep-jsa_net.yaml diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/resources/Port/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/resources/Port/expectedoutputfiles/MainServiceTemplate.yaml new file mode 100644 index 0000000000..48d0f4f4ef --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/resources/Port/expectedoutputfiles/MainServiceTemplate.yaml @@ -0,0 +1,119 @@ +tosca_definitions_version: tosca_simple_yaml_1_0_0 +metadata: + template_name: Main +imports: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +topology_template: + node_templates: + jsa_net: + type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net + properties: + shared: true + network_name: + get_input: jsa_net_name + jsa_net1: + type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net + properties: + shared: true + network_name: + get_input: jsa_net_name + cmaui1_port_0: + type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port + properties: + replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + security_groups: + - get_input: security_group_name + fixed_ips: + - ip_address: + get_input: + - cmaui_oam_ips + - 1 + mac_requirements: + mac_count_required: + is_required: false + network_role_tag: oam + network: + get_input: oam_net_name + cmaui1_port_1: + type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port + properties: + replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + security_groups: + - get_input: security_group_name + fixed_ips: + - subnet: subnetNameVal + ip_address: + get_input: + - cmaui_oam_ips + - 1 + - subnet: subnetNameVal2 + ip_address: + get_input: + - cmaui_oam_ips + - 1 + mac_requirements: + mac_count_required: + is_required: false + network: jsa_net + requirements: + - link: + capability: tosca.capabilities.network.Linkable + node: jsa_net + relationship: tosca.relationships.network.LinksTo + cmaui1_port_2: + type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port + properties: + replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + security_groups: + - get_input: security_group_name + fixed_ips: + - subnet: subnetNameVal + ip_address: + get_input: + - cmaui_oam_ips + - 1 + - subnet: subnetNameVal2 + ip_address: + get_input: + - cmaui_oam_ips + - 1 + mac_requirements: + mac_count_required: + is_required: false + network: jsa_net1 + requirements: + - link: + capability: tosca.capabilities.network.Linkable + node: jsa_net1 + relationship: tosca.relationships.network.LinksTo + groups: + hot_template_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/hot_template.yml + description: cmaui server template for vMMSC + members: + - jsa_net + - jsa_net1 + - cmaui1_port_0 + - cmaui1_port_1 + - cmaui1_port_2
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/resources/Port/inputfiles/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/resources/Port/inputfiles/MANIFEST.json new file mode 100644 index 0000000000..70cdc7d237 --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/resources/Port/inputfiles/MANIFEST.json @@ -0,0 +1,11 @@ +{ + "name": "vMME_Small", + "description": "HOT template to create 2 cinder volumes", + "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/heat/resources/Port/inputfiles/hot_template.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/resources/Port/inputfiles/hot_template.yml new file mode 100644 index 0000000000..cf18a53e6e --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/resources/Port/inputfiles/hot_template.yml @@ -0,0 +1,49 @@ +heat_template_version: 2013-05-23 + +################################# +# +# Changes from MSO 01/26/2016 +# Updated per OPENECOMP feedback +# +################################# + +description: cmaui server template for vMMSC + +resources: + cmaui1_port_0: + type: OS::Neutron::Port + properties: + network: { get_param: oam_net_name } + fixed_ips: [{"ip_address": {get_param: [cmaui_oam_ips, 1]}}] + security_groups: [{get_param: security_group_name}] + replacement_policy: AUTO + + cmaui1_port_1: + type: OS::Neutron::Port + properties: + network_id: { get_resource: jsa_net } + fixed_ips: [{"subnet": subnetNameVal, "ip_address": {get_param: [cmaui_oam_ips, 1]}}, {"subnet": subnetNameVal2, "ip_address": {get_param: [cmaui_oam_ips, 1]}}] + security_groups: [{get_param: security_group_name}] + replacement_policy: AUTO + + jsa_net: + type: OS::Neutron::Net + properties: + name: {get_param: jsa_net_name} + shared: True + + cmaui1_port_2: + type: OS::Neutron::Port + properties: + network: { get_resource: jsa_net1 } + fixed_ips: [{"subnet": subnetNameVal, "ip_address": {get_param: [cmaui_oam_ips, 1]}}, {"subnet": subnetNameVal2, "ip_address": {get_param: [cmaui_oam_ips, 1]}}] + security_groups: [{get_param: security_group_name}] + replacement_policy: AUTO + + jsa_net1: + type: OS::Neutron::Net + properties: + name: {get_param: jsa_net_name} + shared: True + + |