diff options
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/shared/expectedoutputfiles')
4 files changed, 287 insertions, 649 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/shared/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/shared/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml index 704468d325..76f8356d76 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/shared/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/shared/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml @@ -2,38 +2,8 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0 metadata: template_name: GlobalSubstitutionTypes imports: -- CommonGlobalTypes: - file: CommonGlobalTypesServiceTemplate.yaml -- NovaServerGlobalTypes: - file: NovaServerGlobalTypesServiceTemplate.yaml -- NeutronPortGlobalTypes: - file: NeutronPortGlobalTypesServiceTemplate.yaml -- NeutronSecurityRulesGlobalTypes: - file: NeutronSecurityRulesGlobalTypesServiceTemplate.yaml -- NeutronNetGlobalTypes: - file: NeutronNetGlobalTypesServiceTemplate.yaml -- CinderVolumeGlobalTypes: - file: CinderVolumeGlobalTypesServiceTemplate.yaml -- ContrailVirtualNetworkGlobalType: - file: ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml -- ContrailNetworkRuleGlobalType: - file: ContrailNetworkRuleGlobalTypeServiceTemplate.yaml -- AbstractSubstituteGlobalTypes: - file: AbstractSubstituteGlobalTypesServiceTemplate.yaml -- ContrailV2VirtualMachineInterfaceGlobalType: - file: ContrailV2VirtualMachineInterfaceGlobalTypeServiceTemplate.yaml -- ContrailComputeGlobalTypes: - file: ContrailComputeGlobalTypesServiceTemplate.yaml -- ContrailPortGlobalTypes: - file: ContrailPortGlobalTypesServiceTemplate.yaml -- ContrailAbstractSubstituteGlobalTypes: - file: ContrailAbstractSubstituteGlobalTypesServiceTemplate.yaml -- ContrailV2VirtualNetworkGlobalType: - file: ContrailV2VirtualNetworkGlobalTypeServiceTemplate.yaml -- ContrailV2NetworkRuleGlobalType: - file: ContrailV2NetworkRuleGlobalTypeServiceTemplate.yaml -- ContrailV2VLANSubInterfaceGlobalType: - file: ContrailV2VLANSubInterfaceGlobalTypeServiceTemplate.yaml +- openecomp_heat_index: + file: openecomp-heat/_index.yml node_types: org.openecomp.resource.abstract.nodes.heat.nested1: derived_from: org.openecomp.resource.abstract.nodes.AbstractSubstitute @@ -50,6 +20,47 @@ node_types: description: UID of OAM network required: true status: SUPPORTED + p3: + type: string + description: UID of OAM network + required: true + status: SUPPORTED + p4: + type: string + description: UID of OAM network + required: true + status: SUPPORTED + p5: + type: string + description: UID of OAM network + required: true + status: SUPPORTED + virtual_ip_address: + type: string + required: true + status: SUPPORTED + virtual_ipv6_address: + type: string + required: true + status: SUPPORTED + lb_st_vlan_type_oam: + type: string + description: dummy + required: true + status: SUPPORTED + mac_address: + type: string + required: true + status: SUPPORTED + availability_zone_0: + type: string + description: availabilityzone name + required: true + status: SUPPORTED + subinterface_instance_index: + type: float + required: true + status: SUPPORTED abc_flavor: type: string description: Flavor for CMAUI server @@ -67,10 +78,6 @@ node_types: type: string required: true status: SUPPORTED - virtual_ip_address: - type: string - required: true - status: SUPPORTED abc_names: type: list description: CMAUI1, CMAUI2 server names @@ -96,29 +103,11 @@ node_types: description: Image for CMAUI server required: true status: SUPPORTED - virtual_ipv6_address: - type: string - required: true - status: SUPPORTED cmaui_flavor: type: string description: Flavor for CMAUI server required: true status: SUPPORTED - lb_st_vlan_type_oam: - type: string - description: dummy - required: true - status: SUPPORTED - mac_address: - type: string - required: true - status: SUPPORTED - availability_zone_0: - type: string - description: availabilityzone name - required: true - status: SUPPORTED abc_oam_ips: type: string required: true @@ -127,10 +116,6 @@ node_types: type: string required: true status: SUPPORTED - subinterface_instance_index: - type: float - required: true - status: SUPPORTED cmaui_oam_ips: type: string required: true @@ -141,157 +126,82 @@ node_types: required: true status: SUPPORTED requirements: - - link_template_VMInt_OAM_lb_1: - capability: tosca.capabilities.network.Linkable + - dependency_template_Vlan_3: + capability: tosca.capabilities.Node node: tosca.nodes.Root - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - - link_template_VMInt_OAM_lb_2: - capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - - link_template_VMInt_OAM_lb_3: - capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - - local_storage_server_cmaui: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo - occurrences: - - 0 - - UNBOUNDED - - local_storage_server_abc: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo + relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_template_Vlan_3: + - subinterface_link_template_Vlan_3: capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - link_abc_port_1: - capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root - relationship: tosca.relationships.network.LinksTo + - binding_template_Vlan_3: + capability: tosca.capabilities.network.Bindable + node: org.openecomp.resource.cp.nodes.network.Port + relationship: tosca.relationships.network.BindsTo occurrences: - 1 - 1 - - link_template_Vlan_2: - capability: tosca.capabilities.network.Linkable + - dependency_template_Vlan_2: + capability: tosca.capabilities.Node node: tosca.nodes.Root - relationship: tosca.relationships.network.LinksTo + relationship: tosca.relationships.DependsOn occurrences: - - 1 - - 1 - - link_template_Vlan_1: + - 0 + - UNBOUNDED + - subinterface_link_template_Vlan_2: capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - capabilities: - scalable_server_abc: - type: tosca.capabilities.Scalable + - binding_template_Vlan_2: + capability: tosca.capabilities.network.Bindable + node: org.openecomp.resource.cp.nodes.network.Port + relationship: tosca.relationships.network.BindsTo occurrences: - 1 - - UNBOUNDED - os_server_cmaui: - type: tosca.capabilities.OperatingSystem - occurrences: - 1 - - UNBOUNDED - binding_template_VMInt_OAM_lb_2: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED - binding_template_VMInt_OAM_lb_1: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - dependency_template_Vlan_1: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - attachment_abc_port_1: - type: tosca.capabilities.Attachment + - subinterface_link_template_Vlan_1: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo occurrences: - 1 - - UNBOUNDED - scalable_server_cmaui: - type: tosca.capabilities.Scalable - occurrences: - 1 - - UNBOUNDED - host_server_abc: - type: tosca.capabilities.Container - valid_source_types: - - tosca.nodes.SoftwareComponent + - binding_template_Vlan_1: + capability: tosca.capabilities.network.Bindable + node: org.openecomp.resource.cp.nodes.network.Port + relationship: tosca.relationships.network.BindsTo occurrences: - 1 - - UNBOUNDED - os_server_abc: - type: tosca.capabilities.OperatingSystem - occurrences: - 1 - - UNBOUNDED - host_server_cmaui: - type: tosca.capabilities.Container - valid_source_types: - - tosca.nodes.SoftwareComponent - occurrences: - - 1 - - UNBOUNDED - binding_server_abc: - type: tosca.capabilities.network.Bindable - occurrences: - - 1 - - UNBOUNDED - endpoint_server_cmaui: - type: tosca.capabilities.Endpoint.Admin + capabilities: + feature_template_Vlan_2: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - binding_abc_port_1: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED - binding_server_cmaui: - type: tosca.capabilities.network.Bindable + feature_template_Vlan_3: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - endpoint_server_abc: - type: tosca.capabilities.Endpoint.Admin + feature_template_Vlan_1: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - binding_template_VMInt_OAM_lb_3: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED org.openecomp.resource.abstract.nodes.heat.nested2: derived_from: org.openecomp.resource.abstract.nodes.AbstractSubstitute properties: @@ -364,64 +274,29 @@ node_types: required: true status: SUPPORTED requirements: - - local_storage_server_cmaui: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo + - dependency_template_subint_oam_vmi_1: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_template_Vlan_3: + - subinterface_link_template_subint_oam_vmi_1: capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - link_cmaui_port_1: - capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root - relationship: tosca.relationships.network.LinksTo + - binding_template_subint_oam_vmi_1: + capability: tosca.capabilities.network.Bindable + node: org.openecomp.resource.cp.nodes.network.Port + relationship: tosca.relationships.network.BindsTo occurrences: - 1 - 1 capabilities: - host_server_cmaui: - type: tosca.capabilities.Container - valid_source_types: - - tosca.nodes.SoftwareComponent - occurrences: - - 1 - - UNBOUNDED - os_server_cmaui: - type: tosca.capabilities.OperatingSystem - occurrences: - - 1 - - UNBOUNDED - binding_cmaui_port_1: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED - endpoint_server_cmaui: - type: tosca.capabilities.Endpoint.Admin - occurrences: - - 1 - - UNBOUNDED - binding_server_cmaui: - type: tosca.capabilities.network.Bindable - occurrences: - - 1 - - UNBOUNDED - scalable_server_cmaui: - type: tosca.capabilities.Scalable - occurrences: - - 1 - - UNBOUNDED - attachment_cmaui_port_1: - type: tosca.capabilities.Attachment + feature_template_subint_oam_vmi_1: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED
\ 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/VlanToNetConnection/shared/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/shared/expectedoutputfiles/MainServiceTemplate.yaml index c26430b3aa..1262fef985 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/shared/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/shared/expectedoutputfiles/MainServiceTemplate.yaml @@ -2,38 +2,8 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0 metadata: template_name: Main imports: -- CommonGlobalTypes: - file: CommonGlobalTypesServiceTemplate.yaml -- NovaServerGlobalTypes: - file: NovaServerGlobalTypesServiceTemplate.yaml -- NeutronPortGlobalTypes: - file: NeutronPortGlobalTypesServiceTemplate.yaml -- NeutronSecurityRulesGlobalTypes: - file: NeutronSecurityRulesGlobalTypesServiceTemplate.yaml -- NeutronNetGlobalTypes: - file: NeutronNetGlobalTypesServiceTemplate.yaml -- CinderVolumeGlobalTypes: - file: CinderVolumeGlobalTypesServiceTemplate.yaml -- ContrailVirtualNetworkGlobalType: - file: ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml -- ContrailNetworkRuleGlobalType: - file: ContrailNetworkRuleGlobalTypeServiceTemplate.yaml -- AbstractSubstituteGlobalTypes: - file: AbstractSubstituteGlobalTypesServiceTemplate.yaml -- ContrailV2VirtualMachineInterfaceGlobalType: - file: ContrailV2VirtualMachineInterfaceGlobalTypeServiceTemplate.yaml -- ContrailComputeGlobalTypes: - file: ContrailComputeGlobalTypesServiceTemplate.yaml -- ContrailPortGlobalTypes: - file: ContrailPortGlobalTypesServiceTemplate.yaml -- ContrailAbstractSubstituteGlobalTypes: - file: ContrailAbstractSubstituteGlobalTypesServiceTemplate.yaml -- ContrailV2VirtualNetworkGlobalType: - file: ContrailV2VirtualNetworkGlobalTypeServiceTemplate.yaml -- ContrailV2NetworkRuleGlobalType: - file: ContrailV2NetworkRuleGlobalTypeServiceTemplate.yaml -- ContrailV2VLANSubInterfaceGlobalType: - file: ContrailV2VLANSubInterfaceGlobalTypeServiceTemplate.yaml +- openecomp_heat_index: + file: openecomp-heat/_index.yml - GlobalSubstitutionTypes: file: GlobalSubstitutionTypesServiceTemplate.yaml topology_template: @@ -41,16 +11,41 @@ topology_template: shared_network_id1: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - addOn + source_type: HEAT + param_name: shared_network_id1 type: string description: network name of jsa log network shared_network_id2: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - addOn + source_type: HEAT + param_name: shared_network_id2 type: string description: network name of jsa log network jsa_net_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - addOn + - main + source_type: HEAT + param_name: jsa_net_name type: string description: network name of jsa log network node_templates: @@ -70,14 +65,33 @@ topology_template: service_template_filter: substitute_service_template: nested2ServiceTemplate.yaml requirements: - - link_cmaui_port_1: + - subinterface_link_template_subint_oam_vmi_1: capability: tosca.capabilities.network.Linkable node: test_net1 relationship: tosca.relationships.network.LinksTo - - link_template_Vlan_3: + template_VMInt_OAM_lb_1: + type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface + properties: + security_group_refs: + - get_input: jsa_net_name + virtual_network_refs: + - test_net3 + virtual_machine_interface_properties: + service_interface_type: + get_input: jsa_net_name + port_tuple_refs: + - get_input: jsa_net_name + requirements: + - link: capability: tosca.capabilities.network.Linkable - node: test_net1 + node: test_net3 relationship: tosca.relationships.network.LinksTo + test_net3: + type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net + properties: + shared: true + network_name: + get_input: jsa_net_name test_nested3: type: org.openecomp.resource.abstract.nodes.heat.nested1 directives: @@ -90,33 +104,51 @@ topology_template: p2: get_input: shared_network_id2 requirements: - - link_abc_port_1: + - subinterface_link_template_Vlan_3: capability: tosca.capabilities.network.Linkable node: test_net2 relationship: tosca.relationships.network.LinksTo - - link_template_VMInt_OAM_lb_1: - capability: tosca.capabilities.network.Linkable - node: test_net1 - relationship: tosca.relationships.network.LinksTo - - link_template_VMInt_OAM_lb_2: - capability: tosca.capabilities.network.Linkable - node: test_net2 - relationship: tosca.relationships.network.LinksTo - - link_template_VMInt_OAM_lb_3: + - subinterface_link_template_Vlan_2: capability: tosca.capabilities.network.Linkable node: test_net2 relationship: tosca.relationships.network.LinksTo - - link_template_Vlan_3: + - subinterface_link_template_Vlan_1: capability: tosca.capabilities.network.Linkable - node: test_net2 + node: test_net1 relationship: tosca.relationships.network.LinksTo - - link_template_Vlan_2: + template_VMInt_OAM_lb_2: + type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface + properties: + security_group_refs: + - get_input: jsa_net_name + virtual_network_refs: + - test_net3 + virtual_machine_interface_properties: + service_interface_type: + get_input: jsa_net_name + port_tuple_refs: + - get_input: jsa_net_name + requirements: + - link: capability: tosca.capabilities.network.Linkable - node: test_net2 + node: test_net3 relationship: tosca.relationships.network.LinksTo - - link_template_Vlan_1: + template_VMInt_OAM_lb_3: + type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface + properties: + security_group_refs: + - get_input: jsa_net_name + virtual_network_refs: + - test_net3 + virtual_machine_interface_properties: + service_interface_type: + get_input: jsa_net_name + port_tuple_refs: + - get_input: jsa_net_name + requirements: + - link: capability: tosca.capabilities.network.Linkable - node: test_net1 + node: test_net3 relationship: tosca.relationships.network.LinksTo test_net1: type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net @@ -135,32 +167,22 @@ topology_template: get_input: shared_network_id1 p2: get_input: shared_network_id2 + p3: + get_input: template_VMInt_OAM_lb_1 + p4: + get_input: template_VMInt_OAM_lb_2 + p5: + get_input: template_VMInt_OAM_lb_3 requirements: - - link_abc_port_1: - capability: tosca.capabilities.network.Linkable - node: test_net2 - relationship: tosca.relationships.network.LinksTo - - link_template_VMInt_OAM_lb_1: - capability: tosca.capabilities.network.Linkable - node: test_net1 - relationship: tosca.relationships.network.LinksTo - - link_template_VMInt_OAM_lb_2: - capability: tosca.capabilities.network.Linkable - node: test_net2 - relationship: tosca.relationships.network.LinksTo - - link_template_VMInt_OAM_lb_3: - capability: tosca.capabilities.network.Linkable - node: test_net2 - relationship: tosca.relationships.network.LinksTo - - link_template_Vlan_3: + - subinterface_link_template_Vlan_3: capability: tosca.capabilities.network.Linkable node: test_net2 relationship: tosca.relationships.network.LinksTo - - link_template_Vlan_2: + - subinterface_link_template_Vlan_2: capability: tosca.capabilities.network.Linkable node: test_net2 relationship: tosca.relationships.network.LinksTo - - link_template_Vlan_1: + - subinterface_link_template_Vlan_1: capability: tosca.capabilities.network.Linkable node: test_net1 relationship: tosca.relationships.network.LinksTo @@ -182,5 +204,9 @@ topology_template: Version 2.0 02-09-2016 (Authors: John Doe, user PROD) members: - test_nested2 + - template_VMInt_OAM_lb_1 + - test_net3 - test_nested3 + - template_VMInt_OAM_lb_2 + - template_VMInt_OAM_lb_3 - test_nested1
\ 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/VlanToNetConnection/shared/expectedoutputfiles/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/shared/expectedoutputfiles/nested1ServiceTemplate.yaml index ecc816a2a1..cc627ef792 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/shared/expectedoutputfiles/nested1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/shared/expectedoutputfiles/nested1ServiceTemplate.yaml @@ -2,45 +2,10 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0 metadata: template_name: nested1 imports: -- CommonGlobalTypes: - file: CommonGlobalTypesServiceTemplate.yaml -- NovaServerGlobalTypes: - file: NovaServerGlobalTypesServiceTemplate.yaml -- NeutronPortGlobalTypes: - file: NeutronPortGlobalTypesServiceTemplate.yaml -- NeutronSecurityRulesGlobalTypes: - file: NeutronSecurityRulesGlobalTypesServiceTemplate.yaml -- NeutronNetGlobalTypes: - file: NeutronNetGlobalTypesServiceTemplate.yaml -- CinderVolumeGlobalTypes: - file: CinderVolumeGlobalTypesServiceTemplate.yaml -- ContrailVirtualNetworkGlobalType: - file: ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml -- ContrailNetworkRuleGlobalType: - file: ContrailNetworkRuleGlobalTypeServiceTemplate.yaml -- AbstractSubstituteGlobalTypes: - file: AbstractSubstituteGlobalTypesServiceTemplate.yaml -- ContrailV2VirtualMachineInterfaceGlobalType: - file: ContrailV2VirtualMachineInterfaceGlobalTypeServiceTemplate.yaml -- ContrailComputeGlobalTypes: - file: ContrailComputeGlobalTypesServiceTemplate.yaml -- ContrailPortGlobalTypes: - file: ContrailPortGlobalTypesServiceTemplate.yaml -- ContrailAbstractSubstituteGlobalTypes: - file: ContrailAbstractSubstituteGlobalTypesServiceTemplate.yaml -- ContrailV2VirtualNetworkGlobalType: - file: ContrailV2VirtualNetworkGlobalTypeServiceTemplate.yaml -- ContrailV2NetworkRuleGlobalType: - file: ContrailV2NetworkRuleGlobalTypeServiceTemplate.yaml -- ContrailV2VLANSubInterfaceGlobalType: - file: ContrailV2VLANSubInterfaceGlobalTypeServiceTemplate.yaml +- openecomp_heat_index: + file: openecomp-heat/_index.yml - GlobalSubstitutionTypes: file: GlobalSubstitutionTypesServiceTemplate.yaml -node_types: - org.openecomp.resource.vfc.nodes.heat.abc: - derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server - org.openecomp.resource.vfc.nodes.heat.cmaui: - derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: cmaui_names: @@ -55,6 +20,48 @@ topology_template: immutable: false type: string description: UID of OAM network + p3: + hidden: false + immutable: false + type: string + description: UID of OAM network + p4: + hidden: false + immutable: false + type: string + description: UID of OAM network + p5: + hidden: false + immutable: false + type: string + description: UID of OAM network + virtual_ip_address: + hidden: false + immutable: false + type: string + virtual_ipv6_address: + hidden: false + immutable: false + type: string + lb_st_vlan_type_oam: + hidden: false + immutable: false + type: string + description: dummy + mac_address: + hidden: false + immutable: false + type: string + availability_zone_0: + label: availabilityzone name + hidden: false + immutable: false + type: string + description: availabilityzone name + subinterface_instance_index: + hidden: false + immutable: false + type: float abc_flavor: hidden: false immutable: false @@ -72,10 +79,6 @@ topology_template: hidden: false immutable: false type: string - virtual_ip_address: - hidden: false - immutable: false - type: string abc_names: hidden: false immutable: false @@ -101,30 +104,11 @@ topology_template: immutable: false type: string description: Image for CMAUI server - virtual_ipv6_address: - hidden: false - immutable: false - type: string cmaui_flavor: hidden: false immutable: false type: string description: Flavor for CMAUI server - lb_st_vlan_type_oam: - hidden: false - immutable: false - type: string - description: dummy - mac_address: - hidden: false - immutable: false - type: string - availability_zone_0: - label: availabilityzone name - hidden: false - immutable: false - type: string - description: availabilityzone name abc_oam_ips: hidden: false immutable: false @@ -133,10 +117,6 @@ topology_template: hidden: false immutable: false type: string - subinterface_instance_index: - hidden: false - immutable: false - type: float cmaui_oam_ips: hidden: false immutable: false @@ -147,90 +127,11 @@ topology_template: type: string description: Image for CMAUI server node_templates: - template_VMInt_OAM_lb_1: - type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface - properties: - security_group_refs: - - get_input: oam_sec_group_name - virtual_network_refs: - - get_input: shared_network_id1 - virtual_machine_interface_properties: - virtual_machine_interface_properties_service_interface_type: - get_input: lb_st_interface_type_oam - port_tuple_refs: - - get_input: template_PortTuple_LB1 - requirements: - - binding: - capability: tosca.capabilities.network.Bindable - node: server_cmaui - relationship: tosca.relationships.network.BindsTo - template_VMInt_OAM_lb_2: - type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface - properties: - security_group_refs: - - get_input: oam_sec_group_name - virtual_network_refs: - - get_input: p2 - virtual_machine_interface_properties: - virtual_machine_interface_properties_service_interface_type: - get_input: lb_st_interface_type_oam - port_tuple_refs: - - get_input: template_PortTuple_LB1 - requirements: - - binding: - capability: tosca.capabilities.network.Bindable - node: server_cmaui - relationship: tosca.relationships.network.BindsTo - template_VMInt_OAM_lb_3: - type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface - properties: - security_group_refs: - - get_input: oam_sec_group_name - virtual_network_refs: - - get_input: p2 - - get_input: shared_network_id1 - virtual_machine_interface_properties: - virtual_machine_interface_properties_service_interface_type: - get_input: lb_st_interface_type_oam - port_tuple_refs: - - get_input: template_PortTuple_LB1 - requirements: - - binding: - capability: tosca.capabilities.network.Bindable - node: server_cmaui - relationship: tosca.relationships.network.BindsTo - server_cmaui: - type: org.openecomp.resource.vfc.nodes.heat.cmaui - properties: - flavor: - get_input: cmaui_flavor - availability_zone: - get_input: availability_zone_0 - image: - get_input: cmaui_image - contrail_service_instance_ind: true - name: - get_input: - - cmaui_names - - 0 - server_abc: - type: org.openecomp.resource.vfc.nodes.heat.abc - properties: - flavor: - get_input: abc_flavor - availability_zone: - get_input: availability_zone_0 - image: - get_input: abc_image - name: - get_input: - - abc_names - - 0 template_Vlan_3: - type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + type: org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface properties: virtual_machine_interface_refs: - - template_VMInt_OAM_lb_3 + - get_input: p5 name: str_replace: template: $NAME$VLAN @@ -266,34 +167,11 @@ topology_template: virtual_machine_interface_mac_addresses: mac_address: - get_input: mac_address - requirements: - - binding: - capability: tosca.capabilities.network.Bindable - node: template_VMInt_OAM_lb_3 - relationship: tosca.relationships.network.BindsTo - abc_port_1: - type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port - properties: - replacement_policy: AUTO - security_groups: - - get_input: security_group_name - fixed_ips: - - ip_address: - get_input: - - abc_oam_ips - - 0 - network: - get_input: p2 - requirements: - - binding: - capability: tosca.capabilities.network.Bindable - node: server_abc - relationship: tosca.relationships.network.BindsTo template_Vlan_2: - type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + type: org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface properties: virtual_machine_interface_refs: - - template_VMInt_OAM_lb_2 + - get_input: p4 name: str_replace: template: $NAME$VLAN @@ -328,16 +206,11 @@ topology_template: virtual_machine_interface_mac_addresses: mac_address: - get_input: mac_address - requirements: - - binding: - capability: tosca.capabilities.network.Bindable - node: template_VMInt_OAM_lb_2 - relationship: tosca.relationships.network.BindsTo template_Vlan_1: - type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + type: org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface properties: virtual_machine_interface_refs: - - template_VMInt_OAM_lb_1 + - get_input: p3 name: str_replace: template: $NAME$VLAN @@ -372,11 +245,6 @@ topology_template: virtual_machine_interface_mac_addresses: mac_address: - get_input: mac_address - requirements: - - binding: - capability: tosca.capabilities.network.Bindable - node: template_VMInt_OAM_lb_1 - relationship: tosca.relationships.network.BindsTo groups: nested1_group: type: org.openecomp.groups.heat.HeatStack @@ -384,88 +252,46 @@ topology_template: heat_file: ../Artifacts/nested1.yml description: cmaui server template for vMMSC members: - - template_VMInt_OAM_lb_1 - - template_VMInt_OAM_lb_2 - - template_VMInt_OAM_lb_3 - - server_cmaui - - server_abc - template_Vlan_3 - - abc_port_1 - template_Vlan_2 - template_Vlan_1 substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.heat.nested1 capabilities: - scalable_server_abc: - - server_abc - - scalable - os_server_cmaui: - - server_cmaui - - os - binding_template_VMInt_OAM_lb_2: - - template_VMInt_OAM_lb_2 - - binding - binding_template_VMInt_OAM_lb_1: - - template_VMInt_OAM_lb_1 - - binding - attachment_abc_port_1: - - abc_port_1 - - attachment - scalable_server_cmaui: - - server_cmaui - - scalable - host_server_abc: - - server_abc - - host - os_server_abc: - - server_abc - - os - host_server_cmaui: - - server_cmaui - - host - binding_server_abc: - - server_abc - - binding - endpoint_server_cmaui: - - server_cmaui - - endpoint - binding_abc_port_1: - - abc_port_1 - - binding - binding_server_cmaui: - - server_cmaui - - binding - endpoint_server_abc: - - server_abc - - endpoint - binding_template_VMInt_OAM_lb_3: - - template_VMInt_OAM_lb_3 - - binding + feature_template_Vlan_2: + - template_Vlan_2 + - feature + feature_template_Vlan_3: + - template_Vlan_3 + - feature + feature_template_Vlan_1: + - template_Vlan_1 + - feature requirements: - link_template_VMInt_OAM_lb_1: - - template_VMInt_OAM_lb_1 - - link - local_storage_server_cmaui: - - server_cmaui - - local_storage - link_template_VMInt_OAM_lb_3: - - template_VMInt_OAM_lb_3 - - link - link_template_VMInt_OAM_lb_2: - - template_VMInt_OAM_lb_2 - - link - link_template_Vlan_1: + subinterface_link_template_Vlan_3: + - template_Vlan_3 + - subinterface_link + subinterface_link_template_Vlan_2: + - template_Vlan_2 + - subinterface_link + dependency_template_Vlan_2: + - template_Vlan_2 + - dependency + dependency_template_Vlan_1: - template_Vlan_1 - - link - link_template_Vlan_2: + - dependency + subinterface_link_template_Vlan_1: + - template_Vlan_1 + - subinterface_link + binding_template_Vlan_2: - template_Vlan_2 - - link - link_template_Vlan_3: + - binding + binding_template_Vlan_1: + - template_Vlan_1 + - binding + binding_template_Vlan_3: + - template_Vlan_3 + - binding + dependency_template_Vlan_3: - template_Vlan_3 - - link - link_abc_port_1: - - abc_port_1 - - link - local_storage_server_abc: - - server_abc - - local_storage
\ No newline at end of file + - dependency
\ 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/VlanToNetConnection/shared/expectedoutputfiles/nested2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/shared/expectedoutputfiles/nested2ServiceTemplate.yaml index e4c9eac43b..5241d3db88 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/shared/expectedoutputfiles/nested2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/shared/expectedoutputfiles/nested2ServiceTemplate.yaml @@ -2,43 +2,10 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0 metadata: template_name: nested2 imports: -- CommonGlobalTypes: - file: CommonGlobalTypesServiceTemplate.yaml -- NovaServerGlobalTypes: - file: NovaServerGlobalTypesServiceTemplate.yaml -- NeutronPortGlobalTypes: - file: NeutronPortGlobalTypesServiceTemplate.yaml -- NeutronSecurityRulesGlobalTypes: - file: NeutronSecurityRulesGlobalTypesServiceTemplate.yaml -- NeutronNetGlobalTypes: - file: NeutronNetGlobalTypesServiceTemplate.yaml -- CinderVolumeGlobalTypes: - file: CinderVolumeGlobalTypesServiceTemplate.yaml -- ContrailVirtualNetworkGlobalType: - file: ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml -- ContrailNetworkRuleGlobalType: - file: ContrailNetworkRuleGlobalTypeServiceTemplate.yaml -- AbstractSubstituteGlobalTypes: - file: AbstractSubstituteGlobalTypesServiceTemplate.yaml -- ContrailV2VirtualMachineInterfaceGlobalType: - file: ContrailV2VirtualMachineInterfaceGlobalTypeServiceTemplate.yaml -- ContrailComputeGlobalTypes: - file: ContrailComputeGlobalTypesServiceTemplate.yaml -- ContrailPortGlobalTypes: - file: ContrailPortGlobalTypesServiceTemplate.yaml -- ContrailAbstractSubstituteGlobalTypes: - file: ContrailAbstractSubstituteGlobalTypesServiceTemplate.yaml -- ContrailV2VirtualNetworkGlobalType: - file: ContrailV2VirtualNetworkGlobalTypeServiceTemplate.yaml -- ContrailV2NetworkRuleGlobalType: - file: ContrailV2NetworkRuleGlobalTypeServiceTemplate.yaml -- ContrailV2VLANSubInterfaceGlobalType: - file: ContrailV2VLANSubInterfaceGlobalTypeServiceTemplate.yaml +- openecomp_heat_index: + file: openecomp-heat/_index.yml - GlobalSubstitutionTypes: file: GlobalSubstitutionTypesServiceTemplate.yaml -node_types: - org.openecomp.resource.vfc.nodes.heat.cmaui: - derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: cmaui_names: @@ -111,24 +78,11 @@ topology_template: immutable: false type: string node_templates: - server_cmaui: - type: org.openecomp.resource.vfc.nodes.heat.cmaui - properties: - flavor: - get_input: cmaui_flavor - availability_zone: - get_input: availability_zone_0 - image: - get_input: cmaui_image - name: - get_input: - - cmaui_names - - 0 - template_Vlan_3: - type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + template_subint_oam_vmi_1: + type: org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface properties: virtual_machine_interface_refs: - - cmaui_port_1 + - get_input: p2 name: str_replace: template: $NAME$VLAN @@ -163,29 +117,6 @@ topology_template: virtual_machine_interface_mac_addresses: mac_address: - get_input: mac_address - requirements: - - binding: - capability: tosca.capabilities.network.Bindable - node: cmaui_port_1 - relationship: tosca.relationships.network.BindsTo - cmaui_port_1: - type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port - properties: - replacement_policy: AUTO - security_groups: - - get_input: security_group_name - fixed_ips: - - ip_address: - get_input: - - cmaui_oam_ips - - 0 - network: - get_input: p1 - requirements: - - binding: - capability: tosca.capabilities.network.Bindable - node: server_cmaui - relationship: tosca.relationships.network.BindsTo groups: nested2_group: type: org.openecomp.groups.heat.HeatStack @@ -193,40 +124,20 @@ topology_template: heat_file: ../Artifacts/nested2.yml description: cmaui server template for vMMSC members: - - server_cmaui - - template_Vlan_3 - - cmaui_port_1 + - template_subint_oam_vmi_1 substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.heat.nested2 capabilities: - host_server_cmaui: - - server_cmaui - - host - os_server_cmaui: - - server_cmaui - - os - binding_cmaui_port_1: - - cmaui_port_1 - - binding - endpoint_server_cmaui: - - server_cmaui - - endpoint - binding_server_cmaui: - - server_cmaui - - binding - scalable_server_cmaui: - - server_cmaui - - scalable - attachment_cmaui_port_1: - - cmaui_port_1 - - attachment + feature_template_subint_oam_vmi_1: + - template_subint_oam_vmi_1 + - feature requirements: - local_storage_server_cmaui: - - server_cmaui - - local_storage - link_template_Vlan_3: - - template_Vlan_3 - - link - link_cmaui_port_1: - - cmaui_port_1 - - link
\ No newline at end of file + dependency_template_subint_oam_vmi_1: + - template_subint_oam_vmi_1 + - dependency + subinterface_link_template_subint_oam_vmi_1: + - template_subint_oam_vmi_1 + - subinterface_link + binding_template_subint_oam_vmi_1: + - template_subint_oam_vmi_1 + - binding
\ No newline at end of file |