diff options
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation')
5 files changed, 127 insertions, 55 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml index b75037b55b..0f03728659 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -56,6 +56,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_pd01_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -297,6 +303,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 @@ -476,6 +483,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_pd01_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -717,6 +730,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 @@ -856,18 +870,6 @@ node_types: type: string required: true status: SUPPORTED - port_pd01_port_3_order: - type: integer - required: true - status: SUPPORTED - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - status: SUPPORTED - constraints: - - greater_or_equal: 0 port_pd01_port_2_vlan_requirements: type: list required: true @@ -900,10 +902,6 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_3_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED port_pd01_port_3_network: type: list required: true @@ -926,30 +924,22 @@ node_types: type: string required: true status: SUPPORTED - port_pd01_port_2_network: + port_pd01_port_2_subinterface_indicator: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd01_port_3_vlan_requirements: + type: boolean + port_pd01_port_2_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: string port_pd01_port_2_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_pd01_port_2_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_pd01_port_3_network_role_tag: - type: string - required: true - status: SUPPORTED compute_pd_server_user_data_format: type: list required: true @@ -962,6 +952,42 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_3_order: + type: integer + required: true + status: SUPPORTED + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + status: SUPPORTED + constraints: + - greater_or_equal: 0 + port_pd01_port_3_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_pd01_port_3_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean + port_pd01_port_3_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_2_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_pd01_port_3_network_role_tag: + type: string + required: true + status: SUPPORTED port_pd01_port_3_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -1028,6 +1054,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 @@ -1040,6 +1067,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 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/MainServiceTemplate.yaml index 6fe4e09880..743ce1e834 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/MainServiceTemplate.yaml @@ -355,6 +355,8 @@ topology_template: is_required: false port_pd01_port_network: - get_input: oam_net_name + port_pd01_port_subinterface_indicator: + - true port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW @@ -393,19 +395,17 @@ topology_template: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_3_mac_requirements: - mac_count_required: - is_required: false port_pd01_port_3_network: - get_input: oam_net_name vm_image_name: get_input: pd_image_name + port_pd01_port_2_subinterface_indicator: + - true port_pd01_port_2_network: - get_input: oam_net_name port_pd01_port_2_mac_requirements: mac_count_required: is_required: false - port_pd01_port_3_network_role_tag: oam compute_pd_server_user_data_format: - RAW port_pd01_port_2_ip_requirements: @@ -419,6 +419,12 @@ topology_template: is_required: false floating_ip_count_required: is_required: false + port_pd01_port_3_mac_requirements: + mac_count_required: + is_required: false + port_pd01_port_3_subinterface_indicator: + - true + port_pd01_port_3_network_role_tag: oam service_template_filter: substitute_service_template: Nested_pd_server_2ServiceTemplate.yaml count: 1 @@ -467,6 +473,8 @@ topology_template: - get_attribute: - network_policy_server - name + port_pd01_port_subinterface_indicator: + - true compute_pd_server_user_data_format: - RAW service_template_filter: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_serverServiceTemplate.yaml index 3d9ebd74ae..54070a9852 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_serverServiceTemplate.yaml @@ -50,6 +50,11 @@ topology_template: required: true entry_schema: type: string + port_pd01_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -99,6 +104,10 @@ topology_template: get_input: port_pd01_port_exCP_naming vlan_requirements: get_input: port_pd01_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pd01_port_subinterface_indicator + - index_value ip_requirements: get_input: port_pd01_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_1ServiceTemplate.yaml index 7dcab1874c..c5324d5469 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_1ServiceTemplate.yaml @@ -50,6 +50,11 @@ topology_template: required: true entry_schema: type: string + port_pd01_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -99,6 +104,10 @@ topology_template: get_input: port_pd01_port_exCP_naming vlan_requirements: get_input: port_pd01_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pd01_port_subinterface_indicator + - index_value ip_requirements: get_input: port_pd01_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_2ServiceTemplate.yaml index 9e80f46126..84b2aec4a7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_2ServiceTemplate.yaml @@ -17,16 +17,6 @@ topology_template: port_pd01_port_3_network_role: type: string required: true - port_pd01_port_3_order: - type: integer - required: true - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - constraints: - - greater_or_equal: 0 port_pd01_port_2_vlan_requirements: type: list required: true @@ -53,9 +43,6 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_3_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true port_pd01_port_3_network: type: list required: true @@ -73,25 +60,19 @@ topology_template: port_pd01_port_3_subnetpoolid: type: string required: true - port_pd01_port_2_network: + port_pd01_port_2_subinterface_indicator: type: list required: true entry_schema: - type: string - port_pd01_port_3_vlan_requirements: + type: boolean + port_pd01_port_2_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: string port_pd01_port_2_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true - port_pd01_port_2_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_pd01_port_3_network_role_tag: - type: string - required: true compute_pd_server_user_data_format: type: list required: true @@ -102,6 +83,35 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_3_order: + type: integer + required: true + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + constraints: + - greater_or_equal: 0 + port_pd01_port_3_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_pd01_port_3_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean + port_pd01_port_3_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_2_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_pd01_port_3_network_role_tag: + type: string + required: true port_pd01_port_3_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -132,6 +142,10 @@ topology_template: get_input: port_pd01_port_2_exCP_naming vlan_requirements: get_input: port_pd01_port_2_vlan_requirements + subinterface_indicator: + get_input: + - port_pd01_port_2_subinterface_indicator + - index_value ip_requirements: get_input: port_pd01_port_2_ip_requirements network_role_tag: @@ -160,6 +174,10 @@ topology_template: get_input: port_pd01_port_3_exCP_naming vlan_requirements: get_input: port_pd01_port_3_vlan_requirements + subinterface_indicator: + get_input: + - port_pd01_port_3_subinterface_indicator + - index_value ip_requirements: get_input: port_pd01_port_3_ip_requirements network_role_tag: |