diff options
author | 2018-04-12 19:29:57 +0530 | |
---|---|---|
committer | 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/computewithtwosameporttypes4 | |
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/computewithtwosameporttypes4')
3 files changed, 82 insertions, 114 deletions
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: |