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 --- .../GlobalSubstitutionTypesServiceTemplate.yaml | 38 ++++++--------- .../out/SubstitutionServiceTemplate.yaml | 54 +++++++++------------- 2 files changed, 34 insertions(+), 58 deletions(-) (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/out') diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml index 9965624256..a42219e96f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -179,41 +179,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/WithOutputParameters/noConsolidation/out/SubstitutionServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/out/SubstitutionServiceTemplate.yaml index 106cdcd388..b9e572afae 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/out/SubstitutionServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/out/SubstitutionServiceTemplate.yaml @@ -262,62 +262,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