From adca5281550b50d93c7f4259c2f84e21d5681c07 Mon Sep 17 00:00:00 2001 From: siddharth0905 Date: Tue, 27 Mar 2018 19:56:54 +0530 Subject: Code change to evaluate Network role Code change to evaluate Network Role of Sub interface resource Change-Id: I0e29c0a1512b76b6db569aaf534f5e59868ae715 Issue-ID: SDC-1072 Signed-off-by: siddharth0905 --- .../GlobalSubstitutionTypesServiceTemplate.yaml | 98 +++++++++++----------- 1 file changed, 49 insertions(+), 49 deletions(-) (limited to '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') 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 -- cgit 1.2.3-korg