From d60b2a40c15c5952f8a31e2d2aa4be2cf4837fc8 Mon Sep 17 00:00:00 2001 From: siddharth0905 Date: Thu, 12 Apr 2018 19:29:57 +0530 Subject: Subinterface_indicator property issue It should only be present under port implementation Change-Id: I8b52905c5e5c888cf384bebf1d23168c7906b004 Issue-ID: SDC-1183 Signed-off-by: siddharth0905 --- .../GlobalSubstitutionTypesServiceTemplate.yaml | 92 ++++++++++------------ .../out/MainServiceTemplate.yaml | 16 ++-- .../out/Nested_pd_serverServiceTemplate.yaml | 92 +++++++++------------- 3 files changed, 84 insertions(+), 116 deletions(-) (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut') 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: -- cgit 1.2.3-korg