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 | 87 +--------------------- .../out/Nested_cmauiServiceTemplate.yaml | 4 +- 2 files changed, 3 insertions(+), 88 deletions(-) (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance') diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance/out/GlobalSubstitutionTypesServiceTemplate.yaml index 732e0000f1..3113acf1d8 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -426,91 +426,6 @@ node_types: occurrences: - 1 - UNBOUNDED - org.openecomp.resource.vfc.nodes.heat.cmaui: - derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server - properties: - port_cmaui_port_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_cmaui_port_fixed_ips: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_cmaui_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_cmaui_port_network: - 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_cmaui_port_network_role_tag: - type: string - required: true - status: SUPPORTED - port_cmaui_port_order: - type: integer - required: true - status: SUPPORTED - vm_flavor_name: - type: string - required: true - status: SUPPORTED - compute_cmaui_name: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_cmaui_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - compute_cmaui_availability_zone: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_cmaui_port_replacement_policy: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_cmaui_port_network_role: - type: string - required: true - status: SUPPORTED - vm_image_name: - type: string - required: true - status: SUPPORTED - port_cmaui_port_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_cmaui_port_subnetpoolid: - type: string - required: true - status: SUPPORTED org.openecomp.resource.abstract.nodes.heat.nested1: derived_from: org.openecomp.resource.abstract.nodes.AbstractSubstitute properties: @@ -1230,4 +1145,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/nestedOtherScenarios/oneLevel/nestedScalingInstance/out/Nested_cmauiServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance/out/Nested_cmauiServiceTemplate.yaml index 5ac5b94acf..475aefd1e7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance/out/Nested_cmauiServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance/out/Nested_cmauiServiceTemplate.yaml @@ -7,7 +7,7 @@ imports: - GlobalSubstitutionTypes: file: GlobalSubstitutionTypesServiceTemplate.yaml node_types: - org.openecomp.resource.vfc.nodes.heat.cmaui: + org.openecomp.resource.vfc.compute.nodes.heat.cmaui: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: @@ -113,7 +113,7 @@ topology_template: node: cmaui relationship: tosca.relationships.network.BindsTo cmaui: - type: org.openecomp.resource.vfc.nodes.heat.cmaui + type: org.openecomp.resource.vfc.compute.nodes.heat.cmaui properties: availability_zone: get_input: -- cgit 1.2.3-korg