From 100491b13595ffeb8f847fc25b46192b607118af Mon Sep 17 00:00:00 2001 From: talio Date: Mon, 2 Oct 2017 13:54:55 +0300 Subject: Change node template prefix Add "".compute" to nested compute node types in substitution service templates Issue - Id : SDC-425 Change-Id: I00902576a3adf8d0463ef1352961629663efd96c Signed-off-by: talio --- .../GlobalSubstitutionTypesServiceTemplate.yaml | 99 +--------------------- .../out/Nested_smpServiceTemplate.yaml | 4 +- 2 files changed, 3 insertions(+), 100 deletions(-) (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out') 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 9ff132bd99..b88f5d84f4 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 @@ -5,103 +5,6 @@ imports: - openecomp_heat_index: file: openecomp-heat/_index.yml node_types: - org.openecomp.resource.vfc.nodes.heat.smp: - derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server - properties: - port_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_port_network: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - compute_smp_name: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_port_subnetpoolid: - 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 - compute_smp_availability_zone: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_port_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_port_network_role_tag: - type: string - required: true - status: SUPPORTED - vm_flavor_name: - type: string - required: true - status: SUPPORTED - compute_smp_user_data_format: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_port_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_port_network_role: - type: string - required: true - status: SUPPORTED - vm_image_name: - type: string - required: true - status: SUPPORTED - compute_smp_metadata: - type: list - required: true - status: SUPPORTED - entry_schema: - type: json - port_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_port_replacement_policy: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_port_order: - type: integer - required: true - status: SUPPORTED - compute_smp_scheduler_hints: - type: list - required: true - status: SUPPORTED - entry_schema: - type: json org.openecomp.resource.abstract.nodes.smp: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: @@ -534,4 +437,4 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - - UNBOUNDED \ No newline at end of file + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/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 61eebac0d2..6277e3744c 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 @@ -7,7 +7,7 @@ imports: - GlobalSubstitutionTypes: file: GlobalSubstitutionTypesServiceTemplate.yaml node_types: - org.openecomp.resource.vfc.nodes.heat.smp: + org.openecomp.resource.vfc.compute.nodes.heat.smp: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: @@ -121,7 +121,7 @@ topology_template: node: smp relationship: tosca.relationships.network.BindsTo smp: - type: org.openecomp.resource.vfc.nodes.heat.smp + type: org.openecomp.resource.vfc.compute.nodes.heat.smp properties: availability_zone: get_input: -- cgit 1.2.3-korg