From 280f8015d06af1f41a3ef12e8300801c7a5e0d54 Mon Sep 17 00:00:00 2001 From: AviZi Date: Fri, 9 Jun 2017 02:39:56 +0300 Subject: [SDC-29] Amdocs OnBoard 1707 initial commit. Change-Id: Ie4d12a3f574008b792899b368a0902a8b46b5370 Signed-off-by: AviZi --- .../expectedoutputfiles/MainServiceTemplate.yaml | 44 +++--------- .../expectedoutputfiles/MainServiceTemplate.yaml | 71 ++++++++++++++++++ .../macAddressStaticValue/inputfiles/MANIFEST.json | 12 ++++ .../macAddressStaticValue/inputfiles/vmme_vlc.yml | 47 ++++++++++++ .../expectedoutputfiles/MainServiceTemplate.yaml | 71 ++++++++++++++++++ .../inputfiles/MANIFEST.json | 12 ++++ .../inputfiles/vmme_vlc.yml | 44 ++++++++++++ .../expectedoutputfiles/MainServiceTemplate.yaml | 83 ++++++++++++++++++++++ .../inputfiles/MANIFEST.json | 12 ++++ .../inputfiles/vmme_vlc.yml | 61 ++++++++++++++++ .../expectedoutputfiles/MainServiceTemplate.yaml | 72 +++++++++++++++++++ .../inputfiles/MANIFEST.json | 12 ++++ .../inputfiles/vmme_vlc.yml | 47 ++++++++++++ .../expectedoutputfiles/MainServiceTemplate.yaml | 68 ++++++++++++++++++ .../inputfiles/MANIFEST.json | 12 ++++ .../inputfiles/vmme_vlc.yml | 47 ++++++++++++ .../expectedoutputfiles/MainServiceTemplate.yaml | 43 ++++------- .../oneNet/inputfiles/hot_template.yml | 4 ++ 18 files changed, 697 insertions(+), 65 deletions(-) create mode 100644 openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/macAddressStaticValue/expectedoutputfiles/MainServiceTemplate.yaml create mode 100644 openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/macAddressStaticValue/inputfiles/MANIFEST.json create mode 100644 openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/macAddressStaticValue/inputfiles/vmme_vlc.yml create mode 100644 openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/macAddressesValueInProperForm/expectedoutputfiles/MainServiceTemplate.yaml create mode 100644 openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/macAddressesValueInProperForm/inputfiles/MANIFEST.json create mode 100644 openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/macAddressesValueInProperForm/inputfiles/vmme_vlc.yml create mode 100644 openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/macAddressesValueMapOneItem/expectedoutputfiles/MainServiceTemplate.yaml create mode 100644 openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/macAddressesValueMapOneItem/inputfiles/MANIFEST.json create mode 100644 openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/macAddressesValueMapOneItem/inputfiles/vmme_vlc.yml create mode 100644 openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/macAddressesValueMapTwoItems/expectedoutputfiles/MainServiceTemplate.yaml create mode 100644 openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/macAddressesValueMapTwoItems/inputfiles/MANIFEST.json create mode 100644 openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/macAddressesValueMapTwoItems/inputfiles/vmme_vlc.yml create mode 100644 openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/macAddressesValueNotAList/expectedoutputfiles/MainServiceTemplate.yaml create mode 100644 openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/macAddressesValueNotAList/inputfiles/MANIFEST.json create mode 100644 openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/macAddressesValueNotAList/inputfiles/vmme_vlc.yml (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface') diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/listNet/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/listNet/expectedoutputfiles/MainServiceTemplate.yaml index 23c2d851f7..f186c6f7e5 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/listNet/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/listNet/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: template_PortTuple_LB1: @@ -92,7 +68,7 @@ topology_template: virtual_network_refs: [ ] virtual_machine_interface_properties: - virtual_machine_interface_properties_service_interface_type: + service_interface_type: get_input: lb_st_interface_type_oam port_tuple_refs: - get_input: template_PortTuple_LB1 @@ -119,7 +95,7 @@ topology_template: - jsa_net3 - fq_name virtual_machine_interface_properties: - virtual_machine_interface_properties_service_interface_type: + service_interface_type: get_input: lb_st_interface_type_oam port_tuple_refs: - get_input: template_PortTuple_LB1 @@ -129,7 +105,7 @@ topology_template: security_group_refs: - get_input: oam_sec_group_name virtual_machine_interface_properties: - virtual_machine_interface_properties_service_interface_type: + service_interface_type: get_input: lb_st_interface_type_oam port_tuple_refs: - get_input: template_PortTuple_LB1 @@ -160,7 +136,7 @@ topology_template: - jsa_net1 - jsa_net5 virtual_machine_interface_properties: - virtual_machine_interface_properties_service_interface_type: + service_interface_type: get_input: lb_st_interface_type_oam port_tuple_refs: - get_input: template_PortTuple_LB1 @@ -186,7 +162,7 @@ topology_template: - jsa_net5 - fq_name virtual_machine_interface_properties: - virtual_machine_interface_properties_service_interface_type: + service_interface_type: get_input: lb_st_interface_type_oam port_tuple_refs: - get_input: template_PortTuple_LB1 @@ -221,7 +197,7 @@ topology_template: - jsa_net5 - fq_name virtual_machine_interface_properties: - virtual_machine_interface_properties_service_interface_type: + service_interface_type: get_input: lb_st_interface_type_oam port_tuple_refs: - get_input: template_PortTuple_LB1 @@ -240,12 +216,12 @@ topology_template: - jsa_net4 - fq_name virtual_machine_interface_properties: - virtual_machine_interface_properties_service_interface_type: + service_interface_type: get_input: lb_st_interface_type_oam port_tuple_refs: - get_input: template_PortTuple_LB1 groups: - hot_template: + hot_template_group: type: org.openecomp.groups.heat.HeatStack properties: heat_file: ../Artifacts/hot_template.yml diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/macAddressStaticValue/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/macAddressStaticValue/expectedoutputfiles/MainServiceTemplate.yaml new file mode 100644 index 0000000000..a515f5971f --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/macAddressStaticValue/expectedoutputfiles/MainServiceTemplate.yaml @@ -0,0 +1,71 @@ +tosca_definitions_version: tosca_simple_yaml_1_0_0 +metadata: + template_name: Main +imports: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +topology_template: + inputs: + vlc1_Internal2_mac: + hidden: false + immutable: false + type: string + description: static mac address assigned to vlc1_Internal2 + internal_net_id_1: + hidden: false + immutable: false + type: string + description: UUID of Internal2_net + internal_net_id_0: + hidden: false + immutable: false + type: string + description: UUID of Internal1_net + security_group_int2_id: + hidden: false + immutable: false + type: string + description: Security Group UUID for output + security_group_int1_id: + hidden: false + immutable: false + type: string + description: Security Group UUID for output + vlc1_Internal1_mac: + hidden: false + immutable: false + type: string + description: static mac address assigned to vlc1_Internal1 + vlc_st_interface_type_int1: + hidden: false + immutable: false + type: string + description: service_interface_type for the ServiceTemplate + vlc_st_interface_type_int2: + hidden: false + immutable: false + type: string + description: service_interface_type for the ServiceTemplate + node_templates: + template_VMInt_INT1_VLC_1: + type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface + properties: + security_group_refs: + - get_input: security_group_int1_id + virtual_network_refs: + - get_input: internal_net_id_0 + virtual_machine_interface_properties: + service_interface_type: + get_input: vlc_st_interface_type_int1 + virtual_machine_interface_mac_addresses: + - get_input: vlc1_Internal1_mac + - abc + groups: + vmme_vlc_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/vmme_vlc.yml + description: | + Module HOT template to create vmme 2 vlc + members: + - template_VMInt_INT1_VLC_1 \ 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/contrailv2VMinterface/macAddressStaticValue/inputfiles/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/macAddressStaticValue/inputfiles/MANIFEST.json new file mode 100644 index 0000000000..93bb84803b --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/macAddressStaticValue/inputfiles/MANIFEST.json @@ -0,0 +1,12 @@ +{ + "name": "YY2016-227_vmme_vmme_.zip", + "description": "Desc", + "version": "0.1", + "data": [ + { + "isBase": false, + "file": "vmme_vlc.yml", + "type": "HEAT" + } + ] +} \ 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/contrailv2VMinterface/macAddressStaticValue/inputfiles/vmme_vlc.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/macAddressStaticValue/inputfiles/vmme_vlc.yml new file mode 100644 index 0000000000..813565a4d5 --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/macAddressStaticValue/inputfiles/vmme_vlc.yml @@ -0,0 +1,47 @@ +heat_template_version: 2015-04-30 + +description: > + Module HOT template to create vmme 2 vlc + +parameters: + vlc1_Internal1_mac: + type: string + description: static mac address assigned to vlc1_Internal1 + vlc1_Internal2_mac: + type: string + description: static mac address assigned to vlc1_Internal2 + vlc_st_interface_type_int1: + type: string + description: service_interface_type for the ServiceTemplate + vlc_st_interface_type_int2: + type: string + description: service_interface_type for the ServiceTemplate + internal_net_id_0: + type: string + description: UUID of Internal1_net + internal_net_id_1: + type: string + description: UUID of Internal2_net + security_group_int1_id: + type: string + description: Security Group UUID for output + security_group_int2_id: + type: string + description: Security Group UUID for output + +resources: + + template_VMInt_INT1_VLC_1: + type: OS::ContrailV2::VirtualMachineInterface + properties: + virtual_machine_interface_properties: + { + virtual_machine_interface_properties_service_interface_type: { get_param: vlc_st_interface_type_int1 } + } + virtual_network_refs: [{ get_param: internal_net_id_0}] + virtual_machine_interface_mac_addresses: + { + virtual_machine_interface_mac_addresses_mac_address: [{ get_param: vlc1_Internal1_mac }, "abc"] + } + security_group_refs: [{get_param: security_group_int1_id}] + diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/macAddressesValueInProperForm/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/macAddressesValueInProperForm/expectedoutputfiles/MainServiceTemplate.yaml new file mode 100644 index 0000000000..a515f5971f --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/macAddressesValueInProperForm/expectedoutputfiles/MainServiceTemplate.yaml @@ -0,0 +1,71 @@ +tosca_definitions_version: tosca_simple_yaml_1_0_0 +metadata: + template_name: Main +imports: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +topology_template: + inputs: + vlc1_Internal2_mac: + hidden: false + immutable: false + type: string + description: static mac address assigned to vlc1_Internal2 + internal_net_id_1: + hidden: false + immutable: false + type: string + description: UUID of Internal2_net + internal_net_id_0: + hidden: false + immutable: false + type: string + description: UUID of Internal1_net + security_group_int2_id: + hidden: false + immutable: false + type: string + description: Security Group UUID for output + security_group_int1_id: + hidden: false + immutable: false + type: string + description: Security Group UUID for output + vlc1_Internal1_mac: + hidden: false + immutable: false + type: string + description: static mac address assigned to vlc1_Internal1 + vlc_st_interface_type_int1: + hidden: false + immutable: false + type: string + description: service_interface_type for the ServiceTemplate + vlc_st_interface_type_int2: + hidden: false + immutable: false + type: string + description: service_interface_type for the ServiceTemplate + node_templates: + template_VMInt_INT1_VLC_1: + type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface + properties: + security_group_refs: + - get_input: security_group_int1_id + virtual_network_refs: + - get_input: internal_net_id_0 + virtual_machine_interface_properties: + service_interface_type: + get_input: vlc_st_interface_type_int1 + virtual_machine_interface_mac_addresses: + - get_input: vlc1_Internal1_mac + - abc + groups: + vmme_vlc_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/vmme_vlc.yml + description: | + Module HOT template to create vmme 2 vlc + members: + - template_VMInt_INT1_VLC_1 \ 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/contrailv2VMinterface/macAddressesValueInProperForm/inputfiles/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/macAddressesValueInProperForm/inputfiles/MANIFEST.json new file mode 100644 index 0000000000..93bb84803b --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/macAddressesValueInProperForm/inputfiles/MANIFEST.json @@ -0,0 +1,12 @@ +{ + "name": "YY2016-227_vmme_vmme_.zip", + "description": "Desc", + "version": "0.1", + "data": [ + { + "isBase": false, + "file": "vmme_vlc.yml", + "type": "HEAT" + } + ] +} \ 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/contrailv2VMinterface/macAddressesValueInProperForm/inputfiles/vmme_vlc.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/macAddressesValueInProperForm/inputfiles/vmme_vlc.yml new file mode 100644 index 0000000000..44b60209fb --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/macAddressesValueInProperForm/inputfiles/vmme_vlc.yml @@ -0,0 +1,44 @@ +heat_template_version: 2015-04-30 + +description: > + Module HOT template to create vmme 2 vlc + +parameters: + vlc1_Internal1_mac: + type: string + description: static mac address assigned to vlc1_Internal1 + vlc1_Internal2_mac: + type: string + description: static mac address assigned to vlc1_Internal2 + vlc_st_interface_type_int1: + type: string + description: service_interface_type for the ServiceTemplate + vlc_st_interface_type_int2: + type: string + description: service_interface_type for the ServiceTemplate + internal_net_id_0: + type: string + description: UUID of Internal1_net + internal_net_id_1: + type: string + description: UUID of Internal2_net + security_group_int1_id: + type: string + description: Security Group UUID for output + security_group_int2_id: + type: string + description: Security Group UUID for output + +resources: + + template_VMInt_INT1_VLC_1: + type: OS::ContrailV2::VirtualMachineInterface + properties: + virtual_machine_interface_properties: + { + virtual_machine_interface_properties_service_interface_type: { get_param: vlc_st_interface_type_int1 } + } + virtual_network_refs: [{ get_param: internal_net_id_0}] + virtual_machine_interface_mac_addresses: [{ get_param: vlc1_Internal1_mac }, "abc"] + security_group_refs: [{get_param: security_group_int1_id}] + diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/macAddressesValueMapOneItem/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/macAddressesValueMapOneItem/expectedoutputfiles/MainServiceTemplate.yaml new file mode 100644 index 0000000000..40a11da8cf --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/macAddressesValueMapOneItem/expectedoutputfiles/MainServiceTemplate.yaml @@ -0,0 +1,83 @@ +tosca_definitions_version: tosca_simple_yaml_1_0_0 +metadata: + template_name: Main +imports: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +topology_template: + inputs: + vlc1_Internal2_mac: + hidden: false + immutable: false + type: string + description: static mac address assigned to vlc1_Internal2 + internal_net_id_1: + hidden: false + immutable: false + type: string + description: UUID of Internal2_net + internal_net_id_0: + hidden: false + immutable: false + type: string + description: UUID of Internal1_net + security_group_int2_id: + hidden: false + immutable: false + type: string + description: Security Group UUID for output + security_group_int1_id: + hidden: false + immutable: false + type: string + description: Security Group UUID for output + vlc1_Internal1_mac: + hidden: false + immutable: false + type: string + description: static mac address assigned to vlc1_Internal1 + vlc_st_interface_type_int1: + hidden: false + immutable: false + type: string + description: service_interface_type for the ServiceTemplate + vlc_st_interface_type_int2: + hidden: false + immutable: false + type: string + description: service_interface_type for the ServiceTemplate + node_templates: + template_VMInt_INT2_VLC_1: + type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface + properties: + security_group_refs: + - get_input: security_group_int2_id + virtual_network_refs: + - get_input: internal_net_id_1 + virtual_machine_interface_properties: + service_interface_type: + get_input: vlc_st_interface_type_int2 + virtual_machine_interface_mac_addresses: + - get_input: vlc1_Internal2_mac + template_VMInt_INT1_VLC_1: + type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface + properties: + security_group_refs: + - get_input: security_group_int1_id + virtual_network_refs: + - get_input: internal_net_id_0 + virtual_machine_interface_properties: + service_interface_type: + get_input: vlc_st_interface_type_int1 + virtual_machine_interface_mac_addresses: + - get_input: vlc1_Internal1_mac + groups: + vmme_vlc_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/vmme_vlc.yml + description: | + Module HOT template to create vmme 2 vlc + members: + - template_VMInt_INT2_VLC_1 + - template_VMInt_INT1_VLC_1 \ 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/contrailv2VMinterface/macAddressesValueMapOneItem/inputfiles/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/macAddressesValueMapOneItem/inputfiles/MANIFEST.json new file mode 100644 index 0000000000..93bb84803b --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/macAddressesValueMapOneItem/inputfiles/MANIFEST.json @@ -0,0 +1,12 @@ +{ + "name": "YY2016-227_vmme_vmme_.zip", + "description": "Desc", + "version": "0.1", + "data": [ + { + "isBase": false, + "file": "vmme_vlc.yml", + "type": "HEAT" + } + ] +} \ 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/contrailv2VMinterface/macAddressesValueMapOneItem/inputfiles/vmme_vlc.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/macAddressesValueMapOneItem/inputfiles/vmme_vlc.yml new file mode 100644 index 0000000000..67f4ee3c6c --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/macAddressesValueMapOneItem/inputfiles/vmme_vlc.yml @@ -0,0 +1,61 @@ +heat_template_version: 2015-04-30 + +description: > + Module HOT template to create vmme 2 vlc + +parameters: + vlc1_Internal1_mac: + type: string + description: static mac address assigned to vlc1_Internal1 + vlc1_Internal2_mac: + type: string + description: static mac address assigned to vlc1_Internal2 + vlc_st_interface_type_int1: + type: string + description: service_interface_type for the ServiceTemplate + vlc_st_interface_type_int2: + type: string + description: service_interface_type for the ServiceTemplate + internal_net_id_0: + type: string + description: UUID of Internal1_net + internal_net_id_1: + type: string + description: UUID of Internal2_net + security_group_int1_id: + type: string + description: Security Group UUID for output + security_group_int2_id: + type: string + description: Security Group UUID for output + +resources: + + template_VMInt_INT1_VLC_1: + type: OS::ContrailV2::VirtualMachineInterface + properties: + virtual_machine_interface_properties: + { + virtual_machine_interface_properties_service_interface_type: { get_param: vlc_st_interface_type_int1 } + } + virtual_network_refs: [{ get_param: internal_net_id_0}] + virtual_machine_interface_mac_addresses: + { + virtual_machine_interface_mac_addresses_mac_address: [{ get_param: vlc1_Internal1_mac }] + } + security_group_refs: [{get_param: security_group_int1_id}] + + template_VMInt_INT2_VLC_1: + type: OS::ContrailV2::VirtualMachineInterface + properties: + virtual_machine_interface_properties: + { + virtual_machine_interface_properties_service_interface_type: { get_param: vlc_st_interface_type_int2 } + } + virtual_network_refs: [{ get_param: internal_net_id_1 }] + virtual_machine_interface_mac_addresses: + { + virtual_machine_interface_mac_addresses_mac_address: [{ get_param: vlc1_Internal2_mac }] + } + security_group_refs: [{get_param: security_group_int2_id}] + diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/macAddressesValueMapTwoItems/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/macAddressesValueMapTwoItems/expectedoutputfiles/MainServiceTemplate.yaml new file mode 100644 index 0000000000..02bcfd23d0 --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/macAddressesValueMapTwoItems/expectedoutputfiles/MainServiceTemplate.yaml @@ -0,0 +1,72 @@ +tosca_definitions_version: tosca_simple_yaml_1_0_0 +metadata: + template_name: Main +imports: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +topology_template: + inputs: + vlc1_Internal2_mac: + hidden: false + immutable: false + type: string + description: static mac address assigned to vlc1_Internal2 + internal_net_id_1: + hidden: false + immutable: false + type: string + description: UUID of Internal2_net + internal_net_id_0: + hidden: false + immutable: false + type: string + description: UUID of Internal1_net + security_group_int2_id: + hidden: false + immutable: false + type: string + description: Security Group UUID for output + security_group_int1_id: + hidden: false + immutable: false + type: string + description: Security Group UUID for output + vlc1_Internal1_mac: + hidden: false + immutable: false + type: string + description: static mac address assigned to vlc1_Internal1 + vlc_st_interface_type_int1: + hidden: false + immutable: false + type: string + description: service_interface_type for the ServiceTemplate + vlc_st_interface_type_int2: + hidden: false + immutable: false + type: string + description: service_interface_type for the ServiceTemplate + node_templates: + template_VMInt_INT1_VLC_1: + type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface + properties: + security_group_refs: + - get_input: security_group_int1_id + virtual_network_refs: + - get_input: internal_net_id_0 + virtual_machine_interface_properties: + service_interface_type: + get_input: vlc_st_interface_type_int1 + virtual_machine_interface_mac_addresses: + - get_input: vlc1_Internal1_mac + - get_input: vlc1_Internal2_mac + - abc + groups: + vmme_vlc_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/vmme_vlc.yml + description: | + Module HOT template to create vmme 2 vlc + members: + - template_VMInt_INT1_VLC_1 \ 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/contrailv2VMinterface/macAddressesValueMapTwoItems/inputfiles/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/macAddressesValueMapTwoItems/inputfiles/MANIFEST.json new file mode 100644 index 0000000000..93bb84803b --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/macAddressesValueMapTwoItems/inputfiles/MANIFEST.json @@ -0,0 +1,12 @@ +{ + "name": "YY2016-227_vmme_vmme_.zip", + "description": "Desc", + "version": "0.1", + "data": [ + { + "isBase": false, + "file": "vmme_vlc.yml", + "type": "HEAT" + } + ] +} \ 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/contrailv2VMinterface/macAddressesValueMapTwoItems/inputfiles/vmme_vlc.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/macAddressesValueMapTwoItems/inputfiles/vmme_vlc.yml new file mode 100644 index 0000000000..7382a08e28 --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/macAddressesValueMapTwoItems/inputfiles/vmme_vlc.yml @@ -0,0 +1,47 @@ +heat_template_version: 2015-04-30 + +description: > + Module HOT template to create vmme 2 vlc + +parameters: + vlc1_Internal1_mac: + type: string + description: static mac address assigned to vlc1_Internal1 + vlc1_Internal2_mac: + type: string + description: static mac address assigned to vlc1_Internal2 + vlc_st_interface_type_int1: + type: string + description: service_interface_type for the ServiceTemplate + vlc_st_interface_type_int2: + type: string + description: service_interface_type for the ServiceTemplate + internal_net_id_0: + type: string + description: UUID of Internal1_net + internal_net_id_1: + type: string + description: UUID of Internal2_net + security_group_int1_id: + type: string + description: Security Group UUID for output + security_group_int2_id: + type: string + description: Security Group UUID for output + +resources: + + template_VMInt_INT1_VLC_1: + type: OS::ContrailV2::VirtualMachineInterface + properties: + virtual_machine_interface_properties: + { + virtual_machine_interface_properties_service_interface_type: { get_param: vlc_st_interface_type_int1 } + } + virtual_network_refs: [{ get_param: internal_net_id_0}] + virtual_machine_interface_mac_addresses: + { + virtual_machine_interface_mac_addresses_mac_address: [{ get_param: vlc1_Internal1_mac }, { get_param: vlc1_Internal2_mac }, "abc"] + } + security_group_refs: [{get_param: security_group_int1_id}] + diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/macAddressesValueNotAList/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/macAddressesValueNotAList/expectedoutputfiles/MainServiceTemplate.yaml new file mode 100644 index 0000000000..2f40129966 --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/macAddressesValueNotAList/expectedoutputfiles/MainServiceTemplate.yaml @@ -0,0 +1,68 @@ +tosca_definitions_version: tosca_simple_yaml_1_0_0 +metadata: + template_name: Main +imports: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +topology_template: + inputs: + vlc1_Internal2_mac: + hidden: false + immutable: false + type: string + description: static mac address assigned to vlc1_Internal2 + internal_net_id_1: + hidden: false + immutable: false + type: string + description: UUID of Internal2_net + internal_net_id_0: + hidden: false + immutable: false + type: string + description: UUID of Internal1_net + security_group_int2_id: + hidden: false + immutable: false + type: string + description: Security Group UUID for output + security_group_int1_id: + hidden: false + immutable: false + type: string + description: Security Group UUID for output + vlc1_Internal1_mac: + hidden: false + immutable: false + type: string + description: static mac address assigned to vlc1_Internal1 + vlc_st_interface_type_int1: + hidden: false + immutable: false + type: string + description: service_interface_type for the ServiceTemplate + vlc_st_interface_type_int2: + hidden: false + immutable: false + type: string + description: service_interface_type for the ServiceTemplate + node_templates: + template_VMInt_INT1_VLC_1: + type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface + properties: + security_group_refs: + - get_input: security_group_int1_id + virtual_network_refs: + - get_input: internal_net_id_0 + virtual_machine_interface_properties: + service_interface_type: + get_input: vlc_st_interface_type_int1 + groups: + vmme_vlc_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/vmme_vlc.yml + description: | + Module HOT template to create vmme 2 vlc + members: + - template_VMInt_INT1_VLC_1 \ 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/contrailv2VMinterface/macAddressesValueNotAList/inputfiles/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/macAddressesValueNotAList/inputfiles/MANIFEST.json new file mode 100644 index 0000000000..93bb84803b --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/macAddressesValueNotAList/inputfiles/MANIFEST.json @@ -0,0 +1,12 @@ +{ + "name": "YY2016-227_vmme_vmme_.zip", + "description": "Desc", + "version": "0.1", + "data": [ + { + "isBase": false, + "file": "vmme_vlc.yml", + "type": "HEAT" + } + ] +} \ 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/contrailv2VMinterface/macAddressesValueNotAList/inputfiles/vmme_vlc.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/macAddressesValueNotAList/inputfiles/vmme_vlc.yml new file mode 100644 index 0000000000..07d1db087c --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/macAddressesValueNotAList/inputfiles/vmme_vlc.yml @@ -0,0 +1,47 @@ +heat_template_version: 2015-04-30 + +description: > + Module HOT template to create vmme 2 vlc + +parameters: + vlc1_Internal1_mac: + type: string + description: static mac address assigned to vlc1_Internal1 + vlc1_Internal2_mac: + type: string + description: static mac address assigned to vlc1_Internal2 + vlc_st_interface_type_int1: + type: string + description: service_interface_type for the ServiceTemplate + vlc_st_interface_type_int2: + type: string + description: service_interface_type for the ServiceTemplate + internal_net_id_0: + type: string + description: UUID of Internal1_net + internal_net_id_1: + type: string + description: UUID of Internal2_net + security_group_int1_id: + type: string + description: Security Group UUID for output + security_group_int2_id: + type: string + description: Security Group UUID for output + +resources: + + template_VMInt_INT1_VLC_1: + type: OS::ContrailV2::VirtualMachineInterface + properties: + virtual_machine_interface_properties: + { + virtual_machine_interface_properties_service_interface_type: { get_param: vlc_st_interface_type_int1 } + } + virtual_network_refs: [{ get_param: internal_net_id_0}] + virtual_machine_interface_mac_addresses: + { + virtual_machine_interface_mac_addresses_mac_address: { get_param: vlc1_Internal1_mac } + } + security_group_refs: [{get_param: security_group_int1_id}] + diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/oneNet/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/oneNet/expectedoutputfiles/MainServiceTemplate.yaml index 71dbe1a8c6..0a3846b721 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/oneNet/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/oneNet/expectedoutputfiles/MainServiceTemplate.yaml @@ -2,34 +2,15 @@ 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: + interface_param: + hidden: false + immutable: false + type: string + description: dummy template_PortTuple_LB1: hidden: false immutable: false @@ -110,7 +91,7 @@ topology_template: virtual_network_refs: - jsa_net1 virtual_machine_interface_properties: - virtual_machine_interface_properties_service_interface_type: + service_interface_type: get_input: lb_st_interface_type_oam port_tuple_refs: - get_input: template_PortTuple_LB1 @@ -131,7 +112,7 @@ topology_template: - jsa_net2 - fq_name virtual_machine_interface_properties: - virtual_machine_interface_properties_service_interface_type: + service_interface_type: get_input: lb_st_interface_type_oam port_tuple_refs: - get_input: template_PortTuple_LB1 @@ -163,7 +144,7 @@ topology_template: - jsa_net3 - fq_name virtual_machine_interface_properties: - virtual_machine_interface_properties_service_interface_type: + service_interface_type: get_input: lb_st_interface_type_oam port_tuple_refs: - get_input: template_PortTuple_LB1 @@ -182,12 +163,12 @@ topology_template: - jsa_net4 - fq_name virtual_machine_interface_properties: - virtual_machine_interface_properties_service_interface_type: + service_interface_type: get_input: lb_st_interface_type_oam port_tuple_refs: - get_input: template_PortTuple_LB1 groups: - hot_template: + hot_template_group: type: org.openecomp.groups.heat.HeatStack properties: heat_file: ../Artifacts/hot_template.yml diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/oneNet/inputfiles/hot_template.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/oneNet/inputfiles/hot_template.yml index b771be1c0a..7863cb5f9a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/oneNet/inputfiles/hot_template.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/oneNet/inputfiles/hot_template.yml @@ -27,6 +27,9 @@ parameters: nems_traffic_name: description: dummy type: string + interface_param: + description: dummy + type: string resources: template_VMInt_OAM_lb_1: @@ -39,6 +42,7 @@ resources: virtual_network_refs: [{ get_resource: jsa_net1 }] port_tuple_refs: [{ get_param: template_PortTuple_LB1 }] security_group_refs: [{ get_param: oam_sec_group_name}] + virtual_machine_interface_refs: [{ get_param: interface_param }] jsa_net1: properties: -- cgit 1.2.3-korg