diff options
114 files changed, 3418 insertions, 408 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/datatypes/heattotosca/unifiedmodel/consolidation/PortTemplateConsolidationData.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/datatypes/heattotosca/unifiedmodel/consolidation/PortTemplateConsolidationData.java index 487771b12d..2dfa3c90f7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/datatypes/heattotosca/unifiedmodel/consolidation/PortTemplateConsolidationData.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/datatypes/heattotosca/unifiedmodel/consolidation/PortTemplateConsolidationData.java @@ -50,6 +50,10 @@ public class PortTemplateConsolidationData extends EntityConsolidationData { this.networkRole = networkRole; } + public boolean isPortBoundToSubInterface() { + return !subInterfaceConsolidationData.isEmpty(); + } + public SubInterfaceTemplateConsolidationData getSubInterfaceResourceTemplateConsolidationData(Resource resource, String subInterfaceNodeTemplateId, String parentPortNodeTemplateId) { diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/UnifiedCompositionService.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/UnifiedCompositionService.java index 639e76d646..86a360b558 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/UnifiedCompositionService.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/UnifiedCompositionService.java @@ -2165,9 +2165,10 @@ public class UnifiedCompositionService { continue; } - if(unifiedCompositionEntity == UnifiedCompositionEntity.PORT + if (unifiedCompositionEntity == UnifiedCompositionEntity.PORT && entityConsolidationData instanceof PortTemplateConsolidationData) { - properties.put(SUB_INTERFACE_INDICATOR_PROPERTY, true); + properties.put(SUB_INTERFACE_INDICATOR_PROPERTY, + ((PortTemplateConsolidationData) entityConsolidationData).isPortBoundToSubInterface()); } for (Map.Entry<String, Object> propertyEntry : properties.entrySet()) { diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/fulltest/UnifiedCompositionSubInterfaceFullTest.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/fulltest/UnifiedCompositionSubInterfaceFullTest.java index 41eb0732b1..7914f34ade 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/fulltest/UnifiedCompositionSubInterfaceFullTest.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/fulltest/UnifiedCompositionSubInterfaceFullTest.java @@ -133,6 +133,18 @@ public class UnifiedCompositionSubInterfaceFullTest extends BaseFullTranslationT testTranslationWithInit(PATTERN_1A_BASE_DIRECTORY + "notBoundToParentPort"); } + @Test + public void testIfSubInfNotPresentPortPropShouldBeFalse() throws IOException { + /* + * Nested Heat file with one compute, two port and one subinterface resource group with + * 1. Port connected with compute + * 2. Sub-interface connected to only on Port + * 3. Need to verify if sub interface resource is not bind with Port then + * subinterface_indicator property under port value should be false + */ + testTranslationWithInit(PATTERN_1A_BASE_DIRECTORY + "twoPortOnlyOneConnectedWithSubInf"); + } + //Pattern 1B test @Test public void testDiffComputeSubInterface() throws IOException { diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/MainServiceTemplate.yaml index 83bc172858..bc37ee43ad 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/MainServiceTemplate.yaml @@ -919,7 +919,7 @@ topology_template: - substitutable properties: port_iox_oam_0_port_subinterface_indicator: - - true + - false port_iox_data_0_port_ip_requirements: - ip_version: 4 ip_count_required: @@ -940,11 +940,11 @@ topology_template: $vnf_name: get_input: vnf_name port_iox_internal_0_port_subinterface_indicator: - - true + - false vm_flavor_name: get_input: iox_flavor_name port_iox_data_0_port_subinterface_indicator: - - true + - false port_iox_data_0_port_allowed_address_pairs: - ip_address: get_attribute: @@ -1079,7 +1079,7 @@ topology_template: mac_count_required: is_required: false port_app_internal_0_port_subinterface_indicator: - - true + - false compute_app_scheduler_hints: - group: app_server_group_group port_app_internal_0_port_ip_requirements: @@ -1094,7 +1094,7 @@ topology_template: floating_ip_count_required: is_required: false port_app_data_0_port_subinterface_indicator: - - true + - false port_app_oam_0_port_replacement_policy: - AUTO port_app_oam_0_port_network: @@ -1117,7 +1117,7 @@ topology_template: mac_count_required: is_required: false port_app_oam_0_port_subinterface_indicator: - - true + - false port_app_data_0_port_network: - get_input: data_net_id port_app_data_0_port_network_role_tag: data @@ -1251,7 +1251,7 @@ topology_template: - substitutable properties: port_iox_oam_0_port_subinterface_indicator: - - true + - false port_iox_data_0_port_ip_requirements: - ip_version: 4 ip_count_required: @@ -1272,11 +1272,11 @@ topology_template: $vnf_name: get_input: vnf_name port_iox_internal_0_port_subinterface_indicator: - - true + - false vm_flavor_name: get_input: iox_flavor_name port_iox_data_0_port_subinterface_indicator: - - true + - false port_iox_data_0_port_allowed_address_pairs: - ip_address: get_attribute: @@ -1406,7 +1406,7 @@ topology_template: mac_count_required: is_required: false port_app_internal_0_port_subinterface_indicator: - - true + - false compute_app_scheduler_hints: - group: app_server_group_group port_app_internal_0_port_ip_requirements: @@ -1421,7 +1421,7 @@ topology_template: floating_ip_count_required: is_required: false port_app_data_0_port_subinterface_indicator: - - true + - false port_app_oam_0_port_replacement_policy: - AUTO port_app_oam_0_port_network: @@ -1449,7 +1449,7 @@ topology_template: mac_count_required: is_required: false port_app_oam_0_port_subinterface_indicator: - - true + - false port_app_data_0_port_network: - get_input: data_net_id port_app_data_0_port_network_role_tag: data @@ -1551,7 +1551,7 @@ topology_template: mac_count_required: is_required: false port_app_internal_0_port_subinterface_indicator: - - true + - false compute_app_scheduler_hints: - group: app_server_group_group port_app_internal_0_port_ip_requirements: @@ -1566,7 +1566,7 @@ topology_template: floating_ip_count_required: is_required: false port_app_data_0_port_subinterface_indicator: - - true + - false port_app_oam_0_port_replacement_policy: - AUTO port_app_oam_0_port_network: @@ -1594,7 +1594,7 @@ topology_template: mac_count_required: is_required: false port_app_oam_0_port_subinterface_indicator: - - true + - false port_app_data_0_port_network: - get_input: data_net_id port_app_data_0_port_network_role_tag: data @@ -1724,7 +1724,7 @@ topology_template: - plt_data_v6_ips - 1 port_plt_oam_0_port_subinterface_indicator: - - true + - false vm_image_name: get_input: plt_image_name compute_plt_availability_zone: @@ -1759,7 +1759,7 @@ topology_template: - 0 - ip_address port_plt_internal_0_port_subinterface_indicator: - - true + - false port_plt_data_0_port_ip_requirements: - ip_version: 4 ip_count_required: @@ -1831,7 +1831,7 @@ topology_template: port_plt_oam_0_port_network: - get_input: oam_net_id port_plt_data_0_port_subinterface_indicator: - - true + - false port_plt_oam_0_port_replacement_policy: - AUTO port_plt_data_0_port_replacement_policy: @@ -1876,7 +1876,7 @@ topology_template: - plt_data_v6_ips - 0 port_plt_oam_0_port_subinterface_indicator: - - true + - false vm_image_name: get_input: plt_image_name compute_plt_availability_zone: @@ -1911,7 +1911,7 @@ topology_template: - 0 - ip_address port_plt_internal_0_port_subinterface_indicator: - - true + - false port_plt_data_0_port_ip_requirements: - ip_version: 4 ip_count_required: @@ -1988,7 +1988,7 @@ topology_template: port_plt_oam_0_port_network: - get_input: oam_net_id port_plt_data_0_port_subinterface_indicator: - - true + - false port_plt_oam_0_port_replacement_policy: - AUTO port_plt_data_0_port_replacement_policy: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/MainServiceTemplate.yaml index 0c180fdd82..f84c1cf630 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/MainServiceTemplate.yaml @@ -168,7 +168,7 @@ topology_template: port_pd01_port_network: - packet_internal_network port_pd01_port_subinterface_indicator: - - true + - false compute_pd_server_user_data_format: - RAW service_template_filter: @@ -216,7 +216,7 @@ topology_template: port_pd01_port_network: - packet_internal_network port_pd01_port_subinterface_indicator: - - true + - false compute_pd_server_user_data_format: - RAW service_template_filter: @@ -264,7 +264,7 @@ topology_template: port_pd01_port_network: - packet_internal_network port_pd01_port_subinterface_indicator: - - true + - false compute_pd_server_user_data_format: - RAW service_template_filter: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/MainServiceTemplate.yaml index 742b2b4f84..77a85a4047 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/MainServiceTemplate.yaml @@ -354,7 +354,7 @@ topology_template: port_pd01_port_network: - get_input: oam_net_name port_pd01_port_subinterface_indicator: - - true + - false port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW @@ -405,7 +405,7 @@ topology_template: port_pd01_port_network: - get_input: oam_net_name port_pd01_port_subinterface_indicator: - - true + - false port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW @@ -451,7 +451,7 @@ topology_template: port_pd01_port_network: - get_input: oam_net_name port_pd01_port_subinterface_indicator: - - true + - false port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/MainServiceTemplate.yaml index 7dc3464c69..a658e82fda 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/MainServiceTemplate.yaml @@ -159,7 +159,7 @@ topology_template: port_pd01_port_network: - packet_external_network port_pd01_port_subinterface_indicator: - - true + - false compute_pd_server_user_data_format: - RAW service_template_filter: @@ -212,7 +212,7 @@ topology_template: port_pd01_port_network: - packet_internal_network port_pd01_port_subinterface_indicator: - - true + - false compute_pd_server_user_data_format: - RAW service_template_filter: @@ -260,7 +260,7 @@ topology_template: port_pd01_port_network: - packet_internal_network port_pd01_port_subinterface_indicator: - - true + - false compute_pd_server_user_data_format: - RAW service_template_filter: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/twoNovaWithDiffProperties/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/twoNovaWithDiffProperties/out/MainServiceTemplate.yaml index 4f7ddc84ed..8d17362c28 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/twoNovaWithDiffProperties/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/twoNovaWithDiffProperties/out/MainServiceTemplate.yaml @@ -195,7 +195,7 @@ topology_template: port_pd01_port_network: - packet_internal_network port_pd01_port_subinterface_indicator: - - true + - false compute_pd_server_user_data_format: - RAW service_template_filter: @@ -247,7 +247,7 @@ topology_template: port_pd01_port_network: - packet_internal_network port_pd01_port_subinterface_indicator: - - true + - false compute_pd_server_user_data_format: - RAW service_template_filter: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromNestedToNested/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromNestedToNested/out/MainServiceTemplate.yaml index 6fc6c1549f..58c1fe9773 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromNestedToNested/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromNestedToNested/out/MainServiceTemplate.yaml @@ -620,7 +620,7 @@ topology_template: compute_sbg_sc_user_data_format: - RAW port_sbg_sc_internal_0_port_subinterface_indicator: - - true + - false service_template_filter: substitute_service_template: Nested_sbg_scServiceTemplate.yaml count: 1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromNovaToNestedPort/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromNovaToNestedPort/out/MainServiceTemplate.yaml index 61d099e538..ac68f001dd 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromNovaToNestedPort/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromNovaToNestedPort/out/MainServiceTemplate.yaml @@ -357,7 +357,7 @@ topology_template: compute_sbg_sc_user_data_format: - RAW port_sbg_sc_internal_0_port_subinterface_indicator: - - true + - false service_template_filter: substitute_service_template: Nested_sbg_scServiceTemplate.yaml count: 1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromPortToNested/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromPortToNested/out/MainServiceTemplate.yaml index f784ee7404..6fcbd31aef 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromPortToNested/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromPortToNested/out/MainServiceTemplate.yaml @@ -624,11 +624,11 @@ topology_template: - sbg_internal_mac_addresses - 0 port_sbg_sc_management_1_port_subinterface_indicator: - - true + - false compute_sbg_sc_availability_zone: - get_input: availability_zone_0 port_sbg_sc_internal_0_port_subinterface_indicator: - - true + - false service_template_filter: substitute_service_template: Nested_sbg_scServiceTemplate.yaml count: 1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromVfcToNested/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromVfcToNested/out/MainServiceTemplate.yaml index cca1b0f9cc..e5c9092c19 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromVfcToNested/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromVfcToNested/out/MainServiceTemplate.yaml @@ -624,11 +624,11 @@ topology_template: - sbg_internal_mac_addresses - 0 port_sbg_sc_management_1_port_subinterface_indicator: - - true + - false compute_sbg_sc_availability_zone: - get_input: availability_zone_0 port_sbg_sc_internal_0_port_subinterface_indicator: - - true + - false service_template_filter: substitute_service_template: Nested_sbg_scServiceTemplate.yaml count: 1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dynamicPortsWithDependsOn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dynamicPortsWithDependsOn/out/MainServiceTemplate.yaml index 47b653691d..1480589392 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dynamicPortsWithDependsOn/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dynamicPortsWithDependsOn/out/MainServiceTemplate.yaml @@ -1034,11 +1034,11 @@ topology_template: - sbg_internal_mac_addresses - 0 port_sbg_sc_management_1_port_subinterface_indicator: - - true + - false compute_sbg_sc_availability_zone: - get_input: availability_zone_0 port_sbg_sc_internal_0_port_subinterface_indicator: - - true + - false service_template_filter: substitute_service_template: Nested_sbg_scServiceTemplate.yaml count: 1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/MainServiceTemplate.yaml index 6c49d65da0..1a3122cfa0 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/MainServiceTemplate.yaml @@ -232,7 +232,7 @@ topology_template: vm_image_name: get_input: pd_image_name port_1b_t2_port_subinterface_indicator: - - true + - false compute_b_single_1b_user_data_format: - RAW port_1b_t2_port_mac_requirements: @@ -254,7 +254,7 @@ topology_template: floating_ip_count_required: is_required: false port_1b_t1_port_subinterface_indicator: - - true + - false compute_b_single_1b_metadata: - connectivityTo4PNested: get_attribute: @@ -311,8 +311,8 @@ topology_template: - RAW2 - RAW1 port_1c1_t2_port_subinterface_indicator: - - true - - true + - false + - false port_1c1_t2_port_network_role_tag: ppds vm_flavor_name: get_input: pd_flavor_name @@ -440,8 +440,8 @@ topology_template: - abstract_b_single_1b - b_single_1b_instance_name port_1c1_t1_port_subinterface_indicator: - - true - - true + - false + - false service_template_filter: substitute_service_template: Nested_1c1_scalling_instanceServiceTemplate.yaml count: 2 @@ -553,7 +553,7 @@ topology_template: compute_1c2_catalog_instance_availability_zone: - get_input: availabilityzone_name port_1c2_t1_port_subinterface_indicator: - - true + - false vm_flavor_name: get_input: pd_flavor_name vm_image_name: @@ -570,7 +570,7 @@ topology_template: floating_ip_count_required: is_required: false port_1c2_t2_port_subinterface_indicator: - - true + - false port_1c2_t1_port_mac_requirements: mac_count_required: is_required: false @@ -651,7 +651,7 @@ topology_template: compute_1c2_catalog_instance_availability_zone: - get_input: availabilityzone_name port_1c2_t1_port_subinterface_indicator: - - true + - false vm_flavor_name: get_input: pd_flavor_name vm_image_name: @@ -668,7 +668,7 @@ topology_template: floating_ip_count_required: is_required: false port_1c2_t2_port_subinterface_indicator: - - true + - false port_1c2_t1_port_mac_requirements: mac_count_required: is_required: false @@ -918,9 +918,9 @@ topology_template: compute_a_single_1a_scheduler_hints: - group: BE_Affinity_group port_1a_t2_port_subinterface_indicator: - - true + - false port_1a_t1_port_subinterface_indicator: - - true + - false compute_a_single_1a_user_data_format: - RAW compute_a_single_1a_name: @@ -1124,7 +1124,7 @@ topology_template: vm_image_name: get_input: pd_image_name port_1b_t2_port_subinterface_indicator: - - true + - false compute_b_single_1b_user_data_format: - RAW port_1b_t2_port_mac_requirements: @@ -1146,7 +1146,7 @@ topology_template: floating_ip_count_required: is_required: false port_1b_t1_port_subinterface_indicator: - - true + - false port_1b_t1_port_value_specs: - get_attribute: - abstract_a_single_1a diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/nested-no_vfc_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/nested-no_vfc_v0.1ServiceTemplate.yaml index 8f8d2f7a73..01f9ea1b84 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/nested-no_vfc_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/nested-no_vfc_v0.1ServiceTemplate.yaml @@ -113,7 +113,7 @@ topology_template: - substitutable properties: port_pcm_port_0_subinterface_indicator: - - true + - false port_pcm_port_1_network_role_tag: oam port_pcm_port_0_fixed_ips: - ip_address: @@ -128,7 +128,7 @@ topology_template: get_input: pcma_image_name port_pcm_port_0_network_role_tag: cps port_pcm_port_1_subinterface_indicator: - - true + - false port_pcm_port_1_network: - get_input: oam_net_name port_pcm_port_0_ip_requirements: @@ -192,7 +192,7 @@ topology_template: - ip_address: get_input: cps_net_ip port_pcm_port_2_subinterface_indicator: - - true + - false vm_flavor_name: get_input: pcma_flavor_name port_pcm_port_3_security_groups: @@ -226,7 +226,7 @@ topology_template: compute_pcma_server_user_data_format: - RAW port_pcm_port_3_subinterface_indicator: - - true + - false port_pcm_port_2_network: - get_input: cps_net_name port_pcm_port_2_ip_requirements: @@ -697,4 +697,4 @@ topology_template: - dependency_pcma_server_pcm_port_1 dependency_pcm_port_2: - abstract_pcma_server - - dependency_pcma_server_pcm_port_2 + - dependency_pcma_server_pcm_port_2
\ 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 6986a6a3bd..25f6d19385 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 @@ -259,7 +259,7 @@ topology_template: vm_image_name: get_input: pd_image_name port_1b_t2_port_subinterface_indicator: - - true + - false compute_b_single_1b_user_data_format: - RAW port_1b_t2_port_mac_requirements: @@ -281,7 +281,7 @@ topology_template: floating_ip_count_required: is_required: false port_1b_t1_port_subinterface_indicator: - - true + - false port_1b_t1_port_mac_requirements: mac_count_required: is_required: false @@ -313,8 +313,8 @@ topology_template: - RAW2 - RAW1 port_1c1_t2_port_subinterface_indicator: - - true - - true + - false + - false port_1c1_t2_port_network_role_tag: ppds vm_flavor_name: get_input: pd_flavor_name @@ -412,8 +412,8 @@ topology_template: - group: BE_Affinity_group - group: BE_Affinity_group port_1c1_t1_port_subinterface_indicator: - - true - - true + - false + - false service_template_filter: substitute_service_template: Nested_1c1_scalling_instanceServiceTemplate.yaml count: 2 @@ -502,7 +502,7 @@ topology_template: compute_1c2_catalog_instance_availability_zone: - get_input: availabilityzone_name port_1c2_t1_port_subinterface_indicator: - - true + - false vm_flavor_name: get_input: pd_flavor_name vm_image_name: @@ -519,7 +519,7 @@ topology_template: floating_ip_count_required: is_required: false port_1c2_t2_port_subinterface_indicator: - - true + - false port_1c2_t1_port_mac_requirements: mac_count_required: is_required: false @@ -571,7 +571,7 @@ topology_template: compute_1c2_catalog_instance_availability_zone: - get_input: availabilityzone_name port_1c2_t1_port_subinterface_indicator: - - true + - false vm_flavor_name: get_input: pd_flavor_name vm_image_name: @@ -588,7 +588,7 @@ topology_template: floating_ip_count_required: is_required: false port_1c2_t2_port_subinterface_indicator: - - true + - false port_1c2_t1_port_mac_requirements: mac_count_required: is_required: false @@ -815,9 +815,9 @@ topology_template: compute_a_single_1a_scheduler_hints: - group: BE_Affinity_group port_1a_t2_port_subinterface_indicator: - - true + - false port_1a_t1_port_subinterface_indicator: - - true + - false compute_a_single_1a_user_data_format: - RAW compute_a_single_1a_name: @@ -962,7 +962,7 @@ topology_template: vm_image_name: get_input: pd_image_name port_1b_t2_port_subinterface_indicator: - - true + - false compute_b_single_1b_user_data_format: - RAW port_1b_t2_port_mac_requirements: @@ -984,7 +984,7 @@ topology_template: floating_ip_count_required: is_required: false port_1b_t1_port_subinterface_indicator: - - true + - false port_1b_t1_port_network_role_tag: oam port_1b_t1_port_mac_requirements: mac_count_required: 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-no_vfc_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-no_vfc_v0.1ServiceTemplate.yaml index 5edb6aa10d..cf17d5bae7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/nested-no_vfc_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-no_vfc_v0.1ServiceTemplate.yaml @@ -109,7 +109,7 @@ topology_template: - substitutable properties: port_pcm_port_0_subinterface_indicator: - - true + - false port_pcm_port_1_network_role_tag: oam port_pcm_port_0_fixed_ips: - ip_address: @@ -124,7 +124,7 @@ topology_template: get_input: pcma_image_name port_pcm_port_0_network_role_tag: cps port_pcm_port_1_subinterface_indicator: - - true + - false port_pcm_port_1_network: - get_input: oam_net_name port_pcm_port_1_security_groups: @@ -188,7 +188,7 @@ topology_template: - ip_address: get_input: cps_net_ip port_pcm_port_2_subinterface_indicator: - - true + - false vm_flavor_name: get_input: pcma_flavor_name port_pcm_port_3_security_groups: @@ -222,7 +222,7 @@ topology_template: compute_pcma_server_user_data_format: - RAW port_pcm_port_3_subinterface_indicator: - - true + - false port_pcm_port_2_network: - get_input: cps_net_name port_pcm_port_2_ip_requirements: @@ -693,4 +693,4 @@ topology_template: - link_pcma_server_pcm_port_0 link_pcm_port_3_0: - abstract_pcma_server - - link_pcma_server_pcm_port_3 + - link_pcma_server_pcm_port_3
\ 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/oneAppearancePerPattern/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/MainServiceTemplate.yaml index 2b81be456f..acfb399266 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/MainServiceTemplate.yaml @@ -232,7 +232,7 @@ topology_template: vm_image_name: get_input: pd_image_name port_1b_t2_port_subinterface_indicator: - - true + - false compute_b_single_1b_user_data_format: - RAW port_1b_t2_port_mac_requirements: @@ -254,7 +254,7 @@ topology_template: floating_ip_count_required: is_required: false port_1b_t1_port_subinterface_indicator: - - true + - false port_1b_t1_port_mac_requirements: mac_count_required: is_required: false @@ -286,8 +286,8 @@ topology_template: - RAW2 - RAW1 port_1c1_t2_port_subinterface_indicator: - - true - - true + - false + - false port_1c1_t2_port_network_role_tag: ppds vm_flavor_name: get_input: pd_flavor_name @@ -385,8 +385,8 @@ topology_template: - group: BE_Affinity_group - group: BE_Affinity_group port_1c1_t1_port_subinterface_indicator: - - true - - true + - false + - false service_template_filter: substitute_service_template: Nested_1c1_scalling_instanceServiceTemplate.yaml count: 2 @@ -466,7 +466,7 @@ topology_template: compute_1c2_catalog_instance_availability_zone: - get_input: availabilityzone_name port_1c2_t1_port_subinterface_indicator: - - true + - false vm_flavor_name: get_input: pd_flavor_name vm_image_name: @@ -483,7 +483,7 @@ topology_template: floating_ip_count_required: is_required: false port_1c2_t2_port_subinterface_indicator: - - true + - false port_1c2_t1_port_mac_requirements: mac_count_required: is_required: false @@ -535,7 +535,7 @@ topology_template: compute_1c2_catalog_instance_availability_zone: - get_input: availabilityzone_name port_1c2_t1_port_subinterface_indicator: - - true + - false vm_flavor_name: get_input: pd_flavor_name vm_image_name: @@ -552,7 +552,7 @@ topology_template: floating_ip_count_required: is_required: false port_1c2_t2_port_subinterface_indicator: - - true + - false port_1c2_t1_port_mac_requirements: mac_count_required: is_required: false @@ -766,9 +766,9 @@ topology_template: compute_a_single_1a_scheduler_hints: - group: BE_Affinity_group port_1a_t2_port_subinterface_indicator: - - true + - false port_1a_t1_port_subinterface_indicator: - - true + - false compute_a_single_1a_user_data_format: - RAW compute_a_single_1a_name: @@ -940,7 +940,7 @@ topology_template: vm_image_name: get_input: pd_image_name port_1b_t2_port_subinterface_indicator: - - true + - false compute_b_single_1b_user_data_format: - RAW port_1b_t2_port_mac_requirements: @@ -962,7 +962,7 @@ topology_template: floating_ip_count_required: is_required: false port_1b_t1_port_subinterface_indicator: - - true + - false port_1b_t1_port_network_role_tag: oam port_1b_t1_port_mac_requirements: mac_count_required: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/nested-no_vfc_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/nested-no_vfc_v0.1ServiceTemplate.yaml index 422dcdb061..a07ae6d967 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/nested-no_vfc_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/nested-no_vfc_v0.1ServiceTemplate.yaml @@ -109,7 +109,7 @@ topology_template: - substitutable properties: port_pcm_port_0_subinterface_indicator: - - true + - false port_pcm_port_1_network_role_tag: oam port_pcm_port_0_fixed_ips: - ip_address: @@ -124,7 +124,7 @@ topology_template: get_input: pcma_image_name port_pcm_port_0_network_role_tag: cps port_pcm_port_1_subinterface_indicator: - - true + - false port_pcm_port_1_network: - get_input: oam_net_name port_pcm_port_0_ip_requirements: @@ -188,7 +188,7 @@ topology_template: - ip_address: get_input: cps_net_ip port_pcm_port_2_subinterface_indicator: - - true + - false vm_flavor_name: get_input: pcma_flavor_name port_pcm_port_3_security_groups: @@ -222,7 +222,7 @@ topology_template: compute_pcma_server_user_data_format: - RAW port_pcm_port_3_subinterface_indicator: - - true + - false port_pcm_port_2_network: - get_input: cps_net_name port_pcm_port_2_ip_requirements: @@ -693,4 +693,4 @@ topology_template: - dependency_pcma_server_pcm_port_1 dependency_pcm_port_2: - abstract_pcma_server - - dependency_pcma_server_pcm_port_2 + - dependency_pcma_server_pcm_port_2
\ 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/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 eda8f53329..da206cc225 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 @@ -280,7 +280,7 @@ topology_template: vm_image_name: get_input: pd_image_name port_1b_t2_port_subinterface_indicator: - - true + - false compute_b_single_1b_user_data_format: - RAW port_1b_t2_port_mac_requirements: @@ -302,7 +302,7 @@ topology_template: floating_ip_count_required: is_required: false port_1b_t1_port_subinterface_indicator: - - true + - false port_1b_t1_port_value_specs: - get_attribute: - abstract_a_single_1a @@ -342,7 +342,7 @@ topology_template: - abstract_1c2_catalog_instance_1 - 1c2_catalog_instance_instance_name port_2c202_port_subinterface_indicator: - - true + - false vm_flavor_name: get_input: pd_flavor_name port_2c202_port_ip_requirements: @@ -384,7 +384,7 @@ topology_template: floating_ip_count_required: is_required: false port_1c201_port_subinterface_indicator: - - true + - false port_1c201_port_mac_requirements: mac_count_required: is_required: false @@ -411,7 +411,7 @@ topology_template: compute_2c2_catalog_instance_user_data_format: - RAW1 port_2c202_port_subinterface_indicator: - - true + - false vm_flavor_name: get_input: pd_flavor_name port_2c202_port_ip_requirements: @@ -453,7 +453,7 @@ topology_template: floating_ip_count_required: is_required: false port_1c201_port_subinterface_indicator: - - true + - false port_1c201_port_mac_requirements: mac_count_required: is_required: false @@ -478,7 +478,7 @@ topology_template: - substitutable properties: port_2c202_port_subinterface_indicator: - - true + - false compute_1c2_catalog_instance_availability_zone: - get_input: availabilityzone_name vm_flavor_name: @@ -520,7 +520,7 @@ topology_template: floating_ip_count_required: is_required: false port_1c201_port_subinterface_indicator: - - true + - false port_1c201_port_mac_requirements: mac_count_required: is_required: false @@ -549,7 +549,7 @@ topology_template: - substitutable properties: port_2c202_port_subinterface_indicator: - - true + - false compute_1c2_catalog_instance_availability_zone: - get_input: availabilityzone_name vm_flavor_name: @@ -589,7 +589,7 @@ topology_template: floating_ip_count_required: is_required: false port_1c201_port_subinterface_indicator: - - true + - false port_1c201_port_mac_requirements: mac_count_required: is_required: false @@ -785,9 +785,9 @@ topology_template: compute_a_single_1a_scheduler_hints: - group: BE_Affinity_group port_1a_t2_port_subinterface_indicator: - - true + - false port_1a_t1_port_subinterface_indicator: - - true + - false compute_a_single_1a_user_data_format: - RAW compute_a_single_1a_name: @@ -1064,8 +1064,8 @@ topology_template: - group: BE_Affinity_group - group: BE_Affinity_group port_1c1_t1_port_subinterface_indicator: - - true - - true + - false + - false port_1c1_t1_port_network: - 1c1_scalling_instance_network - 1c1_scalling_instance_network @@ -1170,7 +1170,7 @@ topology_template: compute_b_single_2b_scheduler_hints: - group: BE_Affinity_group port_1b_t2_port_subinterface_indicator: - - true + - false compute_b_single_2b_availability_zone: - get_input: availabilityzone_name port_1b_t2_port_mac_requirements: @@ -1192,7 +1192,7 @@ topology_template: - b_single_2b_names - 0 port_1b_t1_port_subinterface_indicator: - - true + - false compute_b_single_2b_user_data_format: - RAW port_1b_t1_port_mac_requirements: @@ -1285,8 +1285,8 @@ topology_template: - get_input: availabilityzone_name - get_input: availabilityzone_name port_1c1_t1_port_subinterface_indicator: - - true - - true + - false + - false port_1c1_t1_port_network: - 1c1_scalling_instance_network - 1c1_scalling_instance_network @@ -1469,7 +1469,7 @@ topology_template: vm_image_name: get_input: pd_image_name port_1a_t1_port_subinterface_indicator: - - true + - false compute_a_single_2a_metadata: - connectivityTo4PNested_2: get_attribute: @@ -1627,7 +1627,7 @@ topology_template: compute_b_single_2b_scheduler_hints: - group: BE_Affinity_group port_1b_t2_port_subinterface_indicator: - - true + - false compute_b_single_2b_availability_zone: - get_input: availabilityzone_name port_1b_t2_port_mac_requirements: @@ -1649,7 +1649,7 @@ topology_template: - b_single_2b_names - 1 port_1b_t1_port_subinterface_indicator: - - true + - false port_1b_t1_port_value_specs: - get_attribute: - abstract_a_single_1a @@ -2089,7 +2089,7 @@ topology_template: vm_image_name: get_input: pd_image_name port_1b_t2_port_subinterface_indicator: - - true + - false compute_b_single_1b_user_data_format: - RAW port_1b_t2_port_mac_requirements: @@ -2111,7 +2111,7 @@ topology_template: floating_ip_count_required: is_required: false port_1b_t1_port_subinterface_indicator: - - true + - false compute_b_single_1b_metadata: - connectivityTo4PNested_2: get_attribute: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/nested-no_vfc_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/nested-no_vfc_v0.1ServiceTemplate.yaml index 8f8d2f7a73..01f9ea1b84 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/nested-no_vfc_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/nested-no_vfc_v0.1ServiceTemplate.yaml @@ -113,7 +113,7 @@ topology_template: - substitutable properties: port_pcm_port_0_subinterface_indicator: - - true + - false port_pcm_port_1_network_role_tag: oam port_pcm_port_0_fixed_ips: - ip_address: @@ -128,7 +128,7 @@ topology_template: get_input: pcma_image_name port_pcm_port_0_network_role_tag: cps port_pcm_port_1_subinterface_indicator: - - true + - false port_pcm_port_1_network: - get_input: oam_net_name port_pcm_port_0_ip_requirements: @@ -192,7 +192,7 @@ topology_template: - ip_address: get_input: cps_net_ip port_pcm_port_2_subinterface_indicator: - - true + - false vm_flavor_name: get_input: pcma_flavor_name port_pcm_port_3_security_groups: @@ -226,7 +226,7 @@ topology_template: compute_pcma_server_user_data_format: - RAW port_pcm_port_3_subinterface_indicator: - - true + - false port_pcm_port_2_network: - get_input: cps_net_name port_pcm_port_2_ip_requirements: @@ -697,4 +697,4 @@ topology_template: - dependency_pcma_server_pcm_port_1 dependency_pcm_port_2: - abstract_pcma_server - - dependency_pcma_server_pcm_port_2 + - dependency_pcma_server_pcm_port_2
\ 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/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/MainServiceTemplate.yaml index fc63cd5fd9..d0594ad2df 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/MainServiceTemplate.yaml @@ -240,7 +240,7 @@ topology_template: - substitutable properties: port_pd_server_main_1b_port_subinterface_indicator: - - true + - false compute_pd_server_main_1b_availability_zone: - get_input: availability_zone_0 port_pd_server_main_1b_port_replacement_policy: @@ -308,7 +308,7 @@ topology_template: vm_flavor_name: get_input: ps_server_main_1b_flavor port_ps_server_main_1b_port_subinterface_indicator: - - true + - false vm_image_name: get_input: ps_server_main_1b_image compute_ps_server_main_1b_name: @@ -401,8 +401,8 @@ topology_template: - get_input: availability_zone_0 - get_input: availability_zone_0 port_cmaui_port_subinterface_indicator: - - true - - true + - false + - false compute_cmaui_1c1_main_name: - get_input: - cmaui_1c1_main_names diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested1ServiceTemplate.yaml index a55fd6c746..460e86bfa3 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested1ServiceTemplate.yaml @@ -166,7 +166,7 @@ topology_template: vm_flavor_name: get_input: ps_server_main_1b_flavor port_ps_server_main_1b_port_subinterface_indicator: - - true + - false vm_image_name: get_input: ps_server_main_1b_image compute_ps_server_main_1b_name: @@ -241,8 +241,8 @@ topology_template: - get_input: availability_zone_0 - get_input: availability_zone_0 port_cmaui_port_subinterface_indicator: - - true - - true + - false + - false compute_cmaui_1c1_main_name: - get_input: - cmaui_1c1_main_names @@ -264,7 +264,7 @@ topology_template: - substitutable properties: port_pd_server_main_1b_port_subinterface_indicator: - - true + - false compute_pd_server_main_1b_availability_zone: - get_input: availability_zone_0 port_pd_server_main_1b_port_replacement_policy: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested2ServiceTemplate.yaml index 2c2094efe0..5aba4fadb2 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested2ServiceTemplate.yaml @@ -142,7 +142,7 @@ topology_template: port_pd_server_nested2_1b_port_network: - get_input: jsa_name port_pd_server_nested2_1b_port_subinterface_indicator: - - true + - false service_template_filter: substitute_service_template: Nested_pd_server_nested2_1bServiceTemplate.yaml count: 1 @@ -240,7 +240,7 @@ topology_template: - substitutable properties: port_ps_server_nested2_1b_port_subinterface_indicator: - - true + - false port_ps_server_nested2_1b_port_ip_requirements: - ip_version: 4 ip_count_required: @@ -355,8 +355,8 @@ topology_template: - cmaui_1c1_nested2_names - 0 port_cmaui_port_subinterface_indicator: - - true - - true + - false + - false compute_cmaui_1c1_nested2_availability_zone: - get_input: availability_zone_0 - get_input: availability_zone_0 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/nested1ServiceTemplate.yaml index 9df6d0ce19..b15a2449c2 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/nested1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/nested1ServiceTemplate.yaml @@ -118,7 +118,7 @@ topology_template: vm_flavor_name: get_input: pd_server_flavor port_pd_server_port_subinterface_indicator: - - true + - false port_pd_server_port_fixed_ips: - ip_address: get_input: @@ -162,7 +162,7 @@ topology_template: vm_flavor_name: get_input: ps_server_flavor port_ps_server_port_subinterface_indicator: - - true + - false port_ps_server_port_ip_requirements: - ip_version: 4 ip_count_required: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/nested2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/nested2ServiceTemplate.yaml index 87a1cf5554..6977033374 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/nested2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/nested2ServiceTemplate.yaml @@ -142,7 +142,7 @@ topology_template: port_sm_server_port_network: - get_input: net1 port_sm_server_port_subinterface_indicator: - - true + - false compute_sm_server_name: - get_input: - sm_server_names @@ -193,7 +193,7 @@ topology_template: port_oam_server_port_security_groups: - - get_input: p1 port_oam_server_port_subinterface_indicator: - - true + - false port_oam_server_port_replacement_policy: - AUTO vm_flavor_name: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/MainServiceTemplate.yaml index 1c31067e93..0c6582f13f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/MainServiceTemplate.yaml @@ -146,7 +146,7 @@ topology_template: get_input: pd_flavor_name port_pd02_port_network_role_tag: oam port_pd02_port_subinterface_indicator: - - true + - false vm_image_name: get_input: pd_image_name port_pd02_port_ip_requirements: @@ -204,7 +204,7 @@ topology_template: port_pd01_port_network: - get_input: oam_net_name port_pd01_port_subinterface_indicator: - - true + - false port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/nested1ServiceTemplate.yaml index e847f26e4f..0e7cf8d11c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/nested1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/nested1ServiceTemplate.yaml @@ -98,7 +98,7 @@ topology_template: port_cmaui02_port_network: - get_input: net port_cmaui02_port_subinterface_indicator: - - true + - false service_template_filter: substitute_service_template: Nested_cmauiServiceTemplate.yaml count: 1 @@ -124,7 +124,7 @@ topology_template: - cmaui_names - 0 port_cmaui01_port_subinterface_indicator: - - true + - false compute_cmaui_availability_zone: - get_input: availability_zone_0 vm_image_name: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/nested2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/nested2ServiceTemplate.yaml index 6201798e24..1735b929c6 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/nested2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/nested2ServiceTemplate.yaml @@ -86,7 +86,7 @@ topology_template: vm_flavor_name: get_input: cmaui_flavor port_oam01_port_subinterface_indicator: - - true + - false vm_image_name: get_input: cmaui_image port_oam01_port_fixed_ips: @@ -149,7 +149,7 @@ topology_template: - oam_names - 0 port_oam02_port_subinterface_indicator: - - true + - false service_template_filter: substitute_service_template: Nested_oamServiceTemplate.yaml count: 1 @@ -870,4 +870,4 @@ topology_template: - local_storage_server_ps_1 dependency_server_ps_2_test_nested3Level: - test_nested3Level - - dependency_server_ps_2 + - dependency_server_ps_2
\ 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/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/nested3ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/nested3ServiceTemplate.yaml index 55bafc0278..bb5d8024fa 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/nested3ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/nested3ServiceTemplate.yaml @@ -73,7 +73,7 @@ topology_template: vm_flavor_name: get_input: cmaui_flavor port_pd02_port_subinterface_indicator: - - true + - false vm_image_name: get_input: cmaui_image port_pd02_port_security_groups: @@ -149,7 +149,7 @@ topology_template: - ps_names - 0 port_pd01_port_subinterface_indicator: - - true + - false service_template_filter: substitute_service_template: Nested_ps_1ServiceTemplate.yaml count: 1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/MainServiceTemplate.yaml index 6170503016..a48a6e4035 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/MainServiceTemplate.yaml @@ -146,7 +146,7 @@ topology_template: get_input: pd_flavor_name port_pd02_port_network_role_tag: oam port_pd02_port_subinterface_indicator: - - true + - false vm_image_name: get_input: pd_image_name port_pd02_port_ip_requirements: @@ -204,7 +204,7 @@ topology_template: port_pd01_port_network: - get_input: oam_net_name port_pd01_port_subinterface_indicator: - - true + - false port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/nested1ServiceTemplate.yaml index 468b4263b3..417d7eeb19 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/nested1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/nested1ServiceTemplate.yaml @@ -89,7 +89,7 @@ topology_template: port_pd01_port_network: - get_input: oam_net_name port_pd01_port_subinterface_indicator: - - true + - false port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW @@ -132,7 +132,7 @@ topology_template: vm_image_name: get_input: pd_image_name port_ps02_port_subinterface_indicator: - - true + - false compute_pd_server_user_data_format: - RAW port_ps02_port_network: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/nested2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/nested2ServiceTemplate.yaml index 55e65ce5bd..8a2410b76c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/nested2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/nested2ServiceTemplate.yaml @@ -84,7 +84,7 @@ topology_template: get_input: pd_flavor_name port_pd02_port_network_role_tag: oam port_pd02_port_subinterface_indicator: - - true + - false vm_image_name: get_input: pd_image_name port_pd02_port_ip_requirements: @@ -142,7 +142,7 @@ topology_template: port_pd01_port_network: - get_input: oam_net_name port_pd01_port_subinterface_indicator: - - true + - false port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/nested3ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/nested3ServiceTemplate.yaml index f2a632a178..765bd83d3d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/nested3ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/nested3ServiceTemplate.yaml @@ -89,7 +89,7 @@ topology_template: port_pd01_port_network: - get_input: oam_net_name port_pd01_port_subinterface_indicator: - - true + - false port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW @@ -119,7 +119,7 @@ topology_template: get_input: pd_flavor_name port_pd02_port_network_role_tag: oam port_pd02_port_subinterface_indicator: - - true + - false vm_image_name: get_input: pd_image_name port_pd02_port_ip_requirements: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/MainServiceTemplate.yaml index 38a8f8e6d8..b6709cc11a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/MainServiceTemplate.yaml @@ -322,7 +322,7 @@ topology_template: mac_count_required: is_required: false port_ps_server_1b_port_subinterface_indicator: - - true + - false port_ps_server_1b_port_fixed_ips: - ip_address: get_input: @@ -389,7 +389,7 @@ topology_template: compute_rd_server_1b_availability_zone: - get_input: availability_zone_0 port_rd_server_1b_port_subinterface_indicator: - - true + - false vm_flavor_name: get_input: rd_server_1b_flavor port_rd_server_1b_port_ip_requirements: @@ -522,7 +522,7 @@ topology_template: port_osm_port_replacement_policy: - AUTO port_osm_port_subinterface_indicator: - - true + - false port_osm_port_network: - packet_internal_network_2 compute_osm_server_1c2_name: @@ -575,7 +575,7 @@ topology_template: port_osm_port_replacement_policy: - AUTO port_osm_port_subinterface_indicator: - - true + - false port_osm_port_network: - packet_external_network_2 compute_osm_server_1c2_name: @@ -706,8 +706,8 @@ topology_template: - AUTO - AUTO port_BE_port_subinterface_indicator: - - true - - true + - false + - false service_template_filter: substitute_service_template: Nested_BE_1c1ServiceTemplate.yaml count: 2 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/nested1ServiceTemplate.yaml index 1b2c3f0b62..a6abb190a9 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/nested1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/nested1ServiceTemplate.yaml @@ -136,7 +136,7 @@ topology_template: vm_flavor_name: get_input: pd_server_1b_flavor port_pd_server_1b_port_subinterface_indicator: - - true + - false vm_image_name: get_input: pd_server_1b_image port_pd_server_1b_port_replacement_policy: @@ -231,8 +231,8 @@ topology_template: - cmaui_1c1_names - 0 port_cmaui_port_subinterface_indicator: - - true - - true + - false + - false service_template_filter: substitute_service_template: Nested_cmaui_1c1ServiceTemplate.yaml count: 2 @@ -296,7 +296,7 @@ topology_template: mac_count_required: is_required: false port_ps_server_1b_port_subinterface_indicator: - - true + - false port_ps_server_1b_port_fixed_ips: - ip_address: get_input: @@ -379,7 +379,7 @@ topology_template: - abstract_cmaui_1c1 - cmaui_1c1_accessIPv4 port_oam_port_subinterface_indicator: - - true + - false port_oam_port_ip_requirements: - ip_version: 4 ip_count_required: @@ -432,7 +432,7 @@ topology_template: vm_image_name: get_input: oam_server_1c2_image port_oam_port_subinterface_indicator: - - true + - false port_oam_port_ip_requirements: - ip_version: 4 ip_count_required: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/nested1ServiceTemplate.yaml index 07199eb1c8..6f71a3c8ce 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/nested1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/nested1ServiceTemplate.yaml @@ -183,8 +183,8 @@ topology_template: - cmaui_1c1_names - 0 port_cmaui_port_subinterface_indicator: - - true - - true + - false + - false service_template_filter: substitute_service_template: Nested_cmaui_1c1ServiceTemplate.yaml count: 2 @@ -210,7 +210,7 @@ topology_template: vm_flavor_name: get_input: pd_server_1b_flavor port_pd_server_1b_port_subinterface_indicator: - - true + - false vm_image_name: get_input: pd_server_1b_image port_pd_server_1b_port_replacement_policy: @@ -255,7 +255,7 @@ topology_template: mac_count_required: is_required: false port_ps_server_1b_port_subinterface_indicator: - - true + - false port_ps_server_1b_port_fixed_ips: - ip_address: get_input: @@ -330,7 +330,7 @@ topology_template: vm_image_name: get_input: oam_server_1c2_image port_oam_port_subinterface_indicator: - - true + - false port_oam_port_ip_requirements: - ip_version: 4 ip_count_required: @@ -383,7 +383,7 @@ topology_template: vm_image_name: get_input: oam_server_1c2_image port_oam_port_subinterface_indicator: - - true + - false port_oam_port_ip_requirements: - ip_version: 4 ip_count_required: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/nested1ServiceTemplate.yaml index 8055036678..6fa7e059bd 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/nested1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/nested1ServiceTemplate.yaml @@ -183,8 +183,8 @@ topology_template: - cmaui_1c1_names - 0 port_cmaui_port_subinterface_indicator: - - true - - true + - false + - false service_template_filter: substitute_service_template: Nested_cmaui_1c1ServiceTemplate.yaml count: 2 @@ -210,7 +210,7 @@ topology_template: vm_flavor_name: get_input: pd_server_1b_flavor port_pd_server_1b_port_subinterface_indicator: - - true + - false vm_image_name: get_input: pd_server_1b_image port_pd_server_1b_port_replacement_policy: @@ -255,7 +255,7 @@ topology_template: mac_count_required: is_required: false port_ps_server_1b_port_subinterface_indicator: - - true + - false port_ps_server_1b_port_fixed_ips: - ip_address: get_input: @@ -330,7 +330,7 @@ topology_template: vm_image_name: get_input: oam_server_1c2_image port_oam_port_subinterface_indicator: - - true + - false port_oam_port_ip_requirements: - ip_version: 4 ip_count_required: @@ -383,7 +383,7 @@ topology_template: vm_image_name: get_input: oam_server_1c2_image port_oam_port_subinterface_indicator: - - true + - false port_oam_port_ip_requirements: - ip_version: 4 ip_count_required: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out/nested1ServiceTemplate.yaml index 1edc6ac481..7635fe0280 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out/nested1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out/nested1ServiceTemplate.yaml @@ -109,7 +109,7 @@ topology_template: floating_ip_count_required: is_required: false port_cmaui_port_subinterface_indicator: - - true + - false service_template_filter: substitute_service_template: Nested_cmauiServiceTemplate.yaml count: 1 @@ -162,7 +162,7 @@ topology_template: floating_ip_count_required: is_required: false port_cmaui_port_subinterface_indicator: - - true + - false service_template_filter: substitute_service_template: Nested_cmauiServiceTemplate.yaml count: 1 @@ -556,4 +556,4 @@ topology_template: - local_storage_cmaui dependency_packet_external_network: - packet_external_network - - 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/nestedOtherScenarios/oneLevel/nestedScalingInstance/out/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance/out/nested1ServiceTemplate.yaml index 09d30ff5ee..c6654dd009 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance/out/nested1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance/out/nested1ServiceTemplate.yaml @@ -116,8 +116,8 @@ topology_template: floating_ip_count_required: is_required: false port_cmaui_port_subinterface_indicator: - - true - - true + - false + - false service_template_filter: substitute_service_template: Nested_cmauiServiceTemplate.yaml count: 2 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/nested1ServiceTemplate.yaml index f031518281..3c5c23a86b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/nested1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/nested1ServiceTemplate.yaml @@ -105,7 +105,7 @@ topology_template: vm_flavor_name: get_input: pd_server_flavor port_pd_server_port_subinterface_indicator: - - true + - false port_pd_server_port_fixed_ips: - ip_address: get_input: @@ -147,7 +147,7 @@ topology_template: vm_flavor_name: get_input: ps_server_flavor port_ps_server_port_subinterface_indicator: - - true + - false port_ps_server_port_ip_requirements: - ip_version: 4 ip_count_required: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/nested-other-file-1BServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/nested-other-file-1BServiceTemplate.yaml index e3f3dd567e..eccef8520c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/nested-other-file-1BServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/nested-other-file-1BServiceTemplate.yaml @@ -105,7 +105,7 @@ topology_template: vm_flavor_name: get_input: pd_server_flavor port_pd_server_port_subinterface_indicator: - - true + - false port_pd_server_port_fixed_ips: - ip_address: get_input: @@ -147,7 +147,7 @@ topology_template: vm_flavor_name: get_input: ps_server_flavor port_ps_server_port_subinterface_indicator: - - true + - false port_ps_server_port_ip_requirements: - ip_version: 4 ip_count_required: @@ -532,4 +532,4 @@ topology_template: - link_ps_server_ps_server_port local_storage_server_ps: - abstract_ps_server - - local_storage_ps_server + - local_storage_ps_server
\ 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/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/nested-same-file-1BServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/nested-same-file-1BServiceTemplate.yaml index d60b76bbda..ec3b1ae58a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/nested-same-file-1BServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/nested-same-file-1BServiceTemplate.yaml @@ -88,7 +88,7 @@ topology_template: port_sm_server_port_network: - get_input: net port_sm_server_port_subinterface_indicator: - - true + - false compute_sm_server_name: - get_input: - sm_server_names @@ -134,7 +134,7 @@ topology_template: port_oam_server_port_network: - get_input: net port_oam_server_port_subinterface_indicator: - - true + - false port_oam_server_port_replacement_policy: - AUTO vm_flavor_name: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/nested-other-file-1BServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/nested-other-file-1BServiceTemplate.yaml index 5a7b1eb96a..5137029fac 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/nested-other-file-1BServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/nested-other-file-1BServiceTemplate.yaml @@ -108,7 +108,7 @@ topology_template: vm_flavor_name: get_input: pd_server_flavor port_pd_server_port_subinterface_indicator: - - true + - false port_pd_server_port_fixed_ips: - ip_address: get_input: @@ -152,7 +152,7 @@ topology_template: vm_flavor_name: get_input: ps_server_flavor port_ps_server_port_subinterface_indicator: - - true + - false port_ps_server_port_ip_requirements: - ip_version: 4 ip_count_required: @@ -537,4 +537,4 @@ topology_template: - link_ps_server_ps_server_port local_storage_server_ps: - abstract_ps_server - - local_storage_ps_server + - local_storage_ps_server
\ 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/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/nested-same-file-1BServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/nested-same-file-1BServiceTemplate.yaml index dfabe8d42e..42a64c02ec 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/nested-same-file-1BServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/nested-same-file-1BServiceTemplate.yaml @@ -88,7 +88,7 @@ topology_template: port_sm_server_port_network: - get_input: net port_sm_server_port_subinterface_indicator: - - true + - false compute_sm_server_name: - get_input: - sm_server_names @@ -139,7 +139,7 @@ topology_template: port_oam_server_port_security_groups: - - get_input: p1 port_oam_server_port_subinterface_indicator: - - true + - false port_oam_server_port_replacement_policy: - AUTO vm_flavor_name: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/MainServiceTemplate.yaml index d01b20e756..7d3f8d8bf2 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/MainServiceTemplate.yaml @@ -2095,7 +2095,7 @@ topology_template: mac_count_required: is_required: false port_cdi_ims_core_1_port_subinterface_indicator: - - true + - false vm_image_name: get_input: cdi_image_name compute_cdi_scheduler_hints: @@ -2171,7 +2171,7 @@ topology_template: floating_ip_count_required: is_required: false port_cdi_internal_1_port_subinterface_indicator: - - true + - false compute_cdi_metadata: - vf_module_id: get_input: vf_module_id @@ -2576,7 +2576,7 @@ topology_template: vm_image_name: get_input: lbd_image_name port_lbd_dpdk_1_port_subinterface_indicator: - - true + - false port_lbd_dpdk_1_port_network: - cscf_internal_dpdk_network_0 port_lbd_ims_core_1_port_name: @@ -2622,7 +2622,7 @@ topology_template: mac_count_required: is_required: false port_lbd_ims_core_1_port_subinterface_indicator: - - true + - false port_lbd_internal_1_port_ip_requirements: - ip_version: 4 ip_count_required: @@ -2673,7 +2673,7 @@ topology_template: vf_module_name: get_input: vf_module_name port_lbd_internal_1_port_subinterface_indicator: - - true + - false service_template_filter: substitute_service_template: Nested_lbdServiceTemplate.yaml count: 1 @@ -2932,11 +2932,11 @@ topology_template: - ip_address: get_input: cdi_internal_v6_ip_0 port_cdi_ims_core_0_port_subinterface_indicator: - - true + - false compute_cdi_config_drive: - true port_cdi_internal_0_port_subinterface_indicator: - - true + - false port_cdi_internal_0_port_security_groups: - - cscf_RSG port_cdi_ims_core_0_port_security_groups: @@ -3032,7 +3032,7 @@ topology_template: floating_ip_count_required: is_required: false port_oam_oam_1_port_subinterface_indicator: - - true + - false port_oam_oam_1_port_network_role_tag: oam port_oam_oam_1_port_security_groups: - - cscf_RSG @@ -3087,7 +3087,7 @@ topology_template: compute_oam_scheduler_hints: - group: oam_server_group_group port_oam_internal_1_port_subinterface_indicator: - - true + - false compute_oam_availability_zone: - get_input: availability_zone_1 compute_oam_metadata: @@ -3132,7 +3132,7 @@ topology_template: properties: port_oam_oam_2_port_network_role_tag: oam port_oam_oam_2_port_subinterface_indicator: - - true + - false port_oam_oam_2_port_security_groups: - - cscf_RSG port_oam_oam_2_port_name: @@ -3177,7 +3177,7 @@ topology_template: mac_count_required: is_required: false port_oam_internal_2_port_subinterface_indicator: - - true + - false port_oam_oam_2_port_network: - get_input: oam_net_id compute_oam_user_data_format: @@ -3331,7 +3331,7 @@ topology_template: $DEL: get_input: vcscf_name_delimeter port_oam_internal_0_port_subinterface_indicator: - - true + - false port_oam_oam_0_port_fixed_ips: - ip_address: get_input: oam_oam_ip_0 @@ -3374,7 +3374,7 @@ topology_template: - ip_address: get_input: oam_internal_ip_0 port_oam_oam_0_port_subinterface_indicator: - - true + - false port_oam_oam_0_port_network_role_tag: oam compute_oam_user_data_format: - RAW @@ -3480,7 +3480,7 @@ topology_template: $DEL: get_input: vcscf_name_delimeter port_lbd_internal_0_port_subinterface_indicator: - - true + - false port_lbd_ims_core_0_port_network_role_tag: ims_core compute_lbd_scheduler_hints: - group: lbd_server_group_group @@ -3499,7 +3499,7 @@ topology_template: floating_ip_count_required: is_required: false port_lbd_ims_core_0_port_subinterface_indicator: - - true + - false port_lbd_internal_0_port_network: - cscf_internal_network_0 port_lbd_dpdk_0_port_mac_requirements: @@ -3537,7 +3537,7 @@ topology_template: port_lbd_dpdk_0_port_network: - cscf_internal_dpdk_network_0 port_lbd_dpdk_0_port_subinterface_indicator: - - true + - false port_lbd_ims_core_0_port_fixed_ips: - ip_address: get_input: lbd_ims_core_v6_ip_0 @@ -3811,7 +3811,7 @@ topology_template: $DEL: get_input: vcscf_name_delimeter port_cif_oam_0_port_3_subinterface_indicator: - - true + - false vm_image_name: get_input: cif_image_name compute_cif_user_data_format: @@ -3880,9 +3880,9 @@ topology_template: port_cif_internal_0_port_network: - cscf_internal_network_0 port_cif_ims_core_0_port_subinterface_indicator: - - true + - false port_cif_ims_li_0_port_subinterface_indicator: - - true + - false port_cif_oam_0_port_3_security_groups: - - cscf_RSG port_cif_ims_core_0_port_ip_requirements: @@ -3900,7 +3900,7 @@ topology_template: mac_count_required: is_required: false port_cif_oam_0_port_1_subinterface_indicator: - - true + - false port_cif_oam_0_port_1_network: - get_input: oam_net_id port_cif_ims_li_0_port_security_groups: @@ -3924,7 +3924,7 @@ topology_template: - ip_address: get_input: cif_ims_li_v6_vip_0 port_cif_internal_0_port_subinterface_indicator: - - true + - false port_cif_internal_0_port_mac_requirements: mac_count_required: is_required: false @@ -4024,15 +4024,15 @@ topology_template: vm_flavor_name: get_input: cif_flavor_name port_cif_internal_1_port_subinterface_indicator: - - true + - false port_cif_ims_core_1_port_subinterface_indicator: - - true + - false vm_image_name: get_input: cif_image_name compute_cif_user_data_format: - RAW port_cif_ims_li_1_port_subinterface_indicator: - - true + - false port_cif_oam_1_port_3_allowed_address_pairs: - ip_address: get_input: cif_oam_vip_1 @@ -4075,7 +4075,7 @@ topology_template: vf_module_name: get_input: vf_module_name port_cif_oam_1_port_1_subinterface_indicator: - - true + - false port_cif_oam_1_port_1_fixed_ips: - ip_address: get_input: cif_oam_ip_1 @@ -4190,7 +4190,7 @@ topology_template: compute_cif_config_drive: - true port_cif_oam_1_port_3_subinterface_indicator: - - true + - false port_cif_oam_1_port_3_name: - str_replace: template: $PREFIX$DELeth3 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested1ServiceTemplate.yaml index cacc945f82..39aeaace84 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested1ServiceTemplate.yaml @@ -63,7 +63,7 @@ topology_template: - substitutable properties: port_cmaui_port_2_subinterface_indicator: - - true + - false port_cmaui_port_1_security_groups: - - get_input: p1 - get_input: p2 @@ -107,7 +107,7 @@ topology_template: floating_ip_count_required: is_required: false port_cmaui_port_1_subinterface_indicator: - - true + - false port_cmaui_port_1_replacement_policy: - AUTO port_cmaui_port_2_replacement_policy: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested2ServiceTemplate.yaml index 0b844f9664..de9e176c66 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested2ServiceTemplate.yaml @@ -90,7 +90,7 @@ topology_template: - cmaui_names - 0 port_cmaui_port_4_subinterface_indicator: - - true + - false port_cmaui_port_4_fixed_ips: - ip_address: get_input: @@ -124,7 +124,7 @@ topology_template: floating_ip_count_required: is_required: false port_cmaui_port_3_subinterface_indicator: - - true + - false port_cmaui_port_4_replacement_policy: - AUTO port_cmaui_port_3_replacement_policy: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested3ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested3ServiceTemplate.yaml index 5f47aa5ee7..c482972e06 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested3ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested3ServiceTemplate.yaml @@ -116,7 +116,7 @@ topology_template: - cmaui_names - 0 port_cmaui_port_5_subinterface_indicator: - - true + - false compute_cmaui_availability_zone: - get_input: availability_zone_0 vm_image_name: @@ -162,7 +162,7 @@ topology_template: mac_count_required: is_required: false port_cmaui_port_6_subinterface_indicator: - - true + - false port_cmaui_port_6_mac_requirements: mac_count_required: is_required: false diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/MainServiceTemplate.yaml index 735d2e4a51..ef299fb3cc 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/MainServiceTemplate.yaml @@ -331,7 +331,7 @@ topology_template: - server_pcm_001 - oam_net_gw port_compute_port_subinterface_indicator: - - true + - false compute_compute_name: - compute_name: null vm_flavor_name: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/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/nestedSingleCompute/nestedWithTwoComputesOfSameType/out/nested-pcm_v0.1ServiceTemplate.yaml index 4fee609326..07f1ca413b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/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/nestedSingleCompute/nestedWithTwoComputesOfSameType/out/nested-pcm_v0.1ServiceTemplate.yaml @@ -119,7 +119,7 @@ topology_template: floating_ip_count_required: is_required: false port_pcm_port_subinterface_indicator: - - true + - false compute_pcm_server_user_data_format: - RAW vm_image_name: @@ -168,7 +168,7 @@ topology_template: floating_ip_count_required: is_required: false port_pcm_port_subinterface_indicator: - - true + - false compute_pcm_server_user_data_format: - RAW vm_image_name: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/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/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/nested-pcm_v0.1ServiceTemplate.yaml index 9660d747ab..b45e42da55 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/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/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/nested-pcm_v0.1ServiceTemplate.yaml @@ -137,7 +137,7 @@ topology_template: floating_ip_count_required: is_required: false port_pcm_port_subinterface_indicator: - - true + - false compute_pcm_server_user_data_format: - RAW vm_image_name: @@ -186,7 +186,7 @@ topology_template: floating_ip_count_required: is_required: false port_pcm_port_subinterface_indicator: - - true + - false vm_image_name: get_input: pd_image_name compute_pd_server_config_drive: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/MainServiceTemplate.yaml index aeaeda46f0..7ceff7cc35 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/MainServiceTemplate.yaml @@ -123,8 +123,8 @@ topology_template: - Network-1 - Network-0 port_pd01_port_subinterface_indicator: - - true - - true + - false + - false compute_pd_server_user_data_format: - RAW_SERVER_PD_2 - RAW_SERVER_PD_1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/MainServiceTemplate.yaml index 2c371cd6be..7c99fec6b4 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/MainServiceTemplate.yaml @@ -137,8 +137,8 @@ topology_template: - Network-1 - Network-0 port_pd01_port_subinterface_indicator: - - true - - true + - false + - false compute_pd_server_user_data_format: - RAW_SERVER_PD_2 - RAW_SERVER_PD_1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/MainServiceTemplate.yaml index 58d4c54c3f..07266a4bf0 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/MainServiceTemplate.yaml @@ -140,8 +140,8 @@ topology_template: - Network-1 - Network-0 port_pd01_port_subinterface_indicator: - - true - - true + - false + - false compute_pd_server_user_data_format: - RAW_SERVER_PD_2 - get_attribute: @@ -173,4 +173,4 @@ topology_template: description: heat template that creates MOG stack members: - network_policy_server - - abstract_pd_server + - abstract_pd_server
\ 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/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/MainServiceTemplate.yaml index b8d5cd6647..59f62e25f9 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/MainServiceTemplate.yaml @@ -120,8 +120,8 @@ topology_template: - Network-1 - Network-0 port_pd01_port_subinterface_indicator: - - true - - true + - false + - false service_template_filter: substitute_service_template: Nested_pd_serverServiceTemplate.yaml count: 2 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/MainServiceTemplate.yaml index 7ac39945a6..30634b5291 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/MainServiceTemplate.yaml @@ -155,8 +155,8 @@ topology_template: - Network-1 - Network-0 port_pd01_port_subinterface_indicator: - - true - - true + - false + - false compute_pd_server_user_data_format: - RAW_SERVER_PD_2 - RAW_SERVER_PD_1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/MainServiceTemplate.yaml index 20fd689f56..ab8de4df45 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/MainServiceTemplate.yaml @@ -176,8 +176,8 @@ topology_template: - packet_mirror_network - packet_mirror_network port_pd01_port_subinterface_indicator: - - true - - true + - false + - false compute_pd_server_user_data_format: - RAW_SERVER_PD_2 - RAW_SERVER_PD_1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/MainServiceTemplate.yaml index 972bf385c1..d663003b4a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/MainServiceTemplate.yaml @@ -126,8 +126,8 @@ topology_template: - Network-1 - Network-0 port_pd01_port_subinterface_indicator: - - true - - true + - false + - false compute_pd_server_user_data_format: - RAW_SERVER_PD_2 - RAW_SERVER_PD_1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/MainServiceTemplate.yaml index 9785f5bf03..348f675567 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/MainServiceTemplate.yaml @@ -123,8 +123,8 @@ topology_template: - Network-1 - Network-0 port_pd01_port_subinterface_indicator: - - true - - true + - false + - false compute_pd_server_user_data_format: - RAW_SERVER_PD_2 - RAW_SERVER_PD_1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/MainServiceTemplate.yaml index 96b39a73f6..c8d10eebb6 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/MainServiceTemplate.yaml @@ -174,8 +174,8 @@ topology_template: - Network-PD-1 - Network-PD-0 port_pd01_port_subinterface_indicator: - - true - - true + - false + - false compute_pd_server_user_data_format: - null - RAW @@ -208,8 +208,8 @@ topology_template: vm_flavor_name: get_input: ps_flavor_name port_ps01_port_subinterface_indicator: - - true - - true + - false + - false vm_image_name: get_input: ps_image_name port_ps01_port_replacement_policy: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/MainServiceTemplate.yaml index f1589d077b..9bf6798f1d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/MainServiceTemplate.yaml @@ -174,8 +174,8 @@ topology_template: - Network-PD-1 - Network-PD-0 port_pd01_port_subinterface_indicator: - - true - - true + - false + - false compute_pd_server_user_data_format: - null - get_attribute: @@ -212,8 +212,8 @@ topology_template: vm_flavor_name: get_input: ps_flavor_name port_ps01_port_subinterface_indicator: - - true - - true + - false + - false vm_image_name: get_input: ps_image_name port_ps01_port_replacement_policy: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/MainServiceTemplate.yaml index a6d46e9b0c..9bb8be0cbc 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/MainServiceTemplate.yaml @@ -842,7 +842,7 @@ topology_template: get_input: pd_flavor_name port_pd02_port_network_role_tag: oam port_pd02_port_subinterface_indicator: - - true + - false port_pd01_port_mac_requirements: mac_count_required: is_required: false @@ -860,7 +860,7 @@ topology_template: floating_ip_count_required: is_required: false port_pd01_port_subinterface_indicator: - - true + - false compute_pd_server_user_data_format: - RAW port_pd02_port_mac_requirements: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/MainServiceTemplate.yaml index 2203ab13d0..4f16339681 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/MainServiceTemplate.yaml @@ -126,7 +126,7 @@ topology_template: vm_image_name: get_input: image_smp_name port_port1_subinterface_indicator: - - true + - false port_port1_ip_requirements: - ip_version: 4 ip_count_required: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/MainServiceTemplate.yaml index 7b63f3c12c..c9d7e708e3 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/MainServiceTemplate.yaml @@ -166,7 +166,7 @@ topology_template: - - jsa_security_group port_pd02_port_network_role_tag: oam port_pd02_port_subinterface_indicator: - - true + - false port_pd01_port_mac_requirements: mac_count_required: is_required: false @@ -186,7 +186,7 @@ topology_template: floating_ip_count_required: is_required: false port_pd01_port_subinterface_indicator: - - true + - false compute_pd_server_user_data_format: - RAW port_pd02_port_mac_requirements: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/MainServiceTemplate.yaml index 756ee422cf..e4af3e8e9a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/MainServiceTemplate.yaml @@ -175,7 +175,7 @@ topology_template: vm_flavor_name: get_input: pd_flavor_name port_pd02_port_subinterface_indicator: - - true + - false port_pd01_port_mac_requirements: mac_count_required: is_required: false @@ -195,7 +195,7 @@ topology_template: floating_ip_count_required: is_required: false port_pd01_port_subinterface_indicator: - - true + - false compute_pd_server_user_data_format: - RAW port_pd02_port_mac_requirements: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/MainServiceTemplate.yaml index e10c369fa3..d49d8a7b16 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/MainServiceTemplate.yaml @@ -177,7 +177,7 @@ topology_template: - pd_server_names - 0 port_pd01_port_0_subinterface_indicator: - - true + - false port_pd01_port_0_replacement_policy: - AUTO vm_flavor_name: @@ -202,7 +202,7 @@ topology_template: floating_ip_count_required: is_required: false port_pd01_port_1_subinterface_indicator: - - true + - false port_pd01_port_1_mac_requirements: mac_count_required: is_required: false diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/MainServiceTemplate.yaml index 6b3f264e01..3833ca7884 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/MainServiceTemplate.yaml @@ -206,7 +206,7 @@ topology_template: - pd_server_names - 0 port_pd01_port_0_subinterface_indicator: - - true + - false port_pd01_port_0_replacement_policy: - AUTO vm_flavor_name: @@ -229,7 +229,7 @@ topology_template: floating_ip_count_required: is_required: false port_pd01_port_1_subinterface_indicator: - - true + - false port_pd01_port_1_mac_requirements: mac_count_required: is_required: false diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/MainServiceTemplate.yaml index 026e8c7ae7..ab960218fe 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/MainServiceTemplate.yaml @@ -883,7 +883,7 @@ topology_template: get_input: pd_flavor_name port_pd02_port_network_role_tag: oam port_pd02_port_subinterface_indicator: - - true + - false port_pd01_port_mac_requirements: mac_count_required: is_required: false @@ -901,7 +901,7 @@ topology_template: floating_ip_count_required: is_required: false port_pd01_port_subinterface_indicator: - - true + - false compute_pd_server_user_data_format: - RAW port_pd02_port_mac_requirements: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/MainServiceTemplate.yaml index d624cc9bf7..5ee9c1705d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/MainServiceTemplate.yaml @@ -855,7 +855,7 @@ topology_template: - pd_server_names - 0 port_pd01_port_0_subinterface_indicator: - - true + - false vm_flavor_name: get_input: pd_flavor_name vm_image_name: @@ -878,7 +878,7 @@ topology_template: floating_ip_count_required: is_required: false port_pd01_port_1_subinterface_indicator: - - true + - false port_pd01_port_1_mac_requirements: mac_count_required: is_required: false diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes2/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes2/out/MainServiceTemplate.yaml index 081c90647f..35f8f22dae 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes2/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes2/out/MainServiceTemplate.yaml @@ -841,13 +841,13 @@ topology_template: - pd_server_names - 0 port_pd_2_port_1_subinterface_indicator: - - true + - false port_pd_2_port_1_network: - get_input: oam_net_name vm_flavor_name: get_input: pd_flavor_name port_pd_1_port_0_subinterface_indicator: - - true + - false vm_image_name: get_input: pd_image_name port_pd_1_port_0_mac_requirements: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes3/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes3/out/MainServiceTemplate.yaml index 8728f58f15..da1d0b7a8d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes3/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes3/out/MainServiceTemplate.yaml @@ -858,7 +858,7 @@ topology_template: vm_image_name: get_input: pd_image_name port_pd_oam1_port_1_subinterface_indicator: - - true + - false port_pd_oam1_port_1_network_role_tag: oam compute_pd_server_user_data_format: - RAW @@ -876,7 +876,7 @@ topology_template: port_pd_oam1_port_1_network: - get_input: oam_net_name port_pd_oam1_port_0_subinterface_indicator: - - true + - false port_pd_oam1_port_0_network: - get_input: oam_net_name port_pd_oam1_port_0_mac_requirements: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes4/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes4/out/MainServiceTemplate.yaml index 4dbcf3a644..e3d7e853ed 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes4/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes4/out/MainServiceTemplate.yaml @@ -860,7 +860,7 @@ topology_template: vm_image_name: get_input: pd_image_name port_pd01_port2_subinterface_indicator: - - true + - false compute_pd_server_user_data_format: - RAW port_pd01_port1_mac_requirements: @@ -881,7 +881,7 @@ topology_template: mac_count_required: is_required: false port_pd01_port1_subinterface_indicator: - - true + - false service_template_filter: substitute_service_template: Nested_pd_serverServiceTemplate.yaml count: 1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/MainServiceTemplate.yaml index dee35ce88e..4b327f1f6b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/MainServiceTemplate.yaml @@ -842,7 +842,7 @@ topology_template: get_input: pd_flavor_name port_pd02_port_network_role_tag: oam port_pd02_port_subinterface_indicator: - - true + - false port_pd01_port_mac_requirements: mac_count_required: is_required: false @@ -860,7 +860,7 @@ topology_template: floating_ip_count_required: is_required: false port_pd01_port_subinterface_indicator: - - true + - false compute_pd_server_user_data_format: - RAW port_pd02_port_mac_requirements: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/MainServiceTemplate.yaml index a8ceff1ec0..7486d7f719 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/MainServiceTemplate.yaml @@ -425,7 +425,7 @@ topology_template: vm_image_name: get_input: pd_image_name port_pd01_port_subinterface_indicator: - - true + - false port_pd01_port_device_id: - PORT_PD_DEVICE_ID port_pd01_port_admin_state_up: @@ -497,7 +497,7 @@ topology_template: port_template_VMInt_OAM_lb_virtual_machine_interface_mac_addresses: - - get_input: mac_address port_template_VMInt_OAM_lb_subinterface_indicator: - - true + - false port_template_VMInt_OAM_lb_name: - template_VMInt_OAM_lb_NAME port_pd01_port_port_security_enabled: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/MainServiceTemplate.yaml index 9dba82e490..99acaf456c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/MainServiceTemplate.yaml @@ -842,7 +842,7 @@ topology_template: get_input: pd_flavor_name port_pd02_port_network_role_tag: oam port_pd02_port_subinterface_indicator: - - true + - false port_pd01_port_mac_requirements: mac_count_required: is_required: false @@ -860,7 +860,7 @@ topology_template: floating_ip_count_required: is_required: false port_pd01_port_subinterface_indicator: - - true + - false compute_pd_server_user_data_format: - RAW port_pd02_port_mac_requirements: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/MainServiceTemplate.yaml index 812d77a64e..82ab424d45 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/MainServiceTemplate.yaml @@ -844,7 +844,7 @@ topology_template: - name port_pd02_port_network_role_tag: oam port_pd02_port_subinterface_indicator: - - true + - false port_pd01_port_mac_requirements: mac_count_required: is_required: false @@ -862,7 +862,7 @@ topology_template: floating_ip_count_required: is_required: false port_pd01_port_subinterface_indicator: - - true + - false compute_pd_server_user_data_format: - RAW port_pd02_port_mac_requirements: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/MainServiceTemplate.yaml index 4af2861395..92b6337d6b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/MainServiceTemplate.yaml @@ -118,7 +118,7 @@ topology_template: - pd_server_names - 0 port_pd01_port_0_subinterface_indicator: - - true + - false vm_flavor_name: get_attribute: - network_policy_server @@ -142,7 +142,7 @@ topology_template: floating_ip_count_required: is_required: false port_pd01_port_1_subinterface_indicator: - - true + - false port_pd01_port_1_mac_requirements: mac_count_required: is_required: false diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/MainServiceTemplate.yaml index c8bbec9c07..56ae9fa503 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/MainServiceTemplate.yaml @@ -855,7 +855,7 @@ topology_template: - pd_server_names - 0 port_pd01_port_0_subinterface_indicator: - - true + - false vm_flavor_name: get_input: pd_flavor_name vm_image_name: @@ -878,7 +878,7 @@ topology_template: floating_ip_count_required: is_required: false port_pd01_port_1_subinterface_indicator: - - true + - false port_pd01_port_1_mac_requirements: mac_count_required: is_required: false diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/MainServiceTemplate.yaml index 5f7c815eec..c3a9bad21c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/MainServiceTemplate.yaml @@ -855,7 +855,7 @@ topology_template: - pd_server_names - 0 port_pd01_port_0_subinterface_indicator: - - true + - false vm_flavor_name: get_input: pd_flavor_name vm_image_name: @@ -878,7 +878,7 @@ topology_template: floating_ip_count_required: is_required: false port_pd01_port_1_subinterface_indicator: - - true + - false port_pd01_port_1_mac_requirements: mac_count_required: is_required: false diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/MainServiceTemplate.yaml index 6bb5f7a911..232a3f50c3 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/MainServiceTemplate.yaml @@ -419,7 +419,7 @@ topology_template: port_pd01_port_network: - get_input: oam_net_name port_pd01_port_subinterface_indicator: - - true + - false port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW @@ -478,7 +478,7 @@ topology_template: - network_policy_server - name port_pd01_port_subinterface_indicator: - - true + - false service_template_filter: substitute_service_template: Nested_ps_serverServiceTemplate.yaml count: 1 @@ -524,7 +524,7 @@ topology_template: port_pd01_port_network: - get_input: oam_net_name port_pd01_port_subinterface_indicator: - - true + - false compute_oam_server_user_data_format: - RAW compute_oam_server_name: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/MainServiceTemplate.yaml index e2104837bd..af2298a4c6 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/MainServiceTemplate.yaml @@ -356,7 +356,7 @@ topology_template: port_pd01_port_network: - get_input: oam_net_name port_pd01_port_subinterface_indicator: - - true + - false port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW @@ -406,7 +406,7 @@ topology_template: - network_policy_server - name port_pd01_port_subinterface_indicator: - - true + - false service_template_filter: substitute_service_template: Nested_ps_serverServiceTemplate.yaml count: 1 @@ -445,7 +445,7 @@ topology_template: port_pd01_port_network: - get_input: oam_net_name port_pd01_port_subinterface_indicator: - - true + - false compute_oam_server_user_data_format: - RAW compute_oam_server_name: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/MainServiceTemplate.yaml index f04c8f5787..a3eb5dcfb1 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/MainServiceTemplate.yaml @@ -372,7 +372,7 @@ topology_template: floating_ip_count_required: is_required: false port_pd01_port_subinterface_indicator: - - true + - false compute_pd_server_user_data_format: - RAW service_template_filter: @@ -415,7 +415,7 @@ topology_template: port_pd01_port_network: - get_input: oam_net_name port_pd01_port_subinterface_indicator: - - true + - false port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW @@ -462,7 +462,7 @@ topology_template: floating_ip_count_required: is_required: false port_pd01_port_subinterface_indicator: - - true + - false compute_pd_server_user_data_format: - RAW service_template_filter: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/MainServiceTemplate.yaml index 743ce1e834..3abb3010c1 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/MainServiceTemplate.yaml @@ -356,7 +356,7 @@ topology_template: port_pd01_port_network: - get_input: oam_net_name port_pd01_port_subinterface_indicator: - - true + - false port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW @@ -400,7 +400,7 @@ topology_template: vm_image_name: get_input: pd_image_name port_pd01_port_2_subinterface_indicator: - - true + - false port_pd01_port_2_network: - get_input: oam_net_name port_pd01_port_2_mac_requirements: @@ -423,7 +423,7 @@ topology_template: mac_count_required: is_required: false port_pd01_port_3_subinterface_indicator: - - true + - false port_pd01_port_3_network_role_tag: oam service_template_filter: substitute_service_template: Nested_pd_server_2ServiceTemplate.yaml @@ -474,7 +474,7 @@ topology_template: - network_policy_server - name port_pd01_port_subinterface_indicator: - - true + - false compute_pd_server_user_data_format: - RAW service_template_filter: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/MainServiceTemplate.yaml index 683b8bfaee..479ebdcebb 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/MainServiceTemplate.yaml @@ -712,7 +712,7 @@ topology_template: port_pd01_port_network: - get_input: oam_net_name port_pd01_port_subinterface_indicator: - - true + - false port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW @@ -740,7 +740,7 @@ topology_template: vm_flavor_name: get_input: pd_flavor_name port_ps01_port_subinterface_indicator: - - true + - false vm_image_name: get_attribute: - abstract_pd_server diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/MainServiceTemplate.yaml index 70c417d5f4..e5436d45aa 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/MainServiceTemplate.yaml @@ -710,7 +710,7 @@ topology_template: port_pd01_port_network: - get_input: oam_net_name port_pd01_port_subinterface_indicator: - - true + - false port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW @@ -738,7 +738,7 @@ topology_template: vm_flavor_name: get_input: pd_flavor_name port_ps01_port_subinterface_indicator: - - true + - false vm_image_name: get_input: pd_image_name port_ps01_port_mac_requirements: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/notBoundToParentPort/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/notBoundToParentPort/out/MainServiceTemplate.yaml index cb896d4449..4d550ba930 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/notBoundToParentPort/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/notBoundToParentPort/out/MainServiceTemplate.yaml @@ -489,7 +489,7 @@ topology_template: - substitutable properties: port_vdbe_untr_1_port_subinterface_indicator: - - true + - false compute_vdbe_availability_zone: - get_input: availability_zone_1 vm_flavor_name: @@ -541,4 +541,4 @@ topology_template: - suport_missing_vlan_tag_property - control_int_net - subport_get_param_parent - - abstract_vdbe + - abstract_vdbe
\ 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/subinterface/vlantagging/pattern1a/twoPortOnlyOneConnectedWithSubInf/in/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/twoPortOnlyOneConnectedWithSubInf/in/MANIFEST.json new file mode 100644 index 0000000000..c16541d85d --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/twoPortOnlyOneConnectedWithSubInf/in/MANIFEST.json @@ -0,0 +1,17 @@ +{ + "name": "vMME_Small", + "description": "HOT template to create 2 cinder volume attachment", + "version": "2013-05-23", + "data": [ + { + "file": "main.yml", + "type": "HEAT", + "isBase": "true" + }, + { + "file": "nested1.yml", + "type": "HEAT", + "isBase": "false" + } + ] +} diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/twoPortOnlyOneConnectedWithSubInf/in/main.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/twoPortOnlyOneConnectedWithSubInf/in/main.yml new file mode 100644 index 0000000000..d7f71ab8d1 --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/twoPortOnlyOneConnectedWithSubInf/in/main.yml @@ -0,0 +1,226 @@ +heat_template_version: 2013-05-23 + +description: > + Version 2.0 02-09-2016 (Authors: John Doe, user PROD) + +parameters: + aap_address_mode: + description: "Address mode for the vDBE cluster IP" + type: string + control_int_net_forwarding_mode: + description: "forwarding mode of the control virtual network" + type: string + control_int_net_rpf: + description: "Reverse Path Filtering enable or disable for the control virtual network" + type: string + control_int_net_shared: + description: "control virtual network shared" + type: boolean + control_int_net_flood_unknown_unicast: + description: "forwarding mode of the control virtual network" + type: boolean + oam_net_name: + description: "Name of NSDNet network from which the management IP addresses will be allocated" + type: string + untrusted_net_name: + description: "Name of public untrusted network into which this vDBE HA cluster is deployed" + type: string + untrusted_num_vn: + constraints: + - + range: + max: 77 + min: 1 + description: "Number of vDBE subinterface virtual Networks" + type: number + untrusted_vlan_tags: + description: "List of subinterface vlan tags" + type: comma_delimited_list + untrusted_vn_networks: + description: "List of subinterface virtual networks" + type: comma_delimited_list + vdbe_aap_sec_untrusted_ip_prefix: + description: "ip prefix for secondary vDBE VM aap on the VAN untrusted network" + type: string + vdbe_aap_sec_untrusted_ip_prefix_len: + description: "ip prefix length for the secondary DBE VM aap on the VAN untrusted network" + type: string + vdbe_aap_untrusted_ip_prefix: + description: "ip prefix for primary vDBE VM on the VAN untrusted network" + type: string + vdbe_aap_untrusted_ip_prefix_len: + description: "ip prefix length for the primary vDBE VM on the VAN untrusted network" + type: string + vdbe_aap_untrusted_v6_ip_prefix: + description: "ipv6 prefix for the primary vDBE VM on the VAN untrusted network" + type: string + vdbe_aap_untrusted_v6_ip_prefix_len: + description: "ipv6 prefix length for the primary vDBE VM on the VAN untrusted network" + type: string + vdbe_device_name: + description: "VDBE device Name for this vdbe VNF" + type: string + vdbe_hw_untr_mac_1: + description: "Secondary MAC address of the secondary vDBE VM on the VAN untrusted network" + type: string + vdbe_name_1: + description: "VM Name for this vdbe node 1" + type: string + vdbe_untrusted_ip_1: + description: "IPV4 address of the secondary vDBE VM on the VAN untrusted network" + type: string + vdbe_untrusted_v6_ip_1: + description: "IPV6 address of the secondary vDBE VM on the VAN untrusted network" + type: string + vdbe_untrusted_vmac_address: + description: "Virtual MAC of the primary vDBE VM on the VAN untrusted network" + type: string + vdbe_flavor_name: + description: "Flavor to use for vDBE" + type: string + vdbe_image_name: + description: "Image to use for vDBE" + type: string + vnf_id: + description: "Unique ID for this VF inst" + type: string + vnf_name: + description: "Unique name for this VF instance" + type: string + vf_module_id: + description: "Unique ID for this VF module inst" + type: string + availability_zone_1: + description: "The availability zone of secondary node1 vDBE vm in the local HA pair." + type: string + counter: + description: "Counter." + type: number +resources: + vdbe_node_1: + type: OS::Nova::Server + properties: + availability_zone: + get_param: availability_zone_1 + flavor: + get_param: vdbe_flavor_name + image: + get_param: vdbe_image_name + metadata: + vf_module_id: + get_param: vf_module_id + vnf_id: + get_param: vnf_id + vnf_name: + get_param: vnf_name + name: + get_param: vdbe_name_1 + networks: + - port: {get_resource: vdbe_1_untr_port_1} + vdbe_node_2: + type: OS::Nova::Server + properties: + availability_zone: + get_param: availability_zone_1 + flavor: + get_param: vdbe_flavor_name + image: + get_param: vdbe_image_name + metadata: + vf_module_id: + get_param: vf_module_id + vnf_id: + get_param: vnf_id + vnf_name: + get_param: vnf_name + name: + get_param: vdbe_name_1 + networks: + - port: {get_resource: vdbe_2_untr_port_2} + vdbe_1_untr_port_1: + type: OS::Neutron::Port + properties: + name: + str_replace: + params: + DBE: + get_param: vdbe_device_name + VM_NAME: + get_param: vdbe_name_1 + template: VM_NAMEDBE001p1n004 + + vdbe_2_untr_port_2: + type: OS::Neutron::Port + properties: + name: + str_replace: + params: + DBE: + get_param: vdbe_device_name + VM_NAME: + get_param: vdbe_name_1 + template: VM_NAMEDBE001p1n004 + + vdbe_untr_1_subports: + type: OS::Heat::ResourceGroup + properties: + count: + get_param: untrusted_num_vn + resource_def: + type: nested1.yml + properties: + aap_address_mode: + get_param: aap_address_mode + aap_sec_untrusted_ip_prefix: + get_param: vdbe_aap_sec_untrusted_ip_prefix + aap_sec_untrusted_ip_prefix_len: + get_param: vdbe_aap_sec_untrusted_ip_prefix_len + aap_untrusted_ip_prefix: + get_param: vdbe_aap_untrusted_ip_prefix + aap_untrusted_ip_prefix_len: + get_param: vdbe_aap_untrusted_ip_prefix_len + aap_untrusted_v6_ip_prefix: + get_param: vdbe_aap_untrusted_v6_ip_prefix + aap_untrusted_v6_ip_prefix_len: + get_param: vdbe_aap_untrusted_v6_ip_prefix_len + counter: "%index%" + ip_address: + get_param: vdbe_untrusted_ip_1 + ip_v6_address: + get_param: vdbe_untrusted_v6_ip_1 + mac_address: + get_param: vdbe_hw_untr_mac_1 + parent_interface: + get_resource: vdbe_1_untr_port_1 + subinterfaces_name_prefix: + str_replace: + params: + DBE: + get_param: vdbe_device_name + VM_NAME: + get_param: vdbe_name_1 + template: VM_NAMEDBE001p1n004 + vlan_tag_list: + get_param: untrusted_vlan_tags + vmac_address: + get_param: vdbe_untrusted_vmac_address + vn_network_list: + get_param: untrusted_vn_networks + control_int_net: + type: OS::ContrailV2::VirtualNetwork + properties: + flood_unknown_unicast: + get_param: control_int_net_flood_unknown_unicast + is_shared: + get_param: control_int_net_shared + name: + str_replace: + params: + VNF_NAME: + get_param: vnf_name + template: VNF_NAME_control_net + virtual_network_properties: + virtual_network_properties_forwarding_mode: + get_param: control_int_net_forwarding_mode + virtual_network_properties_rpf: + get_param: control_int_net_rpf diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/twoPortOnlyOneConnectedWithSubInf/in/nested1.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/twoPortOnlyOneConnectedWithSubInf/in/nested1.yml new file mode 100644 index 0000000000..328b0ea24e --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/twoPortOnlyOneConnectedWithSubInf/in/nested1.yml @@ -0,0 +1,116 @@ +heat_template_version: 2013-05-23 + +description: cmaui server template for vMMSC + +parameters: + aap_address_mode: + description: "Address mode for the vDBE cluster IP" + type: string + aap_sec_untrusted_ip_prefix: + description: "ip prefix for secondary vDBE VM aap on the VAN untrusted network" + type: string + aap_sec_untrusted_ip_prefix_len: + description: "ip prefix length for the secondary DBE VM aap on the VAN untrusted network" + type: string + aap_untrusted_ip_prefix: + description: "ip prefix for primary vDBE VM on the VAN untrusted network" + type: string + aap_untrusted_ip_prefix_len: + description: "ip prefix length for the primary vDBE VM on the VAN untrusted network" + type: string + aap_untrusted_v6_ip_prefix: + description: "ipv6 prefix for the primary vDBE VM on the VAN untrusted network" + type: string + aap_untrusted_v6_ip_prefix_len: + description: "ipv6 prefix length for the primary vDBE VM on the VAN untrusted network" + type: string + counter: + description: "Index of instance among multiple instances. Use to retrieve correct parameter for this instance when passed all parameters for all instances." + type: number + mac_address: + description: "HW MAC address to use for subinterface" + type: string + parent_interface: + description: "Parent Contrail interface" + type: string + subinterfaces_name_prefix: + description: "Combined with subinterface_instance_index, this is used as the name of the subinterface resource" + type: string + vlan_tag_list: + description: "List of VLAN IDs to use for subinterfaces" + type: comma_delimited_list + vmac_address: + description: "virtual MAC address to use for subinterface" + type: string + vn_network_list: + description: "List of Contrail VLAN networks to use for the subinterfaces. The order and number of these must match the VLAN ID list" + type: string + ip_address: + description: "IPv4 address associated with subinterfaces" + type: string + ip_v6_address: + description: "IPv6 address associated with subinterfaces" + type: string +resources: + vdbe_0_subint_untr_vmi_0: + type: OS::ContrailV2::VirtualMachineInterface + properties: + name: + str_replace: + params: + $INDEX: + get_param: + - vlan_tag_list + - + get_param: counter + $NAME: + get_param: subinterfaces_name_prefix + template: $NAME_$INDEX + virtual_machine_interface_allowed_address_pairs: + virtual_machine_interface_allowed_address_pairs_allowed_address_pair: + - + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: + get_param: aap_address_mode + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip: + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: + get_param: aap_untrusted_ip_prefix + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: + get_param: aap_untrusted_ip_prefix_len + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac: + get_param: vmac_address + - + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: + get_param: aap_address_mode + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip: + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: + get_param: aap_sec_untrusted_ip_prefix + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: + get_param: aap_sec_untrusted_ip_prefix_len + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac: + get_param: mac_address + - + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: + get_param: aap_address_mode + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip: + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: + get_param: aap_untrusted_v6_ip_prefix + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: + get_param: aap_untrusted_v6_ip_prefix_len + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac: + get_param: vmac_address + virtual_machine_interface_mac_addresses: + virtual_machine_interface_mac_addresses_mac_address: + - + get_param: mac_address + virtual_machine_interface_properties: + virtual_machine_interface_properties_sub_interface_vlan_tag: + get_param: + - vlan_tag_list + - + get_param: counter + virtual_machine_interface_refs: + [{get_param: parent_interface}] + virtual_network_refs: + [{get_param: vn_network_list}] + + diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/twoPortOnlyOneConnectedWithSubInf/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/twoPortOnlyOneConnectedWithSubInf/out/GlobalSubstitutionTypesServiceTemplate.yaml new file mode 100644 index 0000000000..e8ac4eac41 --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/twoPortOnlyOneConnectedWithSubInf/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -0,0 +1,1099 @@ +tosca_definitions_version: tosca_simple_yaml_1_0_0 +metadata: + template_name: GlobalSubstitutionTypes +imports: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +node_types: + org.openecomp.resource.abstract.nodes.vdbe: + derived_from: org.openecomp.resource.abstract.nodes.VFC + properties: + port_vdbe_untr_port_network_role_tag: + type: string + required: true + status: SUPPORTED + subinterface_nested1_aap_untrusted_v6_ip_prefix_len: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + subinterface_nested1_aap_address_mode: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_vdbe_untr_port_subnetpoolid: + type: string + required: true + status: SUPPORTED + subinterface_nested1_vn_network_list: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + compute_vdbe_availability_zone: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + vm_flavor_name: + type: string + required: true + status: SUPPORTED + port_vdbe_untr_port_order: + type: integer + required: true + status: SUPPORTED + vm_image_name: + type: string + required: true + status: SUPPORTED + port_vdbe_untr_port_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + subinterface_nested1_vmac_address: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + subinterface_nested1_ip_address: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + subinterface_nested1_subinterfaces_name_prefix: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + compute_vdbe_metadata: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + subinterface_nested1_service_template_filter_count: + type: list + required: true + status: SUPPORTED + entry_schema: + type: float + subinterface_nested1_aap_untrusted_v6_ip_prefix: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + subinterface_nested1_parent_interface: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + subinterface_nested1_aap_untrusted_ip_prefix_len: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + subinterface_nested1_ip_v6_address: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_vdbe_untr_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + 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_vdbe_untr_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean + port_vdbe_untr_port_name: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_vdbe_untr_port_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + subinterface_nested1_mac_address: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_vdbe_untr_port_network_role: + type: string + required: true + status: SUPPORTED + subinterface_nested1_aap_untrusted_ip_prefix: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + subinterface_nested1_aap_sec_untrusted_ip_prefix_len: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + subinterface_nested1_vlan_tag_list: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + compute_vdbe_name: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + subinterface_nested1_aap_sec_untrusted_ip_prefix: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_vdbe_untr_port_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + requirements: + - dependency_vdbe_vdbe_untr_port_nested1: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - dependency_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_nested1: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - subinterface_link_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_nested1: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 + - dependency_vdbe: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - local_storage_vdbe: + capability: tosca.capabilities.Attachment + node: tosca.nodes.BlockStorage + relationship: tosca.relationships.AttachesTo + occurrences: + - 0 + - UNBOUNDED + - dependency_vdbe_vdbe_untr_port: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - link_vdbe_vdbe_untr_port: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 + capabilities: + network.outgoing.packets.rate_vdbe_vdbe_untr_port: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes_vdbe_vdbe_untr_port: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + feature_vdbe: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + feature_vdbe_vdbe_untr_port: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + attachment_vdbe_vdbe_untr_port: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + disk.device.iops_vdbe: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + endpoint_vdbe: + type: tosca.capabilities.Endpoint.Admin + occurrences: + - 1 + - UNBOUNDED + disk.ephemeral.size_vdbe: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + cpu_util_vdbe: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + vcpus_vdbe: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.write.requests_vdbe: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.latency_vdbe: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.write.requests.rate_vdbe: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.write.bytes.rate_vdbe: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets_vdbe_vdbe_untr_port: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + scalable_vdbe: + type: tosca.capabilities.Scalable + occurrences: + - 1 + - UNBOUNDED + disk.iops_vdbe: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.write.requests_vdbe: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.capacity_vdbe: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + feature_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_nested1: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + disk.device.allocation_vdbe: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.usage_vdbe: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + memory.usage_vdbe: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outpoing.packets_vdbe_vdbe_untr_port: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes.rate_vdbe_vdbe_untr_port: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.read.requests_vdbe: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + forwarder_vdbe_vdbe_untr_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + binding_vdbe_vdbe_untr_port: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + instance_vdbe: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes.rate_vdbe_vdbe_untr_port: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + cpu.delta_vdbe: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.read.bytes.rate_vdbe: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.write.bytes.rate_vdbe: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + feature_vdbe_vdbe_untr_port_nested1: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + memory.resident_vdbe: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.write.requests.rate_vdbe: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + cpu_vdbe: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.write.bytes_vdbe: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.usage_vdbe: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.read.bytes_vdbe: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.latency_vdbe: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes_vdbe_vdbe_untr_port: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.capacity_vdbe: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + host_vdbe: + type: tosca.capabilities.Container + valid_source_types: + - tosca.nodes.SoftwareComponent + occurrences: + - 1 + - UNBOUNDED + disk.allocation_vdbe: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.read.bytes.rate_vdbe: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + os_vdbe: + type: tosca.capabilities.OperatingSystem + occurrences: + - 1 + - UNBOUNDED + disk.device.read.requests_vdbe: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.root.size_vdbe: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + memory_vdbe: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + binding_vdbe: + type: tosca.capabilities.network.Bindable + occurrences: + - 1 + - UNBOUNDED + disk.device.write.bytes_vdbe: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.read.requests.rate_vdbe: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.read.bytes_vdbe: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets.rate_vdbe_vdbe_untr_port: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + org.openecomp.resource.abstract.nodes.heat.subinterface.nested1: + derived_from: org.openecomp.resource.abstract.nodes.AbstractSubstitute + properties: + aap_untrusted_ip_prefix: + type: string + description: ip prefix for primary vDBE VM on the VAN untrusted network + required: true + status: SUPPORTED + aap_sec_untrusted_ip_prefix: + type: string + description: ip prefix for secondary vDBE VM aap on the VAN untrusted network + required: true + status: SUPPORTED + ip_v6_address: + type: string + description: IPv6 address associated with subinterfaces + required: true + status: SUPPORTED + counter: + type: float + description: Index of instance among multiple instances. Use to retrieve correct parameter for this instance when passed all parameters for all instances. + required: true + status: SUPPORTED + subinterfaces_name_prefix: + type: string + description: Combined with subinterface_instance_index, this is used as the name of the subinterface resource + required: true + status: SUPPORTED + ip_address: + type: string + description: IPv4 address associated with subinterfaces + required: true + status: SUPPORTED + aap_address_mode: + type: string + description: Address mode for the vDBE cluster IP + required: true + status: SUPPORTED + aap_untrusted_v6_ip_prefix: + type: string + description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network + required: true + status: SUPPORTED + parent_interface: + type: string + description: Parent Contrail interface + required: true + status: SUPPORTED + vn_network_list: + type: string + description: List of Contrail VLAN networks to use for the subinterfaces. The order and number of these must match the VLAN ID list + required: true + status: SUPPORTED + mac_address: + type: string + description: HW MAC address to use for subinterface + required: true + status: SUPPORTED + vlan_tag_list: + type: list + description: List of VLAN IDs to use for subinterfaces + required: true + status: SUPPORTED + entry_schema: + type: string + aap_sec_untrusted_ip_prefix_len: + type: string + description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network + required: true + status: SUPPORTED + vmac_address: + type: string + description: virtual MAC address to use for subinterface + required: true + status: SUPPORTED + aap_untrusted_v6_ip_prefix_len: + type: string + description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network + required: true + status: SUPPORTED + aap_untrusted_ip_prefix_len: + type: string + description: ip prefix length for the primary vDBE VM on the VAN untrusted network + required: true + status: SUPPORTED + requirements: + - dependency_vdbe_0_subint_untr_vmi_0: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - subinterface_link_vdbe_0_subint_untr_vmi_0: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 + - binding_vdbe_0_subint_untr_vmi_0: + capability: tosca.capabilities.network.Bindable + node: org.openecomp.resource.cp.nodes.network.Port + relationship: tosca.relationships.network.BindsTo + occurrences: + - 1 + - 1 + capabilities: + feature_vdbe_0_subint_untr_vmi_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + org.openecomp.resource.abstract.nodes.vdbe_1: + derived_from: org.openecomp.resource.abstract.nodes.VFC + properties: + port_vdbe_untr_port_network_role_tag: + type: string + required: true + status: SUPPORTED + port_vdbe_untr_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + 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_vdbe_untr_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean + port_vdbe_untr_port_subnetpoolid: + type: string + required: true + status: SUPPORTED + compute_vdbe_availability_zone: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_vdbe_untr_port_name: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + vm_flavor_name: + type: string + required: true + status: SUPPORTED + port_vdbe_untr_port_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_vdbe_untr_port_network_role: + type: string + required: true + status: SUPPORTED + port_vdbe_untr_port_order: + type: integer + required: true + status: SUPPORTED + vm_image_name: + type: string + required: true + status: SUPPORTED + port_vdbe_untr_port_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + compute_vdbe_metadata: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + compute_vdbe_name: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_vdbe_untr_port_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + requirements: + - dependency_vdbe: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - local_storage_vdbe: + capability: tosca.capabilities.Attachment + node: tosca.nodes.BlockStorage + relationship: tosca.relationships.AttachesTo + occurrences: + - 0 + - UNBOUNDED + - dependency_vdbe_vdbe_untr_port: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - link_vdbe_vdbe_untr_port: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 + capabilities: + network.outgoing.packets.rate_vdbe_vdbe_untr_port: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes_vdbe_vdbe_untr_port: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + feature_vdbe: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + feature_vdbe_vdbe_untr_port: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + attachment_vdbe_vdbe_untr_port: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + disk.device.iops_vdbe: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + endpoint_vdbe: + type: tosca.capabilities.Endpoint.Admin + occurrences: + - 1 + - UNBOUNDED + disk.ephemeral.size_vdbe: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + cpu_util_vdbe: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + vcpus_vdbe: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.write.requests_vdbe: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.latency_vdbe: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.write.requests.rate_vdbe: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.write.bytes.rate_vdbe: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets_vdbe_vdbe_untr_port: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + scalable_vdbe: + type: tosca.capabilities.Scalable + occurrences: + - 1 + - UNBOUNDED + disk.iops_vdbe: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.write.requests_vdbe: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.capacity_vdbe: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.allocation_vdbe: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.usage_vdbe: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + memory.usage_vdbe: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outpoing.packets_vdbe_vdbe_untr_port: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes.rate_vdbe_vdbe_untr_port: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.read.requests_vdbe: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + forwarder_vdbe_vdbe_untr_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + binding_vdbe_vdbe_untr_port: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + instance_vdbe: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes.rate_vdbe_vdbe_untr_port: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + cpu.delta_vdbe: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.read.bytes.rate_vdbe: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.write.bytes.rate_vdbe: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + memory.resident_vdbe: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.write.requests.rate_vdbe: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + cpu_vdbe: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.write.bytes_vdbe: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.usage_vdbe: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.read.bytes_vdbe: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.latency_vdbe: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes_vdbe_vdbe_untr_port: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.capacity_vdbe: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + host_vdbe: + type: tosca.capabilities.Container + valid_source_types: + - tosca.nodes.SoftwareComponent + occurrences: + - 1 + - UNBOUNDED + disk.allocation_vdbe: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.read.bytes.rate_vdbe: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + os_vdbe: + type: tosca.capabilities.OperatingSystem + occurrences: + - 1 + - UNBOUNDED + disk.device.read.requests_vdbe: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.root.size_vdbe: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + memory_vdbe: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + binding_vdbe: + type: tosca.capabilities.network.Bindable + occurrences: + - 1 + - UNBOUNDED + disk.device.write.bytes_vdbe: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.read.requests.rate_vdbe: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.read.bytes_vdbe: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets.rate_vdbe_vdbe_untr_port: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/twoPortOnlyOneConnectedWithSubInf/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/twoPortOnlyOneConnectedWithSubInf/out/MainServiceTemplate.yaml new file mode 100644 index 0000000000..13aeddeddf --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/twoPortOnlyOneConnectedWithSubInf/out/MainServiceTemplate.yaml @@ -0,0 +1,575 @@ +tosca_definitions_version: tosca_simple_yaml_1_0_0 +metadata: + template_name: Main +imports: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: + file: GlobalSubstitutionTypesServiceTemplate.yaml +topology_template: + inputs: + vf_module_id: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vf_module_id + type: string + description: Unique ID for this VF module inst + control_int_net_rpf: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: control_int_net_rpf + type: string + description: Reverse Path Filtering enable or disable for the control virtual network + control_int_net_forwarding_mode: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: control_int_net_forwarding_mode + type: string + description: forwarding mode of the control virtual network + vnf_name: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vnf_name + type: string + description: Unique name for this VF instance + vdbe_untrusted_ip_1: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vdbe_untrusted_ip_1 + type: string + description: IPV4 address of the secondary vDBE VM on the VAN untrusted network + vdbe_aap_untrusted_ip_prefix_len: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vdbe_aap_untrusted_ip_prefix_len + type: string + description: ip prefix length for the primary vDBE VM on the VAN untrusted network + untrusted_num_vn: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: untrusted_num_vn + type: float + description: Number of vDBE subinterface virtual Networks + constraints: + - in_range: + - 1 + - 77 + aap_address_mode: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: aap_address_mode + type: string + description: Address mode for the vDBE cluster IP + control_int_net_shared: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: control_int_net_shared + type: boolean + description: control virtual network shared + vdbe_untrusted_v6_ip_1: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vdbe_untrusted_v6_ip_1 + type: string + description: IPV6 address of the secondary vDBE VM on the VAN untrusted network + vdbe_untrusted_vmac_address: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vdbe_untrusted_vmac_address + type: string + description: Virtual MAC of the primary vDBE VM on the VAN untrusted network + control_int_net_flood_unknown_unicast: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: control_int_net_flood_unknown_unicast + type: boolean + description: forwarding mode of the control virtual network + vdbe_aap_sec_untrusted_ip_prefix: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vdbe_aap_sec_untrusted_ip_prefix + type: string + description: ip prefix for secondary vDBE VM aap on the VAN untrusted network + vnf_id: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vnf_id + type: string + description: Unique ID for this VF inst + vdbe_name_1: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vdbe_name_1 + type: string + description: VM Name for this vdbe node 1 + availability_zone_1: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: availability_zone_1 + type: string + description: The availability zone of secondary node1 vDBE vm in the local HA pair. + untrusted_vn_networks: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: untrusted_vn_networks + type: list + description: List of subinterface virtual networks + entry_schema: + type: string + vdbe_image_name: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vdbe_image_name + type: string + description: Image to use for vDBE + oam_net_name: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: oam_net_name + type: string + description: Name of NSDNet network from which the management IP addresses will be allocated + vdbe_aap_sec_untrusted_ip_prefix_len: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vdbe_aap_sec_untrusted_ip_prefix_len + type: string + description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network + vdbe_aap_untrusted_v6_ip_prefix: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vdbe_aap_untrusted_v6_ip_prefix + type: string + description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network + vdbe_aap_untrusted_v6_ip_prefix_len: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vdbe_aap_untrusted_v6_ip_prefix_len + type: string + description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network + untrusted_vlan_tags: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: untrusted_vlan_tags + type: list + description: List of subinterface vlan tags + entry_schema: + type: string + untr_network_collection_function: + type: string + required: true + untr_vfc_instance_group_function: + type: string + required: true + vdbe_flavor_name: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vdbe_flavor_name + type: string + description: Flavor to use for vDBE + counter: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: counter + type: float + description: Counter. + vdbe_hw_untr_mac_1: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vdbe_hw_untr_mac_1 + type: string + description: Secondary MAC address of the secondary vDBE VM on the VAN untrusted network + untrusted_net_name: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: untrusted_net_name + type: string + description: Name of public untrusted network into which this vDBE HA cluster is deployed + vdbe_device_name: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vdbe_device_name + type: string + description: VDBE device Name for this vdbe VNF + vdbe_aap_untrusted_ip_prefix: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vdbe_aap_untrusted_ip_prefix + type: string + description: ip prefix for primary vDBE VM on the VAN untrusted network + node_templates: + control_int_net: + type: org.openecomp.resource.vl.nodes.heat.network.contrailV2.VirtualNetwork + properties: + network_name: + str_replace: + template: VNF_NAME_control_net + params: + VNF_NAME: + get_input: vnf_name + abstract_vdbe_1: + type: org.openecomp.resource.abstract.nodes.vdbe_1 + directives: + - substitutable + properties: + port_vdbe_untr_port_mac_requirements: + mac_count_required: + is_required: false + port_vdbe_untr_port_subinterface_indicator: + - false + compute_vdbe_availability_zone: + - get_input: availability_zone_1 + port_vdbe_untr_port_name: + - str_replace: + template: VM_NAMEDBE001p1n004 + params: + DBE: + get_input: vdbe_device_name + VM_NAME: + get_input: vdbe_name_1 + vm_flavor_name: + get_input: vdbe_flavor_name + vm_image_name: + get_input: vdbe_image_name + compute_vdbe_metadata: + - vf_module_id: + get_input: vf_module_id + vnf_id: + get_input: vnf_id + vnf_name: + get_input: vnf_name + compute_vdbe_name: + - get_input: vdbe_name_1 + port_vdbe_untr_port_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + service_template_filter: + substitute_service_template: Nested_vdbe_1ServiceTemplate.yaml + count: 1 + index_value: + get_property: + - SELF + - service_template_filter + - index_value + abstract_vdbe: + type: org.openecomp.resource.abstract.nodes.vdbe + directives: + - substitutable + properties: + subinterface_nested1_aap_untrusted_v6_ip_prefix_len: + - get_input: vdbe_aap_untrusted_v6_ip_prefix_len + subinterface_nested1_aap_address_mode: + - get_input: aap_address_mode + subinterface_nested1_vn_network_list: + - get_input: untrusted_vn_networks + compute_vdbe_availability_zone: + - get_input: availability_zone_1 + vm_flavor_name: + get_input: vdbe_flavor_name + vm_image_name: + get_input: vdbe_image_name + subinterface_nested1_vmac_address: + - get_input: vdbe_untrusted_vmac_address + subinterface_nested1_ip_address: + - get_input: vdbe_untrusted_ip_1 + subinterface_nested1_subinterfaces_name_prefix: + - str_replace: + template: VM_NAMEDBE001p1n004 + params: + DBE: + get_input: vdbe_device_name + VM_NAME: + get_input: vdbe_name_1 + compute_vdbe_metadata: + - vf_module_id: + get_input: vf_module_id + vnf_id: + get_input: vnf_id + vnf_name: + get_input: vnf_name + subinterface_nested1_service_template_filter_count: + - get_input: untrusted_num_vn + subinterface_nested1_aap_untrusted_v6_ip_prefix: + - get_input: vdbe_aap_untrusted_v6_ip_prefix + subinterface_nested1_parent_interface: + - vdbe_1_untr_port_1 + subinterface_nested1_aap_untrusted_ip_prefix_len: + - get_input: vdbe_aap_untrusted_ip_prefix_len + subinterface_nested1_ip_v6_address: + - get_input: vdbe_untrusted_v6_ip_1 + port_vdbe_untr_port_mac_requirements: + mac_count_required: + is_required: false + port_vdbe_untr_port_subinterface_indicator: + - true + port_vdbe_untr_port_name: + - str_replace: + template: VM_NAMEDBE001p1n004 + params: + DBE: + get_input: vdbe_device_name + VM_NAME: + get_input: vdbe_name_1 + subinterface_nested1_mac_address: + - get_input: vdbe_hw_untr_mac_1 + subinterface_nested1_aap_untrusted_ip_prefix: + - get_input: vdbe_aap_untrusted_ip_prefix + subinterface_nested1_aap_sec_untrusted_ip_prefix_len: + - get_input: vdbe_aap_sec_untrusted_ip_prefix_len + subinterface_nested1_vlan_tag_list: + - get_input: untrusted_vlan_tags + compute_vdbe_name: + - get_input: vdbe_name_1 + subinterface_nested1_aap_sec_untrusted_ip_prefix: + - get_input: vdbe_aap_sec_untrusted_ip_prefix + port_vdbe_untr_port_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + service_template_filter: + substitute_service_template: Nested_vdbeServiceTemplate.yaml + count: 1 + index_value: + get_property: + - SELF + - service_template_filter + - index_value + groups: + main_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/main.yml + description: | + Version 2.0 02-09-2016 (Authors: John Doe, user PROD) + members: + - control_int_net + - abstract_vdbe + - abstract_vdbe_1 + untr_group: + type: org.openecomp.groups.VfcInstanceGroup + properties: + vfc_parent_port_role: untr + network_collection_function: + get_input: untr_network_collection_function + vfc_instance_group_function: + get_input: untr_vfc_instance_group_function + subinterface_role: untr + members: + - abstract_vdbe
\ 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/subinterface/vlantagging/pattern1a/twoPortOnlyOneConnectedWithSubInf/out/Nested_vdbeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/twoPortOnlyOneConnectedWithSubInf/out/Nested_vdbeServiceTemplate.yaml new file mode 100644 index 0000000000..c74aa04dcd --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/twoPortOnlyOneConnectedWithSubInf/out/Nested_vdbeServiceTemplate.yaml @@ -0,0 +1,483 @@ +tosca_definitions_version: tosca_simple_yaml_1_0_0 +metadata: + template_name: Nested_vdbe +imports: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: + file: GlobalSubstitutionTypesServiceTemplate.yaml +node_types: + org.openecomp.resource.vfc.compute.nodes.heat.vdbe: + derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server +topology_template: + inputs: + port_vdbe_untr_port_network_role_tag: + type: string + required: true + subinterface_nested1_aap_untrusted_v6_ip_prefix_len: + type: list + required: true + entry_schema: + type: string + subinterface_nested1_aap_address_mode: + type: list + required: true + entry_schema: + type: string + port_vdbe_untr_port_subnetpoolid: + type: string + required: true + subinterface_nested1_vn_network_list: + type: list + required: true + entry_schema: + type: string + compute_vdbe_availability_zone: + type: list + required: true + entry_schema: + type: string + vm_flavor_name: + type: string + required: true + port_vdbe_untr_port_order: + type: integer + required: true + vm_image_name: + type: string + required: true + port_vdbe_untr_port_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + subinterface_nested1_vmac_address: + type: list + required: true + entry_schema: + type: string + subinterface_nested1_ip_address: + type: list + required: true + entry_schema: + type: string + subinterface_nested1_subinterfaces_name_prefix: + type: list + required: true + entry_schema: + type: string + compute_vdbe_metadata: + type: list + required: true + entry_schema: + type: json + subinterface_nested1_service_template_filter_count: + type: list + required: true + entry_schema: + type: float + subinterface_nested1_aap_untrusted_v6_ip_prefix: + type: list + required: true + entry_schema: + type: string + subinterface_nested1_parent_interface: + type: list + required: true + entry_schema: + type: string + subinterface_nested1_aap_untrusted_ip_prefix_len: + type: list + required: true + entry_schema: + type: string + subinterface_nested1_ip_v6_address: + type: list + required: true + entry_schema: + type: string + port_vdbe_untr_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + constraints: + - greater_or_equal: 0 + port_vdbe_untr_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean + port_vdbe_untr_port_name: + type: list + required: true + entry_schema: + type: string + port_vdbe_untr_port_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + subinterface_nested1_mac_address: + type: list + required: true + entry_schema: + type: string + port_vdbe_untr_port_network_role: + type: string + required: true + subinterface_nested1_aap_untrusted_ip_prefix: + type: list + required: true + entry_schema: + type: string + subinterface_nested1_aap_sec_untrusted_ip_prefix_len: + type: list + required: true + entry_schema: + type: string + subinterface_nested1_vlan_tag_list: + type: list + required: true + entry_schema: + type: json + compute_vdbe_name: + type: list + required: true + entry_schema: + type: string + subinterface_nested1_aap_sec_untrusted_ip_prefix: + type: list + required: true + entry_schema: + type: string + port_vdbe_untr_port_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + node_templates: + vdbe_vdbe_untr_port_nested1: + type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested1 + directives: + - substitutable + properties: + aap_untrusted_ip_prefix: + get_input: + - subinterface_nested1_aap_untrusted_ip_prefix + - index_value + aap_sec_untrusted_ip_prefix: + get_input: + - subinterface_nested1_aap_sec_untrusted_ip_prefix + - index_value + ip_v6_address: + get_input: + - subinterface_nested1_ip_v6_address + - index_value + counter: + get_property: + - SELF + - service_template_filter + - index_value + ip_address: + get_input: + - subinterface_nested1_ip_address + - index_value + subinterfaces_name_prefix: + get_input: + - subinterface_nested1_subinterfaces_name_prefix + - index_value + aap_address_mode: + get_input: + - subinterface_nested1_aap_address_mode + - index_value + service_template_filter: + count: + get_input: + - subinterface_nested1_service_template_filter_count + - index_value + substitute_service_template: nested1ServiceTemplate.yaml + mandatory: false + aap_untrusted_v6_ip_prefix: + get_input: + - subinterface_nested1_aap_untrusted_v6_ip_prefix + - index_value + parent_interface: + get_input: + - subinterface_nested1_parent_interface + - index_value + vn_network_list: + get_input: + - subinterface_nested1_vn_network_list + - index_value + mac_address: + get_input: + - subinterface_nested1_mac_address + - index_value + vlan_tag_list: + get_input: + - subinterface_nested1_vlan_tag_list + - index_value + aap_sec_untrusted_ip_prefix_len: + get_input: + - subinterface_nested1_aap_sec_untrusted_ip_prefix_len + - index_value + vmac_address: + get_input: + - subinterface_nested1_vmac_address + - index_value + aap_untrusted_v6_ip_prefix_len: + get_input: + - subinterface_nested1_aap_untrusted_v6_ip_prefix_len + - index_value + aap_untrusted_ip_prefix_len: + get_input: + - subinterface_nested1_aap_untrusted_ip_prefix_len + - index_value + requirements: + - binding_vdbe_0_subint_untr_vmi_0: + capability: tosca.capabilities.network.Bindable + node: vdbe_vdbe_untr_port + relationship: tosca.relationships.network.BindsTo + vdbe: + type: org.openecomp.resource.vfc.compute.nodes.heat.vdbe + properties: + availability_zone: + get_input: + - compute_vdbe_availability_zone + - index_value + flavor: + get_input: vm_flavor_name + metadata: + get_input: + - compute_vdbe_metadata + - index_value + image: + get_input: vm_image_name + name: + get_input: + - compute_vdbe_name + - index_value + vdbe_vdbe_untr_port: + type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port + properties: + exCP_naming: + get_input: port_vdbe_untr_port_exCP_naming + vlan_requirements: + get_input: port_vdbe_untr_port_vlan_requirements + subinterface_indicator: + get_input: + - port_vdbe_untr_port_subinterface_indicator + - index_value + ip_requirements: + get_input: port_vdbe_untr_port_ip_requirements + network_role_tag: + get_input: port_vdbe_untr_port_network_role_tag + mac_requirements: + get_input: port_vdbe_untr_port_mac_requirements + order: + get_input: port_vdbe_untr_port_order + network_role: + get_input: port_vdbe_untr_port_network_role + subnetpoolid: + get_input: port_vdbe_untr_port_subnetpoolid + name: + get_input: + - port_vdbe_untr_port_name + - index_value + requirements: + - binding: + capability: tosca.capabilities.network.Bindable + node: vdbe + relationship: tosca.relationships.network.BindsTo + substitution_mappings: + node_type: org.openecomp.resource.abstract.nodes.vdbe + capabilities: + network.outgoing.packets.rate_vdbe_vdbe_untr_port: + - vdbe_vdbe_untr_port + - network.outgoing.packets.rate + network.outgoing.bytes_vdbe_vdbe_untr_port: + - vdbe_vdbe_untr_port + - network.outgoing.bytes + feature_vdbe: + - vdbe + - feature + feature_vdbe_vdbe_untr_port: + - vdbe_vdbe_untr_port + - feature + attachment_vdbe_vdbe_untr_port: + - vdbe_vdbe_untr_port + - attachment + disk.device.iops_vdbe: + - vdbe + - disk.device.iops + endpoint_vdbe: + - vdbe + - endpoint + disk.ephemeral.size_vdbe: + - vdbe + - disk.ephemeral.size + cpu_util_vdbe: + - vdbe + - cpu_util + vcpus_vdbe: + - vdbe + - vcpus + disk.write.requests_vdbe: + - vdbe + - disk.write.requests + disk.device.latency_vdbe: + - vdbe + - disk.device.latency + disk.device.write.requests.rate_vdbe: + - vdbe + - disk.device.write.requests.rate + disk.write.bytes.rate_vdbe: + - vdbe + - disk.write.bytes.rate + network.incoming.packets_vdbe_vdbe_untr_port: + - vdbe_vdbe_untr_port + - network.incoming.packets + scalable_vdbe: + - vdbe + - scalable + disk.iops_vdbe: + - vdbe + - disk.iops + disk.device.write.requests_vdbe: + - vdbe + - disk.device.write.requests + disk.device.capacity_vdbe: + - vdbe + - disk.device.capacity + feature_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_nested1: + - vdbe_vdbe_untr_port_nested1 + - feature_vdbe_0_subint_untr_vmi_0 + disk.device.allocation_vdbe: + - vdbe + - disk.device.allocation + disk.usage_vdbe: + - vdbe + - disk.usage + memory.usage_vdbe: + - vdbe + - memory.usage + network.outpoing.packets_vdbe_vdbe_untr_port: + - vdbe_vdbe_untr_port + - network.outpoing.packets + network.outgoing.bytes.rate_vdbe_vdbe_untr_port: + - vdbe_vdbe_untr_port + - network.outgoing.bytes.rate + disk.read.requests_vdbe: + - vdbe + - disk.read.requests + forwarder_vdbe_vdbe_untr_port: + - vdbe_vdbe_untr_port + - forwarder + binding_vdbe_vdbe_untr_port: + - vdbe_vdbe_untr_port + - binding + instance_vdbe: + - vdbe + - instance + network.incoming.bytes.rate_vdbe_vdbe_untr_port: + - vdbe_vdbe_untr_port + - network.incoming.bytes.rate + cpu.delta_vdbe: + - vdbe + - cpu.delta + disk.device.read.bytes.rate_vdbe: + - vdbe + - disk.device.read.bytes.rate + disk.device.write.bytes.rate_vdbe: + - vdbe + - disk.device.write.bytes.rate + feature_vdbe_vdbe_untr_port_nested1: + - vdbe_vdbe_untr_port_nested1 + - feature + memory.resident_vdbe: + - vdbe + - memory.resident + disk.write.requests.rate_vdbe: + - vdbe + - disk.write.requests.rate + cpu_vdbe: + - vdbe + - cpu + disk.write.bytes_vdbe: + - vdbe + - disk.write.bytes + disk.device.usage_vdbe: + - vdbe + - disk.device.usage + disk.device.read.bytes_vdbe: + - vdbe + - disk.device.read.bytes + disk.latency_vdbe: + - vdbe + - disk.latency + network.incoming.bytes_vdbe_vdbe_untr_port: + - vdbe_vdbe_untr_port + - network.incoming.bytes + disk.capacity_vdbe: + - vdbe + - disk.capacity + host_vdbe: + - vdbe + - host + disk.allocation_vdbe: + - vdbe + - disk.allocation + disk.read.bytes.rate_vdbe: + - vdbe + - disk.read.bytes.rate + os_vdbe: + - vdbe + - os + disk.device.read.requests_vdbe: + - vdbe + - disk.device.read.requests + disk.root.size_vdbe: + - vdbe + - disk.root.size + memory_vdbe: + - vdbe + - memory + binding_vdbe: + - vdbe + - binding + disk.device.write.bytes_vdbe: + - vdbe + - disk.device.write.bytes + disk.device.read.requests.rate_vdbe: + - vdbe + - disk.device.read.requests.rate + disk.read.bytes_vdbe: + - vdbe + - disk.read.bytes + network.incoming.packets.rate_vdbe_vdbe_untr_port: + - vdbe_vdbe_untr_port + - network.incoming.packets.rate + requirements: + subinterface_link_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_nested1: + - vdbe_vdbe_untr_port_nested1 + - subinterface_link_vdbe_0_subint_untr_vmi_0 + dependency_vdbe_vdbe_untr_port: + - vdbe_vdbe_untr_port + - dependency + dependency_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_nested1: + - vdbe_vdbe_untr_port_nested1 + - dependency_vdbe_0_subint_untr_vmi_0 + link_vdbe_vdbe_untr_port: + - vdbe_vdbe_untr_port + - link + local_storage_vdbe: + - vdbe + - local_storage + dependency_vdbe_vdbe_untr_port_nested1: + - vdbe_vdbe_untr_port_nested1 + - dependency + dependency_vdbe: + - vdbe + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/twoPortOnlyOneConnectedWithSubInf/out/Nested_vdbe_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/twoPortOnlyOneConnectedWithSubInf/out/Nested_vdbe_1ServiceTemplate.yaml new file mode 100644 index 0000000000..82071e382b --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/twoPortOnlyOneConnectedWithSubInf/out/Nested_vdbe_1ServiceTemplate.yaml @@ -0,0 +1,306 @@ +tosca_definitions_version: tosca_simple_yaml_1_0_0 +metadata: + template_name: Nested_vdbe_1 +imports: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: + file: GlobalSubstitutionTypesServiceTemplate.yaml +node_types: + org.openecomp.resource.vfc.compute.nodes.heat.vdbe: + derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server +topology_template: + inputs: + port_vdbe_untr_port_network_role_tag: + type: string + required: true + port_vdbe_untr_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + constraints: + - greater_or_equal: 0 + port_vdbe_untr_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean + port_vdbe_untr_port_subnetpoolid: + type: string + required: true + compute_vdbe_availability_zone: + type: list + required: true + entry_schema: + type: string + port_vdbe_untr_port_name: + type: list + required: true + entry_schema: + type: string + vm_flavor_name: + type: string + required: true + port_vdbe_untr_port_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_vdbe_untr_port_network_role: + type: string + required: true + port_vdbe_untr_port_order: + type: integer + required: true + vm_image_name: + type: string + required: true + port_vdbe_untr_port_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + compute_vdbe_metadata: + type: list + required: true + entry_schema: + type: json + compute_vdbe_name: + type: list + required: true + entry_schema: + type: string + port_vdbe_untr_port_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + node_templates: + vdbe: + type: org.openecomp.resource.vfc.compute.nodes.heat.vdbe + properties: + availability_zone: + get_input: + - compute_vdbe_availability_zone + - index_value + flavor: + get_input: vm_flavor_name + metadata: + get_input: + - compute_vdbe_metadata + - index_value + image: + get_input: vm_image_name + name: + get_input: + - compute_vdbe_name + - index_value + vdbe_vdbe_untr_port: + type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port + properties: + exCP_naming: + get_input: port_vdbe_untr_port_exCP_naming + vlan_requirements: + get_input: port_vdbe_untr_port_vlan_requirements + subinterface_indicator: + get_input: + - port_vdbe_untr_port_subinterface_indicator + - index_value + ip_requirements: + get_input: port_vdbe_untr_port_ip_requirements + network_role_tag: + get_input: port_vdbe_untr_port_network_role_tag + mac_requirements: + get_input: port_vdbe_untr_port_mac_requirements + order: + get_input: port_vdbe_untr_port_order + network_role: + get_input: port_vdbe_untr_port_network_role + subnetpoolid: + get_input: port_vdbe_untr_port_subnetpoolid + name: + get_input: + - port_vdbe_untr_port_name + - index_value + requirements: + - binding: + capability: tosca.capabilities.network.Bindable + node: vdbe + relationship: tosca.relationships.network.BindsTo + substitution_mappings: + node_type: org.openecomp.resource.abstract.nodes.vdbe_1 + capabilities: + network.outgoing.packets.rate_vdbe_vdbe_untr_port: + - vdbe_vdbe_untr_port + - network.outgoing.packets.rate + network.outgoing.bytes_vdbe_vdbe_untr_port: + - vdbe_vdbe_untr_port + - network.outgoing.bytes + feature_vdbe: + - vdbe + - feature + feature_vdbe_vdbe_untr_port: + - vdbe_vdbe_untr_port + - feature + attachment_vdbe_vdbe_untr_port: + - vdbe_vdbe_untr_port + - attachment + disk.device.iops_vdbe: + - vdbe + - disk.device.iops + endpoint_vdbe: + - vdbe + - endpoint + disk.ephemeral.size_vdbe: + - vdbe + - disk.ephemeral.size + cpu_util_vdbe: + - vdbe + - cpu_util + vcpus_vdbe: + - vdbe + - vcpus + disk.write.requests_vdbe: + - vdbe + - disk.write.requests + disk.device.latency_vdbe: + - vdbe + - disk.device.latency + disk.device.write.requests.rate_vdbe: + - vdbe + - disk.device.write.requests.rate + disk.write.bytes.rate_vdbe: + - vdbe + - disk.write.bytes.rate + network.incoming.packets_vdbe_vdbe_untr_port: + - vdbe_vdbe_untr_port + - network.incoming.packets + scalable_vdbe: + - vdbe + - scalable + disk.iops_vdbe: + - vdbe + - disk.iops + disk.device.write.requests_vdbe: + - vdbe + - disk.device.write.requests + disk.device.capacity_vdbe: + - vdbe + - disk.device.capacity + disk.device.allocation_vdbe: + - vdbe + - disk.device.allocation + disk.usage_vdbe: + - vdbe + - disk.usage + memory.usage_vdbe: + - vdbe + - memory.usage + network.outpoing.packets_vdbe_vdbe_untr_port: + - vdbe_vdbe_untr_port + - network.outpoing.packets + network.outgoing.bytes.rate_vdbe_vdbe_untr_port: + - vdbe_vdbe_untr_port + - network.outgoing.bytes.rate + disk.read.requests_vdbe: + - vdbe + - disk.read.requests + forwarder_vdbe_vdbe_untr_port: + - vdbe_vdbe_untr_port + - forwarder + binding_vdbe_vdbe_untr_port: + - vdbe_vdbe_untr_port + - binding + instance_vdbe: + - vdbe + - instance + network.incoming.bytes.rate_vdbe_vdbe_untr_port: + - vdbe_vdbe_untr_port + - network.incoming.bytes.rate + cpu.delta_vdbe: + - vdbe + - cpu.delta + disk.device.read.bytes.rate_vdbe: + - vdbe + - disk.device.read.bytes.rate + disk.device.write.bytes.rate_vdbe: + - vdbe + - disk.device.write.bytes.rate + memory.resident_vdbe: + - vdbe + - memory.resident + disk.write.requests.rate_vdbe: + - vdbe + - disk.write.requests.rate + cpu_vdbe: + - vdbe + - cpu + disk.write.bytes_vdbe: + - vdbe + - disk.write.bytes + disk.device.usage_vdbe: + - vdbe + - disk.device.usage + disk.device.read.bytes_vdbe: + - vdbe + - disk.device.read.bytes + disk.latency_vdbe: + - vdbe + - disk.latency + network.incoming.bytes_vdbe_vdbe_untr_port: + - vdbe_vdbe_untr_port + - network.incoming.bytes + disk.capacity_vdbe: + - vdbe + - disk.capacity + host_vdbe: + - vdbe + - host + disk.allocation_vdbe: + - vdbe + - disk.allocation + disk.read.bytes.rate_vdbe: + - vdbe + - disk.read.bytes.rate + os_vdbe: + - vdbe + - os + disk.device.read.requests_vdbe: + - vdbe + - disk.device.read.requests + disk.root.size_vdbe: + - vdbe + - disk.root.size + memory_vdbe: + - vdbe + - memory + binding_vdbe: + - vdbe + - binding + disk.device.write.bytes_vdbe: + - vdbe + - disk.device.write.bytes + disk.device.read.requests.rate_vdbe: + - vdbe + - disk.device.read.requests.rate + disk.read.bytes_vdbe: + - vdbe + - disk.read.bytes + network.incoming.packets.rate_vdbe_vdbe_untr_port: + - vdbe_vdbe_untr_port + - network.incoming.packets.rate + requirements: + dependency_vdbe_vdbe_untr_port: + - vdbe_vdbe_untr_port + - dependency + link_vdbe_vdbe_untr_port: + - vdbe_vdbe_untr_port + - link + local_storage_vdbe: + - vdbe + - local_storage + dependency_vdbe: + - vdbe + - 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/subinterface/vlantagging/pattern1a/twoPortOnlyOneConnectedWithSubInf/out/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/twoPortOnlyOneConnectedWithSubInf/out/nested1ServiceTemplate.yaml new file mode 100644 index 0000000000..83279c502b --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/twoPortOnlyOneConnectedWithSubInf/out/nested1ServiceTemplate.yaml @@ -0,0 +1,171 @@ +tosca_definitions_version: tosca_simple_yaml_1_0_0 +metadata: + template_name: nested1 +imports: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: + file: GlobalSubstitutionTypesServiceTemplate.yaml +topology_template: + inputs: + aap_untrusted_ip_prefix: + hidden: false + immutable: false + type: string + description: ip prefix for primary vDBE VM on the VAN untrusted network + aap_sec_untrusted_ip_prefix: + hidden: false + immutable: false + type: string + description: ip prefix for secondary vDBE VM aap on the VAN untrusted network + ip_v6_address: + hidden: false + immutable: false + type: string + description: IPv6 address associated with subinterfaces + counter: + hidden: false + immutable: false + type: float + description: Index of instance among multiple instances. Use to retrieve correct parameter for this instance when passed all parameters for all instances. + subinterfaces_name_prefix: + hidden: false + immutable: false + type: string + description: Combined with subinterface_instance_index, this is used as the name of the subinterface resource + ip_address: + hidden: false + immutable: false + type: string + description: IPv4 address associated with subinterfaces + aap_address_mode: + hidden: false + immutable: false + type: string + description: Address mode for the vDBE cluster IP + aap_untrusted_v6_ip_prefix: + hidden: false + immutable: false + type: string + description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network + parent_interface: + hidden: false + immutable: false + type: string + description: Parent Contrail interface + vn_network_list: + hidden: false + immutable: false + type: string + description: List of Contrail VLAN networks to use for the subinterfaces. The order and number of these must match the VLAN ID list + mac_address: + hidden: false + immutable: false + type: string + description: HW MAC address to use for subinterface + vlan_tag_list: + hidden: false + immutable: false + type: list + description: List of VLAN IDs to use for subinterfaces + entry_schema: + type: string + aap_sec_untrusted_ip_prefix_len: + hidden: false + immutable: false + type: string + description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network + vmac_address: + hidden: false + immutable: false + type: string + description: virtual MAC address to use for subinterface + aap_untrusted_v6_ip_prefix_len: + hidden: false + immutable: false + type: string + description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network + aap_untrusted_ip_prefix_len: + hidden: false + immutable: false + type: string + description: ip prefix length for the primary vDBE VM on the VAN untrusted network + node_templates: + vdbe_0_subint_untr_vmi_0: + type: org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + properties: + virtual_machine_interface_refs: + - get_input: parent_interface + name: + str_replace: + template: $NAME_$INDEX + params: + $NAME: + get_input: subinterfaces_name_prefix + $INDEX: + get_input: + - vlan_tag_list + - get_input: counter + virtual_network_refs: + - get_input: vn_network_list + virtual_machine_interface_properties: + sub_interface_vlan_tag: + get_input: + - vlan_tag_list + - get_input: counter + virtual_machine_interface_allowed_address_pairs: + allowed_address_pair: + - address_mode: + get_input: aap_address_mode + ip: + ip_prefix: + get_input: aap_untrusted_ip_prefix + ip_prefix_len: + get_input: aap_untrusted_ip_prefix_len + mac: + get_input: vmac_address + - address_mode: + get_input: aap_address_mode + ip: + ip_prefix: + get_input: aap_sec_untrusted_ip_prefix + ip_prefix_len: + get_input: aap_sec_untrusted_ip_prefix_len + mac: + get_input: mac_address + - address_mode: + get_input: aap_address_mode + ip: + ip_prefix: + get_input: aap_untrusted_v6_ip_prefix + ip_prefix_len: + get_input: aap_untrusted_v6_ip_prefix_len + mac: + get_input: vmac_address + virtual_machine_interface_mac_addresses: + mac_address: + - get_input: mac_address + groups: + nested1_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/nested1.yml + description: cmaui server template for vMMSC + members: + - vdbe_0_subint_untr_vmi_0 + substitution_mappings: + node_type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested1 + capabilities: + feature_vdbe_0_subint_untr_vmi_0: + - vdbe_0_subint_untr_vmi_0 + - feature + requirements: + dependency_vdbe_0_subint_untr_vmi_0: + - vdbe_0_subint_untr_vmi_0 + - dependency + subinterface_link_vdbe_0_subint_untr_vmi_0: + - vdbe_0_subint_untr_vmi_0 + - subinterface_link + binding_vdbe_0_subint_untr_vmi_0: + - vdbe_0_subint_untr_vmi_0 + - binding diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/MainServiceTemplate.yaml index 3284aad2f7..662123e127 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/MainServiceTemplate.yaml @@ -735,7 +735,7 @@ topology_template: port_pd01_port_network: - get_input: oam_net_name port_pd01_port_subinterface_indicator: - - true + - false port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW @@ -812,4 +812,4 @@ topology_template: - test_net2 - test_net1 - abstract_pd_server - - abstract_pd_server_1 + - abstract_pd_server_1
\ 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/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/MainServiceTemplate.yaml index 3284aad2f7..662123e127 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/MainServiceTemplate.yaml @@ -735,7 +735,7 @@ topology_template: port_pd01_port_network: - get_input: oam_net_name port_pd01_port_subinterface_indicator: - - true + - false port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW @@ -812,4 +812,4 @@ topology_template: - test_net2 - test_net1 - abstract_pd_server - - abstract_pd_server_1 + - abstract_pd_server_1
\ 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/subinterface/vlantagging/pattern1c1/allConnectivities/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/allConnectivities/out/MainServiceTemplate.yaml index 30ee294d8f..f556f19079 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/allConnectivities/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/allConnectivities/out/MainServiceTemplate.yaml @@ -491,8 +491,8 @@ topology_template: - get_input: counter - get_input: counter port_vdbe_untr_2_port_subinterface_indicator: - - true - - true + - false + - false vm_image_name: get_input: vdbe_image_name compute_vdbe_metadata: @@ -640,4 +640,4 @@ topology_template: value: get_attribute: - abstract_vdbe - - vdbe_vdbe_untr_1_port_vlan1_aap_address_mode + - vdbe_vdbe_untr_1_port_vlan1_aap_address_mode
\ 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/subinterface/vlantagging/pattern1c1/optionalPropertiesConsolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/optionalPropertiesConsolidation/out/MainServiceTemplate.yaml index ef8138edae..e48bb116b8 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/optionalPropertiesConsolidation/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/optionalPropertiesConsolidation/out/MainServiceTemplate.yaml @@ -489,8 +489,8 @@ topology_template: - get_input: counter - get_input: counter port_vdbe_untr_2_port_subinterface_indicator: - - true - - true + - false + - false vm_image_name: get_input: vdbe_image_name compute_vdbe_metadata: @@ -623,4 +623,4 @@ topology_template: members: - fabric_int_net - control_int_net - - abstract_vdbe + - abstract_vdbe
\ 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/subinterface/vlantagging/pattern5/baseScenario/out/nested_pattern5ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/baseScenario/out/nested_pattern5ServiceTemplate.yaml index 469540fa5a..25c72aa1e4 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/baseScenario/out/nested_pattern5ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/baseScenario/out/nested_pattern5ServiceTemplate.yaml @@ -170,7 +170,7 @@ topology_template: mac_count_required: is_required: false port_pd_server_2b_port_subinterface_indicator: - - true + - false port_pd_server_1b_port_network: - packet_internal_network port_pd_server_2b_port_replacement_policy: @@ -228,7 +228,7 @@ topology_template: - ps_server_2b_ips - 0 port_ps_server_2b_port_subinterface_indicator: - - true + - false compute_ps_server_1b_availability_zone: - get_input: availability_zone_0 compute_ps_server_1b_name: @@ -239,7 +239,7 @@ topology_template: mac_count_required: is_required: false port_ps_server_1b_port_subinterface_indicator: - - true + - false port_ps_server_1b_port_network: - packet_internal_network port_ps_server_1b_port_ip_requirements: @@ -746,4 +746,4 @@ topology_template: - link_pd_server_1b_pd_server_2b_port dependency_packet_external_network: - packet_external_network - - 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/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/nested_pattern5ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/nested_pattern5ServiceTemplate.yaml index f5055f4147..86e8f28988 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/nested_pattern5ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/nested_pattern5ServiceTemplate.yaml @@ -103,8 +103,8 @@ topology_template: vm_flavor_name: get_input: pd_server_1b_flavor port_pd_server_1b_port_subinterface_indicator: - - true - - true + - false + - false vm_image_name: get_input: pd_server_1b_image port_pd_server_1b_port_replacement_policy: @@ -999,4 +999,4 @@ topology_template: - dependency_pd_server_1b dependency_server_1b_pd_3: - abstract_pd_server_1b - - dependency_pd_server_1b + - dependency_pd_server_1b
\ 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/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml index 11197a9d69..bcc142a797 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml @@ -86,7 +86,7 @@ topology_template: mac_count_required: is_required: false port_ps_server_1b_port_subinterface_indicator: - - true + - false port_ps_server_1b_port_fixed_ips: - ip_address: get_input: @@ -585,4 +585,4 @@ topology_template: - dependency_ps_server_1b dependency_server_1b_ps_2: - abstract_ps_server_1b_1 - - dependency_ps_server_1b + - dependency_ps_server_1b
\ 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/unifiedComposition/createAbstractSubstitute/oneComputeMultiplePortsDiffType/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/oneComputeMultiplePortsDiffType/out/MainServiceTemplate.yaml index bc08b781f9..53edc4aa75 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/oneComputeMultiplePortsDiffType/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/oneComputeMultiplePortsDiffType/out/MainServiceTemplate.yaml @@ -74,7 +74,7 @@ topology_template: mac_address: get_input: fsb1-Internal2-mac network: Internal2-net - subinterface_indicator: true + subinterface_indicator: false requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -86,7 +86,7 @@ topology_template: mac_address: get_input: fsb1-Internal1-mac network: Internal1-net - subinterface_indicator: true + subinterface_indicator: false requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -103,7 +103,7 @@ topology_template: - ip_address: get_input: fsb1-oam-ip network: jsa_net1 - subinterface_indicator: true + subinterface_indicator: false requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -185,7 +185,7 @@ topology_template: port_FSB1_Internal_mac_address: get_input: fsb1-Internal1-mac port_FSB1_OAM_subinterface_indicator: - - true + - false vm_flavor_name: get_input: fsb-flavor vm_image_name: @@ -193,7 +193,7 @@ topology_template: compute_FSB_admin_pass: - STATIC-DATA-FSB1 port_FSB1_Internal_subinterface_indicator: - - true + - false port_FSB1_Internal_network: - Internal1-net port_FSB2_Internal_mac_address: @@ -207,7 +207,7 @@ topology_template: - path: /path1/etc/sysconfig/network-scripts/ifcfg-eth0 - path: /path2/etc/sysconfig/network-scripts/ifcfg-eth1 port_FSB2_Internal_subinterface_indicator: - - true + - false compute_FSB_availability_zone: - get_input: fsb1_zone port_FSB1_OAM_fixed_ips: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/oneComputeMultiplePortsSameType/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/oneComputeMultiplePortsSameType/out/MainServiceTemplate.yaml index 5c86ef6c5b..1ece0e77db 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/oneComputeMultiplePortsSameType/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/oneComputeMultiplePortsSameType/out/MainServiceTemplate.yaml @@ -69,7 +69,7 @@ topology_template: mac_address: get_input: fsb1-Internal2-mac network: Internal2-net - subinterface_indicator: true + subinterface_indicator: false requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -81,7 +81,7 @@ topology_template: mac_address: get_input: fsb1-Internal1-mac network: Internal1-net - subinterface_indicator: true + subinterface_indicator: false requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -161,7 +161,7 @@ topology_template: - substitutable properties: port_FSB1_Internal_2_subinterface_indicator: - - true + - false vm_flavor_name: get_input: fsb-flavor vm_image_name: @@ -171,7 +171,7 @@ topology_template: port_FSB1_Internal_1_mac_address: get_input: fsb1-Internal1-mac port_FSB1_Internal_1_subinterface_indicator: - - true + - false port_FSB1_Internal_1_network: - Internal1-net port_FSB1_Internal_2_mac_address: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/twoComputesMultiplePorts/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/twoComputesMultiplePorts/out/MainServiceTemplate.yaml index 9b54fbea73..74af8bd259 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/twoComputesMultiplePorts/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/twoComputesMultiplePorts/out/MainServiceTemplate.yaml @@ -94,7 +94,7 @@ topology_template: mac_address: get_input: fsb2-Internal2-mac network: Internal2-net-fsb2-Internal2 - subinterface_indicator: true + subinterface_indicator: false requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -106,7 +106,7 @@ topology_template: mac_address: get_input: fsb2-Internal1-mac network: Internal2-net-fsb2-Internal1 - subinterface_indicator: true + subinterface_indicator: false requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -118,7 +118,7 @@ topology_template: mac_address: get_input: fsb1-Internal2-mac network: Internal1-net-fsb1-Internal2 - subinterface_indicator: true + subinterface_indicator: false requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -134,7 +134,7 @@ topology_template: mac_address: get_input: fsb1-Internal1-mac network: Internal1-net-fsb1-Internal1 - subinterface_indicator: true + subinterface_indicator: false requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -257,8 +257,8 @@ topology_template: - STATIC-DATA-FSB1 - STATIC-DATA-FSB2 port_FSB1_Internal_subinterface_indicator: - - true - - true + - false + - false port_FSB1_Internal_network: - Internal1-net-fsb1-Internal1 - Internal1-net-fsb1-Internal2 @@ -275,8 +275,8 @@ topology_template: - path: /path3/etc/sysconfig/network-scripts/ifcfg-eth0 - path: /path4/etc/sysconfig/network-scripts/ifcfg-eth1 port_FSB2_Internal_subinterface_indicator: - - true - - true + - false + - false compute_FSB_availability_zone: - get_input: fsb1_zone - get_input: fsb2_zone diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/inputoutputparamtype/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/inputoutputparamtype/out/MainServiceTemplate.yaml index cf83056eb9..cb4c364068 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/inputoutputparamtype/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/inputoutputparamtype/out/MainServiceTemplate.yaml @@ -260,7 +260,7 @@ topology_template: - substitutable properties: port_VMI_subinterface_indicator: - - true + - false port_FSB1_Port_network: - Internal1-net vm_flavor_name: @@ -268,7 +268,7 @@ topology_template: port_FSB1_Port_mac_address: get_input: fsb1-Internal1-mac port_FSB1_Port_subinterface_indicator: - - true + - false compute_FSB1_availability_zone: - get_input: fsb_zone port_VMI_port_tuple_refs: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updGroupsConnectivity/consolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updGroupsConnectivity/consolidation/out/MainServiceTemplate.yaml index a46b7613ae..33cf0ab91a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updGroupsConnectivity/consolidation/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updGroupsConnectivity/consolidation/out/MainServiceTemplate.yaml @@ -104,7 +104,7 @@ topology_template: mac_address: get_input: fsb2-Internal2-mac network: Internal2-net-fsb2-Internal2 - subinterface_indicator: true + subinterface_indicator: false requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -120,7 +120,7 @@ topology_template: mac_address: get_input: fsb2-Internal1-mac network: Internal2-net-fsb2-Internal1 - subinterface_indicator: true + subinterface_indicator: false requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -136,7 +136,7 @@ topology_template: mac_address: get_input: fsb1-Internal2-mac network: Internal1-net-fsb1-Internal2 - subinterface_indicator: true + subinterface_indicator: false requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -152,7 +152,7 @@ topology_template: mac_address: get_input: fsb1-Internal1-mac network: Internal1-net-fsb1-Internal1 - subinterface_indicator: true + subinterface_indicator: false requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -254,8 +254,8 @@ topology_template: - OPTIONAL-DATA-FSB1 - null port_FSB1_Internal_subinterface_indicator: - - true - - true + - false + - false port_FSB1_Internal_network: - Internal1-net-fsb1-Internal1 - Internal1-net-fsb1-Internal2 @@ -272,8 +272,8 @@ topology_template: - path: /path3/etc/sysconfig/network-scripts/ifcfg-eth0 - path: /path4/etc/sysconfig/network-scripts/ifcfg-eth1 port_FSB2_Internal_subinterface_indicator: - - true - - true + - false + - false compute_FSB_availability_zone: - get_input: fsb1_zone - get_input: fsb2_zone diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updGroupsConnectivity/noConsolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updGroupsConnectivity/noConsolidation/out/MainServiceTemplate.yaml index 9efe855849..bf66e19579 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updGroupsConnectivity/noConsolidation/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updGroupsConnectivity/noConsolidation/out/MainServiceTemplate.yaml @@ -57,7 +57,7 @@ topology_template: replacement_policy: AUTO network: get_input: port_name - subinterface_indicator: true + subinterface_indicator: false requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -89,7 +89,7 @@ topology_template: replacement_policy: AUTO network: get_input: port_name - subinterface_indicator: true + subinterface_indicator: false requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -109,7 +109,7 @@ topology_template: vm_image_name: get_input: image_smp_name port_port_1_subinterface_indicator: - - true + - false port_port_2_replacement_policy: - AUTO compute_smp_name: @@ -119,7 +119,7 @@ topology_template: port_port_1_network: - get_input: port_name port_port_2_subinterface_indicator: - - true + - false port_port_2_network: - get_input: port_name compute_smp_metadata: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedIn/consolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedIn/consolidation/out/MainServiceTemplate.yaml index 7691174c4c..f0d017909c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedIn/consolidation/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedIn/consolidation/out/MainServiceTemplate.yaml @@ -104,7 +104,7 @@ topology_template: mac_address: get_input: fsb2-Internal2-mac network: Internal2-net-fsb2-Internal2 - subinterface_indicator: true + subinterface_indicator: false requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -120,7 +120,7 @@ topology_template: mac_address: get_input: fsb2-Internal1-mac network: Internal2-net-fsb2-Internal1 - subinterface_indicator: true + subinterface_indicator: false requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -136,7 +136,7 @@ topology_template: mac_address: get_input: fsb1-Internal2-mac network: Internal1-net-fsb1-Internal2 - subinterface_indicator: true + subinterface_indicator: false requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -152,7 +152,7 @@ topology_template: mac_address: get_input: fsb1-Internal1-mac network: Internal1-net-fsb1-Internal1 - subinterface_indicator: true + subinterface_indicator: false requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -267,8 +267,8 @@ topology_template: - STATIC-DATA-FSB1 - STATIC-DATA-FSB2 port_FSB1_Internal_subinterface_indicator: - - true - - true + - false + - false port_FSB1_Internal_network: - Internal1-net-fsb1-Internal1 - Internal1-net-fsb1-Internal2 @@ -285,8 +285,8 @@ topology_template: - path: /path3/etc/sysconfig/network-scripts/ifcfg-eth0 - path: /path4/etc/sysconfig/network-scripts/ifcfg-eth1 port_FSB2_Internal_subinterface_indicator: - - true - - true + - false + - false compute_FSB_availability_zone: - get_input: fsb1_zone - get_input: fsb2_zone 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 386d6cd7fb..796d4db974 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 @@ -55,7 +55,7 @@ topology_template: properties: network: get_input: cdr_network - subinterface_indicator: true + subinterface_indicator: false requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -66,7 +66,7 @@ topology_template: properties: network: get_input: oam_private_net_name - subinterface_indicator: true + subinterface_indicator: false requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -102,7 +102,7 @@ topology_template: vm_flavor_name: FLAVOR-test vm_image_name: Image-test port_oam_private_net_network_port_subinterface_indicator: - - true + - false compute_QRouter_availability_zone: - Availability-test compute_QRouter_config_drive: @@ -114,7 +114,7 @@ topology_template: compute_QRouter_name: - QRouter-name port_cdr_network_port_subinterface_indicator: - - true + - false service_template_filter: substitute_service_template: Nested_QRouterServiceTemplate.yaml count: 1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedOut/consolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedOut/consolidation/out/MainServiceTemplate.yaml index f2d7a0b7f9..6315ba5ec4 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedOut/consolidation/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedOut/consolidation/out/MainServiceTemplate.yaml @@ -104,7 +104,7 @@ topology_template: mac_address: get_input: fsb2-Internal2-mac network: Internal2-net-fsb2-Internal2 - subinterface_indicator: true + subinterface_indicator: false requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -120,7 +120,7 @@ topology_template: mac_address: get_input: fsb2-Internal1-mac network: Internal2-net-fsb2-Internal1 - subinterface_indicator: true + subinterface_indicator: false requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -136,7 +136,7 @@ topology_template: mac_address: get_input: fsb1-Internal2-mac network: Internal1-net-fsb1-Internal2 - subinterface_indicator: true + subinterface_indicator: false requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -152,7 +152,7 @@ topology_template: mac_address: get_input: fsb1-Internal1-mac network: Internal1-net-fsb1-Internal1 - subinterface_indicator: true + subinterface_indicator: false requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -254,8 +254,8 @@ topology_template: - STATIC-DATA-FSB1 - STATIC-DATA-FSB2 port_FSB1_Internal_subinterface_indicator: - - true - - true + - false + - false port_FSB1_Internal_network: - Internal1-net-fsb1-Internal1 - Internal1-net-fsb1-Internal2 @@ -272,8 +272,8 @@ topology_template: - path: /path3/etc/sysconfig/network-scripts/ifcfg-eth0 - path: /path4/etc/sysconfig/network-scripts/ifcfg-eth1 port_FSB2_Internal_subinterface_indicator: - - true - - true + - false + - false compute_FSB_availability_zone: - get_input: fsb1_zone - get_input: fsb2_zone diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedOut/noConsolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedOut/noConsolidation/out/MainServiceTemplate.yaml index c4d02a16cd..03086cc4a9 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedOut/noConsolidation/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedOut/noConsolidation/out/MainServiceTemplate.yaml @@ -79,7 +79,7 @@ topology_template: mac_address: get_input: fsb1-Internal2-mac network: Internal2-net - subinterface_indicator: true + subinterface_indicator: false requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -91,7 +91,7 @@ topology_template: mac_address: get_input: fsb1-Internal1-mac network: Internal1-net - subinterface_indicator: true + subinterface_indicator: false requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -108,7 +108,7 @@ topology_template: - ip_address: get_input: fsb1-oam-ip network: jsa_net1 - subinterface_indicator: true + subinterface_indicator: false requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -179,7 +179,7 @@ topology_template: port_FSB1_Internal_mac_address: get_input: fsb1-Internal1-mac port_FSB1_OAM_subinterface_indicator: - - true + - false vm_flavor_name: get_input: fsb-flavor vm_image_name: @@ -187,7 +187,7 @@ topology_template: compute_FSB_admin_pass: - STATIC-DATA-FSB1 port_FSB1_Internal_subinterface_indicator: - - true + - false port_FSB1_Internal_network: - Internal1-net port_FSB2_Internal_mac_address: @@ -201,7 +201,7 @@ topology_template: - path: /path1/etc/sysconfig/network-scripts/ifcfg-eth0 - path: /path2/etc/sysconfig/network-scripts/ifcfg-eth1 port_FSB2_Internal_subinterface_indicator: - - true + - false compute_FSB_availability_zone: - get_input: fsb1_zone port_FSB1_OAM_fixed_ips: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updVolumes/consolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updVolumes/consolidation/out/MainServiceTemplate.yaml index 82e7614811..511aa0ccbe 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updVolumes/consolidation/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updVolumes/consolidation/out/MainServiceTemplate.yaml @@ -104,7 +104,7 @@ topology_template: mac_address: get_input: fsb2-Internal2-mac network: Internal2-net-fsb2-Internal2 - subinterface_indicator: true + subinterface_indicator: false requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -120,7 +120,7 @@ topology_template: mac_address: get_input: fsb2-Internal1-mac network: Internal2-net-fsb2-Internal1 - subinterface_indicator: true + subinterface_indicator: false requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -136,7 +136,7 @@ topology_template: mac_address: get_input: fsb1-Internal2-mac network: Internal1-net-fsb1-Internal2 - subinterface_indicator: true + subinterface_indicator: false requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -152,7 +152,7 @@ topology_template: mac_address: get_input: fsb1-Internal1-mac network: Internal1-net-fsb1-Internal1 - subinterface_indicator: true + subinterface_indicator: false requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -294,8 +294,8 @@ topology_template: - STATIC-DATA-FSB1 - STATIC-DATA-FSB2 port_FSB1_Internal_subinterface_indicator: - - true - - true + - false + - false port_FSB1_Internal_network: - Internal1-net-fsb1-Internal1 - Internal1-net-fsb1-Internal2 @@ -312,8 +312,8 @@ topology_template: - path: /path3/etc/sysconfig/network-scripts/ifcfg-eth0 - path: /path4/etc/sysconfig/network-scripts/ifcfg-eth1 port_FSB2_Internal_subinterface_indicator: - - true - - true + - false + - false compute_FSB_availability_zone: - get_input: fsb1_zone - get_input: fsb2_zone diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updVolumes/noConsolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updVolumes/noConsolidation/out/MainServiceTemplate.yaml index 8e411bde02..41a5177c3d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updVolumes/noConsolidation/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updVolumes/noConsolidation/out/MainServiceTemplate.yaml @@ -79,7 +79,7 @@ topology_template: mac_address: get_input: fsb1-Internal2-mac network: Internal2-net - subinterface_indicator: true + subinterface_indicator: false requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -91,7 +91,7 @@ topology_template: mac_address: get_input: fsb1-Internal1-mac network: Internal1-net - subinterface_indicator: true + subinterface_indicator: false requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -108,7 +108,7 @@ topology_template: - ip_address: get_input: fsb1-oam-ip network: jsa_net1 - subinterface_indicator: true + subinterface_indicator: false requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -199,7 +199,7 @@ topology_template: port_FSB1_Internal_mac_address: get_input: fsb1-Internal1-mac port_FSB1_OAM_subinterface_indicator: - - true + - false vm_flavor_name: get_input: fsb-flavor vm_image_name: @@ -207,7 +207,7 @@ topology_template: compute_FSB_admin_pass: - STATIC-DATA-FSB1 port_FSB1_Internal_subinterface_indicator: - - true + - false port_FSB1_Internal_network: - Internal1-net port_FSB2_Internal_mac_address: @@ -221,7 +221,7 @@ topology_template: - path: /path1/etc/sysconfig/network-scripts/ifcfg-eth0 - path: /path2/etc/sysconfig/network-scripts/ifcfg-eth1 port_FSB2_Internal_subinterface_indicator: - - true + - false compute_FSB_availability_zone: - get_input: fsb1_zone port_FSB1_OAM_fixed_ips: |