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 --- .../consolidation/in/MainServiceTemplate.yaml | 6 +++--- .../consolidation/out/MainServiceTemplate.yaml | 10 +++++----- .../noConsolidation/in/MainServiceTemplate.yaml | 4 ++-- .../noConsolidation/out/MainServiceTemplate.yaml | 6 +++--- 4 files changed, 13 insertions(+), 13 deletions(-) (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updOutputGetAttrIn') diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updOutputGetAttrIn/consolidation/in/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updOutputGetAttrIn/consolidation/in/MainServiceTemplate.yaml index 784a841cad..b26f74ace5 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updOutputGetAttrIn/consolidation/in/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updOutputGetAttrIn/consolidation/in/MainServiceTemplate.yaml @@ -324,10 +324,10 @@ topology_template: simpleOutput2: value: {get_attribute: [ FSB2_template, addresses, key1 ] } complexOutput1: - value: {get_attribute: [ FSB1_template, addresses, {get_attribute: [ FSB2_Internal2,index ] } ]} + value: {get_attribute: [ FSB1_template, addresses, {get_attribute: [ FSB2_Internal2,tenant_id ] } ]} complexOutput2: description: cgi fw01 left interface Mac-Address - value: { get_attribute: [FSB1_Internal2, addresses, get_input: [CMAUI_volume_type, {get_attribute: [FSB2_Internal1,oam_index ] }], 0, "OS-EXT-IPS-MAC:mac_addr"] } + value: { get_attribute: [FSB1_Internal2, addresses, get_input: [CMAUI_volume_type, {get_attribute: [FSB2_Internal1,user_data_format ] }], 0, "OS-EXT-IPS-MAC:mac_addr"] } complexOutput3: description: cgi fw01 left interface Mac-Address - value: { get_input: [a, addresses, get_input: [CMAUI_volume_type, {get_attribute: [FSB1_Internal1,accessIPv6 ] }], 0, "OS-EXT-IPS-MAC:mac_addr"] } + value: { get_input: [a, addresses, get_input: [CMAUI_volume_type, {get_attribute: [FSB1_Internal1,admin_state_up ] }], 0, "OS-EXT-IPS-MAC:mac_addr"] } diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updOutputGetAttrIn/consolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updOutputGetAttrIn/consolidation/out/MainServiceTemplate.yaml index 56b2881a66..a59e6a5572 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updOutputGetAttrIn/consolidation/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updOutputGetAttrIn/consolidation/out/MainServiceTemplate.yaml @@ -337,18 +337,18 @@ topology_template: - FSB1_addresses - get_attribute: - FSB1 - - FSB1_FSB2_Internal_index + - FSB1_FSB2_Internal_tenant_id complexOutput2: description: cgi fw01 left interface Mac-Address value: get_attribute: - - FSB1 - - FSB1_FSB1_Internal_addresses + - FSB1_Internal2 + - addresses - get_input: - CMAUI_volume_type - get_attribute: - FSB1 - - FSB1_FSB2_Internal_oam_index + - FSB1_FSB2_Internal_user_data_format - 0 - OS-EXT-IPS-MAC:mac_addr complexOutput3: @@ -361,6 +361,6 @@ topology_template: - CMAUI_volume_type - get_attribute: - FSB1 - - FSB1_FSB1_Internal_accessIPv6 + - FSB1_FSB1_Internal_admin_state_up - 0 - OS-EXT-IPS-MAC:mac_addr diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updOutputGetAttrIn/noConsolidation/in/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updOutputGetAttrIn/noConsolidation/in/MainServiceTemplate.yaml index 0286f33e97..ad7f9440f5 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updOutputGetAttrIn/noConsolidation/in/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updOutputGetAttrIn/noConsolidation/in/MainServiceTemplate.yaml @@ -255,10 +255,10 @@ topology_template: simpleOutput2: value: {get_attribute: [ FSB1_template, addresses, key1 ] } complexOutput1: - value: {get_attribute: [ FSB1_template, addresses, {get_attribute: [ FSB2_Internal2,index ] } ]} + value: {get_attribute: [ FSB1_template, addresses, {get_attribute: [ FSB2_Internal2,tenant_id ] } ]} complexOutput2: description: cgi fw01 left interface Mac-Address - value: { get_attribute: [FSB1_Internal1, addresses, get_input: [CMAUI_volume_type,{get_attribute: [FSB1_OAM,oam_index ] }], 0, "OS-EXT-IPS-MAC:mac_addr"] } + value: { get_attribute: [FSB1_Internal1, device_owner, get_input: [CMAUI_volume_type,{get_attribute: [FSB1_OAM,user_data_format ] }], 0, "OS-EXT-IPS-MAC:mac_addr"] } complexOutput3: description: cgi fw01 left interface Mac-Address value: { get_input: [a, addresses, get_input: [CMAUI_volume_type, {get_attribute: [FSB1_template,accessIPv6 ] }], 0, "OS-EXT-IPS-MAC:mac_addr"] } diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updOutputGetAttrIn/noConsolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updOutputGetAttrIn/noConsolidation/out/MainServiceTemplate.yaml index 5fa7de719a..c76d482953 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updOutputGetAttrIn/noConsolidation/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updOutputGetAttrIn/noConsolidation/out/MainServiceTemplate.yaml @@ -268,18 +268,18 @@ topology_template: - FSB1_addresses - get_attribute: - FSB1 - - FSB1_FSB2_Internal_index + - FSB1_FSB2_Internal_tenant_id complexOutput2: description: cgi fw01 left interface Mac-Address value: get_attribute: - FSB1 - - FSB1_FSB1_Internal_addresses + - FSB1_FSB1_Internal_device_owner - get_input: - CMAUI_volume_type - get_attribute: - FSB1 - - FSB1_FSB_OAM_oam_index + - FSB1_FSB_OAM_user_data_format - 0 - OS-EXT-IPS-MAC:mac_addr complexOutput3: -- cgit 1.2.3-korg