From b8e2faf476202b6ffe61bc3a9a37df1304881d40 Mon Sep 17 00:00:00 2001 From: Avi Ziv Date: Tue, 18 Jul 2017 19:45:38 +0300 Subject: [SDC] Onboarding 1710 rebase. Change-Id: If3b6b81d221fde13908f1e8160db6f7d9433c535 Signed-off-by: Avi Ziv --- .../noConsolidation/in/MainServiceTemplate.yaml | 4 +- .../GlobalSubstitutionTypesServiceTemplate.yaml | 38 ++++++--------- .../out/SubstitutionServiceTemplate.yaml | 54 +++++++++------------- 3 files changed, 36 insertions(+), 60 deletions(-) (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation') diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/in/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/in/MainServiceTemplate.yaml index 30ec112f14..d896f4bda2 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/in/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/in/MainServiceTemplate.yaml @@ -379,8 +379,8 @@ topology_template: cmaui_volume1: type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume properties: - volume_type: {get_attribute: [ FSB1_template, addresses, {get_attribute: [ FSB2_Internal2,index ] } ]} - size: { get_attribute: [FSB1_Internal1, addresses, get_input: [CMAUI_volume_type,{get_attribute: [FSB1_OAM,oam_index ] }], 0, "OS-EXT-IPS-MAC:mac_addr"] } + volume_type: {get_attribute: [ FSB1_template, addresses, {get_attribute: [ FSB2_Internal2,tenant_id ] } ]} + size: { get_attribute: [FSB1_Internal1, device_owner, get_input: [CMAUI_volume_type,{get_attribute: [FSB1_OAM,status ] }], 0, "OS-EXT-IPS-MAC:mac_addr"] } cmaui_volume2: type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume properties: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml index 6ff916ceb2..d2ea7e94b4 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -161,41 +161,29 @@ node_types: required: true status: SUPPORTED attributes: - FSB1_FSB1_Internal_network_id: - type: list + FSB1_FSB_OAM_status: + type: string status: SUPPORTED - entry_schema: - type: string - FSB1_FSB1_Internal_addresses: - type: list + FSB1_FSB2_Internal_tenant_id: + type: string + status: SUPPORTED + FSB1_FSB1_Internal_network_id: + type: string status: SUPPORTED - entry_schema: - type: string FSB1_accessIPv6: - type: list + type: string status: SUPPORTED - entry_schema: - type: string FSB1_addresses: - type: list + type: map status: SUPPORTED entry_schema: - type: string + type: org.openecomp.datatypes.heat.novaServer.network.AddressInfo FSB1_FSB2_Internal_network_id: - type: list - status: SUPPORTED - entry_schema: - type: string - FSB1_FSB2_Internal_index: - type: list + type: string status: SUPPORTED - entry_schema: - type: string - FSB1_FSB_OAM_oam_index: - type: list + FSB1_FSB1_Internal_device_owner: + type: string status: SUPPORTED - entry_schema: - type: string requirements: - dependency_FSB1_FSB1_Internal: capability: tosca.capabilities.Node diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/out/SubstitutionServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/out/SubstitutionServiceTemplate.yaml index af4ed4e441..7112a172e7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/out/SubstitutionServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/out/SubstitutionServiceTemplate.yaml @@ -242,62 +242,50 @@ topology_template: type: tosca.artifacts.Deployment file: ../Artifacts/nimbus-ethernet outputs: - FSB1_FSB1_Internal_network_id: - type: list + FSB1_FSB_OAM_status: + type: string value: get_attribute: - - FSB1_FSB1_Internal - - network_id - entry_schema: - type: string - FSB1_FSB1_Internal_addresses: - type: list + - FSB1_FSB_OAM + - status + FSB1_FSB2_Internal_tenant_id: + type: string + value: + get_attribute: + - FSB1_FSB2_Internal + - tenant_id + FSB1_FSB1_Internal_network_id: + type: string value: get_attribute: - FSB1_FSB1_Internal - - addresses - entry_schema: - type: string + - network_id FSB1_accessIPv6: - type: list + type: string value: get_attribute: - FSB1 - accessIPv6 - entry_schema: - type: string FSB1_addresses: - type: list + type: map value: get_attribute: - FSB1 - addresses entry_schema: - type: string + type: org.openecomp.datatypes.heat.novaServer.network.AddressInfo FSB1_FSB2_Internal_network_id: - type: list + type: string value: get_attribute: - FSB1_FSB2_Internal - network_id - entry_schema: - type: string - FSB1_FSB2_Internal_index: - type: list - value: - get_attribute: - - FSB1_FSB2_Internal - - index - entry_schema: - type: string - FSB1_FSB_OAM_oam_index: - type: list + FSB1_FSB1_Internal_device_owner: + type: string value: get_attribute: - - FSB1_FSB_OAM - - oam_index - entry_schema: - type: string + - FSB1_FSB1_Internal + - device_owner substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.FSB1 capabilities: -- cgit 1.2.3-korg