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 | 294 ------------------- .../GlobalSubstitutionTypesServiceTemplate.yaml | 324 --------------------- 2 files changed, 618 deletions(-) (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/pattern4') diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/pattern4/oneNestedNode/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/pattern4/oneNestedNode/out/GlobalSubstitutionTypesServiceTemplate.yaml index 7f16b2ff14..a424a5d19b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/pattern4/oneNestedNode/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/pattern4/oneNestedNode/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -329,297 +329,3 @@ node_types: occurrences: - 1 - UNBOUNDED - org.openecomp.resource.vfc.nodes.heat.pcm_server: - derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server - properties: - availabilityzone_name: - type: string - description: availabilityzone name - required: true - status: SUPPORTED - oam_net_gw: - type: string - description: CPS network gateway - required: true - status: SUPPORTED - pcm_image_name: - type: string - description: PCRF CM image name - required: true - status: SUPPORTED - cps_net_ips: - type: string - description: CPS network ip - required: true - status: SUPPORTED - security_group_name: - type: string - description: the name of security group - required: true - status: SUPPORTED - cps_net_ip: - type: string - description: CPS network ip - required: true - status: SUPPORTED - pcm_volumes: - type: string - description: CPS Cluman Cinder Volume - required: true - status: SUPPORTED - pcm_flavor_name: - type: string - description: flavor name of PCRF CM instance - required: true - status: SUPPORTED - pcm_vol: - type: string - description: CPS Cluman Cinder Volume - required: true - status: SUPPORTED - pcm_server_name: - type: string - description: PCRF CM server name - required: true - status: SUPPORTED - cps_net_name: - type: string - description: CPS network name - required: true - status: SUPPORTED - cps_net_mask: - type: string - description: CPS network mask - required: true - status: SUPPORTED - oam_net_ip: - type: string - description: OAM network ip - required: true - status: SUPPORTED - oam_net_mask: - type: string - description: CPS network mask - required: true - status: SUPPORTED - oam_net_name: - type: string - description: OAM network name - required: true - status: SUPPORTED - attributes: - server_pcm_id: - type: string - description: the pcm nova service id - status: SUPPORTED - requirements: - - link_pcm_port_1: - capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - - local_storage_server_pcm: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo - occurrences: - - 0 - - UNBOUNDED - - link_pcm_port_1_server_pcm_005: - capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - - local_storage_server_pcm_server_pcm_005: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo - occurrences: - - 0 - - UNBOUNDED - - link_pcm_port_0_server_pcm_005: - capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - - link_pcm_port_0: - capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - capabilities: - endpoint_server_pcm: - type: tosca.capabilities.Endpoint.Admin - occurrences: - - 1 - - UNBOUNDED - feature_network_server_pcm_005: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - host_server_pcm_server_pcm_005: - type: tosca.capabilities.Container - valid_source_types: - - tosca.nodes.SoftwareComponent - occurrences: - - 1 - - UNBOUNDED - binding_server_pcm_server_pcm_005: - type: tosca.capabilities.network.Bindable - occurrences: - - 1 - - UNBOUNDED - scalable_server_pcm_server_pcm_005: - type: tosca.capabilities.Scalable - occurrences: - - 1 - - UNBOUNDED - endpoint_server_pcm_server_pcm_005: - type: tosca.capabilities.Endpoint.Admin - occurrences: - - 1 - - UNBOUNDED - attachment_network: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - binding_pcm_port_1_server_pcm_005: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED - attachment_pcm_port_0_server_pcm_005: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - link_network_server_pcm_005: - type: tosca.capabilities.network.Linkable - occurrences: - - 1 - - UNBOUNDED - scalable_server_pcm: - type: tosca.capabilities.Scalable - occurrences: - - 1 - - UNBOUNDED - feature_server_pcm_server_pcm_005: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - feature_network: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - binding_pcm_port_0_server_pcm_005: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED - feature_server_pcm_005: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - host_server_pcm: - type: tosca.capabilities.Container - valid_source_types: - - tosca.nodes.SoftwareComponent - occurrences: - - 1 - - UNBOUNDED - os_server_pcm_server_pcm_005: - type: tosca.capabilities.OperatingSystem - occurrences: - - 1 - - UNBOUNDED - feature_pcm_port_0_server_pcm_005: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - attachment_network_server_pcm_005: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - binding_server_pcm: - type: tosca.capabilities.network.Bindable - occurrences: - - 1 - - UNBOUNDED - binding_pcm_port_0: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED - binding_pcm_port_1: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED - link_network: - type: tosca.capabilities.network.Linkable - occurrences: - - 1 - - UNBOUNDED - os_server_pcm: - type: tosca.capabilities.OperatingSystem - occurrences: - - 1 - - UNBOUNDED - feature_server_pcm: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - feature_pcm_port_1: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - feature_pcm_port_0: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - feature_pcm_port_1_server_pcm_005: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - attachment_pcm_port_0: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - attachment_pcm_port_1: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - attachment_pcm_port_1_server_pcm_005: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/pattern4/twoNestedWithOneCompute/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/pattern4/twoNestedWithOneCompute/out/GlobalSubstitutionTypesServiceTemplate.yaml index 217eb69b16..22cf58d6f6 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/pattern4/twoNestedWithOneCompute/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/pattern4/twoNestedWithOneCompute/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -275,168 +275,6 @@ node_types: occurrences: - 0 - UNBOUNDED - org.openecomp.resource.vfc.nodes.heat.pcm_server: - derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server - properties: - availabilityzone_name: - type: string - description: availabilityzone name - required: true - status: SUPPORTED - oam_net_gw: - type: string - description: CPS network gateway - required: true - status: SUPPORTED - pcm_image_name: - type: string - description: PCRF CM image name - required: true - status: SUPPORTED - security_group_name: - type: string - description: the name of security group - required: true - status: SUPPORTED - cps_net_ip: - type: string - description: CPS network ip - required: true - status: SUPPORTED - pcm_flavor_name: - type: string - description: flavor name of PCRF CM instance - required: true - status: SUPPORTED - pcm_vol: - type: string - description: CPS Cluman Cinder Volume - required: true - status: SUPPORTED - pcm_server_name: - type: string - description: PCRF CM server name - required: true - status: SUPPORTED - cps_net_name: - type: string - description: CPS network name - required: true - status: SUPPORTED - cps_net_mask: - type: string - description: CPS network mask - required: true - status: SUPPORTED - oam_net_ip: - type: string - description: OAM network ip - required: true - status: SUPPORTED - oam_net_mask: - type: string - description: CPS network mask - required: true - status: SUPPORTED - oam_net_name: - type: string - description: OAM network name - required: true - status: SUPPORTED - attributes: - server_pcm_id: - type: string - description: the pcm nova service id - status: SUPPORTED - requirements: - - link_pcm_port_1: - capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - - local_storage_server_pcm: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo - occurrences: - - 0 - - UNBOUNDED - - link_pcm_port_0: - capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - capabilities: - endpoint_server_pcm: - type: tosca.capabilities.Endpoint.Admin - occurrences: - - 1 - - UNBOUNDED - os_server_pcm: - type: tosca.capabilities.OperatingSystem - occurrences: - - 1 - - UNBOUNDED - host_server_pcm: - type: tosca.capabilities.Container - valid_source_types: - - tosca.nodes.SoftwareComponent - occurrences: - - 1 - - UNBOUNDED - feature_server_pcm: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - feature_pcm_port_1: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - scalable_server_pcm: - type: tosca.capabilities.Scalable - occurrences: - - 1 - - UNBOUNDED - feature_pcm_port_0: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - binding_server_pcm: - type: tosca.capabilities.network.Bindable - occurrences: - - 1 - - UNBOUNDED - attachment_pcm_port_0: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - attachment_pcm_port_1: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - binding_pcm_port_0: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED - binding_pcm_port_1: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED org.openecomp.resource.abstract.nodes.heat.oam_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: @@ -599,165 +437,3 @@ node_types: occurrences: - 0 - UNBOUNDED - org.openecomp.resource.vfc.nodes.heat.oam_server: - derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server - properties: - availabilityzone_name: - type: string - description: availabilityzone name - required: true - status: SUPPORTED - oam_net_gw: - type: string - description: CPS network gateway - required: true - status: SUPPORTED - oam_flavor_name: - type: string - description: flavor name of PCRF CM instance - required: true - status: SUPPORTED - security_group_name: - type: string - description: the name of security group - required: true - status: SUPPORTED - cps_net_ip: - type: string - description: CPS network ip - required: true - status: SUPPORTED - oam_server_name: - type: string - description: oam server name - required: true - status: SUPPORTED - pcm_vol: - type: string - description: CPS Cluman Cinder Volume - required: true - status: SUPPORTED - oam_image_name: - type: string - description: oam image name - required: true - status: SUPPORTED - cps_net_name: - type: string - description: CPS network name - required: true - status: SUPPORTED - cps_net_mask: - type: string - description: CPS network mask - required: true - status: SUPPORTED - oam_net_ip: - type: string - description: OAM network ip - required: true - status: SUPPORTED - oam_net_mask: - type: string - description: CPS network mask - required: true - status: SUPPORTED - oam_net_name: - type: string - description: OAM network name - required: true - status: SUPPORTED - attributes: - server_oam_id: - type: string - description: the oam nova service id - status: SUPPORTED - requirements: - - local_storage_server_oam: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo - occurrences: - - 0 - - UNBOUNDED - - link_pcm_port_1: - capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - - link_pcm_port_0: - capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - capabilities: - host_server_oam: - type: tosca.capabilities.Container - valid_source_types: - - tosca.nodes.SoftwareComponent - occurrences: - - 1 - - UNBOUNDED - endpoint_server_oam: - type: tosca.capabilities.Endpoint.Admin - occurrences: - - 1 - - UNBOUNDED - os_server_oam: - type: tosca.capabilities.OperatingSystem - occurrences: - - 1 - - UNBOUNDED - feature_server_oam: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - feature_pcm_port_1: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - scalable_server_oam: - type: tosca.capabilities.Scalable - occurrences: - - 1 - - UNBOUNDED - feature_pcm_port_0: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - binding_server_oam: - type: tosca.capabilities.network.Bindable - occurrences: - - 1 - - UNBOUNDED - attachment_pcm_port_0: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - attachment_pcm_port_1: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - binding_pcm_port_0: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED - binding_pcm_port_1: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED -- cgit 1.2.3-korg