diff options
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario')
7 files changed, 114 insertions, 114 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/in/nested_vlan.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/in/nested_vlan.yml index cc50a66d6e..1aa418cd5a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/in/nested_vlan.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/in/nested_vlan.yml @@ -24,7 +24,7 @@ parameters: type: number resources: - template_Vlan_vmi_1: + template_subint_Vlan_vmi_1: type: OS::ContrailV2::VirtualMachineInterface properties: name: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml index 4b63486703..f955a57828 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -101,7 +101,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_template_Vlan_vmi_1_test_resourceGroup_0: + - dependency_template_subint_Vlan_vmi_1_test_resourceGroup_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn @@ -143,7 +143,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_template_Vlan_vmi_1_test_resourceGroup_1_test_nested_level2: + - dependency_template_subint_Vlan_vmi_1_test_resourceGroup_1_test_nested_level2: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn @@ -157,7 +157,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_template_Vlan_vmi_1_test_resourceGroup_2_test_nested_level2: + - dependency_template_subint_Vlan_vmi_1_test_resourceGroup_2_test_nested_level2: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn @@ -399,6 +399,11 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_template_subint_Vlan_vmi_1_test_resourceGroup_1_test_nested_level2: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.device.read.bytes.rate_server_1b_pd_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -590,11 +595,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_template_Vlan_vmi_1_test_resourceGroup_0: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED end_point_packet_external_network: type: tosca.capabilities.Endpoint occurrences: @@ -652,16 +652,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_template_Vlan_vmi_1_test_resourceGroup_2_test_nested_level2: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - feature_template_Vlan_vmi_1_test_resourceGroup_1_test_nested_level2: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED network.outgoing.bytes_pd_server_1b_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -853,6 +843,11 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_template_subint_Vlan_vmi_1_test_resourceGroup_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.device.read.requests_server_1b_ps_1_test_nested_level2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -934,6 +929,11 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_template_subint_Vlan_vmi_1_test_resourceGroup_2_test_nested_level2: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED binding_ps_server_1b_port_1_test_nested_level2: type: tosca.capabilities.network.Bindable valid_source_types: @@ -1363,14 +1363,14 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: + - dependency_template_subint_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: + - link_template_subint_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -1592,11 +1592,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.device.write.bytes.rate_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1655,6 +1650,11 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_template_subint_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED cpu_util_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1808,7 +1808,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_template_Vlan_vmi_1_test_resourceGroup_1: + - dependency_template_subint_Vlan_vmi_1_test_resourceGroup_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn @@ -1822,7 +1822,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_template_Vlan_vmi_1_test_resourceGroup_2: + - dependency_template_subint_Vlan_vmi_1_test_resourceGroup_2: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn @@ -2127,16 +2127,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_template_Vlan_vmi_1_test_resourceGroup_1: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - feature_template_Vlan_vmi_1_test_resourceGroup_2: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.device.capacity_server_1b_ps_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2335,6 +2325,16 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_template_subint_Vlan_vmi_1_test_resourceGroup_2: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + feature_template_subint_Vlan_vmi_1_test_resourceGroup_1: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.read.bytes.rate_server_1b_ps_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2675,14 +2675,14 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: + - dependency_template_subint_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: + - link_template_subint_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -2873,6 +2873,11 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_template_subint_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED binding_ps_server_1b: type: tosca.capabilities.network.Bindable occurrences: @@ -3019,11 +3024,6 @@ node_types: occurrences: - 0 - UNBOUNDED - feature_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED org.openecomp.resource.abstract.nodes.heat.subinterface.nested_vlan: derived_from: org.openecomp.resource.abstract.nodes.AbstractSubstitute properties: @@ -3065,20 +3065,20 @@ node_types: required: true status: SUPPORTED requirements: - - dependency_template_Vlan_vmi_1: + - dependency_template_subint_Vlan_vmi_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_template_Vlan_vmi_1: + - link_template_subint_Vlan_vmi_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - binding_template_Vlan_vmi_1: + - binding_template_subint_Vlan_vmi_1: capability: tosca.capabilities.network.Bindable node: org.openecomp.resource.cp.nodes.network.Port relationship: tosca.relationships.network.BindsTo @@ -3086,8 +3086,8 @@ node_types: - 1 - 1 capabilities: - feature_template_Vlan_vmi_1: + feature_template_subint_Vlan_vmi_1: type: tosca.capabilities.Node occurrences: - 1 - - UNBOUNDED + - 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/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/Nested_pd_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/Nested_pd_server_1bServiceTemplate.yaml index 9bea96b063..629fdb2fb6 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/Nested_pd_server_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/Nested_pd_server_1bServiceTemplate.yaml @@ -106,7 +106,7 @@ topology_template: - subinterface_nested_vlan_net1 - index_value requirements: - - binding_template_Vlan_vmi_1: + - binding_template_subint_Vlan_vmi_1: capability: tosca.capabilities.network.Bindable node: pd_server_1b_pd_server_1b_port relationship: tosca.relationships.network.BindsTo @@ -260,9 +260,6 @@ topology_template: disk.write.requests_pd_server_1b: - pd_server_1b - disk.write.requests - feature_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: - - pd_server_1b_pd_server_1b_port_nested_vlan - - feature_template_Vlan_vmi_1 disk.device.write.bytes.rate_pd_server_1b: - pd_server_1b - disk.device.write.bytes.rate @@ -293,6 +290,9 @@ topology_template: binding_pd_server_1b: - pd_server_1b - binding + feature_template_subint_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: + - pd_server_1b_pd_server_1b_port_nested_vlan + - feature_template_subint_Vlan_vmi_1 cpu_util_pd_server_1b: - pd_server_1b - cpu_util @@ -330,9 +330,6 @@ topology_template: - pd_server_1b - disk.write.requests.rate requirements: - link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: - - pd_server_1b_pd_server_1b_port_nested_vlan - - link_template_Vlan_vmi_1 dependency_pd_server_1b: - pd_server_1b - dependency @@ -345,9 +342,12 @@ topology_template: dependency_pd_server_1b_pd_server_1b_port_nested_vlan: - pd_server_1b_pd_server_1b_port_nested_vlan - dependency - dependency_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: + link_template_subint_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: - pd_server_1b_pd_server_1b_port_nested_vlan - - dependency_template_Vlan_vmi_1 + - link_template_subint_Vlan_vmi_1 dependency_pd_server_1b_pd_server_1b_port: - pd_server_1b_pd_server_1b_port - dependency + dependency_template_subint_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: + - pd_server_1b_pd_server_1b_port_nested_vlan + - dependency_template_subint_Vlan_vmi_1
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/Nested_ps_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/Nested_ps_server_1bServiceTemplate.yaml index 9b0f4d9573..3b19af8867 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/Nested_ps_server_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/Nested_ps_server_1bServiceTemplate.yaml @@ -121,7 +121,7 @@ topology_template: - subinterface_nested_vlan_net1 - index_value requirements: - - binding_template_Vlan_vmi_1: + - binding_template_subint_Vlan_vmi_1: capability: tosca.capabilities.network.Bindable node: ps_server_1b_ps_server_1b_port relationship: tosca.relationships.network.BindsTo @@ -251,6 +251,9 @@ topology_template: disk.root.size_ps_server_1b: - ps_server_1b - disk.root.size + feature_template_subint_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: + - ps_server_1b_ps_server_1b_port_nested_vlan + - feature_template_subint_Vlan_vmi_1 binding_ps_server_1b: - ps_server_1b - binding @@ -326,13 +329,7 @@ topology_template: binding_ps_server_1b_ps_server_1b_port: - ps_server_1b_ps_server_1b_port - binding - feature_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: - - ps_server_1b_ps_server_1b_port_nested_vlan - - feature_template_Vlan_vmi_1 requirements: - dependency_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: - - ps_server_1b_ps_server_1b_port_nested_vlan - - dependency_template_Vlan_vmi_1 local_storage_ps_server_1b: - ps_server_1b - local_storage @@ -345,9 +342,12 @@ topology_template: link_ps_server_1b_ps_server_1b_port: - ps_server_1b_ps_server_1b_port - link - link_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: + dependency_template_subint_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: - ps_server_1b_ps_server_1b_port_nested_vlan - - link_template_Vlan_vmi_1 + - dependency_template_subint_Vlan_vmi_1 dependency_ps_server_1b: - ps_server_1b - dependency + link_template_subint_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: + - ps_server_1b_ps_server_1b_port_nested_vlan + - link_template_subint_Vlan_vmi_1
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/nested_pattern5ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/nested_pattern5ServiceTemplate.yaml index 51fd65c2fb..de25a40e58 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/nested_pattern5ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/nested_pattern5ServiceTemplate.yaml @@ -145,7 +145,7 @@ topology_template: capability: tosca.capabilities.network.Linkable node: packet_internal_network relationship: tosca.relationships.network.LinksTo - - link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: + - link_template_subint_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: capability: tosca.capabilities.network.Linkable node: packet_external_network relationship: tosca.relationships.network.LinksTo @@ -276,6 +276,9 @@ topology_template: disk.latency_server_1b_ps_1_test_nested_level2: - test_nested_level2 - disk.latency_server_1b_ps_1 + feature_template_subint_Vlan_vmi_1_test_resourceGroup_1_test_nested_level2: + - test_nested_level2 + - feature_template_subint_Vlan_vmi_1_test_resourceGroup_1 disk.device.read.bytes.rate_server_1b_pd_0: - abstract_pd_server_1b - disk.device.read.bytes.rate_pd_server_1b @@ -375,9 +378,6 @@ topology_template: disk.iops_server_1b_pd_0: - abstract_pd_server_1b - disk.iops_pd_server_1b - feature_template_Vlan_vmi_1_test_resourceGroup_0: - - test_resourceGroup_0 - - feature_template_Vlan_vmi_1 end_point_packet_external_network: - packet_external_network - end_point @@ -408,12 +408,6 @@ topology_template: disk.device.iops_server_1b_ps_2_test_nested_level2: - test_nested_level2 - disk.device.iops_server_1b_ps_2 - feature_template_Vlan_vmi_1_test_resourceGroup_2_test_nested_level2: - - test_nested_level2 - - feature_template_Vlan_vmi_1_test_resourceGroup_2 - feature_template_Vlan_vmi_1_test_resourceGroup_1_test_nested_level2: - - test_nested_level2 - - feature_template_Vlan_vmi_1_test_resourceGroup_1 network.outgoing.bytes_pd_server_1b_port_0: - abstract_pd_server_1b - network.outgoing.bytes_pd_server_1b_pd_server_1b_port @@ -513,6 +507,9 @@ topology_template: network.incoming.packets.rate_ps_server_1b_port_1_test_nested_level2: - test_nested_level2 - network.incoming.packets.rate_ps_server_1b_port_1 + feature_template_subint_Vlan_vmi_1_test_resourceGroup_0: + - test_resourceGroup_0 + - feature_template_subint_Vlan_vmi_1 disk.device.read.requests_server_1b_ps_1_test_nested_level2: - test_nested_level2 - disk.device.read.requests_server_1b_ps_1 @@ -555,6 +552,9 @@ topology_template: network.incoming.bytes.rate_ps_server_1b_port_1_test_nested_level2: - test_nested_level2 - network.incoming.bytes.rate_ps_server_1b_port_1 + feature_template_subint_Vlan_vmi_1_test_resourceGroup_2_test_nested_level2: + - test_nested_level2 + - feature_template_subint_Vlan_vmi_1_test_resourceGroup_2 binding_ps_server_1b_port_1_test_nested_level2: - test_nested_level2 - binding_ps_server_1b_port_1 @@ -727,24 +727,24 @@ topology_template: dependency_server_1b_ps_1_test_nested_level2: - test_nested_level2 - dependency_server_1b_ps_1 + dependency_template_subint_Vlan_vmi_1_test_resourceGroup_1_test_nested_level2: + - test_nested_level2 + - dependency_template_subint_Vlan_vmi_1_test_resourceGroup_1 + dependency_template_subint_Vlan_vmi_1_test_resourceGroup_2_test_nested_level2: + - test_nested_level2 + - dependency_template_subint_Vlan_vmi_1_test_resourceGroup_2 dependency_ps_server_1b_port_1_test_nested_level2: - test_nested_level2 - dependency_ps_server_1b_port_1 dependency_pd_server_1b_port_0: - abstract_pd_server_1b - dependency_pd_server_1b_pd_server_1b_port - dependency_template_Vlan_vmi_1_test_resourceGroup_0: - - test_resourceGroup_0 - - dependency_template_Vlan_vmi_1 dependency_ps_server_1b_port_2_test_nested_level2: - test_nested_level2 - dependency_ps_server_1b_port_2 dependency_test_resourceGroup_2_test_nested_level2: - test_nested_level2 - dependency_test_resourceGroup_2 - dependency_template_Vlan_vmi_1_test_resourceGroup_2_test_nested_level2: - - test_nested_level2 - - dependency_template_Vlan_vmi_1_test_resourceGroup_2 dependency_test_resourceGroup_0: - test_resourceGroup_0 - dependency @@ -769,12 +769,12 @@ topology_template: dependency_server_1b_pd_0: - abstract_pd_server_1b - dependency_pd_server_1b - dependency_template_Vlan_vmi_1_test_resourceGroup_1_test_nested_level2: - - test_nested_level2 - - dependency_template_Vlan_vmi_1_test_resourceGroup_1 dependency_packet_ext_network_test_nested_level2: - test_nested_level2 - dependency_packet_ext_network + dependency_template_subint_Vlan_vmi_1_test_resourceGroup_0: + - test_resourceGroup_0 + - dependency_template_subint_Vlan_vmi_1 dependency_test_nested_level2: - test_nested_level2 - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml index 5d7b81aaa3..616e93e46d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml @@ -128,7 +128,7 @@ topology_template: capability: tosca.capabilities.network.Linkable node: packet_int_network relationship: tosca.relationships.network.LinksTo - - link_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: + - link_template_subint_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: capability: tosca.capabilities.network.Linkable node: packet_ext_network relationship: tosca.relationships.network.LinksTo @@ -197,7 +197,7 @@ topology_template: capability: tosca.capabilities.network.Linkable node: packet_int_network relationship: tosca.relationships.network.LinksTo - - link_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: + - link_template_subint_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: capability: tosca.capabilities.network.Linkable node: packet_ext_network relationship: tosca.relationships.network.LinksTo @@ -356,12 +356,6 @@ topology_template: instance_server_1b_ps_2: - abstract_ps_server_1b_1 - instance_ps_server_1b - feature_template_Vlan_vmi_1_test_resourceGroup_1: - - test_resourceGroup_1 - - feature_template_Vlan_vmi_1 - feature_template_Vlan_vmi_1_test_resourceGroup_2: - - test_resourceGroup_2 - - feature_template_Vlan_vmi_1 disk.device.capacity_server_1b_ps_1: - abstract_ps_server_1b_0 - disk.device.capacity_ps_server_1b @@ -464,6 +458,12 @@ topology_template: vcpus_server_1b_ps_2: - abstract_ps_server_1b_1 - vcpus_ps_server_1b + feature_template_subint_Vlan_vmi_1_test_resourceGroup_2: + - test_resourceGroup_2 + - feature_template_subint_Vlan_vmi_1 + feature_template_subint_Vlan_vmi_1_test_resourceGroup_1: + - test_resourceGroup_1 + - feature_template_subint_Vlan_vmi_1 disk.read.bytes.rate_server_1b_ps_2: - abstract_ps_server_1b_1 - disk.read.bytes.rate_ps_server_1b @@ -603,18 +603,18 @@ topology_template: dependency_packet_ext_network: - packet_ext_network - dependency - dependency_template_Vlan_vmi_1_test_resourceGroup_2: - - test_resourceGroup_2 - - dependency_template_Vlan_vmi_1 - dependency_template_Vlan_vmi_1_test_resourceGroup_1: - - test_resourceGroup_1 - - dependency_template_Vlan_vmi_1 local_storage_server_1b_ps_2: - abstract_ps_server_1b_1 - local_storage_ps_server_1b dependency_server_1b_ps_1: - abstract_ps_server_1b_0 - dependency_ps_server_1b + dependency_template_subint_Vlan_vmi_1_test_resourceGroup_2: + - test_resourceGroup_2 + - dependency_template_subint_Vlan_vmi_1 dependency_server_1b_ps_2: - abstract_ps_server_1b_1 - - dependency_ps_server_1b
\ No newline at end of file + - dependency_ps_server_1b + dependency_template_subint_Vlan_vmi_1_test_resourceGroup_1: + - test_resourceGroup_1 + - dependency_template_subint_Vlan_vmi_1
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/nested_vlanServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/nested_vlanServiceTemplate.yaml index ed59356950..bbb740fc75 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/nested_vlanServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/nested_vlanServiceTemplate.yaml @@ -46,7 +46,7 @@ topology_template: immutable: false type: float node_templates: - template_Vlan_vmi_1: + template_subint_Vlan_vmi_1: type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface properties: virtual_machine_interface_refs: @@ -92,20 +92,20 @@ topology_template: heat_file: ../Artifacts/nested_vlan.yml description: cmaui server template for vMMSC members: - - template_Vlan_vmi_1 + - template_subint_Vlan_vmi_1 substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested_vlan capabilities: - feature_template_Vlan_vmi_1: - - template_Vlan_vmi_1 + feature_template_subint_Vlan_vmi_1: + - template_subint_Vlan_vmi_1 - feature requirements: - link_template_Vlan_vmi_1: - - template_Vlan_vmi_1 - - link - dependency_template_Vlan_vmi_1: - - template_Vlan_vmi_1 - - dependency - binding_template_Vlan_vmi_1: - - template_Vlan_vmi_1 + binding_template_subint_Vlan_vmi_1: + - template_subint_Vlan_vmi_1 - binding + dependency_template_subint_Vlan_vmi_1: + - template_subint_Vlan_vmi_1 + - dependency + link_template_subint_Vlan_vmi_1: + - template_subint_Vlan_vmi_1 + - link
\ No newline at end of file |