diff options
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out')
10 files changed, 329 insertions, 121 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml index 20f2eca975..f444f3afe4 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -1044,6 +1044,12 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_pcm_port_3_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments index_value: type: integer description: Index value of this substitution service template runtime instance @@ -1082,6 +1088,12 @@ node_types: type: string required: true status: SUPPORTED + port_pcm_port_2_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pcm_port_3_network: type: list required: true @@ -1529,6 +1541,12 @@ node_types: org.openecomp.resource.abstract.nodes.heat.pcm_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_pcm_port_1_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pcm_port_0_network_role: type: string required: true @@ -1561,6 +1579,12 @@ node_types: type: string required: true status: SUPPORTED + port_pcm_port_0_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pcm_port_1_subnetpoolid: type: string required: true @@ -2118,6 +2142,12 @@ node_types: type: string required: true status: SUPPORTED + port_1c2_t1_port_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_1c2_t2_port_network_role: type: string required: true @@ -2158,6 +2188,12 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements + port_1c2_t2_port_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_1c2_t1_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -2664,6 +2700,12 @@ node_types: org.openecomp.resource.abstract.nodes.pcma_server_1: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_pcm_port_1_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pcm_port_0_network_role: type: string required: true @@ -2712,6 +2754,12 @@ node_types: type: string required: true status: SUPPORTED + port_pcm_port_0_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pcm_port_1_subnetpoolid: type: string required: true @@ -3241,124 +3289,136 @@ node_types: org.openecomp.resource.abstract.nodes.b_single_1b: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_1b_t2_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_1b_t1_port_order: + type: integer required: true status: SUPPORTED - compute_b_single_1b_availability_zone: - type: list + port_1b_t1_port_network_role: + type: string 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 - compute_b_single_1b_scheduler_hints: - type: list + port_1b_t1_port_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json - port_1b_t1_port_order: - type: integer + vm_flavor_name: + type: string required: true status: SUPPORTED - port_1b_t2_port_vlan_requirements: + port_1b_t2_port_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_1b_t2_port_ip_requirements: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_1b_t1_port_ip_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_1b_t1_port_network_role: + vm_image_name: type: string required: true status: SUPPORTED - port_1b_t1_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - vm_flavor_name: + port_1b_t2_port_network_role: type: string required: true status: SUPPORTED - port_1b_t1_port_network_role_tag: - type: string + port_1b_t2_port_order: + type: integer required: true status: SUPPORTED - port_1b_t1_port_ip_requirements: + compute_b_single_1b_user_data_format: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - vm_image_name: + type: string + port_1b_t2_port_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_1b_t2_port_network_role_tag: type: string required: true status: SUPPORTED - port_1b_t1_port_subnetpoolid: + port_1b_t2_port_subnetpoolid: type: string required: true status: SUPPORTED - port_1b_t1_port_mac_requirements: + port_1b_t1_port_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_1b_t2_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_1b_t2_port_network: + compute_b_single_1b_availability_zone: type: list required: true status: SUPPORTED entry_schema: type: string - port_1b_t2_port_network_role: - type: string - required: true - status: SUPPORTED - port_1b_t2_port_order: + 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 + compute_b_single_1b_scheduler_hints: + type: list required: true status: SUPPORTED - port_1b_t1_port_vlan_requirements: + entry_schema: + type: json + port_1b_t2_port_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - compute_b_single_1b_user_data_format: + port_1b_t2_port_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_1b_t2_port_exCP_naming: - type: org.openecomp.datatypes.Naming + type: org.openecomp.datatypes.network.IpRequirements + port_1b_t1_port_network_role_tag: + type: string required: true status: SUPPORTED - compute_b_single_1b_name: + port_1b_t1_port_subnetpoolid: + type: string + required: true + status: SUPPORTED + port_1b_t1_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_1b_t2_port_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_1b_t2_port_network_role_tag: - type: string + port_1b_t1_port_vlan_requirements: + type: list required: true status: SUPPORTED - port_1b_t2_port_subnetpoolid: - type: string + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + compute_b_single_1b_name: + type: list required: true status: SUPPORTED + entry_schema: + type: string attributes: b_single_1b_instance_name: type: string @@ -3811,6 +3871,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_1c1_t2_port_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_1c1_t2_port_network_role_tag: type: string required: true @@ -3819,6 +3885,12 @@ node_types: type: string required: true status: SUPPORTED + port_1c1_t1_port_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_1c1_t1_port_ip_requirements: type: list required: true @@ -4421,6 +4493,12 @@ node_types: type: string required: true status: SUPPORTED + port_1a_t2_port_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_1a_t2_port_ip_requirements: type: list required: true @@ -4457,6 +4535,12 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 + port_1a_t1_port_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_1a_t1_port_network_role_tag: type: string required: true @@ -4955,6 +5039,12 @@ node_types: type: string required: true status: SUPPORTED + port_1b_t2_port_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_1b_t1_port_ip_requirements: type: list required: true @@ -4991,6 +5081,12 @@ node_types: type: string required: true status: SUPPORTED + port_1b_t1_port_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_1b_t2_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -5558,4 +5654,4 @@ node_types: type: tosca.capabilities.Endpoint occurrences: - 1 - - UNBOUNDED + - UNBOUNDED
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/MainServiceTemplate.yaml index 0556b0b82f..a7aec720a7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/MainServiceTemplate.yaml @@ -243,6 +243,18 @@ topology_template: directives: - substitutable properties: + vm_flavor_name: + get_input: pd_flavor_name + port_1b_t1_port_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + vm_image_name: + get_input: pd_image_name + compute_b_single_1b_user_data_format: + - RAW port_1b_t2_port_mac_requirements: mac_count_required: is_required: false @@ -256,23 +268,11 @@ topology_template: is_required: false floating_ip_count_required: is_required: false - vm_flavor_name: - get_input: pd_flavor_name - port_1b_t1_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false - vm_image_name: - get_input: pd_image_name port_1b_t1_port_mac_requirements: mac_count_required: is_required: false port_1b_t2_port_network: - b_single_1b_network - compute_b_single_1b_user_data_format: - - RAW compute_b_single_1b_name: - get_input: - b_single_1b_names diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c1_scalling_instanceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c1_scalling_instanceServiceTemplate.yaml index 268118dc64..15620d7809 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c1_scalling_instanceServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c1_scalling_instanceServiceTemplate.yaml @@ -24,12 +24,22 @@ topology_template: required: true entry_schema: type: string + port_1c1_t2_port_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_1c1_t2_port_network_role_tag: type: string required: true vm_flavor_name: type: string required: true + port_1c1_t1_port_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_1c1_t1_port_ip_requirements: type: list required: true @@ -145,6 +155,8 @@ topology_template: subinterface_indicator: false ip_requirements: get_input: port_1c1_t1_port_ip_requirements + related_networks: + get_input: port_1c1_t1_port_related_networks network_role_tag: get_input: port_1c1_t1_port_network_role_tag network_role: @@ -205,6 +217,8 @@ topology_template: subinterface_indicator: false ip_requirements: get_input: port_1c1_t2_port_ip_requirements + related_networks: + get_input: port_1c1_t2_port_related_networks network_role_tag: get_input: port_1c1_t2_port_network_role_tag network_role: @@ -457,4 +471,4 @@ topology_template: - link local_storage_1c1_scalling_instance: - 1c1_scalling_instance - - local_storage + - local_storage
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c2_catalog_instanceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c2_catalog_instanceServiceTemplate.yaml index 2c11c084ec..ff4f00e722 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c2_catalog_instanceServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c2_catalog_instanceServiceTemplate.yaml @@ -22,6 +22,11 @@ topology_template: port_1c2_t2_port_subnetpoolid: type: string required: true + port_1c2_t1_port_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_1c2_t2_port_network_role: type: string required: true @@ -53,6 +58,11 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements + port_1c2_t2_port_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_1c2_t1_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -142,6 +152,8 @@ topology_template: vlan_requirements: get_input: port_1c2_t2_port_vlan_requirements subinterface_indicator: false + related_networks: + get_input: port_1c2_t2_port_related_networks ip_requirements: get_input: port_1c2_t2_port_ip_requirements network_role_tag: @@ -171,6 +183,8 @@ topology_template: vlan_requirements: get_input: port_1c2_t1_port_vlan_requirements subinterface_indicator: false + related_networks: + get_input: port_1c2_t1_port_related_networks ip_requirements: get_input: port_1c2_t1_port_ip_requirements network_role_tag: @@ -421,4 +435,4 @@ topology_template: - dependency link_1c2_catalog_instance_1c2_t2_port: - 1c2_catalog_instance_1c2_t2_port - - link + - link
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_a_single_1aServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_a_single_1aServiceTemplate.yaml index 5169d022a8..37ef56746b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_a_single_1aServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_a_single_1aServiceTemplate.yaml @@ -44,6 +44,11 @@ topology_template: vm_image_name: type: string required: true + port_1a_t2_port_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_1a_t2_port_ip_requirements: type: list required: true @@ -74,6 +79,11 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 + port_1a_t1_port_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_1a_t1_port_network_role_tag: type: string required: true @@ -119,6 +129,8 @@ topology_template: vlan_requirements: get_input: port_1a_t1_port_vlan_requirements subinterface_indicator: false + related_networks: + get_input: port_1a_t1_port_related_networks ip_requirements: get_input: port_1a_t1_port_ip_requirements network_role_tag: @@ -171,6 +183,8 @@ topology_template: vlan_requirements: get_input: port_1a_t2_port_vlan_requirements subinterface_indicator: false + related_networks: + get_input: port_1a_t2_port_related_networks ip_requirements: get_input: port_1a_t2_port_ip_requirements network_role_tag: @@ -421,4 +435,4 @@ topology_template: - dependency local_storage_a_single_1a: - a_single_1a - - local_storage + - local_storage
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_b_single_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_b_single_1bServiceTemplate.yaml index 391eba68f1..8bf062f993 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_b_single_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_b_single_1bServiceTemplate.yaml @@ -11,6 +11,56 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_1b_t1_port_order: + type: integer + required: true + port_1b_t1_port_network_role: + type: string + required: true + port_1b_t1_port_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + vm_flavor_name: + type: string + required: true + port_1b_t2_port_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_1b_t1_port_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + vm_image_name: + type: string + required: true + port_1b_t2_port_network_role: + type: string + required: true + port_1b_t2_port_order: + type: integer + required: true + compute_b_single_1b_user_data_format: + type: list + required: true + entry_schema: + type: string + port_1b_t2_port_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_1b_t2_port_network_role_tag: + type: string + required: true + port_1b_t2_port_subnetpoolid: + type: string + required: true + port_1b_t1_port_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_1b_t2_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -31,9 +81,6 @@ topology_template: required: true entry_schema: type: json - port_1b_t1_port_order: - type: integer - required: true port_1b_t2_port_vlan_requirements: type: list required: true @@ -44,26 +91,9 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_1b_t1_port_network_role: - type: string - required: true - port_1b_t1_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - vm_flavor_name: - type: string - required: true port_1b_t1_port_network_role_tag: type: string required: true - port_1b_t1_port_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - vm_image_name: - type: string - required: true port_1b_t1_port_subnetpoolid: type: string required: true @@ -75,36 +105,16 @@ topology_template: required: true entry_schema: type: string - port_1b_t2_port_network_role: - type: string - required: true - port_1b_t2_port_order: - type: integer - required: true port_1b_t1_port_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - compute_b_single_1b_user_data_format: - type: list - required: true - entry_schema: - type: string - port_1b_t2_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true compute_b_single_1b_name: type: list required: true entry_schema: type: string - port_1b_t2_port_network_role_tag: - type: string - required: true - port_1b_t2_port_subnetpoolid: - type: string - required: true node_templates: b_single_1b: type: org.openecomp.resource.vfc.compute.nodes.heat.b_single_1b @@ -137,6 +147,8 @@ topology_template: vlan_requirements: get_input: port_1b_t1_port_vlan_requirements subinterface_indicator: false + related_networks: + get_input: port_1b_t1_port_related_networks ip_requirements: get_input: port_1b_t1_port_ip_requirements network_role_tag: @@ -166,6 +178,8 @@ topology_template: vlan_requirements: get_input: port_1b_t2_port_vlan_requirements subinterface_indicator: false + related_networks: + get_input: port_1b_t2_port_related_networks ip_requirements: get_input: port_1b_t2_port_ip_requirements network_role_tag: @@ -416,4 +430,4 @@ topology_template: - link dependency_b_single_1b_1b_t2_port: - b_single_1b_1b_t2_port - - dependency + - dependency
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_b_single_1b_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_b_single_1b_1ServiceTemplate.yaml index ed3dde70f9..1da7eb2953 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_b_single_1b_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_b_single_1b_1ServiceTemplate.yaml @@ -23,6 +23,11 @@ topology_template: vm_flavor_name: type: string required: true + port_1b_t2_port_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_1b_t1_port_ip_requirements: type: list required: true @@ -51,6 +56,11 @@ topology_template: port_1b_t2_port_subnetpoolid: type: string required: true + port_1b_t1_port_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_1b_t2_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -142,6 +152,8 @@ topology_template: vlan_requirements: get_input: port_1b_t1_port_vlan_requirements subinterface_indicator: false + related_networks: + get_input: port_1b_t1_port_related_networks ip_requirements: get_input: port_1b_t1_port_ip_requirements network_role_tag: @@ -171,6 +183,8 @@ topology_template: vlan_requirements: get_input: port_1b_t2_port_vlan_requirements subinterface_indicator: false + related_networks: + get_input: port_1b_t2_port_related_networks ip_requirements: get_input: port_1b_t2_port_ip_requirements network_role_tag: @@ -421,4 +435,4 @@ topology_template: - link dependency_b_single_1b_1b_t2_port: - b_single_1b_1b_t2_port - - dependency + - dependency
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_pcma_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_pcma_serverServiceTemplate.yaml index 42c8b54010..3b3e7bc0ed 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_pcma_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_pcma_serverServiceTemplate.yaml @@ -89,6 +89,11 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_pcm_port_3_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments index_value: type: integer description: Index value of this substitution service template runtime instance @@ -120,6 +125,11 @@ topology_template: port_pcm_port_2_network_role_tag: type: string required: true + port_pcm_port_2_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pcm_port_3_network: type: list required: true @@ -181,6 +191,8 @@ topology_template: subinterface_indicator: false ip_requirements: get_input: port_pcm_port_3_ip_requirements + related_networks: + get_input: port_pcm_port_3_related_networks network_role_tag: get_input: port_pcm_port_3_network_role_tag network_role: @@ -218,6 +230,8 @@ topology_template: subinterface_indicator: false ip_requirements: get_input: port_pcm_port_2_ip_requirements + related_networks: + get_input: port_pcm_port_2_related_networks network_role_tag: get_input: port_pcm_port_2_network_role_tag network_role: @@ -453,4 +467,4 @@ topology_template: - link link_pcma_server_pcm_port_3: - pcma_server_pcm_port_3 - - link + - link
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_pcma_server_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_pcma_server_1ServiceTemplate.yaml index 502244f096..25ffdd165b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_pcma_server_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_pcma_server_1ServiceTemplate.yaml @@ -11,6 +11,11 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pcm_port_1_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pcm_port_0_network_role: type: string required: true @@ -49,6 +54,11 @@ topology_template: vm_image_name: type: string required: true + port_pcm_port_0_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pcm_port_1_subnetpoolid: type: string required: true @@ -172,6 +182,8 @@ topology_template: subinterface_indicator: false ip_requirements: get_input: port_pcm_port_0_ip_requirements + related_networks: + get_input: port_pcm_port_0_related_networks network_role_tag: get_input: port_pcm_port_0_network_role_tag network_role: @@ -209,6 +221,8 @@ topology_template: subinterface_indicator: false ip_requirements: get_input: port_pcm_port_1_ip_requirements + related_networks: + get_input: port_pcm_port_1_related_networks network_role_tag: get_input: port_pcm_port_1_network_role_tag network_role: @@ -444,4 +458,4 @@ topology_template: - link dependency_pcma_server_pcm_port_0: - pcma_server_pcm_port_0 - - dependency + - dependency
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/nested-pcm_v0.1ServiceTemplate.yaml index d8b22559e8..b6d965399e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/nested-pcm_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/nested-pcm_v0.1ServiceTemplate.yaml @@ -11,6 +11,11 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pcm_port_1_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pcm_port_0_network_role: type: string required: true @@ -40,6 +45,11 @@ topology_template: port_pcm_port_0_subnetpoolid: type: string required: true + port_pcm_port_0_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pcm_port_1_subnetpoolid: type: string required: true @@ -153,6 +163,12 @@ topology_template: pcm_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + subnetpoolid: + get_input: port_pcm_port_1_subnetpoolid + related_networks: + get_input: port_pcm_port_1_related_networks + network: + get_input: oam_net_name ip_requirements: get_input: port_pcm_port_1_ip_requirements security_groups: @@ -162,8 +178,6 @@ topology_template: fixed_ips: - ip_address: get_input: oam_net_ip - subnetpoolid: - get_input: port_pcm_port_1_subnetpoolid mac_requirements: get_input: port_pcm_port_1_mac_requirements subinterface_indicator: false @@ -173,8 +187,6 @@ topology_template: get_input: port_pcm_port_1_vlan_requirements network_role_tag: get_input: port_pcm_port_1_network_role_tag - network: - get_input: oam_net_name order: get_input: port_pcm_port_1_order requirements: @@ -201,6 +213,12 @@ topology_template: pcm_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + subnetpoolid: + get_input: port_pcm_port_0_subnetpoolid + related_networks: + get_input: port_pcm_port_0_related_networks + network: + get_input: cps_net_name ip_requirements: get_input: port_pcm_port_0_ip_requirements security_groups: @@ -210,8 +228,6 @@ topology_template: fixed_ips: - ip_address: get_input: cps_net_ip - subnetpoolid: - get_input: port_pcm_port_0_subnetpoolid mac_requirements: get_input: port_pcm_port_0_mac_requirements subinterface_indicator: false @@ -221,8 +237,6 @@ topology_template: get_input: port_pcm_port_0_vlan_requirements network_role_tag: get_input: port_pcm_port_0_network_role_tag - network: - get_input: cps_net_name order: get_input: port_pcm_port_0_order requirements: @@ -460,4 +474,4 @@ topology_template: - dependency dependency_pcm_port_1: - pcm_port_1 - - dependency + - dependency
\ No newline at end of file |