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 | 2 +- .../WithIndex/out/SubstitutionServiceTemplate.yaml | 2 +- .../consolidation/in/MainServiceTemplate.yaml | 8 +- .../GlobalSubstitutionTypesServiceTemplate.yaml | 42 +-- .../out/SubstitutionServiceTemplate.yaml | 58 ++-- .../noConsolidation/in/MainServiceTemplate.yaml | 4 +- .../GlobalSubstitutionTypesServiceTemplate.yaml | 38 +-- .../out/SubstitutionServiceTemplate.yaml | 54 ++-- .../consolidation/in/MainServiceTemplate.yaml | 8 +- .../GlobalSubstitutionTypesServiceTemplate.yaml | 42 +-- .../out/SubstitutionServiceTemplate.yaml | 58 ++-- .../noConsolidation/in/MainServiceTemplate.yaml | 4 +- .../GlobalSubstitutionTypesServiceTemplate.yaml | 38 +-- .../out/SubstitutionServiceTemplate.yaml | 54 ++-- .../in/MainServiceTemplate.yaml | 191 ++++++++++++ .../out/MainServiceTemplate.yaml | 345 +++++++++++++++++++++ .../noConsolidation/in/MainServiceTemplate.yaml | 6 +- .../noConsolidation/out/MainServiceTemplate.yaml | 8 +- .../consolidation/in/MainServiceTemplate.yaml | 8 +- .../consolidation/out/MainServiceTemplate.yaml | 12 +- .../noConsolidation/in/MainServiceTemplate.yaml | 4 +- .../noConsolidation/out/MainServiceTemplate.yaml | 6 +- .../consolidation/in/MainServiceTemplate.yaml | 6 +- .../consolidation/out/MainServiceTemplate.yaml | 10 +- .../noConsolidation/in/MainServiceTemplate.yaml | 4 +- .../noConsolidation/out/MainServiceTemplate.yaml | 6 +- 26 files changed, 725 insertions(+), 293 deletions(-) create mode 100644 openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/inputoutputparamtype/in/MainServiceTemplate.yaml create mode 100644 openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/inputoutputparamtype/out/MainServiceTemplate.yaml (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition') diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/out/GlobalSubstitutionTypesServiceTemplate.yaml index 8f4f687229..30616940a7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -5,7 +5,7 @@ imports: - openecomp_heat_index: file: openecomp-heat/_index.yml node_types: - org.openecomp.resource.abstract.nodes.FSB1_2: + org.openecomp.resource.abstract.nodes.FSB1: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: port_FSB1_Internal_mac_address: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/out/SubstitutionServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/out/SubstitutionServiceTemplate.yaml index 31f53ed6f9..10f6fd221e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/out/SubstitutionServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/out/SubstitutionServiceTemplate.yaml @@ -262,7 +262,7 @@ topology_template: type: tosca.artifacts.Deployment file: ../Artifacts/nimbus-ethernet substitution_mappings: - node_type: org.openecomp.resource.abstract.nodes.FSB1_2 + node_type: org.openecomp.resource.abstract.nodes.FSB1 capabilities: network.outgoing.packets.rate_FSB1_FSB_OAM: - FSB1_FSB_OAM diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/consolidation/in/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/consolidation/in/MainServiceTemplate.yaml index 611052d787..e1099bde90 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/consolidation/in/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/consolidation/in/MainServiceTemplate.yaml @@ -258,8 +258,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_Internal2,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_Internal2,status ] }], 0, "OS-EXT-IPS-MAC:mac_addr"] } cmaui_volume2: type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume properties: @@ -269,8 +269,8 @@ topology_template: cmaui_volume3: type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume properties: - volume_type: {get_attribute: [ FSB2_template, addresses, {get_attribute: [ FSB2_Internal1,index ] } ]} - size: { get_attribute: [FSB1_Internal2, addresses, get_input: [CMAUI_volume_type,{get_attribute: [FSB2_template,oam_index ] }], 0, "OS-EXT-IPS-MAC:mac_addr"] } + volume_type: {get_attribute: [ FSB2_template, addresses, {get_attribute: [ FSB2_Internal1,tenant_id ] } ]} + size: { get_attribute: [FSB1_Internal2, device_owner, get_input: [CMAUI_volume_type,{get_attribute: [FSB2_template,status ] }], 0, "OS-EXT-IPS-MAC:mac_addr"] } groups: ep-jsa_net_group: type: org.openecomp.groups.heat.HeatStack diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/consolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/consolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml index 9c1c0bb7be..83ade4a8b1 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/consolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/consolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -131,46 +131,32 @@ node_types: required: true status: SUPPORTED attributes: + FSB1_FSB2_Internal_tenant_id: + type: string + status: SUPPORTED FSB1_FSB1_Internal_network_id: - type: list + type: string status: SUPPORTED - entry_schema: - type: string - FSB1_FSB1_Internal_addresses: - type: list + FSB1_user_data_format: + type: string status: SUPPORTED - entry_schema: - type: string FSB1_accessIPv6: - type: list + type: string status: SUPPORTED - entry_schema: - type: string FSB1_addresses: - type: list - status: SUPPORTED - entry_schema: - type: string - FSB1_oam_index: - 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 + type: string status: SUPPORTED - entry_schema: - type: string - FSB1_FSB2_Internal_index: - type: list + FSB1_FSB1_Internal_status: + type: string status: SUPPORTED - entry_schema: - type: string - FSB1_FSB1_Internal_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/consolidation/out/SubstitutionServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/consolidation/out/SubstitutionServiceTemplate.yaml index 6b1c37dd23..d2665c4897 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/consolidation/out/SubstitutionServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/consolidation/out/SubstitutionServiceTemplate.yaml @@ -194,70 +194,56 @@ topology_template: type: tosca.artifacts.Deployment file: ../Artifacts/nimbus-ethernet outputs: + FSB1_FSB2_Internal_tenant_id: + type: string + value: + get_attribute: + - FSB1_FSB2_Internal + - tenant_id FSB1_FSB1_Internal_network_id: - type: list + type: string value: get_attribute: - FSB1_FSB1_Internal - network_id - entry_schema: - type: string - FSB1_FSB1_Internal_addresses: - type: list + FSB1_user_data_format: + type: string value: get_attribute: - - FSB1_FSB1_Internal - - addresses - entry_schema: - type: string + - FSB1 + - user_data_format 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 - FSB1_oam_index: - type: list - value: - get_attribute: - - FSB1 - - oam_index - 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 + FSB1_FSB1_Internal_status: + type: string value: get_attribute: - - FSB1_FSB2_Internal - - index - entry_schema: - type: string - FSB1_FSB1_Internal_oam_index: - type: list + - FSB1_FSB1_Internal + - status + FSB1_FSB1_Internal_device_owner: + type: string value: get_attribute: - FSB1_FSB1_Internal - - oam_index - entry_schema: - type: string + - device_owner substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.FSB1 capabilities: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/in/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/in/MainServiceTemplate.yaml index 8e6142435e..bda72f8c8f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/in/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/in/MainServiceTemplate.yaml @@ -409,8 +409,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/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: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/in/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/in/MainServiceTemplate.yaml index c45d65ac5f..d007e85493 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/in/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/in/MainServiceTemplate.yaml @@ -259,8 +259,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_Internal2,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_Internal2,status ] }], 0, "OS-EXT-IPS-MAC:mac_addr"] } cmaui_volume2: type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume properties: @@ -270,8 +270,8 @@ topology_template: cmaui_volume3: type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume properties: - volume_type: {get_attribute: [ FSB2_template, addresses, {get_attribute: [ FSB2_Internal1,index ] } ]} - size: { get_attribute: [FSB1_Internal2, addresses, get_input: [CMAUI_volume_type,{get_attribute: [FSB2_template,oam_index ] }], 0, "OS-EXT-IPS-MAC:mac_addr"] } + volume_type: {get_attribute: [ FSB2_template, addresses, {get_attribute: [ FSB2_Internal1,tenant_id ] } ]} + size: { get_attribute: [FSB1_Internal2, device_owner, get_input: [CMAUI_volume_type,{get_attribute: [FSB2_template,status ] }], 0, "OS-EXT-IPS-MAC:mac_addr"] } groups: ep-jsa_net_group: type: org.openecomp.groups.heat.HeatStack diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml index 9807e6aabe..7c1d5352a9 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -125,46 +125,32 @@ node_types: required: true status: SUPPORTED attributes: + FSB1_FSB2_Internal_tenant_id: + type: string + status: SUPPORTED FSB1_FSB1_Internal_network_id: - type: list + type: string status: SUPPORTED - entry_schema: - type: string - FSB1_FSB1_Internal_addresses: - type: list + FSB1_user_data_format: + type: string status: SUPPORTED - entry_schema: - type: string FSB1_accessIPv6: - type: list + type: string status: SUPPORTED - entry_schema: - type: string FSB1_addresses: - type: list - status: SUPPORTED - entry_schema: - type: string - FSB1_oam_index: - 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 + type: string status: SUPPORTED - entry_schema: - type: string - FSB1_FSB2_Internal_index: - type: list + FSB1_FSB1_Internal_status: + type: string status: SUPPORTED - entry_schema: - type: string - FSB1_FSB1_Internal_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/consolidation/out/SubstitutionServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/out/SubstitutionServiceTemplate.yaml index 2261cefa27..e4fa28737d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/out/SubstitutionServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/out/SubstitutionServiceTemplate.yaml @@ -193,70 +193,56 @@ topology_template: type: tosca.artifacts.Deployment file: ../Artifacts/nimbus-ethernet outputs: + FSB1_FSB2_Internal_tenant_id: + type: string + value: + get_attribute: + - FSB1_FSB2_Internal + - tenant_id FSB1_FSB1_Internal_network_id: - type: list + type: string value: get_attribute: - FSB1_FSB1_Internal - network_id - entry_schema: - type: string - FSB1_FSB1_Internal_addresses: - type: list + FSB1_user_data_format: + type: string value: get_attribute: - - FSB1_FSB1_Internal - - addresses - entry_schema: - type: string + - FSB1 + - user_data_format 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 - FSB1_oam_index: - type: list - value: - get_attribute: - - FSB1 - - oam_index - 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 + FSB1_FSB1_Internal_status: + type: string value: get_attribute: - - FSB1_FSB2_Internal - - index - entry_schema: - type: string - FSB1_FSB1_Internal_oam_index: - type: list + - FSB1_FSB1_Internal + - status + FSB1_FSB1_Internal_device_owner: + type: string value: get_attribute: - FSB1_FSB1_Internal - - oam_index - entry_schema: - type: string + - device_owner substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.FSB1 capabilities: 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: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/inputoutputparamtype/in/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/inputoutputparamtype/in/MainServiceTemplate.yaml new file mode 100644 index 0000000000..4e939ca9d8 --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/inputoutputparamtype/in/MainServiceTemplate.yaml @@ -0,0 +1,191 @@ +tosca_definitions_version: tosca_simple_yaml_1_0_0 +metadata: + template_name: Main +imports: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +node_types: + org.openecomp.resource.vfc.nodes.heat.FSB1: + derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server +topology_template: + inputs: + vipr_atm_name_0: + label: vipr_atm_name_0 + hidden: false + immutable: false + type: string + description: vipr_atm_name_0 + network_name: + label: network_name + hidden: false + immutable: false + type: string + description: network_name + port_name: + label: port_name + hidden: false + immutable: false + type: string + description: port_name + fsb_zone: + label: fsb_zone + hidden: false + immutable: false + type: string + description: fsb_zone + fsb1-flavor: + label: fsb1-flavor + hidden: false + immutable: false + type: string + description: fsb1-flavor + fsb1-Internal1-mac: + label: fsb1-flavor + hidden: false + immutable: false + type: string + description: fsb1-flavor + + node_templates: + VMI1: + type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface + properties: + name: + str_replace: + template: VM_NAME_PORT_3 + params: + VM_NAME: + get_input: vipr_atm_name_0 + virtual_network_refs: + - get_input: network_name + virtual_machine_interface_properties: + service_interface_type: left + port_tuple_refs: + - get_input: port_name + FSB1: + type: org.openecomp.resource.vfc.nodes.heat.FSB1 + properties: + flavor: + get_input: fsb1-flavor + availability_zone: + get_input: fsb_zone + name: + get_attribute: + - VMI1 + - name + FSB1_Port1: + type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port + properties: + mac_address: + get_input: fsb1-Internal1-mac + network: Internal1-net + requirements: + - binding: + capability: tosca.capabilities.network.Bindable + node: FSB1 + relationship: tosca.relationships.network.BindsTo + + cmaui_volume_test_compute_properties: + type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume + properties: + availability_zone: {get_attribute: [FSB1, availability_zone ] } + backup_id: {get_attribute: [FSB1, admin_pass ] } + description: {get_attribute: [FSB1, flavor ] } + image: {get_attribute: [FSB1, config_drive ] } + metadata: {get_attribute: [FSB1, metadata ] } + multiattach: {get_attribute: [FSB1, flavor_update_policy ] } + name: {get_attribute: [FSB1, image ] } + read_only: {get_attribute: [FSB1, image_update_policy ] } + scheduler_hints: {get_attribute: [FSB1, key_name ] } + size: {get_attribute: [FSB1, diskConfig ] } + snapshot_id: {get_attribute: [FSB1, name ] } + source_volid: {get_attribute: [FSB1, personality ] } + volume_id: {get_attribute: [FSB1, reservation_id ] } + volume_type: {get_attribute: [FSB1, scheduler_hints ] } + delete_on_termination: {get_attribute: [FSB1, security_groups ] } + volume_size: {get_attribute: [FSB1, software_config_transport ] } + device_type: {get_attribute: [FSB1, user_data_format ] } + disk_bus: {get_attribute: [FSB1, user_data_update_policy ] } + swap_size: {get_attribute: [FSB1, accessIPv4 ] } + image_id: {get_attribute: [FSB1, accessIPv6 ] } + attachments: {get_attribute: [FSB1, addresses ] } + encrypted: {get_attribute: [FSB1, console_urls ] } + created_at: {get_attribute: [FSB1, instance_name ] } + display_description: {get_attribute: [FSB1, show ] } + + cmaui_volume_test_neutron_port_properties: + type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume + properties: + availability_zone: {get_attribute: [FSB1_Port1, ip_address ] } + backup_id: {get_attribute: [FSB1_Port1, network ] } + #description: {get_attribute: [FSB1_Port1, subnet ] } + image: {get_attribute: [FSB1_Port1, admin_state_up ] } + metadata: {get_attribute: [FSB1_Port1, allowed_address_pairs ] } + multiattach: {get_attribute: [FSB1_Port1, "binding:vnic_type" ] } + name: {get_attribute: [FSB1_Port1, device_id ] } + read_only: {get_attribute: [FSB1_Port1, device_owner ] } + scheduler_hints: {get_attribute: [FSB1_Port1, fixed_ips ] } + #size: {get_attribute: [FSB1_Port1, mac_address ] } + snapshot_id: {get_attribute: [FSB1_Port1, name ] } + source_volid: {get_attribute: [FSB1_Port1, port_security_enabled ] } + volume_id: {get_attribute: [FSB1_Port1, qos_policy ] } + volume_type: {get_attribute: [FSB1_Port1, security_groups ] } + delete_on_termination: {get_attribute: [FSB1_Port1, value_specs ] } + volume_size: {get_attribute: [FSB1_Port1, replacement_policy ] } + device_type: {get_attribute: [FSB1_Port1, show ] } + disk_bus: {get_attribute: [FSB1_Port1, subnets ] } + swap_size: {get_attribute: [FSB1_Port1, tenant_id ] } + + cmaui_volume_test_contrailv2_VMI_properties: + type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume + properties: + availability_zone: {get_attribute: [VMI1, virtual_machine_interface_mac_addresses ] } + #backup_id: {get_attribute: [VMI1, mac_address ] } + description: {get_attribute: [VMI1, virtual_network_refs ] } + image: {get_attribute: [VMI1, port_tuple_refs ] } + metadata: {get_attribute: [VMI1, security_group_refs ] } + multiattach: {get_attribute: [VMI1, virtual_machine_interface_properties ] } + name: {get_attribute: [VMI1, name ] } + #read_only: {get_attribute: [VMI1, service_interface_type ] } + #scheduler_hints: {get_attribute: [VMI1, sub_interface_vlan_tag ] } + size: {get_attribute: [VMI1, virtual_machine_interface_allowed_address_pairs ] } + #snapshot_id: {get_attribute: [VMI1, allowed_address_pair ] } + #source_volid: {get_attribute: [VMI1, port_security_enabled ] } + #volume_id: {get_attribute: [VMI1, address_mode ] } + #volume_type: {get_attribute: [VMI1, mac ] } + #delete_on_termination: {get_attribute: [VMI1, ip ] } + #volume_size: {get_attribute: [VMI1, ip_prefix ] } + #device_type: {get_attribute: [VMI1, ip_prefix_len ] } + #disk_bus: {get_attribute: [VMI1, virtual_machine_interface_refs ] } + #swap_size: {get_attribute: [VMI1, virtual_machine_interface_properties_service_interface_type ] } + created_at: {get_attribute: [VMI1, fq_name ] } + display_description: {get_attribute: [VMI1, show ] } + + groups: + ep-jsa_net_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/ep-jsa_net.yaml + description: | + Version 2.0 02-09-2016 (Authors: Paul Phillips, pp2854 PROD) + members: + - VMI1 + - FSB1 + - FSB1_Port1 + - cmaui_volume_test_compute_properties + - cmaui_volume_test_neutron_port_properties + - cmaui_volume_test_contrailv2_VMI_properties + + outputs: + simpleOutput1: + value: {get_attribute: [ FSB1, accessIPv4 ] } + simpleOutput2: + value: {get_attribute: [ FSB1, addresses, key1 ] } + complexOutput1: + value: {get_attribute: [ FSB1, addresses, {get_attribute: [ FSB2_Internal2,tenant_id ] } ]} + complexOutput2: + description: cgi fw01 left interface Mac-Address + value: { get_attribute: [FSB1_Port1, device_owner, get_input: [CMAUI_volume_type,{get_attribute: [FSB1,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,accessIPv6 ] }], 0, "OS-EXT-IPS-MAC:mac_addr"] } \ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/inputoutputparamtype/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/inputoutputparamtype/out/MainServiceTemplate.yaml new file mode 100644 index 0000000000..b3db1c2890 --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/inputoutputparamtype/out/MainServiceTemplate.yaml @@ -0,0 +1,345 @@ +tosca_definitions_version: tosca_simple_yaml_1_0_0 +metadata: + template_name: Main +imports: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: + file: GlobalSubstitutionTypesServiceTemplate.yaml +topology_template: + inputs: + vipr_atm_name_0: + label: vipr_atm_name_0 + hidden: false + immutable: false + type: string + description: vipr_atm_name_0 + network_name: + label: network_name + hidden: false + immutable: false + type: string + description: network_name + port_name: + label: port_name + hidden: false + immutable: false + type: string + description: port_name + fsb_zone: + label: fsb_zone + hidden: false + immutable: false + type: string + description: fsb_zone + fsb1-flavor: + label: fsb1-flavor + hidden: false + immutable: false + type: string + description: fsb1-flavor + fsb1-Internal1-mac: + label: fsb1-flavor + hidden: false + immutable: false + type: string + description: fsb1-flavor + node_templates: + cmaui_volume_test_compute_properties: + type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume + properties: + availability_zone: + get_attribute: + - abstract_FSB1 + - FSB1_availability_zone + backup_id: + get_attribute: + - abstract_FSB1 + - FSB1_admin_pass + description: + get_attribute: + - abstract_FSB1 + - FSB1_flavor + image: + get_attribute: + - abstract_FSB1 + - FSB1_config_drive + metadata: + get_attribute: + - abstract_FSB1 + - FSB1_metadata + multiattach: + get_attribute: + - abstract_FSB1 + - FSB1_flavor_update_policy + name: + get_attribute: + - abstract_FSB1 + - FSB1_image + read_only: + get_attribute: + - abstract_FSB1 + - FSB1_image_update_policy + scheduler_hints: + get_attribute: + - abstract_FSB1 + - FSB1_key_name + size: + get_attribute: + - abstract_FSB1 + - FSB1_diskConfig + snapshot_id: + get_attribute: + - abstract_FSB1 + - FSB1_name + source_volid: + get_attribute: + - abstract_FSB1 + - FSB1_personality + volume_id: + get_attribute: + - abstract_FSB1 + - FSB1_reservation_id + volume_type: + get_attribute: + - abstract_FSB1 + - FSB1_scheduler_hints + delete_on_termination: + get_attribute: + - abstract_FSB1 + - FSB1_security_groups + volume_size: + get_attribute: + - abstract_FSB1 + - FSB1_software_config_transport + device_type: + get_attribute: + - abstract_FSB1 + - FSB1_user_data_format + disk_bus: + get_attribute: + - abstract_FSB1 + - FSB1_user_data_update_policy + swap_size: + get_attribute: + - abstract_FSB1 + - FSB1_accessIPv4 + image_id: + get_attribute: + - abstract_FSB1 + - FSB1_accessIPv6 + attachments: + get_attribute: + - abstract_FSB1 + - FSB1_addresses + encrypted: + get_attribute: + - abstract_FSB1 + - FSB1_console_urls + created_at: + get_attribute: + - abstract_FSB1 + - FSB1_instance_name + display_description: + get_attribute: + - abstract_FSB1 + - FSB1_show + cmaui_volume_test_neutron_port_properties: + type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume + properties: + availability_zone: + get_attribute: + - abstract_FSB1 + - FSB1_FSB1_Port_ip_address + backup_id: + get_attribute: + - abstract_FSB1 + - FSB1_FSB1_Port_network + image: + get_attribute: + - abstract_FSB1 + - FSB1_FSB1_Port_admin_state_up + metadata: + get_attribute: + - abstract_FSB1 + - FSB1_FSB1_Port_allowed_address_pairs + multiattach: + get_attribute: + - abstract_FSB1 + - FSB1_FSB1_Port_binding:vnic_type + name: + get_attribute: + - abstract_FSB1 + - FSB1_FSB1_Port_device_id + read_only: + get_attribute: + - abstract_FSB1 + - FSB1_FSB1_Port_device_owner + scheduler_hints: + get_attribute: + - abstract_FSB1 + - FSB1_FSB1_Port_fixed_ips + snapshot_id: + get_attribute: + - abstract_FSB1 + - FSB1_FSB1_Port_name + source_volid: + get_attribute: + - abstract_FSB1 + - FSB1_FSB1_Port_port_security_enabled + volume_id: + get_attribute: + - abstract_FSB1 + - FSB1_FSB1_Port_qos_policy + volume_type: + get_attribute: + - abstract_FSB1 + - FSB1_FSB1_Port_security_groups + delete_on_termination: + get_attribute: + - abstract_FSB1 + - FSB1_FSB1_Port_value_specs + volume_size: + get_attribute: + - abstract_FSB1 + - FSB1_FSB1_Port_replacement_policy + device_type: + get_attribute: + - abstract_FSB1 + - FSB1_FSB1_Port_show + disk_bus: + get_attribute: + - abstract_FSB1 + - FSB1_FSB1_Port_subnets + swap_size: + get_attribute: + - abstract_FSB1 + - FSB1_FSB1_Port_tenant_id + cmaui_volume_test_contrailv2_VMI_properties: + type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume + properties: + availability_zone: + get_attribute: + - abstract_FSB1 + - FSB1_VMI_virtual_machine_interface_mac_addresses + description: + get_attribute: + - abstract_FSB1 + - FSB1_VMI_virtual_network_refs + image: + get_attribute: + - abstract_FSB1 + - FSB1_VMI_port_tuple_refs + metadata: + get_attribute: + - abstract_FSB1 + - FSB1_VMI_security_group_refs + multiattach: + get_attribute: + - abstract_FSB1 + - FSB1_VMI_virtual_machine_interface_properties + name: + get_attribute: + - abstract_FSB1 + - FSB1_VMI_name + size: + get_attribute: + - abstract_FSB1 + - FSB1_VMI_virtual_machine_interface_allowed_address_pairs + created_at: + get_attribute: + - abstract_FSB1 + - FSB1_VMI_fq_name + display_description: + get_attribute: + - abstract_FSB1 + - FSB1_VMI_show + abstract_FSB1: + type: org.openecomp.resource.abstract.nodes.FSB1 + directives: + - substitutable + properties: + port_FSB1_Port_network: + - Internal1-net + vm_flavor_name: + get_input: fsb1-flavor + port_FSB1_Port_mac_address: + get_input: fsb1-Internal1-mac + compute_FSB1_availability_zone: + - get_input: fsb_zone + port_VMI_port_tuple_refs: + - - get_input: port_name + port_VMI_name: + - str_replace: + template: VM_NAME_PORT_3 + params: + VM_NAME: + get_input: vipr_atm_name_0 + port_VMI_virtual_network_refs: + - - get_input: network_name + service_template_filter: + substitute_service_template: Nested_FSB1ServiceTemplate.yaml + count: 1 + index_value: + get_property: + - SELF + - service_template_filter + - index_value + groups: + ep-jsa_net_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/ep-jsa_net.yaml + description: | + Version 2.0 02-09-2016 (Authors: Paul Phillips, pp2854 PROD) + members: + - cmaui_volume_test_compute_properties + - cmaui_volume_test_neutron_port_properties + - cmaui_volume_test_contrailv2_VMI_properties + - abstract_FSB1 + outputs: + simpleOutput1: + value: + get_attribute: + - FSB1 + - accessIPv4 + simpleOutput2: + value: + get_attribute: + - FSB1 + - addresses + - key1 + complexOutput1: + value: + get_attribute: + - FSB1 + - addresses + - get_attribute: + - FSB2_Internal2 + - tenant_id + complexOutput2: + description: cgi fw01 left interface Mac-Address + value: + get_attribute: + - FSB1_Port1 + - device_owner + - get_input: + - CMAUI_volume_type + - get_attribute: + - FSB1 + - 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 + - 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/pattern1b/noConsolidation/in/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/pattern1b/noConsolidation/in/MainServiceTemplate.yaml index 21d373968b..4113dadea4 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/pattern1b/noConsolidation/in/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/pattern1b/noConsolidation/in/MainServiceTemplate.yaml @@ -231,10 +231,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, device_owner, 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/pattern1b/noConsolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/pattern1b/noConsolidation/out/MainServiceTemplate.yaml index 371b190878..35a1e38837 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/pattern1b/noConsolidation/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/pattern1b/noConsolidation/out/MainServiceTemplate.yaml @@ -265,18 +265,18 @@ topology_template: - FSB1_addresses - get_attribute: - abstract_FSB1_0 - - FSB1_FSB2_Internal_index + - FSB1_FSB2_Internal_tenant_id complexOutput2: description: cgi fw01 left interface Mac-Address value: get_attribute: - FSB1_Internal2 - - addresses + - device_owner - get_input: - CMAUI_volume_type - get_attribute: - FSB2_Internal1 - - oam_index + - user_data_format - 0 - OS-EXT-IPS-MAC:mac_addr complexOutput3: @@ -289,6 +289,6 @@ topology_template: - CMAUI_volume_type - get_attribute: - abstract_FSB1_0 - - 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/updNodesGetAttrIn/consolidation/in/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesGetAttrIn/consolidation/in/MainServiceTemplate.yaml index 7e50caf852..ef381fe9c9 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesGetAttrIn/consolidation/in/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesGetAttrIn/consolidation/in/MainServiceTemplate.yaml @@ -295,8 +295,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_Internal2,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_Internal2,status ] }], 0, "OS-EXT-IPS-MAC:mac_addr"] } cmaui_volume2: type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume properties: @@ -306,8 +306,8 @@ topology_template: cmaui_volume3: type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume properties: - volume_type: {get_attribute: [ FSB2_template, addresses, {get_attribute: [ FSB2_Internal1,index ] } ]} - size: { get_attribute: [FSB1_Internal2, addresses, get_input: [CMAUI_volume_type,{get_attribute: [FSB2_template,oam_index ] }], 0, "OS-EXT-IPS-MAC:mac_addr"] } + volume_type: {get_attribute: [ FSB2_template, addresses, {get_attribute: [ FSB2_Internal1,tenant_id ] } ]} + size: { get_attribute: [FSB1_Internal2, device_owner, get_input: [CMAUI_volume_type,{get_attribute: [FSB2_template,user_data_format ] }], 0, "OS-EXT-IPS-MAC:mac_addr"] } groups: ep-jsa_net_group: type: org.openecomp.groups.heat.HeatStack diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesGetAttrIn/consolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesGetAttrIn/consolidation/out/MainServiceTemplate.yaml index 50a62f642d..a6eb69ef4d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesGetAttrIn/consolidation/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesGetAttrIn/consolidation/out/MainServiceTemplate.yaml @@ -301,16 +301,16 @@ topology_template: - FSB1_addresses - get_attribute: - FSB1 - - FSB1_FSB2_Internal_index + - FSB1_FSB2_Internal_tenant_id size: get_attribute: - FSB1 - - FSB1_FSB1_Internal_addresses + - FSB1_FSB1_Internal_device_owner - get_input: - CMAUI_volume_type - get_attribute: - FSB1 - - FSB1_FSB1_Internal_oam_index + - FSB1_FSB1_Internal_status - 0 - OS-EXT-IPS-MAC:mac_addr cmaui_volume2: @@ -338,16 +338,16 @@ topology_template: - FSB1_addresses - get_attribute: - FSB1 - - FSB1_FSB2_Internal_index + - FSB1_FSB2_Internal_tenant_id size: get_attribute: - FSB1 - - FSB1_FSB1_Internal_addresses + - FSB1_FSB1_Internal_device_owner - get_input: - CMAUI_volume_type - get_attribute: - FSB1 - - FSB1_oam_index + - FSB1_user_data_format - 0 - OS-EXT-IPS-MAC:mac_addr groups: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesGetAttrIn/noConsolidation/in/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesGetAttrIn/noConsolidation/in/MainServiceTemplate.yaml index 9cd2498824..065584de49 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesGetAttrIn/noConsolidation/in/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesGetAttrIn/noConsolidation/in/MainServiceTemplate.yaml @@ -198,8 +198,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/updNodesGetAttrIn/noConsolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesGetAttrIn/noConsolidation/out/MainServiceTemplate.yaml index 84f83498f0..4c75e2c736 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesGetAttrIn/noConsolidation/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesGetAttrIn/noConsolidation/out/MainServiceTemplate.yaml @@ -219,16 +219,16 @@ topology_template: - FSB1_addresses - get_attribute: - FSB1 - - FSB1_FSB2_Internal_index + - FSB1_FSB2_Internal_tenant_id size: 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_status - 0 - OS-EXT-IPS-MAC:mac_addr cmaui_volume2: 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