diff options
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition')
13 files changed, 518 insertions, 297 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 114521fe48..793c3bdd7c 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 @@ -8,20 +8,12 @@ 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_FSB1_Internal_ip_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_FSB2_Internal_2_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED port_FSB1_Internal_subnetpoolid: type: string required: true @@ -30,74 +22,142 @@ node_types: type: string required: true status: SUPPORTED - port_FSB1_OAM_subnetpoolid: + compute_FSB1_metadata: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_FSB2_Internal_2_order: + type: integer + required: true + status: SUPPORTED + vm_flavor_name: type: string required: true status: SUPPORTED - compute_FSB1_metadata: + port_FSB1_Internal_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: json - port_FSB2_Internal_1_exCP_naming: - type: org.openecomp.datatypes.Naming + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_FSB1_OAM_vlan_requirements: + type: list required: true status: SUPPORTED - port_FSB1_OAM_exCP_naming: - type: org.openecomp.datatypes.Naming + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_FSB1_Internal_vlan_requirements: + type: list required: true status: SUPPORTED - port_FSB1_OAM_ip_requirements: + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_FSB1_Internal_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_FSB2_Internal_2_order: + type: string + port_FSB2_Internal_1_order: type: integer required: true status: SUPPORTED - port_FSB2_Internal_1_mac_address: + port_FSB2_Internal_2_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_FSB1_OAM_network: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_FSB2_Internal_2_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_FSB2_Internal_1_network: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_FSB2_Internal_2_network_role: type: string required: true status: SUPPORTED - vm_flavor_name: + port_FSB1_OAM_network_role: type: string required: true status: SUPPORTED - port_FSB2_Internal_2_mac_address: + port_FSB2_Internal_1_network_role: type: string required: true status: SUPPORTED - port_FSB2_Internal_1_ip_requirements: + port_FSB2_Internal_2_network_role_tag: + type: string + required: true + status: SUPPORTED + port_FSB2_Internal_1_subnetpoolid: + type: string + required: true + status: SUPPORTED + port_FSB1_Internal_mac_address: + type: string + required: true + status: SUPPORTED + port_FSB2_Internal_2_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_FSB1_OAM_subnetpoolid: + type: string + required: true + status: SUPPORTED + port_FSB2_Internal_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_FSB1_OAM_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_FSB1_OAM_ip_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_FSB2_Internal_2_vlan_requirements: - type: list + port_FSB2_Internal_1_mac_address: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_FSB1_Internal_network_role_tag: + port_FSB2_Internal_2_mac_address: type: string required: true status: SUPPORTED - port_FSB1_OAM_vlan_requirements: + port_FSB2_Internal_1_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_FSB1_Internal_vlan_requirements: + type: org.openecomp.datatypes.network.IpRequirements + port_FSB2_Internal_2_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements + port_FSB1_Internal_network_role_tag: + type: string + required: true + status: SUPPORTED port_FSB1_Internal_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -120,12 +180,6 @@ node_types: status: SUPPORTED entry_schema: type: string - port_FSB1_Internal_network: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string index_value: type: integer description: Index value of this substitution service template runtime instance @@ -134,16 +188,6 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_FSB2_Internal_1_order: - type: integer - required: true - status: SUPPORTED - port_FSB2_Internal_2_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements port_FSB1_OAM_order: type: integer required: true @@ -154,28 +198,12 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_FSB1_OAM_network: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_FSB2_Internal_1_network: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string port_FSB2_Internal_2_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_FSB2_Internal_2_network_role: - type: string - required: true - status: SUPPORTED port_FSB2_Internal_1_network_role_tag: type: string required: true @@ -184,14 +212,18 @@ node_types: type: integer required: true status: SUPPORTED - port_FSB1_OAM_network_role: - type: string + port_FSB2_Internal_1_related_networks: + type: list required: true status: SUPPORTED - port_FSB2_Internal_1_network_role: - type: string + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_FSB1_OAM_related_networks: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_FSB1_OAM_network_role_tag: type: string required: true @@ -212,18 +244,10 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_FSB2_Internal_2_network_role_tag: - type: string - required: true - status: SUPPORTED port_FSB2_Internal_2_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_FSB2_Internal_1_subnetpoolid: - type: string - required: true - status: SUPPORTED 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/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 eb0ec3020f..20ecc5780f 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 @@ -11,31 +11,95 @@ 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_FSB1_Internal_ip_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_FSB2_Internal_2_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true port_FSB1_Internal_subnetpoolid: type: string required: true port_FSB2_Internal_2_subnetpoolid: type: string required: true - port_FSB1_OAM_subnetpoolid: - type: string - required: true compute_FSB1_metadata: type: list required: true entry_schema: type: json + port_FSB2_Internal_2_order: + type: integer + required: true + vm_flavor_name: + type: string + required: true + port_FSB1_Internal_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_FSB1_OAM_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_FSB1_Internal_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_FSB1_Internal_network: + type: list + required: true + entry_schema: + type: string + port_FSB2_Internal_1_order: + type: integer + required: true + port_FSB2_Internal_2_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_FSB1_OAM_network: + type: list + required: true + entry_schema: + type: string + port_FSB2_Internal_2_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_FSB2_Internal_1_network: + type: list + required: true + entry_schema: + type: string + port_FSB2_Internal_2_network_role: + type: string + required: true + port_FSB1_OAM_network_role: + type: string + required: true + port_FSB2_Internal_1_network_role: + type: string + required: true + port_FSB2_Internal_2_network_role_tag: + type: string + required: true + port_FSB2_Internal_1_subnetpoolid: + type: string + required: true + port_FSB1_Internal_mac_address: + type: string + required: true + port_FSB2_Internal_2_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_FSB1_OAM_subnetpoolid: + type: string + required: true port_FSB2_Internal_1_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -47,15 +111,9 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_FSB2_Internal_2_order: - type: integer - required: true port_FSB2_Internal_1_mac_address: type: string required: true - vm_flavor_name: - type: string - required: true port_FSB2_Internal_2_mac_address: type: string required: true @@ -72,16 +130,6 @@ topology_template: port_FSB1_Internal_network_role_tag: type: string required: true - port_FSB1_OAM_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_FSB1_Internal_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements port_FSB1_Internal_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -99,11 +147,6 @@ topology_template: required: true entry_schema: type: string - port_FSB1_Internal_network: - type: list - required: true - entry_schema: - type: string index_value: type: integer description: Index value of this substitution service template runtime instance @@ -111,14 +154,6 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_FSB2_Internal_1_order: - type: integer - required: true - port_FSB2_Internal_2_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements port_FSB1_OAM_order: type: integer required: true @@ -127,36 +162,27 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_FSB1_OAM_network: - type: list - required: true - entry_schema: - type: string - port_FSB2_Internal_1_network: - type: list - required: true - entry_schema: - type: string port_FSB2_Internal_2_network: type: list required: true entry_schema: type: string - port_FSB2_Internal_2_network_role: - type: string - required: true port_FSB2_Internal_1_network_role_tag: type: string required: true port_FSB1_Internal_order: type: integer required: true - port_FSB1_OAM_network_role: - type: string + port_FSB2_Internal_1_related_networks: + type: list required: true - port_FSB2_Internal_1_network_role: - type: string + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_FSB1_OAM_related_networks: + type: list required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_FSB1_OAM_network_role_tag: type: string required: true @@ -173,19 +199,19 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_FSB2_Internal_2_network_role_tag: - type: string - required: true port_FSB2_Internal_2_exCP_naming: type: org.openecomp.datatypes.Naming required: true - port_FSB2_Internal_1_subnetpoolid: - type: string - required: true node_templates: FSB1_FSB1_Internal: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + mac_requirements: + get_input: port_FSB1_Internal_mac_requirements + order: + get_input: port_FSB1_Internal_order + mac_address: + get_input: port_FSB1_Internal_mac_address exCP_naming: get_input: port_FSB1_Internal_exCP_naming vlan_requirements: @@ -193,12 +219,10 @@ topology_template: subinterface_indicator: false ip_requirements: get_input: port_FSB1_Internal_ip_requirements + related_networks: + get_input: port_FSB1_Internal_related_networks network_role_tag: get_input: port_FSB1_Internal_network_role_tag - mac_requirements: - get_input: port_FSB1_Internal_mac_requirements - order: - get_input: port_FSB1_Internal_order network_role: get_input: port_FSB1_Internal_network_role subnetpoolid: @@ -207,8 +231,6 @@ topology_template: get_input: - port_FSB1_Internal_network - index_value - mac_address: - get_input: port_FSB1_Internal_mac_address requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -217,6 +239,12 @@ topology_template: FSB1_FSB2_Internal_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + mac_requirements: + get_input: port_FSB2_Internal_1_mac_requirements + order: + get_input: port_FSB2_Internal_1_order + mac_address: + get_input: port_FSB2_Internal_1_mac_address exCP_naming: get_input: port_FSB2_Internal_1_exCP_naming vlan_requirements: @@ -224,12 +252,10 @@ topology_template: subinterface_indicator: false ip_requirements: get_input: port_FSB2_Internal_1_ip_requirements + related_networks: + get_input: port_FSB2_Internal_1_related_networks network_role_tag: get_input: port_FSB2_Internal_1_network_role_tag - mac_requirements: - get_input: port_FSB2_Internal_1_mac_requirements - order: - get_input: port_FSB2_Internal_1_order network_role: get_input: port_FSB2_Internal_1_network_role subnetpoolid: @@ -238,8 +264,6 @@ topology_template: get_input: - port_FSB2_Internal_1_network - index_value - mac_address: - get_input: port_FSB2_Internal_1_mac_address requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -248,6 +272,12 @@ topology_template: FSB1_FSB2_Internal_2: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + mac_requirements: + get_input: port_FSB2_Internal_2_mac_requirements + order: + get_input: port_FSB2_Internal_2_order + mac_address: + get_input: port_FSB2_Internal_2_mac_address exCP_naming: get_input: port_FSB2_Internal_2_exCP_naming vlan_requirements: @@ -255,12 +285,10 @@ topology_template: subinterface_indicator: false ip_requirements: get_input: port_FSB2_Internal_2_ip_requirements + related_networks: + get_input: port_FSB2_Internal_2_related_networks network_role_tag: get_input: port_FSB2_Internal_2_network_role_tag - mac_requirements: - get_input: port_FSB2_Internal_2_mac_requirements - order: - get_input: port_FSB2_Internal_2_order network_role: get_input: port_FSB2_Internal_2_network_role subnetpoolid: @@ -269,8 +297,6 @@ topology_template: get_input: - port_FSB2_Internal_2_network - index_value - mac_address: - get_input: port_FSB2_Internal_2_mac_address requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -279,6 +305,10 @@ topology_template: FSB1_FSB1_OAM: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + mac_requirements: + get_input: port_FSB1_OAM_mac_requirements + order: + get_input: port_FSB1_OAM_order exCP_naming: get_input: port_FSB1_OAM_exCP_naming vlan_requirements: @@ -286,20 +316,18 @@ topology_template: subinterface_indicator: false ip_requirements: get_input: port_FSB1_OAM_ip_requirements + related_networks: + get_input: port_FSB1_OAM_related_networks network_role_tag: get_input: port_FSB1_OAM_network_role_tag - mac_requirements: - get_input: port_FSB1_OAM_mac_requirements - order: - get_input: port_FSB1_OAM_order network_role: get_input: port_FSB1_OAM_network_role - subnetpoolid: - get_input: port_FSB1_OAM_subnetpoolid fixed_ips: get_input: - port_FSB1_OAM_fixed_ips - index_value + subnetpoolid: + get_input: port_FSB1_OAM_subnetpoolid network: get_input: - port_FSB1_OAM_network 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 e22c860596..42008cf2fd 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 @@ -18,6 +18,12 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements + port_FSB2_Internal_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_FSB1_Internal_subnetpoolid: type: string required: true @@ -66,6 +72,12 @@ node_types: type: string required: true status: SUPPORTED + port_FSB1_Internal_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_FSB1_Internal_network_role_tag: type: string required: true @@ -154,6 +166,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_FSB1_OAM_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_FSB1_OAM_network_role_tag: type: string required: true 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 82388dac1d..99e7fd0762 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 @@ -19,6 +19,11 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements + port_FSB2_Internal_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_FSB1_Internal_subnetpoolid: type: string required: true @@ -57,6 +62,11 @@ topology_template: port_FSB2_Internal_network_role: type: string required: true + port_FSB1_Internal_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_FSB1_Internal_network_role_tag: type: string required: true @@ -127,6 +137,11 @@ topology_template: required: true entry_schema: type: string + port_FSB1_OAM_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_FSB1_OAM_network_role_tag: type: string required: true @@ -150,6 +165,12 @@ topology_template: FSB1_FSB1_Internal: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + mac_requirements: + get_input: port_FSB1_Internal_mac_requirements + order: + get_input: port_FSB1_Internal_order + mac_address: + get_input: port_FSB1_Internal_mac_address exCP_naming: get_input: port_FSB1_Internal_exCP_naming vlan_requirements: @@ -157,12 +178,10 @@ topology_template: subinterface_indicator: false ip_requirements: get_input: port_FSB1_Internal_ip_requirements + related_networks: + get_input: port_FSB1_Internal_related_networks network_role_tag: get_input: port_FSB1_Internal_network_role_tag - mac_requirements: - get_input: port_FSB1_Internal_mac_requirements - order: - get_input: port_FSB1_Internal_order network_role: get_input: port_FSB1_Internal_network_role subnetpoolid: @@ -171,8 +190,6 @@ topology_template: get_input: - port_FSB1_Internal_network - index_value - mac_address: - get_input: port_FSB1_Internal_mac_address requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -181,6 +198,12 @@ topology_template: FSB1_FSB2_Internal: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + mac_requirements: + get_input: port_FSB2_Internal_mac_requirements + order: + get_input: port_FSB2_Internal_order + mac_address: + get_input: port_FSB2_Internal_mac_address exCP_naming: get_input: port_FSB2_Internal_exCP_naming vlan_requirements: @@ -188,12 +211,10 @@ topology_template: subinterface_indicator: false ip_requirements: get_input: port_FSB2_Internal_ip_requirements + related_networks: + get_input: port_FSB2_Internal_related_networks network_role_tag: get_input: port_FSB2_Internal_network_role_tag - mac_requirements: - get_input: port_FSB2_Internal_mac_requirements - order: - get_input: port_FSB2_Internal_order network_role: get_input: port_FSB2_Internal_network_role subnetpoolid: @@ -202,8 +223,6 @@ topology_template: get_input: - port_FSB2_Internal_network - index_value - mac_address: - get_input: port_FSB2_Internal_mac_address requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -212,6 +231,10 @@ topology_template: FSB1_FSB1_OAM: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + mac_requirements: + get_input: port_FSB1_OAM_mac_requirements + order: + get_input: port_FSB1_OAM_order exCP_naming: get_input: port_FSB1_OAM_exCP_naming vlan_requirements: @@ -219,20 +242,18 @@ topology_template: subinterface_indicator: false ip_requirements: get_input: port_FSB1_OAM_ip_requirements + related_networks: + get_input: port_FSB1_OAM_related_networks network_role_tag: get_input: port_FSB1_OAM_network_role_tag - mac_requirements: - get_input: port_FSB1_OAM_mac_requirements - order: - get_input: port_FSB1_OAM_order network_role: get_input: port_FSB1_OAM_network_role - subnetpoolid: - get_input: port_FSB1_OAM_subnetpoolid fixed_ips: get_input: - port_FSB1_OAM_fixed_ips - index_value + subnetpoolid: + get_input: port_FSB1_OAM_subnetpoolid network: get_input: - port_FSB1_OAM_network 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 b0861eae74..316771995c 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 @@ -18,6 +18,12 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements + port_FSB2_Internal_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_FSB1_Internal_subnetpoolid: type: string required: true @@ -52,6 +58,12 @@ node_types: type: string required: true status: SUPPORTED + port_FSB1_Internal_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_FSB1_Internal_network_role_tag: type: string required: true 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 2978332fac..aa9a7167f6 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 @@ -19,6 +19,11 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements + port_FSB2_Internal_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_FSB1_Internal_subnetpoolid: type: string required: true @@ -46,6 +51,11 @@ topology_template: port_FSB2_Internal_network_role: type: string required: true + port_FSB1_Internal_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_FSB1_Internal_network_role_tag: type: string required: true @@ -112,6 +122,12 @@ topology_template: FSB1_FSB1_Internal: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + mac_requirements: + get_input: port_FSB1_Internal_mac_requirements + order: + get_input: port_FSB1_Internal_order + mac_address: + get_input: port_FSB1_Internal_mac_address exCP_naming: get_input: port_FSB1_Internal_exCP_naming vlan_requirements: @@ -119,12 +135,10 @@ topology_template: subinterface_indicator: false ip_requirements: get_input: port_FSB1_Internal_ip_requirements + related_networks: + get_input: port_FSB1_Internal_related_networks network_role_tag: get_input: port_FSB1_Internal_network_role_tag - mac_requirements: - get_input: port_FSB1_Internal_mac_requirements - order: - get_input: port_FSB1_Internal_order network_role: get_input: port_FSB1_Internal_network_role subnetpoolid: @@ -133,8 +147,6 @@ topology_template: get_input: - port_FSB1_Internal_network - index_value - mac_address: - get_input: port_FSB1_Internal_mac_address requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -143,6 +155,12 @@ topology_template: FSB1_FSB2_Internal: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + mac_requirements: + get_input: port_FSB2_Internal_mac_requirements + order: + get_input: port_FSB2_Internal_order + mac_address: + get_input: port_FSB2_Internal_mac_address exCP_naming: get_input: port_FSB2_Internal_exCP_naming vlan_requirements: @@ -150,12 +168,10 @@ topology_template: subinterface_indicator: false ip_requirements: get_input: port_FSB2_Internal_ip_requirements + related_networks: + get_input: port_FSB2_Internal_related_networks network_role_tag: get_input: port_FSB2_Internal_network_role_tag - mac_requirements: - get_input: port_FSB2_Internal_mac_requirements - order: - get_input: port_FSB2_Internal_order network_role: get_input: port_FSB2_Internal_network_role subnetpoolid: @@ -164,8 +180,6 @@ topology_template: get_input: - port_FSB2_Internal_network - index_value - mac_address: - get_input: port_FSB2_Internal_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/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 7aadbaf386..a6fed8e0de 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 @@ -18,6 +18,12 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements + port_FSB2_Internal_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_FSB1_Internal_subnetpoolid: type: string required: true @@ -66,6 +72,12 @@ node_types: type: string required: true status: SUPPORTED + port_FSB1_Internal_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_FSB1_Internal_network_role_tag: type: string required: true @@ -154,6 +166,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_FSB1_OAM_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_FSB1_OAM_network_role_tag: type: string required: true 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 b3663c8ac4..d8e84c2056 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 @@ -19,6 +19,11 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements + port_FSB2_Internal_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_FSB1_Internal_subnetpoolid: type: string required: true @@ -57,6 +62,11 @@ topology_template: port_FSB2_Internal_network_role: type: string required: true + port_FSB1_Internal_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_FSB1_Internal_network_role_tag: type: string required: true @@ -127,6 +137,11 @@ topology_template: required: true entry_schema: type: string + port_FSB1_OAM_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_FSB1_OAM_network_role_tag: type: string required: true @@ -150,6 +165,12 @@ topology_template: FSB1_FSB1_Internal: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + mac_requirements: + get_input: port_FSB1_Internal_mac_requirements + order: + get_input: port_FSB1_Internal_order + mac_address: + get_input: port_FSB1_Internal_mac_address exCP_naming: get_input: port_FSB1_Internal_exCP_naming vlan_requirements: @@ -157,12 +178,10 @@ topology_template: subinterface_indicator: false ip_requirements: get_input: port_FSB1_Internal_ip_requirements + related_networks: + get_input: port_FSB1_Internal_related_networks network_role_tag: get_input: port_FSB1_Internal_network_role_tag - mac_requirements: - get_input: port_FSB1_Internal_mac_requirements - order: - get_input: port_FSB1_Internal_order network_role: get_input: port_FSB1_Internal_network_role subnetpoolid: @@ -171,8 +190,6 @@ topology_template: get_input: - port_FSB1_Internal_network - index_value - mac_address: - get_input: port_FSB1_Internal_mac_address requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -181,6 +198,12 @@ topology_template: FSB1_FSB2_Internal: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + mac_requirements: + get_input: port_FSB2_Internal_mac_requirements + order: + get_input: port_FSB2_Internal_order + mac_address: + get_input: port_FSB2_Internal_mac_address exCP_naming: get_input: port_FSB2_Internal_exCP_naming vlan_requirements: @@ -188,12 +211,10 @@ topology_template: subinterface_indicator: false ip_requirements: get_input: port_FSB2_Internal_ip_requirements + related_networks: + get_input: port_FSB2_Internal_related_networks network_role_tag: get_input: port_FSB2_Internal_network_role_tag - mac_requirements: - get_input: port_FSB2_Internal_mac_requirements - order: - get_input: port_FSB2_Internal_order network_role: get_input: port_FSB2_Internal_network_role subnetpoolid: @@ -202,8 +223,6 @@ topology_template: get_input: - port_FSB2_Internal_network - index_value - mac_address: - get_input: port_FSB2_Internal_mac_address requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -212,6 +231,10 @@ topology_template: FSB1_FSB1_OAM: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + mac_requirements: + get_input: port_FSB1_OAM_mac_requirements + order: + get_input: port_FSB1_OAM_order exCP_naming: get_input: port_FSB1_OAM_exCP_naming vlan_requirements: @@ -219,20 +242,18 @@ topology_template: subinterface_indicator: false ip_requirements: get_input: port_FSB1_OAM_ip_requirements + related_networks: + get_input: port_FSB1_OAM_related_networks network_role_tag: get_input: port_FSB1_OAM_network_role_tag - mac_requirements: - get_input: port_FSB1_OAM_mac_requirements - order: - get_input: port_FSB1_OAM_order network_role: get_input: port_FSB1_OAM_network_role - subnetpoolid: - get_input: port_FSB1_OAM_subnetpoolid fixed_ips: get_input: - port_FSB1_OAM_fixed_ips - index_value + subnetpoolid: + get_input: port_FSB1_OAM_subnetpoolid network: get_input: - port_FSB1_OAM_network 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 3e8b719e50..f20b53326b 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 @@ -18,6 +18,12 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements + port_FSB2_Internal_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_FSB1_Internal_subnetpoolid: type: string required: true @@ -38,70 +44,84 @@ node_types: type: integer required: true status: SUPPORTED - compute_FSB1_availability_zone: + port_FSB2_Internal_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 + type: org.openecomp.datatypes.network.IpRequirements + vm_flavor_name: + type: string + required: true status: SUPPORTED - constraints: - - greater_or_equal: 0 - port_FSB2_Internal_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_FSB2_Internal_network_role: + type: string required: true status: SUPPORTED - port_FSB2_Internal_ip_requirements: + port_FSB1_Internal_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - vm_flavor_name: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_FSB1_Internal_network_role_tag: type: string required: true status: SUPPORTED - port_FSB2_Internal_mac_address: - type: string + port_FSB1_Internal_vlan_requirements: + type: list required: true status: SUPPORTED - port_FSB2_Internal_network_role: + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_FSB2_Internal_subnetpoolid: type: string required: true status: SUPPORTED - port_FSB2_Internal_exCP_naming: + port_FSB1_Internal_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_FSB1_Internal_network_role_tag: + port_FSB1_Internal_network_role: type: string required: true status: SUPPORTED - port_FSB1_Internal_order: + compute_FSB1_availability_zone: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + index_value: type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + status: SUPPORTED + constraints: + - greater_or_equal: 0 + port_FSB2_Internal_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_FSB1_Internal_vlan_requirements: - type: list + port_FSB2_Internal_mac_address: + type: string + required: true + status: SUPPORTED + port_FSB2_Internal_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_FSB1_Internal_order: + type: integer required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements port_FSB2_Internal_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_FSB2_Internal_subnetpoolid: - type: string - required: true - status: SUPPORTED port_FSB1_Internal_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -112,14 +132,6 @@ node_types: status: SUPPORTED entry_schema: type: string - port_FSB1_Internal_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_FSB1_Internal_network_role: - type: string - required: true - status: SUPPORTED port_FSB2_Internal_network_role_tag: type: string required: true 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 9e616c9ba0..3e648300da 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 @@ -19,6 +19,11 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements + port_FSB2_Internal_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_FSB1_Internal_subnetpoolid: type: string required: true @@ -35,6 +40,39 @@ topology_template: port_FSB2_Internal_order: type: integer required: true + port_FSB2_Internal_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + vm_flavor_name: + type: string + required: true + port_FSB2_Internal_network_role: + type: string + required: true + port_FSB1_Internal_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_FSB1_Internal_network_role_tag: + type: string + required: true + port_FSB1_Internal_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_FSB2_Internal_subnetpoolid: + type: string + required: true + port_FSB1_Internal_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_FSB1_Internal_network_role: + type: string + required: true compute_FSB1_availability_zone: type: list required: true @@ -50,42 +88,20 @@ topology_template: port_FSB2_Internal_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true - port_FSB2_Internal_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - vm_flavor_name: - type: string - required: true port_FSB2_Internal_mac_address: type: string required: true - port_FSB2_Internal_network_role: - type: string - required: true port_FSB2_Internal_exCP_naming: type: org.openecomp.datatypes.Naming required: true - port_FSB1_Internal_network_role_tag: - type: string - required: true port_FSB1_Internal_order: type: integer required: true - port_FSB1_Internal_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements port_FSB2_Internal_network: type: list required: true entry_schema: type: string - port_FSB2_Internal_subnetpoolid: - type: string - required: true port_FSB1_Internal_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -94,12 +110,6 @@ topology_template: required: true entry_schema: type: string - port_FSB1_Internal_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_FSB1_Internal_network_role: - type: string - required: true port_FSB2_Internal_network_role_tag: type: string required: true @@ -107,6 +117,12 @@ topology_template: FSB1_FSB1_Internal: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + mac_requirements: + get_input: port_FSB1_Internal_mac_requirements + order: + get_input: port_FSB1_Internal_order + mac_address: + get_input: port_FSB1_Internal_mac_address exCP_naming: get_input: port_FSB1_Internal_exCP_naming vlan_requirements: @@ -114,12 +130,10 @@ topology_template: subinterface_indicator: false ip_requirements: get_input: port_FSB1_Internal_ip_requirements + related_networks: + get_input: port_FSB1_Internal_related_networks network_role_tag: get_input: port_FSB1_Internal_network_role_tag - mac_requirements: - get_input: port_FSB1_Internal_mac_requirements - order: - get_input: port_FSB1_Internal_order network_role: get_input: port_FSB1_Internal_network_role subnetpoolid: @@ -128,8 +142,6 @@ topology_template: get_attribute: - FSB1_FSB2_Internal - att - mac_address: - get_input: port_FSB1_Internal_mac_address requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -151,6 +163,8 @@ topology_template: subinterface_indicator: false ip_requirements: get_input: port_FSB2_Internal_ip_requirements + related_networks: + get_input: port_FSB2_Internal_related_networks network_role_tag: get_input: port_FSB2_Internal_network_role_tag network_role: 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 397a1a0541..647db5b03f 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 @@ -18,6 +18,12 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements + port_FSB2_Internal_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_FSB1_Internal_subnetpoolid: type: string required: true @@ -60,6 +66,12 @@ node_types: type: string required: true status: SUPPORTED + port_FSB1_Internal_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_FSB1_Internal_network_role_tag: type: string required: true @@ -142,6 +154,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_FSB1_OAM_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_FSB1_OAM_network_role_tag: type: string required: true 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 bb7bb359c1..33e1cb9752 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 @@ -19,6 +19,11 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements + port_FSB2_Internal_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_FSB1_Internal_subnetpoolid: type: string required: true @@ -52,6 +57,11 @@ topology_template: port_FSB2_Internal_network_role: type: string required: true + port_FSB1_Internal_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_FSB1_Internal_network_role_tag: type: string required: true @@ -117,6 +127,11 @@ topology_template: required: true entry_schema: type: string + port_FSB1_OAM_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_FSB1_OAM_network_role_tag: type: string required: true @@ -135,6 +150,12 @@ topology_template: FSB1_FSB1_Internal: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + mac_requirements: + get_input: port_FSB1_Internal_mac_requirements + order: + get_input: port_FSB1_Internal_order + mac_address: + get_input: port_FSB1_Internal_mac_address exCP_naming: get_input: port_FSB1_Internal_exCP_naming vlan_requirements: @@ -142,12 +163,10 @@ topology_template: subinterface_indicator: false ip_requirements: get_input: port_FSB1_Internal_ip_requirements + related_networks: + get_input: port_FSB1_Internal_related_networks network_role_tag: get_input: port_FSB1_Internal_network_role_tag - mac_requirements: - get_input: port_FSB1_Internal_mac_requirements - order: - get_input: port_FSB1_Internal_order network_role: get_input: port_FSB1_Internal_network_role subnetpoolid: @@ -156,8 +175,6 @@ topology_template: get_input: - port_FSB1_Internal_network - index_value - mac_address: - get_input: port_FSB1_Internal_mac_address requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -166,6 +183,12 @@ topology_template: FSB1_FSB2_Internal: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + mac_requirements: + get_input: port_FSB2_Internal_mac_requirements + order: + get_input: port_FSB2_Internal_order + mac_address: + get_input: port_FSB2_Internal_mac_address exCP_naming: get_input: port_FSB2_Internal_exCP_naming vlan_requirements: @@ -173,12 +196,10 @@ topology_template: subinterface_indicator: false ip_requirements: get_input: port_FSB2_Internal_ip_requirements + related_networks: + get_input: port_FSB2_Internal_related_networks network_role_tag: get_input: port_FSB2_Internal_network_role_tag - mac_requirements: - get_input: port_FSB2_Internal_mac_requirements - order: - get_input: port_FSB2_Internal_order network_role: get_input: port_FSB2_Internal_network_role subnetpoolid: @@ -187,8 +208,6 @@ topology_template: get_input: - port_FSB2_Internal_network - index_value - mac_address: - get_input: port_FSB2_Internal_mac_address requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -197,6 +216,10 @@ topology_template: FSB1_FSB1_OAM: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + mac_requirements: + get_input: port_FSB1_OAM_mac_requirements + order: + get_input: port_FSB1_OAM_order exCP_naming: get_input: port_FSB1_OAM_exCP_naming vlan_requirements: @@ -204,20 +227,18 @@ topology_template: subinterface_indicator: false ip_requirements: get_input: port_FSB1_OAM_ip_requirements + related_networks: + get_input: port_FSB1_OAM_related_networks network_role_tag: get_input: port_FSB1_OAM_network_role_tag - mac_requirements: - get_input: port_FSB1_OAM_mac_requirements - order: - get_input: port_FSB1_OAM_order network_role: get_input: port_FSB1_OAM_network_role - subnetpoolid: - get_input: port_FSB1_OAM_subnetpoolid fixed_ips: get_input: - port_FSB1_OAM_fixed_ips - index_value + subnetpoolid: + get_input: port_FSB1_OAM_subnetpoolid network: get_input: - port_FSB1_OAM_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedIn/noConsolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedIn/noConsolidation/out/MainServiceTemplate.yaml index e4ee3cca82..54db7a4a0a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedIn/noConsolidation/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedIn/noConsolidation/out/MainServiceTemplate.yaml @@ -97,16 +97,16 @@ topology_template: directives: - substitutable properties: + vm_flavor_name: FLAVOR-test + vm_image_name: Image-test compute_QRouter_availability_zone: - Availability-test compute_QRouter_config_drive: - true port_cdr_network_port_network: - get_input: cdr_network - vm_flavor_name: FLAVOR-test port_oam_private_net_network_port_network: - get_input: oam_private_net_name - vm_image_name: Image-test compute_QRouter_name: - QRouter-name service_template_filter: |