diff options
author | siddharth0905 <siddharth.singh4@amdocs.com> | 2018-04-03 20:24:59 +0530 |
---|---|---|
committer | siddharth0905 <siddharth.singh4@amdocs.com> | 2018-04-04 13:54:59 +0530 |
commit | d6982006c27288936d8b0d9eee18068854036f45 (patch) | |
tree | 7b71be074b5303d442971d0bd59b2accd7940604 /openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection | |
parent | 4b6709601c47050c853e6eaa5525259f066d5277 (diff) |
Added new nodes type
Added new nodes type and new property in Port.
All test data need to be updated, so file count is much more.
Change-Id: Ic21befe8d7feee912fbed1d3eb676488db1fb68c
Issue-ID: SDC-1183
Signed-off-by: siddharth0905 <siddharth.singh4@amdocs.com>
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection')
27 files changed, 5415 insertions, 2386 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/nested/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/nested/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml index 84a2824b76..8ab703915e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/nested/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/nested/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml @@ -2,40 +2,10 @@ 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.nested: + org.openecomp.resource.abstract.nodes.heat.subinterface.nested: derived_from: org.openecomp.resource.abstract.nodes.AbstractSubstitute properties: cmaui_names: @@ -55,6 +25,16 @@ node_types: description: UID of OAM network required: true status: SUPPORTED + p3: + type: string + description: port resource + required: true + status: SUPPORTED + p4: + type: string + description: port resource + required: true + status: SUPPORTED template_PortTuple_LB1: type: string required: true @@ -123,80 +103,54 @@ node_types: required: true status: SUPPORTED requirements: - - link_template_VMInt_OAM_lb_1: - capability: tosca.capabilities.network.Linkable + - dependency_template_Vlan_2: + capability: tosca.capabilities.Node node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - subinterface_link_template_Vlan_2: + capability: tosca.capabilities.network.Linkable 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 + - binding_template_Vlan_2: + capability: tosca.capabilities.network.Bindable + node: org.openecomp.resource.cp.nodes.network.Port + relationship: tosca.relationships.network.BindsTo occurrences: - 1 - 1 - - local_storage_server_cmaui: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo + - dependency_template_Vlan_1: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_template_Vlan_2: + - subinterface_link_template_Vlan_1: capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - link_template_Vlan_1: - capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root - relationship: tosca.relationships.network.LinksTo + - binding_template_Vlan_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_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 - occurrences: - - 0 - - UNBOUNDED - endpoint_server_cmaui: - type: tosca.capabilities.Endpoint.Admin - occurrences: - - 1 - - UNBOUNDED - binding_server_cmaui: - type: tosca.capabilities.network.Bindable + feature_template_Vlan_2: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - scalable_server_cmaui: - type: tosca.capabilities.Scalable + feature_template_Vlan_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/nested/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/nested/expectedoutputfiles/MainServiceTemplate.yaml index e8cb686316..9a387fb8ac 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/nested/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/nested/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,9 +11,42 @@ topology_template: jsa_net_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: jsa_net_name type: string description: network name of jsa log network 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: p1 + virtual_machine_interface_properties: + service_interface_type: + get_input: lb_st_interface_type_oam + port_tuple_refs: + - get_input: template_PortTuple_LB1 + 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: p1 + - get_input: p2 + virtual_machine_interface_properties: + service_interface_type: + get_input: lb_st_interface_type_oam + port_tuple_refs: + - get_input: template_PortTuple_LB1 test_net1: type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net properties: @@ -57,7 +60,7 @@ topology_template: network_name: get_input: jsa_net_name test_nested: - type: org.openecomp.resource.abstract.nodes.heat.nested + type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested directives: - substitutable properties: @@ -65,23 +68,25 @@ topology_template: service_template_filter: substitute_service_template: nestedServiceTemplate.yaml p2: test_net1 + p3: template_VMInt_OAM_lb_1 + p4: template_VMInt_OAM_lb_2 requirements: - - link_template_VMInt_OAM_lb_1: - capability: tosca.capabilities.network.Linkable - node: test_net - relationship: tosca.relationships.network.LinksTo - - link_template_VMInt_OAM_lb_2: - capability: tosca.capabilities.network.Linkable - node: test_net - relationship: tosca.relationships.network.LinksTo - - link_template_Vlan_2: + - subinterface_link_template_Vlan_2: capability: tosca.capabilities.network.Linkable node: test_net relationship: tosca.relationships.network.LinksTo - - link_template_Vlan_1: + - subinterface_link_template_Vlan_1: capability: tosca.capabilities.network.Linkable node: test_net relationship: tosca.relationships.network.LinksTo + - binding_template_Vlan_2: + capability: tosca.capabilities.network.Bindable + node: template_VMInt_OAM_lb_2 + relationship: tosca.relationships.network.BindsTo + - binding_template_Vlan_1: + capability: tosca.capabilities.network.Bindable + node: template_VMInt_OAM_lb_1 + relationship: tosca.relationships.network.BindsTo groups: main_group: type: org.openecomp.groups.heat.HeatStack @@ -90,6 +95,8 @@ topology_template: description: | Version 2.0 02-09-2016 (Authors: John Doe, user PROD) members: + - template_VMInt_OAM_lb_1 + - template_VMInt_OAM_lb_2 - test_net1 - test_net - test_nested
\ 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/nested/expectedoutputfiles/nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/nested/expectedoutputfiles/nestedServiceTemplate.yaml index 673fffdaf7..ac1b452a06 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/nested/expectedoutputfiles/nestedServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/nested/expectedoutputfiles/nestedServiceTemplate.yaml @@ -2,43 +2,10 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0 metadata: template_name: nested 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: @@ -58,6 +25,16 @@ topology_template: immutable: false type: string description: UID of OAM network + p3: + hidden: false + immutable: false + type: string + description: port resource + p4: + hidden: false + immutable: false + type: string + description: port resource template_PortTuple_LB1: hidden: false immutable: false @@ -127,60 +104,11 @@ topology_template: immutable: false type: string 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: p1 - 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: p1 - - 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 - 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 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 @@ -216,16 +144,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 @@ -260,11 +183,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: nested_group: type: org.openecomp.groups.heat.HeatStack @@ -272,48 +190,33 @@ topology_template: heat_file: ../Artifacts/nested.yml description: cmaui server template for vMMSC members: - - template_VMInt_OAM_lb_1 - - template_VMInt_OAM_lb_2 - - server_cmaui - template_Vlan_2 - template_Vlan_1 substitution_mappings: - node_type: org.openecomp.resource.abstract.nodes.heat.nested + node_type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested capabilities: - host_server_cmaui: - - server_cmaui - - host - 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 - endpoint_server_cmaui: - - server_cmaui - - endpoint - binding_server_cmaui: - - server_cmaui - - binding - scalable_server_cmaui: - - server_cmaui - - scalable + feature_template_Vlan_2: + - template_Vlan_2 + - 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_2: - - template_VMInt_OAM_lb_2 - - link - link_template_Vlan_1: + 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
\ No newline at end of file + - binding + binding_template_Vlan_1: + - template_Vlan_1 + - binding
\ 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/nested/inputfiles/main.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/nested/inputfiles/main.yml index e68f16ec29..aac85f1d5e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/nested/inputfiles/main.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/nested/inputfiles/main.yml @@ -20,8 +20,32 @@ resources: name: {get_param: jsa_net_name} shared: True + template_VMInt_OAM_lb_1: + type: OS::ContrailV2::VirtualMachineInterface + properties: + virtual_machine_interface_properties: + { + virtual_machine_interface_properties_service_interface_type: { get_param: lb_st_interface_type_oam }, + } + virtual_network_refs: [{ get_param: p1 }] + port_tuple_refs: [{ get_param: template_PortTuple_LB1 }] + security_group_refs: [{ get_param: oam_sec_group_name}] + + template_VMInt_OAM_lb_2: + type: OS::ContrailV2::VirtualMachineInterface + properties: + virtual_machine_interface_properties: + { + virtual_machine_interface_properties_service_interface_type: { get_param: lb_st_interface_type_oam }, + } + virtual_network_refs: [{ get_param: p1 },{ get_param: p2 }] + port_tuple_refs: [{ get_param: template_PortTuple_LB1 }] + security_group_refs: [{ get_param: oam_sec_group_name}] + test_nested: type: nested.yml properties: p1: { get_resource: test_net} p2: { get_resource: test_net1} + p3: { get_resource: template_VMInt_OAM_lb_1} + p4: { get_resource: template_VMInt_OAM_lb_2} diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/nested/inputfiles/nested.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/nested/inputfiles/nested.yml index b8ec5dd9d3..060bb5ff2a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/nested/inputfiles/nested.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/nested/inputfiles/nested.yml @@ -9,6 +9,12 @@ parameters: p2: type: string description: UID of OAM network + p3: + type: string + description: port resource + p4: + type: string + description: port resource security_group_name: type: comma_delimited_list description: CMAUI1, CMAUI2 server names @@ -49,16 +55,6 @@ parameters: subinterface_instance_index: type: number resources: - template_VMInt_OAM_lb_1: - type: OS::ContrailV2::VirtualMachineInterface - properties: - virtual_machine_interface_properties: - { - virtual_machine_interface_properties_service_interface_type: { get_param: lb_st_interface_type_oam }, - } - virtual_network_refs: [{ get_param: p1 }] - port_tuple_refs: [{ get_param: template_PortTuple_LB1 }] - security_group_refs: [{ get_param: oam_sec_group_name}] template_Vlan_1: type: OS::ContrailV2::VirtualMachineInterface @@ -101,18 +97,7 @@ resources: ] } virtual_network_refs: [{ get_param: p1 }] - virtual_machine_interface_refs: [{ get_resource: template_VMInt_OAM_lb_1 }] - - template_VMInt_OAM_lb_2: - type: OS::ContrailV2::VirtualMachineInterface - properties: - virtual_machine_interface_properties: - { - virtual_machine_interface_properties_service_interface_type: { get_param: lb_st_interface_type_oam }, - } - virtual_network_refs: [{ get_param: p1 },{ get_param: p2 }] - port_tuple_refs: [{ get_param: template_PortTuple_LB1 }] - security_group_refs: [{ get_param: oam_sec_group_name}] + virtual_machine_interface_refs: [{ get_param: p3 }] template_Vlan_2: type: OS::ContrailV2::VirtualMachineInterface @@ -155,15 +140,4 @@ resources: ] } virtual_network_refs: [{ get_param: p1 },{ get_param: p2 }] - virtual_machine_interface_refs: [{ get_resource: template_VMInt_OAM_lb_2 }] - - server_cmaui: - type: OS::Nova::Server - properties: - name: { get_param: [cmaui_names, 0]} - image: { get_param: cmaui_image } - availability_zone: { get_param: availability_zone_0 } - flavor: { get_param: cmaui_flavor } - networks: - - port: { get_resource: template_VMInt_OAM_lb_1 } - - port: { get_resource: template_VMInt_OAM_lb_2 }
\ No newline at end of file + virtual_machine_interface_refs: [{ get_param: p4 }]
\ 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/nestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/nestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml index 98c0195c9a..938e59adcc 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/nestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/nestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml @@ -5,6 +5,123 @@ imports: - openecomp_heat_index: file: openecomp-heat/_index.yml node_types: + org.openecomp.resource.abstract.nodes.heat.subinterface.nested4: + derived_from: org.openecomp.resource.abstract.nodes.AbstractSubstitute + properties: + cmaui_names: + type: list + description: CMAUI1, CMAUI2 server names + required: true + status: SUPPORTED + entry_schema: + type: string + p1: + type: string + description: UID of OAM network + required: true + status: SUPPORTED + p2: + type: string + required: true + status: SUPPORTED + p3: + type: string + required: true + status: SUPPORTED + template_PortTuple_LB1: + type: string + required: true + status: SUPPORTED + lb_st_interface_type_oam: + type: string + required: true + status: SUPPORTED + oam_sec_group_name: + type: string + required: true + status: SUPPORTED + virtual_ip_address: + type: string + required: true + status: SUPPORTED + security_group_name: + type: list + description: CMAUI1, CMAUI2 server names + required: true + status: SUPPORTED + entry_schema: + type: string + vlan_ids: + type: string + required: true + status: SUPPORTED + cmaui_image: + type: string + 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 + subinterface_name_prefix: + type: string + required: true + status: SUPPORTED + subinterface_instance_index: + type: float + required: true + status: SUPPORTED + cmaui_oam_ips: + type: string + required: true + status: SUPPORTED + requirements: + - dependency_template_subint_oam_vmi_4: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - subinterface_link_template_subint_oam_vmi_4: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 + - binding_template_subint_oam_vmi_4: + capability: tosca.capabilities.network.Bindable + node: org.openecomp.resource.cp.nodes.network.Port + relationship: tosca.relationships.network.BindsTo + occurrences: + - 1 + - 1 + capabilities: + feature_template_subint_oam_vmi_4: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED org.openecomp.resource.abstract.nodes.heat.nested1: derived_from: org.openecomp.resource.abstract.nodes.AbstractSubstitute properties: @@ -93,20 +210,39 @@ node_types: required: true status: SUPPORTED requirements: + - dependency_template_VMInt_OAM_lb_1: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED - link_template_VMInt_OAM_lb_1: capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 + - dependency_template_VMInt_OAM_lb_2: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED - link_template_VMInt_OAM_lb_2: capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 + - dependency_server_cmaui: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED - local_storage_server_cmaui: capability: tosca.capabilities.Attachment node: tosca.nodes.BlockStorage @@ -114,261 +250,1347 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_1: - capability: tosca.capabilities.network.Linkable + - dependency_test_nested2Level: + capability: tosca.capabilities.Node node: tosca.nodes.Root - relationship: tosca.relationships.network.LinksTo + relationship: tosca.relationships.DependsOn occurrences: - - 1 - - 1 - - link_template_VMInt_OAM_lb_5_test_nested3Level_test_nested2Level: - capability: tosca.capabilities.network.Linkable + - 0 + - UNBOUNDED + - dependency_server_cmaui_2_test_nested2Level: + capability: tosca.capabilities.Node node: tosca.nodes.Root - relationship: tosca.relationships.network.LinksTo + relationship: tosca.relationships.DependsOn occurrences: - - 1 - - 1 - - link_template_VMInt_OAM_lb_7_test_nested4Level_test_nested3Level_test_nested2Level: - capability: tosca.capabilities.network.Linkable + - 0 + - UNBOUNDED + - local_storage_server_cmaui_2_test_nested2Level: + capability: tosca.capabilities.Attachment + node: tosca.nodes.BlockStorage + relationship: tosca.relationships.AttachesTo + occurrences: + - 0 + - UNBOUNDED + - dependency_test_nested3Level_test_nested2Level: + capability: tosca.capabilities.Node node: tosca.nodes.Root - relationship: tosca.relationships.network.LinksTo + relationship: tosca.relationships.DependsOn occurrences: - - 1 - - 1 - - link_template_VMInt_OAM_lb_8_test_nested4Level_test_nested3Level_test_nested2Level: - capability: tosca.capabilities.network.Linkable + - 0 + - UNBOUNDED + - dependency_template_VMInt_OAM_lb_5_test_nested3Level_test_nested2Level: + capability: tosca.capabilities.Node node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - link_template_VMInt_OAM_lb_5_test_nested3Level_test_nested2Level: + capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - local_storage_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo + - dependency_test_nested4Level_test_nested3Level_test_nested2Level: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_template_Vlan_4_test_nested4Level_test_nested3Level_test_nested2Level: - capability: tosca.capabilities.network.Linkable + - dependency_template_subint_oam_vmi_4_test_nested4Level_test_nested3Level_test_nested2Level: + capability: tosca.capabilities.Node node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - subinterface_link_template_subint_oam_vmi_4_test_nested4Level_test_nested3Level_test_nested2Level: + capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 + - dependency_template_VMInt_OAM_lb_6_test_nested3Level_test_nested2Level: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED - link_template_VMInt_OAM_lb_6_test_nested3Level_test_nested2Level: capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - local_storage_server_cmaui_test_nested3Level_test_nested2Level: + - dependency_server_cmaui_3_test_nested3Level_test_nested2Level: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - local_storage_server_cmaui_3_test_nested3Level_test_nested2Level: capability: tosca.capabilities.Attachment node: tosca.nodes.BlockStorage relationship: tosca.relationships.AttachesTo occurrences: - 0 - UNBOUNDED - - link_template_Vlan_3_test_nested3Level_test_nested2Level: - capability: tosca.capabilities.network.Linkable + - dependency_template_VMInt_OAM_lb_8_test_nested3Level_test_nested2Level: + capability: tosca.capabilities.Node node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - link_template_VMInt_OAM_lb_8_test_nested3Level_test_nested2Level: + capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - link_template_VMInt_OAM_lb_3_test_nested2Level: - capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root - relationship: tosca.relationships.network.LinksTo + - binding_template_VMInt_OAM_lb_8_test_nested3Level_test_nested2Level: + capability: tosca.capabilities.network.Bindable + relationship: tosca.relationships.network.BindsTo occurrences: - 1 - 1 - - link_template_VMInt_OAM_lb_4_test_nested2Level: - capability: tosca.capabilities.network.Linkable + - dependency_template_VMInt_OAM_lb_3_test_nested2Level: + capability: tosca.capabilities.Node node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - link_template_VMInt_OAM_lb_3_test_nested2Level: + capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - local_storage_server_cmaui_test_nested2Level: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo + - dependency_template_VMInt_OAM_lb_4_test_nested2Level: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_template_Vlan_2_test_nested2Level: + - link_template_VMInt_OAM_lb_4_test_nested2Level: capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: - os_server_cmaui_test_nested2Level: - type: tosca.capabilities.OperatingSystem - occurrences: - - 1 - - UNBOUNDED - os_server_cmaui: - type: tosca.capabilities.OperatingSystem + disk.device.write.requests.rate_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - os_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level: - type: tosca.capabilities.OperatingSystem + disk.device.allocation_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - endpoint_server_cmaui_test_nested2Level: - type: tosca.capabilities.Endpoint.Admin + memory.resident_server_cmaui_3_test_nested3Level_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - scalable_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level: - type: tosca.capabilities.Scalable + network.incoming.packets.rate_template_VMInt_OAM_lb_6_test_nested3Level_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - endpoint_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level: - type: tosca.capabilities.Endpoint.Admin + network.outpoing.packets_template_VMInt_OAM_lb_3_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - host_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level: + host_server_cmaui: type: tosca.capabilities.Container valid_source_types: - tosca.nodes.SoftwareComponent occurrences: - 1 - UNBOUNDED - host_server_cmaui_test_nested3Level_test_nested2Level: - type: tosca.capabilities.Container - valid_source_types: - - tosca.nodes.SoftwareComponent + disk.device.latency_server_cmaui_3_test_nested3Level_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - binding_template_VMInt_OAM_lb_8_test_nested4Level_test_nested3Level_test_nested2Level: + scalable_server_cmaui_3_test_nested3Level_test_nested2Level: + type: tosca.capabilities.Scalable + occurrences: + - 1 + - UNBOUNDED + binding_template_VMInt_OAM_lb_5_test_nested3Level_test_nested2Level: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED - scalable_server_cmaui: - type: tosca.capabilities.Scalable + network.incoming.bytes_template_VMInt_OAM_lb_2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - scalable_server_cmaui_test_nested3Level_test_nested2Level: - type: tosca.capabilities.Scalable + network.incoming.bytes_template_VMInt_OAM_lb_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - host_server_cmaui: - type: tosca.capabilities.Container - valid_source_types: - - tosca.nodes.SoftwareComponent + endpoint_server_cmaui_2_test_nested2Level: + type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED - binding_template_VMInt_OAM_lb_4_test_nested2Level: + disk.latency_server_cmaui_3_test_nested3Level_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + feature_server_cmaui_2_test_nested2Level: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + disk.capacity_server_cmaui_2_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + instance_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + binding_template_VMInt_OAM_lb_6_test_nested3Level_test_nested2Level: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED - binding_template_VMInt_OAM_lb_5_test_nested3Level_test_nested2Level: + network.outgoing.packets.rate_template_VMInt_OAM_lb_5_test_nested3Level_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + binding_template_VMInt_OAM_lb_3_test_nested2Level: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED - host_server_cmaui_test_nested2Level: - type: tosca.capabilities.Container - valid_source_types: - - tosca.nodes.SoftwareComponent + disk.device.write.requests_server_cmaui_2_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - endpoint_server_cmaui_test_nested3Level_test_nested2Level: - type: tosca.capabilities.Endpoint.Admin + network.outpoing.packets_template_VMInt_OAM_lb_4_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - binding_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level: - type: tosca.capabilities.network.Bindable + disk.device.read.bytes_server_cmaui_2_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - binding_server_cmaui_test_nested3Level_test_nested2Level: - type: tosca.capabilities.network.Bindable + disk.device.write.requests.rate_server_cmaui_2_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - binding_template_VMInt_OAM_lb_2: + os_server_cmaui: + type: tosca.capabilities.OperatingSystem + occurrences: + - 1 + - UNBOUNDED + disk.read.bytes_server_cmaui_2_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.allocation_server_cmaui_2_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets_template_VMInt_OAM_lb_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets_template_VMInt_OAM_lb_2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes_template_VMInt_OAM_lb_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes_template_VMInt_OAM_lb_2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + binding_template_VMInt_OAM_lb_4_test_nested2Level: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED - binding_template_VMInt_OAM_lb_1: + instance_server_cmaui_3_test_nested3Level_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + feature_server_cmaui: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + feature_test_nested2Level: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + disk.write.requests_server_cmaui_3_test_nested3Level_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + memory.usage_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + cpu_server_cmaui_3_test_nested3Level_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.packets.rate_template_VMInt_OAM_lb_4_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.ephemeral.size_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + forwarder_template_VMInt_OAM_lb_4_test_nested2Level: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets_template_VMInt_OAM_lb_3_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets.rate_template_VMInt_OAM_lb_8_test_nested3Level_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.packets.rate_template_VMInt_OAM_lb_6_test_nested3Level_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.iops_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes.rate_template_VMInt_OAM_lb_5_test_nested3Level_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes.rate_template_VMInt_OAM_lb_6_test_nested3Level_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.read.requests.rate_server_cmaui_3_test_nested3Level_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + cpu_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + cpu_server_cmaui_2_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes_template_VMInt_OAM_lb_3_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + feature_template_VMInt_OAM_lb_4_test_nested2Level: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + disk.ephemeral.size_server_cmaui_3_test_nested3Level_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.read.bytes.rate_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.root.size_server_cmaui_3_test_nested3Level_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + feature_template_VMInt_OAM_lb_3_test_nested2Level: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + os_server_cmaui_3_test_nested3Level_test_nested2Level: + type: tosca.capabilities.OperatingSystem + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes_template_VMInt_OAM_lb_5_test_nested3Level_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + forwarder_template_VMInt_OAM_lb_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes.rate_template_VMInt_OAM_lb_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.latency_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.read.requests_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.write.bytes_server_cmaui_3_test_nested3Level_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes.rate_template_VMInt_OAM_lb_2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + binding_template_VMInt_OAM_lb_8_test_nested3Level_test_nested2Level: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED - os_server_cmaui_test_nested3Level_test_nested2Level: + network.incoming.packets.rate_template_VMInt_OAM_lb_4_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.usage_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + forwarder_template_VMInt_OAM_lb_2: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + disk.device.usage_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.capacity_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.write.requests.rate_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.write.bytes_server_cmaui_2_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets.rate_template_VMInt_OAM_lb_2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets.rate_template_VMInt_OAM_lb_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.packets.rate_template_VMInt_OAM_lb_8_test_nested3Level_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.read.requests_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + feature_template_VMInt_OAM_lb_2: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + feature_template_VMInt_OAM_lb_1: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + binding_server_cmaui: + type: tosca.capabilities.network.Bindable + occurrences: + - 1 + - UNBOUNDED + disk.usage_server_cmaui_2_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.read.requests.rate_server_cmaui_2_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.read.requests.rate_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.read.bytes.rate_server_cmaui_3_test_nested3Level_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes_template_VMInt_OAM_lb_8_test_nested3Level_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outpoing.packets_template_VMInt_OAM_lb_5_test_nested3Level_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.write.bytes_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.write.bytes_server_cmaui_3_test_nested3Level_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + forwarder_template_VMInt_OAM_lb_3_test_nested2Level: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + disk.write.requests.rate_server_cmaui_3_test_nested3Level_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + os_server_cmaui_2_test_nested2Level: type: tosca.capabilities.OperatingSystem occurrences: - 1 - UNBOUNDED - binding_template_VMInt_OAM_lb_6_test_nested3Level_test_nested2Level: + network.incoming.bytes.rate_template_VMInt_OAM_lb_8_test_nested3Level_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes.rate_template_VMInt_OAM_lb_4_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.read.requests_server_cmaui_3_test_nested3Level_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.iops_server_cmaui_2_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.read.bytes.rate_server_cmaui_2_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + memory_server_cmaui_3_test_nested3Level_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + vcpus_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.write.bytes_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.allocation_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.read.bytes_server_cmaui_3_test_nested3Level_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes.rate_template_VMInt_OAM_lb_6_test_nested3Level_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.write.bytes.rate_server_cmaui_3_test_nested3Level_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + forwarder_template_VMInt_OAM_lb_6_test_nested3Level_test_nested2Level: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + disk.device.allocation_server_cmaui_3_test_nested3Level_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + cpu.delta_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + cpu_util_server_cmaui_2_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + memory.usage_server_cmaui_2_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + feature_server_cmaui_3_test_nested3Level_test_nested2Level: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + scalable_server_cmaui: + type: tosca.capabilities.Scalable + occurrences: + - 1 + - UNBOUNDED + disk.read.bytes.rate_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.read.requests_server_cmaui_3_test_nested3Level_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.write.requests.rate_server_cmaui_3_test_nested3Level_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + cpu_util_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes_template_VMInt_OAM_lb_6_test_nested3Level_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.read.requests_server_cmaui_2_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outpoing.packets_template_VMInt_OAM_lb_6_test_nested3Level_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.write.bytes.rate_server_cmaui_2_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.write.requests_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.latency_server_cmaui_2_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + vcpus_server_cmaui_3_test_nested3Level_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes.rate_template_VMInt_OAM_lb_8_test_nested3Level_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes_template_VMInt_OAM_lb_8_test_nested3Level_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + forwarder_template_VMInt_OAM_lb_8_test_nested3Level_test_nested2Level: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + disk.device.read.bytes_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.packets.rate_template_VMInt_OAM_lb_2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.write.bytes.rate_server_cmaui_2_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.packets.rate_template_VMInt_OAM_lb_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.root.size_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes_template_VMInt_OAM_lb_5_test_nested3Level_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.read.requests_server_cmaui_2_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + memory.resident_server_cmaui_2_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.iops_server_cmaui_3_test_nested3Level_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.allocation_server_cmaui_2_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.write.bytes.rate_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outpoing.packets_template_VMInt_OAM_lb_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outpoing.packets_template_VMInt_OAM_lb_2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.write.requests_server_cmaui_3_test_nested3Level_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.write.requests_server_cmaui_2_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outpoing.packets_template_VMInt_OAM_lb_8_test_nested3Level_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets_template_VMInt_OAM_lb_6_test_nested3Level_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes.rate_template_VMInt_OAM_lb_3_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.read.bytes.rate_server_cmaui_2_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets_template_VMInt_OAM_lb_5_test_nested3Level_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + feature_test_nested4Level_test_nested3Level_test_nested2Level: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes.rate_template_VMInt_OAM_lb_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes.rate_template_VMInt_OAM_lb_2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.usage_server_cmaui_2_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.write.bytes.rate_server_cmaui_3_test_nested3Level_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.iops_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.read.bytes_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + endpoint_server_cmaui_3_test_nested3Level_test_nested2Level: + type: tosca.capabilities.Endpoint.Admin + occurrences: + - 1 + - UNBOUNDED + feature_template_VMInt_OAM_lb_5_test_nested3Level_test_nested2Level: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + binding_server_cmaui_3_test_nested3Level_test_nested2Level: + type: tosca.capabilities.network.Bindable + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets.rate_template_VMInt_OAM_lb_3_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes_template_VMInt_OAM_lb_3_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.iops_server_cmaui_2_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.write.bytes.rate_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes_template_VMInt_OAM_lb_4_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes_template_VMInt_OAM_lb_4_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + instance_server_cmaui_2_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + feature_template_subint_oam_vmi_4_test_nested4Level_test_nested3Level_test_nested2Level: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + disk.device.capacity_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + forwarder_template_VMInt_OAM_lb_5_test_nested3Level_test_nested2Level: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + disk.read.bytes_server_cmaui_3_test_nested3Level_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + cpu.delta_server_cmaui_3_test_nested3Level_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + feature_template_VMInt_OAM_lb_6_test_nested3Level_test_nested2Level: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + memory_server_cmaui_2_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.usage_server_cmaui_3_test_nested3Level_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + memory_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.root.size_server_cmaui_2_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + cpu_util_server_cmaui_3_test_nested3Level_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.latency_server_cmaui_2_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.allocation_server_cmaui_3_test_nested3Level_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.ephemeral.size_server_cmaui_2_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes.rate_template_VMInt_OAM_lb_3_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.capacity_server_cmaui_3_test_nested3Level_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets_template_VMInt_OAM_lb_4_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + binding_server_cmaui_2_test_nested2Level: + type: tosca.capabilities.network.Bindable + occurrences: + - 1 + - UNBOUNDED + cpu.delta_server_cmaui_2_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.capacity_server_cmaui_2_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes.rate_template_VMInt_OAM_lb_5_test_nested3Level_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + memory.usage_server_cmaui_3_test_nested3Level_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + scalable_server_cmaui_2_test_nested2Level: + type: tosca.capabilities.Scalable + occurrences: + - 1 + - UNBOUNDED + host_server_cmaui_3_test_nested3Level_test_nested2Level: + type: tosca.capabilities.Container + valid_source_types: + - tosca.nodes.SoftwareComponent + occurrences: + - 1 + - UNBOUNDED + disk.iops_server_cmaui_3_test_nested3Level_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + memory.resident_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + vcpus_server_cmaui_2_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.packets.rate_template_VMInt_OAM_lb_3_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.latency_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets.rate_template_VMInt_OAM_lb_5_test_nested3Level_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + 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 + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED - binding_template_VMInt_OAM_lb_3_test_nested2Level: + binding_template_VMInt_OAM_lb_1: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED - endpoint_server_cmaui: - type: tosca.capabilities.Endpoint.Admin + disk.device.read.bytes.rate_server_cmaui_3_test_nested3Level_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - scalable_server_cmaui_test_nested2Level: - type: tosca.capabilities.Scalable + disk.write.requests_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - binding_server_cmaui: - type: tosca.capabilities.network.Bindable + disk.write.requests.rate_server_cmaui_2_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - binding_server_cmaui_test_nested2Level: - type: tosca.capabilities.network.Bindable + disk.write.bytes_server_cmaui_2_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - binding_template_VMInt_OAM_lb_7_test_nested4Level_test_nested3Level_test_nested2Level: - type: tosca.capabilities.network.Bindable + feature_test_nested3Level_test_nested2Level: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + disk.device.usage_server_cmaui_3_test_nested3Level_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.capacity_server_cmaui_3_test_nested3Level_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets_template_VMInt_OAM_lb_8_test_nested3Level_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + feature_template_VMInt_OAM_lb_8_test_nested3Level_test_nested2Level: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + endpoint_server_cmaui: + type: tosca.capabilities.Endpoint.Admin + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes.rate_template_VMInt_OAM_lb_4_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes_template_VMInt_OAM_lb_6_test_nested3Level_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + host_server_cmaui_2_test_nested2Level: + type: tosca.capabilities.Container valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - tosca.nodes.SoftwareComponent occurrences: - - 0 + - 1 - UNBOUNDED org.openecomp.resource.abstract.nodes.heat.nested2: derived_from: org.openecomp.resource.abstract.nodes.AbstractSubstitute @@ -458,151 +1680,374 @@ node_types: required: true status: SUPPORTED requirements: - - link_template_VMInt_OAM_lb_5_test_nested3Level: - capability: tosca.capabilities.network.Linkable + - dependency_server_cmaui_2: + capability: tosca.capabilities.Node node: tosca.nodes.Root - relationship: tosca.relationships.network.LinksTo + relationship: tosca.relationships.DependsOn occurrences: - - 1 - - 1 - - link_template_VMInt_OAM_lb_7_test_nested4Level_test_nested3Level: - capability: tosca.capabilities.network.Linkable + - 0 + - UNBOUNDED + - local_storage_server_cmaui_2: + capability: tosca.capabilities.Attachment + node: tosca.nodes.BlockStorage + relationship: tosca.relationships.AttachesTo + occurrences: + - 0 + - UNBOUNDED + - dependency_test_nested3Level: + capability: tosca.capabilities.Node node: tosca.nodes.Root - relationship: tosca.relationships.network.LinksTo + relationship: tosca.relationships.DependsOn occurrences: - - 1 - - 1 - - link_template_VMInt_OAM_lb_8_test_nested4Level_test_nested3Level: - capability: tosca.capabilities.network.Linkable + - 0 + - UNBOUNDED + - dependency_template_VMInt_OAM_lb_5_test_nested3Level: + capability: tosca.capabilities.Node node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - link_template_VMInt_OAM_lb_5_test_nested3Level: + capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - local_storage_server_cmaui_test_nested4Level_test_nested3Level: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo + - dependency_test_nested4Level_test_nested3Level: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_template_Vlan_4_test_nested4Level_test_nested3Level: - capability: tosca.capabilities.network.Linkable + - dependency_template_subint_oam_vmi_4_test_nested4Level_test_nested3Level: + capability: tosca.capabilities.Node node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - subinterface_link_template_subint_oam_vmi_4_test_nested4Level_test_nested3Level: + capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 + - dependency_template_VMInt_OAM_lb_6_test_nested3Level: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED - link_template_VMInt_OAM_lb_6_test_nested3Level: capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - local_storage_server_cmaui_test_nested3Level: + - dependency_server_cmaui_3_test_nested3Level: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - local_storage_server_cmaui_3_test_nested3Level: capability: tosca.capabilities.Attachment node: tosca.nodes.BlockStorage relationship: tosca.relationships.AttachesTo occurrences: - 0 - UNBOUNDED - - link_template_Vlan_3_test_nested3Level: - capability: tosca.capabilities.network.Linkable + - dependency_template_VMInt_OAM_lb_8_test_nested3Level: + capability: tosca.capabilities.Node node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - link_template_VMInt_OAM_lb_8_test_nested3Level: + capability: tosca.capabilities.network.Linkable 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 + - binding_template_VMInt_OAM_lb_8_test_nested3Level: + capability: tosca.capabilities.network.Bindable + relationship: tosca.relationships.network.BindsTo occurrences: - 1 - 1 - - link_template_VMInt_OAM_lb_4: - capability: tosca.capabilities.network.Linkable + - dependency_template_VMInt_OAM_lb_3: + capability: tosca.capabilities.Node node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - link_template_VMInt_OAM_lb_3: + capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - local_storage_server_cmaui: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo + - dependency_template_VMInt_OAM_lb_4: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_template_Vlan_2: + - link_template_VMInt_OAM_lb_4: capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: - os_server_cmaui: - type: tosca.capabilities.OperatingSystem + memory.usage_server_cmaui_3_test_nested3Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - os_server_cmaui_test_nested4Level_test_nested3Level: - type: tosca.capabilities.OperatingSystem + cpu_util_server_cmaui_3_test_nested3Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - scalable_server_cmaui_test_nested4Level_test_nested3Level: - type: tosca.capabilities.Scalable + disk.device.usage_server_cmaui_2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - host_server_cmaui_test_nested3Level: - type: tosca.capabilities.Container - valid_source_types: - - tosca.nodes.SoftwareComponent + network.incoming.bytes.rate_template_VMInt_OAM_lb_6_test_nested3Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - endpoint_server_cmaui_test_nested3Level: - type: tosca.capabilities.Endpoint.Admin + disk.device.latency_server_cmaui_2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - scalable_server_cmaui: - type: tosca.capabilities.Scalable + network.outgoing.bytes.rate_template_VMInt_OAM_lb_8_test_nested3Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - binding_template_VMInt_OAM_lb_6_test_nested3Level: + disk.root.size_server_cmaui_2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.write.requests.rate_server_cmaui_2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets_template_VMInt_OAM_lb_8_test_nested3Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.read.requests_server_cmaui_3_test_nested3Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.latency_server_cmaui_3_test_nested3Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + binding_template_VMInt_OAM_lb_4: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED - binding_server_cmaui_test_nested3Level: + disk.write.bytes.rate_server_cmaui_3_test_nested3Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + 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 + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + network.incoming.bytes_template_VMInt_OAM_lb_4: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - host_server_cmaui: + disk.read.requests_server_cmaui_2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes_template_VMInt_OAM_lb_3: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + feature_test_nested4Level_test_nested3Level: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + disk.device.iops_server_cmaui_2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes.rate_template_VMInt_OAM_lb_6_test_nested3Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.capacity_server_cmaui_2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.read.bytes.rate_server_cmaui_2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.read.bytes_server_cmaui_2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.read.bytes_server_cmaui_2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.write.requests.rate_server_cmaui_2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes.rate_template_VMInt_OAM_lb_5_test_nested3Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + memory_server_cmaui_2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + cpu_server_cmaui_2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + host_server_cmaui_3_test_nested3Level: type: tosca.capabilities.Container valid_source_types: - tosca.nodes.SoftwareComponent occurrences: - 1 - UNBOUNDED - binding_template_VMInt_OAM_lb_7_test_nested4Level_test_nested3Level: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + disk.allocation_server_cmaui_3_test_nested3Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - - 0 + - 1 - UNBOUNDED - scalable_server_cmaui_test_nested3Level: - type: tosca.capabilities.Scalable + network.outpoing.packets_template_VMInt_OAM_lb_3: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets_template_VMInt_OAM_lb_5_test_nested3Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outpoing.packets_template_VMInt_OAM_lb_4: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.ephemeral.size_server_cmaui_2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.write.requests_server_cmaui_3_test_nested3Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.capacity_server_cmaui_2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes_template_VMInt_OAM_lb_3: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets_template_VMInt_OAM_lb_3: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes_template_VMInt_OAM_lb_4: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets_template_VMInt_OAM_lb_4: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED @@ -610,62 +2055,587 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED - binding_template_VMInt_OAM_lb_8_test_nested4Level_test_nested3Level: + network.outgoing.bytes_template_VMInt_OAM_lb_8_test_nested3Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.read.bytes.rate_server_cmaui_3_test_nested3Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets.rate_template_VMInt_OAM_lb_8_test_nested3Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + forwarder_template_VMInt_OAM_lb_8_test_nested3Level: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes.rate_template_VMInt_OAM_lb_3: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes.rate_template_VMInt_OAM_lb_4: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.iops_server_cmaui_2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes.rate_template_VMInt_OAM_lb_3: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes.rate_template_VMInt_OAM_lb_4: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.write.requests_server_cmaui_2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.packets.rate_template_VMInt_OAM_lb_8_test_nested3Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + memory_server_cmaui_3_test_nested3Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + feature_server_cmaui_3_test_nested3Level: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets.rate_template_VMInt_OAM_lb_6_test_nested3Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.write.bytes.rate_server_cmaui_3_test_nested3Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.root.size_server_cmaui_3_test_nested3Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.usage_server_cmaui_3_test_nested3Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outpoing.packets_template_VMInt_OAM_lb_5_test_nested3Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.write.requests_server_cmaui_3_test_nested3Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.read.requests.rate_server_cmaui_3_test_nested3Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.latency_server_cmaui_3_test_nested3Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + cpu_util_server_cmaui_2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.write.requests.rate_server_cmaui_3_test_nested3Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.write.bytes.rate_server_cmaui_2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.write.bytes.rate_server_cmaui_2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.write.bytes_server_cmaui_2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.packets.rate_template_VMInt_OAM_lb_6_test_nested3Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + feature_template_subint_oam_vmi_4_test_nested4Level_test_nested3Level: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + disk.iops_server_cmaui_3_test_nested3Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + feature_template_VMInt_OAM_lb_5_test_nested3Level: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + cpu_server_cmaui_3_test_nested3Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.write.bytes_server_cmaui_2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + feature_server_cmaui_2: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + disk.allocation_server_cmaui_2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes_template_VMInt_OAM_lb_5_test_nested3Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + forwarder_template_VMInt_OAM_lb_6_test_nested3Level: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + binding_server_cmaui_2: + type: tosca.capabilities.network.Bindable + occurrences: + - 1 + - UNBOUNDED + vcpus_server_cmaui_2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + binding_template_VMInt_OAM_lb_8_test_nested3Level: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED - endpoint_server_cmaui: - type: tosca.capabilities.Endpoint.Admin + instance_server_cmaui_3_test_nested3Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - os_server_cmaui_test_nested3Level: - type: tosca.capabilities.OperatingSystem + scalable_server_cmaui_2: + type: tosca.capabilities.Scalable occurrences: - 1 - UNBOUNDED - endpoint_server_cmaui_test_nested4Level_test_nested3Level: + network.outgoing.bytes_template_VMInt_OAM_lb_5_test_nested3Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets.rate_template_VMInt_OAM_lb_5_test_nested3Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + forwarder_template_VMInt_OAM_lb_4: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + forwarder_template_VMInt_OAM_lb_3: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + disk.device.read.bytes.rate_server_cmaui_3_test_nested3Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.write.requests_server_cmaui_2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets.rate_template_VMInt_OAM_lb_4: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets.rate_template_VMInt_OAM_lb_3: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.usage_server_cmaui_2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.usage_server_cmaui_3_test_nested3Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.write.bytes_server_cmaui_3_test_nested3Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.packets.rate_template_VMInt_OAM_lb_5_test_nested3Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.write.requests.rate_server_cmaui_3_test_nested3Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + endpoint_server_cmaui_2: type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED - binding_server_cmaui: - type: tosca.capabilities.network.Bindable + network.outgoing.bytes_template_VMInt_OAM_lb_6_test_nested3Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - binding_template_VMInt_OAM_lb_4: + feature_template_VMInt_OAM_lb_4: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + binding_template_VMInt_OAM_lb_6_test_nested3Level: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED - host_server_cmaui_test_nested4Level_test_nested3Level: + forwarder_template_VMInt_OAM_lb_5_test_nested3Level: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + feature_template_VMInt_OAM_lb_3: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + os_server_cmaui_2: + type: tosca.capabilities.OperatingSystem + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes_template_VMInt_OAM_lb_6_test_nested3Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outpoing.packets_template_VMInt_OAM_lb_8_test_nested3Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.allocation_server_cmaui_2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.read.bytes_server_cmaui_3_test_nested3Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.allocation_server_cmaui_3_test_nested3Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + host_server_cmaui_2: type: tosca.capabilities.Container valid_source_types: - tosca.nodes.SoftwareComponent 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 + os_server_cmaui_3_test_nested3Level: + type: tosca.capabilities.OperatingSystem occurrences: - - 0 + - 1 - UNBOUNDED - binding_server_cmaui_test_nested4Level_test_nested3Level: + binding_server_cmaui_3_test_nested3Level: type: tosca.capabilities.network.Bindable occurrences: - 1 - UNBOUNDED + network.incoming.bytes.rate_template_VMInt_OAM_lb_8_test_nested3Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + feature_test_nested3Level: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + feature_template_VMInt_OAM_lb_8_test_nested3Level: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + network.outgoing.packets.rate_template_VMInt_OAM_lb_4: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes.rate_template_VMInt_OAM_lb_5_test_nested3Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + cpu.delta_server_cmaui_3_test_nested3Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.packets.rate_template_VMInt_OAM_lb_3: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.capacity_server_cmaui_3_test_nested3Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + scalable_server_cmaui_3_test_nested3Level: + type: tosca.capabilities.Scalable + occurrences: + - 1 + - UNBOUNDED + instance_server_cmaui_2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.iops_server_cmaui_3_test_nested3Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes_template_VMInt_OAM_lb_8_test_nested3Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outpoing.packets_template_VMInt_OAM_lb_6_test_nested3Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + endpoint_server_cmaui_3_test_nested3Level: + type: tosca.capabilities.Endpoint.Admin + occurrences: + - 1 + - UNBOUNDED + vcpus_server_cmaui_3_test_nested3Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.write.bytes_server_cmaui_3_test_nested3Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.read.requests_server_cmaui_2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.read.bytes.rate_server_cmaui_2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets_template_VMInt_OAM_lb_6_test_nested3Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.capacity_server_cmaui_3_test_nested3Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + cpu.delta_server_cmaui_2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.read.requests.rate_server_cmaui_2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + memory.resident_server_cmaui_2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.read.requests_server_cmaui_3_test_nested3Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.latency_server_cmaui_2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + feature_template_VMInt_OAM_lb_6_test_nested3Level: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + disk.ephemeral.size_server_cmaui_3_test_nested3Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.read.bytes_server_cmaui_3_test_nested3Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + memory.resident_server_cmaui_3_test_nested3Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + memory.usage_server_cmaui_2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED org.openecomp.resource.abstract.nodes.heat.nested3: derived_from: org.openecomp.resource.abstract.nodes.AbstractSubstitute properties: @@ -757,123 +2727,165 @@ node_types: required: true status: SUPPORTED requirements: - - link_template_VMInt_OAM_lb_5: - capability: tosca.capabilities.network.Linkable + - dependency_template_VMInt_OAM_lb_5: + capability: tosca.capabilities.Node node: tosca.nodes.Root - relationship: tosca.relationships.network.LinksTo + relationship: tosca.relationships.DependsOn occurrences: - - 1 - - 1 - - link_template_VMInt_OAM_lb_7_test_nested4Level: + - 0 + - UNBOUNDED + - link_template_VMInt_OAM_lb_5: capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - link_template_VMInt_OAM_lb_8_test_nested4Level: - capability: tosca.capabilities.network.Linkable + - dependency_test_nested4Level: + capability: tosca.capabilities.Node node: tosca.nodes.Root - relationship: tosca.relationships.network.LinksTo + relationship: tosca.relationships.DependsOn occurrences: - - 1 - - 1 - - local_storage_server_cmaui_test_nested4Level: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo + - 0 + - UNBOUNDED + - dependency_template_subint_oam_vmi_4_test_nested4Level: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_template_Vlan_4_test_nested4Level: + - subinterface_link_template_subint_oam_vmi_4_test_nested4Level: capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 + - dependency_template_VMInt_OAM_lb_6: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED - link_template_VMInt_OAM_lb_6: capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - local_storage_server_cmaui: + - dependency_server_cmaui_3: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - local_storage_server_cmaui_3: capability: tosca.capabilities.Attachment node: tosca.nodes.BlockStorage relationship: tosca.relationships.AttachesTo occurrences: - 0 - UNBOUNDED - - link_template_Vlan_3: - capability: tosca.capabilities.network.Linkable + - dependency_template_VMInt_OAM_lb_8: + capability: tosca.capabilities.Node node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - link_template_VMInt_OAM_lb_8: + capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 + - binding_template_VMInt_OAM_lb_8: + capability: tosca.capabilities.network.Bindable + relationship: tosca.relationships.network.BindsTo + occurrences: + - 1 + - 1 capabilities: - scalable_server_cmaui_test_nested4Level: - type: tosca.capabilities.Scalable + disk.write.bytes.rate_server_cmaui_3: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - os_server_cmaui: - type: tosca.capabilities.OperatingSystem + forwarder_template_VMInt_OAM_lb_8: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - scalable_server_cmaui: - type: tosca.capabilities.Scalable + disk.device.write.bytes_server_cmaui_3: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - binding_template_VMInt_OAM_lb_7_test_nested4Level: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + forwarder_template_VMInt_OAM_lb_6: + type: org.openecomp.capabilities.Forwarder occurrences: - - 0 + - 1 - UNBOUNDED - endpoint_server_cmaui_test_nested4Level: - type: tosca.capabilities.Endpoint.Admin + feature_server_cmaui_3: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - host_server_cmaui: - type: tosca.capabilities.Container - valid_source_types: - - tosca.nodes.SoftwareComponent + disk.device.usage_server_cmaui_3: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - os_server_cmaui_test_nested4Level: - type: tosca.capabilities.OperatingSystem + disk.device.latency_server_cmaui_3: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - host_server_cmaui_test_nested4Level: - type: tosca.capabilities.Container - valid_source_types: - - tosca.nodes.SoftwareComponent + disk.write.bytes_server_cmaui_3: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - endpoint_server_cmaui: - type: tosca.capabilities.Endpoint.Admin + disk.allocation_server_cmaui_3: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - binding_server_cmaui: + binding_server_cmaui_3: type: tosca.capabilities.network.Bindable occurrences: - 1 - UNBOUNDED + vcpus_server_cmaui_3: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.root.size_server_cmaui_3: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.write.requests.rate_server_cmaui_3: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED binding_template_VMInt_OAM_lb_6: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -881,175 +2893,367 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED - binding_template_VMInt_OAM_lb_8_test_nested4Level: + scalable_server_cmaui_3: + type: tosca.capabilities.Scalable + occurrences: + - 1 + - UNBOUNDED + forwarder_template_VMInt_OAM_lb_5: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + disk.read.requests_server_cmaui_3: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + binding_template_VMInt_OAM_lb_8: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED - binding_server_cmaui_test_nested4Level: - type: tosca.capabilities.network.Bindable + network.incoming.bytes_template_VMInt_OAM_lb_8: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - org.openecomp.resource.abstract.nodes.heat.nested4: - derived_from: org.openecomp.resource.abstract.nodes.AbstractSubstitute - properties: - cmaui_names: - type: list - description: CMAUI1, CMAUI2 server names - required: true - status: SUPPORTED - entry_schema: - type: string - p1: - type: string - description: UID of OAM network - required: true - status: SUPPORTED - p2: - type: string - required: true - status: SUPPORTED - template_PortTuple_LB1: - type: string - required: true - status: SUPPORTED - lb_st_interface_type_oam: - type: string - required: true - status: SUPPORTED - oam_sec_group_name: - type: string - required: true - status: SUPPORTED - virtual_ip_address: - type: string - required: true - status: SUPPORTED - security_group_name: - type: list - description: CMAUI1, CMAUI2 server names - required: true - status: SUPPORTED - entry_schema: - type: string - vlan_ids: - type: string - required: true - status: SUPPORTED - cmaui_image: - type: string - 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 - subinterface_name_prefix: - type: string - required: true - status: SUPPORTED - subinterface_instance_index: - type: float - required: true - status: SUPPORTED - cmaui_oam_ips: - type: string - required: true - status: SUPPORTED - requirements: - - link_template_VMInt_OAM_lb_7: - capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root - relationship: tosca.relationships.network.LinksTo + disk.write.requests_server_cmaui_3: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 + - UNBOUNDED + network.incoming.bytes_template_VMInt_OAM_lb_6: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: - 1 - - link_template_VMInt_OAM_lb_8: - capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root - relationship: tosca.relationships.network.LinksTo + - UNBOUNDED + network.incoming.bytes_template_VMInt_OAM_lb_5: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 + - UNBOUNDED + disk.usage_server_cmaui_3: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: - 1 - - local_storage_server_cmaui: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo + - UNBOUNDED + disk.device.iops_server_cmaui_3: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - - 0 + - 1 - UNBOUNDED - - link_template_Vlan_4: - capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root - relationship: tosca.relationships.network.LinksTo + disk.device.capacity_server_cmaui_3: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 + - UNBOUNDED + network.incoming.packets.rate_template_VMInt_OAM_lb_8: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: - 1 - capabilities: - host_server_cmaui: + - UNBOUNDED + feature_template_VMInt_OAM_lb_8: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + disk.device.read.bytes.rate_server_cmaui_3: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets.rate_template_VMInt_OAM_lb_6: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + feature_template_VMInt_OAM_lb_6: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets.rate_template_VMInt_OAM_lb_5: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + feature_template_VMInt_OAM_lb_5: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + endpoint_server_cmaui_3: + type: tosca.capabilities.Endpoint.Admin + occurrences: + - 1 + - UNBOUNDED + disk.read.bytes_server_cmaui_3: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + os_server_cmaui_3: + type: tosca.capabilities.OperatingSystem + occurrences: + - 1 + - UNBOUNDED + disk.write.requests.rate_server_cmaui_3: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.read.bytes_server_cmaui_3: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + memory_server_cmaui_3: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.allocation_server_cmaui_3: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + cpu_server_cmaui_3: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + host_server_cmaui_3: type: tosca.capabilities.Container valid_source_types: - tosca.nodes.SoftwareComponent occurrences: - 1 - UNBOUNDED - os_server_cmaui: - type: tosca.capabilities.OperatingSystem + network.outpoing.packets_template_VMInt_OAM_lb_5: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - endpoint_server_cmaui: - type: tosca.capabilities.Endpoint.Admin + network.outgoing.packets.rate_template_VMInt_OAM_lb_8: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - binding_server_cmaui: - type: tosca.capabilities.network.Bindable + disk.ephemeral.size_server_cmaui_3: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - scalable_server_cmaui: - type: tosca.capabilities.Scalable + network.outgoing.packets.rate_template_VMInt_OAM_lb_6: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - binding_template_VMInt_OAM_lb_8: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + disk.capacity_server_cmaui_3: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - - 0 + - 1 - UNBOUNDED - binding_template_VMInt_OAM_lb_7: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + network.outgoing.packets.rate_template_VMInt_OAM_lb_5: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - - 0 + - 1 + - UNBOUNDED + network.outgoing.bytes_template_VMInt_OAM_lb_5: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes_template_VMInt_OAM_lb_6: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + feature_test_nested4Level: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + feature_template_subint_oam_vmi_4_test_nested4Level: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + network.outpoing.packets_template_VMInt_OAM_lb_6: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + instance_server_cmaui_3: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outpoing.packets_template_VMInt_OAM_lb_8: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes_template_VMInt_OAM_lb_8: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes.rate_template_VMInt_OAM_lb_5: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes.rate_template_VMInt_OAM_lb_6: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.read.bytes.rate_server_cmaui_3: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.write.requests_server_cmaui_3: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes.rate_template_VMInt_OAM_lb_8: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes.rate_template_VMInt_OAM_lb_5: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes.rate_template_VMInt_OAM_lb_6: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.iops_server_cmaui_3: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.read.requests_server_cmaui_3: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes.rate_template_VMInt_OAM_lb_8: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets_template_VMInt_OAM_lb_5: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets_template_VMInt_OAM_lb_6: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.read.requests.rate_server_cmaui_3: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets_template_VMInt_OAM_lb_8: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + cpu.delta_server_cmaui_3: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + memory.resident_server_cmaui_3: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.latency_server_cmaui_3: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + memory.usage_server_cmaui_3: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + cpu_util_server_cmaui_3: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.write.bytes.rate_server_cmaui_3: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + 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/nestedMultiLevels/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/nestedMultiLevels/expectedoutputfiles/MainServiceTemplate.yaml index cb4c190ae4..ff3411cb33 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/nestedMultiLevels/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/nestedMultiLevels/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 node_types: @@ -44,15 +14,39 @@ topology_template: contrail_net_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: contrail_net_name 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: + - main + source_type: HEAT + param_name: jsa_net_name type: string jsa_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: jsa_name type: string description: network name of jsa log network node_templates: @@ -77,23 +71,11 @@ topology_template: capability: tosca.capabilities.network.Linkable node: test_contrailV2_net relationship: tosca.relationships.network.LinksTo - - link_template_Vlan_1: - capability: tosca.capabilities.network.Linkable - node: test_net - relationship: tosca.relationships.network.LinksTo - link_template_VMInt_OAM_lb_5_test_nested3Level_test_nested2Level: capability: tosca.capabilities.network.Linkable node: test_net relationship: tosca.relationships.network.LinksTo - - link_template_VMInt_OAM_lb_7_test_nested4Level_test_nested3Level_test_nested2Level: - capability: tosca.capabilities.network.Linkable - node: test_net - relationship: tosca.relationships.network.LinksTo - - link_template_VMInt_OAM_lb_8_test_nested4Level_test_nested3Level_test_nested2Level: - capability: tosca.capabilities.network.Linkable - node: test_net - relationship: tosca.relationships.network.LinksTo - - link_template_Vlan_4_test_nested4Level_test_nested3Level_test_nested2Level: + - subinterface_link_template_subint_oam_vmi_4_test_nested4Level_test_nested3Level_test_nested2Level: capability: tosca.capabilities.network.Linkable node: test_net relationship: tosca.relationships.network.LinksTo @@ -101,7 +83,7 @@ topology_template: capability: tosca.capabilities.network.Linkable node: test_net relationship: tosca.relationships.network.LinksTo - - link_template_Vlan_3_test_nested3Level_test_nested2Level: + - link_template_VMInt_OAM_lb_8_test_nested3Level_test_nested2Level: capability: tosca.capabilities.network.Linkable node: test_net relationship: tosca.relationships.network.LinksTo @@ -113,10 +95,6 @@ topology_template: capability: tosca.capabilities.network.Linkable node: test_contrailV2_net relationship: tosca.relationships.network.LinksTo - - link_template_Vlan_2_test_nested2Level: - capability: tosca.capabilities.network.Linkable - node: test_contrailV2_net - relationship: tosca.relationships.network.LinksTo test_resourceGroup: type: org.openecomp.resource.abstract.nodes.heat.nested3 directives: @@ -138,15 +116,15 @@ topology_template: - service_template_filter - index_value requirements: - - link_template_VMInt_OAM_lb_8_test_nested4Level: + - subinterface_link_template_subint_oam_vmi_4_test_nested4Level: capability: tosca.capabilities.network.Linkable node: test_contrailV2_net relationship: tosca.relationships.network.LinksTo - - link_template_Vlan_4_test_nested4Level: + - link_template_VMInt_OAM_lb_6: capability: tosca.capabilities.network.Linkable node: test_contrailV2_net relationship: tosca.relationships.network.LinksTo - - link_template_VMInt_OAM_lb_6: + - link_template_VMInt_OAM_lb_8: capability: tosca.capabilities.network.Linkable node: test_contrailV2_net relationship: tosca.relationships.network.LinksTo diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/nestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/nestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml index ec585edd53..b4e80d35af 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/nestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/nestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml @@ -2,38 +2,8 @@ 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: @@ -135,7 +105,7 @@ topology_template: virtual_network_refs: - get_input: p1 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 @@ -153,7 +123,7 @@ topology_template: - get_input: p2 - get_input: p1 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 @@ -176,50 +146,6 @@ topology_template: get_input: - cmaui_names - 0 - template_Vlan_1: - type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - properties: - virtual_machine_interface_refs: - - template_VMInt_OAM_lb_1 - name: - str_replace: - template: $NAME$VLAN - params: - $NAME: - get_input: subinterface_name_prefix - $VLAN: - get_input: - - vlan_ids - - get_input: subinterface_instance_index - virtual_network_refs: - - get_input: p1 - virtual_machine_interface_properties: - sub_interface_vlan_tag: - get_input: lb_st_vlan_type_oam - virtual_machine_interface_allowed_address_pairs: - allowed_address_pair: - - address_mode: active-standby - ip: - ip_prefix: - get_input: virtual_ip_address - ip_prefix_len: 32 - mac: - get_input: mac_address - - address_mode: active-standby - ip: - ip_prefix: - get_input: virtual_ipv6_address - ip_prefix_len: 128 - mac: - get_input: mac_address - 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 test_nested2Level: type: org.openecomp.resource.abstract.nodes.heat.nested2 directives: @@ -241,141 +167,698 @@ topology_template: - template_VMInt_OAM_lb_1 - template_VMInt_OAM_lb_2 - server_cmaui - - template_Vlan_1 - test_nested2Level substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.heat.nested1 capabilities: - os_server_cmaui_test_nested2Level: + disk.device.write.requests.rate_server_cmaui: + - server_cmaui + - disk.device.write.requests.rate + disk.device.allocation_server_cmaui: + - server_cmaui + - disk.device.allocation + memory.resident_server_cmaui_3_test_nested3Level_test_nested2Level: + - test_nested2Level + - memory.resident_server_cmaui_3_test_nested3Level + network.incoming.packets.rate_template_VMInt_OAM_lb_6_test_nested3Level_test_nested2Level: + - test_nested2Level + - network.incoming.packets.rate_template_VMInt_OAM_lb_6_test_nested3Level + network.outpoing.packets_template_VMInt_OAM_lb_3_test_nested2Level: + - test_nested2Level + - network.outpoing.packets_template_VMInt_OAM_lb_3 + host_server_cmaui: + - server_cmaui + - host + disk.device.latency_server_cmaui_3_test_nested3Level_test_nested2Level: + - test_nested2Level + - disk.device.latency_server_cmaui_3_test_nested3Level + scalable_server_cmaui_3_test_nested3Level_test_nested2Level: + - test_nested2Level + - scalable_server_cmaui_3_test_nested3Level + binding_template_VMInt_OAM_lb_5_test_nested3Level_test_nested2Level: + - test_nested2Level + - binding_template_VMInt_OAM_lb_5_test_nested3Level + network.incoming.bytes_template_VMInt_OAM_lb_2: + - template_VMInt_OAM_lb_2 + - network.incoming.bytes + network.incoming.bytes_template_VMInt_OAM_lb_1: + - template_VMInt_OAM_lb_1 + - network.incoming.bytes + endpoint_server_cmaui_2_test_nested2Level: + - test_nested2Level + - endpoint_server_cmaui_2 + disk.latency_server_cmaui_3_test_nested3Level_test_nested2Level: + - test_nested2Level + - disk.latency_server_cmaui_3_test_nested3Level + feature_server_cmaui_2_test_nested2Level: + - test_nested2Level + - feature_server_cmaui_2 + disk.capacity_server_cmaui_2_test_nested2Level: + - test_nested2Level + - disk.capacity_server_cmaui_2 + instance_server_cmaui: + - server_cmaui + - instance + binding_template_VMInt_OAM_lb_6_test_nested3Level_test_nested2Level: - test_nested2Level - - os_server_cmaui + - binding_template_VMInt_OAM_lb_6_test_nested3Level + network.outgoing.packets.rate_template_VMInt_OAM_lb_5_test_nested3Level_test_nested2Level: + - test_nested2Level + - network.outgoing.packets.rate_template_VMInt_OAM_lb_5_test_nested3Level + binding_template_VMInt_OAM_lb_3_test_nested2Level: + - test_nested2Level + - binding_template_VMInt_OAM_lb_3 + disk.device.write.requests_server_cmaui_2_test_nested2Level: + - test_nested2Level + - disk.device.write.requests_server_cmaui_2 + network.outpoing.packets_template_VMInt_OAM_lb_4_test_nested2Level: + - test_nested2Level + - network.outpoing.packets_template_VMInt_OAM_lb_4 + disk.device.read.bytes_server_cmaui_2_test_nested2Level: + - test_nested2Level + - disk.device.read.bytes_server_cmaui_2 + disk.device.write.requests.rate_server_cmaui_2_test_nested2Level: + - test_nested2Level + - disk.device.write.requests.rate_server_cmaui_2 os_server_cmaui: - server_cmaui - os - os_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level: + disk.read.bytes_server_cmaui_2_test_nested2Level: + - test_nested2Level + - disk.read.bytes_server_cmaui_2 + disk.device.allocation_server_cmaui_2_test_nested2Level: + - test_nested2Level + - disk.device.allocation_server_cmaui_2 + network.incoming.packets_template_VMInt_OAM_lb_1: + - template_VMInt_OAM_lb_1 + - network.incoming.packets + network.incoming.packets_template_VMInt_OAM_lb_2: + - template_VMInt_OAM_lb_2 + - network.incoming.packets + network.outgoing.bytes_template_VMInt_OAM_lb_1: + - template_VMInt_OAM_lb_1 + - network.outgoing.bytes + network.outgoing.bytes_template_VMInt_OAM_lb_2: + - template_VMInt_OAM_lb_2 + - network.outgoing.bytes + binding_template_VMInt_OAM_lb_4_test_nested2Level: + - test_nested2Level + - binding_template_VMInt_OAM_lb_4 + instance_server_cmaui_3_test_nested3Level_test_nested2Level: + - test_nested2Level + - instance_server_cmaui_3_test_nested3Level + feature_server_cmaui: + - server_cmaui + - feature + feature_test_nested2Level: + - test_nested2Level + - feature + disk.write.requests_server_cmaui_3_test_nested3Level_test_nested2Level: + - test_nested2Level + - disk.write.requests_server_cmaui_3_test_nested3Level + memory.usage_server_cmaui: + - server_cmaui + - memory.usage + cpu_server_cmaui_3_test_nested3Level_test_nested2Level: - test_nested2Level - - os_server_cmaui_test_nested4Level_test_nested3Level - endpoint_server_cmaui_test_nested2Level: + - cpu_server_cmaui_3_test_nested3Level + network.outgoing.packets.rate_template_VMInt_OAM_lb_4_test_nested2Level: + - test_nested2Level + - network.outgoing.packets.rate_template_VMInt_OAM_lb_4 + disk.ephemeral.size_server_cmaui: + - server_cmaui + - disk.ephemeral.size + forwarder_template_VMInt_OAM_lb_4_test_nested2Level: + - test_nested2Level + - forwarder_template_VMInt_OAM_lb_4 + network.incoming.packets_template_VMInt_OAM_lb_3_test_nested2Level: + - test_nested2Level + - network.incoming.packets_template_VMInt_OAM_lb_3 + network.incoming.packets.rate_template_VMInt_OAM_lb_8_test_nested3Level_test_nested2Level: + - test_nested2Level + - network.incoming.packets.rate_template_VMInt_OAM_lb_8_test_nested3Level + network.outgoing.packets.rate_template_VMInt_OAM_lb_6_test_nested3Level_test_nested2Level: + - test_nested2Level + - network.outgoing.packets.rate_template_VMInt_OAM_lb_6_test_nested3Level + disk.device.iops_server_cmaui: + - server_cmaui + - disk.device.iops + network.incoming.bytes.rate_template_VMInt_OAM_lb_5_test_nested3Level_test_nested2Level: - test_nested2Level - - endpoint_server_cmaui - scalable_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level: + - network.incoming.bytes.rate_template_VMInt_OAM_lb_5_test_nested3Level + network.incoming.bytes.rate_template_VMInt_OAM_lb_6_test_nested3Level_test_nested2Level: - test_nested2Level - - scalable_server_cmaui_test_nested4Level_test_nested3Level - endpoint_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level: + - network.incoming.bytes.rate_template_VMInt_OAM_lb_6_test_nested3Level + disk.device.read.requests.rate_server_cmaui_3_test_nested3Level_test_nested2Level: - test_nested2Level - - endpoint_server_cmaui_test_nested4Level_test_nested3Level - host_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level: + - disk.device.read.requests.rate_server_cmaui_3_test_nested3Level + cpu_server_cmaui: + - server_cmaui + - cpu + cpu_server_cmaui_2_test_nested2Level: + - test_nested2Level + - cpu_server_cmaui_2 + network.incoming.bytes_template_VMInt_OAM_lb_3_test_nested2Level: + - test_nested2Level + - network.incoming.bytes_template_VMInt_OAM_lb_3 + feature_template_VMInt_OAM_lb_4_test_nested2Level: + - test_nested2Level + - feature_template_VMInt_OAM_lb_4 + disk.ephemeral.size_server_cmaui_3_test_nested3Level_test_nested2Level: + - test_nested2Level + - disk.ephemeral.size_server_cmaui_3_test_nested3Level + disk.device.read.bytes.rate_server_cmaui: + - server_cmaui + - disk.device.read.bytes.rate + disk.root.size_server_cmaui_3_test_nested3Level_test_nested2Level: + - test_nested2Level + - disk.root.size_server_cmaui_3_test_nested3Level + feature_template_VMInt_OAM_lb_3_test_nested2Level: + - test_nested2Level + - feature_template_VMInt_OAM_lb_3 + os_server_cmaui_3_test_nested3Level_test_nested2Level: + - test_nested2Level + - os_server_cmaui_3_test_nested3Level + network.outgoing.bytes_template_VMInt_OAM_lb_5_test_nested3Level_test_nested2Level: + - test_nested2Level + - network.outgoing.bytes_template_VMInt_OAM_lb_5_test_nested3Level + forwarder_template_VMInt_OAM_lb_1: + - template_VMInt_OAM_lb_1 + - forwarder + network.outgoing.bytes.rate_template_VMInt_OAM_lb_1: + - template_VMInt_OAM_lb_1 + - network.outgoing.bytes.rate + disk.device.latency_server_cmaui: + - server_cmaui + - disk.device.latency + disk.read.requests_server_cmaui: + - server_cmaui + - disk.read.requests + disk.write.bytes_server_cmaui_3_test_nested3Level_test_nested2Level: + - test_nested2Level + - disk.write.bytes_server_cmaui_3_test_nested3Level + network.outgoing.bytes.rate_template_VMInt_OAM_lb_2: + - template_VMInt_OAM_lb_2 + - network.outgoing.bytes.rate + binding_template_VMInt_OAM_lb_8_test_nested3Level_test_nested2Level: + - test_nested2Level + - binding_template_VMInt_OAM_lb_8_test_nested3Level + network.incoming.packets.rate_template_VMInt_OAM_lb_4_test_nested2Level: + - test_nested2Level + - network.incoming.packets.rate_template_VMInt_OAM_lb_4 + disk.usage_server_cmaui: + - server_cmaui + - disk.usage + forwarder_template_VMInt_OAM_lb_2: + - template_VMInt_OAM_lb_2 + - forwarder + disk.device.usage_server_cmaui: + - server_cmaui + - disk.device.usage + disk.capacity_server_cmaui: + - server_cmaui + - disk.capacity + disk.write.requests.rate_server_cmaui: + - server_cmaui + - disk.write.requests.rate + disk.device.write.bytes_server_cmaui_2_test_nested2Level: + - test_nested2Level + - disk.device.write.bytes_server_cmaui_2 + network.incoming.packets.rate_template_VMInt_OAM_lb_2: + - template_VMInt_OAM_lb_2 + - network.incoming.packets.rate + network.incoming.packets.rate_template_VMInt_OAM_lb_1: + - template_VMInt_OAM_lb_1 + - network.incoming.packets.rate + network.outgoing.packets.rate_template_VMInt_OAM_lb_8_test_nested3Level_test_nested2Level: + - test_nested2Level + - network.outgoing.packets.rate_template_VMInt_OAM_lb_8_test_nested3Level + disk.device.read.requests_server_cmaui: + - server_cmaui + - disk.device.read.requests + feature_template_VMInt_OAM_lb_2: + - template_VMInt_OAM_lb_2 + - feature + feature_template_VMInt_OAM_lb_1: + - template_VMInt_OAM_lb_1 + - feature + binding_server_cmaui: + - server_cmaui + - binding + disk.usage_server_cmaui_2_test_nested2Level: + - test_nested2Level + - disk.usage_server_cmaui_2 + disk.device.read.requests.rate_server_cmaui_2_test_nested2Level: + - test_nested2Level + - disk.device.read.requests.rate_server_cmaui_2 + disk.device.read.requests.rate_server_cmaui: + - server_cmaui + - disk.device.read.requests.rate + disk.read.bytes.rate_server_cmaui_3_test_nested3Level_test_nested2Level: + - test_nested2Level + - disk.read.bytes.rate_server_cmaui_3_test_nested3Level + network.incoming.bytes_template_VMInt_OAM_lb_8_test_nested3Level_test_nested2Level: + - test_nested2Level + - network.incoming.bytes_template_VMInt_OAM_lb_8_test_nested3Level + network.outpoing.packets_template_VMInt_OAM_lb_5_test_nested3Level_test_nested2Level: + - test_nested2Level + - network.outpoing.packets_template_VMInt_OAM_lb_5_test_nested3Level + disk.write.bytes_server_cmaui: + - server_cmaui + - disk.write.bytes + disk.device.write.bytes_server_cmaui_3_test_nested3Level_test_nested2Level: + - test_nested2Level + - disk.device.write.bytes_server_cmaui_3_test_nested3Level + forwarder_template_VMInt_OAM_lb_3_test_nested2Level: + - test_nested2Level + - forwarder_template_VMInt_OAM_lb_3 + disk.write.requests.rate_server_cmaui_3_test_nested3Level_test_nested2Level: + - test_nested2Level + - disk.write.requests.rate_server_cmaui_3_test_nested3Level + os_server_cmaui_2_test_nested2Level: + - test_nested2Level + - os_server_cmaui_2 + network.incoming.bytes.rate_template_VMInt_OAM_lb_8_test_nested3Level_test_nested2Level: + - test_nested2Level + - network.incoming.bytes.rate_template_VMInt_OAM_lb_8_test_nested3Level + network.outgoing.bytes.rate_template_VMInt_OAM_lb_4_test_nested2Level: + - test_nested2Level + - network.outgoing.bytes.rate_template_VMInt_OAM_lb_4 + disk.read.requests_server_cmaui_3_test_nested3Level_test_nested2Level: + - test_nested2Level + - disk.read.requests_server_cmaui_3_test_nested3Level + disk.device.iops_server_cmaui_2_test_nested2Level: + - test_nested2Level + - disk.device.iops_server_cmaui_2 + disk.read.bytes.rate_server_cmaui_2_test_nested2Level: + - test_nested2Level + - disk.read.bytes.rate_server_cmaui_2 + memory_server_cmaui_3_test_nested3Level_test_nested2Level: + - test_nested2Level + - memory_server_cmaui_3_test_nested3Level + vcpus_server_cmaui: + - server_cmaui + - vcpus + disk.device.write.bytes_server_cmaui: + - server_cmaui + - disk.device.write.bytes + disk.allocation_server_cmaui: + - server_cmaui + - disk.allocation + disk.device.read.bytes_server_cmaui_3_test_nested3Level_test_nested2Level: + - test_nested2Level + - disk.device.read.bytes_server_cmaui_3_test_nested3Level + network.outgoing.bytes.rate_template_VMInt_OAM_lb_6_test_nested3Level_test_nested2Level: + - test_nested2Level + - network.outgoing.bytes.rate_template_VMInt_OAM_lb_6_test_nested3Level + disk.write.bytes.rate_server_cmaui_3_test_nested3Level_test_nested2Level: + - test_nested2Level + - disk.write.bytes.rate_server_cmaui_3_test_nested3Level + forwarder_template_VMInt_OAM_lb_6_test_nested3Level_test_nested2Level: + - test_nested2Level + - forwarder_template_VMInt_OAM_lb_6_test_nested3Level + disk.device.allocation_server_cmaui_3_test_nested3Level_test_nested2Level: + - test_nested2Level + - disk.device.allocation_server_cmaui_3_test_nested3Level + cpu.delta_server_cmaui: + - server_cmaui + - cpu.delta + cpu_util_server_cmaui_2_test_nested2Level: - test_nested2Level - - host_server_cmaui_test_nested4Level_test_nested3Level - host_server_cmaui_test_nested3Level_test_nested2Level: + - cpu_util_server_cmaui_2 + memory.usage_server_cmaui_2_test_nested2Level: - test_nested2Level - - host_server_cmaui_test_nested3Level - binding_template_VMInt_OAM_lb_8_test_nested4Level_test_nested3Level_test_nested2Level: + - memory.usage_server_cmaui_2 + feature_server_cmaui_3_test_nested3Level_test_nested2Level: - test_nested2Level - - binding_template_VMInt_OAM_lb_8_test_nested4Level_test_nested3Level + - feature_server_cmaui_3_test_nested3Level scalable_server_cmaui: - server_cmaui - scalable - scalable_server_cmaui_test_nested3Level_test_nested2Level: + disk.read.bytes.rate_server_cmaui: + - server_cmaui + - disk.read.bytes.rate + disk.device.read.requests_server_cmaui_3_test_nested3Level_test_nested2Level: - test_nested2Level - - scalable_server_cmaui_test_nested3Level - host_server_cmaui: + - disk.device.read.requests_server_cmaui_3_test_nested3Level + disk.device.write.requests.rate_server_cmaui_3_test_nested3Level_test_nested2Level: + - test_nested2Level + - disk.device.write.requests.rate_server_cmaui_3_test_nested3Level + cpu_util_server_cmaui: - server_cmaui - - host - binding_template_VMInt_OAM_lb_4_test_nested2Level: + - cpu_util + network.incoming.bytes_template_VMInt_OAM_lb_6_test_nested3Level_test_nested2Level: - test_nested2Level - - binding_template_VMInt_OAM_lb_4 - binding_template_VMInt_OAM_lb_5_test_nested3Level_test_nested2Level: + - network.incoming.bytes_template_VMInt_OAM_lb_6_test_nested3Level + disk.read.requests_server_cmaui_2_test_nested2Level: - test_nested2Level - - binding_template_VMInt_OAM_lb_5_test_nested3Level - host_server_cmaui_test_nested2Level: + - disk.read.requests_server_cmaui_2 + network.outpoing.packets_template_VMInt_OAM_lb_6_test_nested3Level_test_nested2Level: + - test_nested2Level + - network.outpoing.packets_template_VMInt_OAM_lb_6_test_nested3Level + disk.write.bytes.rate_server_cmaui_2_test_nested2Level: + - test_nested2Level + - disk.write.bytes.rate_server_cmaui_2 + disk.device.write.requests_server_cmaui: + - server_cmaui + - disk.device.write.requests + disk.latency_server_cmaui_2_test_nested2Level: + - test_nested2Level + - disk.latency_server_cmaui_2 + vcpus_server_cmaui_3_test_nested3Level_test_nested2Level: + - test_nested2Level + - vcpus_server_cmaui_3_test_nested3Level + network.outgoing.bytes.rate_template_VMInt_OAM_lb_8_test_nested3Level_test_nested2Level: + - test_nested2Level + - network.outgoing.bytes.rate_template_VMInt_OAM_lb_8_test_nested3Level + network.outgoing.bytes_template_VMInt_OAM_lb_8_test_nested3Level_test_nested2Level: + - test_nested2Level + - network.outgoing.bytes_template_VMInt_OAM_lb_8_test_nested3Level + forwarder_template_VMInt_OAM_lb_8_test_nested3Level_test_nested2Level: + - test_nested2Level + - forwarder_template_VMInt_OAM_lb_8_test_nested3Level + disk.device.read.bytes_server_cmaui: + - server_cmaui + - disk.device.read.bytes + network.outgoing.packets.rate_template_VMInt_OAM_lb_2: + - template_VMInt_OAM_lb_2 + - network.outgoing.packets.rate + disk.device.write.bytes.rate_server_cmaui_2_test_nested2Level: + - test_nested2Level + - disk.device.write.bytes.rate_server_cmaui_2 + network.outgoing.packets.rate_template_VMInt_OAM_lb_1: + - template_VMInt_OAM_lb_1 + - network.outgoing.packets.rate + disk.root.size_server_cmaui: + - server_cmaui + - disk.root.size + network.incoming.bytes_template_VMInt_OAM_lb_5_test_nested3Level_test_nested2Level: + - test_nested2Level + - network.incoming.bytes_template_VMInt_OAM_lb_5_test_nested3Level + disk.device.read.requests_server_cmaui_2_test_nested2Level: + - test_nested2Level + - disk.device.read.requests_server_cmaui_2 + memory.resident_server_cmaui_2_test_nested2Level: + - test_nested2Level + - memory.resident_server_cmaui_2 + disk.device.iops_server_cmaui_3_test_nested3Level_test_nested2Level: + - test_nested2Level + - disk.device.iops_server_cmaui_3_test_nested3Level + disk.allocation_server_cmaui_2_test_nested2Level: + - test_nested2Level + - disk.allocation_server_cmaui_2 + disk.device.write.bytes.rate_server_cmaui: + - server_cmaui + - disk.device.write.bytes.rate + network.outpoing.packets_template_VMInt_OAM_lb_1: + - template_VMInt_OAM_lb_1 + - network.outpoing.packets + network.outpoing.packets_template_VMInt_OAM_lb_2: + - template_VMInt_OAM_lb_2 + - network.outpoing.packets + disk.device.write.requests_server_cmaui_3_test_nested3Level_test_nested2Level: + - test_nested2Level + - disk.device.write.requests_server_cmaui_3_test_nested3Level + disk.write.requests_server_cmaui_2_test_nested2Level: + - test_nested2Level + - disk.write.requests_server_cmaui_2 + network.outpoing.packets_template_VMInt_OAM_lb_8_test_nested3Level_test_nested2Level: + - test_nested2Level + - network.outpoing.packets_template_VMInt_OAM_lb_8_test_nested3Level + network.incoming.packets_template_VMInt_OAM_lb_6_test_nested3Level_test_nested2Level: + - test_nested2Level + - network.incoming.packets_template_VMInt_OAM_lb_6_test_nested3Level + network.incoming.bytes.rate_template_VMInt_OAM_lb_3_test_nested2Level: + - test_nested2Level + - network.incoming.bytes.rate_template_VMInt_OAM_lb_3 + disk.device.read.bytes.rate_server_cmaui_2_test_nested2Level: + - test_nested2Level + - disk.device.read.bytes.rate_server_cmaui_2 + network.incoming.packets_template_VMInt_OAM_lb_5_test_nested3Level_test_nested2Level: + - test_nested2Level + - network.incoming.packets_template_VMInt_OAM_lb_5_test_nested3Level + feature_test_nested4Level_test_nested3Level_test_nested2Level: + - test_nested2Level + - feature_test_nested4Level_test_nested3Level + network.incoming.bytes.rate_template_VMInt_OAM_lb_1: + - template_VMInt_OAM_lb_1 + - network.incoming.bytes.rate + network.incoming.bytes.rate_template_VMInt_OAM_lb_2: + - template_VMInt_OAM_lb_2 + - network.incoming.bytes.rate + disk.device.usage_server_cmaui_2_test_nested2Level: + - test_nested2Level + - disk.device.usage_server_cmaui_2 + disk.device.write.bytes.rate_server_cmaui_3_test_nested3Level_test_nested2Level: + - test_nested2Level + - disk.device.write.bytes.rate_server_cmaui_3_test_nested3Level + disk.iops_server_cmaui: + - server_cmaui + - disk.iops + disk.read.bytes_server_cmaui: + - server_cmaui + - disk.read.bytes + endpoint_server_cmaui_3_test_nested3Level_test_nested2Level: + - test_nested2Level + - endpoint_server_cmaui_3_test_nested3Level + feature_template_VMInt_OAM_lb_5_test_nested3Level_test_nested2Level: + - test_nested2Level + - feature_template_VMInt_OAM_lb_5_test_nested3Level + binding_server_cmaui_3_test_nested3Level_test_nested2Level: + - test_nested2Level + - binding_server_cmaui_3_test_nested3Level + network.incoming.packets.rate_template_VMInt_OAM_lb_3_test_nested2Level: + - test_nested2Level + - network.incoming.packets.rate_template_VMInt_OAM_lb_3 + network.outgoing.bytes_template_VMInt_OAM_lb_3_test_nested2Level: + - test_nested2Level + - network.outgoing.bytes_template_VMInt_OAM_lb_3 + disk.iops_server_cmaui_2_test_nested2Level: + - test_nested2Level + - disk.iops_server_cmaui_2 + disk.write.bytes.rate_server_cmaui: + - server_cmaui + - disk.write.bytes.rate + network.incoming.bytes_template_VMInt_OAM_lb_4_test_nested2Level: + - test_nested2Level + - network.incoming.bytes_template_VMInt_OAM_lb_4 + network.outgoing.bytes_template_VMInt_OAM_lb_4_test_nested2Level: + - test_nested2Level + - network.outgoing.bytes_template_VMInt_OAM_lb_4 + instance_server_cmaui_2_test_nested2Level: + - test_nested2Level + - instance_server_cmaui_2 + feature_template_subint_oam_vmi_4_test_nested4Level_test_nested3Level_test_nested2Level: + - test_nested2Level + - feature_template_subint_oam_vmi_4_test_nested4Level_test_nested3Level + disk.device.capacity_server_cmaui: + - server_cmaui + - disk.device.capacity + forwarder_template_VMInt_OAM_lb_5_test_nested3Level_test_nested2Level: + - test_nested2Level + - forwarder_template_VMInt_OAM_lb_5_test_nested3Level + disk.read.bytes_server_cmaui_3_test_nested3Level_test_nested2Level: + - test_nested2Level + - disk.read.bytes_server_cmaui_3_test_nested3Level + cpu.delta_server_cmaui_3_test_nested3Level_test_nested2Level: + - test_nested2Level + - cpu.delta_server_cmaui_3_test_nested3Level + feature_template_VMInt_OAM_lb_6_test_nested3Level_test_nested2Level: + - test_nested2Level + - feature_template_VMInt_OAM_lb_6_test_nested3Level + memory_server_cmaui_2_test_nested2Level: - test_nested2Level - - host_server_cmaui - endpoint_server_cmaui_test_nested3Level_test_nested2Level: + - memory_server_cmaui_2 + disk.usage_server_cmaui_3_test_nested3Level_test_nested2Level: - test_nested2Level - - endpoint_server_cmaui_test_nested3Level - binding_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level: + - disk.usage_server_cmaui_3_test_nested3Level + memory_server_cmaui: + - server_cmaui + - memory + disk.root.size_server_cmaui_2_test_nested2Level: + - test_nested2Level + - disk.root.size_server_cmaui_2 + cpu_util_server_cmaui_3_test_nested3Level_test_nested2Level: + - test_nested2Level + - cpu_util_server_cmaui_3_test_nested3Level + disk.device.latency_server_cmaui_2_test_nested2Level: + - test_nested2Level + - disk.device.latency_server_cmaui_2 + disk.allocation_server_cmaui_3_test_nested3Level_test_nested2Level: + - test_nested2Level + - disk.allocation_server_cmaui_3_test_nested3Level + disk.ephemeral.size_server_cmaui_2_test_nested2Level: + - test_nested2Level + - disk.ephemeral.size_server_cmaui_2 + network.outgoing.bytes.rate_template_VMInt_OAM_lb_3_test_nested2Level: + - test_nested2Level + - network.outgoing.bytes.rate_template_VMInt_OAM_lb_3 + disk.capacity_server_cmaui_3_test_nested3Level_test_nested2Level: + - test_nested2Level + - disk.capacity_server_cmaui_3_test_nested3Level + network.incoming.packets_template_VMInt_OAM_lb_4_test_nested2Level: + - test_nested2Level + - network.incoming.packets_template_VMInt_OAM_lb_4 + binding_server_cmaui_2_test_nested2Level: + - test_nested2Level + - binding_server_cmaui_2 + cpu.delta_server_cmaui_2_test_nested2Level: + - test_nested2Level + - cpu.delta_server_cmaui_2 + disk.device.capacity_server_cmaui_2_test_nested2Level: + - test_nested2Level + - disk.device.capacity_server_cmaui_2 + network.outgoing.bytes.rate_template_VMInt_OAM_lb_5_test_nested3Level_test_nested2Level: + - test_nested2Level + - network.outgoing.bytes.rate_template_VMInt_OAM_lb_5_test_nested3Level + memory.usage_server_cmaui_3_test_nested3Level_test_nested2Level: + - test_nested2Level + - memory.usage_server_cmaui_3_test_nested3Level + scalable_server_cmaui_2_test_nested2Level: + - test_nested2Level + - scalable_server_cmaui_2 + host_server_cmaui_3_test_nested3Level_test_nested2Level: - test_nested2Level - - binding_server_cmaui_test_nested4Level_test_nested3Level - binding_server_cmaui_test_nested3Level_test_nested2Level: + - host_server_cmaui_3_test_nested3Level + disk.iops_server_cmaui_3_test_nested3Level_test_nested2Level: - test_nested2Level - - binding_server_cmaui_test_nested3Level + - disk.iops_server_cmaui_3_test_nested3Level + memory.resident_server_cmaui: + - server_cmaui + - memory.resident + vcpus_server_cmaui_2_test_nested2Level: + - test_nested2Level + - vcpus_server_cmaui_2 + network.outgoing.packets.rate_template_VMInt_OAM_lb_3_test_nested2Level: + - test_nested2Level + - network.outgoing.packets.rate_template_VMInt_OAM_lb_3 + disk.latency_server_cmaui: + - server_cmaui + - disk.latency + network.incoming.packets.rate_template_VMInt_OAM_lb_5_test_nested3Level_test_nested2Level: + - test_nested2Level + - network.incoming.packets.rate_template_VMInt_OAM_lb_5_test_nested3Level binding_template_VMInt_OAM_lb_2: - template_VMInt_OAM_lb_2 - binding binding_template_VMInt_OAM_lb_1: - template_VMInt_OAM_lb_1 - binding - os_server_cmaui_test_nested3Level_test_nested2Level: + disk.device.read.bytes.rate_server_cmaui_3_test_nested3Level_test_nested2Level: - test_nested2Level - - os_server_cmaui_test_nested3Level - binding_template_VMInt_OAM_lb_6_test_nested3Level_test_nested2Level: + - disk.device.read.bytes.rate_server_cmaui_3_test_nested3Level + disk.write.requests_server_cmaui: + - server_cmaui + - disk.write.requests + disk.write.requests.rate_server_cmaui_2_test_nested2Level: - test_nested2Level - - binding_template_VMInt_OAM_lb_6_test_nested3Level - binding_template_VMInt_OAM_lb_3_test_nested2Level: + - disk.write.requests.rate_server_cmaui_2 + disk.write.bytes_server_cmaui_2_test_nested2Level: - test_nested2Level - - binding_template_VMInt_OAM_lb_3 + - disk.write.bytes_server_cmaui_2 + feature_test_nested3Level_test_nested2Level: + - test_nested2Level + - feature_test_nested3Level + disk.device.usage_server_cmaui_3_test_nested3Level_test_nested2Level: + - test_nested2Level + - disk.device.usage_server_cmaui_3_test_nested3Level + disk.device.capacity_server_cmaui_3_test_nested3Level_test_nested2Level: + - test_nested2Level + - disk.device.capacity_server_cmaui_3_test_nested3Level + network.incoming.packets_template_VMInt_OAM_lb_8_test_nested3Level_test_nested2Level: + - test_nested2Level + - network.incoming.packets_template_VMInt_OAM_lb_8_test_nested3Level + feature_template_VMInt_OAM_lb_8_test_nested3Level_test_nested2Level: + - test_nested2Level + - feature_template_VMInt_OAM_lb_8_test_nested3Level endpoint_server_cmaui: - server_cmaui - endpoint - scalable_server_cmaui_test_nested2Level: + network.incoming.bytes.rate_template_VMInt_OAM_lb_4_test_nested2Level: - test_nested2Level - - scalable_server_cmaui - binding_server_cmaui: - - server_cmaui - - binding - binding_server_cmaui_test_nested2Level: + - network.incoming.bytes.rate_template_VMInt_OAM_lb_4 + network.outgoing.bytes_template_VMInt_OAM_lb_6_test_nested3Level_test_nested2Level: - test_nested2Level - - binding_server_cmaui - binding_template_VMInt_OAM_lb_7_test_nested4Level_test_nested3Level_test_nested2Level: + - network.outgoing.bytes_template_VMInt_OAM_lb_6_test_nested3Level + host_server_cmaui_2_test_nested2Level: - test_nested2Level - - binding_template_VMInt_OAM_lb_7_test_nested4Level_test_nested3Level + - host_server_cmaui_2 requirements: - link_template_VMInt_OAM_lb_5_test_nested3Level_test_nested2Level: + dependency_template_VMInt_OAM_lb_4_test_nested2Level: - test_nested2Level - - link_template_VMInt_OAM_lb_5_test_nested3Level - link_template_Vlan_2_test_nested2Level: + - dependency_template_VMInt_OAM_lb_4 + dependency_server_cmaui: + - server_cmaui + - dependency + local_storage_server_cmaui_2_test_nested2Level: - test_nested2Level - - link_template_Vlan_2 + - local_storage_server_cmaui_2 link_template_VMInt_OAM_lb_4_test_nested2Level: - test_nested2Level - link_template_VMInt_OAM_lb_4 - link_template_VMInt_OAM_lb_7_test_nested4Level_test_nested3Level_test_nested2Level: + dependency_test_nested2Level: - test_nested2Level - - link_template_VMInt_OAM_lb_7_test_nested4Level_test_nested3Level - link_template_Vlan_3_test_nested3Level_test_nested2Level: - - test_nested2Level - - link_template_Vlan_3_test_nested3Level + - dependency link_template_VMInt_OAM_lb_6_test_nested3Level_test_nested2Level: - test_nested2Level - link_template_VMInt_OAM_lb_6_test_nested3Level link_template_VMInt_OAM_lb_1: - template_VMInt_OAM_lb_1 - link - local_storage_server_cmaui: - - server_cmaui - - local_storage + dependency_template_VMInt_OAM_lb_5_test_nested3Level_test_nested2Level: + - test_nested2Level + - dependency_template_VMInt_OAM_lb_5_test_nested3Level link_template_VMInt_OAM_lb_3_test_nested2Level: - test_nested2Level - link_template_VMInt_OAM_lb_3 - local_storage_server_cmaui_test_nested2Level: - - test_nested2Level - - local_storage_server_cmaui link_template_VMInt_OAM_lb_2: - template_VMInt_OAM_lb_2 - link - link_template_Vlan_1: - - template_Vlan_1 - - link - link_template_Vlan_4_test_nested4Level_test_nested3Level_test_nested2Level: + dependency_server_cmaui_2_test_nested2Level: + - test_nested2Level + - dependency_server_cmaui_2 + local_storage_server_cmaui_3_test_nested3Level_test_nested2Level: + - test_nested2Level + - local_storage_server_cmaui_3_test_nested3Level + dependency_template_subint_oam_vmi_4_test_nested4Level_test_nested3Level_test_nested2Level: - test_nested2Level - - link_template_Vlan_4_test_nested4Level_test_nested3Level - local_storage_server_cmaui_test_nested3Level_test_nested2Level: + - dependency_template_subint_oam_vmi_4_test_nested4Level_test_nested3Level + binding_template_VMInt_OAM_lb_8_test_nested3Level_test_nested2Level: + - test_nested2Level + - binding_template_VMInt_OAM_lb_8_test_nested3Level + link_template_VMInt_OAM_lb_8_test_nested3Level_test_nested2Level: + - test_nested2Level + - link_template_VMInt_OAM_lb_8_test_nested3Level + link_template_VMInt_OAM_lb_5_test_nested3Level_test_nested2Level: + - test_nested2Level + - link_template_VMInt_OAM_lb_5_test_nested3Level + dependency_template_VMInt_OAM_lb_8_test_nested3Level_test_nested2Level: + - test_nested2Level + - dependency_template_VMInt_OAM_lb_8_test_nested3Level + dependency_server_cmaui_3_test_nested3Level_test_nested2Level: + - test_nested2Level + - dependency_server_cmaui_3_test_nested3Level + subinterface_link_template_subint_oam_vmi_4_test_nested4Level_test_nested3Level_test_nested2Level: + - test_nested2Level + - subinterface_link_template_subint_oam_vmi_4_test_nested4Level_test_nested3Level + dependency_template_VMInt_OAM_lb_1: + - template_VMInt_OAM_lb_1 + - dependency + dependency_template_VMInt_OAM_lb_2: + - template_VMInt_OAM_lb_2 + - dependency + dependency_template_VMInt_OAM_lb_3_test_nested2Level: + - test_nested2Level + - dependency_template_VMInt_OAM_lb_3 + local_storage_server_cmaui: + - server_cmaui + - local_storage + dependency_test_nested4Level_test_nested3Level_test_nested2Level: - test_nested2Level - - local_storage_server_cmaui_test_nested3Level - link_template_VMInt_OAM_lb_8_test_nested4Level_test_nested3Level_test_nested2Level: + - dependency_test_nested4Level_test_nested3Level + dependency_template_VMInt_OAM_lb_6_test_nested3Level_test_nested2Level: - test_nested2Level - - link_template_VMInt_OAM_lb_8_test_nested4Level_test_nested3Level - local_storage_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level: + - dependency_template_VMInt_OAM_lb_6_test_nested3Level + dependency_test_nested3Level_test_nested2Level: - test_nested2Level - - local_storage_server_cmaui_test_nested4Level_test_nested3Level
\ No newline at end of file + - dependency_test_nested3Level
\ 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/nestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/nestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml index e0ac24d1a9..3c6bb3a13f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/nestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/nestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml @@ -2,38 +2,8 @@ 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: @@ -127,6 +97,20 @@ topology_template: immutable: false type: string node_templates: + server_cmaui_2: + 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 test_nested3Level: type: org.openecomp.resource.abstract.nodes.heat.nested3 directives: @@ -153,14 +137,14 @@ topology_template: virtual_network_refs: - get_input: p1 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 requirements: - binding: capability: tosca.capabilities.network.Bindable - node: server_cmaui + node: server_cmaui_2 relationship: tosca.relationships.network.BindsTo template_VMInt_OAM_lb_4: type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface @@ -171,73 +155,14 @@ topology_template: - get_input: p2 - get_input: p1 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 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 - template_Vlan_2: - type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - properties: - virtual_machine_interface_refs: - - template_VMInt_OAM_lb_4 - name: - str_replace: - template: $NAME$VLAN - params: - $NAME: - get_input: subinterface_name_prefix - $VLAN: - get_input: - - vlan_ids - - get_input: subinterface_instance_index - virtual_network_refs: - - get_input: p2 - - get_input: p1 - virtual_machine_interface_properties: - sub_interface_vlan_tag: - get_input: lb_st_vlan_type_oam - virtual_machine_interface_allowed_address_pairs: - allowed_address_pair: - - address_mode: active-standby - ip: - ip_prefix: - get_input: virtual_ip_address - ip_prefix_len: 32 - mac: - get_input: mac_address - - address_mode: active-standby - ip: - ip_prefix: - get_input: virtual_ipv6_address - ip_prefix_len: 128 - mac: - get_input: mac_address - virtual_machine_interface_mac_addresses: - mac_address: - - get_input: mac_address - requirements: - - binding: - capability: tosca.capabilities.network.Bindable - node: template_VMInt_OAM_lb_4 + node: server_cmaui_2 relationship: tosca.relationships.network.BindsTo groups: nested2_group: @@ -246,111 +171,488 @@ topology_template: heat_file: ../Artifacts/nested2.yml description: nested2 members: + - server_cmaui_2 - test_nested3Level - template_VMInt_OAM_lb_3 - template_VMInt_OAM_lb_4 - - server_cmaui - - template_Vlan_2 substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.heat.nested2 capabilities: - os_server_cmaui: - - server_cmaui - - os - os_server_cmaui_test_nested4Level_test_nested3Level: + memory.usage_server_cmaui_3_test_nested3Level: - test_nested3Level - - os_server_cmaui_test_nested4Level - scalable_server_cmaui_test_nested4Level_test_nested3Level: + - memory.usage_server_cmaui_3 + cpu_util_server_cmaui_3_test_nested3Level: - test_nested3Level - - scalable_server_cmaui_test_nested4Level - host_server_cmaui_test_nested3Level: + - cpu_util_server_cmaui_3 + disk.device.usage_server_cmaui_2: + - server_cmaui_2 + - disk.device.usage + network.incoming.bytes.rate_template_VMInt_OAM_lb_6_test_nested3Level: - test_nested3Level - - host_server_cmaui - endpoint_server_cmaui_test_nested3Level: + - network.incoming.bytes.rate_template_VMInt_OAM_lb_6 + disk.device.latency_server_cmaui_2: + - server_cmaui_2 + - disk.device.latency + network.outgoing.bytes.rate_template_VMInt_OAM_lb_8_test_nested3Level: - test_nested3Level - - endpoint_server_cmaui - scalable_server_cmaui: - - server_cmaui - - scalable - binding_template_VMInt_OAM_lb_6_test_nested3Level: + - network.outgoing.bytes.rate_template_VMInt_OAM_lb_8 + disk.root.size_server_cmaui_2: + - server_cmaui_2 + - disk.root.size + disk.device.write.requests.rate_server_cmaui_2: + - server_cmaui_2 + - disk.device.write.requests.rate + network.incoming.packets_template_VMInt_OAM_lb_8_test_nested3Level: - test_nested3Level - - binding_template_VMInt_OAM_lb_6 - binding_server_cmaui_test_nested3Level: + - network.incoming.packets_template_VMInt_OAM_lb_8 + disk.read.requests_server_cmaui_3_test_nested3Level: - test_nested3Level - - binding_server_cmaui - host_server_cmaui: - - server_cmaui - - host - binding_template_VMInt_OAM_lb_7_test_nested4Level_test_nested3Level: + - disk.read.requests_server_cmaui_3 + disk.latency_server_cmaui_3_test_nested3Level: + - test_nested3Level + - disk.latency_server_cmaui_3 + binding_template_VMInt_OAM_lb_4: + - template_VMInt_OAM_lb_4 + - binding + disk.write.bytes.rate_server_cmaui_3_test_nested3Level: + - test_nested3Level + - disk.write.bytes.rate_server_cmaui_3 + binding_template_VMInt_OAM_lb_3: + - template_VMInt_OAM_lb_3 + - binding + network.incoming.bytes_template_VMInt_OAM_lb_4: + - template_VMInt_OAM_lb_4 + - network.incoming.bytes + disk.read.requests_server_cmaui_2: + - server_cmaui_2 + - disk.read.requests + network.incoming.bytes_template_VMInt_OAM_lb_3: + - template_VMInt_OAM_lb_3 + - network.incoming.bytes + feature_test_nested4Level_test_nested3Level: + - test_nested3Level + - feature_test_nested4Level + disk.device.iops_server_cmaui_2: + - server_cmaui_2 + - disk.device.iops + network.outgoing.bytes.rate_template_VMInt_OAM_lb_6_test_nested3Level: + - test_nested3Level + - network.outgoing.bytes.rate_template_VMInt_OAM_lb_6 + disk.device.capacity_server_cmaui_2: + - server_cmaui_2 + - disk.device.capacity + disk.device.read.bytes.rate_server_cmaui_2: + - server_cmaui_2 + - disk.device.read.bytes.rate + disk.read.bytes_server_cmaui_2: + - server_cmaui_2 + - disk.read.bytes + disk.device.read.bytes_server_cmaui_2: + - server_cmaui_2 + - disk.device.read.bytes + disk.write.requests.rate_server_cmaui_2: + - server_cmaui_2 + - disk.write.requests.rate + network.incoming.bytes.rate_template_VMInt_OAM_lb_5_test_nested3Level: + - test_nested3Level + - network.incoming.bytes.rate_template_VMInt_OAM_lb_5 + memory_server_cmaui_2: + - server_cmaui_2 + - memory + cpu_server_cmaui_2: + - server_cmaui_2 + - cpu + host_server_cmaui_3_test_nested3Level: + - test_nested3Level + - host_server_cmaui_3 + disk.allocation_server_cmaui_3_test_nested3Level: + - test_nested3Level + - disk.allocation_server_cmaui_3 + network.outpoing.packets_template_VMInt_OAM_lb_3: + - template_VMInt_OAM_lb_3 + - network.outpoing.packets + network.incoming.packets_template_VMInt_OAM_lb_5_test_nested3Level: - test_nested3Level - - binding_template_VMInt_OAM_lb_7_test_nested4Level - scalable_server_cmaui_test_nested3Level: + - network.incoming.packets_template_VMInt_OAM_lb_5 + network.outpoing.packets_template_VMInt_OAM_lb_4: + - template_VMInt_OAM_lb_4 + - network.outpoing.packets + disk.ephemeral.size_server_cmaui_2: + - server_cmaui_2 + - disk.ephemeral.size + disk.write.requests_server_cmaui_3_test_nested3Level: - test_nested3Level - - scalable_server_cmaui + - disk.write.requests_server_cmaui_3 + disk.capacity_server_cmaui_2: + - server_cmaui_2 + - disk.capacity + network.outgoing.bytes_template_VMInt_OAM_lb_3: + - template_VMInt_OAM_lb_3 + - network.outgoing.bytes + network.incoming.packets_template_VMInt_OAM_lb_3: + - template_VMInt_OAM_lb_3 + - network.incoming.packets + network.outgoing.bytes_template_VMInt_OAM_lb_4: + - template_VMInt_OAM_lb_4 + - network.outgoing.bytes + network.incoming.packets_template_VMInt_OAM_lb_4: + - template_VMInt_OAM_lb_4 + - network.incoming.packets binding_template_VMInt_OAM_lb_5_test_nested3Level: - test_nested3Level - binding_template_VMInt_OAM_lb_5 - binding_template_VMInt_OAM_lb_8_test_nested4Level_test_nested3Level: + network.outgoing.bytes_template_VMInt_OAM_lb_8_test_nested3Level: - test_nested3Level - - binding_template_VMInt_OAM_lb_8_test_nested4Level - endpoint_server_cmaui: - - server_cmaui - - endpoint - os_server_cmaui_test_nested3Level: + - network.outgoing.bytes_template_VMInt_OAM_lb_8 + disk.read.bytes.rate_server_cmaui_3_test_nested3Level: - test_nested3Level - - os_server_cmaui - endpoint_server_cmaui_test_nested4Level_test_nested3Level: + - disk.read.bytes.rate_server_cmaui_3 + network.incoming.packets.rate_template_VMInt_OAM_lb_8_test_nested3Level: - test_nested3Level - - endpoint_server_cmaui_test_nested4Level - binding_server_cmaui: - - server_cmaui - - binding - binding_template_VMInt_OAM_lb_4: + - network.incoming.packets.rate_template_VMInt_OAM_lb_8 + forwarder_template_VMInt_OAM_lb_8_test_nested3Level: + - test_nested3Level + - forwarder_template_VMInt_OAM_lb_8 + network.outgoing.bytes.rate_template_VMInt_OAM_lb_3: + - template_VMInt_OAM_lb_3 + - network.outgoing.bytes.rate + network.outgoing.bytes.rate_template_VMInt_OAM_lb_4: - template_VMInt_OAM_lb_4 + - network.outgoing.bytes.rate + disk.iops_server_cmaui_2: + - server_cmaui_2 + - disk.iops + network.incoming.bytes.rate_template_VMInt_OAM_lb_3: + - template_VMInt_OAM_lb_3 + - network.incoming.bytes.rate + network.incoming.bytes.rate_template_VMInt_OAM_lb_4: + - template_VMInt_OAM_lb_4 + - network.incoming.bytes.rate + disk.device.write.requests_server_cmaui_2: + - server_cmaui_2 + - disk.device.write.requests + network.outgoing.packets.rate_template_VMInt_OAM_lb_8_test_nested3Level: + - test_nested3Level + - network.outgoing.packets.rate_template_VMInt_OAM_lb_8 + memory_server_cmaui_3_test_nested3Level: + - test_nested3Level + - memory_server_cmaui_3 + feature_server_cmaui_3_test_nested3Level: + - test_nested3Level + - feature_server_cmaui_3 + network.incoming.packets.rate_template_VMInt_OAM_lb_6_test_nested3Level: + - test_nested3Level + - network.incoming.packets.rate_template_VMInt_OAM_lb_6 + disk.device.write.bytes.rate_server_cmaui_3_test_nested3Level: + - test_nested3Level + - disk.device.write.bytes.rate_server_cmaui_3 + disk.root.size_server_cmaui_3_test_nested3Level: + - test_nested3Level + - disk.root.size_server_cmaui_3 + disk.usage_server_cmaui_3_test_nested3Level: + - test_nested3Level + - disk.usage_server_cmaui_3 + network.outpoing.packets_template_VMInt_OAM_lb_5_test_nested3Level: + - test_nested3Level + - network.outpoing.packets_template_VMInt_OAM_lb_5 + disk.device.write.requests_server_cmaui_3_test_nested3Level: + - test_nested3Level + - disk.device.write.requests_server_cmaui_3 + disk.device.read.requests.rate_server_cmaui_3_test_nested3Level: + - test_nested3Level + - disk.device.read.requests.rate_server_cmaui_3 + disk.device.latency_server_cmaui_3_test_nested3Level: + - test_nested3Level + - disk.device.latency_server_cmaui_3 + cpu_util_server_cmaui_2: + - server_cmaui_2 + - cpu_util + disk.device.write.requests.rate_server_cmaui_3_test_nested3Level: + - test_nested3Level + - disk.device.write.requests.rate_server_cmaui_3 + disk.device.write.bytes.rate_server_cmaui_2: + - server_cmaui_2 + - disk.device.write.bytes.rate + disk.write.bytes.rate_server_cmaui_2: + - server_cmaui_2 + - disk.write.bytes.rate + disk.device.write.bytes_server_cmaui_2: + - server_cmaui_2 + - disk.device.write.bytes + network.outgoing.packets.rate_template_VMInt_OAM_lb_6_test_nested3Level: + - test_nested3Level + - network.outgoing.packets.rate_template_VMInt_OAM_lb_6 + feature_template_subint_oam_vmi_4_test_nested4Level_test_nested3Level: + - test_nested3Level + - feature_template_subint_oam_vmi_4_test_nested4Level + disk.iops_server_cmaui_3_test_nested3Level: + - test_nested3Level + - disk.iops_server_cmaui_3 + feature_template_VMInt_OAM_lb_5_test_nested3Level: + - test_nested3Level + - feature_template_VMInt_OAM_lb_5 + cpu_server_cmaui_3_test_nested3Level: + - test_nested3Level + - cpu_server_cmaui_3 + disk.write.bytes_server_cmaui_2: + - server_cmaui_2 + - disk.write.bytes + feature_server_cmaui_2: + - server_cmaui_2 + - feature + disk.allocation_server_cmaui_2: + - server_cmaui_2 + - disk.allocation + network.incoming.bytes_template_VMInt_OAM_lb_5_test_nested3Level: + - test_nested3Level + - network.incoming.bytes_template_VMInt_OAM_lb_5 + forwarder_template_VMInt_OAM_lb_6_test_nested3Level: + - test_nested3Level + - forwarder_template_VMInt_OAM_lb_6 + binding_server_cmaui_2: + - server_cmaui_2 - binding - host_server_cmaui_test_nested4Level_test_nested3Level: + vcpus_server_cmaui_2: + - server_cmaui_2 + - vcpus + binding_template_VMInt_OAM_lb_8_test_nested3Level: - test_nested3Level - - host_server_cmaui_test_nested4Level - binding_template_VMInt_OAM_lb_3: + - binding_template_VMInt_OAM_lb_8 + instance_server_cmaui_3_test_nested3Level: + - test_nested3Level + - instance_server_cmaui_3 + scalable_server_cmaui_2: + - server_cmaui_2 + - scalable + network.outgoing.bytes_template_VMInt_OAM_lb_5_test_nested3Level: + - test_nested3Level + - network.outgoing.bytes_template_VMInt_OAM_lb_5 + network.incoming.packets.rate_template_VMInt_OAM_lb_5_test_nested3Level: + - test_nested3Level + - network.incoming.packets.rate_template_VMInt_OAM_lb_5 + forwarder_template_VMInt_OAM_lb_4: + - template_VMInt_OAM_lb_4 + - forwarder + forwarder_template_VMInt_OAM_lb_3: - template_VMInt_OAM_lb_3 - - binding - binding_server_cmaui_test_nested4Level_test_nested3Level: + - forwarder + disk.device.read.bytes.rate_server_cmaui_3_test_nested3Level: + - test_nested3Level + - disk.device.read.bytes.rate_server_cmaui_3 + disk.write.requests_server_cmaui_2: + - server_cmaui_2 + - disk.write.requests + network.incoming.packets.rate_template_VMInt_OAM_lb_4: + - template_VMInt_OAM_lb_4 + - network.incoming.packets.rate + network.incoming.packets.rate_template_VMInt_OAM_lb_3: + - template_VMInt_OAM_lb_3 + - network.incoming.packets.rate + disk.usage_server_cmaui_2: + - server_cmaui_2 + - disk.usage + disk.device.usage_server_cmaui_3_test_nested3Level: + - test_nested3Level + - disk.device.usage_server_cmaui_3 + disk.write.bytes_server_cmaui_3_test_nested3Level: + - test_nested3Level + - disk.write.bytes_server_cmaui_3 + network.outgoing.packets.rate_template_VMInt_OAM_lb_5_test_nested3Level: + - test_nested3Level + - network.outgoing.packets.rate_template_VMInt_OAM_lb_5 + disk.write.requests.rate_server_cmaui_3_test_nested3Level: + - test_nested3Level + - disk.write.requests.rate_server_cmaui_3 + endpoint_server_cmaui_2: + - server_cmaui_2 + - endpoint + network.outgoing.bytes_template_VMInt_OAM_lb_6_test_nested3Level: + - test_nested3Level + - network.outgoing.bytes_template_VMInt_OAM_lb_6 + feature_template_VMInt_OAM_lb_4: + - template_VMInt_OAM_lb_4 + - feature + binding_template_VMInt_OAM_lb_6_test_nested3Level: + - test_nested3Level + - binding_template_VMInt_OAM_lb_6 + forwarder_template_VMInt_OAM_lb_5_test_nested3Level: + - test_nested3Level + - forwarder_template_VMInt_OAM_lb_5 + feature_template_VMInt_OAM_lb_3: + - template_VMInt_OAM_lb_3 + - feature + os_server_cmaui_2: + - server_cmaui_2 + - os + network.incoming.bytes_template_VMInt_OAM_lb_6_test_nested3Level: + - test_nested3Level + - network.incoming.bytes_template_VMInt_OAM_lb_6 + network.outpoing.packets_template_VMInt_OAM_lb_8_test_nested3Level: + - test_nested3Level + - network.outpoing.packets_template_VMInt_OAM_lb_8 + disk.device.allocation_server_cmaui_2: + - server_cmaui_2 + - disk.device.allocation + disk.read.bytes_server_cmaui_3_test_nested3Level: + - test_nested3Level + - disk.read.bytes_server_cmaui_3 + disk.device.allocation_server_cmaui_3_test_nested3Level: - test_nested3Level - - binding_server_cmaui_test_nested4Level + - disk.device.allocation_server_cmaui_3 + host_server_cmaui_2: + - server_cmaui_2 + - host + os_server_cmaui_3_test_nested3Level: + - test_nested3Level + - os_server_cmaui_3 + binding_server_cmaui_3_test_nested3Level: + - test_nested3Level + - binding_server_cmaui_3 + network.incoming.bytes.rate_template_VMInt_OAM_lb_8_test_nested3Level: + - test_nested3Level + - network.incoming.bytes.rate_template_VMInt_OAM_lb_8 + feature_test_nested3Level: + - test_nested3Level + - feature + feature_template_VMInt_OAM_lb_8_test_nested3Level: + - test_nested3Level + - feature_template_VMInt_OAM_lb_8 + network.outgoing.packets.rate_template_VMInt_OAM_lb_4: + - template_VMInt_OAM_lb_4 + - network.outgoing.packets.rate + network.outgoing.bytes.rate_template_VMInt_OAM_lb_5_test_nested3Level: + - test_nested3Level + - network.outgoing.bytes.rate_template_VMInt_OAM_lb_5 + cpu.delta_server_cmaui_3_test_nested3Level: + - test_nested3Level + - cpu.delta_server_cmaui_3 + network.outgoing.packets.rate_template_VMInt_OAM_lb_3: + - template_VMInt_OAM_lb_3 + - network.outgoing.packets.rate + disk.device.capacity_server_cmaui_3_test_nested3Level: + - test_nested3Level + - disk.device.capacity_server_cmaui_3 + scalable_server_cmaui_3_test_nested3Level: + - test_nested3Level + - scalable_server_cmaui_3 + instance_server_cmaui_2: + - server_cmaui_2 + - instance + disk.device.iops_server_cmaui_3_test_nested3Level: + - test_nested3Level + - disk.device.iops_server_cmaui_3 + network.incoming.bytes_template_VMInt_OAM_lb_8_test_nested3Level: + - test_nested3Level + - network.incoming.bytes_template_VMInt_OAM_lb_8 + network.outpoing.packets_template_VMInt_OAM_lb_6_test_nested3Level: + - test_nested3Level + - network.outpoing.packets_template_VMInt_OAM_lb_6 + endpoint_server_cmaui_3_test_nested3Level: + - test_nested3Level + - endpoint_server_cmaui_3 + vcpus_server_cmaui_3_test_nested3Level: + - test_nested3Level + - vcpus_server_cmaui_3 + disk.device.write.bytes_server_cmaui_3_test_nested3Level: + - test_nested3Level + - disk.device.write.bytes_server_cmaui_3 + disk.device.read.requests_server_cmaui_2: + - server_cmaui_2 + - disk.device.read.requests + disk.read.bytes.rate_server_cmaui_2: + - server_cmaui_2 + - disk.read.bytes.rate + network.incoming.packets_template_VMInt_OAM_lb_6_test_nested3Level: + - test_nested3Level + - network.incoming.packets_template_VMInt_OAM_lb_6 + disk.capacity_server_cmaui_3_test_nested3Level: + - test_nested3Level + - disk.capacity_server_cmaui_3 + cpu.delta_server_cmaui_2: + - server_cmaui_2 + - cpu.delta + disk.device.read.requests.rate_server_cmaui_2: + - server_cmaui_2 + - disk.device.read.requests.rate + memory.resident_server_cmaui_2: + - server_cmaui_2 + - memory.resident + disk.device.read.requests_server_cmaui_3_test_nested3Level: + - test_nested3Level + - disk.device.read.requests_server_cmaui_3 + disk.latency_server_cmaui_2: + - server_cmaui_2 + - disk.latency + feature_template_VMInt_OAM_lb_6_test_nested3Level: + - test_nested3Level + - feature_template_VMInt_OAM_lb_6 + disk.ephemeral.size_server_cmaui_3_test_nested3Level: + - test_nested3Level + - disk.ephemeral.size_server_cmaui_3 + disk.device.read.bytes_server_cmaui_3_test_nested3Level: + - test_nested3Level + - disk.device.read.bytes_server_cmaui_3 + memory.resident_server_cmaui_3_test_nested3Level: + - test_nested3Level + - memory.resident_server_cmaui_3 + memory.usage_server_cmaui_2: + - server_cmaui_2 + - memory.usage requirements: - link_template_VMInt_OAM_lb_7_test_nested4Level_test_nested3Level: + dependency_template_VMInt_OAM_lb_5_test_nested3Level: - test_nested3Level - - link_template_VMInt_OAM_lb_7_test_nested4Level - local_storage_server_cmaui: - - server_cmaui - - local_storage + - dependency_template_VMInt_OAM_lb_5 + local_storage_server_cmaui_3_test_nested3Level: + - test_nested3Level + - local_storage_server_cmaui_3 link_template_VMInt_OAM_lb_5_test_nested3Level: - test_nested3Level - link_template_VMInt_OAM_lb_5 + dependency_template_VMInt_OAM_lb_3: + - template_VMInt_OAM_lb_3 + - dependency + subinterface_link_template_subint_oam_vmi_4_test_nested4Level_test_nested3Level: + - test_nested3Level + - subinterface_link_template_subint_oam_vmi_4_test_nested4Level + dependency_template_VMInt_OAM_lb_4: + - template_VMInt_OAM_lb_4 + - dependency + local_storage_server_cmaui_2: + - server_cmaui_2 + - local_storage + dependency_test_nested4Level_test_nested3Level: + - test_nested3Level + - dependency_test_nested4Level + dependency_template_subint_oam_vmi_4_test_nested4Level_test_nested3Level: + - test_nested3Level + - dependency_template_subint_oam_vmi_4_test_nested4Level link_template_VMInt_OAM_lb_3: - template_VMInt_OAM_lb_3 - link - local_storage_server_cmaui_test_nested4Level_test_nested3Level: + dependency_server_cmaui_3_test_nested3Level: - test_nested3Level - - local_storage_server_cmaui_test_nested4Level - link_template_Vlan_2: - - template_Vlan_2 - - link + - dependency_server_cmaui_3 + dependency_template_VMInt_OAM_lb_6_test_nested3Level: + - test_nested3Level + - dependency_template_VMInt_OAM_lb_6 + binding_template_VMInt_OAM_lb_8_test_nested3Level: + - test_nested3Level + - binding_template_VMInt_OAM_lb_8 link_template_VMInt_OAM_lb_4: - template_VMInt_OAM_lb_4 - link - link_template_Vlan_3_test_nested3Level: + link_template_VMInt_OAM_lb_8_test_nested3Level: - test_nested3Level - - link_template_Vlan_3 - link_template_VMInt_OAM_lb_8_test_nested4Level_test_nested3Level: + - link_template_VMInt_OAM_lb_8 + dependency_test_nested3Level: - test_nested3Level - - link_template_VMInt_OAM_lb_8_test_nested4Level - link_template_Vlan_4_test_nested4Level_test_nested3Level: + - dependency + dependency_template_VMInt_OAM_lb_8_test_nested3Level: - test_nested3Level - - link_template_Vlan_4_test_nested4Level + - dependency_template_VMInt_OAM_lb_8 + dependency_server_cmaui_2: + - server_cmaui_2 + - dependency link_template_VMInt_OAM_lb_6_test_nested3Level: - test_nested3Level - - link_template_VMInt_OAM_lb_6 - local_storage_server_cmaui_test_nested3Level: - - test_nested3Level - - local_storage_server_cmaui
\ No newline at end of file + - link_template_VMInt_OAM_lb_6
\ 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/nestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/nestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml index 026f5c6933..3fbfb47ed5 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/nestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/nestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml @@ -2,38 +2,8 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0 metadata: template_name: nested3 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: @@ -138,17 +108,17 @@ topology_template: virtual_network_refs: - get_input: p2 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 requirements: - binding: capability: tosca.capabilities.network.Bindable - node: server_cmaui + node: server_cmaui_3 relationship: tosca.relationships.network.BindsTo test_nested4Level: - type: org.openecomp.resource.abstract.nodes.heat.nested4 + type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested4 directives: - substitutable properties: @@ -158,6 +128,12 @@ topology_template: substitute_service_template: nested4ServiceTemplate.yaml p2: get_input: p2 + p3: template_VMInt_OAM_lb_8 + requirements: + - binding_template_subint_oam_vmi_4: + capability: tosca.capabilities.network.Bindable + node: template_VMInt_OAM_lb_8 + relationship: tosca.relationships.network.BindsTo template_VMInt_OAM_lb_6: type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface properties: @@ -167,16 +143,16 @@ topology_template: - get_input: p1 - get_input: p2 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 requirements: - binding: capability: tosca.capabilities.network.Bindable - node: server_cmaui + node: server_cmaui_3 relationship: tosca.relationships.network.BindsTo - server_cmaui: + server_cmaui_3: type: org.openecomp.resource.vfc.nodes.heat.cmaui properties: flavor: @@ -190,50 +166,18 @@ topology_template: get_input: - cmaui_names - 0 - template_Vlan_3: - type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + template_VMInt_OAM_lb_8: + type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface properties: - virtual_machine_interface_refs: - - template_VMInt_OAM_lb_5 - name: - str_replace: - template: $NAME$VLAN - params: - $NAME: - get_input: subinterface_name_prefix - $VLAN: - get_input: - - vlan_ids - - get_input: subinterface_instance_index + security_group_refs: + - get_input: oam_sec_group_name virtual_network_refs: - - get_input: p2 + - get_input: p1 virtual_machine_interface_properties: - sub_interface_vlan_tag: - get_input: lb_st_vlan_type_oam - virtual_machine_interface_allowed_address_pairs: - allowed_address_pair: - - address_mode: active-standby - ip: - ip_prefix: - get_input: virtual_ip_address - ip_prefix_len: 32 - mac: - get_input: mac_address - - address_mode: active-standby - ip: - ip_prefix: - get_input: virtual_ipv6_address - ip_prefix_len: 128 - mac: - get_input: mac_address - virtual_machine_interface_mac_addresses: - mac_address: - - get_input: mac_address - requirements: - - binding: - capability: tosca.capabilities.network.Bindable - node: template_VMInt_OAM_lb_5 - relationship: tosca.relationships.network.BindsTo + service_interface_type: + get_input: lb_st_interface_type_oam + port_tuple_refs: + - get_input: template_PortTuple_LB1 groups: nested3_group: type: org.openecomp.groups.heat.HeatStack @@ -244,75 +188,273 @@ topology_template: - template_VMInt_OAM_lb_5 - test_nested4Level - template_VMInt_OAM_lb_6 - - server_cmaui - - template_Vlan_3 + - server_cmaui_3 + - template_VMInt_OAM_lb_8 substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.heat.nested3 capabilities: - scalable_server_cmaui_test_nested4Level: - - test_nested4Level - - scalable_server_cmaui - os_server_cmaui: - - server_cmaui - - os - scalable_server_cmaui: - - server_cmaui - - scalable - binding_template_VMInt_OAM_lb_7_test_nested4Level: - - test_nested4Level - - binding_template_VMInt_OAM_lb_7 - endpoint_server_cmaui_test_nested4Level: - - test_nested4Level - - endpoint_server_cmaui - host_server_cmaui: - - server_cmaui - - host - os_server_cmaui_test_nested4Level: - - test_nested4Level - - os_server_cmaui - host_server_cmaui_test_nested4Level: - - test_nested4Level - - host_server_cmaui - endpoint_server_cmaui: - - server_cmaui - - endpoint - binding_server_cmaui: - - server_cmaui + disk.write.bytes.rate_server_cmaui_3: + - server_cmaui_3 + - disk.write.bytes.rate + forwarder_template_VMInt_OAM_lb_8: + - template_VMInt_OAM_lb_8 + - forwarder + disk.device.write.bytes_server_cmaui_3: + - server_cmaui_3 + - disk.device.write.bytes + forwarder_template_VMInt_OAM_lb_6: + - template_VMInt_OAM_lb_6 + - forwarder + feature_server_cmaui_3: + - server_cmaui_3 + - feature + disk.device.usage_server_cmaui_3: + - server_cmaui_3 + - disk.device.usage + disk.device.latency_server_cmaui_3: + - server_cmaui_3 + - disk.device.latency + disk.write.bytes_server_cmaui_3: + - server_cmaui_3 + - disk.write.bytes + disk.allocation_server_cmaui_3: + - server_cmaui_3 + - disk.allocation + binding_server_cmaui_3: + - server_cmaui_3 - binding + vcpus_server_cmaui_3: + - server_cmaui_3 + - vcpus + disk.root.size_server_cmaui_3: + - server_cmaui_3 + - disk.root.size + disk.device.write.requests.rate_server_cmaui_3: + - server_cmaui_3 + - disk.device.write.requests.rate binding_template_VMInt_OAM_lb_6: - template_VMInt_OAM_lb_6 - binding binding_template_VMInt_OAM_lb_5: - template_VMInt_OAM_lb_5 - binding - binding_template_VMInt_OAM_lb_8_test_nested4Level: + scalable_server_cmaui_3: + - server_cmaui_3 + - scalable + forwarder_template_VMInt_OAM_lb_5: + - template_VMInt_OAM_lb_5 + - forwarder + disk.read.requests_server_cmaui_3: + - server_cmaui_3 + - disk.read.requests + binding_template_VMInt_OAM_lb_8: + - template_VMInt_OAM_lb_8 + - binding + network.incoming.bytes_template_VMInt_OAM_lb_8: + - template_VMInt_OAM_lb_8 + - network.incoming.bytes + disk.write.requests_server_cmaui_3: + - server_cmaui_3 + - disk.write.requests + network.incoming.bytes_template_VMInt_OAM_lb_6: + - template_VMInt_OAM_lb_6 + - network.incoming.bytes + network.incoming.bytes_template_VMInt_OAM_lb_5: + - template_VMInt_OAM_lb_5 + - network.incoming.bytes + disk.usage_server_cmaui_3: + - server_cmaui_3 + - disk.usage + disk.device.iops_server_cmaui_3: + - server_cmaui_3 + - disk.device.iops + disk.device.capacity_server_cmaui_3: + - server_cmaui_3 + - disk.device.capacity + network.incoming.packets.rate_template_VMInt_OAM_lb_8: + - template_VMInt_OAM_lb_8 + - network.incoming.packets.rate + feature_template_VMInt_OAM_lb_8: + - template_VMInt_OAM_lb_8 + - feature + disk.device.read.bytes.rate_server_cmaui_3: + - server_cmaui_3 + - disk.device.read.bytes.rate + network.incoming.packets.rate_template_VMInt_OAM_lb_6: + - template_VMInt_OAM_lb_6 + - network.incoming.packets.rate + feature_template_VMInt_OAM_lb_6: + - template_VMInt_OAM_lb_6 + - feature + network.incoming.packets.rate_template_VMInt_OAM_lb_5: + - template_VMInt_OAM_lb_5 + - network.incoming.packets.rate + feature_template_VMInt_OAM_lb_5: + - template_VMInt_OAM_lb_5 + - feature + endpoint_server_cmaui_3: + - server_cmaui_3 + - endpoint + disk.read.bytes_server_cmaui_3: + - server_cmaui_3 + - disk.read.bytes + os_server_cmaui_3: + - server_cmaui_3 + - os + disk.write.requests.rate_server_cmaui_3: + - server_cmaui_3 + - disk.write.requests.rate + disk.device.read.bytes_server_cmaui_3: + - server_cmaui_3 + - disk.device.read.bytes + memory_server_cmaui_3: + - server_cmaui_3 + - memory + disk.device.allocation_server_cmaui_3: + - server_cmaui_3 + - disk.device.allocation + cpu_server_cmaui_3: + - server_cmaui_3 + - cpu + host_server_cmaui_3: + - server_cmaui_3 + - host + network.outpoing.packets_template_VMInt_OAM_lb_5: + - template_VMInt_OAM_lb_5 + - network.outpoing.packets + network.outgoing.packets.rate_template_VMInt_OAM_lb_8: + - template_VMInt_OAM_lb_8 + - network.outgoing.packets.rate + disk.ephemeral.size_server_cmaui_3: + - server_cmaui_3 + - disk.ephemeral.size + network.outgoing.packets.rate_template_VMInt_OAM_lb_6: + - template_VMInt_OAM_lb_6 + - network.outgoing.packets.rate + disk.capacity_server_cmaui_3: + - server_cmaui_3 + - disk.capacity + network.outgoing.packets.rate_template_VMInt_OAM_lb_5: + - template_VMInt_OAM_lb_5 + - network.outgoing.packets.rate + network.outgoing.bytes_template_VMInt_OAM_lb_5: + - template_VMInt_OAM_lb_5 + - network.outgoing.bytes + network.outgoing.bytes_template_VMInt_OAM_lb_6: + - template_VMInt_OAM_lb_6 + - network.outgoing.bytes + feature_test_nested4Level: - test_nested4Level - - binding_template_VMInt_OAM_lb_8 - binding_server_cmaui_test_nested4Level: + - feature + feature_template_subint_oam_vmi_4_test_nested4Level: - test_nested4Level - - binding_server_cmaui + - feature_template_subint_oam_vmi_4 + network.outpoing.packets_template_VMInt_OAM_lb_6: + - template_VMInt_OAM_lb_6 + - network.outpoing.packets + instance_server_cmaui_3: + - server_cmaui_3 + - instance + network.outpoing.packets_template_VMInt_OAM_lb_8: + - template_VMInt_OAM_lb_8 + - network.outpoing.packets + network.outgoing.bytes_template_VMInt_OAM_lb_8: + - template_VMInt_OAM_lb_8 + - network.outgoing.bytes + network.outgoing.bytes.rate_template_VMInt_OAM_lb_5: + - template_VMInt_OAM_lb_5 + - network.outgoing.bytes.rate + network.outgoing.bytes.rate_template_VMInt_OAM_lb_6: + - template_VMInt_OAM_lb_6 + - network.outgoing.bytes.rate + disk.read.bytes.rate_server_cmaui_3: + - server_cmaui_3 + - disk.read.bytes.rate + disk.device.write.requests_server_cmaui_3: + - server_cmaui_3 + - disk.device.write.requests + network.outgoing.bytes.rate_template_VMInt_OAM_lb_8: + - template_VMInt_OAM_lb_8 + - network.outgoing.bytes.rate + network.incoming.bytes.rate_template_VMInt_OAM_lb_5: + - template_VMInt_OAM_lb_5 + - network.incoming.bytes.rate + network.incoming.bytes.rate_template_VMInt_OAM_lb_6: + - template_VMInt_OAM_lb_6 + - network.incoming.bytes.rate + disk.iops_server_cmaui_3: + - server_cmaui_3 + - disk.iops + disk.device.read.requests_server_cmaui_3: + - server_cmaui_3 + - disk.device.read.requests + network.incoming.bytes.rate_template_VMInt_OAM_lb_8: + - template_VMInt_OAM_lb_8 + - network.incoming.bytes.rate + network.incoming.packets_template_VMInt_OAM_lb_5: + - template_VMInt_OAM_lb_5 + - network.incoming.packets + network.incoming.packets_template_VMInt_OAM_lb_6: + - template_VMInt_OAM_lb_6 + - network.incoming.packets + disk.device.read.requests.rate_server_cmaui_3: + - server_cmaui_3 + - disk.device.read.requests.rate + network.incoming.packets_template_VMInt_OAM_lb_8: + - template_VMInt_OAM_lb_8 + - network.incoming.packets + cpu.delta_server_cmaui_3: + - server_cmaui_3 + - cpu.delta + memory.resident_server_cmaui_3: + - server_cmaui_3 + - memory.resident + disk.latency_server_cmaui_3: + - server_cmaui_3 + - disk.latency + memory.usage_server_cmaui_3: + - server_cmaui_3 + - memory.usage + cpu_util_server_cmaui_3: + - server_cmaui_3 + - cpu_util + disk.device.write.bytes.rate_server_cmaui_3: + - server_cmaui_3 + - disk.device.write.bytes.rate requirements: - link_template_VMInt_OAM_lb_8_test_nested4Level: + dependency_test_nested4Level: - test_nested4Level - - link_template_VMInt_OAM_lb_8 - local_storage_server_cmaui: - - server_cmaui - - local_storage + - dependency + dependency_template_subint_oam_vmi_4_test_nested4Level: + - test_nested4Level + - dependency_template_subint_oam_vmi_4 + dependency_template_VMInt_OAM_lb_5: + - template_VMInt_OAM_lb_5 + - dependency + dependency_template_VMInt_OAM_lb_6: + - template_VMInt_OAM_lb_6 + - dependency link_template_VMInt_OAM_lb_5: - template_VMInt_OAM_lb_5 - link - link_template_Vlan_3: - - template_Vlan_3 - - link + dependency_template_VMInt_OAM_lb_8: + - template_VMInt_OAM_lb_8 + - dependency link_template_VMInt_OAM_lb_6: - template_VMInt_OAM_lb_6 - link - local_storage_server_cmaui_test_nested4Level: - - test_nested4Level - - local_storage_server_cmaui - link_template_Vlan_4_test_nested4Level: - - test_nested4Level - - link_template_Vlan_4 - link_template_VMInt_OAM_lb_7_test_nested4Level: + link_template_VMInt_OAM_lb_8: + - template_VMInt_OAM_lb_8 + - link + dependency_server_cmaui_3: + - server_cmaui_3 + - dependency + local_storage_server_cmaui_3: + - server_cmaui_3 + - local_storage + binding_template_VMInt_OAM_lb_8: + - template_VMInt_OAM_lb_8 + - binding + subinterface_link_template_subint_oam_vmi_4_test_nested4Level: - test_nested4Level - - link_template_VMInt_OAM_lb_7
\ No newline at end of file + - subinterface_link_template_subint_oam_vmi_4
\ 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/nestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/nestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml index ba3c164e3c..a26eaede77 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/nestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/nestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml @@ -2,43 +2,10 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0 metadata: template_name: nested4 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: @@ -57,6 +24,10 @@ topology_template: hidden: false immutable: false type: string + p3: + hidden: false + immutable: false + type: string template_PortTuple_LB1: hidden: false immutable: false @@ -126,59 +97,11 @@ topology_template: immutable: false type: string node_templates: - template_VMInt_OAM_lb_7: - 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_8: - type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface - properties: - security_group_refs: - - get_input: oam_sec_group_name - virtual_network_refs: - - get_input: p1 - 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 - template_Vlan_4: - type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + template_subint_oam_vmi_4: + type: org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface properties: virtual_machine_interface_refs: - - template_VMInt_OAM_lb_8 + - get_input: p3 name: str_replace: template: $NAME$VLAN @@ -213,11 +136,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_8 - relationship: tosca.relationships.network.BindsTo groups: nested4_group: type: org.openecomp.groups.heat.HeatStack @@ -225,44 +143,20 @@ topology_template: heat_file: ../Artifacts/nested4.yml description: nested4 members: - - template_VMInt_OAM_lb_7 - - template_VMInt_OAM_lb_8 - - server_cmaui - - template_Vlan_4 + - template_subint_oam_vmi_4 substitution_mappings: - node_type: org.openecomp.resource.abstract.nodes.heat.nested4 + node_type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested4 capabilities: - host_server_cmaui: - - server_cmaui - - host - os_server_cmaui: - - server_cmaui - - os - endpoint_server_cmaui: - - server_cmaui - - endpoint - binding_server_cmaui: - - server_cmaui - - binding - scalable_server_cmaui: - - server_cmaui - - scalable - binding_template_VMInt_OAM_lb_8: - - template_VMInt_OAM_lb_8 - - binding - binding_template_VMInt_OAM_lb_7: - - template_VMInt_OAM_lb_7 - - binding + feature_template_subint_oam_vmi_4: + - template_subint_oam_vmi_4 + - feature requirements: - local_storage_server_cmaui: - - server_cmaui - - local_storage - link_template_VMInt_OAM_lb_7: - - template_VMInt_OAM_lb_7 - - link - link_template_Vlan_4: - - template_Vlan_4 - - link - link_template_VMInt_OAM_lb_8: - - template_VMInt_OAM_lb_8 - - link
\ No newline at end of file + dependency_template_subint_oam_vmi_4: + - template_subint_oam_vmi_4 + - dependency + subinterface_link_template_subint_oam_vmi_4: + - template_subint_oam_vmi_4 + - subinterface_link + binding_template_subint_oam_vmi_4: + - template_subint_oam_vmi_4 + - binding
\ 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/nestedMultiLevels/inputfiles/nested2.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/nestedMultiLevels/inputfiles/nested2.yml index 272d074db8..26f8cd6fb6 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/nestedMultiLevels/inputfiles/nested2.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/nestedMultiLevels/inputfiles/nested2.yml @@ -115,7 +115,7 @@ resources: virtual_network_refs: [{ get_param: p2 },{ get_param: p1 }] virtual_machine_interface_refs: [{ get_resource: template_VMInt_OAM_lb_4 }] - server_cmaui: + server_cmaui_2: type: OS::Nova::Server properties: name: { get_param: [cmaui_names, 0]} diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/nestedMultiLevels/inputfiles/nested3.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/nestedMultiLevels/inputfiles/nested3.yml index ee7c6c746c..dd77633e1f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/nestedMultiLevels/inputfiles/nested3.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/nestedMultiLevels/inputfiles/nested3.yml @@ -116,7 +116,7 @@ resources: port_tuple_refs: [{ get_param: template_PortTuple_LB1 }] security_group_refs: [{ get_param: oam_sec_group_name}] - server_cmaui: + server_cmaui_3: type: OS::Nova::Server properties: name: { get_param: [cmaui_names, 0]} @@ -127,8 +127,20 @@ resources: - port: { get_resource: template_VMInt_OAM_lb_5 } - port: { get_resource: template_VMInt_OAM_lb_6 } + template_VMInt_OAM_lb_8: + type: OS::ContrailV2::VirtualMachineInterface + properties: + virtual_machine_interface_properties: + { + virtual_machine_interface_properties_service_interface_type: { get_param: lb_st_interface_type_oam }, + } + virtual_network_refs: [{ get_param: p1 }] + port_tuple_refs: [{ get_param: template_PortTuple_LB1 }] + security_group_refs: [{ get_param: oam_sec_group_name}] + test_nested4Level: type: nested4.yml properties: p1: { get_param: p1} - p2: { get_param: p2}
\ No newline at end of file + p2: { get_param: p2} + p3: { get_resource: template_VMInt_OAM_lb_8}
\ 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/nestedMultiLevels/inputfiles/nested4.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/nestedMultiLevels/inputfiles/nested4.yml index 264cbd16d2..9c3a2a38e0 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/nestedMultiLevels/inputfiles/nested4.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/nestedMultiLevels/inputfiles/nested4.yml @@ -14,6 +14,8 @@ parameters: description: UID of OAM network p2: type: string + p3: + type: string security_group_name: type: comma_delimited_list description: CMAUI1, CMAUI2 server names @@ -49,29 +51,7 @@ parameters: type: number resources: - template_VMInt_OAM_lb_7: - type: OS::ContrailV2::VirtualMachineInterface - properties: - virtual_machine_interface_properties: - { - virtual_machine_interface_properties_service_interface_type: { get_param: lb_st_interface_type_oam }, - } - virtual_network_refs: [{ get_param: p2 }] - port_tuple_refs: [{ get_param: template_PortTuple_LB1 }] - security_group_refs: [{ get_param: oam_sec_group_name}] - - template_VMInt_OAM_lb_8: - type: OS::ContrailV2::VirtualMachineInterface - properties: - virtual_machine_interface_properties: - { - virtual_machine_interface_properties_service_interface_type: { get_param: lb_st_interface_type_oam }, - } - virtual_network_refs: [{ get_param: p1 }] - port_tuple_refs: [{ get_param: template_PortTuple_LB1 }] - security_group_refs: [{ get_param: oam_sec_group_name}] - - template_Vlan_4: + template_subint_oam_vmi_4: type: OS::ContrailV2::VirtualMachineInterface properties: name: @@ -112,15 +92,4 @@ resources: ] } virtual_network_refs: [{ get_param: p1 }] - virtual_machine_interface_refs: [{ get_resource: template_VMInt_OAM_lb_8 }] - - server_cmaui: - type: OS::Nova::Server - properties: - name: { get_param: [cmaui_names, 0]} - image: { get_param: cmaui_image } - availability_zone: { get_param: availability_zone_0 } - flavor: { get_param: cmaui_flavor } - networks: - - port: { get_resource: template_VMInt_OAM_lb_7 } - - port: { get_resource: template_VMInt_OAM_lb_8 }
\ No newline at end of file + virtual_machine_interface_refs: [{ get_param: p3 }]
\ 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/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 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/shared/inputfiles/addOn.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/shared/inputfiles/addOn.yml index 507bfcaa08..6be5882f0d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/shared/inputfiles/addOn.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/shared/inputfiles/addOn.yml @@ -4,6 +4,10 @@ description: > Version 2.0 02-09-2016 (Authors: John Doe, user PROD) parameters: + jsa_net_name: + type: string + description: network name of jsa log network + shared_network_id1: type: string description: network name of jsa log network @@ -14,11 +18,21 @@ parameters: resources: + test_net3: + type: OS::Neutron::Net + properties: + name: {get_param: jsa_net_name} + shared: True + test_nested1: type: nested1.yml properties: shared_network_id1: { get_param: shared_network_id1} p2: { get_param: shared_network_id2} + p3: { get_param: template_VMInt_OAM_lb_1} + p4: { get_param: template_VMInt_OAM_lb_2} + p5: { get_param: template_VMInt_OAM_lb_3} + test_nested2: type: nested2.yml @@ -29,4 +43,38 @@ resources: type: nested1.yml properties: shared_network_id1: { get_param: shared_network_id1} - p2: { get_param: shared_network_id2}
\ No newline at end of file + p2: { get_param: shared_network_id2} + + template_VMInt_OAM_lb_1: + type: OS::ContrailV2::VirtualMachineInterface + properties: + virtual_machine_interface_properties: + { + virtual_machine_interface_properties_service_interface_type: { get_param: jsa_net_name }, + } + virtual_network_refs: [{ get_resource: test_net3 }] + port_tuple_refs: [{ get_param: jsa_net_name }] + security_group_refs: [{ get_param: jsa_net_name}] + + + template_VMInt_OAM_lb_2: + type: OS::ContrailV2::VirtualMachineInterface + properties: + virtual_machine_interface_properties: + { + virtual_machine_interface_properties_service_interface_type: { get_param: jsa_net_name }, + } + virtual_network_refs: [{ get_resource: test_net3 }] + port_tuple_refs: [{ get_param: jsa_net_name }] + security_group_refs: [{ get_param: jsa_net_name}] + + template_VMInt_OAM_lb_3: + type: OS::ContrailV2::VirtualMachineInterface + properties: + virtual_machine_interface_properties: + { + virtual_machine_interface_properties_service_interface_type: { get_param: jsa_net_name }, + } + virtual_network_refs: [{ get_resource: test_net3 }] + port_tuple_refs: [{ get_param: jsa_net_name }] + security_group_refs: [{ get_param: jsa_net_name}]
\ 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/inputfiles/nested1.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/shared/inputfiles/nested1.yml index 6687a32f2a..ce0336d766 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/shared/inputfiles/nested1.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/shared/inputfiles/nested1.yml @@ -9,6 +9,15 @@ parameters: p2: type: string description: UID of OAM network + p3: + type: string + description: UID of OAM network + p4: + type: string + description: UID of OAM network + p5: + type: string + description: UID of OAM network cmaui_names: type: comma_delimited_list description: CMAUI1, CMAUI2 server names @@ -61,17 +70,6 @@ parameters: type: number resources: - template_VMInt_OAM_lb_1: - type: OS::ContrailV2::VirtualMachineInterface - properties: - virtual_machine_interface_properties: - { - virtual_machine_interface_properties_service_interface_type: { get_param: lb_st_interface_type_oam }, - } - virtual_network_refs: [{ get_param: shared_network_id1 }] - port_tuple_refs: [{ get_param: template_PortTuple_LB1 }] - security_group_refs: [{ get_param: oam_sec_group_name}] - template_Vlan_1: type: OS::ContrailV2::VirtualMachineInterface properties: @@ -113,18 +111,7 @@ resources: ] } virtual_network_refs: [{ get_param: shared_network_id1 }] - virtual_machine_interface_refs: [{ get_resource: template_VMInt_OAM_lb_1 }] - - template_VMInt_OAM_lb_2: - type: OS::ContrailV2::VirtualMachineInterface - properties: - virtual_machine_interface_properties: - { - virtual_machine_interface_properties_service_interface_type: { get_param: lb_st_interface_type_oam }, - } - virtual_network_refs: [{ get_param: p2 }] - port_tuple_refs: [{ get_param: template_PortTuple_LB1 }] - security_group_refs: [{ get_param: oam_sec_group_name}] + virtual_machine_interface_refs: [{ get_param: p3 }] template_Vlan_2: type: OS::ContrailV2::VirtualMachineInterface @@ -167,18 +154,7 @@ resources: ] } virtual_network_refs: [{ get_param: p2 }] - virtual_machine_interface_refs: [{ get_resource: template_VMInt_OAM_lb_2 }] - - template_VMInt_OAM_lb_3: - type: OS::ContrailV2::VirtualMachineInterface - properties: - virtual_machine_interface_properties: - { - virtual_machine_interface_properties_service_interface_type: { get_param: lb_st_interface_type_oam }, - } - virtual_network_refs: [{ get_param: p2 },{ get_param: shared_network_id1 }] - port_tuple_refs: [{ get_param: template_PortTuple_LB1 }] - security_group_refs: [{ get_param: oam_sec_group_name}] + virtual_machine_interface_refs: [{ get_param: p4 }] template_Vlan_3: type: OS::ContrailV2::VirtualMachineInterface @@ -221,34 +197,4 @@ resources: ] } virtual_network_refs: [{ get_param: p2 },{ get_param: shared_network_id1 }] - virtual_machine_interface_refs: [{ get_resource: template_VMInt_OAM_lb_3 }] - - abc_port_1: - type: OS::Neutron::Port - properties: - network: { get_param: p2 } - fixed_ips: [{"ip_address": {get_param: [abc_oam_ips, 0]}}] - security_groups: [{get_param: security_group_name}] - replacement_policy: AUTO - - server_cmaui: - type: OS::Nova::Server - properties: - name: { get_param: [cmaui_names, 0]} - image: { get_param: cmaui_image } - availability_zone: { get_param: availability_zone_0 } - flavor: { get_param: cmaui_flavor } - networks: - - port: { get_resource: template_VMInt_OAM_lb_1 } - - port: { get_resource: template_VMInt_OAM_lb_2 } - - port: { get_resource: template_VMInt_OAM_lb_3 } - - server_abc: - type: OS::Nova::Server - properties: - name: { get_param: [abc_names, 0]} - image: { get_param: abc_image } - availability_zone: { get_param: availability_zone_0 } - flavor: { get_param: abc_flavor } - networks: - - port: { get_resource: abc_port_1 }
\ No newline at end of file + virtual_machine_interface_refs: [{ get_param: p5 }] diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/shared/inputfiles/nested2.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/shared/inputfiles/nested2.yml index 0381298528..1e5a41699b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/shared/inputfiles/nested2.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/shared/inputfiles/nested2.yml @@ -43,15 +43,7 @@ parameters: type: number resources: - cmaui_port_1: - type: OS::Neutron::Port - properties: - network: { get_param: p1 } - fixed_ips: [{"ip_address": {get_param: [cmaui_oam_ips, 0]}}] - security_groups: [{get_param: security_group_name}] - replacement_policy: AUTO - - template_Vlan_3: + template_subint_oam_vmi_1: type: OS::ContrailV2::VirtualMachineInterface properties: name: @@ -92,14 +84,4 @@ resources: ] } virtual_network_refs: [{ get_param: p1 }] - virtual_machine_interface_refs: [{ get_resource: cmaui_port_1 }] - - server_cmaui: - type: OS::Nova::Server - properties: - name: { get_param: [cmaui_names, 0]} - image: { get_param: cmaui_image } - availability_zone: { get_param: availability_zone_0 } - flavor: { get_param: cmaui_flavor } - networks: - - port: { get_resource: cmaui_port_1 }
\ No newline at end of file + virtual_machine_interface_refs: [{ get_param: p2 }]
\ 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/sharedAddOn/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/sharedAddOn/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml new file mode 100644 index 0000000000..1be71bb7c5 --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/sharedAddOn/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml @@ -0,0 +1,203 @@ +tosca_definitions_version: tosca_simple_yaml_1_0_0 +metadata: + template_name: GlobalSubstitutionTypes +imports: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +node_types: + org.openecomp.resource.abstract.nodes.heat.subinterface.vlan: + derived_from: org.openecomp.resource.abstract.nodes.AbstractSubstitute + properties: + cmaui_names: + type: list + description: CMAUI1, CMAUI2 server names + required: true + status: SUPPORTED + entry_schema: + type: string + p1: + type: string + description: UID of OAM network + required: true + status: SUPPORTED + p2: + type: string + 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 + template_PortTuple_LB1: + type: string + required: true + status: SUPPORTED + p5: + type: string + description: UID of OAM network + required: true + status: SUPPORTED + oam_sec_group_name: + type: string + required: true + status: SUPPORTED + lb_st_interface_type_oam: + type: string + required: true + status: SUPPORTED + virtual_ip_address: + type: string + required: true + status: SUPPORTED + security_group_name: + type: list + description: CMAUI1, CMAUI2 server names + required: true + status: SUPPORTED + entry_schema: + type: string + shared_network_id: + type: string + description: Flavor for CMAUI server + required: true + status: SUPPORTED + vlan_ids: + type: string + required: true + status: SUPPORTED + shared_network_id1: + type: string + description: Flavor for CMAUI server + required: true + status: SUPPORTED + cmaui_image: + type: string + 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 + shared_network_id2: + type: list + description: Flavor for CMAUI server + required: true + status: SUPPORTED + entry_schema: + type: string + 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_name_prefix: + type: string + required: true + status: SUPPORTED + subinterface_instance_index: + type: float + required: true + status: SUPPORTED + cmaui_oam_ips: + type: string + required: true + status: SUPPORTED + requirements: + - dependency_template_Vlan_3: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - subinterface_link_template_Vlan_3: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 + - 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 + - dependency_template_Vlan_2: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - subinterface_link_template_Vlan_2: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 + - binding_template_Vlan_2: + capability: tosca.capabilities.network.Bindable + node: org.openecomp.resource.cp.nodes.network.Port + relationship: tosca.relationships.network.BindsTo + occurrences: + - 1 + - 1 + - dependency_template_Vlan_1: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - subinterface_link_template_Vlan_1: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 + - binding_template_Vlan_1: + capability: tosca.capabilities.network.Bindable + node: org.openecomp.resource.cp.nodes.network.Port + relationship: tosca.relationships.network.BindsTo + occurrences: + - 1 + - 1 + capabilities: + feature_template_Vlan_2: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + feature_template_Vlan_3: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + feature_template_Vlan_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/sharedAddOn/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/sharedAddOn/expectedoutputfiles/MainServiceTemplate.yaml index ab9cc09215..d22c84d7fe 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/sharedAddOn/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/sharedAddOn/expectedoutputfiles/MainServiceTemplate.yaml @@ -2,46 +2,23 @@ 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 -node_types: - org.openecomp.resource.vfc.nodes.heat.cmaui: - derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: + file: GlobalSubstitutionTypesServiceTemplate.yaml topology_template: inputs: cmaui_names: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - addOn + source_type: HEAT + param_name: cmaui_names type: list description: CMAUI1, CMAUI2 server names entry_schema: @@ -49,27 +26,75 @@ topology_template: p1: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - addOn + source_type: HEAT + param_name: p1 type: string description: UID of OAM network template_PortTuple_LB1: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - addOn + source_type: HEAT + param_name: template_PortTuple_LB1 type: string oam_sec_group_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - addOn + source_type: HEAT + param_name: oam_sec_group_name type: string lb_st_interface_type_oam: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - addOn + source_type: HEAT + param_name: lb_st_interface_type_oam type: string virtual_ip_address: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - addOn + source_type: HEAT + param_name: virtual_ip_address type: string security_group_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - addOn + source_type: HEAT + param_name: security_group_name type: list description: CMAUI1, CMAUI2 server names entry_schema: @@ -77,39 +102,103 @@ topology_template: shared_network_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - addOn + source_type: HEAT + param_name: shared_network_id type: string description: Flavor for CMAUI server jsa_net_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: jsa_net_name type: string description: network name of jsa log network vlan_ids: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - addOn + source_type: HEAT + param_name: vlan_ids type: string 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: Flavor for CMAUI server cmaui_image: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - addOn + source_type: HEAT + param_name: cmaui_image type: string description: Image for CMAUI server virtual_ipv6_address: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - addOn + source_type: HEAT + param_name: virtual_ipv6_address type: string cmaui_flavor: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - addOn + source_type: HEAT + param_name: cmaui_flavor type: string description: Flavor for CMAUI server 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: list description: Flavor for CMAUI server entry_schema: @@ -117,29 +206,77 @@ topology_template: lb_st_vlan_type_oam: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - addOn + source_type: HEAT + param_name: lb_st_vlan_type_oam type: string description: dummy mac_address: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - addOn + source_type: HEAT + param_name: mac_address type: string availability_zone_0: label: availabilityzone name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - addOn + source_type: HEAT + param_name: availability_zone_0 type: string description: availabilityzone name subinterface_name_prefix: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - addOn + source_type: HEAT + param_name: subinterface_name_prefix type: string subinterface_instance_index: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - addOn + source_type: HEAT + param_name: subinterface_instance_index type: float cmaui_oam_ips: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - addOn + source_type: HEAT + param_name: cmaui_oam_ips type: string node_templates: template_VMInt_OAM_lb_1: @@ -150,7 +287,7 @@ topology_template: virtual_network_refs: - get_input: shared_network_id 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 @@ -159,10 +296,6 @@ topology_template: capability: tosca.capabilities.network.Linkable node: test_net relationship: tosca.relationships.network.LinksTo - - 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: @@ -172,7 +305,7 @@ topology_template: - get_input: shared_network_id - get_input: shared_network_id1 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 @@ -181,10 +314,6 @@ topology_template: capability: tosca.capabilities.network.Linkable node: test_net relationship: tosca.relationships.network.LinksTo - - 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: @@ -195,7 +324,7 @@ topology_template: - shared_network_id2 - 0 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 @@ -205,169 +334,39 @@ topology_template: shared: true network_name: get_input: jsa_net_name - 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 - test_net: - type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net - properties: - shared: true - network_name: - get_input: jsa_net_name - template_Vlan_3: - type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + test_nested1: + type: org.openecomp.resource.abstract.nodes.heat.subinterface.vlan + directives: + - substitutable properties: - virtual_machine_interface_refs: - - template_VMInt_OAM_lb_1 - name: - str_replace: - template: $NAME$VLAN - params: - $NAME: - get_input: subinterface_name_prefix - $VLAN: - get_input: - - vlan_ids - - get_input: subinterface_instance_index - virtual_network_refs: - - get_input: - - shared_network_id2 - - 0 - virtual_machine_interface_properties: - sub_interface_vlan_tag: - get_input: lb_st_vlan_type_oam - virtual_machine_interface_allowed_address_pairs: - allowed_address_pair: - - address_mode: active-standby - ip: - ip_prefix: - get_input: virtual_ip_address - ip_prefix_len: 32 - mac: - get_input: mac_address - - address_mode: active-standby - ip: - ip_prefix: - get_input: virtual_ipv6_address - ip_prefix_len: 128 - mac: - get_input: mac_address - virtual_machine_interface_mac_addresses: - mac_address: - - get_input: mac_address + service_template_filter: + substitute_service_template: vlanServiceTemplate.yaml + shared_network_id1: + get_input: shared_network_id1 + p2: + get_input: shared_network_id2 + p3: template_VMInt_OAM_lb_1 + p4: template_VMInt_OAM_lb_2 + p5: template_VMInt_OAM_lb_3 requirements: - - binding: + - binding_template_Vlan_3: capability: tosca.capabilities.network.Bindable - node: template_VMInt_OAM_lb_1 + node: template_VMInt_OAM_lb_3 relationship: tosca.relationships.network.BindsTo - template_Vlan_2: - type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - properties: - virtual_machine_interface_refs: - - template_VMInt_OAM_lb_1 - name: - str_replace: - template: $NAME$VLAN - params: - $NAME: - get_input: subinterface_name_prefix - $VLAN: - get_input: - - vlan_ids - - get_input: subinterface_instance_index - virtual_network_refs: - - get_input: shared_network_id - - get_input: shared_network_id1 - virtual_machine_interface_properties: - sub_interface_vlan_tag: - get_input: lb_st_vlan_type_oam - virtual_machine_interface_allowed_address_pairs: - allowed_address_pair: - - address_mode: active-standby - ip: - ip_prefix: - get_input: virtual_ip_address - ip_prefix_len: 32 - mac: - get_input: mac_address - - address_mode: active-standby - ip: - ip_prefix: - get_input: virtual_ipv6_address - ip_prefix_len: 128 - mac: - get_input: mac_address - virtual_machine_interface_mac_addresses: - mac_address: - - get_input: mac_address - requirements: - - link: - capability: tosca.capabilities.network.Linkable - node: test_net - relationship: tosca.relationships.network.LinksTo - - binding: + - binding_template_Vlan_2: capability: tosca.capabilities.network.Bindable - node: template_VMInt_OAM_lb_1 + node: template_VMInt_OAM_lb_2 relationship: tosca.relationships.network.BindsTo - template_Vlan_1: - type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - properties: - virtual_machine_interface_refs: - - template_VMInt_OAM_lb_1 - name: - str_replace: - template: $NAME$VLAN - params: - $NAME: - get_input: subinterface_name_prefix - $VLAN: - get_input: - - vlan_ids - - get_input: subinterface_instance_index - virtual_network_refs: - - get_input: shared_network_id - virtual_machine_interface_properties: - sub_interface_vlan_tag: - get_input: lb_st_vlan_type_oam - virtual_machine_interface_allowed_address_pairs: - allowed_address_pair: - - address_mode: active-standby - ip: - ip_prefix: - get_input: virtual_ip_address - ip_prefix_len: 32 - mac: - get_input: mac_address - - address_mode: active-standby - ip: - ip_prefix: - get_input: virtual_ipv6_address - ip_prefix_len: 128 - mac: - get_input: mac_address - virtual_machine_interface_mac_addresses: - mac_address: - - get_input: mac_address - requirements: - - link: - capability: tosca.capabilities.network.Linkable - node: test_net - relationship: tosca.relationships.network.LinksTo - - binding: + - binding_template_Vlan_1: capability: tosca.capabilities.network.Bindable node: template_VMInt_OAM_lb_1 relationship: tosca.relationships.network.BindsTo + test_net: + type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net + properties: + shared: true + network_name: + get_input: jsa_net_name groups: main_group: type: org.openecomp.groups.heat.HeatStack @@ -387,7 +386,4 @@ topology_template: - template_VMInt_OAM_lb_1 - template_VMInt_OAM_lb_2 - template_VMInt_OAM_lb_3 - - server_cmaui - - template_Vlan_3 - - template_Vlan_2 - - template_Vlan_1
\ No newline at end of file + - test_nested1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/sharedAddOn/expectedoutputfiles/vlanServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/sharedAddOn/expectedoutputfiles/vlanServiceTemplate.yaml new file mode 100644 index 0000000000..b0301d5efd --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/sharedAddOn/expectedoutputfiles/vlanServiceTemplate.yaml @@ -0,0 +1,298 @@ +tosca_definitions_version: tosca_simple_yaml_1_0_0 +metadata: + template_name: vlan +imports: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: + file: GlobalSubstitutionTypesServiceTemplate.yaml +topology_template: + inputs: + cmaui_names: + hidden: false + immutable: false + type: list + description: CMAUI1, CMAUI2 server names + entry_schema: + type: string + p1: + hidden: false + immutable: false + type: string + description: UID of OAM network + p2: + hidden: false + 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 + template_PortTuple_LB1: + hidden: false + immutable: false + type: string + p5: + hidden: false + immutable: false + type: string + description: UID of OAM network + oam_sec_group_name: + hidden: false + immutable: false + type: string + lb_st_interface_type_oam: + hidden: false + immutable: false + type: string + virtual_ip_address: + hidden: false + immutable: false + type: string + security_group_name: + hidden: false + immutable: false + type: list + description: CMAUI1, CMAUI2 server names + entry_schema: + type: string + shared_network_id: + hidden: false + immutable: false + type: string + description: Flavor for CMAUI server + vlan_ids: + hidden: false + immutable: false + type: string + shared_network_id1: + hidden: false + immutable: false + type: string + description: Flavor for CMAUI server + cmaui_image: + hidden: false + 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 + shared_network_id2: + hidden: false + immutable: false + type: list + description: Flavor for CMAUI server + entry_schema: + 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_name_prefix: + hidden: false + immutable: false + type: string + subinterface_instance_index: + hidden: false + immutable: false + type: float + cmaui_oam_ips: + hidden: false + immutable: false + type: string + node_templates: + template_Vlan_3: + type: org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + properties: + virtual_machine_interface_refs: + - get_input: p5 + name: + str_replace: + template: $NAME$VLAN + params: + $NAME: + get_input: subinterface_name_prefix + $VLAN: + get_input: + - vlan_ids + - get_input: subinterface_instance_index + virtual_network_refs: + - get_input: + - shared_network_id2 + - 0 + virtual_machine_interface_properties: + sub_interface_vlan_tag: + get_input: lb_st_vlan_type_oam + virtual_machine_interface_allowed_address_pairs: + allowed_address_pair: + - address_mode: active-standby + ip: + ip_prefix: + get_input: virtual_ip_address + ip_prefix_len: 32 + mac: + get_input: mac_address + - address_mode: active-standby + ip: + ip_prefix: + get_input: virtual_ipv6_address + ip_prefix_len: 128 + mac: + get_input: mac_address + virtual_machine_interface_mac_addresses: + mac_address: + - get_input: mac_address + template_Vlan_2: + type: org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + properties: + virtual_machine_interface_refs: + - get_input: p4 + name: + str_replace: + template: $NAME$VLAN + params: + $NAME: + get_input: subinterface_name_prefix + $VLAN: + get_input: + - vlan_ids + - get_input: subinterface_instance_index + virtual_network_refs: + - get_input: shared_network_id + - get_input: shared_network_id1 + virtual_machine_interface_properties: + sub_interface_vlan_tag: + get_input: lb_st_vlan_type_oam + virtual_machine_interface_allowed_address_pairs: + allowed_address_pair: + - address_mode: active-standby + ip: + ip_prefix: + get_input: virtual_ip_address + ip_prefix_len: 32 + mac: + get_input: mac_address + - address_mode: active-standby + ip: + ip_prefix: + get_input: virtual_ipv6_address + ip_prefix_len: 128 + mac: + get_input: mac_address + virtual_machine_interface_mac_addresses: + mac_address: + - get_input: mac_address + template_Vlan_1: + type: org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + properties: + virtual_machine_interface_refs: + - get_input: p3 + name: + str_replace: + template: $NAME$VLAN + params: + $NAME: + get_input: subinterface_name_prefix + $VLAN: + get_input: + - vlan_ids + - get_input: subinterface_instance_index + virtual_network_refs: + - get_input: shared_network_id + virtual_machine_interface_properties: + sub_interface_vlan_tag: + get_input: lb_st_vlan_type_oam + virtual_machine_interface_allowed_address_pairs: + allowed_address_pair: + - address_mode: active-standby + ip: + ip_prefix: + get_input: virtual_ip_address + ip_prefix_len: 32 + mac: + get_input: mac_address + - address_mode: active-standby + ip: + ip_prefix: + get_input: virtual_ipv6_address + ip_prefix_len: 128 + mac: + get_input: mac_address + virtual_machine_interface_mac_addresses: + mac_address: + - get_input: mac_address + groups: + vlan_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/vlan.yml + description: cmaui server template for vMMSC + members: + - template_Vlan_3 + - template_Vlan_2 + - template_Vlan_1 + substitution_mappings: + node_type: org.openecomp.resource.abstract.nodes.heat.subinterface.vlan + capabilities: + 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: + 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 + - dependency + subinterface_link_template_Vlan_1: + - template_Vlan_1 + - subinterface_link + binding_template_Vlan_2: + - template_Vlan_2 + - binding + binding_template_Vlan_1: + - template_Vlan_1 + - binding + binding_template_Vlan_3: + - template_Vlan_3 + - binding + dependency_template_Vlan_3: + - template_Vlan_3 + - 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/sharedAddOn/inputfiles/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/sharedAddOn/inputfiles/MANIFEST.json index 1f762d0ccc..3346702d2a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/sharedAddOn/inputfiles/MANIFEST.json +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/sharedAddOn/inputfiles/MANIFEST.json @@ -12,6 +12,11 @@ "file": "addOn.yml", "type": "HEAT", "isBase": "false" + }, + { + "file": "vlan.yml", + "type": "HEAT", + "isBase": "false" } ] } diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/sharedAddOn/inputfiles/addOn.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/sharedAddOn/inputfiles/addOn.yml index 41c8f74ff3..b49b2ca96f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/sharedAddOn/inputfiles/addOn.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/sharedAddOn/inputfiles/addOn.yml @@ -67,49 +67,6 @@ resources: port_tuple_refs: [{ get_param: template_PortTuple_LB1 }] security_group_refs: [{ get_param: oam_sec_group_name}] - template_Vlan_1: - type: OS::ContrailV2::VirtualMachineInterface - properties: - name: - str_replace: - template: $NAME$VLAN - params: - $NAME: { get_param: subinterface_name_prefix } - $VLAN: { get_param: [ vlan_ids, { get_param: subinterface_instance_index } ] } - virtual_machine_interface_properties: - { - virtual_machine_interface_properties_sub_interface_vlan_tag: { get_param: lb_st_vlan_type_oam } - } - virtual_machine_interface_mac_addresses: - { - virtual_machine_interface_mac_addresses_mac_address: [{ get_param: mac_address }], - } - virtual_machine_interface_allowed_address_pairs: - { - virtual_machine_interface_allowed_address_pairs_allowed_address_pair: [ - { - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: active-standby, - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac: { get_param: mac_address }, - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip: - { - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: { get_param: virtual_ip_address }, - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: 32 - } - }, - { - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: active-standby, - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac: { get_param: mac_address }, - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip: - { - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: { get_param: virtual_ipv6_address }, - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: 128 - } - } - ] - } - virtual_network_refs: [{ get_param: shared_network_id }] - virtual_machine_interface_refs: [{ get_resource: template_VMInt_OAM_lb_1 }] - template_VMInt_OAM_lb_2: type: OS::ContrailV2::VirtualMachineInterface properties: @@ -121,49 +78,6 @@ resources: port_tuple_refs: [{ get_param: template_PortTuple_LB1 }] security_group_refs: [{ get_param: oam_sec_group_name}] - template_Vlan_2: - type: OS::ContrailV2::VirtualMachineInterface - properties: - name: - str_replace: - template: $NAME$VLAN - params: - $NAME: { get_param: subinterface_name_prefix } - $VLAN: { get_param: [ vlan_ids, { get_param: subinterface_instance_index } ] } - virtual_machine_interface_properties: - { - virtual_machine_interface_properties_sub_interface_vlan_tag: { get_param: lb_st_vlan_type_oam } - } - virtual_machine_interface_mac_addresses: - { - virtual_machine_interface_mac_addresses_mac_address: [{ get_param: mac_address }], - } - virtual_machine_interface_allowed_address_pairs: - { - virtual_machine_interface_allowed_address_pairs_allowed_address_pair: [ - { - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: active-standby, - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac: { get_param: mac_address }, - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip: - { - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: { get_param: virtual_ip_address }, - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: 32 - } - }, - { - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: active-standby, - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac: { get_param: mac_address }, - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip: - { - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: { get_param: virtual_ipv6_address }, - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: 128 - } - } - ] - } - virtual_network_refs: [{ get_param: shared_network_id }, { get_param: shared_network_id1 }] - virtual_machine_interface_refs: [{ get_resource: template_VMInt_OAM_lb_1 }] - template_VMInt_OAM_lb_3: type: OS::ContrailV2::VirtualMachineInterface properties: @@ -175,56 +89,11 @@ resources: port_tuple_refs: [{ get_param: template_PortTuple_LB1 }] security_group_refs: [{ get_param: oam_sec_group_name}] - template_Vlan_3: - type: OS::ContrailV2::VirtualMachineInterface - properties: - name: - str_replace: - template: $NAME$VLAN - params: - $NAME: { get_param: subinterface_name_prefix } - $VLAN: { get_param: [ vlan_ids, { get_param: subinterface_instance_index } ] } - virtual_machine_interface_properties: - { - virtual_machine_interface_properties_sub_interface_vlan_tag: { get_param: lb_st_vlan_type_oam } - } - virtual_machine_interface_mac_addresses: - { - virtual_machine_interface_mac_addresses_mac_address: [{ get_param: mac_address }], - } - virtual_machine_interface_allowed_address_pairs: - { - virtual_machine_interface_allowed_address_pairs_allowed_address_pair: [ - { - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: active-standby, - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac: { get_param: mac_address }, - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip: - { - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: { get_param: virtual_ip_address }, - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: 32 - } - }, - { - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: active-standby, - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac: { get_param: mac_address }, - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip: - { - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: { get_param: virtual_ipv6_address }, - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: 128 - } - } - ] - } - virtual_network_refs: [{ get_param: [ shared_network_id2, 0] }] - virtual_machine_interface_refs: [{ get_resource: template_VMInt_OAM_lb_1 }] - - server_cmaui: - type: OS::Nova::Server + test_nested1: + type: vlan.yml properties: - name: { get_param: [cmaui_names, 0]} - image: { get_param: cmaui_image } - availability_zone: { get_param: availability_zone_0 } - flavor: { get_param: cmaui_flavor } - networks: - - port: { get_resource: template_VMInt_OAM_lb_1 } - - port: { get_resource: template_VMInt_OAM_lb_2 }
\ No newline at end of file + shared_network_id1: { get_param: shared_network_id1} + p2: { get_param: shared_network_id2} + p3: { get_resource: template_VMInt_OAM_lb_1} + p4: { get_resource: template_VMInt_OAM_lb_2} + p5: { get_resource: template_VMInt_OAM_lb_3}
\ 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/sharedAddOn/inputfiles/vlan.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/sharedAddOn/inputfiles/vlan.yml new file mode 100644 index 0000000000..dbc5887313 --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/sharedAddOn/inputfiles/vlan.yml @@ -0,0 +1,198 @@ +heat_template_version: 2013-05-23 + +description: cmaui server template for vMMSC + +parameters: + p1: + type: string + description: UID of OAM network + p2: + type: string + description: UID of OAM network + p3: + type: string + description: UID of OAM network + p4: + type: string + description: UID of OAM network + p5: + type: string + description: UID of OAM network + cmaui_names: + type: comma_delimited_list + description: CMAUI1, CMAUI2 server names + security_group_name: + type: comma_delimited_list + description: CMAUI1, CMAUI2 server names + cmaui_image: + type: string + description: Image for CMAUI server + availability_zone_0: + type: string + label: availabilityzone name + description: availabilityzone name + cmaui_flavor: + type: string + description: Flavor for CMAUI server + shared_network_id: + type: string + description: Flavor for CMAUI server + shared_network_id1: + type: string + description: Flavor for CMAUI server + shared_network_id2: + type: comma_delimited_list + description: Flavor for CMAUI server + cmaui_oam_ips: + type: string + oam_sec_group_name: + type: string + lb_st_interface_type_oam: + type: string + template_PortTuple_LB1: + type: string + lb_st_vlan_type_oam: + description: dummy + type: string + mac_address: + type: string + virtual_ip_address: + type: string + virtual_ipv6_address: + type: string + vlan_ids: + type: string + subinterface_name_prefix: + type: string + subinterface_instance_index: + type: number + +resources: + template_Vlan_1: + type: OS::ContrailV2::VirtualMachineInterface + properties: + name: + str_replace: + template: $NAME$VLAN + params: + $NAME: { get_param: subinterface_name_prefix } + $VLAN: { get_param: [ vlan_ids, { get_param: subinterface_instance_index } ] } + virtual_machine_interface_properties: + { + virtual_machine_interface_properties_sub_interface_vlan_tag: { get_param: lb_st_vlan_type_oam } + } + virtual_machine_interface_mac_addresses: + { + virtual_machine_interface_mac_addresses_mac_address: [{ get_param: mac_address }], + } + virtual_machine_interface_allowed_address_pairs: + { + virtual_machine_interface_allowed_address_pairs_allowed_address_pair: [ + { + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: active-standby, + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac: { get_param: mac_address }, + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip: + { + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: { get_param: virtual_ip_address }, + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: 32 + } + }, + { + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: active-standby, + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac: { get_param: mac_address }, + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip: + { + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: { get_param: virtual_ipv6_address }, + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: 128 + } + } + ] + } + virtual_network_refs: [{ get_param: shared_network_id }] + virtual_machine_interface_refs: [{ get_param: p3}] + + template_Vlan_2: + type: OS::ContrailV2::VirtualMachineInterface + properties: + name: + str_replace: + template: $NAME$VLAN + params: + $NAME: { get_param: subinterface_name_prefix } + $VLAN: { get_param: [ vlan_ids, { get_param: subinterface_instance_index } ] } + virtual_machine_interface_properties: + { + virtual_machine_interface_properties_sub_interface_vlan_tag: { get_param: lb_st_vlan_type_oam } + } + virtual_machine_interface_mac_addresses: + { + virtual_machine_interface_mac_addresses_mac_address: [{ get_param: mac_address }], + } + virtual_machine_interface_allowed_address_pairs: + { + virtual_machine_interface_allowed_address_pairs_allowed_address_pair: [ + { + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: active-standby, + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac: { get_param: mac_address }, + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip: + { + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: { get_param: virtual_ip_address }, + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: 32 + } + }, + { + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: active-standby, + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac: { get_param: mac_address }, + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip: + { + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: { get_param: virtual_ipv6_address }, + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: 128 + } + } + ] + } + virtual_network_refs: [{ get_param: shared_network_id }, { get_param: shared_network_id1 }] + virtual_machine_interface_refs: [{ get_param: p4}] + + template_Vlan_3: + type: OS::ContrailV2::VirtualMachineInterface + properties: + name: + str_replace: + template: $NAME$VLAN + params: + $NAME: { get_param: subinterface_name_prefix } + $VLAN: { get_param: [ vlan_ids, { get_param: subinterface_instance_index } ] } + virtual_machine_interface_properties: + { + virtual_machine_interface_properties_sub_interface_vlan_tag: { get_param: lb_st_vlan_type_oam } + } + virtual_machine_interface_mac_addresses: + { + virtual_machine_interface_mac_addresses_mac_address: [{ get_param: mac_address }], + } + virtual_machine_interface_allowed_address_pairs: + { + virtual_machine_interface_allowed_address_pairs_allowed_address_pair: [ + { + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: active-standby, + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac: { get_param: mac_address }, + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip: + { + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: { get_param: virtual_ip_address }, + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: 32 + } + }, + { + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: active-standby, + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac: { get_param: mac_address }, + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip: + { + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: { get_param: virtual_ipv6_address }, + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: 128 + } + } + ] + } + virtual_network_refs: [{ get_param: [ shared_network_id2, 0] }] + virtual_machine_interface_refs: [{ get_param: p5}]
\ No newline at end of file |