diff options
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition')
22 files changed, 97 insertions, 182 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/out/GlobalSubstitutionTypesServiceTemplate.yaml index 13cccd38b7..fcfd61365d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -9,11 +9,9 @@ node_types: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: port_FSB1_Internal_mac_address: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_FSB_OAM_network_role_tag: type: list required: true @@ -97,11 +95,9 @@ node_types: entry_schema: type: string port_FSB2_Internal1_mac_address: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_FSB2_Internal1_vlan_requirements: type: list required: true @@ -145,11 +141,9 @@ node_types: entry_schema: type: string port_FSB2_Internal2_mac_address: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_FSB2_Internal2_mac_requirements: type: list required: true @@ -247,7 +241,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.heat.neutron.port.FixedIps port_FSB2_Internal2_order: type: list required: true @@ -847,4 +841,4 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - - UNBOUNDED
\ No newline at end of file + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/out/SubstitutionServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/out/SubstitutionServiceTemplate.yaml index ac5e7b1360..c419c0df91 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/out/SubstitutionServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/out/SubstitutionServiceTemplate.yaml @@ -12,10 +12,8 @@ node_types: topology_template: inputs: port_FSB1_Internal_mac_address: - type: list + type: string required: true - entry_schema: - type: string port_FSB_OAM_network_role_tag: type: list required: true @@ -85,10 +83,8 @@ topology_template: entry_schema: type: string port_FSB2_Internal1_mac_address: - type: list + type: string required: true - entry_schema: - type: string port_FSB2_Internal1_vlan_requirements: type: list required: true @@ -125,10 +121,8 @@ topology_template: entry_schema: type: string port_FSB2_Internal2_mac_address: - type: list + type: string required: true - entry_schema: - type: string port_FSB2_Internal2_mac_requirements: type: list required: true @@ -210,7 +204,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.heat.neutron.port.FixedIps port_FSB2_Internal2_order: type: list required: true @@ -277,9 +271,7 @@ topology_template: - port_FSB1_Internal_network - index_value mac_address: - get_input: - - port_FSB1_Internal_mac_address - - index_value + get_input: port_FSB1_Internal_mac_address requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -321,9 +313,7 @@ topology_template: - port_FSB_OAM_subnetpoolid - index_value fixed_ips: - get_input: - - port_FSB_OAM_fixed_ips - - index_value + get_input: port_FSB_OAM_fixed_ips network: get_input: - port_FSB_OAM_network @@ -373,9 +363,7 @@ topology_template: - port_FSB2_Internal2_network - index_value mac_address: - get_input: - - port_FSB2_Internal2_mac_address - - index_value + get_input: port_FSB2_Internal2_mac_address requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -445,9 +433,7 @@ topology_template: - port_FSB2_Internal1_network - index_value mac_address: - get_input: - - port_FSB2_Internal1_mac_address - - index_value + get_input: port_FSB2_Internal1_mac_address requirements: - binding: capability: tosca.capabilities.network.Bindable 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 dda1f4295d..b7a2b294db 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 @@ -9,11 +9,9 @@ node_types: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: port_FSB1_Internal_mac_address: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_FSB_OAM_network_role_tag: type: list required: true @@ -165,11 +163,9 @@ node_types: entry_schema: type: json port_FSB2_Internal_mac_address: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_FSB2_Internal_exCP_naming: type: list required: true @@ -187,7 +183,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.heat.neutron.port.FixedIps port_FSB2_Internal_network: type: list required: true @@ -709,4 +705,4 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - - UNBOUNDED
\ No newline at end of file + - UNBOUNDED 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 76dbaad388..ca12b431e2 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 @@ -12,10 +12,8 @@ node_types: topology_template: inputs: port_FSB1_Internal_mac_address: - type: list + type: string required: true - entry_schema: - type: string port_FSB_OAM_network_role_tag: type: list required: true @@ -142,10 +140,8 @@ topology_template: entry_schema: type: json port_FSB2_Internal_mac_address: - type: list + type: string required: true - entry_schema: - type: string port_FSB2_Internal_exCP_naming: type: list required: true @@ -160,7 +156,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.heat.neutron.port.FixedIps port_FSB2_Internal_network: type: list required: true @@ -227,9 +223,7 @@ topology_template: - port_FSB1_Internal_network - index_value mac_address: - get_input: - - port_FSB1_Internal_mac_address - - index_value + get_input: port_FSB1_Internal_mac_address requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -275,9 +269,7 @@ topology_template: - port_FSB2_Internal_network - index_value mac_address: - get_input: - - port_FSB2_Internal_mac_address - - index_value + get_input: port_FSB2_Internal_mac_address requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -319,9 +311,7 @@ topology_template: - port_FSB_OAM_subnetpoolid - index_value fixed_ips: - get_input: - - port_FSB_OAM_fixed_ips - - index_value + get_input: port_FSB_OAM_fixed_ips network: get_input: - port_FSB_OAM_network @@ -604,4 +594,4 @@ topology_template: - link dependency_FSB1_FSB2_Internal: - FSB1_FSB2_Internal - - dependency
\ No newline at end of file + - dependency 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 e2581559d2..aabb513dba 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 @@ -9,11 +9,9 @@ node_types: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: port_FSB1_Internal_mac_address: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_FSB1_Internal_ip_requirements: type: list required: true @@ -117,11 +115,9 @@ node_types: entry_schema: type: json port_FSB2_Internal_mac_address: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_FSB2_Internal_exCP_naming: type: list required: true @@ -612,4 +608,4 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - - UNBOUNDED
\ No newline at end of file + - UNBOUNDED 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 adc80eaf7a..39e93ab08d 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 @@ -12,10 +12,8 @@ node_types: topology_template: inputs: port_FSB1_Internal_mac_address: - type: list + type: string required: true - entry_schema: - type: string port_FSB1_Internal_ip_requirements: type: list required: true @@ -102,10 +100,8 @@ topology_template: entry_schema: type: json port_FSB2_Internal_mac_address: - type: list + type: string required: true - entry_schema: - type: string port_FSB2_Internal_exCP_naming: type: list required: true @@ -177,9 +173,7 @@ topology_template: - port_FSB1_Internal_network - index_value mac_address: - get_input: - - port_FSB1_Internal_mac_address - - index_value + get_input: port_FSB1_Internal_mac_address requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -225,9 +219,7 @@ topology_template: - port_FSB2_Internal_network - index_value mac_address: - get_input: - - port_FSB2_Internal_mac_address - - index_value + get_input: port_FSB2_Internal_mac_address requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -532,4 +524,4 @@ topology_template: - local_storage dependency_FSB1_FSB2_Internal: - FSB1_FSB2_Internal - - dependency
\ No newline at end of file + - dependency 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 40048e44db..f50192de3c 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 @@ -9,11 +9,9 @@ node_types: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: port_FSB1_Internal_mac_address: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_FSB_OAM_network_role_tag: type: list required: true @@ -165,11 +163,9 @@ node_types: entry_schema: type: json port_FSB2_Internal_mac_address: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_FSB2_Internal_exCP_naming: type: list required: true @@ -187,7 +183,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.heat.neutron.port.FixedIps port_FSB2_Internal_network: type: list required: true @@ -745,4 +741,4 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - - UNBOUNDED
\ No newline at end of file + - UNBOUNDED 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 4faca73a16..62d483639b 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 @@ -12,10 +12,8 @@ node_types: topology_template: inputs: port_FSB1_Internal_mac_address: - type: list + type: string required: true - entry_schema: - type: string port_FSB_OAM_network_role_tag: type: list required: true @@ -142,10 +140,8 @@ topology_template: entry_schema: type: json port_FSB2_Internal_mac_address: - type: list + type: string required: true - entry_schema: - type: string port_FSB2_Internal_exCP_naming: type: list required: true @@ -160,7 +156,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.heat.neutron.port.FixedIps port_FSB2_Internal_network: type: list required: true @@ -227,9 +223,7 @@ topology_template: - port_FSB1_Internal_network - index_value mac_address: - get_input: - - port_FSB1_Internal_mac_address - - index_value + get_input: port_FSB1_Internal_mac_address requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -275,9 +269,7 @@ topology_template: - port_FSB2_Internal_network - index_value mac_address: - get_input: - - port_FSB2_Internal_mac_address - - index_value + get_input: port_FSB2_Internal_mac_address requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -319,9 +311,7 @@ topology_template: - port_FSB_OAM_subnetpoolid - index_value fixed_ips: - get_input: - - port_FSB_OAM_fixed_ips - - index_value + get_input: port_FSB_OAM_fixed_ips network: get_input: - port_FSB_OAM_network @@ -661,4 +651,4 @@ topology_template: - link dependency_FSB1_FSB2_Internal: - FSB1_FSB2_Internal - - dependency
\ No newline at end of file + - dependency 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 84bab83d19..ecbec2f2b4 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 @@ -9,11 +9,9 @@ node_types: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: port_FSB1_Internal_mac_address: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_FSB1_Internal_ip_requirements: type: list required: true @@ -75,11 +73,9 @@ node_types: required: true status: SUPPORTED port_FSB2_Internal_mac_address: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_FSB2_Internal_network_role: type: list required: true @@ -606,4 +602,4 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - - UNBOUNDED
\ No newline at end of file + - UNBOUNDED 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 cb7a4127a1..07013e3833 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 @@ -12,10 +12,8 @@ node_types: topology_template: inputs: port_FSB1_Internal_mac_address: - type: list + type: string required: true - entry_schema: - type: string port_FSB1_Internal_ip_requirements: type: list required: true @@ -67,10 +65,8 @@ topology_template: type: string required: true port_FSB2_Internal_mac_address: - type: list + type: string required: true - entry_schema: - type: string port_FSB2_Internal_network_role: type: list required: true @@ -172,9 +168,7 @@ topology_template: - FSB1_FSB2_Internal - device_id mac_address: - get_input: - - port_FSB1_Internal_mac_address - - index_value + get_input: port_FSB1_Internal_mac_address requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -224,9 +218,7 @@ topology_template: - port_FSB2_Internal_network - index_value mac_address: - get_input: - - port_FSB2_Internal_mac_address - - index_value + get_input: port_FSB2_Internal_mac_address requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -531,4 +523,4 @@ topology_template: - local_storage dependency_FSB1_FSB2_Internal: - FSB1_FSB2_Internal - - dependency
\ No newline at end of file + - dependency 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 b9a448541a..8c6ae90130 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 @@ -8,6 +8,10 @@ node_types: org.openecomp.resource.abstract.nodes.FSB1: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_FSB1_Internal_mac_address: + type: string + required: true + status: SUPPORTED port_FSB_OAM_network_role_tag: type: list required: true @@ -147,11 +151,9 @@ node_types: entry_schema: type: json port_FSB2_Internal_mac_address: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_FSB2_Internal_exCP_naming: type: list required: true @@ -169,7 +171,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.heat.neutron.port.FixedIps port_FSB2_Internal_network: type: list required: true @@ -721,4 +723,4 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - - UNBOUNDED
\ No newline at end of file + - UNBOUNDED 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 6cd3625e82..c6275a1ab8 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 @@ -11,6 +11,9 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_FSB1_Internal_mac_address: + type: string + required: true port_FSB_OAM_network_role_tag: type: list required: true @@ -127,10 +130,8 @@ topology_template: entry_schema: type: json port_FSB2_Internal_mac_address: - type: list + type: string required: true - entry_schema: - type: string port_FSB2_Internal_exCP_naming: type: list required: true @@ -145,7 +146,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.heat.neutron.port.FixedIps port_FSB2_Internal_network: type: list required: true @@ -207,9 +208,7 @@ topology_template: - port_FSB1_Internal_network - index_value mac_address: - get_attribute: - - FSB1 - - mac + get_input: port_FSB1_Internal_mac_address requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -255,9 +254,7 @@ topology_template: - port_FSB2_Internal_network - index_value mac_address: - get_input: - - port_FSB2_Internal_mac_address - - index_value + get_input: port_FSB2_Internal_mac_address requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -299,9 +296,7 @@ topology_template: - port_FSB_OAM_subnetpoolid - index_value fixed_ips: - get_input: - - port_FSB_OAM_fixed_ips - - index_value + get_input: port_FSB_OAM_fixed_ips network: get_input: - port_FSB_OAM_network @@ -636,4 +631,4 @@ topology_template: - link dependency_FSB1_FSB2_Internal: - FSB1_FSB2_Internal - - dependency
\ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/oneComputeMultiplePortsDiffType/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/oneComputeMultiplePortsDiffType/out/MainServiceTemplate.yaml index ac134c31c5..11847d0505 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/oneComputeMultiplePortsDiffType/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/oneComputeMultiplePortsDiffType/out/MainServiceTemplate.yaml @@ -180,7 +180,7 @@ topology_template: - substitutable properties: port_FSB1_Internal_mac_address: - - get_input: fsb1-Internal1-mac + get_input: fsb1-Internal1-mac vm_flavor_name: get_input: fsb-flavor vm_image_name: @@ -192,7 +192,7 @@ topology_template: port_FSB1_Internal_network: - Internal1-net port_FSB2_Internal_mac_address: - - get_input: fsb1-Internal2-mac + get_input: fsb1-Internal2-mac port_FSB_OAM_fixed_ips: - - ip_address: get_input: fsb1-oam-ip @@ -225,4 +225,4 @@ topology_template: - FSB2_Internal2 - FSB1_Internal1 - FSB1_OAM - - FSB1_template
\ No newline at end of file + - FSB1_template diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/oneComputeMultiplePortsSameType/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/oneComputeMultiplePortsSameType/out/MainServiceTemplate.yaml index 8bb81bc2fa..55e4754bb4 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/oneComputeMultiplePortsSameType/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/oneComputeMultiplePortsSameType/out/MainServiceTemplate.yaml @@ -159,7 +159,7 @@ topology_template: - substitutable properties: port_FSB1_Internal1_mac_address: - - get_input: fsb1-Internal1-mac + get_input: fsb1-Internal1-mac port_FSB1_Internal2_network: - Internal2-net port_FSB1_Internal1_network: @@ -167,7 +167,7 @@ topology_template: vm_flavor_name: get_input: fsb-flavor port_FSB1_Internal2_mac_address: - - get_input: fsb1-Internal2-mac + get_input: fsb1-Internal1-mac vm_image_name: get_input: fsb-image compute_FSB_admin_pass: @@ -198,4 +198,4 @@ topology_template: members: - FSB1_Internal2 - FSB1_Internal1 - - FSB1_template
\ No newline at end of file + - FSB1_template diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/twoComputesMultiplePorts/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/twoComputesMultiplePorts/out/MainServiceTemplate.yaml index 92fc5bdb6e..0a226df009 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/twoComputesMultiplePorts/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/twoComputesMultiplePorts/out/MainServiceTemplate.yaml @@ -241,8 +241,7 @@ topology_template: - substitutable properties: port_FSB1_Internal_mac_address: - - get_input: fsb1-Internal1-mac - - get_input: fsb1-Internal2-mac + get_input: fsb1-Internal1-mac compute_FSB_user_data: - OPTIONAL-DATA-FSB1 - null @@ -257,8 +256,7 @@ topology_template: - Internal1-net-fsb1-Internal1 - Internal1-net-fsb1-Internal2 port_FSB2_Internal_mac_address: - - get_input: fsb2-Internal1-mac - - get_input: fsb2-Internal2-mac + get_input: fsb2-Internal1-mac port_FSB2_Internal_network: - Internal2-net-fsb2-Internal1 - Internal2-net-fsb2-Internal2 @@ -296,4 +294,4 @@ topology_template: - FSB2_Internal1 - FSB2_Internal2 - FSB1_template - - FSB2_template
\ No newline at end of file + - FSB2_template 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 209d729be8..371b190878 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 @@ -143,7 +143,7 @@ topology_template: - substitutable properties: port_FSB1_Internal_mac_address: - - get_input: fsb1-Internal1-mac + get_input: fsb1-Internal1-mac compute_FSB1_availability_zone: - get_input: fsb_zone port_FSB1_Internal_network: @@ -151,7 +151,7 @@ topology_template: vm_flavor_name: get_input: fsb1-flavor port_FSB2_Internal_mac_address: - - get_input: fsb1-Internal2-mac + get_input: fsb1-Internal2-mac port_FSB2_Internal_network: - Internal2-net service_template_filter: @@ -291,4 +291,4 @@ topology_template: - abstract_FSB1_0 - FSB1_FSB1_Internal_accessIPv6 - 0 - - OS-EXT-IPS-MAC:mac_addr
\ No newline at end of file + - 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/updGroupsConnectivity/consolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updGroupsConnectivity/consolidation/out/MainServiceTemplate.yaml index 492e64573c..623b14cc28 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updGroupsConnectivity/consolidation/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updGroupsConnectivity/consolidation/out/MainServiceTemplate.yaml @@ -238,8 +238,7 @@ topology_template: - substitutable properties: port_FSB1_Internal_mac_address: - - get_input: fsb1-Internal1-mac - - get_input: fsb1-Internal2-mac + get_input: fsb1-Internal1-mac compute_FSB_user_data: - STATIC-DATA-FSB1 - STATIC-DATA-FSB2 @@ -254,8 +253,7 @@ topology_template: - Internal1-net-fsb1-Internal1 - Internal1-net-fsb1-Internal2 port_FSB2_Internal_mac_address: - - get_input: fsb2-Internal1-mac - - get_input: fsb2-Internal2-mac + get_input: fsb2-Internal1-mac port_FSB2_Internal_network: - Internal2-net-fsb2-Internal1 - Internal2-net-fsb2-Internal2 @@ -317,4 +315,4 @@ topology_template: - FSB2_template - jsa_net - jsa_net1 - - packet_mirror_network_name
\ No newline at end of file + - packet_mirror_network_name diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedIn/consolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedIn/consolidation/out/MainServiceTemplate.yaml index b7bb7cbb43..5019e08333 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedIn/consolidation/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedIn/consolidation/out/MainServiceTemplate.yaml @@ -251,8 +251,7 @@ topology_template: - substitutable properties: port_FSB1_Internal_mac_address: - - get_input: fsb1-Internal1-mac - - get_input: fsb1-Internal2-mac + get_input: fsb1-Internal1-mac compute_FSB_user_data: - OPTIONAL-DATA-FSB1 - null @@ -267,8 +266,7 @@ topology_template: - Internal1-net-fsb1-Internal1 - Internal1-net-fsb1-Internal2 port_FSB2_Internal_mac_address: - - get_input: fsb2-Internal1-mac - - get_input: fsb2-Internal2-mac + get_input: fsb2-Internal1-mac port_FSB2_Internal_network: - Internal2-net-fsb2-Internal1 - Internal2-net-fsb2-Internal2 @@ -319,4 +317,4 @@ topology_template: - jsa_net - jsa_net1 - packet_mirror_network - - jsa_security_group
\ No newline at end of file + - jsa_security_group diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedOut/consolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedOut/consolidation/out/MainServiceTemplate.yaml index 5cd7faa646..fb0d179203 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedOut/consolidation/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedOut/consolidation/out/MainServiceTemplate.yaml @@ -238,8 +238,7 @@ topology_template: - substitutable properties: port_FSB1_Internal_mac_address: - - get_input: fsb1-Internal1-mac - - get_input: fsb1-Internal2-mac + get_input: fsb1-Internal1-mac compute_FSB_user_data: - OPTIONAL-DATA-FSB1 - null @@ -254,8 +253,7 @@ topology_template: - Internal1-net-fsb1-Internal1 - Internal1-net-fsb1-Internal2 port_FSB2_Internal_mac_address: - - get_input: fsb2-Internal1-mac - - get_input: fsb2-Internal2-mac + get_input: fsb2-Internal1-mac port_FSB2_Internal_network: - Internal2-net-fsb2-Internal1 - Internal2-net-fsb2-Internal2 @@ -309,4 +307,4 @@ topology_template: - FSB2_template - jsa_net - jsa_net1 - - packet_mirror_network_name
\ No newline at end of file + - packet_mirror_network_name diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedOut/noConsolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedOut/noConsolidation/out/MainServiceTemplate.yaml index 1779261886..a551227f42 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedOut/noConsolidation/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedOut/noConsolidation/out/MainServiceTemplate.yaml @@ -174,7 +174,7 @@ topology_template: - substitutable properties: port_FSB1_Internal_mac_address: - - get_input: fsb1-Internal1-mac + get_input: fsb1-Internal1-mac vm_flavor_name: get_input: fsb-flavor vm_image_name: @@ -186,7 +186,7 @@ topology_template: port_FSB1_Internal_network: - Internal1-net port_FSB2_Internal_mac_address: - - get_input: fsb1-Internal2-mac + get_input: fsb1-Internal2-mac port_FSB_OAM_fixed_ips: - - ip_address: get_input: fsb1-oam-ip @@ -233,4 +233,4 @@ topology_template: - FSB1_Internal1 - FSB1_OAM - FSB1_template - - packet_mirror_network_name
\ No newline at end of file + - packet_mirror_network_name diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updVolumes/consolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updVolumes/consolidation/out/MainServiceTemplate.yaml index e5513bd30a..cde2c25b76 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updVolumes/consolidation/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updVolumes/consolidation/out/MainServiceTemplate.yaml @@ -278,8 +278,7 @@ topology_template: - substitutable properties: port_FSB1_Internal_mac_address: - - get_input: fsb1-Internal1-mac - - get_input: fsb1-Internal2-mac + get_input: fsb1-Internal1-mac compute_FSB_user_data: - OPTIONAL-DATA-FSB1 - null @@ -294,8 +293,7 @@ topology_template: - Internal1-net-fsb1-Internal1 - Internal1-net-fsb1-Internal2 port_FSB2_Internal_mac_address: - - get_input: fsb2-Internal1-mac - - get_input: fsb2-Internal2-mac + get_input: fsb2-Internal1-mac port_FSB2_Internal_network: - Internal2-net-fsb2-Internal1 - Internal2-net-fsb2-Internal2 @@ -357,4 +355,4 @@ topology_template: - FSB2_template - jsa_net - jsa_net1 - - packet_mirror_network_name
\ No newline at end of file + - packet_mirror_network_name diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updVolumes/noConsolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updVolumes/noConsolidation/out/MainServiceTemplate.yaml index 54d4cfe9ee..4b8efb2d7d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updVolumes/noConsolidation/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updVolumes/noConsolidation/out/MainServiceTemplate.yaml @@ -194,7 +194,7 @@ topology_template: - substitutable properties: port_FSB1_Internal_mac_address: - - get_input: fsb1-Internal1-mac + get_input: fsb1-Internal1-mac vm_flavor_name: get_input: fsb-flavor vm_image_name: @@ -206,7 +206,7 @@ topology_template: port_FSB1_Internal_network: - Internal1-net port_FSB2_Internal_mac_address: - - get_input: fsb1-Internal2-mac + get_input: fsb1-Internal2-mac port_FSB_OAM_fixed_ips: - - ip_address: get_input: fsb1-oam-ip @@ -261,4 +261,4 @@ topology_template: - FSB1_Internal1 - FSB1_OAM - FSB1_template - - packet_mirror_network_name
\ No newline at end of file + - packet_mirror_network_name |