From 6ce1094d509195fe484761467a67a6b3757593b0 Mon Sep 17 00:00:00 2001 From: ojasdubey Date: Thu, 29 Nov 2018 20:46:49 +0530 Subject: Fix - Port type and vmtype underscore issue 1. Fix for consolidation of VMs for cases when: a. VM type contains an underscore b. Multiple ports per network role 2. Updated the unit test cases and test data Change-Id: I875f3c8384f8ef2c2aa6add9e30a5f8899ae1a71 Issue-ID: SDC-1966 Signed-off-by: ojasdubey --- .../out/MainServiceTemplate.yaml | 494 ++++++++++----------- 1 file changed, 247 insertions(+), 247 deletions(-) (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/MainServiceTemplate.yaml') diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/MainServiceTemplate.yaml index 6741c72585..9cabc6d0d0 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/MainServiceTemplate.yaml @@ -264,43 +264,43 @@ topology_template: directives: - substitutable properties: + port_b_single_1b_t1_port_0_network_role_tag: oam + port_b_single_1b_t2_port_0_network: + - b_single_1b_network_1 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: + port_b_single_1b_t1_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: is_required: false + port_b_single_1b_t1_port_0_value_specs: + - get_attribute: + - abstract_a_single_1a + - a_single_1a_a_single_1a_t1_port_0_tenant_id compute_b_single_1b_availability_zone: - get_input: availabilityzone_name compute_b_single_1b_scheduler_hints: - group: BE_Affinity_group - port_1b_t2_port_ip_requirements: + port_b_single_1b_t1_port_0_mac_requirements: + mac_count_required: + is_required: false + port_b_single_1b_t1_port_0_network: + - get_input: oam_net_name + port_b_single_1b_t2_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_1b_t1_port_value_specs: - - get_attribute: - - abstract_a_single_1a - - a_single_1a_1a_t1_port_tenant_id - port_1b_t1_port_network_role_tag: oam - port_1b_t1_port_mac_requirements: + port_b_single_1b_t2_port_0_mac_requirements: mac_count_required: is_required: false - port_1b_t2_port_network: - - b_single_1b_network_1 - port_1b_t1_port_network: - - get_input: oam_net_name compute_b_single_1b_name: - get_input: - b_single_1b_names @@ -314,7 +314,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_b_single_1b_1b_t2_port: + - link_b_single_1b_b_single_1b_t2_port_0: capability: tosca.capabilities.network.Linkable node: b_single_1b_network_1 relationship: tosca.relationships.network.LinksTo @@ -329,7 +329,15 @@ topology_template: - 1c2_catalog_instance_instance_name vm_flavor_name: get_input: pd_flavor_name - port_2c202_port_ip_requirements: + port_2c2_catalog_instance_202_port_0_network: + - 1c2_catalog_instance_network + port_2c2_catalog_instance_202_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_2c2_catalog_instance_201_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false @@ -337,30 +345,22 @@ topology_template: is_required: false vm_image_name: get_input: pd_image_name - port_1c201_port_network_role_tag: oam compute_2c2_catalog_instance_scheduler_hints: - group: BE_Affinity_group compute_2c2_catalog_instance_availability_zone: - get_input: availabilityzone_name - compute_2c2_catalog_instance_name: - - get_input: - - 2c2_catalog_instance_names - - 1 - port_2c202_port_mac_requirements: + port_2c2_catalog_instance_201_port_0_mac_requirements: mac_count_required: is_required: false - port_2c202_port_network: - - 1c2_catalog_instance_network - port_1c201_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false - port_1c201_port_mac_requirements: + port_2c2_catalog_instance_202_port_0_mac_requirements: mac_count_required: is_required: false - port_1c201_port_network: + compute_2c2_catalog_instance_name: + - get_input: + - 2c2_catalog_instance_names + - 1 + port_2c2_catalog_instance_201_port_0_network_role_tag: oam + port_2c2_catalog_instance_201_port_0_network: - get_input: oam_net_name service_template_filter: substitute_service_template: Nested_2c2_catalog_instanceServiceTemplate.yaml @@ -371,7 +371,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_2c2_catalog_instance_2c202_port: + - link_2c2_catalog_instance_2c2_catalog_instance_202_port_0: capability: tosca.capabilities.network.Linkable node: 1c2_catalog_instance_network relationship: tosca.relationships.network.LinksTo @@ -384,7 +384,15 @@ topology_template: - RAW1 vm_flavor_name: get_input: pd_flavor_name - port_2c202_port_ip_requirements: + port_2c2_catalog_instance_202_port_0_network: + - 1c2_catalog_instance_network + port_2c2_catalog_instance_202_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_2c2_catalog_instance_201_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false @@ -392,30 +400,22 @@ topology_template: is_required: false vm_image_name: get_input: pd_image_name - port_1c201_port_network_role_tag: oam compute_2c2_catalog_instance_scheduler_hints: - group: BE_Affinity_group compute_2c2_catalog_instance_availability_zone: - get_input: availabilityzone_name - compute_2c2_catalog_instance_name: - - get_input: - - 2c2_catalog_instance_names - - 0 - port_2c202_port_mac_requirements: + port_2c2_catalog_instance_201_port_0_mac_requirements: mac_count_required: is_required: false - port_2c202_port_network: - - 1c2_catalog_instance_network - port_1c201_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false - port_1c201_port_mac_requirements: + port_2c2_catalog_instance_202_port_0_mac_requirements: mac_count_required: is_required: false - port_1c201_port_network: + compute_2c2_catalog_instance_name: + - get_input: + - 2c2_catalog_instance_names + - 0 + port_2c2_catalog_instance_201_port_0_network_role_tag: oam + port_2c2_catalog_instance_201_port_0_network: - get_input: oam_net_name service_template_filter: substitute_service_template: Nested_2c2_catalog_instanceServiceTemplate.yaml @@ -426,7 +426,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_2c2_catalog_instance_2c202_port: + - link_2c2_catalog_instance_2c2_catalog_instance_202_port_0: capability: tosca.capabilities.network.Linkable node: 1c2_catalog_instance_network relationship: tosca.relationships.network.LinksTo @@ -439,39 +439,39 @@ topology_template: - get_input: availabilityzone_name vm_flavor_name: get_input: pd_flavor_name - compute_1c2_catalog_instance_personality: - - - UNSUPPORTED_RESOURCE_[1a_single_1A_1, instance_name] - port_2c202_port_ip_requirements: + port_1c2_catalog_instance_202_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false + compute_1c2_catalog_instance_personality: + - - UNSUPPORTED_RESOURCE_[1a_single_1A_1, instance_name] + port_1c2_catalog_instance_201_port_0_mac_requirements: + mac_count_required: + is_required: false + port_1c2_catalog_instance_202_port_0_network: + - 1c2_catalog_instance_network vm_image_name: get_input: pd_image_name - port_1c201_port_network_role_tag: oam + port_1c2_catalog_instance_202_port_0_mac_requirements: + mac_count_required: + is_required: false + port_1c2_catalog_instance_201_port_0_network_role_tag: oam compute_1c2_catalog_instance_name: - get_input: - 1c2_catalog_instance_names - 1 - port_2c202_port_mac_requirements: - mac_count_required: - is_required: false - port_2c202_port_network: - - 1c2_catalog_instance_network - port_1c201_port_ip_requirements: + port_1c2_catalog_instance_201_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_1c201_port_mac_requirements: - mac_count_required: - is_required: false + port_1c2_catalog_instance_201_port_0_network: + - get_input: oam_net_name compute_1c2_catalog_instance_user_data_format: - RAW1 - port_1c201_port_network: - - get_input: oam_net_name compute_1c2_catalog_instance_scheduler_hints: - group: BE_Affinity_group service_template_filter: @@ -483,7 +483,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_1c2_catalog_instance_2c202_port: + - link_1c2_catalog_instance_1c2_catalog_instance_202_port_0: capability: tosca.capabilities.network.Linkable node: 1c2_catalog_instance_network relationship: tosca.relationships.network.LinksTo @@ -496,39 +496,39 @@ topology_template: - get_input: availabilityzone_name vm_flavor_name: get_input: pd_flavor_name - port_2c202_port_ip_requirements: + port_1c2_catalog_instance_202_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false + port_1c2_catalog_instance_201_port_0_mac_requirements: + mac_count_required: + is_required: false + port_1c2_catalog_instance_202_port_0_network: + - 1c2_catalog_instance_network vm_image_name: get_input: pd_image_name - port_1c201_port_network_role_tag: oam + port_1c2_catalog_instance_202_port_0_mac_requirements: + mac_count_required: + is_required: false + port_1c2_catalog_instance_201_port_0_network_role_tag: oam compute_1c2_catalog_instance_name: - get_input: - 1c2_catalog_instance_names - 2 - port_2c202_port_mac_requirements: - mac_count_required: - is_required: false - port_2c202_port_network: - - 1c2_catalog_instance_network - port_1c201_port_ip_requirements: + port_1c2_catalog_instance_201_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_1c201_port_mac_requirements: - mac_count_required: - is_required: false + port_1c2_catalog_instance_201_port_0_network: + - get_input: oam_net_name compute_1c2_catalog_instance_user_data_format: - get_attribute: - abstract_1c2_catalog_instance_0 - 1c2_catalog_instance_instance_name - port_1c201_port_network: - - get_input: oam_net_name compute_1c2_catalog_instance_scheduler_hints: - group: BE_Affinity_group service_template_filter: @@ -540,7 +540,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_1c2_catalog_instance_2c202_port: + - link_1c2_catalog_instance_1c2_catalog_instance_202_port_0: capability: tosca.capabilities.network.Linkable node: 1c2_catalog_instance_network relationship: tosca.relationships.network.LinksTo @@ -550,10 +550,10 @@ topology_template: dhcp_agent_ids: get_attribute: - abstract_1c2_catalog_instance_1 - - 1c2_catalog_instance_1c201_port_tenant_id + - 1c2_catalog_instance_1c2_catalog_instance_201_port_0_tenant_id - get_attribute: - abstract_1c2_catalog_instance_0 - - 1c2_catalog_instance_1c201_port_tenant_id + - 1c2_catalog_instance_1c2_catalog_instance_201_port_0_tenant_id - get_attribute: - abstract_1c2_catalog_instance_1 - 1c2_catalog_instance_instance_name @@ -582,7 +582,7 @@ topology_template: admin_state_up: get_attribute: - abstract_a_single_1a - - a_single_1a_1a_t1_port_tenant_id + - a_single_1a_a_single_1a_t1_port_0_tenant_id qos_policy: get_attribute: - abstract_a_single_1a @@ -603,10 +603,10 @@ topology_template: - b_single_1b_instance_name - get_attribute: - abstract_b_single_1b_1 - - b_single_1b_1b_t1_port_tenant_id + - b_single_1b_b_single_1b_t1_port_0_tenant_id - get_attribute: - abstract_b_single_1b - - b_single_1b_1b_t1_port_tenant_id + - b_single_1b_b_single_1b_t1_port_0_tenant_id abstract_a_single_1a: type: org.openecomp.resource.abstract.nodes.a_single_1a directives: @@ -676,43 +676,43 @@ topology_template: get_attribute: - abstract_1c2_catalog_instance_1 - 1c2_catalog_instance_instance_name - port_1a_t1_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false - port_1a_t2_port_network_role_tag: ppds vm_flavor_name: get_input: pd_flavor_name - port_1a_t2_port_network: - - get_input: ppds_net_name - port_1a_t1_port_mac_requirements: + port_a_single_1a_t2_port_0_network_role_tag: ppds + port_a_single_1a_t1_port_0_mac_requirements: mac_count_required: is_required: false - port_1a_t1_port_network: - - a_single_1a_network vm_image_name: get_input: pd_image_name - port_1a_t2_port_ip_requirements: + port_a_single_1a_t2_port_0_network: + - get_input: ppds_net_name + port_a_single_1a_t1_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false + port_a_single_1a_t2_port_0_mac_requirements: + mac_count_required: + is_required: false + port_a_single_1a_t1_port_0_network: + - a_single_1a_network compute_a_single_1a_availability_zone: - get_input: availabilityzone_name compute_a_single_1a_scheduler_hints: - group: BE_Affinity_group + port_a_single_1a_t2_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false compute_a_single_1a_user_data_format: - RAW compute_a_single_1a_name: - get_input: - a_single_1a_names - 0 - port_1a_t2_port_mac_requirements: - mac_count_required: - is_required: false service_template_filter: substitute_service_template: Nested_a_single_1aServiceTemplate.yaml count: 1 @@ -722,7 +722,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_a_single_1a_1a_t1_port: + - link_a_single_1a_a_single_1a_t1_port_0: capability: tosca.capabilities.network.Linkable node: a_single_1a_network relationship: tosca.relationships.network.LinksTo @@ -744,11 +744,11 @@ topology_template: connectivityTo1C1_T1_02: get_attribute: - abstract_1c11_scalling_instance - - 1c11_scalling_instance_1c1_t1_port_tenant_id + - 1c11_scalling_instance_1c11_scalling_instance_t1_port_0_tenant_id connectivityTo1C1_T1_11: get_attribute: - abstract_1c12_scalling_instance - - 1c12_scalling_instance_1c1_t1_port_tenant_id + - 1c12_scalling_instance_1c12_scalling_instance_t1_port_0_tenant_id connectivityTo4PNested_1: get_attribute: - 4p_nested_1 @@ -756,11 +756,11 @@ topology_template: connectivityTo1C1_T1_01: get_attribute: - abstract_1c11_scalling_instance - - 1c11_scalling_instance_1c1_t1_port_tenant_id + - 1c11_scalling_instance_1c11_scalling_instance_t1_port_0_tenant_id connectivityTo1C1_T1_12: get_attribute: - abstract_1c12_scalling_instance - - 1c12_scalling_instance_1c1_t1_port_tenant_id + - 1c12_scalling_instance_1c12_scalling_instance_t1_port_0_tenant_id connectivityTo1B01_1: get_attribute: - abstract_b_single_1b_1 @@ -840,11 +840,11 @@ topology_template: connectivityTo1C1_T1_02: get_attribute: - abstract_1c11_scalling_instance - - 1c11_scalling_instance_1c1_t1_port_tenant_id + - 1c11_scalling_instance_1c11_scalling_instance_t1_port_0_tenant_id connectivityTo1C1_T1_11: get_attribute: - abstract_1c12_scalling_instance - - 1c12_scalling_instance_1c1_t1_port_tenant_id + - 1c12_scalling_instance_1c12_scalling_instance_t1_port_0_tenant_id connectivityTo4PNested_1: get_attribute: - 4p_nested_1 @@ -852,11 +852,11 @@ topology_template: connectivityTo1C1_T1_01: get_attribute: - abstract_1c11_scalling_instance - - 1c11_scalling_instance_1c1_t1_port_tenant_id + - 1c11_scalling_instance_1c11_scalling_instance_t1_port_0_tenant_id connectivityTo1C1_T1_12: get_attribute: - abstract_1c12_scalling_instance - - 1c12_scalling_instance_1c1_t1_port_tenant_id + - 1c12_scalling_instance_1c12_scalling_instance_t1_port_0_tenant_id connectivityTo1B01_1: get_attribute: - abstract_b_single_1b_1 @@ -923,18 +923,6 @@ topology_template: directives: - substitutable properties: - port_1c1_t1_port_fixed_ips: - - - ip_address: - get_input: - - myIPs - - 1 - - - ip_address: - get_input: - - myIPs - - 1 - port_1c1_t1_port_mac_requirements: - mac_count_required: - is_required: false vm_flavor_name: get_input: pd_flavor_name compute_1c11_scalling_instance_name: @@ -950,23 +938,35 @@ topology_template: compute_1c11_scalling_instance_user_data_format: - RAW1 - RAW1 - port_1c1_t1_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: + port_1c11_scalling_instance_t1_port_0_name: + - 1c11_scalling_instance_0_t1_port_0 + - 1c11_scalling_instance_1_t1_port_0 + port_1c11_scalling_instance_t1_port_0_mac_requirements: + mac_count_required: is_required: false vm_image_name: get_input: pd_image_name - port_1c1_t1_port_name: - - 1c1_t1_port_01 - - 1c1_t1_port_02 compute_1c11_scalling_instance_scheduler_hints: - group: BE_Affinity_group - group: BE_Affinity_group - port_1c1_t1_port_network: + port_1c11_scalling_instance_t1_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + port_1c11_scalling_instance_t1_port_0_network: - 1c1_scalling_instance_network - 1c1_scalling_instance_network + port_1c11_scalling_instance_t1_port_0_fixed_ips: + - - ip_address: + get_input: + - myIPs + - 1 + - - ip_address: + get_input: + - myIPs + - 1 service_template_filter: substitute_service_template: Nested_1c11_scalling_instanceServiceTemplate.yaml count: 2 @@ -976,7 +976,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_1c11_scalling_instance_1c1_t1_port: + - link_1c11_scalling_instance_1c11_scalling_instance_t1_port_0: capability: tosca.capabilities.network.Linkable node: 1c1_scalling_instance_network relationship: tosca.relationships.network.LinksTo @@ -987,6 +987,12 @@ topology_template: properties: vm_flavor_name: get_input: pd_flavor_name + port_b_single_2b_t1_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false compute_b_single_2b_metadata: - connectivityTo4PNested_2: get_attribute: @@ -995,11 +1001,11 @@ topology_template: connectivityTo1C1_T1_02: get_attribute: - abstract_1c11_scalling_instance - - 1c11_scalling_instance_1c1_t1_port_tenant_id + - 1c11_scalling_instance_1c11_scalling_instance_t1_port_0_tenant_id connectivityTo1C1_T1_11: get_attribute: - abstract_1c12_scalling_instance - - 1c12_scalling_instance_1c1_t1_port_tenant_id + - 1c12_scalling_instance_1c12_scalling_instance_t1_port_0_tenant_id connectivityTo4PNested_1: get_attribute: - 4p_nested_1 @@ -1007,11 +1013,11 @@ topology_template: connectivityTo1C1_T1_01: get_attribute: - abstract_1c11_scalling_instance - - 1c11_scalling_instance_1c1_t1_port_tenant_id + - 1c11_scalling_instance_1c11_scalling_instance_t1_port_0_tenant_id connectivityTo1C1_T1_12: get_attribute: - abstract_1c12_scalling_instance - - 1c12_scalling_instance_1c1_t1_port_tenant_id + - 1c12_scalling_instance_1c12_scalling_instance_t1_port_0_tenant_id connectivityTo1B01_1: get_attribute: - abstract_b_single_1b_1 @@ -1052,38 +1058,32 @@ topology_template: get_attribute: - abstract_1c2_catalog_instance_1 - 1c2_catalog_instance_instance_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_b_single_2b_t2_port_0_network: + - b_single_1b_network_2 compute_b_single_2b_scheduler_hints: - group: BE_Affinity_group + port_b_single_2b_t1_port_0_mac_requirements: + mac_count_required: + is_required: false compute_b_single_2b_availability_zone: - get_input: availabilityzone_name - port_1b_t2_port_mac_requirements: + compute_b_single_2b_name: + - get_input: + - b_single_2b_names + - 0 + port_b_single_2b_t2_port_0_mac_requirements: mac_count_required: is_required: false - port_1b_t2_port_ip_requirements: + port_b_single_2b_t2_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - compute_b_single_2b_name: - - get_input: - - b_single_2b_names - - 0 compute_b_single_2b_user_data_format: - RAW - port_1b_t1_port_mac_requirements: - mac_count_required: - is_required: false - port_1b_t2_port_network: - - b_single_1b_network_2 service_template_filter: substitute_service_template: Nested_b_single_2b_1ServiceTemplate.yaml count: 1 @@ -1093,7 +1093,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_b_single_2b_1b_t2_port: + - link_b_single_2b_b_single_2b_t2_port_0: capability: tosca.capabilities.network.Linkable node: b_single_1b_network_2 relationship: tosca.relationships.network.LinksTo @@ -1115,15 +1115,6 @@ topology_template: compute_1c12_scalling_instance_scheduler_hints: - group: BE_Affinity_group - group: BE_Affinity_group - port_1c1_t1_port_fixed_ips: - - - ip_address: - get_input: - - myIPs - - 1 - - - ip_address: - get_input: - - myIPs - - 1 compute_1c12_scalling_instance_name: - get_input: - 1c12_scalling_instance_names @@ -1131,7 +1122,7 @@ topology_template: - get_input: - 1c12_scalling_instance_names - 2 - port_1c1_t1_port_mac_requirements: + port_1c12_scalling_instance_t1_port_0_mac_requirements: mac_count_required: is_required: false vm_flavor_name: @@ -1139,23 +1130,32 @@ topology_template: compute_1c12_scalling_instance_user_data_format: - RAW1 - RAW1 - port_1c1_t1_port_ip_requirements: + port_1c12_scalling_instance_t1_port_0_name: + - 1c12_scalling_instance_0_t1_port_0 + - 1c12_scalling_instance_1_t1_port_0 + port_1c12_scalling_instance_t1_port_0_network: + - 1c1_scalling_instance_network + - 1c1_scalling_instance_network + vm_image_name: + get_input: pd_image_name + port_1c12_scalling_instance_t1_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false - vm_image_name: - get_input: pd_image_name - port_1c1_t1_port_name: - - 1c1_t1_port_11 - - 1c1_t1_port_12 + port_1c12_scalling_instance_t1_port_0_fixed_ips: + - - ip_address: + get_input: + - myIPs + - 1 + - - ip_address: + get_input: + - myIPs + - 1 compute_1c12_scalling_instance_availability_zone: - get_input: availabilityzone_name - get_input: availabilityzone_name - port_1c1_t1_port_network: - - 1c1_scalling_instance_network - - 1c1_scalling_instance_network service_template_filter: substitute_service_template: Nested_1c12_scalling_instanceServiceTemplate.yaml count: 2 @@ -1165,7 +1165,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_1c12_scalling_instance_1c1_t1_port: + - link_1c12_scalling_instance_1c12_scalling_instance_t1_port_0: capability: tosca.capabilities.network.Linkable node: 1c1_scalling_instance_network relationship: tosca.relationships.network.LinksTo @@ -1304,25 +1304,25 @@ topology_template: directives: - substitutable properties: - compute_a_single_2a_user_data_format: - - RAW - port_1a_t1_port_ip_requirements: + port_a_single_2a_t1_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false + compute_a_single_2a_user_data_format: + - RAW + port_a_single_2a_t1_port_0_mac_requirements: + mac_count_required: + is_required: false + port_a_single_2a_t1_port_0_network: + - a_single_1a_network compute_a_single_2a_scheduler_hints: - group: BE_Affinity_group compute_a_single_2a_availability_zone: - get_input: availabilityzone_name vm_flavor_name: get_input: pd_flavor_name - port_1a_t1_port_mac_requirements: - mac_count_required: - is_required: false - port_1a_t1_port_network: - - a_single_1a_network compute_a_single_2a_name: - get_input: - a_single_2a_names @@ -1402,7 +1402,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_a_single_2a_1a_t1_port: + - link_a_single_2a_a_single_2a_t1_port_0: capability: tosca.capabilities.network.Linkable node: a_single_1a_network relationship: tosca.relationships.network.LinksTo @@ -1460,44 +1460,44 @@ topology_template: properties: vm_flavor_name: get_input: pd_flavor_name - port_1b_t1_port_ip_requirements: + port_b_single_2b_t1_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false + port_b_single_2b_t1_port_0_network_role_tag: oam vm_image_name: get_input: pd_image_name + port_b_single_2b_t2_port_0_network: + - b_single_1b_network_2 compute_b_single_2b_scheduler_hints: - group: BE_Affinity_group + port_b_single_2b_t1_port_0_mac_requirements: + mac_count_required: + is_required: false compute_b_single_2b_availability_zone: - get_input: availabilityzone_name - port_1b_t2_port_mac_requirements: + compute_b_single_2b_name: + - get_input: + - b_single_2b_names + - 1 + port_b_single_2b_t2_port_0_mac_requirements: mac_count_required: is_required: false - port_1b_t2_port_ip_requirements: + port_b_single_2b_t2_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - compute_b_single_2b_name: - - get_input: - - b_single_2b_names - - 1 - port_1b_t1_port_value_specs: - - get_attribute: - - abstract_a_single_1a - - a_single_1a_1a_t1_port_tenant_id compute_b_single_2b_user_data_format: - RAW - port_1b_t1_port_network_role_tag: oam - port_1b_t1_port_mac_requirements: - mac_count_required: - is_required: false - port_1b_t2_port_network: - - b_single_1b_network_2 - port_1b_t1_port_network: + port_b_single_2b_t1_port_0_value_specs: + - get_attribute: + - abstract_a_single_1a + - a_single_1a_a_single_1a_t1_port_0_tenant_id + port_b_single_2b_t1_port_0_network: - get_input: oam_net_name service_template_filter: substitute_service_template: Nested_b_single_2bServiceTemplate.yaml @@ -1508,7 +1508,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_b_single_2b_1b_t2_port: + - link_b_single_2b_b_single_2b_t2_port_0: capability: tosca.capabilities.network.Linkable node: b_single_1b_network_2 relationship: tosca.relationships.network.LinksTo @@ -1519,11 +1519,11 @@ topology_template: get_input: net_name requirements: - dependency: - capability: feature_1c2_catalog_instance_1c201_port + capability: feature_1c2_catalog_instance_1c2_catalog_instance_201_port_0 node: abstract_1c2_catalog_instance_1 relationship: tosca.relationships.DependsOn - dependency: - capability: feature_1c2_catalog_instance_1c201_port + capability: feature_1c2_catalog_instance_1c2_catalog_instance_201_port_0 node: abstract_1c2_catalog_instance_0 relationship: tosca.relationships.DependsOn - dependency: @@ -1567,11 +1567,11 @@ topology_template: node: abstract_b_single_1b relationship: tosca.relationships.DependsOn - dependency: - capability: feature_b_single_1b_1b_t1_port + capability: feature_b_single_1b_b_single_1b_t1_port_0 node: abstract_b_single_1b_1 relationship: tosca.relationships.DependsOn - dependency: - capability: feature_b_single_1b_1b_t1_port + capability: feature_b_single_1b_b_single_1b_t1_port_0 node: abstract_b_single_1b relationship: tosca.relationships.DependsOn - dependency: @@ -1583,7 +1583,7 @@ topology_template: node: abstract_a_single_2a relationship: tosca.relationships.DependsOn - dependency: - capability: feature_a_single_1a_1a_t1_port + capability: feature_a_single_1a_a_single_1a_t1_port_0 node: abstract_a_single_1a relationship: tosca.relationships.DependsOn 4p_nested_2: @@ -1601,11 +1601,11 @@ topology_template: connectivityChk: connectivityTo1C1_T1_02: get_attribute: - - 1c1_t1_port_02 + - 1c11_scalling_instance_1_t1_port_0 - tenant_id connectivityTo1C1_T1_11: get_attribute: - - 1c1_t1_port_11 + - 1c12_scalling_instance_0_t1_port_0 - tenant_id connectivityTo4PNested_1: get_attribute: @@ -1613,11 +1613,11 @@ topology_template: - server_pcm_id connectivityTo1C1_T1_01: get_attribute: - - 1c1_t1_port_01 + - 1c11_scalling_instance_0_t1_port_0 - tenant_id connectivityTo1C1_T1_12: get_attribute: - - 1c1_t1_port_12 + - 1c12_scalling_instance_1_t1_port_0 - tenant_id connectivityTo1B01_1: get_attribute: @@ -1738,19 +1738,19 @@ topology_template: - server_pcm_id connectivityTo1C1_T1_02: get_attribute: - - 1c1_t1_port_02 + - 1c11_scalling_instance_1_t1_port_0 - tenant_id connectivityTo1C1_T1_11: get_attribute: - - 1c1_t1_port_11 + - 1c12_scalling_instance_0_t1_port_0 - tenant_id connectivityTo1C1_T1_01: get_attribute: - - 1c1_t1_port_01 + - 1c11_scalling_instance_0_t1_port_0 - tenant_id connectivityTo1C1_T1_12: get_attribute: - - 1c1_t1_port_12 + - 1c12_scalling_instance_1_t1_port_0 - tenant_id connectivityTo1B01_1: get_attribute: @@ -1862,30 +1862,26 @@ topology_template: directives: - substitutable properties: + port_b_single_1b_t2_port_0_network: + - b_single_1b_network_1 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: + port_b_single_1b_t1_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: is_required: false compute_b_single_1b_availability_zone: - get_input: availabilityzone_name compute_b_single_1b_scheduler_hints: - group: BE_Affinity_group - port_1b_t2_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: + port_b_single_1b_t1_port_0_mac_requirements: + mac_count_required: is_required: false compute_b_single_1b_metadata: - connectivityTo4PNested_2: @@ -1895,11 +1891,11 @@ topology_template: connectivityTo1C1_T1_02: get_attribute: - abstract_1c11_scalling_instance - - 1c11_scalling_instance_1c1_t1_port_tenant_id + - 1c11_scalling_instance_1c11_scalling_instance_t1_port_0_tenant_id connectivityTo1C1_T1_11: get_attribute: - abstract_1c12_scalling_instance - - 1c12_scalling_instance_1c1_t1_port_tenant_id + - 1c12_scalling_instance_1c12_scalling_instance_t1_port_0_tenant_id connectivityTo4PNested_1: get_attribute: - 4p_nested_1 @@ -1907,11 +1903,11 @@ topology_template: connectivityTo1C1_T1_01: get_attribute: - abstract_1c11_scalling_instance - - 1c11_scalling_instance_1c1_t1_port_tenant_id + - 1c11_scalling_instance_1c11_scalling_instance_t1_port_0_tenant_id connectivityTo1C1_T1_12: get_attribute: - abstract_1c12_scalling_instance - - 1c12_scalling_instance_1c1_t1_port_tenant_id + - 1c12_scalling_instance_1c12_scalling_instance_t1_port_0_tenant_id connectivityTo1B01_2: get_attribute: - abstract_b_single_2b_1 @@ -1952,11 +1948,15 @@ topology_template: get_attribute: - abstract_1c2_catalog_instance_1 - 1c2_catalog_instance_instance_name - port_1b_t1_port_mac_requirements: + port_b_single_1b_t2_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_b_single_1b_t2_port_0_mac_requirements: mac_count_required: is_required: false - port_1b_t2_port_network: - - b_single_1b_network_1 compute_b_single_1b_name: - get_input: - b_single_1b_names @@ -1970,7 +1970,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_b_single_1b_1b_t2_port: + - link_b_single_1b_b_single_1b_t2_port_0: capability: tosca.capabilities.network.Linkable node: b_single_1b_network_1 relationship: tosca.relationships.network.LinksTo @@ -2030,10 +2030,10 @@ topology_template: value: get_attribute: - abstract_1c2_catalog_instance_1 - - 1c2_catalog_instance_1c201_port_tenant_id + - 1c2_catalog_instance_1c2_catalog_instance_201_port_0_tenant_id - get_attribute: - abstract_1c2_catalog_instance_0 - - 1c2_catalog_instance_1c201_port_tenant_id + - 1c2_catalog_instance_1c2_catalog_instance_201_port_0_tenant_id - get_attribute: - abstract_1c2_catalog_instance_1 - 1c2_catalog_instance_instance_name @@ -2070,10 +2070,10 @@ topology_template: - b_single_1b_instance_name - get_attribute: - abstract_b_single_1b_1 - - b_single_1b_1b_t1_port_tenant_id + - b_single_1b_b_single_1b_t1_port_0_tenant_id - get_attribute: - abstract_b_single_1b - - b_single_1b_1b_t1_port_tenant_id + - b_single_1b_b_single_1b_t1_port_0_tenant_id out5: value: get_attribute: @@ -2091,7 +2091,7 @@ topology_template: value: get_attribute: - abstract_a_single_1a - - a_single_1a_1a_t1_port_tenant_id + - a_single_1a_a_single_1a_t1_port_0_tenant_id out7: value: get_attribute: -- cgit 1.2.3-korg