diff options
author | siddharth0905 <siddharth.singh4@amdocs.com> | 2018-04-12 19:29:57 +0530 |
---|---|---|
committer | Oren Kleks <orenkle@amdocs.com> | 2018-04-12 14:51:57 +0000 |
commit | d60b2a40c15c5952f8a31e2d2aa4be2cf4837fc8 (patch) | |
tree | d17143ff8d9708103d98b487700efa1bc356f850 /openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution | |
parent | 8da1beb7fb630954a0c7adfc7ae6fbb175877b49 (diff) |
Subinterface_indicator property issue
It should only be present under port implementation
Change-Id: I8b52905c5e5c888cf384bebf1d23168c7906b004
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/singleSubstitution')
83 files changed, 1119 insertions, 1949 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/GlobalSubstitutionTypesServiceTemplate.yaml index 5df6256ee1..615de8dc2e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,6 +8,14 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + 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 compute_pd_server_availability_zone: type: list required: true @@ -20,92 +28,60 @@ node_types: status: SUPPORTED entry_schema: type: string - vm_flavor_name: - type: string + port_pd02_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_pd02_port_network_role_tag: - type: string + port_pd01_port_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_pd02_port_subinterface_indicator: - type: list + vm_flavor_name: + type: string required: true status: SUPPORTED - entry_schema: - type: boolean - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pd02_port_order: + type: integer required: true status: SUPPORTED - vm_image_name: + port_pd02_port_subnetpoolid: type: string required: true status: SUPPORTED - port_pd01_port_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd02_port_network_role: + port_pd02_port_network_role_tag: type: string required: true status: SUPPORTED - port_pd01_port_subinterface_indicator: - type: list + port_pd01_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: boolean - port_pd01_port_vlan_requirements: + port_pd02_port_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - compute_pd_server_user_data_format: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - 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_pd02_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_pd02_port_order: - type: integer - required: true - status: SUPPORTED - port_pd02_port_subnetpoolid: + vm_image_name: type: string required: true status: SUPPORTED - port_pd02_port_vlan_requirements: + port_pd01_port_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_network: type: list required: true status: SUPPORTED entry_schema: type: string + port_pd02_port_network_role: + type: string + required: true + status: SUPPORTED port_pd01_port_order: type: integer required: true @@ -132,12 +108,24 @@ node_types: type: string required: true status: SUPPORTED + port_pd01_port_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements port_pd02_port_network: type: list required: true status: SUPPORTED entry_schema: type: string + compute_pd_server_user_data_format: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string requirements: - dependency_pd_server: capability: tosca.capabilities.Node diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/MainServiceTemplate.yaml index bc0b6e2f3d..a6d5ed65ce 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/MainServiceTemplate.yaml @@ -838,11 +838,12 @@ topology_template: - get_input: - pd_server_names - 0 + port_pd02_port_mac_requirements: + mac_count_required: + is_required: false vm_flavor_name: get_input: pd_flavor_name port_pd02_port_network_role_tag: oam - port_pd02_port_subinterface_indicator: - - false port_pd01_port_mac_requirements: mac_count_required: is_required: false @@ -854,13 +855,6 @@ topology_template: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_subinterface_indicator: - - false - compute_pd_server_user_data_format: - - RAW - port_pd02_port_mac_requirements: - mac_count_required: - is_required: false port_pd01_port_network: - get_input: oam_net_name port_pd02_port_ip_requirements: @@ -872,6 +866,8 @@ topology_template: port_pd01_port_network_role_tag: oam port_pd02_port_network: - get_input: oam_net_name + compute_pd_server_user_data_format: + - RAW service_template_filter: substitute_service_template: Nested_pd_serverServiceTemplate.yaml count: 1 @@ -887,4 +883,4 @@ topology_template: heat_file: ../Artifacts/hot-mog-0108-bs1271.yml description: heat template that creates MOG stack members: - - abstract_pd_server
\ No newline at end of file + - abstract_pd_server diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/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/computeWithDiffPortType/out/Nested_pd_serverServiceTemplate.yaml index f84903c708..3c0aeaee28 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/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/computeWithDiffPortType/out/Nested_pd_serverServiceTemplate.yaml @@ -11,6 +11,13 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + constraints: + - greater_or_equal: 0 compute_pd_server_availability_zone: type: list required: true @@ -21,75 +28,48 @@ topology_template: required: true entry_schema: type: string - vm_flavor_name: - type: string + port_pd02_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_pd02_port_network_role_tag: - type: string + port_pd01_port_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - port_pd02_port_subinterface_indicator: - type: list + vm_flavor_name: + type: string required: true - entry_schema: - type: boolean - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pd02_port_order: + type: integer required: true - vm_image_name: + port_pd02_port_subnetpoolid: type: string required: true - port_pd01_port_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd02_port_network_role: + port_pd02_port_network_role_tag: type: string required: true - port_pd01_port_subinterface_indicator: - type: list + port_pd01_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: boolean - port_pd01_port_vlan_requirements: + port_pd02_port_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - compute_pd_server_user_data_format: - type: list - required: true - entry_schema: - type: string - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - constraints: - - greater_or_equal: 0 - port_pd02_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_pd02_port_order: - type: integer - required: true - port_pd02_port_subnetpoolid: + vm_image_name: type: string required: true - port_pd02_port_vlan_requirements: + port_pd01_port_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_network: type: list required: true entry_schema: type: string + port_pd02_port_network_role: + type: string + required: true port_pd01_port_order: type: integer required: true @@ -110,11 +90,21 @@ topology_template: port_pd01_port_network_role_tag: type: string required: true + port_pd01_port_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements port_pd02_port_network: type: list required: true entry_schema: type: string + compute_pd_server_user_data_format: + type: list + required: true + entry_schema: + type: string node_templates: pd_server: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server @@ -142,10 +132,7 @@ 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 + subinterface_indicator: false ip_requirements: get_input: port_pd01_port_ip_requirements network_role_tag: @@ -174,10 +161,7 @@ topology_template: get_input: port_pd02_port_exCP_naming vlan_requirements: get_input: port_pd02_port_vlan_requirements - subinterface_indicator: - get_input: - - port_pd02_port_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_pd02_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/computeWithDiffPortTypeAndServerGroup/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/GlobalSubstitutionTypesServiceTemplate.yaml index f185be579f..43c0f0badf 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -72,12 +72,6 @@ node_types: type: string required: true status: SUPPORTED - port_port1_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean port_port1_exCP_naming: type: org.openecomp.datatypes.Naming required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/MainServiceTemplate.yaml index 4096acade3..b6df4b4bc3 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/MainServiceTemplate.yaml @@ -125,8 +125,6 @@ topology_template: - RAW vm_image_name: get_input: image_smp_name - port_port1_subinterface_indicator: - - false port_port1_ip_requirements: - ip_version: 4 ip_count_required: @@ -187,4 +185,4 @@ topology_template: name: def affinity: host targets: - - BE_Affinity_group
\ No newline at end of file + - BE_Affinity_group diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/Nested_smpServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/Nested_smpServiceTemplate.yaml index 00a60624cd..2aa43774c9 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/Nested_smpServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/Nested_smpServiceTemplate.yaml @@ -63,11 +63,6 @@ topology_template: vm_image_name: type: string required: true - port_port1_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean port_port1_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -104,10 +99,7 @@ topology_template: - index_value vlan_requirements: get_input: port_port1_vlan_requirements - subinterface_indicator: - get_input: - - port_port1_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_port1_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/computeWithDiffPortTypeNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml index f3f62dafc0..c4d4e6bc15 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -40,12 +40,6 @@ node_types: type: string required: true status: SUPPORTED - port_pd02_port_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean port_pd01_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -70,12 +64,6 @@ node_types: type: string required: true status: SUPPORTED - port_pd01_port_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean port_pd01_port_vlan_requirements: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/MainServiceTemplate.yaml index deee13fe85..424fcd66ab 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/MainServiceTemplate.yaml @@ -165,8 +165,6 @@ topology_template: port_pd01_port_security_groups: - - jsa_security_group port_pd02_port_network_role_tag: oam - port_pd02_port_subinterface_indicator: - - false port_pd01_port_mac_requirements: mac_count_required: is_required: false @@ -180,8 +178,6 @@ topology_template: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_subinterface_indicator: - - false compute_pd_server_user_data_format: - RAW port_pd02_port_mac_requirements: @@ -217,4 +213,4 @@ topology_template: members: - resources_with_dependOn - jsa_security_group - - abstract_pd_server
\ No newline at end of file + - abstract_pd_server diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/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/computeWithDiffPortTypeNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml index e604ae2ae5..14e970880c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/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/computeWithDiffPortTypeNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml @@ -37,11 +37,6 @@ topology_template: port_pd02_port_network_role_tag: type: string required: true - port_pd02_port_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean port_pd01_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -61,11 +56,6 @@ topology_template: port_pd02_port_network_role: type: string required: true - port_pd01_port_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean port_pd01_port_vlan_requirements: type: list required: true @@ -174,10 +164,7 @@ 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 + subinterface_indicator: false ip_requirements: get_input: port_pd01_port_ip_requirements network_role_tag: @@ -214,10 +201,7 @@ topology_template: get_input: port_pd02_port_exCP_naming vlan_requirements: get_input: port_pd02_port_vlan_requirements - subinterface_indicator: - get_input: - - port_pd02_port_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_pd02_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/computeWithDiffPortTypeNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml index ad1fe5af08..7c030269e5 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -34,12 +34,6 @@ node_types: type: string required: true status: SUPPORTED - port_pd02_port_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean port_pd01_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -64,12 +58,6 @@ node_types: type: string required: true status: SUPPORTED - port_pd01_port_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean port_pd01_port_vlan_requirements: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/MainServiceTemplate.yaml index 875168c704..0ad20baa65 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/MainServiceTemplate.yaml @@ -174,8 +174,6 @@ topology_template: - AUTO vm_flavor_name: get_input: pd_flavor_name - port_pd02_port_subinterface_indicator: - - false port_pd01_port_mac_requirements: mac_count_required: is_required: false @@ -189,8 +187,6 @@ topology_template: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_subinterface_indicator: - - false compute_pd_server_user_data_format: - RAW port_pd02_port_mac_requirements: @@ -246,4 +242,4 @@ topology_template: members: - packet_mirror_network - pd01_volume - - abstract_pd_server
\ No newline at end of file + - abstract_pd_server diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/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/computeWithDiffPortTypeNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml index 5cf54bac84..e5183bdf1c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/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/computeWithDiffPortTypeNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml @@ -32,11 +32,6 @@ topology_template: port_pd02_port_network_role_tag: type: string required: true - port_pd02_port_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean port_pd01_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -56,11 +51,6 @@ topology_template: port_pd02_port_network_role: type: string required: true - port_pd01_port_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean port_pd01_port_vlan_requirements: type: list required: true @@ -156,10 +146,7 @@ topology_template: - index_value vlan_requirements: get_input: port_pd01_port_vlan_requirements - subinterface_indicator: - get_input: - - port_pd01_port_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_pd01_port_ip_requirements network_role_tag: @@ -192,10 +179,7 @@ topology_template: - index_value vlan_requirements: get_input: port_pd02_port_vlan_requirements - subinterface_indicator: - get_input: - - port_pd02_port_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_pd02_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/computeWithSamePortTypeNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml index e31c7e32bc..7ff82db5b6 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -46,12 +46,6 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_0_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean port_pd01_port_0_replacement_policy: type: list required: true @@ -116,12 +110,6 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_pd01_port_1_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean port_pd01_port_1_order: type: integer required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/MainServiceTemplate.yaml index 64c5fd5936..3529fedc3a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/MainServiceTemplate.yaml @@ -171,8 +171,6 @@ topology_template: - get_input: - pd_server_names - 0 - port_pd01_port_0_subinterface_indicator: - - false port_pd01_port_0_replacement_policy: - AUTO vm_flavor_name: @@ -191,8 +189,6 @@ topology_template: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_1_subinterface_indicator: - - false port_pd01_port_1_mac_requirements: mac_count_required: is_required: false @@ -217,4 +213,4 @@ topology_template: members: - resources_with_dependOn - jsa_security_group - - abstract_pd_server
\ No newline at end of file + - abstract_pd_server diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/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/computeWithSamePortTypeNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml index b949593d7d..8460f43650 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/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/computeWithSamePortTypeNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml @@ -42,11 +42,6 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_0_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean port_pd01_port_0_replacement_policy: type: list required: true @@ -98,11 +93,6 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_pd01_port_1_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean port_pd01_port_1_order: type: integer required: true @@ -174,10 +164,7 @@ topology_template: get_input: port_pd01_port_1_exCP_naming vlan_requirements: get_input: port_pd01_port_1_vlan_requirements - subinterface_indicator: - get_input: - - port_pd01_port_1_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_pd01_port_1_ip_requirements network_role_tag: @@ -214,10 +201,7 @@ topology_template: get_input: port_pd01_port_0_exCP_naming vlan_requirements: get_input: port_pd01_port_0_vlan_requirements - subinterface_indicator: - get_input: - - port_pd01_port_0_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_pd01_port_0_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/computeWithSamePortTypeNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml index 55cbc86f16..4af5b2df1f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -40,12 +40,6 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_0_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean port_pd01_port_0_replacement_policy: type: list required: true @@ -110,12 +104,6 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_pd01_port_1_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean port_pd01_port_1_order: type: integer required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/MainServiceTemplate.yaml index 420e802a28..3f3e490da9 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/MainServiceTemplate.yaml @@ -200,8 +200,6 @@ topology_template: - get_input: - pd_server_names - 0 - port_pd01_port_0_subinterface_indicator: - - false port_pd01_port_0_replacement_policy: - AUTO vm_flavor_name: @@ -218,8 +216,6 @@ topology_template: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_1_subinterface_indicator: - - false port_pd01_port_1_mac_requirements: mac_count_required: is_required: false @@ -266,4 +262,4 @@ topology_template: - packet_mirror_network - pd01_volume - packet_internal_network - - abstract_pd_server
\ No newline at end of file + - abstract_pd_server diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/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/computeWithSamePortTypeNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml index a45b794a03..f8630d572f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/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/computeWithSamePortTypeNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml @@ -37,11 +37,6 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_0_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean port_pd01_port_0_replacement_policy: type: list required: true @@ -93,11 +88,6 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_pd01_port_1_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean port_pd01_port_1_order: type: integer required: true @@ -156,10 +146,7 @@ topology_template: - index_value vlan_requirements: get_input: port_pd01_port_1_vlan_requirements - subinterface_indicator: - get_input: - - port_pd01_port_1_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_pd01_port_1_ip_requirements network_role_tag: @@ -192,10 +179,7 @@ topology_template: - index_value vlan_requirements: get_input: port_pd01_port_0_vlan_requirements - subinterface_indicator: - get_input: - - port_pd01_port_0_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_pd01_port_0_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/computewithtwodiffporttypesandnested/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/GlobalSubstitutionTypesServiceTemplate.yaml index 76ab87a8b8..d4f3cb8ffb 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,6 +8,14 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + 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 compute_pd_server_availability_zone: type: list required: true @@ -20,92 +28,60 @@ node_types: status: SUPPORTED entry_schema: type: string - vm_flavor_name: - type: string + port_pd02_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_pd02_port_network_role_tag: - type: string + port_pd01_port_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_pd02_port_subinterface_indicator: - type: list + vm_flavor_name: + type: string required: true status: SUPPORTED - entry_schema: - type: boolean - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pd02_port_order: + type: integer required: true status: SUPPORTED - vm_image_name: + port_pd02_port_subnetpoolid: type: string required: true status: SUPPORTED - port_pd01_port_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd02_port_network_role: + port_pd02_port_network_role_tag: type: string required: true status: SUPPORTED - port_pd01_port_subinterface_indicator: - type: list + port_pd01_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: boolean - port_pd01_port_vlan_requirements: + port_pd02_port_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - compute_pd_server_user_data_format: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - 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_pd02_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_pd02_port_order: - type: integer - required: true - status: SUPPORTED - port_pd02_port_subnetpoolid: + vm_image_name: type: string required: true status: SUPPORTED - port_pd02_port_vlan_requirements: + port_pd01_port_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_network: type: list required: true status: SUPPORTED entry_schema: type: string + port_pd02_port_network_role: + type: string + required: true + status: SUPPORTED port_pd01_port_order: type: integer required: true @@ -132,12 +108,24 @@ node_types: type: string required: true status: SUPPORTED + port_pd01_port_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements port_pd02_port_network: type: list required: true status: SUPPORTED entry_schema: type: string + compute_pd_server_user_data_format: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string requirements: - dependency_pd_server: capability: tosca.capabilities.Node diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/MainServiceTemplate.yaml index c2477214e5..e7fa960d3b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/MainServiceTemplate.yaml @@ -869,11 +869,12 @@ topology_template: - get_input: - pd_server_names - 0 + port_pd02_port_mac_requirements: + mac_count_required: + is_required: false vm_flavor_name: get_input: pd_flavor_name port_pd02_port_network_role_tag: oam - port_pd02_port_subinterface_indicator: - - false port_pd01_port_mac_requirements: mac_count_required: is_required: false @@ -885,13 +886,6 @@ topology_template: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_subinterface_indicator: - - false - compute_pd_server_user_data_format: - - RAW - port_pd02_port_mac_requirements: - mac_count_required: - is_required: false port_pd01_port_network: - get_input: oam_net_name port_pd02_port_ip_requirements: @@ -903,6 +897,8 @@ topology_template: port_pd01_port_network_role_tag: oam port_pd02_port_network: - get_input: oam_net_name + compute_pd_server_user_data_format: + - RAW service_template_filter: substitute_service_template: Nested_pd_serverServiceTemplate.yaml count: 1 @@ -919,4 +915,4 @@ topology_template: description: heat template that creates MOG stack members: - server_pcm_003 - - abstract_pd_server
\ No newline at end of file + - abstract_pd_server diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/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/computewithtwodiffporttypesandnested/out/Nested_pd_serverServiceTemplate.yaml index f84903c708..3c0aeaee28 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/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/computewithtwodiffporttypesandnested/out/Nested_pd_serverServiceTemplate.yaml @@ -11,6 +11,13 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + constraints: + - greater_or_equal: 0 compute_pd_server_availability_zone: type: list required: true @@ -21,75 +28,48 @@ topology_template: required: true entry_schema: type: string - vm_flavor_name: - type: string + port_pd02_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_pd02_port_network_role_tag: - type: string + port_pd01_port_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - port_pd02_port_subinterface_indicator: - type: list + vm_flavor_name: + type: string required: true - entry_schema: - type: boolean - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pd02_port_order: + type: integer required: true - vm_image_name: + port_pd02_port_subnetpoolid: type: string required: true - port_pd01_port_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd02_port_network_role: + port_pd02_port_network_role_tag: type: string required: true - port_pd01_port_subinterface_indicator: - type: list + port_pd01_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: boolean - port_pd01_port_vlan_requirements: + port_pd02_port_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - compute_pd_server_user_data_format: - type: list - required: true - entry_schema: - type: string - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - constraints: - - greater_or_equal: 0 - port_pd02_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_pd02_port_order: - type: integer - required: true - port_pd02_port_subnetpoolid: + vm_image_name: type: string required: true - port_pd02_port_vlan_requirements: + port_pd01_port_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_network: type: list required: true entry_schema: type: string + port_pd02_port_network_role: + type: string + required: true port_pd01_port_order: type: integer required: true @@ -110,11 +90,21 @@ topology_template: port_pd01_port_network_role_tag: type: string required: true + port_pd01_port_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements port_pd02_port_network: type: list required: true entry_schema: type: string + compute_pd_server_user_data_format: + type: list + required: true + entry_schema: + type: string node_templates: pd_server: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server @@ -142,10 +132,7 @@ 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 + subinterface_indicator: false ip_requirements: get_input: port_pd01_port_ip_requirements network_role_tag: @@ -174,10 +161,7 @@ topology_template: get_input: port_pd02_port_exCP_naming vlan_requirements: get_input: port_pd02_port_vlan_requirements - subinterface_indicator: - get_input: - - port_pd02_port_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_pd02_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/computewithtwodiffporttypesandnested/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/nested-pcm_v0.1ServiceTemplate.yaml index b31492fa74..02aa261eac 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/nested-pcm_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/nested-pcm_v0.1ServiceTemplate.yaml @@ -174,6 +174,7 @@ topology_template: get_input: port_pcm_port_1_subnetpoolid mac_requirements: get_input: port_pcm_port_1_mac_requirements + subinterface_indicator: false exCP_naming: get_input: port_pcm_port_1_exCP_naming vlan_requirements: @@ -218,6 +219,7 @@ topology_template: get_input: port_pcm_port_0_subnetpoolid mac_requirements: get_input: port_pcm_port_0_mac_requirements + subinterface_indicator: false exCP_naming: get_input: port_pcm_port_0_exCP_naming vlan_requirements: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/GlobalSubstitutionTypesServiceTemplate.yaml index ace7b0798e..3a97da1e81 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -24,10 +24,28 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role_tag: + type: string + required: true + status: SUPPORTED port_pd01_port_0_network_role: type: string required: true status: SUPPORTED + port_pd01_port_1_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + 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 compute_pd_server_availability_zone: type: list required: true @@ -40,16 +58,18 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_0_subinterface_indicator: - type: list + port_pd01_port_1_order: + type: integer required: true status: SUPPORTED - entry_schema: - type: boolean vm_flavor_name: type: string required: true status: SUPPORTED + port_pd01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED port_pd01_port_1_network_role: type: string required: true @@ -58,86 +78,54 @@ node_types: type: integer required: true status: SUPPORTED - port_pd01_port_1_subnetpoolid: - type: string + port_pd01_port_1_vlan_requirements: + type: list required: true status: SUPPORTED - vm_image_name: - type: string + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_pd01_port_1_network_role_tag: + port_pd01_port_1_subnetpoolid: type: string required: true status: SUPPORTED - port_pd01_port_0_subnetpoolid: + vm_image_name: type: string required: true status: SUPPORTED - port_pd01_port_1_network: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - compute_pd_server_user_data_format: - type: list + port_pd01_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: string - port_pd01_port_0_network_role_tag: + port_pd01_port_1_network_role_tag: type: string required: true status: SUPPORTED - port_pd01_port_1_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - 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_1_subinterface_indicator: + port_pd01_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: boolean - port_pd01_port_1_order: - type: integer - required: true - status: SUPPORTED - port_pd01_port_0_exCP_naming: - type: org.openecomp.datatypes.Naming + type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_0_subnetpoolid: + type: string required: true status: SUPPORTED - port_pd01_port_1_vlan_requirements: + port_pd01_port_1_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd01_port_1_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_pd01_port_1_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_pd01_port_0_vlan_requirements: + type: string + compute_pd_server_user_data_format: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: string requirements: - dependency_pd_server: capability: tosca.capabilities.Node diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/MainServiceTemplate.yaml index aec25e442c..cdc3fd47ee 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/MainServiceTemplate.yaml @@ -843,16 +843,24 @@ topology_template: is_required: false floating_ip_count_required: is_required: false + port_pd01_port_0_network_role_tag: oam + port_pd01_port_1_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: - get_input: - pd_server_names - 0 - port_pd01_port_0_subinterface_indicator: - - false vm_flavor_name: get_input: pd_flavor_name + port_pd01_port_1_mac_requirements: + mac_count_required: + is_required: false vm_image_name: get_input: pd_image_name port_pd01_port_1_network_role_tag: oam @@ -860,18 +868,6 @@ topology_template: - get_input: oam_net_name compute_pd_server_user_data_format: - RAW - port_pd01_port_0_network_role_tag: oam - port_pd01_port_1_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false - port_pd01_port_1_subinterface_indicator: - - false - port_pd01_port_1_mac_requirements: - mac_count_required: - is_required: false service_template_filter: substitute_service_template: Nested_pd_serverServiceTemplate.yaml count: 1 @@ -887,4 +883,4 @@ topology_template: heat_file: ../Artifacts/hot-mog-0108-bs1271.yml description: heat template that creates MOG stack members: - - abstract_pd_server
\ No newline at end of file + - abstract_pd_server diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/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/computewithtwosameporttypes/out/Nested_pd_serverServiceTemplate.yaml index 818ba138cb..0dd90f3eea 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/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/computewithtwosameporttypes/out/Nested_pd_serverServiceTemplate.yaml @@ -24,9 +24,24 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role_tag: + type: string + required: true port_pd01_port_0_network_role: type: string required: true + port_pd01_port_1_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + constraints: + - greater_or_equal: 0 compute_pd_server_availability_zone: type: list required: true @@ -37,29 +52,46 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_0_subinterface_indicator: - type: list + port_pd01_port_1_order: + type: integer required: true - entry_schema: - type: boolean vm_flavor_name: type: string required: true + port_pd01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true port_pd01_port_1_network_role: type: string required: true port_pd01_port_0_order: type: integer required: true + port_pd01_port_1_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true port_pd01_port_1_subnetpoolid: type: string required: true vm_image_name: type: string required: true + port_pd01_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true port_pd01_port_1_network_role_tag: type: string required: true + port_pd01_port_0_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements port_pd01_port_0_subnetpoolid: type: string required: true @@ -73,48 +105,6 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_0_network_role_tag: - type: string - required: true - port_pd01_port_1_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - 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_1_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean - port_pd01_port_1_order: - type: integer - required: true - port_pd01_port_0_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_pd01_port_1_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd01_port_1_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_pd01_port_1_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_pd01_port_0_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements node_templates: pd_server: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server @@ -142,10 +132,7 @@ topology_template: get_input: port_pd01_port_1_exCP_naming vlan_requirements: get_input: port_pd01_port_1_vlan_requirements - subinterface_indicator: - get_input: - - port_pd01_port_1_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_pd01_port_1_ip_requirements network_role_tag: @@ -174,10 +161,7 @@ topology_template: get_input: port_pd01_port_0_exCP_naming vlan_requirements: get_input: port_pd01_port_0_vlan_requirements - subinterface_indicator: - get_input: - - port_pd01_port_0_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_pd01_port_0_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/computewithtwosameporttypes2/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes2/out/GlobalSubstitutionTypesServiceTemplate.yaml index f95dac28ed..d689fd88ea 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes2/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes2/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -14,30 +14,42 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd_2_port_1_vlan_requirements: + port_pd_1_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - compute_pd_server_availability_zone: + port_pd_1_port_0_network_role: + type: string + 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_pd_2_port_1_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - compute_pd_server_name: + type: org.openecomp.datatypes.network.VlanRequirements + compute_pd_server_availability_zone: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd_2_port_1_subinterface_indicator: + compute_pd_server_name: type: list required: true status: SUPPORTED entry_schema: - type: boolean + type: string port_pd_2_port_1_network: type: list required: true @@ -48,6 +60,10 @@ node_types: type: string required: true status: SUPPORTED + port_pd_2_port_1_subnetpoolid: + type: string + required: true + status: SUPPORTED vm_flavor_name: type: string required: true @@ -56,12 +72,10 @@ node_types: type: integer required: true status: SUPPORTED - port_pd_1_port_0_subinterface_indicator: - type: list + port_pd_2_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: boolean vm_image_name: type: string required: true @@ -74,12 +88,28 @@ node_types: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED + port_pd_1_port_0_order: + type: integer + required: true + status: SUPPORTED + port_pd_1_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED port_pd_1_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements + port_pd_1_port_0_network_role_tag: + type: string + required: true + status: SUPPORTED + port_pd_2_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED port_pd_2_port_1_ip_requirements: type: list required: true @@ -96,48 +126,6 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd_1_port_0_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd_1_port_0_network_role: - type: string - 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_pd_2_port_1_subnetpoolid: - type: string - required: true - status: SUPPORTED - port_pd_2_port_1_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_pd_1_port_0_order: - type: integer - required: true - status: SUPPORTED - port_pd_1_port_0_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_pd_1_port_0_network_role_tag: - type: string - required: true - status: SUPPORTED - port_pd_2_port_1_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED requirements: - dependency_pd_server: capability: tosca.capabilities.Node diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes2/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes2/out/MainServiceTemplate.yaml index 8fde33fb03..81e6cac6ff 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes2/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes2/out/MainServiceTemplate.yaml @@ -840,14 +840,10 @@ topology_template: - get_input: - pd_server_names - 0 - port_pd_2_port_1_subinterface_indicator: - - false port_pd_2_port_1_network: - get_input: oam_net_name vm_flavor_name: get_input: pd_flavor_name - port_pd_1_port_0_subinterface_indicator: - - false vm_image_name: get_input: pd_image_name port_pd_1_port_0_mac_requirements: @@ -859,6 +855,10 @@ topology_template: is_required: false floating_ip_count_required: is_required: false + port_pd_1_port_0_network_role_tag: oam + port_pd_2_port_1_mac_requirements: + mac_count_required: + is_required: false port_pd_2_port_1_ip_requirements: - ip_version: 4 ip_count_required: @@ -868,10 +868,6 @@ topology_template: port_pd_2_port_1_network_role_tag: oam compute_pd_server_user_data_format: - RAW - port_pd_1_port_0_network_role_tag: oam - port_pd_2_port_1_mac_requirements: - mac_count_required: - is_required: false service_template_filter: substitute_service_template: Nested_pd_serverServiceTemplate.yaml count: 1 @@ -887,4 +883,4 @@ topology_template: heat_file: ../Artifacts/hot-mog-0108-bs1271.yml description: heat template that creates MOG stack members: - - abstract_pd_server
\ No newline at end of file + - abstract_pd_server diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes2/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/computewithtwosameporttypes2/out/Nested_pd_serverServiceTemplate.yaml index 6e005d07a3..58da3124e9 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes2/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/computewithtwosameporttypes2/out/Nested_pd_serverServiceTemplate.yaml @@ -16,6 +16,21 @@ topology_template: required: true entry_schema: type: string + port_pd_1_port_0_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd_1_port_0_network_role: + type: string + 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_pd_2_port_1_vlan_requirements: type: list required: true @@ -31,11 +46,6 @@ topology_template: required: true entry_schema: type: string - port_pd_2_port_1_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean port_pd_2_port_1_network: type: list required: true @@ -44,17 +54,18 @@ topology_template: port_pd_2_port_1_network_role: type: string required: true + port_pd_2_port_1_subnetpoolid: + type: string + required: true vm_flavor_name: type: string required: true port_pd_2_port_1_order: type: integer required: true - port_pd_1_port_0_subinterface_indicator: - type: list + port_pd_2_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: boolean vm_image_name: type: string required: true @@ -64,11 +75,23 @@ topology_template: port_pd_1_port_0_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true + port_pd_1_port_0_order: + type: integer + required: true + port_pd_1_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true port_pd_1_port_0_ip_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements + port_pd_1_port_0_network_role_tag: + type: string + required: true + port_pd_2_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true port_pd_2_port_1_ip_requirements: type: list required: true @@ -82,39 +105,6 @@ topology_template: required: true entry_schema: type: string - port_pd_1_port_0_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd_1_port_0_network_role: - type: string - 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_pd_2_port_1_subnetpoolid: - type: string - required: true - port_pd_2_port_1_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_pd_1_port_0_order: - type: integer - required: true - port_pd_1_port_0_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_pd_1_port_0_network_role_tag: - type: string - required: true - port_pd_2_port_1_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true node_templates: pd_server: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server @@ -142,10 +132,7 @@ topology_template: get_input: port_pd_2_port_1_exCP_naming vlan_requirements: get_input: port_pd_2_port_1_vlan_requirements - subinterface_indicator: - get_input: - - port_pd_2_port_1_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_pd_2_port_1_ip_requirements network_role_tag: @@ -174,10 +161,7 @@ topology_template: get_input: port_pd_1_port_0_exCP_naming vlan_requirements: get_input: port_pd_1_port_0_vlan_requirements - subinterface_indicator: - get_input: - - port_pd_1_port_0_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_pd_1_port_0_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/computewithtwosameporttypes3/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes3/out/GlobalSubstitutionTypesServiceTemplate.yaml index d5acb4ca67..2c72b0aa07 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes3/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes3/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -22,6 +22,20 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements + 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_pd_oam1_port_0_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements compute_pd_server_availability_zone: type: list required: true @@ -42,48 +56,6 @@ node_types: type: integer required: true status: SUPPORTED - port_pd_oam1_port_1_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_pd_oam1_port_1_network_role: - type: string - required: true - status: SUPPORTED - vm_image_name: - type: string - required: true - status: SUPPORTED - port_pd_oam1_port_1_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean - port_pd_oam1_port_1_network_role_tag: - type: string - required: true - status: SUPPORTED - compute_pd_server_user_data_format: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - 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_pd_oam1_port_0_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements port_pd_oam1_port_0_vlan_requirements: type: list required: true @@ -96,16 +68,18 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd_oam1_port_1_subnetpoolid: + port_pd_oam1_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_pd_oam1_port_1_network_role: type: string required: true status: SUPPORTED - port_pd_oam1_port_0_subinterface_indicator: - type: list + port_pd_oam1_port_1_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: boolean port_pd_oam1_port_0_order: type: integer required: true @@ -120,6 +94,10 @@ node_types: status: SUPPORTED entry_schema: type: string + vm_image_name: + type: string + required: true + status: SUPPORTED port_pd_oam1_port_0_subnetpoolid: type: string required: true @@ -128,6 +106,10 @@ node_types: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED + port_pd_oam1_port_1_network_role_tag: + type: string + required: true + status: SUPPORTED port_pd_oam1_port_1_vlan_requirements: type: list required: true @@ -138,6 +120,12 @@ node_types: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED + compute_pd_server_user_data_format: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string requirements: - dependency_pd_server: capability: tosca.capabilities.Node diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes3/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes3/out/MainServiceTemplate.yaml index 33bdfa22df..4f4840d9ba 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes3/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes3/out/MainServiceTemplate.yaml @@ -839,6 +839,12 @@ topology_template: is_required: false floating_ip_count_required: is_required: false + port_pd_oam1_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: @@ -847,31 +853,21 @@ topology_template: - 0 vm_flavor_name: get_input: pd_flavor_name + port_pd_oam1_port_1_network: + - get_input: oam_net_name port_pd_oam1_port_1_mac_requirements: mac_count_required: is_required: false + port_pd_oam1_port_0_network: + - get_input: oam_net_name vm_image_name: get_input: pd_image_name - port_pd_oam1_port_1_subinterface_indicator: - - false port_pd_oam1_port_1_network_role_tag: oam - compute_pd_server_user_data_format: - - RAW - port_pd_oam1_port_0_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false - port_pd_oam1_port_1_network: - - get_input: oam_net_name - port_pd_oam1_port_0_subinterface_indicator: - - false - port_pd_oam1_port_0_network: - - get_input: oam_net_name port_pd_oam1_port_0_mac_requirements: mac_count_required: is_required: false + compute_pd_server_user_data_format: + - RAW service_template_filter: substitute_service_template: Nested_pd_serverServiceTemplate.yaml count: 1 @@ -887,4 +883,4 @@ topology_template: heat_file: ../Artifacts/hot-mog-0108-bs1271.yml description: heat template that creates MOG stack members: - - abstract_pd_server
\ No newline at end of file + - abstract_pd_server diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes3/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/computewithtwosameporttypes3/out/Nested_pd_serverServiceTemplate.yaml index ccd2d95f87..fdcc754cb8 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes3/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/computewithtwosameporttypes3/out/Nested_pd_serverServiceTemplate.yaml @@ -22,6 +22,18 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + constraints: + - greater_or_equal: 0 + port_pd_oam1_port_0_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements compute_pd_server_availability_zone: type: list required: true @@ -38,40 +50,6 @@ topology_template: port_pd_oam1_port_1_order: type: integer required: true - port_pd_oam1_port_1_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_pd_oam1_port_1_network_role: - type: string - required: true - vm_image_name: - type: string - required: true - port_pd_oam1_port_1_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean - port_pd_oam1_port_1_network_role_tag: - type: string - required: true - compute_pd_server_user_data_format: - type: list - required: true - entry_schema: - type: string - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - constraints: - - greater_or_equal: 0 - port_pd_oam1_port_0_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements port_pd_oam1_port_0_vlan_requirements: type: list required: true @@ -82,14 +60,15 @@ topology_template: required: true entry_schema: type: string - port_pd_oam1_port_1_subnetpoolid: + port_pd_oam1_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_pd_oam1_port_1_network_role: type: string required: true - port_pd_oam1_port_0_subinterface_indicator: - type: list + port_pd_oam1_port_1_subnetpoolid: + type: string required: true - entry_schema: - type: boolean port_pd_oam1_port_0_order: type: integer required: true @@ -101,12 +80,18 @@ topology_template: required: true entry_schema: type: string + vm_image_name: + type: string + required: true port_pd_oam1_port_0_subnetpoolid: type: string required: true port_pd_oam1_port_0_exCP_naming: type: org.openecomp.datatypes.Naming required: true + port_pd_oam1_port_1_network_role_tag: + type: string + required: true port_pd_oam1_port_1_vlan_requirements: type: list required: true @@ -115,6 +100,11 @@ topology_template: port_pd_oam1_port_0_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true + compute_pd_server_user_data_format: + type: list + required: true + entry_schema: + type: string node_templates: pd_server: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server @@ -142,10 +132,7 @@ topology_template: get_input: port_pd_oam1_port_1_exCP_naming vlan_requirements: get_input: port_pd_oam1_port_1_vlan_requirements - subinterface_indicator: - get_input: - - port_pd_oam1_port_1_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_pd_oam1_port_1_ip_requirements network_role_tag: @@ -174,10 +161,7 @@ topology_template: get_input: port_pd_oam1_port_0_exCP_naming vlan_requirements: get_input: port_pd_oam1_port_0_vlan_requirements - subinterface_indicator: - get_input: - - port_pd_oam1_port_0_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_pd_oam1_port_0_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/computewithtwosameporttypes4/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes4/out/GlobalSubstitutionTypesServiceTemplate.yaml index 7624e45914..8f9cd39986 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes4/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes4/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -28,12 +28,24 @@ node_types: status: SUPPORTED entry_schema: type: string + port_pd01_port1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED port_pd01_port2_ip_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements + 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 compute_pd_server_availability_zone: type: list required: true @@ -46,98 +58,74 @@ node_types: status: SUPPORTED entry_schema: type: string - vm_flavor_name: + port_pd01_port1_subnetpoolid: type: string required: true status: SUPPORTED - port_pd01_port2_network_role_tag: + port_pd01_port2_subnetpoolid: type: string required: true status: SUPPORTED - port_pd01_port1_order: - type: integer - required: true - status: SUPPORTED - port_pd01_port2_order: - type: integer + port_pd01_port2_network_role: + type: string required: true status: SUPPORTED - vm_image_name: + vm_flavor_name: type: string required: true status: SUPPORTED - port_pd01_port2_subinterface_indicator: + port_pd01_port1_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: boolean - port_pd01_port2_vlan_requirements: - type: list + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port2_network_role_tag: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd01_port2_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd01_port1_order: + type: integer required: true status: SUPPORTED - compute_pd_server_user_data_format: - type: list + port_pd01_port1_network_role: + type: string required: true status: SUPPORTED - entry_schema: - type: string - port_pd01_port1_mac_requirements: + port_pd01_port2_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - index_value: + port_pd01_port2_order: 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_port1_subnetpoolid: - type: string - required: true - status: SUPPORTED - port_pd01_port2_subnetpoolid: - type: string required: true status: SUPPORTED - port_pd01_port2_network_role: - type: string - required: true - status: SUPPORTED - port_pd01_port1_ip_requirements: + port_pd01_port1_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port1_network_role: + type: org.openecomp.datatypes.network.VlanRequirements + vm_image_name: type: string required: true status: SUPPORTED - port_pd01_port2_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_pd01_port1_vlan_requirements: + port_pd01_port2_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_pd01_port1_subinterface_indicator: + port_pd01_port2_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + compute_pd_server_user_data_format: type: list required: true status: SUPPORTED entry_schema: - type: boolean + type: string requirements: - dependency_pd_server_pd01_port1: capability: tosca.capabilities.Node diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes4/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes4/out/MainServiceTemplate.yaml index 14be3f3ae6..1b6083282c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes4/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes4/out/MainServiceTemplate.yaml @@ -837,6 +837,9 @@ topology_template: port_pd01_port1_network_role_tag: oam port_pd01_port2_network: - get_input: oam_net_name + port_pd01_port1_mac_requirements: + mac_count_required: + is_required: false port_pd01_port2_ip_requirements: - ip_version: 4 ip_count_required: @@ -851,27 +854,20 @@ topology_template: - 0 vm_flavor_name: get_input: pd_flavor_name - port_pd01_port2_network_role_tag: oam - vm_image_name: - get_input: pd_image_name - port_pd01_port2_subinterface_indicator: - - false - compute_pd_server_user_data_format: - - RAW - port_pd01_port1_mac_requirements: - mac_count_required: - is_required: false port_pd01_port1_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false + port_pd01_port2_network_role_tag: oam port_pd01_port2_mac_requirements: mac_count_required: is_required: false - port_pd01_port1_subinterface_indicator: - - false + vm_image_name: + get_input: pd_image_name + compute_pd_server_user_data_format: + - RAW service_template_filter: substitute_service_template: Nested_pd_serverServiceTemplate.yaml count: 1 @@ -887,4 +883,4 @@ topology_template: heat_file: ../Artifacts/hot-mog-0108-bs1271.yml description: heat template that creates MOG stack members: - - abstract_pd_server
\ No newline at end of file + - abstract_pd_server diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes4/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/computewithtwosameporttypes4/out/Nested_pd_serverServiceTemplate.yaml index 1293f8f76d..906ea1896b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes4/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/computewithtwosameporttypes4/out/Nested_pd_serverServiceTemplate.yaml @@ -27,11 +27,21 @@ topology_template: required: true entry_schema: type: string + port_pd01_port1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true port_pd01_port2_ip_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + constraints: + - greater_or_equal: 0 compute_pd_server_availability_zone: type: list required: true @@ -42,79 +52,59 @@ topology_template: required: true entry_schema: type: string - vm_flavor_name: + port_pd01_port1_subnetpoolid: type: string required: true - port_pd01_port2_network_role_tag: + port_pd01_port2_subnetpoolid: type: string required: true - port_pd01_port1_order: - type: integer - required: true - port_pd01_port2_order: - type: integer + port_pd01_port2_network_role: + type: string required: true - vm_image_name: + vm_flavor_name: type: string required: true - port_pd01_port2_subinterface_indicator: + port_pd01_port1_ip_requirements: type: list required: true entry_schema: - type: boolean - port_pd01_port2_vlan_requirements: - type: list + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port2_network_role_tag: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd01_port2_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd01_port1_order: + type: integer required: true - compute_pd_server_user_data_format: - type: list + port_pd01_port1_network_role: + type: string required: true - entry_schema: - type: string - port_pd01_port1_mac_requirements: + port_pd01_port2_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true - index_value: + port_pd01_port2_order: type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - constraints: - - greater_or_equal: 0 - port_pd01_port1_subnetpoolid: - type: string - required: true - port_pd01_port2_subnetpoolid: - type: string required: true - port_pd01_port2_network_role: - type: string - required: true - port_pd01_port1_ip_requirements: + port_pd01_port1_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port1_network_role: + type: org.openecomp.datatypes.network.VlanRequirements + vm_image_name: type: string required: true - port_pd01_port2_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_pd01_port1_vlan_requirements: + port_pd01_port2_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_pd01_port1_subinterface_indicator: + port_pd01_port2_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + compute_pd_server_user_data_format: type: list required: true entry_schema: - type: boolean + type: string node_templates: pd_server_pd01_port1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port @@ -123,10 +113,7 @@ topology_template: get_input: port_pd01_port1_exCP_naming vlan_requirements: get_input: port_pd01_port1_vlan_requirements - subinterface_indicator: - get_input: - - port_pd01_port1_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_pd01_port1_ip_requirements network_role_tag: @@ -174,10 +161,7 @@ topology_template: get_input: port_pd01_port2_exCP_naming vlan_requirements: get_input: port_pd01_port2_vlan_requirements - subinterface_indicator: - get_input: - - port_pd01_port2_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_pd01_port2_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/diffPortTypeAndOutParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml index 63428c4dff..d652fffcb5 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,6 +8,14 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + 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 compute_pd_server_availability_zone: type: list required: true @@ -20,92 +28,60 @@ node_types: status: SUPPORTED entry_schema: type: string - vm_flavor_name: - type: string + port_pd02_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_pd02_port_network_role_tag: - type: string + port_pd01_port_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_pd02_port_subinterface_indicator: - type: list + vm_flavor_name: + type: string required: true status: SUPPORTED - entry_schema: - type: boolean - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pd02_port_order: + type: integer required: true status: SUPPORTED - vm_image_name: + port_pd02_port_subnetpoolid: type: string required: true status: SUPPORTED - port_pd01_port_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd02_port_network_role: + port_pd02_port_network_role_tag: type: string required: true status: SUPPORTED - port_pd01_port_subinterface_indicator: - type: list + port_pd01_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: boolean - port_pd01_port_vlan_requirements: + port_pd02_port_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - compute_pd_server_user_data_format: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - 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_pd02_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_pd02_port_order: - type: integer - required: true - status: SUPPORTED - port_pd02_port_subnetpoolid: + vm_image_name: type: string required: true status: SUPPORTED - port_pd02_port_vlan_requirements: + port_pd01_port_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_network: type: list required: true status: SUPPORTED entry_schema: type: string + port_pd02_port_network_role: + type: string + required: true + status: SUPPORTED port_pd01_port_order: type: integer required: true @@ -132,12 +108,24 @@ node_types: type: string required: true status: SUPPORTED + port_pd01_port_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements port_pd02_port_network: type: list required: true status: SUPPORTED entry_schema: type: string + compute_pd_server_user_data_format: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string attributes: pd_server_accessIPv4: type: string diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/MainServiceTemplate.yaml index f437be45a1..4054d32d29 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/MainServiceTemplate.yaml @@ -838,11 +838,12 @@ topology_template: - get_input: - pd_server_names - 0 + port_pd02_port_mac_requirements: + mac_count_required: + is_required: false vm_flavor_name: get_input: pd_flavor_name port_pd02_port_network_role_tag: oam - port_pd02_port_subinterface_indicator: - - false port_pd01_port_mac_requirements: mac_count_required: is_required: false @@ -854,13 +855,6 @@ topology_template: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_subinterface_indicator: - - false - compute_pd_server_user_data_format: - - RAW - port_pd02_port_mac_requirements: - mac_count_required: - is_required: false port_pd01_port_network: - get_input: oam_net_name port_pd02_port_ip_requirements: @@ -872,6 +866,8 @@ topology_template: port_pd01_port_network_role_tag: oam port_pd02_port_network: - get_input: oam_net_name + compute_pd_server_user_data_format: + - RAW service_template_filter: substitute_service_template: Nested_pd_serverServiceTemplate.yaml count: 1 @@ -906,4 +902,4 @@ topology_template: value: get_attribute: - abstract_pd_server - - pd_server_accessIPv4
\ No newline at end of file + - pd_server_accessIPv4 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/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/diffPortTypeAndOutParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml index ff9ab1fa47..33183aebc4 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/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/diffPortTypeAndOutParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml @@ -11,6 +11,13 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + constraints: + - greater_or_equal: 0 compute_pd_server_availability_zone: type: list required: true @@ -21,75 +28,48 @@ topology_template: required: true entry_schema: type: string - vm_flavor_name: - type: string + port_pd02_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_pd02_port_network_role_tag: - type: string + port_pd01_port_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - port_pd02_port_subinterface_indicator: - type: list + vm_flavor_name: + type: string required: true - entry_schema: - type: boolean - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pd02_port_order: + type: integer required: true - vm_image_name: + port_pd02_port_subnetpoolid: type: string required: true - port_pd01_port_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd02_port_network_role: + port_pd02_port_network_role_tag: type: string required: true - port_pd01_port_subinterface_indicator: - type: list + port_pd01_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: boolean - port_pd01_port_vlan_requirements: + port_pd02_port_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - compute_pd_server_user_data_format: - type: list - required: true - entry_schema: - type: string - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - constraints: - - greater_or_equal: 0 - port_pd02_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_pd02_port_order: - type: integer - required: true - port_pd02_port_subnetpoolid: + vm_image_name: type: string required: true - port_pd02_port_vlan_requirements: + port_pd01_port_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_network: type: list required: true entry_schema: type: string + port_pd02_port_network_role: + type: string + required: true port_pd01_port_order: type: integer required: true @@ -110,11 +90,21 @@ topology_template: port_pd01_port_network_role_tag: type: string required: true + port_pd01_port_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements port_pd02_port_network: type: list required: true entry_schema: type: string + compute_pd_server_user_data_format: + type: list + required: true + entry_schema: + type: string node_templates: pd_server: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server @@ -142,10 +132,7 @@ 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 + subinterface_indicator: false ip_requirements: get_input: port_pd01_port_ip_requirements network_role_tag: @@ -174,10 +161,7 @@ topology_template: get_input: port_pd02_port_exCP_naming vlan_requirements: get_input: port_pd02_port_vlan_requirements - subinterface_indicator: - get_input: - - port_pd02_port_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_pd02_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/inputOutputParamType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/GlobalSubstitutionTypesServiceTemplate.yaml index 3053ba7550..cf4a0e04ec 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -50,12 +50,6 @@ node_types: type: string required: true status: SUPPORTED - port_pd01_port_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean port_template_VMInt_OAM_lb_virtual_machine_interface_properties: type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.interface.Properties required: true @@ -266,12 +260,6 @@ node_types: status: SUPPORTED entry_schema: type: json - port_template_VMInt_OAM_lb_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean port_template_VMInt_OAM_lb_name: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/MainServiceTemplate.yaml index c12219adc0..4712348457 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/MainServiceTemplate.yaml @@ -424,8 +424,6 @@ topology_template: is_required: true vm_image_name: get_input: pd_image_name - port_pd01_port_subinterface_indicator: - - false port_pd01_port_device_id: - PORT_PD_DEVICE_ID port_pd01_port_admin_state_up: @@ -491,8 +489,6 @@ topology_template: - fq_name port_template_VMInt_OAM_lb_virtual_machine_interface_mac_addresses: - - get_input: mac_address - port_template_VMInt_OAM_lb_subinterface_indicator: - - false port_template_VMInt_OAM_lb_name: - template_VMInt_OAM_lb_NAME port_pd01_port_port_security_enabled: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/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/inputOutputParamType/out/Nested_pd_serverServiceTemplate.yaml index 1536b33544..e676206762 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/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/inputOutputParamType/out/Nested_pd_serverServiceTemplate.yaml @@ -45,11 +45,6 @@ topology_template: vm_image_name: type: string required: true - port_pd01_port_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean port_template_VMInt_OAM_lb_virtual_machine_interface_properties: type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.interface.Properties required: true @@ -222,11 +217,6 @@ topology_template: required: true entry_schema: type: json - port_template_VMInt_OAM_lb_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean port_template_VMInt_OAM_lb_name: type: list required: true @@ -369,10 +359,7 @@ topology_template: get_input: - port_template_VMInt_OAM_lb_virtual_machine_interface_properties - index_value - subinterface_indicator: - get_input: - - port_template_VMInt_OAM_lb_subinterface_indicator - - index_value + subinterface_indicator: false security_group_refs: get_input: - port_template_VMInt_OAM_lb_security_group_refs @@ -441,10 +428,7 @@ 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 + subinterface_indicator: false qos_policy: get_input: - port_pd01_port_qos_policy diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/GlobalSubstitutionTypesServiceTemplate.yaml index 98ef12fa28..0b464f4f24 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,6 +8,14 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + 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 compute_pd_server_availability_zone: type: list required: true @@ -20,92 +28,60 @@ node_types: status: SUPPORTED entry_schema: type: string - vm_flavor_name: - type: string + port_pd02_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_pd02_port_network_role_tag: - type: string + port_pd01_port_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_pd02_port_subinterface_indicator: - type: list + vm_flavor_name: + type: string required: true status: SUPPORTED - entry_schema: - type: boolean - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pd02_port_order: + type: integer required: true status: SUPPORTED - vm_image_name: + port_pd02_port_subnetpoolid: type: string required: true status: SUPPORTED - port_pd01_port_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd02_port_network_role: + port_pd02_port_network_role_tag: type: string required: true status: SUPPORTED - port_pd01_port_subinterface_indicator: - type: list + port_pd01_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: boolean - port_pd01_port_vlan_requirements: + port_pd02_port_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - compute_pd_server_user_data_format: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - 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_pd02_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_pd02_port_order: - type: integer - required: true - status: SUPPORTED - port_pd02_port_subnetpoolid: + vm_image_name: type: string required: true status: SUPPORTED - port_pd02_port_vlan_requirements: + port_pd01_port_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_network: type: list required: true status: SUPPORTED entry_schema: type: string + port_pd02_port_network_role: + type: string + required: true + status: SUPPORTED port_pd01_port_order: type: integer required: true @@ -132,12 +108,24 @@ node_types: type: string required: true status: SUPPORTED + port_pd01_port_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements port_pd02_port_network: type: list required: true status: SUPPORTED entry_schema: type: string + compute_pd_server_user_data_format: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string attributes: pd_server_accessIPv4: type: string diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/MainServiceTemplate.yaml index e91c7baf2f..e9d7a14899 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/MainServiceTemplate.yaml @@ -838,11 +838,12 @@ topology_template: - get_input: - pd_server_names - 0 + port_pd02_port_mac_requirements: + mac_count_required: + is_required: false vm_flavor_name: get_input: pd_flavor_name port_pd02_port_network_role_tag: oam - port_pd02_port_subinterface_indicator: - - false port_pd01_port_mac_requirements: mac_count_required: is_required: false @@ -854,13 +855,6 @@ topology_template: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_subinterface_indicator: - - false - compute_pd_server_user_data_format: - - RAW - port_pd02_port_mac_requirements: - mac_count_required: - is_required: false port_pd01_port_network: - get_input: oam_net_name port_pd02_port_ip_requirements: @@ -872,6 +866,8 @@ topology_template: port_pd01_port_network_role_tag: oam port_pd02_port_network: - get_input: oam_net_name + compute_pd_server_user_data_format: + - RAW service_template_filter: substitute_service_template: Nested_pd_serverServiceTemplate.yaml count: 1 @@ -903,4 +899,4 @@ topology_template: members: - network_policy_port - network_policy_server - - abstract_pd_server
\ No newline at end of file + - abstract_pd_server diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/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/oneComputeDiffPortTypesAndGetAttIn/out/Nested_pd_serverServiceTemplate.yaml index acec850677..796f721384 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/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/oneComputeDiffPortTypesAndGetAttIn/out/Nested_pd_serverServiceTemplate.yaml @@ -11,6 +11,13 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + constraints: + - greater_or_equal: 0 compute_pd_server_availability_zone: type: list required: true @@ -21,75 +28,48 @@ topology_template: required: true entry_schema: type: string - vm_flavor_name: - type: string + port_pd02_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_pd02_port_network_role_tag: - type: string + port_pd01_port_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - port_pd02_port_subinterface_indicator: - type: list + vm_flavor_name: + type: string required: true - entry_schema: - type: boolean - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pd02_port_order: + type: integer required: true - vm_image_name: + port_pd02_port_subnetpoolid: type: string required: true - port_pd01_port_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd02_port_network_role: + port_pd02_port_network_role_tag: type: string required: true - port_pd01_port_subinterface_indicator: - type: list + port_pd01_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: boolean - port_pd01_port_vlan_requirements: + port_pd02_port_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - compute_pd_server_user_data_format: - type: list - required: true - entry_schema: - type: string - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - constraints: - - greater_or_equal: 0 - port_pd02_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_pd02_port_order: - type: integer - required: true - port_pd02_port_subnetpoolid: + vm_image_name: type: string required: true - port_pd02_port_vlan_requirements: + port_pd01_port_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_network: type: list required: true entry_schema: type: string + port_pd02_port_network_role: + type: string + required: true port_pd01_port_order: type: integer required: true @@ -110,11 +90,21 @@ topology_template: port_pd01_port_network_role_tag: type: string required: true + port_pd01_port_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements port_pd02_port_network: type: list required: true entry_schema: type: string + compute_pd_server_user_data_format: + type: list + required: true + entry_schema: + type: string node_templates: pd_server: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server @@ -142,10 +132,7 @@ 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 + subinterface_indicator: false ip_requirements: get_input: port_pd01_port_ip_requirements network_role_tag: @@ -174,10 +161,7 @@ topology_template: get_input: port_pd02_port_exCP_naming vlan_requirements: get_input: port_pd02_port_vlan_requirements - subinterface_indicator: - get_input: - - port_pd02_port_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_pd02_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/oneComputeDiffPortTypesAndGetAttOut/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/GlobalSubstitutionTypesServiceTemplate.yaml index 5df6256ee1..615de8dc2e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,6 +8,14 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + 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 compute_pd_server_availability_zone: type: list required: true @@ -20,92 +28,60 @@ node_types: status: SUPPORTED entry_schema: type: string - vm_flavor_name: - type: string + port_pd02_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_pd02_port_network_role_tag: - type: string + port_pd01_port_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_pd02_port_subinterface_indicator: - type: list + vm_flavor_name: + type: string required: true status: SUPPORTED - entry_schema: - type: boolean - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pd02_port_order: + type: integer required: true status: SUPPORTED - vm_image_name: + port_pd02_port_subnetpoolid: type: string required: true status: SUPPORTED - port_pd01_port_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd02_port_network_role: + port_pd02_port_network_role_tag: type: string required: true status: SUPPORTED - port_pd01_port_subinterface_indicator: - type: list + port_pd01_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: boolean - port_pd01_port_vlan_requirements: + port_pd02_port_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - compute_pd_server_user_data_format: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - 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_pd02_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_pd02_port_order: - type: integer - required: true - status: SUPPORTED - port_pd02_port_subnetpoolid: + vm_image_name: type: string required: true status: SUPPORTED - port_pd02_port_vlan_requirements: + port_pd01_port_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_network: type: list required: true status: SUPPORTED entry_schema: type: string + port_pd02_port_network_role: + type: string + required: true + status: SUPPORTED port_pd01_port_order: type: integer required: true @@ -132,12 +108,24 @@ node_types: type: string required: true status: SUPPORTED + port_pd01_port_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements port_pd02_port_network: type: list required: true status: SUPPORTED entry_schema: type: string + compute_pd_server_user_data_format: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string requirements: - dependency_pd_server: capability: tosca.capabilities.Node diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/MainServiceTemplate.yaml index ab8accff76..0feb8ef859 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/MainServiceTemplate.yaml @@ -838,13 +838,14 @@ topology_template: - get_input: - pd_server_names - 0 + port_pd02_port_mac_requirements: + mac_count_required: + is_required: false vm_flavor_name: get_attribute: - network_policy_server - name port_pd02_port_network_role_tag: oam - port_pd02_port_subinterface_indicator: - - false port_pd01_port_mac_requirements: mac_count_required: is_required: false @@ -856,13 +857,6 @@ topology_template: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_subinterface_indicator: - - false - compute_pd_server_user_data_format: - - RAW - port_pd02_port_mac_requirements: - mac_count_required: - is_required: false port_pd01_port_network: - get_attribute: - network_policy_server @@ -875,6 +869,8 @@ topology_template: is_required: false port_pd02_port_network: - get_input: oam_net_name + compute_pd_server_user_data_format: + - RAW service_template_filter: substitute_service_template: Nested_pd_serverServiceTemplate.yaml count: 1 @@ -896,4 +892,4 @@ topology_template: description: heat template that creates MOG stack members: - network_policy_server - - abstract_pd_server
\ No newline at end of file + - abstract_pd_server diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/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/oneComputeDiffPortTypesAndGetAttOut/out/Nested_pd_serverServiceTemplate.yaml index f84903c708..3c0aeaee28 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/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/oneComputeDiffPortTypesAndGetAttOut/out/Nested_pd_serverServiceTemplate.yaml @@ -11,6 +11,13 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + constraints: + - greater_or_equal: 0 compute_pd_server_availability_zone: type: list required: true @@ -21,75 +28,48 @@ topology_template: required: true entry_schema: type: string - vm_flavor_name: - type: string + port_pd02_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_pd02_port_network_role_tag: - type: string + port_pd01_port_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - port_pd02_port_subinterface_indicator: - type: list + vm_flavor_name: + type: string required: true - entry_schema: - type: boolean - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pd02_port_order: + type: integer required: true - vm_image_name: + port_pd02_port_subnetpoolid: type: string required: true - port_pd01_port_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd02_port_network_role: + port_pd02_port_network_role_tag: type: string required: true - port_pd01_port_subinterface_indicator: - type: list + port_pd01_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: boolean - port_pd01_port_vlan_requirements: + port_pd02_port_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - compute_pd_server_user_data_format: - type: list - required: true - entry_schema: - type: string - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - constraints: - - greater_or_equal: 0 - port_pd02_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_pd02_port_order: - type: integer - required: true - port_pd02_port_subnetpoolid: + vm_image_name: type: string required: true - port_pd02_port_vlan_requirements: + port_pd01_port_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_network: type: list required: true entry_schema: type: string + port_pd02_port_network_role: + type: string + required: true port_pd01_port_order: type: integer required: true @@ -110,11 +90,21 @@ topology_template: port_pd01_port_network_role_tag: type: string required: true + port_pd01_port_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements port_pd02_port_network: type: list required: true entry_schema: type: string + compute_pd_server_user_data_format: + type: list + required: true + entry_schema: + type: string node_templates: pd_server: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server @@ -142,10 +132,7 @@ 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 + subinterface_indicator: false ip_requirements: get_input: port_pd01_port_ip_requirements network_role_tag: @@ -174,10 +161,7 @@ topology_template: get_input: port_pd02_port_exCP_naming vlan_requirements: get_input: port_pd02_port_vlan_requirements - subinterface_indicator: - get_input: - - port_pd02_port_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_pd02_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/oneComputeSamePortTypesAndGetAttOut/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/GlobalSubstitutionTypesServiceTemplate.yaml index ace7b0798e..3a97da1e81 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -24,10 +24,28 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role_tag: + type: string + required: true + status: SUPPORTED port_pd01_port_0_network_role: type: string required: true status: SUPPORTED + port_pd01_port_1_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + 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 compute_pd_server_availability_zone: type: list required: true @@ -40,16 +58,18 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_0_subinterface_indicator: - type: list + port_pd01_port_1_order: + type: integer required: true status: SUPPORTED - entry_schema: - type: boolean vm_flavor_name: type: string required: true status: SUPPORTED + port_pd01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED port_pd01_port_1_network_role: type: string required: true @@ -58,86 +78,54 @@ node_types: type: integer required: true status: SUPPORTED - port_pd01_port_1_subnetpoolid: - type: string + port_pd01_port_1_vlan_requirements: + type: list required: true status: SUPPORTED - vm_image_name: - type: string + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_pd01_port_1_network_role_tag: + port_pd01_port_1_subnetpoolid: type: string required: true status: SUPPORTED - port_pd01_port_0_subnetpoolid: + vm_image_name: type: string required: true status: SUPPORTED - port_pd01_port_1_network: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - compute_pd_server_user_data_format: - type: list + port_pd01_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: string - port_pd01_port_0_network_role_tag: + port_pd01_port_1_network_role_tag: type: string required: true status: SUPPORTED - port_pd01_port_1_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - 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_1_subinterface_indicator: + port_pd01_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: boolean - port_pd01_port_1_order: - type: integer - required: true - status: SUPPORTED - port_pd01_port_0_exCP_naming: - type: org.openecomp.datatypes.Naming + type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_0_subnetpoolid: + type: string required: true status: SUPPORTED - port_pd01_port_1_vlan_requirements: + port_pd01_port_1_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd01_port_1_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_pd01_port_1_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_pd01_port_0_vlan_requirements: + type: string + compute_pd_server_user_data_format: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: string requirements: - dependency_pd_server: capability: tosca.capabilities.Node diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/MainServiceTemplate.yaml index 7239791942..dd26c73c26 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/MainServiceTemplate.yaml @@ -106,18 +106,25 @@ topology_template: is_required: false floating_ip_count_required: is_required: false + port_pd01_port_1_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: - get_input: - pd_server_names - 0 - port_pd01_port_0_subinterface_indicator: - - false vm_flavor_name: get_attribute: - network_policy_server - name + port_pd01_port_1_mac_requirements: + mac_count_required: + is_required: false vm_image_name: get_input: pd_image_name port_pd01_port_1_network_role_tag: oam @@ -125,17 +132,6 @@ topology_template: - get_input: oam_net_name compute_pd_server_user_data_format: - RAW - port_pd01_port_1_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false - port_pd01_port_1_subinterface_indicator: - - false - port_pd01_port_1_mac_requirements: - mac_count_required: - is_required: false service_template_filter: substitute_service_template: Nested_pd_serverServiceTemplate.yaml count: 1 @@ -157,4 +153,4 @@ topology_template: description: heat template that creates MOG stack members: - network_policy_server - - abstract_pd_server
\ No newline at end of file + - abstract_pd_server diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/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/oneComputeSamePortTypesAndGetAttOut/out/Nested_pd_serverServiceTemplate.yaml index 818ba138cb..0dd90f3eea 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/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/oneComputeSamePortTypesAndGetAttOut/out/Nested_pd_serverServiceTemplate.yaml @@ -24,9 +24,24 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role_tag: + type: string + required: true port_pd01_port_0_network_role: type: string required: true + port_pd01_port_1_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + constraints: + - greater_or_equal: 0 compute_pd_server_availability_zone: type: list required: true @@ -37,29 +52,46 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_0_subinterface_indicator: - type: list + port_pd01_port_1_order: + type: integer required: true - entry_schema: - type: boolean vm_flavor_name: type: string required: true + port_pd01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true port_pd01_port_1_network_role: type: string required: true port_pd01_port_0_order: type: integer required: true + port_pd01_port_1_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true port_pd01_port_1_subnetpoolid: type: string required: true vm_image_name: type: string required: true + port_pd01_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true port_pd01_port_1_network_role_tag: type: string required: true + port_pd01_port_0_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements port_pd01_port_0_subnetpoolid: type: string required: true @@ -73,48 +105,6 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_0_network_role_tag: - type: string - required: true - port_pd01_port_1_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - 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_1_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean - port_pd01_port_1_order: - type: integer - required: true - port_pd01_port_0_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_pd01_port_1_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd01_port_1_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_pd01_port_1_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_pd01_port_0_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements node_templates: pd_server: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server @@ -142,10 +132,7 @@ topology_template: get_input: port_pd01_port_1_exCP_naming vlan_requirements: get_input: port_pd01_port_1_vlan_requirements - subinterface_indicator: - get_input: - - port_pd01_port_1_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_pd01_port_1_ip_requirements network_role_tag: @@ -174,10 +161,7 @@ topology_template: get_input: port_pd01_port_0_exCP_naming vlan_requirements: get_input: port_pd01_port_0_vlan_requirements - subinterface_indicator: - get_input: - - port_pd01_port_0_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_pd01_port_0_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/oneComputeSamePortsAndGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml index ffd4d72a14..530e44c0bf 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -24,10 +24,28 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role_tag: + type: string + required: true + status: SUPPORTED port_pd01_port_0_network_role: type: string required: true status: SUPPORTED + port_pd01_port_1_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + 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 compute_pd_server_availability_zone: type: list required: true @@ -40,16 +58,18 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_0_subinterface_indicator: - type: list + port_pd01_port_1_order: + type: integer required: true status: SUPPORTED - entry_schema: - type: boolean vm_flavor_name: type: string required: true status: SUPPORTED + port_pd01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED port_pd01_port_1_network_role: type: string required: true @@ -58,86 +78,54 @@ node_types: type: integer required: true status: SUPPORTED - port_pd01_port_1_subnetpoolid: - type: string + port_pd01_port_1_vlan_requirements: + type: list required: true status: SUPPORTED - vm_image_name: - type: string + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_pd01_port_1_network_role_tag: + port_pd01_port_1_subnetpoolid: type: string required: true status: SUPPORTED - port_pd01_port_0_subnetpoolid: + vm_image_name: type: string required: true status: SUPPORTED - port_pd01_port_1_network: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - compute_pd_server_user_data_format: - type: list + port_pd01_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: string - port_pd01_port_0_network_role_tag: + port_pd01_port_1_network_role_tag: type: string required: true status: SUPPORTED - port_pd01_port_1_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - 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_1_subinterface_indicator: + port_pd01_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: boolean - port_pd01_port_1_order: - type: integer - required: true - status: SUPPORTED - port_pd01_port_0_exCP_naming: - type: org.openecomp.datatypes.Naming + type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_0_subnetpoolid: + type: string required: true status: SUPPORTED - port_pd01_port_1_vlan_requirements: + port_pd01_port_1_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd01_port_1_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_pd01_port_1_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_pd01_port_0_vlan_requirements: + type: string + compute_pd_server_user_data_format: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: string attributes: pd_server_accessIPv4: type: string diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/MainServiceTemplate.yaml index f1f724ca42..41f9b91758 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/MainServiceTemplate.yaml @@ -843,16 +843,24 @@ topology_template: is_required: false floating_ip_count_required: is_required: false + port_pd01_port_0_network_role_tag: oam + port_pd01_port_1_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: - get_input: - pd_server_names - 0 - port_pd01_port_0_subinterface_indicator: - - false vm_flavor_name: get_input: pd_flavor_name + port_pd01_port_1_mac_requirements: + mac_count_required: + is_required: false vm_image_name: get_input: pd_image_name port_pd01_port_1_network_role_tag: oam @@ -860,18 +868,6 @@ topology_template: - get_input: oam_net_name compute_pd_server_user_data_format: - RAW - port_pd01_port_0_network_role_tag: oam - port_pd01_port_1_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false - port_pd01_port_1_subinterface_indicator: - - false - port_pd01_port_1_mac_requirements: - mac_count_required: - is_required: false service_template_filter: substitute_service_template: Nested_pd_serverServiceTemplate.yaml count: 1 @@ -911,4 +907,4 @@ topology_template: - network_policy_port0 - network_policy_server - network_policy_port1 - - abstract_pd_server
\ No newline at end of file + - abstract_pd_server diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/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/oneComputeSamePortsAndGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml index 64e8423103..997d59b094 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/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/oneComputeSamePortsAndGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml @@ -24,9 +24,24 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role_tag: + type: string + required: true port_pd01_port_0_network_role: type: string required: true + port_pd01_port_1_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + constraints: + - greater_or_equal: 0 compute_pd_server_availability_zone: type: list required: true @@ -37,29 +52,46 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_0_subinterface_indicator: - type: list + port_pd01_port_1_order: + type: integer required: true - entry_schema: - type: boolean vm_flavor_name: type: string required: true + port_pd01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true port_pd01_port_1_network_role: type: string required: true port_pd01_port_0_order: type: integer required: true + port_pd01_port_1_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true port_pd01_port_1_subnetpoolid: type: string required: true vm_image_name: type: string required: true + port_pd01_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true port_pd01_port_1_network_role_tag: type: string required: true + port_pd01_port_0_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements port_pd01_port_0_subnetpoolid: type: string required: true @@ -73,48 +105,6 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_0_network_role_tag: - type: string - required: true - port_pd01_port_1_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - 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_1_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean - port_pd01_port_1_order: - type: integer - required: true - port_pd01_port_0_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_pd01_port_1_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd01_port_1_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_pd01_port_1_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_pd01_port_0_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements node_templates: pd_server: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server @@ -142,10 +132,7 @@ topology_template: get_input: port_pd01_port_1_exCP_naming vlan_requirements: get_input: port_pd01_port_1_vlan_requirements - subinterface_indicator: - get_input: - - port_pd01_port_1_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_pd01_port_1_ip_requirements network_role_tag: @@ -174,10 +161,7 @@ topology_template: get_input: port_pd01_port_0_exCP_naming vlan_requirements: get_input: port_pd01_port_0_vlan_requirements - subinterface_indicator: - get_input: - - port_pd01_port_0_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_pd01_port_0_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/samePortTypeAndOutParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml index 6d9b66fe62..32a7c0254d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -24,10 +24,28 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role_tag: + type: string + required: true + status: SUPPORTED port_pd01_port_0_network_role: type: string required: true status: SUPPORTED + port_pd01_port_1_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + 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 compute_pd_server_availability_zone: type: list required: true @@ -40,16 +58,18 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_0_subinterface_indicator: - type: list + port_pd01_port_1_order: + type: integer required: true status: SUPPORTED - entry_schema: - type: boolean vm_flavor_name: type: string required: true status: SUPPORTED + port_pd01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED port_pd01_port_1_network_role: type: string required: true @@ -58,86 +78,54 @@ node_types: type: integer required: true status: SUPPORTED - port_pd01_port_1_subnetpoolid: - type: string + port_pd01_port_1_vlan_requirements: + type: list required: true status: SUPPORTED - vm_image_name: - type: string + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_pd01_port_1_network_role_tag: + port_pd01_port_1_subnetpoolid: type: string required: true status: SUPPORTED - port_pd01_port_0_subnetpoolid: + vm_image_name: type: string required: true status: SUPPORTED - port_pd01_port_1_network: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - compute_pd_server_user_data_format: - type: list + port_pd01_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: string - port_pd01_port_0_network_role_tag: + port_pd01_port_1_network_role_tag: type: string required: true status: SUPPORTED - port_pd01_port_1_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - 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_1_subinterface_indicator: + port_pd01_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: boolean - port_pd01_port_1_order: - type: integer - required: true - status: SUPPORTED - port_pd01_port_0_exCP_naming: - type: org.openecomp.datatypes.Naming + type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_0_subnetpoolid: + type: string required: true status: SUPPORTED - port_pd01_port_1_vlan_requirements: + port_pd01_port_1_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd01_port_1_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_pd01_port_1_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_pd01_port_0_vlan_requirements: + type: string + compute_pd_server_user_data_format: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: string attributes: pd_server_pd01_port_0_device_id: type: string diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/MainServiceTemplate.yaml index fed463ac76..d35d65a2d4 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/MainServiceTemplate.yaml @@ -843,16 +843,24 @@ topology_template: is_required: false floating_ip_count_required: is_required: false + port_pd01_port_0_network_role_tag: oam + port_pd01_port_1_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: - get_input: - pd_server_names - 0 - port_pd01_port_0_subinterface_indicator: - - false vm_flavor_name: get_input: pd_flavor_name + port_pd01_port_1_mac_requirements: + mac_count_required: + is_required: false vm_image_name: get_input: pd_image_name port_pd01_port_1_network_role_tag: oam @@ -860,18 +868,6 @@ topology_template: - get_input: oam_net_name compute_pd_server_user_data_format: - RAW - port_pd01_port_0_network_role_tag: oam - port_pd01_port_1_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false - port_pd01_port_1_subinterface_indicator: - - false - port_pd01_port_1_mac_requirements: - mac_count_required: - is_required: false service_template_filter: substitute_service_template: Nested_pd_serverServiceTemplate.yaml count: 1 @@ -906,4 +902,4 @@ topology_template: value: get_attribute: - abstract_pd_server - - pd_server_accessIPv4
\ No newline at end of file + - pd_server_accessIPv4 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/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/samePortTypeAndOutParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml index f934f60a74..7f9ab67ca5 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/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/samePortTypeAndOutParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml @@ -24,9 +24,24 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role_tag: + type: string + required: true port_pd01_port_0_network_role: type: string required: true + port_pd01_port_1_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + constraints: + - greater_or_equal: 0 compute_pd_server_availability_zone: type: list required: true @@ -37,29 +52,46 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_0_subinterface_indicator: - type: list + port_pd01_port_1_order: + type: integer required: true - entry_schema: - type: boolean vm_flavor_name: type: string required: true + port_pd01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true port_pd01_port_1_network_role: type: string required: true port_pd01_port_0_order: type: integer required: true + port_pd01_port_1_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true port_pd01_port_1_subnetpoolid: type: string required: true vm_image_name: type: string required: true + port_pd01_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true port_pd01_port_1_network_role_tag: type: string required: true + port_pd01_port_0_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements port_pd01_port_0_subnetpoolid: type: string required: true @@ -73,48 +105,6 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_0_network_role_tag: - type: string - required: true - port_pd01_port_1_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - 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_1_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean - port_pd01_port_1_order: - type: integer - required: true - port_pd01_port_0_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_pd01_port_1_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd01_port_1_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_pd01_port_1_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_pd01_port_0_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements node_templates: pd_server: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server @@ -142,10 +132,7 @@ topology_template: get_input: port_pd01_port_1_exCP_naming vlan_requirements: get_input: port_pd01_port_1_vlan_requirements - subinterface_indicator: - get_input: - - port_pd01_port_1_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_pd01_port_1_ip_requirements network_role_tag: @@ -174,10 +161,7 @@ topology_template: get_input: port_pd01_port_0_exCP_naming vlan_requirements: get_input: port_pd01_port_0_vlan_requirements - subinterface_indicator: - get_input: - - port_pd01_port_0_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_pd01_port_0_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/threeDiffComputesWithAllConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml index 1eadc23a94..2b4345e681 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -68,12 +68,6 @@ 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 @@ -502,12 +496,6 @@ 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 @@ -963,12 +951,6 @@ 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 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/MainServiceTemplate.yaml index db4109d81a..8002f73309 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/MainServiceTemplate.yaml @@ -413,8 +413,6 @@ topology_template: is_required: false port_pd01_port_network: - get_input: oam_net_name - port_pd01_port_subinterface_indicator: - - false port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW @@ -467,8 +465,6 @@ topology_template: - get_attribute: - network_policy_server - name - port_pd01_port_subinterface_indicator: - - false service_template_filter: substitute_service_template: Nested_ps_serverServiceTemplate.yaml count: 1 @@ -508,8 +504,6 @@ topology_template: is_required: false port_pd01_port_network: - get_input: oam_net_name - port_pd01_port_subinterface_indicator: - - false compute_oam_server_user_data_format: - RAW compute_oam_server_name: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_oam_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_oam_serverServiceTemplate.yaml index ab73989d32..da16719710 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_oam_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_oam_serverServiceTemplate.yaml @@ -50,11 +50,6 @@ 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,10 +94,7 @@ 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 + subinterface_indicator: false 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/threeDiffComputesWithAllConnectivities/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/threeDiffComputesWithAllConnectivities/out/Nested_pd_serverServiceTemplate.yaml index cb03463f31..c5ea7736e5 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/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/threeDiffComputesWithAllConnectivities/out/Nested_pd_serverServiceTemplate.yaml @@ -60,11 +60,6 @@ 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 @@ -122,10 +117,7 @@ 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 + subinterface_indicator: false 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/threeDiffComputesWithAllConnectivities/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_ps_serverServiceTemplate.yaml index 554ecbf1d6..e634dcdf84 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_ps_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_ps_serverServiceTemplate.yaml @@ -65,11 +65,6 @@ 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,10 +94,7 @@ 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 + subinterface_indicator: false 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/threeDiffComputesWithPorts/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/GlobalSubstitutionTypesServiceTemplate.yaml index 7216b0c255..6f6eb39722 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -56,12 +56,6 @@ 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 @@ -477,12 +471,6 @@ 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 @@ -916,12 +904,6 @@ 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 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/MainServiceTemplate.yaml index aa673f97b7..0bb61d1682 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/MainServiceTemplate.yaml @@ -350,8 +350,6 @@ topology_template: is_required: false port_pd01_port_network: - get_input: oam_net_name - port_pd01_port_subinterface_indicator: - - false port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW @@ -395,8 +393,6 @@ topology_template: - get_attribute: - network_policy_server - name - port_pd01_port_subinterface_indicator: - - false service_template_filter: substitute_service_template: Nested_ps_serverServiceTemplate.yaml count: 1 @@ -429,8 +425,6 @@ topology_template: is_required: false port_pd01_port_network: - get_input: oam_net_name - port_pd01_port_subinterface_indicator: - - false compute_oam_server_user_data_format: - RAW compute_oam_server_name: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_oam_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_oam_serverServiceTemplate.yaml index 38592a2bf8..bae9f9e1b5 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_oam_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_oam_serverServiceTemplate.yaml @@ -45,11 +45,6 @@ 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 @@ -85,10 +80,7 @@ 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 + subinterface_indicator: false 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/threeDiffComputesWithPorts/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/threeDiffComputesWithPorts/out/Nested_pd_serverServiceTemplate.yaml index 54070a9852..9ce1d48341 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/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/threeDiffComputesWithPorts/out/Nested_pd_serverServiceTemplate.yaml @@ -50,11 +50,6 @@ 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 @@ -104,10 +99,7 @@ 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 + subinterface_indicator: false 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/threeDiffComputesWithPorts/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_ps_serverServiceTemplate.yaml index cf6052bf9f..4012ad45ce 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_ps_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_ps_serverServiceTemplate.yaml @@ -55,11 +55,6 @@ 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 @@ -85,10 +80,7 @@ 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 + subinterface_indicator: false 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/threeNovaSameTypeWithGetAttrFromPort/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/GlobalSubstitutionTypesServiceTemplate.yaml index 41c744d8b4..abab5c3f7f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -50,12 +50,6 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean port_pd01_port_order: type: integer required: true @@ -471,12 +465,6 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean port_pd01_port_order: type: integer required: true @@ -898,12 +886,6 @@ 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 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/MainServiceTemplate.yaml index 502f8fa595..7863e55a5b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/MainServiceTemplate.yaml @@ -361,8 +361,6 @@ topology_template: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_subinterface_indicator: - - false compute_pd_server_user_data_format: - RAW service_template_filter: @@ -399,8 +397,6 @@ topology_template: is_required: false port_pd01_port_network: - get_input: oam_net_name - port_pd01_port_subinterface_indicator: - - false port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW @@ -441,8 +437,6 @@ topology_template: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_subinterface_indicator: - - false compute_pd_server_user_data_format: - RAW service_template_filter: @@ -464,4 +458,4 @@ topology_template: - network_policy_server - abstract_pd_server - abstract_pd_server_1 - - abstract_pd_server_2
\ No newline at end of file + - abstract_pd_server_2 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/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/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_serverServiceTemplate.yaml index e360446048..9a5769b7cc 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/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/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_serverServiceTemplate.yaml @@ -45,11 +45,6 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean port_pd01_port_order: type: integer required: true @@ -99,10 +94,7 @@ 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 + subinterface_indicator: false 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/threeNovaSameTypeWithGetAttrFromPort/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/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_server_1ServiceTemplate.yaml index 474984e929..61ca45bec6 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/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/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_server_1ServiceTemplate.yaml @@ -45,11 +45,6 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean port_pd01_port_order: type: integer required: true @@ -99,10 +94,7 @@ 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 + subinterface_indicator: false 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/threeNovaSameTypeWithGetAttrFromPort/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/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_server_2ServiceTemplate.yaml index e133a985b5..8c0ba00c86 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/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/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_server_2ServiceTemplate.yaml @@ -50,11 +50,6 @@ 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 @@ -104,10 +99,7 @@ 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 + subinterface_indicator: false 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/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 0f03728659..dd92ac4351 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,12 +56,6 @@ 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 @@ -483,12 +477,6 @@ 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 @@ -870,6 +858,18 @@ 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 @@ -902,6 +902,10 @@ 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 @@ -924,70 +928,42 @@ node_types: type: string required: true status: SUPPORTED - port_pd01_port_2_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean port_pd01_port_2_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd01_port_2_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - compute_pd_server_user_data_format: + port_pd01_port_3_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd01_port_2_ip_requirements: - type: list + type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_2_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_3_order: - type: integer + port_pd01_port_2_exCP_naming: + type: org.openecomp.datatypes.Naming 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 + port_pd01_port_3_network_role_tag: + type: string required: true status: SUPPORTED - port_pd01_port_3_subinterface_indicator: + compute_pd_server_user_data_format: type: list required: true status: SUPPORTED entry_schema: - type: boolean - port_pd01_port_3_vlan_requirements: + type: string + port_pd01_port_2_ip_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 + type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_3_exCP_naming: type: org.openecomp.datatypes.Naming required: true 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 79f14b2199..344d34ea74 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 @@ -350,8 +350,6 @@ topology_template: is_required: false port_pd01_port_network: - get_input: oam_net_name - port_pd01_port_subinterface_indicator: - - false port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW @@ -385,17 +383,19 @@ 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: - - false 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: @@ -404,12 +404,6 @@ 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: - - false - port_pd01_port_3_network_role_tag: oam service_template_filter: substitute_service_template: Nested_pd_server_2ServiceTemplate.yaml count: 1 @@ -453,8 +447,6 @@ topology_template: - get_attribute: - network_policy_server - name - port_pd01_port_subinterface_indicator: - - false compute_pd_server_user_data_format: - RAW service_template_filter: @@ -475,4 +467,4 @@ topology_template: - network_policy_server - abstract_pd_server - abstract_pd_server_1 - - abstract_pd_server_2
\ No newline at end of file + - abstract_pd_server_2 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 54070a9852..9ce1d48341 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,11 +50,6 @@ 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 @@ -104,10 +99,7 @@ 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 + subinterface_indicator: false 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 c5324d5469..f875aad129 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,11 +50,6 @@ 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 @@ -104,10 +99,7 @@ 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 + subinterface_indicator: false 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 84b2aec4a7..2ab72c8a16 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,6 +17,16 @@ 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 @@ -43,6 +53,9 @@ 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 @@ -60,19 +73,25 @@ topology_template: port_pd01_port_3_subnetpoolid: type: string required: true - port_pd01_port_2_subinterface_indicator: + port_pd01_port_2_network: type: list required: true entry_schema: - type: boolean - port_pd01_port_2_network: + type: string + port_pd01_port_3_vlan_requirements: type: list required: true entry_schema: - type: string + type: org.openecomp.datatypes.network.VlanRequirements 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 @@ -83,35 +102,6 @@ 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 @@ -142,10 +132,7 @@ 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 + subinterface_indicator: false ip_requirements: get_input: port_pd01_port_2_ip_requirements network_role_tag: @@ -174,10 +161,7 @@ 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 + subinterface_indicator: false ip_requirements: get_input: port_pd01_port_3_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/twoComputesWithGetAttrBetweenThem/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/GlobalSubstitutionTypesServiceTemplate.yaml index 8cef821fd7..575f1f3d1e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -56,12 +56,6 @@ 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 @@ -479,12 +473,6 @@ node_types: type: string required: true status: SUPPORTED - port_ps01_port_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean port_ps01_port_order: type: integer required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/MainServiceTemplate.yaml index c59fb848b5..4d445e467c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/MainServiceTemplate.yaml @@ -706,8 +706,6 @@ topology_template: is_required: false port_pd01_port_network: - get_input: oam_net_name - port_pd01_port_subinterface_indicator: - - false port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW @@ -734,8 +732,6 @@ topology_template: - RAW vm_flavor_name: get_input: pd_flavor_name - port_ps01_port_subinterface_indicator: - - false vm_image_name: get_attribute: - abstract_pd_server diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/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/twoComputesWithGetAttrBetweenThem/out/Nested_pd_serverServiceTemplate.yaml index ff163d0573..633da82add 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/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/twoComputesWithGetAttrBetweenThem/out/Nested_pd_serverServiceTemplate.yaml @@ -50,11 +50,6 @@ 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 @@ -104,10 +99,7 @@ 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 + subinterface_indicator: false 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/twoComputesWithGetAttrBetweenThem/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/Nested_ps_serverServiceTemplate.yaml index 2109090026..0e6bc63fdb 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/Nested_ps_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/Nested_ps_serverServiceTemplate.yaml @@ -44,11 +44,6 @@ topology_template: vm_flavor_name: type: string required: true - port_ps01_port_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean port_ps01_port_order: type: integer required: true @@ -104,10 +99,7 @@ topology_template: get_input: port_ps01_port_exCP_naming vlan_requirements: get_input: port_ps01_port_vlan_requirements - subinterface_indicator: - get_input: - - port_ps01_port_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_ps01_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/twoSetsOfSingle/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/GlobalSubstitutionTypesServiceTemplate.yaml index 603bceea9a..e2792b59fb 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -56,12 +56,6 @@ 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 @@ -475,12 +469,6 @@ node_types: type: string required: true status: SUPPORTED - port_ps01_port_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean port_ps01_port_order: type: integer required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/MainServiceTemplate.yaml index a349637b7a..3fe02b86e4 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/MainServiceTemplate.yaml @@ -704,8 +704,6 @@ topology_template: is_required: false port_pd01_port_network: - get_input: oam_net_name - port_pd01_port_subinterface_indicator: - - false port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW @@ -732,8 +730,6 @@ topology_template: - RAW vm_flavor_name: get_input: pd_flavor_name - port_ps01_port_subinterface_indicator: - - false vm_image_name: get_input: pd_image_name port_ps01_port_mac_requirements: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/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/twoSetsOfSingle/out/Nested_pd_serverServiceTemplate.yaml index 54070a9852..9ce1d48341 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/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/twoSetsOfSingle/out/Nested_pd_serverServiceTemplate.yaml @@ -50,11 +50,6 @@ 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 @@ -104,10 +99,7 @@ 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 + subinterface_indicator: false 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/twoSetsOfSingle/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/Nested_ps_serverServiceTemplate.yaml index 5a5d97e43f..86a0b0dbba 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/Nested_ps_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/Nested_ps_serverServiceTemplate.yaml @@ -44,11 +44,6 @@ topology_template: vm_flavor_name: type: string required: true - port_ps01_port_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean port_ps01_port_order: type: integer required: true @@ -104,10 +99,7 @@ topology_template: get_input: port_ps01_port_exCP_naming vlan_requirements: get_input: port_ps01_port_vlan_requirements - subinterface_indicator: - get_input: - - port_ps01_port_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_ps01_port_ip_requirements network_role_tag: |