diff options
author | 2018-04-03 20:24:59 +0530 | |
---|---|---|
committer | 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/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out | |
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/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out')
6 files changed, 76 insertions, 34 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/complexVFCMultiLevelNestedMultiComputeScenario/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/complexVFCMultiLevelNestedMultiComputeScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml index 8d11461838..d7ea458bf6 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/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/complexVFCMultiLevelNestedMultiComputeScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -938,6 +938,7 @@ 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 @@ -969,6 +970,7 @@ 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 @@ -1081,6 +1083,7 @@ 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 @@ -1285,6 +1288,12 @@ node_types: type: string required: true status: SUPPORTED + port_pd_server_1b_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pd_server_1b_port_vlan_requirements: type: list required: true @@ -1376,7 +1385,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: + - subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -1484,6 +1493,7 @@ 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 @@ -1882,6 +1892,7 @@ 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 @@ -1931,6 +1942,7 @@ 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 @@ -2581,6 +2593,12 @@ node_types: status: SUPPORTED entry_schema: type: float + port_ps_server_1b_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_ps_server_1b_port_network_role_tag: type: string required: true @@ -2694,7 +2712,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: + - subinterface_link_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -3028,6 +3046,7 @@ 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 @@ -3084,7 +3103,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_vmi_1: + - subinterface_link_template_Vlan_vmi_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -3102,4 +3121,4 @@ node_types: type: tosca.capabilities.Node occurrences: - 1 - - UNBOUNDED
\ No newline at end of file + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/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/complexVFCMultiLevelNestedMultiComputeScenario/out/Nested_pd_server_1bServiceTemplate.yaml index 057aac895e..e37886cc8b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/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/complexVFCMultiLevelNestedMultiComputeScenario/out/Nested_pd_server_1bServiceTemplate.yaml @@ -31,6 +31,11 @@ topology_template: vm_flavor_name: type: string required: true + port_pd_server_1b_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pd_server_1b_port_vlan_requirements: type: list required: true @@ -136,30 +141,34 @@ topology_template: pd_server_1b_pd_server_1b_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: port_pd_server_1b_port_exCP_naming replacement_policy: get_input: - port_pd_server_1b_port_replacement_policy - index_value + mac_requirements: + get_input: port_pd_server_1b_port_mac_requirements + order: + get_input: port_pd_server_1b_port_order + exCP_naming: + get_input: port_pd_server_1b_port_exCP_naming vlan_requirements: get_input: port_pd_server_1b_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pd_server_1b_port_subinterface_indicator + - index_value ip_requirements: get_input: port_pd_server_1b_port_ip_requirements network_role_tag: get_input: port_pd_server_1b_port_network_role_tag - mac_requirements: - get_input: port_pd_server_1b_port_mac_requirements - order: - get_input: port_pd_server_1b_port_order network_role: get_input: port_pd_server_1b_port_network_role - subnetpoolid: - get_input: port_pd_server_1b_port_subnetpoolid fixed_ips: get_input: - port_pd_server_1b_port_fixed_ips - index_value + subnetpoolid: + get_input: port_pd_server_1b_port_subnetpoolid network: get_input: - port_pd_server_1b_port_network @@ -338,9 +347,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 @@ -356,6 +362,9 @@ topology_template: dependency_template_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 + subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: + - pd_server_1b_pd_server_1b_port_nested_vlan + - subinterface_link_template_Vlan_vmi_1 dependency_pd_server_1b_pd_server_1b_port: - pd_server_1b_pd_server_1b_port - - dependency
\ No newline at end of file + - 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/complexVFCMultiLevelNestedMultiComputeScenario/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/complexVFCMultiLevelNestedMultiComputeScenario/out/Nested_ps_server_1bServiceTemplate.yaml index 855e842bf5..f518d262b3 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/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/complexVFCMultiLevelNestedMultiComputeScenario/out/Nested_ps_server_1bServiceTemplate.yaml @@ -24,6 +24,11 @@ topology_template: required: true entry_schema: type: float + port_ps_server_1b_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_ps_server_1b_port_network_role_tag: type: string required: true @@ -136,30 +141,34 @@ topology_template: ps_server_1b_ps_server_1b_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: port_ps_server_1b_port_exCP_naming replacement_policy: get_input: - port_ps_server_1b_port_replacement_policy - index_value + mac_requirements: + get_input: port_ps_server_1b_port_mac_requirements + order: + get_input: port_ps_server_1b_port_order + exCP_naming: + get_input: port_ps_server_1b_port_exCP_naming vlan_requirements: get_input: port_ps_server_1b_port_vlan_requirements + subinterface_indicator: + get_input: + - port_ps_server_1b_port_subinterface_indicator + - index_value ip_requirements: get_input: port_ps_server_1b_port_ip_requirements network_role_tag: get_input: port_ps_server_1b_port_network_role_tag - mac_requirements: - get_input: port_ps_server_1b_port_mac_requirements - order: - get_input: port_ps_server_1b_port_order network_role: get_input: port_ps_server_1b_port_network_role - subnetpoolid: - get_input: port_ps_server_1b_port_subnetpoolid fixed_ips: get_input: - port_ps_server_1b_port_fixed_ips - index_value + subnetpoolid: + get_input: port_ps_server_1b_port_subnetpoolid network: get_input: - port_ps_server_1b_port_network @@ -341,6 +350,9 @@ topology_template: 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 + subinterface_link_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: + - ps_server_1b_ps_server_1b_port_nested_vlan + - subinterface_link_template_Vlan_vmi_1 local_storage_ps_server_1b: - ps_server_1b - local_storage @@ -353,9 +365,6 @@ 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: - - ps_server_1b_ps_server_1b_port_nested_vlan - - link_template_Vlan_vmi_1 dependency_ps_server_1b: - ps_server_1b - - dependency
\ No newline at end of file + - 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/complexVFCMultiLevelNestedMultiComputeScenario/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/complexVFCMultiLevelNestedMultiComputeScenario/out/nested_pattern5ServiceTemplate.yaml index 9b9b379f8d..cac0be9063 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/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/complexVFCMultiLevelNestedMultiComputeScenario/out/nested_pattern5ServiceTemplate.yaml @@ -97,6 +97,8 @@ topology_template: - 9 vm_flavor_name: get_input: pd_server_1b_flavor + port_pd_server_1b_port_subinterface_indicator: + - true subinterface_nested_vlan_net1: - packet_external_network vm_image_name: @@ -141,7 +143,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: + - subinterface_link_template_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 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/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/complexVFCMultiLevelNestedMultiComputeScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml index d02dbd04aa..3d8089b03b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/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/complexVFCMultiLevelNestedMultiComputeScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml @@ -88,6 +88,9 @@ topology_template: subinterface_nested_vlan_service_template_filter_count: - 9 - 9 + port_ps_server_1b_port_subinterface_indicator: + - true + - true port_ps_server_1b_port_fixed_ips: - - ip_address: get_input: @@ -157,7 +160,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: + - subinterface_link_template_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 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/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/complexVFCMultiLevelNestedMultiComputeScenario/out/nested_vlanServiceTemplate.yaml index ed59356950..9a7f270928 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/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/complexVFCMultiLevelNestedMultiComputeScenario/out/nested_vlanServiceTemplate.yaml @@ -47,7 +47,7 @@ topology_template: type: float node_templates: template_Vlan_vmi_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: - get_input: parent_interface @@ -100,12 +100,12 @@ topology_template: - template_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 + subinterface_link_template_Vlan_vmi_1: + - template_Vlan_vmi_1 + - subinterface_link binding_template_Vlan_vmi_1: - template_Vlan_vmi_1 - binding |