diff options
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters')
6 files changed, 76 insertions, 128 deletions
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: |