From 6ce1094d509195fe484761467a67a6b3757593b0 Mon Sep 17 00:00:00 2001 From: ojasdubey Date: Thu, 29 Nov 2018 20:46:49 +0530 Subject: Fix - Port type and vmtype underscore issue 1. Fix for consolidation of VMs for cases when: a. VM type contains an underscore b. Multiple ports per network role 2. Updated the unit test cases and test data Change-Id: I875f3c8384f8ef2c2aa6add9e30a5f8899ae1a71 Issue-ID: SDC-1966 Signed-off-by: ojasdubey --- .../consolidation/EntityConsolidationData.java | 29 +- .../consolidation/FilePortConsolidationData.java | 12 +- .../consolidation/PortConsolidationData.java | 4 +- .../PortConsolidationDataHandler.java | 14 +- .../PortTemplateConsolidationData.java | 10 + .../heattotosca/ConsolidationDataUtil.java | 31 +- .../services/heattotosca/ConsolidationService.java | 3 +- .../heattotosca/UnifiedCompositionService.java | 29 +- .../heattotosca/UnifiedCompositionUtil.java | 32 +- .../org/openecomp/sdc/translator/TestUtils.java | 11 +- .../FilePortConsolidationDataTest.java | 15 +- .../consolidation/PortConsolidationDataTest.java | 16 +- .../heattotosca/ConsolidationDataUtilTest.java | 50 +- .../heattotosca/ConsolidationServiceTest.java | 418 +-- .../heattotosca/UnifiedCompositionServiceTest.java | 156 +- .../ConsolidationDataTestUtil.java | 2 +- .../PortNewNodeTemplateIdGeneratorTest.java | 2 +- .../computewithtwosameporttypes/in/base_vIECCF.yml | 102 +- .../GlobalSubstitutionTypesServiceTemplate.yaml | 1346 +++---- .../out/MainServiceTemplate.yaml | 968 ++--- .../out/Nested_appServiceTemplate.yaml | 546 +-- .../out/Nested_ioxServiceTemplate.yaml | 598 ++-- .../out/Nested_pltServiceTemplate.yaml | 526 +-- .../in/hot-mog-0108-bs1271.yml | 12 +- .../GlobalSubstitutionTypesServiceTemplate.yaml | 146 +- .../out/MainServiceTemplate.yaml | 56 +- .../out/Nested_pd_serverServiceTemplate.yaml | 156 +- .../in/hot-mog-0108-bs1271.yml | 12 +- .../GlobalSubstitutionTypesServiceTemplate.yaml | 146 +- .../out/MainServiceTemplate.yaml | 56 +- .../out/Nested_pd_serverServiceTemplate.yaml | 156 +- .../in/hot-mog-0108-bs1271.yml | 12 +- .../GlobalSubstitutionTypesServiceTemplate.yaml | 146 +- .../out/MainServiceTemplate.yaml | 56 +- .../out/Nested_pd_serverServiceTemplate.yaml | 156 +- .../in/hot-mog-0108-bs1271.yml | 8 +- .../GlobalSubstitutionTypesServiceTemplate.yaml | 146 +- .../out/MainServiceTemplate.yaml | 38 +- .../out/Nested_pd_serverServiceTemplate.yaml | 156 +- .../in/DPA3_New_VNF_TSBGv_base.yaml | 4 +- .../in/DPA3_New_VNF_TSBGv_base.yaml | 4 +- .../in/DPA3_New_VNF_TSBGv_base.yaml | 8 +- .../in/DPA3_New_VNF_TSBGv_base.yaml | 8 +- .../in/DPA3_New_VNF_TSBGv_base.yaml | 10 +- .../in/hot-mog-0108-bs1271.yml | 116 +- .../GlobalSubstitutionTypesServiceTemplate.yaml | 1134 +++--- .../out/MainServiceTemplate.yaml | 276 +- ...ested_1c1_scalling_instanceServiceTemplate.yaml | 352 +- ...Nested_1c2_catalog_instanceServiceTemplate.yaml | 302 +- .../out/Nested_b_single_1bServiceTemplate.yaml | 304 +- .../out/Nested_b_single_1b_1ServiceTemplate.yaml | 324 +- .../out/Nested_pcma_server_1ServiceTemplate.yaml | 24 +- .../out/nested-no_vfc_v0.1ServiceTemplate.yaml | 12 +- .../in/hot-mog-0108-bs1271.yml | 102 +- .../GlobalSubstitutionTypesServiceTemplate.yaml | 1992 +++++------ .../out/MainServiceTemplate.yaml | 280 +- ...ested_1c1_scalling_instanceServiceTemplate.yaml | 340 +- ...Nested_1c2_catalog_instanceServiceTemplate.yaml | 302 +- .../out/Nested_a_single_1aServiceTemplate.yaml | 302 +- .../out/Nested_b_single_1bServiceTemplate.yaml | 302 +- .../out/Nested_b_single_1b_1ServiceTemplate.yaml | 296 +- .../out/Nested_pcma_serverServiceTemplate.yaml | 320 +- .../out/Nested_pcma_server_1ServiceTemplate.yaml | 334 +- .../out/nested-no_vfc_v0.1ServiceTemplate.yaml | 212 +- .../in/hot-mog-0108-bs1271.yml | 98 +- .../GlobalSubstitutionTypesServiceTemplate.yaml | 1122 +++--- .../out/MainServiceTemplate.yaml | 240 +- ...ested_1c1_scalling_instanceServiceTemplate.yaml | 340 +- ...Nested_1c2_catalog_instanceServiceTemplate.yaml | 302 +- .../out/Nested_b_single_1bServiceTemplate.yaml | 302 +- .../out/Nested_b_single_1b_1ServiceTemplate.yaml | 296 +- .../out/Nested_pcma_server_1ServiceTemplate.yaml | 24 +- .../out/nested-no_vfc_v0.1ServiceTemplate.yaml | 12 +- .../in/hot-mog-0108-bs1271.yml | 218 +- .../GlobalSubstitutionTypesServiceTemplate.yaml | 2392 ++++++------- .../out/MainServiceTemplate.yaml | 494 +-- ...sted_1c11_scalling_instanceServiceTemplate.yaml | 222 +- ...sted_1c12_scalling_instanceServiceTemplate.yaml | 216 +- ...Nested_1c2_catalog_instanceServiceTemplate.yaml | 308 +- ...Nested_2c2_catalog_instanceServiceTemplate.yaml | 292 +- .../out/Nested_a_single_1aServiceTemplate.yaml | 302 +- .../out/Nested_a_single_2aServiceTemplate.yaml | 164 +- .../out/Nested_b_single_1bServiceTemplate.yaml | 324 +- .../out/Nested_b_single_1b_1ServiceTemplate.yaml | 304 +- .../out/Nested_b_single_2bServiceTemplate.yaml | 314 +- .../out/Nested_b_single_2b_1ServiceTemplate.yaml | 304 +- .../out/Nested_pcma_server_1ServiceTemplate.yaml | 24 +- .../out/nested-no_vfc_v0.1ServiceTemplate.yaml | 12 +- .../allPatternsDependsOnConnectivity/in/main.yml | 8 +- .../in/nested-pattern-4-same-type.yml | 8 +- .../in/nested-pattern-4.yml | 8 +- .../in/nested1.yml | 8 +- .../in/nested2.yml | 8 +- .../GlobalSubstitutionTypesServiceTemplate.yaml | 3768 ++++++++++---------- .../out/MainServiceTemplate.yaml | 46 +- .../out/Nested_cmaui_1c1_mainServiceTemplate.yaml | 196 +- .../Nested_cmaui_1c1_main_1ServiceTemplate.yaml | 196 +- .../Nested_cmaui_1c1_nested2ServiceTemplate.yaml | 204 +- .../Nested_pd_server_main_1bServiceTemplate.yaml | 208 +- .../Nested_pd_server_main_1b_1ServiceTemplate.yaml | 2 +- ...Nested_pd_server_nested2_1bServiceTemplate.yaml | 2 +- .../Nested_ps_server_main_1bServiceTemplate.yaml | 164 +- .../Nested_ps_server_main_1b_1ServiceTemplate.yaml | 2 +- ...Nested_ps_server_nested2_1bServiceTemplate.yaml | 2 +- .../nested-pattern-4-same-typeServiceTemplate.yaml | 320 +- .../out/nested-pattern-4ServiceTemplate.yaml | 294 +- .../out/nested1ServiceTemplate.yaml | 966 ++--- .../out/nested2ServiceTemplate.yaml | 540 +-- .../GlobalSubstitutionTypesServiceTemplate.yaml | 1370 +++---- .../out/MainServiceTemplate.yaml | 48 +- .../out/Nested_cmauiServiceTemplate.yaml | 176 +- .../out/Nested_cmaui_1ServiceTemplate.yaml | 176 +- .../out/Nested_oamServiceTemplate.yaml | 206 +- .../out/Nested_oam_1ServiceTemplate.yaml | 172 +- .../out/Nested_pd_serverServiceTemplate.yaml | 152 +- .../out/Nested_pd_server_1ServiceTemplate.yaml | 170 +- .../out/Nested_psServiceTemplate.yaml | 180 +- .../out/Nested_ps_1ServiceTemplate.yaml | 174 +- .../out/nested1ServiceTemplate.yaml | 120 +- .../out/nested2ServiceTemplate.yaml | 110 +- .../out/nested3ServiceTemplate.yaml | 128 +- .../GlobalSubstitutionTypesServiceTemplate.yaml | 1294 +++---- .../out/MainServiceTemplate.yaml | 48 +- .../out/Nested_pd_serverServiceTemplate.yaml | 192 +- .../out/Nested_pd_server_1ServiceTemplate.yaml | 154 +- .../out/Nested_pd_server_2ServiceTemplate.yaml | 152 +- .../out/Nested_pd_server_3ServiceTemplate.yaml | 156 +- .../out/Nested_pd_server_4ServiceTemplate.yaml | 158 +- .../out/Nested_pd_server_5ServiceTemplate.yaml | 194 +- .../out/Nested_pd_server_6ServiceTemplate.yaml | 152 +- .../out/Nested_pd_server_7ServiceTemplate.yaml | 170 +- .../out/nested1ServiceTemplate.yaml | 90 +- .../out/nested2ServiceTemplate.yaml | 86 +- .../out/nested3ServiceTemplate.yaml | 86 +- .../in/nested-pattern-4.yml | 8 +- .../in/nested1.yml | 16 +- .../in/nested2.yml | 16 +- .../GlobalSubstitutionTypesServiceTemplate.yaml | 2542 ++++++------- .../out/MainServiceTemplate.yaml | 120 +- .../out/Nested_BE_1c1ServiceTemplate.yaml | 200 +- .../out/Nested_cmaui_1c1ServiceTemplate.yaml | 180 +- .../out/Nested_oam_server_1c2ServiceTemplate.yaml | 208 +- .../out/Nested_osm_server_1c2ServiceTemplate.yaml | 164 +- .../out/Nested_pd_server_1bServiceTemplate.yaml | 198 +- .../out/Nested_pd_server_1b_1ServiceTemplate.yaml | 172 +- .../out/nested-pattern-4ServiceTemplate.yaml | 292 +- .../out/nested1ServiceTemplate.yaml | 696 ++-- .../nestedAllNonNestedPatterns/in/nested1.yml | 16 +- .../GlobalSubstitutionTypesServiceTemplate.yaml | 838 ++--- .../out/Nested_cmaui_1c1ServiceTemplate.yaml | 180 +- .../out/Nested_oam_server_1c2ServiceTemplate.yaml | 200 +- .../out/nested1ServiceTemplate.yaml | 410 +-- .../nestedAllPatternsConnectivity/in/nested1.yml | 16 +- .../GlobalSubstitutionTypesServiceTemplate.yaml | 848 ++--- .../out/Nested_cmaui_1c1ServiceTemplate.yaml | 180 +- .../out/Nested_oam_server_1c2ServiceTemplate.yaml | 200 +- .../out/nested1ServiceTemplate.yaml | 410 +-- .../oneLevel/nestedCatalogInstance/in/nested1.yml | 8 +- .../GlobalSubstitutionTypesServiceTemplate.yaml | 392 +- .../out/Nested_cmauiServiceTemplate.yaml | 178 +- .../out/nested1ServiceTemplate.yaml | 192 +- .../oneLevel/nestedScalingInstance/in/nested1.yml | 8 +- .../GlobalSubstitutionTypesServiceTemplate.yaml | 394 +- .../out/Nested_cmauiServiceTemplate.yaml | 178 +- .../out/nested1ServiceTemplate.yaml | 188 +- .../GlobalSubstitutionTypesServiceTemplate.yaml | 3554 +++++++++--------- .../duplicateReqs/out/MainServiceTemplate.yaml | 1066 +++--- .../out/Nested_cdiServiceTemplate.yaml | 416 +-- .../out/Nested_cdi_1ServiceTemplate.yaml | 366 +- .../out/Nested_cifServiceTemplate.yaml | 626 ++-- .../out/Nested_cif_1ServiceTemplate.yaml | 616 ++-- .../out/Nested_lbdServiceTemplate.yaml | 520 +-- .../out/Nested_lbd_1ServiceTemplate.yaml | 528 +-- .../out/Nested_oamServiceTemplate.yaml | 402 +-- .../out/Nested_oam_1ServiceTemplate.yaml | 418 +-- .../out/Nested_oam_2ServiceTemplate.yaml | 412 +-- .../out/nested_cscfServiceTemplate.yaml | 2 +- .../out/nested_tdcoreServiceTemplate.yaml | 2 +- .../GlobalSubstitutionTypesServiceTemplate.yaml | 6 +- .../out/Nested_cmaui_2ServiceTemplate.yaml | 6 +- .../GlobalSubstitutionTypesServiceTemplate.yaml | 166 +- .../out/MainServiceTemplate.yaml | 22 +- .../out/Nested_computeServiceTemplate.yaml | 164 +- .../in/nested-pcm_v0.1.yaml | 8 +- .../GlobalSubstitutionTypesServiceTemplate.yaml | 446 +-- .../out/Nested_pcm_serverServiceTemplate.yaml | 162 +- .../out/nested-pcm_v0.1ServiceTemplate.yaml | 210 +- .../GlobalSubstitutionTypesServiceTemplate.yaml | 378 +- .../out/Nested_pcm_serverServiceTemplate.yaml | 224 +- .../out/Nested_pd_serverServiceTemplate.yaml | 172 +- .../out/nested-pcm_v0.1ServiceTemplate.yaml | 114 +- .../in/hot-mog-0108-bs1271.yml | 8 +- .../GlobalSubstitutionTypesServiceTemplate.yaml | 150 +- .../out/MainServiceTemplate.yaml | 20 +- .../out/Nested_pd_serverServiceTemplate.yaml | 164 +- .../in/hot-mog-0108-bs1271.yml | 10 +- .../GlobalSubstitutionTypesServiceTemplate.yaml | 156 +- .../out/MainServiceTemplate.yaml | 22 +- .../out/Nested_pd_serverServiceTemplate.yaml | 176 +- .../in/hot-mog-0108-bs1271.yml | 8 +- .../GlobalSubstitutionTypesServiceTemplate.yaml | 150 +- .../out/MainServiceTemplate.yaml | 20 +- .../out/Nested_pd_serverServiceTemplate.yaml | 164 +- .../in/hot-mog-0108-bs1271.yml | 12 +- .../GlobalSubstitutionTypesServiceTemplate.yaml | 144 +- .../out/MainServiceTemplate.yaml | 14 +- .../out/Nested_pd_serverServiceTemplate.yaml | 156 +- .../in/hot-mog-0108-bs1271.yml | 8 +- .../GlobalSubstitutionTypesServiceTemplate.yaml | 152 +- .../out/MainServiceTemplate.yaml | 28 +- .../out/Nested_pd_serverServiceTemplate.yaml | 166 +- .../in/hot-mog-0108-bs1271.yml | 8 +- .../GlobalSubstitutionTypesServiceTemplate.yaml | 150 +- .../out/MainServiceTemplate.yaml | 24 +- .../out/Nested_pd_serverServiceTemplate.yaml | 164 +- .../in/hot-mog-0108-bs1271.yml | 8 +- .../GlobalSubstitutionTypesServiceTemplate.yaml | 150 +- .../out/MainServiceTemplate.yaml | 22 +- .../out/Nested_pd_serverServiceTemplate.yaml | 164 +- .../in/hot-mog-0108-bs1271.yml | 10 +- .../GlobalSubstitutionTypesServiceTemplate.yaml | 152 +- .../out/MainServiceTemplate.yaml | 22 +- .../out/Nested_pd_serverServiceTemplate.yaml | 168 +- .../in/hot-mog-0108-bs1271.yml | 16 +- .../GlobalSubstitutionTypesServiceTemplate.yaml | 314 +- .../out/MainServiceTemplate.yaml | 40 +- .../out/Nested_pd_serverServiceTemplate.yaml | 164 +- .../out/Nested_ps_serverServiceTemplate.yaml | 158 +- .../in/hot-mog-0108-bs1271.yml | 16 +- .../GlobalSubstitutionTypesServiceTemplate.yaml | 314 +- .../out/MainServiceTemplate.yaml | 40 +- .../out/Nested_pd_serverServiceTemplate.yaml | 164 +- .../out/Nested_ps_serverServiceTemplate.yaml | 158 +- .../GlobalSubstitutionTypesServiceTemplate.yaml | 270 +- .../out/MainServiceTemplate.yaml | 38 +- .../out/Nested_pd_serverServiceTemplate.yaml | 306 +- .../GlobalSubstitutionTypesServiceTemplate.yaml | 288 +- .../out/MainServiceTemplate.yaml | 54 +- .../out/Nested_pd_serverServiceTemplate.yaml | 330 +- .../GlobalSubstitutionTypesServiceTemplate.yaml | 278 +- .../out/MainServiceTemplate.yaml | 42 +- .../out/Nested_pd_serverServiceTemplate.yaml | 316 +- .../GlobalSubstitutionTypesServiceTemplate.yaml | 26 +- .../out/MainServiceTemplate.yaml | 8 +- .../out/Nested_pd_serverServiceTemplate.yaml | 24 +- .../in/hot-mog-0108-bs1271.yml | 8 +- .../GlobalSubstitutionTypesServiceTemplate.yaml | 294 +- .../out/MainServiceTemplate.yaml | 40 +- .../out/Nested_pd_serverServiceTemplate.yaml | 308 +- .../GlobalSubstitutionTypesServiceTemplate.yaml | 272 +- .../out/MainServiceTemplate.yaml | 40 +- .../out/Nested_pd_serverServiceTemplate.yaml | 306 +- .../in/hot-mog-0108-bs1271.yml | 8 +- .../GlobalSubstitutionTypesServiceTemplate.yaml | 292 +- .../out/MainServiceTemplate.yaml | 34 +- .../out/Nested_pd_serverServiceTemplate.yaml | 304 +- .../in/hot-mog-0108-bs1271.yml | 8 +- .../GlobalSubstitutionTypesServiceTemplate.yaml | 278 +- .../out/MainServiceTemplate.yaml | 28 +- .../out/Nested_pd_serverServiceTemplate.yaml | 300 +- .../GlobalSubstitutionTypesServiceTemplate.yaml | 276 +- .../out/MainServiceTemplate.yaml | 42 +- .../out/Nested_pd_serverServiceTemplate.yaml | 322 +- .../GlobalSubstitutionTypesServiceTemplate.yaml | 462 +-- .../out/MainServiceTemplate.yaml | 162 +- .../out/Nested_pd_serverServiceTemplate.yaml | 642 ++-- .../GlobalSubstitutionTypesServiceTemplate.yaml | 272 +- .../out/MainServiceTemplate.yaml | 40 +- .../out/Nested_pd_serverServiceTemplate.yaml | 310 +- .../GlobalSubstitutionTypesServiceTemplate.yaml | 270 +- .../out/MainServiceTemplate.yaml | 40 +- .../out/Nested_pd_serverServiceTemplate.yaml | 306 +- .../in/hot-mog-0108-bs1271.yml | 8 +- .../GlobalSubstitutionTypesServiceTemplate.yaml | 292 +- .../out/MainServiceTemplate.yaml | 36 +- .../out/Nested_pd_serverServiceTemplate.yaml | 304 +- .../in/hot-mog-0108-bs1271.yml | 12 +- .../GlobalSubstitutionTypesServiceTemplate.yaml | 298 +- .../out/MainServiceTemplate.yaml | 40 +- .../out/Nested_pd_serverServiceTemplate.yaml | 312 +- .../in/hot-mog-0108-bs1271.yml | 12 +- .../GlobalSubstitutionTypesServiceTemplate.yaml | 300 +- .../out/MainServiceTemplate.yaml | 40 +- .../out/Nested_pd_serverServiceTemplate.yaml | 320 +- .../in/hot-mog-0108-bs1271.yml | 16 +- .../GlobalSubstitutionTypesServiceTemplate.yaml | 482 +-- .../out/MainServiceTemplate.yaml | 60 +- .../out/Nested_oam_serverServiceTemplate.yaml | 162 +- .../out/Nested_pd_serverServiceTemplate.yaml | 164 +- .../out/Nested_ps_serverServiceTemplate.yaml | 210 +- .../in/hot-mog-0108-bs1271.yml | 12 +- .../GlobalSubstitutionTypesServiceTemplate.yaml | 462 +-- .../out/MainServiceTemplate.yaml | 40 +- .../out/Nested_oam_serverServiceTemplate.yaml | 158 +- .../out/Nested_pd_serverServiceTemplate.yaml | 152 +- .../out/Nested_ps_serverServiceTemplate.yaml | 188 +- .../GlobalSubstitutionTypesServiceTemplate.yaml | 462 +-- .../out/MainServiceTemplate.yaml | 52 +- .../out/Nested_pd_serverServiceTemplate.yaml | 142 +- .../out/Nested_pd_server_1ServiceTemplate.yaml | 158 +- .../out/Nested_pd_server_2ServiceTemplate.yaml | 156 +- .../in/hot-mog-0108-bs1271.yml | 8 +- .../GlobalSubstitutionTypesServiceTemplate.yaml | 584 +-- .../out/MainServiceTemplate.yaml | 68 +- .../out/Nested_pd_serverServiceTemplate.yaml | 148 +- .../out/Nested_pd_server_1ServiceTemplate.yaml | 170 +- .../out/Nested_pd_server_2ServiceTemplate.yaml | 292 +- .../GlobalSubstitutionTypesServiceTemplate.yaml | 314 +- .../out/MainServiceTemplate.yaml | 48 +- .../out/Nested_pd_serverServiceTemplate.yaml | 170 +- .../out/Nested_ps_serverServiceTemplate.yaml | 182 +- .../GlobalSubstitutionTypesServiceTemplate.yaml | 314 +- .../twoSetsOfSingle/out/MainServiceTemplate.yaml | 44 +- .../out/Nested_pd_serverServiceTemplate.yaml | 170 +- .../out/Nested_ps_serverServiceTemplate.yaml | 182 +- .../GlobalSubstitutionTypesServiceTemplate.yaml | 202 +- .../out/MainServiceTemplate.yaml | 28 +- .../out/Nested_vdbeServiceTemplate.yaml | 246 +- .../GlobalSubstitutionTypesServiceTemplate.yaml | 352 +- .../out/MainServiceTemplate.yaml | 60 +- .../out/Nested_vdbeServiceTemplate.yaml | 192 +- .../out/Nested_vdbe_1ServiceTemplate.yaml | 198 +- .../GlobalSubstitutionTypesServiceTemplate.yaml | 378 +- .../out/MainServiceTemplate.yaml | 54 +- .../out/Nested_pd_serverServiceTemplate.yaml | 240 +- .../out/Nested_ps_serverServiceTemplate.yaml | 214 +- .../GlobalSubstitutionTypesServiceTemplate.yaml | 358 +- .../out/MainServiceTemplate.yaml | 46 +- .../out/Nested_pd_serverServiceTemplate.yaml | 148 +- .../out/Nested_pd_server_1ServiceTemplate.yaml | 242 +- .../GlobalSubstitutionTypesServiceTemplate.yaml | 378 +- .../out/MainServiceTemplate.yaml | 54 +- .../out/Nested_pd_serverServiceTemplate.yaml | 240 +- .../out/Nested_ps_serverServiceTemplate.yaml | 214 +- .../GlobalSubstitutionTypesServiceTemplate.yaml | 404 +-- .../out/MainServiceTemplate.yaml | 54 +- .../out/Nested_pd_serverServiceTemplate.yaml | 222 +- .../out/Nested_pd_server_1ServiceTemplate.yaml | 242 +- .../GlobalSubstitutionTypesServiceTemplate.yaml | 358 +- .../out/MainServiceTemplate.yaml | 46 +- .../out/Nested_pd_serverServiceTemplate.yaml | 148 +- .../out/Nested_pd_server_1ServiceTemplate.yaml | 242 +- .../pattern1c1/allConnectivities/in/main.yml | 10 +- .../GlobalSubstitutionTypesServiceTemplate.yaml | 342 +- .../allConnectivities/out/MainServiceTemplate.yaml | 70 +- .../out/Nested_vdbeServiceTemplate.yaml | 450 +-- .../multiplePortsMultipleVlans/in/main.yml | 24 +- .../GlobalSubstitutionTypesServiceTemplate.yaml | 352 +- .../out/MainServiceTemplate.yaml | 66 +- .../out/Nested_vdbeServiceTemplate.yaml | 618 ++-- .../pattern1c1/onePortVlanSameType/in/main.yml | 6 +- .../GlobalSubstitutionTypesServiceTemplate.yaml | 214 +- .../out/MainServiceTemplate.yaml | 24 +- .../out/Nested_vdbeServiceTemplate.yaml | 302 +- .../optionalPropertiesConsolidation/in/main.yml | 946 ++--- .../GlobalSubstitutionTypesServiceTemplate.yaml | 340 +- .../out/MainServiceTemplate.yaml | 68 +- .../out/Nested_vdbeServiceTemplate.yaml | 448 +-- .../regularNestedSubInterface/in/main.yml | 6 +- .../GlobalSubstitutionTypesServiceTemplate.yaml | 208 +- .../out/MainServiceTemplate.yaml | 24 +- .../out/Nested_vdbeServiceTemplate.yaml | 306 +- .../pattern1c2/differentNetwork/in/main.yml | 12 +- .../GlobalSubstitutionTypesServiceTemplate.yaml | 182 +- .../differentNetwork/out/MainServiceTemplate.yaml | 36 +- .../out/Nested_pd_serverServiceTemplate.yaml | 244 +- .../differentNodesConnectedOut/in/main.yml | 12 +- .../GlobalSubstitutionTypesServiceTemplate.yaml | 182 +- .../out/MainServiceTemplate.yaml | 38 +- .../out/Nested_pd_serverServiceTemplate.yaml | 244 +- .../differentResourceGroupCount/in/main.yml | 6 +- .../GlobalSubstitutionTypesServiceTemplate.yaml | 232 +- .../out/MainServiceTemplate.yaml | 54 +- .../out/Nested_vdbeServiceTemplate.yaml | 320 +- .../GlobalSubstitutionTypesServiceTemplate.yaml | 184 +- .../out/Nested_pd_server_1bServiceTemplate.yaml | 202 +- .../out/nested_pattern5ServiceTemplate.yaml | 60 +- .../nested_pattern5_levelTwoServiceTemplate.yaml | 2 +- .../in/nested_pattern5_levelTwo.yml | 6 +- .../GlobalSubstitutionTypesServiceTemplate.yaml | 642 ++-- .../out/Nested_pd_server_1bServiceTemplate.yaml | 202 +- .../out/Nested_ps_server_1bServiceTemplate.yaml | 248 +- .../out/nested_pattern5ServiceTemplate.yaml | 138 +- .../nested_pattern5_levelTwoServiceTemplate.yaml | 154 +- .../GlobalSubstitutionTypesServiceTemplate.yaml | 184 +- .../out/Nested_pd_server_1bServiceTemplate.yaml | 202 +- .../out/nested_pattern5ServiceTemplate.yaml | 58 +- .../nested_pattern5_levelTwoServiceTemplate.yaml | 2 +- .../in/main.yml | 18 +- .../in/nested_pattern5.yml | 10 +- .../GlobalSubstitutionTypesServiceTemplate.yaml | 808 ++--- .../out/MainServiceTemplate.yaml | 66 +- .../out/Nested_pd_server_1bServiceTemplate.yaml | 172 +- .../out/Nested_pd_server_1b_1ServiceTemplate.yaml | 250 +- .../out/Nested_ps_server_1bServiceTemplate.yaml | 200 +- .../out/nested_pattern5ServiceTemplate.yaml | 282 +- .../in/nested_pattern5.yml | 6 +- .../GlobalSubstitutionTypesServiceTemplate.yaml | 334 +- .../out/Nested_pd_server_1bServiceTemplate.yaml | 250 +- .../out/nested_pattern5ServiceTemplate.yaml | 150 +- .../in/nested_pattern5_levelTwo.yml | 4 +- .../GlobalSubstitutionTypesServiceTemplate.yaml | 800 ++--- .../out/Nested_pd_server_1bServiceTemplate.yaml | 202 +- .../out/Nested_ps_server_1bServiceTemplate.yaml | 248 +- .../out/Nested_ps_server_1b_1ServiceTemplate.yaml | 162 +- .../out/nested_pattern5ServiceTemplate.yaml | 138 +- .../nested_pattern5_levelTwoServiceTemplate.yaml | 166 +- .../in/nested_pattern5_levelTwo.yml | 6 +- .../GlobalSubstitutionTypesServiceTemplate.yaml | 638 ++-- .../out/Nested_pd_server_1bServiceTemplate.yaml | 202 +- .../out/Nested_ps_server_1bServiceTemplate.yaml | 248 +- .../out/nested_pattern5ServiceTemplate.yaml | 138 +- .../nested_pattern5_levelTwoServiceTemplate.yaml | 177 +- .../GlobalSubstitutionTypesServiceTemplate.yaml | 222 +- .../out/MainServiceTemplate.yaml | 34 +- .../out/Nested_vdbeServiceTemplate.yaml | 304 +- .../in/main.yml | 6 +- .../GlobalSubstitutionTypesServiceTemplate.yaml | 202 +- .../out/MainServiceTemplate.yaml | 62 +- .../out/Nested_vdbeServiceTemplate.yaml | 276 +- .../in/main.yml | 6 +- .../GlobalSubstitutionTypesServiceTemplate.yaml | 366 +- .../out/MainServiceTemplate.yaml | 62 +- .../out/Nested_vdbeServiceTemplate.yaml | 194 +- .../out/Nested_vdbe_1ServiceTemplate.yaml | 202 +- .../vdbeav/in/vdbeav_base_heat_template.yaml | 16 +- .../GlobalSubstitutionTypesServiceTemplate.yaml | 558 +-- .../vdbeav/out/MainServiceTemplate.yaml | 52 +- .../vdbeav/out/Nested_vdbeServiceTemplate.yaml | 400 +-- .../vdbeav/out/Nested_vdbe_1ServiceTemplate.yaml | 452 +-- .../in/MainServiceTemplate.yaml | 8 +- .../GlobalSubstitutionTypesServiceTemplate.yaml | 446 +-- .../out/SubstitutionServiceTemplate.yaml | 512 +-- .../WithIndex/in/MainServiceTemplate.yaml | 8 +- .../GlobalSubstitutionTypesServiceTemplate.yaml | 322 +- .../WithIndex/out/SubstitutionServiceTemplate.yaml | 344 +- .../consolidation/in/MainServiceTemplate.yaml | 30 +- .../GlobalSubstitutionTypesServiceTemplate.yaml | 293 +- .../out/SubstitutionServiceTemplate.yaml | 330 +- .../GlobalSubstitutionTypesServiceTemplate.yaml | 338 +- .../out/SubstitutionServiceTemplate.yaml | 344 +- .../consolidation/in/MainServiceTemplate.yaml | 36 +- .../GlobalSubstitutionTypesServiceTemplate.yaml | 291 +- .../out/SubstitutionServiceTemplate.yaml | 328 +- .../noConsolidation/in/MainServiceTemplate.yaml | 24 +- .../GlobalSubstitutionTypesServiceTemplate.yaml | 326 +- .../out/SubstitutionServiceTemplate.yaml | 368 +- .../in/MainServiceTemplate.yaml | 14 +- .../out/MainServiceTemplate.yaml | 30 +- .../in/MainServiceTemplate.yaml | 22 +- .../out/MainServiceTemplate.yaml | 42 +- .../out/MainServiceTemplate.yaml | 74 +- .../consolidation/in/MainServiceTemplate.yaml | 22 +- .../consolidation/out/MainServiceTemplate.yaml | 50 +- .../consolidation/in/MainServiceTemplate.yaml | 26 +- .../consolidation/out/MainServiceTemplate.yaml | 52 +- .../consolidation/in/MainServiceTemplate.yaml | 22 +- .../consolidation/out/MainServiceTemplate.yaml | 50 +- .../noConsolidation/in/MainServiceTemplate.yaml | 14 +- .../noConsolidation/out/MainServiceTemplate.yaml | 32 +- .../consolidation/in/MainServiceTemplate.yaml | 30 +- .../consolidation/out/MainServiceTemplate.yaml | 44 +- .../noConsolidation/in/MainServiceTemplate.yaml | 24 +- .../noConsolidation/out/MainServiceTemplate.yaml | 26 +- .../consolidation/out/MainServiceTemplate.yaml | 6 +- .../noConsolidation/out/MainServiceTemplate.yaml | 4 +- .../consolidation/in/MainServiceTemplate.yaml | 22 +- .../consolidation/out/MainServiceTemplate.yaml | 50 +- .../noConsolidation/in/MainServiceTemplate.yaml | 14 +- .../noConsolidation/out/MainServiceTemplate.yaml | 32 +- 470 files changed, 52140 insertions(+), 52153 deletions(-) (limited to 'openecomp-be') 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/EntityConsolidationData.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/datatypes/heattotosca/unifiedmodel/consolidation/EntityConsolidationData.java index 1c272770b3..814011d846 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/datatypes/heattotosca/unifiedmodel/consolidation/EntityConsolidationData.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/datatypes/heattotosca/unifiedmodel/consolidation/EntityConsolidationData.java @@ -31,7 +31,6 @@ import java.util.stream.Collectors; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.MapUtils; import org.onap.sdc.tosca.datatypes.model.RequirementAssignment; -import org.openecomp.sdc.translator.services.heattotosca.ConsolidationDataUtil; /** * The type Entity consolidation data. @@ -106,7 +105,7 @@ public class EntityConsolidationData { * @param requirementAssignment the requirement assignment */ public void addNodesConnectedIn(String nodeTemplateId, String requirementId, - RequirementAssignment requirementAssignment) { + RequirementAssignment requirementAssignment) { if (this.nodesConnectedIn == null) { this.nodesConnectedIn = ArrayListMultimap.create(); @@ -152,7 +151,7 @@ public class EntityConsolidationData { * @param requirementAssignment the requirement assignment */ public void addNodesConnectedOut(String nodeTemplateId, String requirementId, - RequirementAssignment requirementAssignment) { + RequirementAssignment requirementAssignment) { if (this.nodesConnectedOut == null) { this.nodesConnectedOut = ArrayListMultimap.create(); @@ -280,7 +279,7 @@ public class EntityConsolidationData { * otherwise return false */ public boolean isGetAttrOutFromEntityLegal(Collection - entityConsolidationDataList, Map> portTypeToIds) { + entityConsolidationDataList, Map> portTypeToIds) { if (CollectionUtils.isEmpty(entityConsolidationDataList) || MapUtils.isEmpty(portTypeToIds)) { return true; @@ -288,11 +287,11 @@ public class EntityConsolidationData { for (String portType : portTypeToIds.keySet()) { Set startingGetAttrFunc = - getEntityGetAttrFuncAsSet(portType); + getEntityGetAttrFuncAsSet(portType, portTypeToIds); for (EntityConsolidationData entity : entityConsolidationDataList) { Set currentGetAttrFuncData = - entity.getEntityGetAttrFuncAsSet(portType); + entity.getEntityGetAttrFuncAsSet(portType, portTypeToIds); if (!(startingGetAttrFunc.equals(currentGetAttrFuncData))) { return false; } @@ -301,15 +300,25 @@ public class EntityConsolidationData { return true; } - private Set getEntityGetAttrFuncAsSet(String portType) { + private Set getEntityGetAttrFuncAsSet(String portType, Map> portTypeToIds) { if (MapUtils.isEmpty(nodesGetAttrOut)) { return new HashSet<>(); } return nodesGetAttrOut.entrySet().stream() - .filter(entry -> portType.equals(ConsolidationDataUtil.getPortType(entry.getKey()))) - .flatMap(entry -> entry.getValue().stream()) - .collect(Collectors.toSet()); + .filter(entry -> portType.equals(getPortTypeFromNodeTemplateId(entry.getKey(), + portTypeToIds))) + .flatMap(entry -> entry.getValue().stream()) + .collect(Collectors.toSet()); + } + + private String getPortTypeFromNodeTemplateId(String portNodeTemplateId, Map> portTypeToIds) { + for (Map.Entry> portTypeToIdEntry : portTypeToIds.entrySet()) { + if (portTypeToIdEntry.getValue().contains(portNodeTemplateId)) { + return portTypeToIdEntry.getKey(); + } + } + return ""; } /** 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/FilePortConsolidationData.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/datatypes/heattotosca/unifiedmodel/consolidation/FilePortConsolidationData.java index 229e680bda..0300f9fcd9 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/datatypes/heattotosca/unifiedmodel/consolidation/FilePortConsolidationData.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/datatypes/heattotosca/unifiedmodel/consolidation/FilePortConsolidationData.java @@ -77,7 +77,7 @@ public class FilePortConsolidationData { PortTemplateConsolidationData consolidationData = addPortTemplateConsolidationData(parentPortNodeTemplateId, parentPortResourceId, - parentPortResourceType); + parentPortResourceType, null); return consolidationData.addSubInterfaceTemplateConsolidationData(resource, subInterfaceNodeTemplateId, parentPortNodeTemplateId); @@ -90,13 +90,16 @@ public class FilePortConsolidationData { * @return port template consolidation data entity by given keys */ PortTemplateConsolidationData addPortTemplateConsolidationData( - String portNodeTemplateId, String portResourceId, String portResourceType) { + String portNodeTemplateId, String portResourceId, String portResourceType, String portType) { PortTemplateConsolidationData consolidationData = getPortTemplateConsolidationData(portNodeTemplateId); if (consolidationData == null) { consolidationData = createPortTemplateConsolidationData(portNodeTemplateId, - portResourceId, portResourceType); + portResourceId, portResourceType, portType); setPortTemplateConsolidationData(portNodeTemplateId, consolidationData); } + if (consolidationData.getPortType() == null) { + consolidationData.setPortType(portType); + } return consolidationData; } @@ -116,9 +119,10 @@ public class FilePortConsolidationData { } private PortTemplateConsolidationData createPortTemplateConsolidationData(String portNodeTemplateId, - String portResourceId, String portResourceType) { + String portResourceId, String portResourceType, String portType) { PortTemplateConsolidationData consolidationData = new PortTemplateConsolidationData(); consolidationData.setNodeTemplateId(portNodeTemplateId); + consolidationData.setPortType(portType); Optional portNetworkRole = HeatResourceUtil.evaluateNetworkRoleFromResourceId(portResourceId, portResourceType); portNetworkRole.ifPresent(consolidationData::setNetworkRole); 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/PortConsolidationData.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/datatypes/heattotosca/unifiedmodel/consolidation/PortConsolidationData.java index 1c830646d6..132a507298 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/datatypes/heattotosca/unifiedmodel/consolidation/PortConsolidationData.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/datatypes/heattotosca/unifiedmodel/consolidation/PortConsolidationData.java @@ -50,10 +50,10 @@ public class PortConsolidationData { * @return port template consolidation data */ PortTemplateConsolidationData addPortTemplateConsolidationData(String serviceTemplateFileName, - String portNodeTemplateId, String portResourceId, String portResourceType) { + String portNodeTemplateId, String portResourceId, String portResourceType, String portType) { FilePortConsolidationData consolidationData = addFilePortConsolidationData(serviceTemplateFileName); return consolidationData - .addPortTemplateConsolidationData(portNodeTemplateId, portResourceId, portResourceType); + .addPortTemplateConsolidationData(portNodeTemplateId, portResourceId, portResourceType, portType); } /** 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/PortConsolidationDataHandler.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/datatypes/heattotosca/unifiedmodel/consolidation/PortConsolidationDataHandler.java index c28c54c861..5114e5d25d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/datatypes/heattotosca/unifiedmodel/consolidation/PortConsolidationDataHandler.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/datatypes/heattotosca/unifiedmodel/consolidation/PortConsolidationDataHandler.java @@ -66,7 +66,7 @@ public class PortConsolidationDataHandler implements ConsolidationDataHandler { Resource resource = heatOrchestrationTemplate.getResources().get(contrailSharedResourceId); String serviceTemplateFileName = ToscaUtil.getServiceTemplateFileName(serviceTemplate); EntityConsolidationData entityConsolidationData = getPortTemplateConsolidationData(serviceTemplateFileName, - contrailSharedResourceId, resource.getType(), sharedTranslatedResourceId); + contrailSharedResourceId, resource.getType(), sharedTranslatedResourceId, null); entityConsolidationData.removeParamNameFromAttrFuncList(paramName); } @@ -76,9 +76,9 @@ public class PortConsolidationDataHandler implements ConsolidationDataHandler { * */ public void addConsolidationData(String serviceTemplateFileName, - String portResourceId, String portResourceType, String portNodeTemplateId) { + String portResourceId, String portResourceType, String portNodeTemplateId, String portType) { getPortTemplateConsolidationData( - serviceTemplateFileName, portResourceId, portResourceType, portNodeTemplateId); + serviceTemplateFileName, portResourceId, portResourceType, portNodeTemplateId, portType); } @Override @@ -133,7 +133,7 @@ public class PortConsolidationDataHandler implements ConsolidationDataHandler { Resource resource = heatOrchestrationTemplate.getResources().get(targetResourceId); ServiceTemplate serviceTemplate = functionTranslator.getServiceTemplate(); return getPortTemplateConsolidationData(ToscaUtil.getServiceTemplateFileName(serviceTemplate), - targetResourceId, resource.getType(), targetResourceTranslatedId); + targetResourceId, resource.getType(), targetResourceTranslatedId, null); } private PortTemplateConsolidationData getPortTemplateConsolidationData(TranslateTo translateTo, @@ -141,14 +141,14 @@ public class PortConsolidationDataHandler implements ConsolidationDataHandler { ServiceTemplate serviceTemplate = translateTo.getServiceTemplate(); String serviceTemplateFileName = ToscaUtil.getServiceTemplateFileName(serviceTemplate); return getPortTemplateConsolidationData(serviceTemplateFileName, - portResourceId, portResourceType, portNodeTemplateId); + portResourceId, portResourceType, portNodeTemplateId, null); } private PortTemplateConsolidationData getPortTemplateConsolidationData(String serviceTemplateFileName, - String portResourceId, String portResourceType, String portNodeTemplateId) { + String portResourceId, String portResourceType, String portNodeTemplateId, String portType) { return portConsolidationData.addPortTemplateConsolidationData(serviceTemplateFileName, - portNodeTemplateId, portResourceId, portResourceType); + portNodeTemplateId, portResourceId, portResourceType, portType); } } 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 f612c35abe..b529c7a55e 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 @@ -36,6 +36,8 @@ public class PortTemplateConsolidationData extends EntityConsolidationData { private final ListMultimap subInterfaceConsolidationData = Multimaps.synchronizedListMultimap(ArrayListMultimap.create()); + private String portType; + private String networkRole; public String getNetworkRole() { @@ -46,6 +48,14 @@ public class PortTemplateConsolidationData extends EntityConsolidationData { this.networkRole = networkRole; } + public String getPortType() { + return portType; + } + + public void setPortType(String portType) { + this.portType = portType; + } + public boolean isPortBoundToSubInterface() { return !subInterfaceConsolidationData.isEmpty(); } diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/ConsolidationDataUtil.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/ConsolidationDataUtil.java index e7c32e195b..0fb2eb8606 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/ConsolidationDataUtil.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/ConsolidationDataUtil.java @@ -29,6 +29,7 @@ import org.openecomp.sdc.datatypes.configuration.ImplementationConfiguration; import org.openecomp.sdc.heat.datatypes.model.HeatOrchestrationTemplate; import org.openecomp.sdc.heat.datatypes.model.HeatResourcesTypes; import org.openecomp.sdc.heat.datatypes.model.Resource; +import org.openecomp.sdc.tosca.services.DataModelUtil; import org.openecomp.sdc.tosca.services.ToscaUtil; import org.openecomp.sdc.translator.datatypes.heattotosca.TranslationContext; import org.openecomp.sdc.translator.datatypes.heattotosca.to.TranslateTo; @@ -92,7 +93,7 @@ import static org.openecomp.sdc.translator.services.heattotosca.ConfigConstants. String portNodeTemplateId) { TranslationContext translationContext = translateTo.getContext(); String computeNodeTemplateId = translateTo.getTranslatedId(); - String portType = getPortType(portNodeTemplateId); + String portType = getPortType(portNodeTemplateId, DataModelUtil.getNamespaceSuffix(computeNodeType)); translationContext.getComputeConsolidationDataHandler().addPortToConsolidationData( translateTo, computeNodeType, computeNodeTemplateId, portType, portNodeTemplateId); @@ -100,7 +101,7 @@ import static org.openecomp.sdc.translator.services.heattotosca.ConfigConstants. ServiceTemplate serviceTemplate = translateTo.getServiceTemplate(); String serviceTemplateFileName = ToscaUtil.getServiceTemplateFileName(serviceTemplate); translationContext.getPortConsolidationDataHandler().addConsolidationData( - serviceTemplateFileName, portResourceId, portResourceType, portNodeTemplateId); + serviceTemplateFileName, portResourceId, portResourceType, portNodeTemplateId, portType); } /** @@ -243,24 +244,30 @@ import static org.openecomp.sdc.translator.services.heattotosca.ConfigConstants. * @param portNodeTemplateId the port node template id * @return the port type */ - public static String getPortType(String portNodeTemplateId) { + public static String getPortType(String portNodeTemplateId, String vmType) { - if (StringUtils.isBlank(portNodeTemplateId)) { + if (StringUtils.isBlank(portNodeTemplateId) || !portNodeTemplateId.startsWith(vmType + UNDERSCORE)) { return portNodeTemplateId; } + String temp = portNodeTemplateId.substring(portNodeTemplateId.indexOf(vmType) + vmType.length()); - String formattedName = portNodeTemplateId.replaceAll(UNDERSCORE + DIGIT_REGEX + "$", ""); + StringBuilder sb = new StringBuilder(vmType + UNDERSCORE); + String[] tokens = temp.split(UNDERSCORE); - StringBuilder sb = new StringBuilder(); - int count = 0; - for (String token : formattedName.split(UNDERSCORE)) { + if (tokens.length == 0) { + return portNodeTemplateId; + } - if (StringUtils.isNotBlank(token)) { - count++; + for (int i=0; i portNodeTemplateIds = filePortConsolidationData.getAllPortNodeTemplateIds(); for (String portNodeTemplateId : portNodeTemplateIds) { consolidationEntityIdToType - .put(portNodeTemplateId, ConsolidationDataUtil.getPortType(portNodeTemplateId)); + .put(portNodeTemplateId, + filePortConsolidationData.getPortTemplateConsolidationData(portNodeTemplateId).getPortType()); } } 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 7eec4e0c72..81a5a199c2 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 @@ -31,6 +31,7 @@ import static org.openecomp.sdc.translator.services.heattotosca.Constants.PORT_I import static org.openecomp.sdc.translator.services.heattotosca.Constants.SUB_INTERFACE_PROPERTY_VALUE_PREFIX; import static org.openecomp.sdc.translator.services.heattotosca.Constants.SUB_INTERFACE_ROLE; import static org.openecomp.sdc.translator.services.heattotosca.Constants.VFC_PARENT_PORT_ROLE; +import static org.openecomp.sdc.translator.services.heattotosca.UnifiedCompositionUtil.getPortTemplateConsolidationDataForPort; import static org.openecomp.sdc.translator.services.heattotosca.UnifiedCompositionUtil.getComputeTypeSuffix; import static org.openecomp.sdc.translator.services.heattotosca.UnifiedCompositionUtil.getConnectedComputeConsolidationData; import static org.openecomp.sdc.translator.services.heattotosca.UnifiedCompositionUtil.getNewComputeNodeTemplateId; @@ -2197,7 +2198,8 @@ public class UnifiedCompositionService { } else { Optional parameterId = updateProperty(unifiedCompositionTo.getServiceTemplate(), nodeTemplateId, unifiedCompositionTo.getNodeTemplate(), propertyEntry, - unifiedCompositionEntity, computeTemplateConsolidationData, null, + unifiedCompositionEntity, computeTemplateConsolidationData, + getPortTemplateConsolidationDataForPort(unifiedCompositionTo.getUnifiedCompositionDataList(), nodeTemplateId), unifiedCompositionTo.getUnifiedCompositionDataList(), unifiedCompositionTo.getContext()); parameterId.ifPresent( @@ -2298,7 +2300,8 @@ public class UnifiedCompositionService { String inputParamId = getParameterId(nodeTemplateId, nodeTemplate, enrichPropertyName, - compositionEntity, computeTemplateConsolidationData, null); + compositionEntity, computeTemplateConsolidationData, + (PortTemplateConsolidationData) entityConsolidationData); Map propertyValMap = new HashMap<>(); context @@ -2477,7 +2480,13 @@ public class UnifiedCompositionService { nodeTemplate.getProperties().put(propertyId, propertyVal); break; case PORT: - String portType = ConsolidationDataUtil.getPortType(nodeTemplateId); + PortTemplateConsolidationData portTemplateConsolidationData = + getPortTemplateConsolidationDataForPort(unifiedCompositionDataList, + nodeTemplateId); + String portType = null; + if (Objects.nonNull(portTemplateConsolidationData)) { + portType = portTemplateConsolidationData.getPortType(); + } ComputeTemplateConsolidationData computeTemplateConsolidationData = getConnectedComputeConsolidationData(unifiedCompositionDataList, nodeTemplateId); inputParamId = getInputParamIdForPort(nodeTemplateId, propertyId, portType, computeTemplateConsolidationData); @@ -2690,9 +2699,10 @@ public class UnifiedCompositionService { + getComputeTypeSuffix(nodeTemplate.getType()) + "_" + propertyId; break; case PORT: - String portType = ConsolidationDataUtil.getPortType(nodeTemplateId); + String portType = portTemplateConsolidationData.getPortType(); if (Objects.isNull(computeTemplateConsolidationData) - || computeTemplateConsolidationData.getPorts().get(portType).size() > 1) { + || (computeTemplateConsolidationData.getPorts().get(portType) != null + && computeTemplateConsolidationData.getPorts().get(portType).size() > 1)) { paramterId = UnifiedCompositionEntity.PORT.getDisplayName().toLowerCase() + "_" + nodeTemplateId + "_" + propertyId; } else { @@ -2882,7 +2892,7 @@ public class UnifiedCompositionService { String portNodeTemplateId = portTemplateConsolidationData.getNodeTemplateId(); Object propertyValue = getPortPropertyValue(substitutionTemplateInputName, computeType, portInputType, serviceTemplate, - portNodeTemplateId); + portNodeTemplateId, portTemplateConsolidationData); //If the value object is Optional.empty it implies that the property name was not // found in the input name if (!(propertyValue instanceof Optional)) { @@ -2995,7 +3005,7 @@ public class UnifiedCompositionService { .stream() .filter(s -> substitutionTemplateInputName. contains(getPropertyInputPrefix(s.getNodeTemplateId(), - ConsolidationDataUtil.getPortType(s.getNodeTemplateId()), + s.getPortType(), portInputType, UnifiedCompositionEntity.PORT))) .findFirst(); @@ -3487,9 +3497,10 @@ public class UnifiedCompositionService { String computeType, PropertyInputType portInputType, ServiceTemplate serviceTemplate, - String portNodeTemplateId) { + String portNodeTemplateId, + PortTemplateConsolidationData portTemplateConsolidationData) { //Get the input prefix to extract the property name from the input name - String portType = ConsolidationDataUtil.getPortType(portNodeTemplateId); + String portType = portTemplateConsolidationData.getPortType(); String portInputPrefix = getPropertyInputPrefix( portNodeTemplateId, portType, portInputType, UnifiedCompositionEntity.PORT); //Get the property name from the input diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/UnifiedCompositionUtil.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/UnifiedCompositionUtil.java index bc9fc5a331..82fb4b0c8e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/UnifiedCompositionUtil.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/UnifiedCompositionUtil.java @@ -16,6 +16,9 @@ package org.openecomp.sdc.translator.services.heattotosca; +import com.google.common.collect.ArrayListMultimap; +import com.google.common.collect.ListMultimap; + import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -25,10 +28,10 @@ import java.util.Map; import java.util.Objects; import java.util.Optional; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.MapUtils; import org.onap.sdc.tosca.datatypes.model.NodeTemplate; import org.onap.sdc.tosca.datatypes.model.ServiceTemplate; -//import org.openecomp.core.model.types.ServiceTemplate; import org.openecomp.sdc.tosca.services.DataModelUtil; import org.openecomp.sdc.translator.datatypes.heattotosca.TranslationContext; import org.openecomp.sdc.translator.datatypes.heattotosca.unifiedmodel.composition.UnifiedCompositionData; @@ -36,9 +39,6 @@ import org.openecomp.sdc.translator.datatypes.heattotosca.unifiedmodel.consolida import org.openecomp.sdc.translator.datatypes.heattotosca.unifiedmodel.consolidation.PortTemplateConsolidationData; import org.openecomp.sdc.translator.datatypes.heattotosca.unifiedmodel.consolidation.SubInterfaceTemplateConsolidationData; -import com.google.common.collect.ArrayListMultimap; -import com.google.common.collect.ListMultimap; - /** * Utility class for consolidation data collection helper methods. */ @@ -123,6 +123,24 @@ public class UnifiedCompositionUtil { return null; } + public static PortTemplateConsolidationData getPortTemplateConsolidationDataForPort(List + unifiedCompositionDataList, + String portNodeTemplateId) { + for (UnifiedCompositionData unifiedCompositionData : unifiedCompositionDataList) { + if (CollectionUtils.isEmpty(unifiedCompositionData.getPortTemplateConsolidationDataList())) { + continue; + } + List portTemplateConsolidationDataList = + unifiedCompositionData.getPortTemplateConsolidationDataList(); + for (PortTemplateConsolidationData portTemplateConsolidationData : portTemplateConsolidationDataList) { + if (portTemplateConsolidationData.getNodeTemplateId().equals(portNodeTemplateId)) { + return portTemplateConsolidationData; + } + } + } + return null; + } + //The ID should be _ or _ public static String getNewPortNodeTemplateId( String portNodeTemplateId, @@ -130,9 +148,11 @@ public class UnifiedCompositionUtil { ComputeTemplateConsolidationData computeTemplateConsolidationData) { StringBuilder newPortNodeTemplateId = new StringBuilder(); - String portType = ConsolidationDataUtil.getPortType(portNodeTemplateId); + String portType = ConsolidationDataUtil.getPortType(portNodeTemplateId, + DataModelUtil.getNamespaceSuffix(connectedComputeNodeType)); newPortNodeTemplateId.append(DataModelUtil.getNamespaceSuffix(connectedComputeNodeType)); - if (computeTemplateConsolidationData.getPorts().get(portType).size() > 1) { + if (computeTemplateConsolidationData.getPorts().get(portType) != null + && computeTemplateConsolidationData.getPorts().get(portType).size() > 1) { //single port newPortNodeTemplateId.append("_").append(portNodeTemplateId); } else { diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/TestUtils.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/TestUtils.java index 0d981f320a..0ca5e64377 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/TestUtils.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/TestUtils.java @@ -270,6 +270,7 @@ public class TestUtils { public static void updateMultiplePortConsolidationDatas(String serviceTemplateName, List portNodeTemplateIds, + List portTypes, List> nodesConnectedInIds, List> nodesConnectedOutIds, List> groupIds, @@ -277,7 +278,7 @@ public class TestUtils { List>> getAttrOutFuncDataList, ConsolidationData consolidationData) { for (int i = 0; i < portNodeTemplateIds.size(); i++) { - updatePortConsolidationData(serviceTemplateName, portNodeTemplateIds.get(i), + updatePortConsolidationData(serviceTemplateName, portNodeTemplateIds.get(i), portTypes.get(i), nodesConnectedInIds.get(i), nodesConnectedOutIds.get(i), groupIds.get(i), getAttrInIds.get(i), getAttrOutFuncDataList.get(i), consolidationData); } @@ -310,6 +311,7 @@ public class TestUtils { public static void updatePortConsolidationData(String serviceTemplateFileName, String portNodeTemplateId, + String portType, List nodesConnectedInIds, List nodesConnectedOutIds, List groupIds, List getAttrInIds, @@ -317,7 +319,7 @@ public class TestUtils { ConsolidationData consolidationData) { PortTemplateConsolidationData portTemplateConsolidationData = - createPortTemplateConsolidationData(portNodeTemplateId); + createPortTemplateConsolidationData(portNodeTemplateId, portType); updateRelationsForEntityConsolidationData(nodesConnectedInIds, nodesConnectedOutIds, groupIds, getAttrInIds, getAttrOutFuncDataList, @@ -328,11 +330,12 @@ public class TestUtils { .setPortTemplateConsolidationData(portNodeTemplateId, portTemplateConsolidationData); } - public static PortTemplateConsolidationData createPortTemplateConsolidationData( - String portNodeTemplateId) { + public static PortTemplateConsolidationData createPortTemplateConsolidationData(String portNodeTemplateId, + String portType) { PortTemplateConsolidationData portTemplateConsolidationData = new PortTemplateConsolidationData(); portTemplateConsolidationData.setNodeTemplateId(portNodeTemplateId); + portTemplateConsolidationData.setPortType(portType); return portTemplateConsolidationData; } diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/datatypes/heattotosca/unifiedmodel/consolidation/FilePortConsolidationDataTest.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/datatypes/heattotosca/unifiedmodel/consolidation/FilePortConsolidationDataTest.java index 8dd0307a43..60beaa02c3 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/datatypes/heattotosca/unifiedmodel/consolidation/FilePortConsolidationDataTest.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/datatypes/heattotosca/unifiedmodel/consolidation/FilePortConsolidationDataTest.java @@ -31,13 +31,14 @@ public class FilePortConsolidationDataTest { private static final String PORT_RESOURCE_ID_1 = "pcm_port_01"; private static final String PORT_RESOURCE_ID_2 = "pcm_port_02"; private static final String PORT_RESOURCE_TYPE = HeatResourcesTypes.NEUTRON_PORT_RESOURCE_TYPE.getHeatResource(); + private static final String PORT_TYPE = "pcm_port"; private final FilePortConsolidationData consolidationData = new FilePortConsolidationData(); @Test public void testAddPortConsolidationData() { consolidationData.addPortTemplateConsolidationData(PORT_NODE_TEMPLATE_ID_1, PORT_RESOURCE_ID_1, - PORT_RESOURCE_TYPE); + PORT_RESOURCE_TYPE, PORT_TYPE); Set expectedComputeNodeTypes = new HashSet<>(); expectedComputeNodeTypes.add(PORT_NODE_TEMPLATE_ID_1); checkComputeConsolidationData(consolidationData, PORT_NODE_TEMPLATE_ID_1, expectedComputeNodeTypes); @@ -46,12 +47,12 @@ public class FilePortConsolidationDataTest { @Test public void testAddSameConsolidationDataTwice_noNewCreated() { consolidationData.addPortTemplateConsolidationData(PORT_NODE_TEMPLATE_ID_1, PORT_RESOURCE_ID_1, - PORT_RESOURCE_TYPE); + PORT_RESOURCE_TYPE, PORT_TYPE); PortTemplateConsolidationData firstPortTemplateConsolidationData = consolidationData.getPortTemplateConsolidationData(PORT_NODE_TEMPLATE_ID_1); consolidationData.addPortTemplateConsolidationData(PORT_NODE_TEMPLATE_ID_1, PORT_RESOURCE_ID_1, - PORT_RESOURCE_TYPE); + PORT_RESOURCE_TYPE, PORT_TYPE); PortTemplateConsolidationData secondPortTemplateConsolidationData = consolidationData.getPortTemplateConsolidationData(PORT_NODE_TEMPLATE_ID_1); Assert.assertEquals(firstPortTemplateConsolidationData, secondPortTemplateConsolidationData); @@ -60,13 +61,13 @@ public class FilePortConsolidationDataTest { @Test public void testAddDiffConsolidationData_diffNodeTemplateIds() { consolidationData.addPortTemplateConsolidationData(PORT_NODE_TEMPLATE_ID_1, PORT_RESOURCE_ID_1, - PORT_RESOURCE_TYPE); + PORT_RESOURCE_TYPE, PORT_TYPE); Set expectedComputeNodeTypes = new HashSet<>(); expectedComputeNodeTypes.add(PORT_NODE_TEMPLATE_ID_1); checkComputeConsolidationData(consolidationData, PORT_NODE_TEMPLATE_ID_1, expectedComputeNodeTypes); consolidationData.addPortTemplateConsolidationData(PORT_NODE_TEMPLATE_ID_2, PORT_RESOURCE_ID_2, - PORT_RESOURCE_TYPE); + PORT_RESOURCE_TYPE, PORT_TYPE); expectedComputeNodeTypes.add(PORT_NODE_TEMPLATE_ID_2); checkComputeConsolidationData(consolidationData, PORT_NODE_TEMPLATE_ID_2, expectedComputeNodeTypes); } @@ -74,13 +75,13 @@ public class FilePortConsolidationDataTest { @Test public void testAddDiffConsolidationData_diffResourceIds() { consolidationData.addPortTemplateConsolidationData(PORT_NODE_TEMPLATE_ID_1, PORT_RESOURCE_ID_1, - PORT_RESOURCE_TYPE); + PORT_RESOURCE_TYPE, PORT_TYPE); Set expectedComputeNodeTypes = new HashSet<>(); expectedComputeNodeTypes.add(PORT_NODE_TEMPLATE_ID_1); checkComputeConsolidationData(consolidationData, PORT_NODE_TEMPLATE_ID_1, expectedComputeNodeTypes); consolidationData.addPortTemplateConsolidationData(PORT_NODE_TEMPLATE_ID_1, PORT_RESOURCE_ID_2, - PORT_RESOURCE_TYPE); + PORT_RESOURCE_TYPE, PORT_TYPE); checkComputeConsolidationData(consolidationData, PORT_NODE_TEMPLATE_ID_1, expectedComputeNodeTypes); } diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/datatypes/heattotosca/unifiedmodel/consolidation/PortConsolidationDataTest.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/datatypes/heattotosca/unifiedmodel/consolidation/PortConsolidationDataTest.java index 05382e12ce..f42144d628 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/datatypes/heattotosca/unifiedmodel/consolidation/PortConsolidationDataTest.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/datatypes/heattotosca/unifiedmodel/consolidation/PortConsolidationDataTest.java @@ -58,14 +58,14 @@ public class PortConsolidationDataTest { @Test public void testAddConsolidationData_noNewCreated() { String serviceTemplateName = ServiceTemplateFileNameEnum.SERVICE_TEMPLATE_FILE_NAME_1.name(); - consolidationData.addPortTemplateConsolidationData(serviceTemplateName, PORT_NODE_TYPE_1, + consolidationData.addPortTemplateConsolidationData(serviceTemplateName, PORT_NODE_TYPE_1, PORT_NODE_TYPE_1, PORT_RESOURCE_ID, PORT_RESOURCE_TYPE); consolidationData.getFilePortConsolidationData(serviceTemplateName); Set expectedServiceTemplateNames = new HashSet<>(); expectedServiceTemplateNames.add(serviceTemplateName); checkPortConsolidationData(consolidationData, serviceTemplateName, expectedServiceTemplateNames); - consolidationData.addPortTemplateConsolidationData(serviceTemplateName, PORT_NODE_TYPE_1, + consolidationData.addPortTemplateConsolidationData(serviceTemplateName, PORT_NODE_TYPE_1, PORT_NODE_TYPE_1, PORT_RESOURCE_ID, PORT_RESOURCE_TYPE); consolidationData.getFilePortConsolidationData(serviceTemplateName); checkPortConsolidationData(consolidationData, serviceTemplateName, expectedServiceTemplateNames); @@ -74,12 +74,12 @@ public class PortConsolidationDataTest { @Test public void testAddConsolidationData_DiffNodeTypes() { String serviceTemplateName = ServiceTemplateFileNameEnum.SERVICE_TEMPLATE_FILE_NAME_1.name(); - consolidationData.addPortTemplateConsolidationData(serviceTemplateName, PORT_NODE_TYPE_1, + consolidationData.addPortTemplateConsolidationData(serviceTemplateName, PORT_NODE_TYPE_1, PORT_NODE_TYPE_1, PORT_RESOURCE_ID, PORT_RESOURCE_TYPE); Set expectedServiceTemplateNames = new HashSet<>(); expectedServiceTemplateNames.add(serviceTemplateName); checkPortConsolidationData(consolidationData, serviceTemplateName, expectedServiceTemplateNames); - consolidationData.addPortTemplateConsolidationData(serviceTemplateName, PORT_NODE_TYPE_2, + consolidationData.addPortTemplateConsolidationData(serviceTemplateName, PORT_NODE_TYPE_2, PORT_NODE_TYPE_2, PORT_RESOURCE_ID, PORT_RESOURCE_TYPE); checkPortConsolidationData(consolidationData, serviceTemplateName, expectedServiceTemplateNames); } @@ -88,14 +88,14 @@ public class PortConsolidationDataTest { public void testAddConsolidationData_DiffServiceTemplate() { String serviceTemplateName1 = ServiceTemplateFileNameEnum.SERVICE_TEMPLATE_FILE_NAME_1.name(); consolidationData.addPortTemplateConsolidationData( - serviceTemplateName1, PORT_NODE_TYPE_1, PORT_RESOURCE_ID, PORT_RESOURCE_TYPE); + serviceTemplateName1, PORT_NODE_TYPE_1, PORT_RESOURCE_ID, PORT_RESOURCE_TYPE, PORT_NODE_TYPE_1); Set expectedServiceTemplateNames = new HashSet<>(); expectedServiceTemplateNames.add(serviceTemplateName1); checkPortConsolidationData(consolidationData, serviceTemplateName1, expectedServiceTemplateNames); String serviceTemplateName2 = ServiceTemplateFileNameEnum.SERVICE_TEMPLATE_FILE_NAME_2.name(); consolidationData.addPortTemplateConsolidationData( - serviceTemplateName2, PORT_NODE_TYPE_2, PORT_RESOURCE_ID, PORT_RESOURCE_TYPE); + serviceTemplateName2, PORT_NODE_TYPE_2, PORT_RESOURCE_ID, PORT_RESOURCE_TYPE, PORT_NODE_TYPE_2); expectedServiceTemplateNames.add(serviceTemplateName2); checkPortConsolidationData(consolidationData, serviceTemplateName2, expectedServiceTemplateNames); } @@ -160,10 +160,10 @@ public class PortConsolidationDataTest { setFilePortConsolidationDataMock(serviceTemplateFileName); consolidationData.addPortTemplateConsolidationData( - serviceTemplateFileName, portNodeType, PORT_RESOURCE_ID, PORT_RESOURCE_TYPE); + serviceTemplateFileName, portNodeType, PORT_RESOURCE_ID, PORT_RESOURCE_TYPE, portNodeType); Mockito.verify(filePortConsolidationDataMock) - .addPortTemplateConsolidationData(portNodeType, PORT_RESOURCE_ID, PORT_RESOURCE_TYPE); + .addPortTemplateConsolidationData(portNodeType, PORT_RESOURCE_ID, PORT_RESOURCE_TYPE, portNodeType); } private void addAndCheckSubInterfaceTemplateConsolidationData(String serviceTemplateFileName, diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/ConsolidationDataUtilTest.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/ConsolidationDataUtilTest.java index 6b637d2992..ff00b39d7b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/ConsolidationDataUtilTest.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/ConsolidationDataUtilTest.java @@ -12,68 +12,70 @@ public class ConsolidationDataUtilTest { private static final String PORT_TYPE_FORMAT_5 = "network_port_22"; private static final String PORT_TYPE_FORMAT_6 = "network_port22"; private static final String PORT_TYPE_FORMAT_7 = "a_network_11_port22"; - private static final String PORT_TYPE_OUTPUT_1 = "a_network_port"; + private static final String PORT_TYPE_OUTPUT_1 = "a_network_port_22"; private static final String PORT_TYPE_OUTPUT_2 = "a_network_port22"; - private static final String PORT_TYPE_OUTPUT_3 = "network_port"; + private static final String PORT_TYPE_OUTPUT_3 = "network_port_22"; private static final String PORT_TYPE_OUTPUT_4 = "network_port22"; private static final String PORT_TYPE_OUTPUT_5 = "a_network_11_port22"; + private static final String VM_TYPE = "a"; + @Test - public void testGetPortType_Empty() throws Exception { + public void testGetPortType_Empty() { String port = ""; - assertEquals(ConsolidationDataUtil.getPortType(port), port); + assertEquals(ConsolidationDataUtil.getPortType(port, VM_TYPE), port); } @Test - public void testGetPortType_Spaces() throws Exception { + public void testGetPortType_Spaces() { String port = " "; - assertEquals(ConsolidationDataUtil.getPortType(port), port); + assertEquals(ConsolidationDataUtil.getPortType(port, VM_TYPE), port); } @Test - public void testGetPortType_Null() throws Exception { + public void testGetPortType_Null() { String port = null; - assertEquals(ConsolidationDataUtil.getPortType(port), port); + assertEquals(ConsolidationDataUtil.getPortType(port, VM_TYPE), port); } @Test - public void testGetPortType_OnlyPortType() throws Exception { + public void testGetPortType_OnlyPortType() { String port = "network"; - assertEquals(ConsolidationDataUtil.getPortType(port), port); + assertEquals(ConsolidationDataUtil.getPortType(port, VM_TYPE), port); } @Test - public void testGetPortType_WithServerAndPortIndex() throws Exception { - assertEquals(ConsolidationDataUtil.getPortType(PORT_TYPE_FORMAT_1), PORT_TYPE_OUTPUT_1); + public void testGetPortType_WithServerAndPortIndex() { + assertEquals(PORT_TYPE_OUTPUT_1, ConsolidationDataUtil.getPortType(PORT_TYPE_FORMAT_1, VM_TYPE)); } @Test - public void testGetPortType_Input_WithServerAndPortIndexWithoutUnderscore() throws Exception { - assertEquals(ConsolidationDataUtil.getPortType(PORT_TYPE_FORMAT_2), PORT_TYPE_OUTPUT_2); + public void testGetPortType_Input_WithServerAndPortIndexWithoutUnderscore() { + assertEquals(PORT_TYPE_OUTPUT_2, ConsolidationDataUtil.getPortType(PORT_TYPE_FORMAT_2, VM_TYPE)); } @Test - public void testGetPortType_Input_WithoutServerIndexAndWithPortIndex() throws Exception { - assertEquals(ConsolidationDataUtil.getPortType(PORT_TYPE_FORMAT_3), PORT_TYPE_OUTPUT_1); + public void testGetPortType_Input_WithoutServerIndexAndWithPortIndex() { + assertEquals(PORT_TYPE_OUTPUT_1, ConsolidationDataUtil.getPortType(PORT_TYPE_FORMAT_3, VM_TYPE)); } @Test - public void testGetPortType_Input_WithoutServerIndexAndWithPortIndexWithoutUnderscore() throws Exception { - assertEquals(ConsolidationDataUtil.getPortType(PORT_TYPE_FORMAT_4), PORT_TYPE_OUTPUT_2); + public void testGetPortType_Input_WithoutServerIndexAndWithPortIndexWithoutUnderscore() { + assertEquals(PORT_TYPE_OUTPUT_2, ConsolidationDataUtil.getPortType(PORT_TYPE_FORMAT_4, VM_TYPE)); } @Test - public void testGetPortType_Input_PortTypeWithIndex() throws Exception { - assertEquals(ConsolidationDataUtil.getPortType(PORT_TYPE_FORMAT_5), PORT_TYPE_OUTPUT_3); + public void testGetPortType_Input_PortTypeWithIndex() { + assertEquals(PORT_TYPE_OUTPUT_3, ConsolidationDataUtil.getPortType(PORT_TYPE_FORMAT_5, VM_TYPE)); } @Test - public void testGetPortType_Input_PortIndexWithoutUnderscore() throws Exception { - assertEquals(ConsolidationDataUtil.getPortType(PORT_TYPE_FORMAT_6), PORT_TYPE_OUTPUT_4); + public void testGetPortType_Input_PortIndexWithoutUnderscore() { + assertEquals(PORT_TYPE_OUTPUT_4, ConsolidationDataUtil.getPortType(PORT_TYPE_FORMAT_6, VM_TYPE)); } @Test - public void testGetPortType_Input_PortIndexAndDigitInBetween() throws Exception { - assertEquals(ConsolidationDataUtil.getPortType(PORT_TYPE_FORMAT_7), PORT_TYPE_OUTPUT_5); + public void testGetPortType_Input_PortIndexAndDigitInBetween() { + assertEquals(PORT_TYPE_OUTPUT_5, ConsolidationDataUtil.getPortType(PORT_TYPE_FORMAT_7, VM_TYPE)); } } diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/ConsolidationServiceTest.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/ConsolidationServiceTest.java index 347ea65c0a..ed8d0a7e73 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/ConsolidationServiceTest.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/ConsolidationServiceTest.java @@ -45,6 +45,8 @@ import static org.mockito.Mockito.verify; public class ConsolidationServiceTest { + private static final String CM_01_PORT_TYPE = "cm01_port"; + private static final String SM_01_PORT_TYPE = "sm01_port"; @Spy private TranslationContext translationContext = new TranslationContext(); private static String mainST = "MainServiceTemplate.yaml"; @@ -80,8 +82,8 @@ public class ConsolidationServiceTest { consolidationData); List> portTypeToIdList = new ArrayList<>(); - portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_1")); - portTypeToIdList.add(new ImmutablePair<>("sm01_port", "sm01_port_1")); + portTypeToIdList.add(new ImmutablePair<>(CM_01_PORT_TYPE, "cm01_port_1")); + portTypeToIdList.add(new ImmutablePair<>(SM_01_PORT_TYPE, "sm01_port_1")); TestUtils.updateComputeTemplateConsolidationData( mainST, @@ -95,11 +97,11 @@ public class ConsolidationServiceTest { portTypeToIdList, consolidationData); TestUtils.initPortConsolidationData(mainST, consolidationData); - TestUtils.updatePortConsolidationData(mainST, "cm01_port_1", - null, null, null, null, null, + TestUtils.updatePortConsolidationData(mainST, "cm01_port_1", CM_01_PORT_TYPE, + null, null, null, null, null, consolidationData); - TestUtils.updatePortConsolidationData(mainST, "sm01_port_1", - null, null, null, null, null, + TestUtils.updatePortConsolidationData(mainST, "sm01_port_1", CM_01_PORT_TYPE, + null, null, null, null, null, consolidationData); translationContext.setConsolidationData(consolidationData); @@ -121,8 +123,8 @@ public class ConsolidationServiceTest { .initComputeNodeTypeInConsolidationData(mainST, computeNodeTypeName, consolidationData); List> portTypeToIdList = new ArrayList<>(); - portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_1")); - portTypeToIdList.add(new ImmutablePair<>("sm01_port", "sm01_port_1")); + portTypeToIdList.add(new ImmutablePair<>(CM_01_PORT_TYPE, "cm01_port_1")); + portTypeToIdList.add(new ImmutablePair<>(SM_01_PORT_TYPE, "sm01_port_1")); TestUtils.updateComputeTemplateConsolidationData( mainST, @@ -131,10 +133,10 @@ public class ConsolidationServiceTest { portTypeToIdList, consolidationData); TestUtils.initPortConsolidationData(mainST, consolidationData); - TestUtils.updatePortConsolidationData(mainST, "cm01_port_1", - null, null, null, null, null, + TestUtils.updatePortConsolidationData(mainST, "cm01_port_1", CM_01_PORT_TYPE, + null, null, null, null, null, consolidationData); - TestUtils.updatePortConsolidationData(mainST, "sm01_port_1", + TestUtils.updatePortConsolidationData(mainST, "sm01_port_1", SM_01_PORT_TYPE, null, null, null, null, null, consolidationData); @@ -156,8 +158,8 @@ public class ConsolidationServiceTest { .initComputeNodeTypeInConsolidationData(mainST, computeNodeTypeName, consolidationData); List> portTypeToIdList = new ArrayList<>(); - portTypeToIdList.add(new ImmutablePair<>("sm01_port", "sm01_port_1")); - portTypeToIdList.add(new ImmutablePair<>("sm01_port", "sm01_port_2")); + portTypeToIdList.add(new ImmutablePair<>(SM_01_PORT_TYPE, "sm01_port_1")); + portTypeToIdList.add(new ImmutablePair<>(SM_01_PORT_TYPE, "sm01_port_2")); TestUtils.updateComputeTemplateConsolidationData( mainST, @@ -193,7 +195,7 @@ public class ConsolidationServiceTest { .initComputeNodeTypeInConsolidationData(mainST, computeNodeTypeName, consolidationData); List> portTypeToIdList = new ArrayList<>(); - portTypeToIdList.add(new ImmutablePair<>("sm01_port", "sm01_port_1")); + portTypeToIdList.add(new ImmutablePair<>(SM_01_PORT_TYPE, "sm01_port_1")); TestUtils.updateComputeTemplateConsolidationData( mainST, @@ -202,7 +204,7 @@ public class ConsolidationServiceTest { portTypeToIdList, consolidationData); portTypeToIdList = new ArrayList<>(); - portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_1")); + portTypeToIdList.add(new ImmutablePair<>(CM_01_PORT_TYPE, "cm01_port_1")); TestUtils.updateComputeTemplateConsolidationData( mainST, @@ -211,10 +213,10 @@ public class ConsolidationServiceTest { portTypeToIdList, consolidationData); TestUtils.initPortConsolidationData(mainST, consolidationData); - TestUtils.updatePortConsolidationData(mainST, "cm01_port_1", + TestUtils.updatePortConsolidationData(mainST, "cm01_port_1", CM_01_PORT_TYPE, null, null, null, null, null, consolidationData); - TestUtils.updatePortConsolidationData(mainST, "sm01_port_1", + TestUtils.updatePortConsolidationData(mainST, "sm01_port_1", SM_01_PORT_TYPE, null, null, null, null, null, consolidationData); @@ -237,8 +239,8 @@ public class ConsolidationServiceTest { .initComputeNodeTypeInConsolidationData(mainST, computeNodeTypeName, consolidationData); List> portTypeToIdList = new ArrayList<>(); - portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_1")); - portTypeToIdList.add(new ImmutablePair<>("sm01_port", "sm01_port_1")); + portTypeToIdList.add(new ImmutablePair<>(CM_01_PORT_TYPE, "cm01_port_1")); + portTypeToIdList.add(new ImmutablePair<>(SM_01_PORT_TYPE, "sm01_port_1")); TestUtils.updateComputeTemplateConsolidationData( mainST, @@ -259,10 +261,10 @@ public class ConsolidationServiceTest { portTypeToIdList, consolidationData); TestUtils.initPortConsolidationData(mainST, consolidationData); - TestUtils.updatePortConsolidationData(mainST, "cm01_port_1", + TestUtils.updatePortConsolidationData(mainST, "cm01_port_1", CM_01_PORT_TYPE, null, null, null, null, null, consolidationData); - TestUtils.updatePortConsolidationData(mainST, "sm01_port_1", + TestUtils.updatePortConsolidationData(mainST, "sm01_port_1", SM_01_PORT_TYPE, null, null, null, null, null, consolidationData); @@ -285,8 +287,8 @@ public class ConsolidationServiceTest { .initComputeNodeTypeInConsolidationData(mainST, computeNodeTypeName, consolidationData); List> portTypeToIdList = new ArrayList<>(); - portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_1")); - portTypeToIdList.add(new ImmutablePair<>("sm01_port", "sm01_port_1")); + portTypeToIdList.add(new ImmutablePair<>(CM_01_PORT_TYPE, "cm01_port_1")); + portTypeToIdList.add(new ImmutablePair<>(SM_01_PORT_TYPE, "sm01_port_1")); TestUtils.updateComputeTemplateConsolidationData( mainST, @@ -301,7 +303,7 @@ public class ConsolidationServiceTest { portTypeToIdList, consolidationData); portTypeToIdList = new ArrayList<>(); - portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_1")); + portTypeToIdList.add(new ImmutablePair<>(CM_01_PORT_TYPE, "cm01_port_1")); TestUtils.updateComputeTemplateConsolidationData( mainST, computeNodeTypeName, "server_ps03", @@ -309,10 +311,10 @@ public class ConsolidationServiceTest { portTypeToIdList, consolidationData); TestUtils.initPortConsolidationData(mainST, consolidationData); - TestUtils.updatePortConsolidationData(mainST, "cm01_port_1", + TestUtils.updatePortConsolidationData(mainST, "cm01_port_1", CM_01_PORT_TYPE, null, null, null, null, null, consolidationData); - TestUtils.updatePortConsolidationData(mainST, "sm01_port_1", + TestUtils.updatePortConsolidationData(mainST, "sm01_port_1", SM_01_PORT_TYPE, null, null, null, null, null, consolidationData); @@ -338,8 +340,8 @@ public class ConsolidationServiceTest { (mainST, computeNodeTypeName2, consolidationData); List> portTypeToIdList = new ArrayList<>(); - portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_1")); - portTypeToIdList.add(new ImmutablePair<>("sm01_port", "sm01_port_1")); + portTypeToIdList.add(new ImmutablePair<>(CM_01_PORT_TYPE, "cm01_port_1")); + portTypeToIdList.add(new ImmutablePair<>(SM_01_PORT_TYPE, "sm01_port_1")); TestUtils.updateComputeTemplateConsolidationData( mainST, @@ -354,10 +356,10 @@ public class ConsolidationServiceTest { portTypeToIdList, consolidationData); TestUtils.initPortConsolidationData(mainST, consolidationData); - TestUtils.updatePortConsolidationData(mainST, "cm01_port_1", + TestUtils.updatePortConsolidationData(mainST, "cm01_port_1", CM_01_PORT_TYPE, null, null, null, null, null, consolidationData); - TestUtils.updatePortConsolidationData(mainST, "sm01_port_1", + TestUtils.updatePortConsolidationData(mainST, "sm01_port_1", SM_01_PORT_TYPE, null, null, null, null, null, consolidationData); @@ -385,8 +387,8 @@ public class ConsolidationServiceTest { .initComputeNodeTypeInConsolidationData(mainST, computeNodeTypeName2, consolidationData); List> portTypeToIdList = new ArrayList<>(); - portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_1")); - portTypeToIdList.add(new ImmutablePair<>("sm01_port", "sm01_port_1")); + portTypeToIdList.add(new ImmutablePair<>(CM_01_PORT_TYPE, "cm01_port_1")); + portTypeToIdList.add(new ImmutablePair<>(SM_01_PORT_TYPE, "sm01_port_1")); TestUtils.updateComputeTemplateConsolidationData( mainST, @@ -406,10 +408,10 @@ public class ConsolidationServiceTest { portTypeToIdList, consolidationData); TestUtils.initPortConsolidationData(mainST, consolidationData); - TestUtils.updatePortConsolidationData(mainST, "cm01_port_1", + TestUtils.updatePortConsolidationData(mainST, "cm01_port_1", CM_01_PORT_TYPE, null, null, null, null, null, consolidationData); - TestUtils.updatePortConsolidationData(mainST, "sm01_port_1", + TestUtils.updatePortConsolidationData(mainST, "sm01_port_1", SM_01_PORT_TYPE, null, null, null, null, null, consolidationData); @@ -432,8 +434,8 @@ public class ConsolidationServiceTest { .initComputeNodeTypeInConsolidationData(mainST, computeNodeTypeName, consolidationData); List> portTypeToIdList = new ArrayList<>(); - portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_1")); - portTypeToIdList.add(new ImmutablePair<>("sm01_port", "sm01_port_1")); + portTypeToIdList.add(new ImmutablePair<>(CM_01_PORT_TYPE, "cm01_port_1")); + portTypeToIdList.add(new ImmutablePair<>(SM_01_PORT_TYPE, "sm01_port_1")); TestUtils.updateComputeTemplateConsolidationData( mainST, @@ -454,10 +456,10 @@ public class ConsolidationServiceTest { portTypeToIdList, consolidationData); TestUtils.initPortConsolidationData(mainST, consolidationData); - TestUtils.updatePortConsolidationData(mainST, "cm01_port_1", + TestUtils.updatePortConsolidationData(mainST, "cm01_port_1", CM_01_PORT_TYPE, null, null, null, null, null, consolidationData); - TestUtils.updatePortConsolidationData(mainST, "sm01_port_1", + TestUtils.updatePortConsolidationData(mainST, "sm01_port_1", SM_01_PORT_TYPE, null, null, null, null, null, consolidationData); @@ -482,8 +484,8 @@ public class ConsolidationServiceTest { mainST, computeNodeTypeName2, consolidationData); List> portTypeToIdList = new ArrayList<>(); - portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_1")); - portTypeToIdList.add(new ImmutablePair<>("sm01_port", "sm01_port_1")); + portTypeToIdList.add(new ImmutablePair<>(CM_01_PORT_TYPE, "cm01_port_1")); + portTypeToIdList.add(new ImmutablePair<>(SM_01_PORT_TYPE, "sm01_port_1")); TestUtils.updateComputeTemplateConsolidationData( mainST, @@ -522,10 +524,10 @@ public class ConsolidationServiceTest { portTypeToIdList, consolidationData); TestUtils.initPortConsolidationData(mainST, consolidationData); - TestUtils.updatePortConsolidationData(mainST, "cm01_port_1", + TestUtils.updatePortConsolidationData(mainST, "cm01_port_1", CM_01_PORT_TYPE, null, null, null, null, null, consolidationData); - TestUtils.updatePortConsolidationData(mainST, "sm01_port_1", + TestUtils.updatePortConsolidationData(mainST, "sm01_port_1", SM_01_PORT_TYPE, null, null, null, null, null, consolidationData); @@ -548,8 +550,8 @@ public class ConsolidationServiceTest { mainST, computeNodeTypeName, consolidationData); List> portTypeToIdList = new ArrayList<>(); - portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_1")); - portTypeToIdList.add(new ImmutablePair<>("sm01_port", "sm01_port_1")); + portTypeToIdList.add(new ImmutablePair<>(CM_01_PORT_TYPE, "cm01_port_1")); + portTypeToIdList.add(new ImmutablePair<>(SM_01_PORT_TYPE, "sm01_port_1")); TestUtils.updateComputeTemplateConsolidationData( mainST, @@ -570,10 +572,10 @@ public class ConsolidationServiceTest { portTypeToIdList, consolidationData); TestUtils.initPortConsolidationData(mainST, consolidationData); - TestUtils.updatePortConsolidationData(mainST, "cm01_port_1", + TestUtils.updatePortConsolidationData(mainST, "cm01_port_1", CM_01_PORT_TYPE, null, null, null, null, null, consolidationData); - TestUtils.updatePortConsolidationData(mainST, "sm01_port_1", + TestUtils.updatePortConsolidationData(mainST, "sm01_port_1", SM_01_PORT_TYPE, null, null, null, null, null, consolidationData); @@ -595,8 +597,8 @@ public class ConsolidationServiceTest { .initComputeNodeTypeInConsolidationData(mainST, computeNodeTypeName, consolidationData); List> portTypeToIdList = new ArrayList<>(); - portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_1")); - portTypeToIdList.add(new ImmutablePair<>("sm01_port", "sm01_port_1")); + portTypeToIdList.add(new ImmutablePair<>(CM_01_PORT_TYPE, "cm01_port_1")); + portTypeToIdList.add(new ImmutablePair<>(SM_01_PORT_TYPE, "sm01_port_1")); TestUtils.updateComputeTemplateConsolidationData( mainST, @@ -614,10 +616,10 @@ public class ConsolidationServiceTest { portTypeToIdList, consolidationData); TestUtils.initPortConsolidationData(mainST, consolidationData); - TestUtils.updatePortConsolidationData(mainST, "cm01_port_1", + TestUtils.updatePortConsolidationData(mainST, "cm01_port_1", CM_01_PORT_TYPE, null, null, null, null, null, consolidationData); - TestUtils.updatePortConsolidationData(mainST, "sm01_port_1", + TestUtils.updatePortConsolidationData(mainST, "sm01_port_1", SM_01_PORT_TYPE, null, null, null, null, null, consolidationData); @@ -639,28 +641,28 @@ public class ConsolidationServiceTest { .initComputeNodeTypeInConsolidationData(mainST, computeNodeTypeName, consolidationData); List> portTypeToIdList = new ArrayList<>(); - portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_1")); + portTypeToIdList.add(new ImmutablePair<>(CM_01_PORT_TYPE, "cm01_port_1")); TestUtils.updateComputeTemplateConsolidationData( mainST, computeNodeTypeName, "server_ps01", null, null, null, null, null, null, portTypeToIdList, consolidationData); portTypeToIdList = new ArrayList<>(); - portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_2")); + portTypeToIdList.add(new ImmutablePair<>(CM_01_PORT_TYPE, "cm01_port_2")); TestUtils.updateComputeTemplateConsolidationData( mainST, computeNodeTypeName, "server_ps02", null, null, null, null, null, null, portTypeToIdList, consolidationData); portTypeToIdList = new ArrayList<>(); - portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_3")); + portTypeToIdList.add(new ImmutablePair<>(CM_01_PORT_TYPE, "cm01_port_3")); TestUtils.updateComputeTemplateConsolidationData( mainST, computeNodeTypeName, "server_ps03", null, null, null, null, null, null, portTypeToIdList, consolidationData); TestUtils.initPortConsolidationData(mainST, consolidationData); - TestUtils.updatePortConsolidationData(mainST, "cm01_port_1", + TestUtils.updatePortConsolidationData(mainST, "cm01_port_1", CM_01_PORT_TYPE, null, null, null, null, null, consolidationData); @@ -687,28 +689,28 @@ public class ConsolidationServiceTest { .initComputeNodeTypeInConsolidationData(mainST, computeNodeTypeName, consolidationData); List> portTypeToIdList = new ArrayList<>(); - portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_1")); + portTypeToIdList.add(new ImmutablePair<>(CM_01_PORT_TYPE, "cm01_port_1")); TestUtils.updateComputeTemplateConsolidationData( mainST, computeNodeTypeName, "server_ps01", null, null, null, null, null, null, portTypeToIdList, consolidationData); portTypeToIdList = new ArrayList<>(); - portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_2")); + portTypeToIdList.add(new ImmutablePair<>(CM_01_PORT_TYPE, "cm01_port_2")); TestUtils.updateComputeTemplateConsolidationData( mainST, computeNodeTypeName, "server_ps02", null, null, null, null, null, null, portTypeToIdList, consolidationData); portTypeToIdList = new ArrayList<>(); - portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_3")); + portTypeToIdList.add(new ImmutablePair<>(CM_01_PORT_TYPE, "cm01_port_3")); TestUtils.updateComputeTemplateConsolidationData( mainST, computeNodeTypeName, "server_ps03", null, null, null, null, null, null, portTypeToIdList, consolidationData); TestUtils.initPortConsolidationData(mainST, consolidationData); - TestUtils.updatePortConsolidationData(mainST, "cm01_port_1", + TestUtils.updatePortConsolidationData(mainST, "cm01_port_1", CM_01_PORT_TYPE, null, null, null, null, null, consolidationData); @@ -731,27 +733,27 @@ public class ConsolidationServiceTest { .initComputeNodeTypeInConsolidationData(mainST, computeNodeTypeName, consolidationData); List> portTypeToIdList = new ArrayList<>(); - portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_1")); + portTypeToIdList.add(new ImmutablePair<>(CM_01_PORT_TYPE, "cm01_port_1")); TestUtils.updateComputeTemplateConsolidationData( mainST, computeNodeTypeName, "server_ps01", null, null, null, null, null, null, portTypeToIdList, consolidationData); portTypeToIdList = new ArrayList<>(); - portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_2")); + portTypeToIdList.add(new ImmutablePair<>(CM_01_PORT_TYPE, "cm01_port_2")); TestUtils.updateComputeTemplateConsolidationData( mainST, computeNodeTypeName, "server_ps02", null, null, null, null, null, null, portTypeToIdList, consolidationData); portTypeToIdList = new ArrayList<>(); - portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_3")); + portTypeToIdList.add(new ImmutablePair<>(CM_01_PORT_TYPE, "cm01_port_3")); TestUtils.updateComputeTemplateConsolidationData( mainST, computeNodeTypeName, "server_ps03", null, null, null, null, null, null, portTypeToIdList, consolidationData); TestUtils.initPortConsolidationData(mainST, consolidationData); - TestUtils.updatePortConsolidationData(mainST, "cm01_port_1", + TestUtils.updatePortConsolidationData(mainST, "cm01_port_1", CM_01_PORT_TYPE, null, null, null, null, null, consolidationData); @@ -774,27 +776,27 @@ public class ConsolidationServiceTest { .initComputeNodeTypeInConsolidationData(mainST, computeNodeTypeName, consolidationData); List> portTypeToIdList = new ArrayList<>(); - portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_1")); + portTypeToIdList.add(new ImmutablePair<>(CM_01_PORT_TYPE, "cm01_port_1")); TestUtils.updateComputeTemplateConsolidationData( mainST, computeNodeTypeName, "server_ps01", null, null, null, null, null, null, portTypeToIdList, consolidationData); portTypeToIdList = new ArrayList<>(); - portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_2")); + portTypeToIdList.add(new ImmutablePair<>(CM_01_PORT_TYPE, "cm01_port_2")); TestUtils.updateComputeTemplateConsolidationData( mainST, computeNodeTypeName, "server_ps02", null, null, null, null, null, null, portTypeToIdList, consolidationData); portTypeToIdList = new ArrayList<>(); - portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_3")); + portTypeToIdList.add(new ImmutablePair<>(CM_01_PORT_TYPE, "cm01_port_3")); TestUtils.updateComputeTemplateConsolidationData( mainST, computeNodeTypeName, "server_ps03", null, null, null, null, null, null, portTypeToIdList, consolidationData); TestUtils.initPortConsolidationData(mainST, consolidationData); - TestUtils.updatePortConsolidationData(mainST, "cm01_port_1", + TestUtils.updatePortConsolidationData(mainST, "cm01_port_1", CM_01_PORT_TYPE, null, null, null, null, null, consolidationData); @@ -817,38 +819,38 @@ public class ConsolidationServiceTest { .initComputeNodeTypeInConsolidationData(mainST, computeNodeTypeName, consolidationData); List> portTypeToIdList = new ArrayList<>(); - portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_1")); + portTypeToIdList.add(new ImmutablePair<>(CM_01_PORT_TYPE, "cm01_port_1")); TestUtils.updateComputeTemplateConsolidationData( mainST, computeNodeTypeName, "server_ps01", null, null, null, null, null, null, portTypeToIdList, consolidationData); portTypeToIdList = new ArrayList<>(); - portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_2")); + portTypeToIdList.add(new ImmutablePair<>(CM_01_PORT_TYPE, "cm01_port_2")); TestUtils.updateComputeTemplateConsolidationData( mainST, computeNodeTypeName, "server_ps02", null, null, null, null, null, null, portTypeToIdList, consolidationData); portTypeToIdList = new ArrayList<>(); - portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_3")); + portTypeToIdList.add(new ImmutablePair<>(CM_01_PORT_TYPE, "cm01_port_3")); TestUtils.updateComputeTemplateConsolidationData( mainST, computeNodeTypeName, "server_ps03", null, null, null, null, null, null, portTypeToIdList, consolidationData); TestUtils.initPortConsolidationData(mainST, consolidationData); - TestUtils.updatePortConsolidationData(mainST, "cm01_port_1", + TestUtils.updatePortConsolidationData(mainST, "cm01_port_1", CM_01_PORT_TYPE, Collections.singletonList("node_in_1"), Collections.singletonList("net_id_1"), Collections.singletonList("group_id_1"), null, null, consolidationData); - TestUtils.updatePortConsolidationData(mainST, "cm01_port_2", + TestUtils.updatePortConsolidationData(mainST, "cm01_port_2", CM_01_PORT_TYPE, Collections.singletonList("node_in_1"), Collections.singletonList("net_id_1"), Collections.singletonList("group_id_1"), null, null, consolidationData); - TestUtils.updatePortConsolidationData(mainST, "cm01_port_3", + TestUtils.updatePortConsolidationData(mainST, "cm01_port_3", CM_01_PORT_TYPE, Collections.singletonList("node_in_1"), Collections.singletonList("net_id_1"), Collections.singletonList("group_id_1"), null, null, @@ -872,7 +874,7 @@ public class ConsolidationServiceTest { .initComputeNodeTypeInConsolidationData(mainST, computeNodeTypeName, consolidationData); List> portTypeToIdList = new ArrayList<>(); - portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_1")); + portTypeToIdList.add(new ImmutablePair<>(CM_01_PORT_TYPE, "cm01_port_1")); TestUtils.updateComputeTemplateConsolidationData( mainST, computeNodeTypeName, "server_ps01", Collections.singletonList("cm01_port_1"), @@ -883,7 +885,7 @@ public class ConsolidationServiceTest { consolidationData); portTypeToIdList = new ArrayList<>(); - portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_2")); + portTypeToIdList.add(new ImmutablePair<>(CM_01_PORT_TYPE, "cm01_port_2")); TestUtils.updateComputeTemplateConsolidationData( mainST, computeNodeTypeName, "server_ps02", Collections.singletonList("cm01_port_1"), @@ -894,7 +896,7 @@ public class ConsolidationServiceTest { consolidationData); portTypeToIdList = new ArrayList<>(); - portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_3")); + portTypeToIdList.add(new ImmutablePair<>(CM_01_PORT_TYPE, "cm01_port_3")); TestUtils.updateComputeTemplateConsolidationData( mainST, computeNodeTypeName, "server_ps03", Collections.singletonList("cm01_port_1"), @@ -905,17 +907,17 @@ public class ConsolidationServiceTest { consolidationData); TestUtils.initPortConsolidationData(mainST, consolidationData); - TestUtils.updatePortConsolidationData(mainST, "cm01_port_1", + TestUtils.updatePortConsolidationData(mainST, "cm01_port_1", CM_01_PORT_TYPE, Collections.singletonList("node_in_1"), Collections.singletonList("net_id_1"), Collections.singletonList("group_id_1"), null, null, consolidationData); - TestUtils.updatePortConsolidationData(mainST, "cm01_port_2", + TestUtils.updatePortConsolidationData(mainST, "cm01_port_2", CM_01_PORT_TYPE, Collections.singletonList("node_in_1"), Collections.singletonList("net_id_1"), Collections.singletonList("group_id_1"), null, null, consolidationData); - TestUtils.updatePortConsolidationData(mainST, "cm01_port_3", + TestUtils.updatePortConsolidationData(mainST, "cm01_port_3", CM_01_PORT_TYPE, Collections.singletonList("node_in_1"), Collections.singletonList("net_id_1"), Collections.singletonList("group_id_1"), null, null, @@ -940,7 +942,7 @@ public class ConsolidationServiceTest { .initComputeNodeTypeInConsolidationData(mainST, computeNodeTypeName, consolidationData); List> portTypeToIdList = new ArrayList<>(); - portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_1")); + portTypeToIdList.add(new ImmutablePair<>(CM_01_PORT_TYPE, "cm01_port_1")); TestUtils.updateComputeTemplateConsolidationData( mainST, computeNodeTypeName, "server_ps01", Collections.singletonList("cm01_port_1"), @@ -951,7 +953,7 @@ public class ConsolidationServiceTest { consolidationData); portTypeToIdList = new ArrayList<>(); - portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_2")); + portTypeToIdList.add(new ImmutablePair<>(CM_01_PORT_TYPE, "cm01_port_2")); TestUtils.updateComputeTemplateConsolidationData( mainST, computeNodeTypeName, "server_ps02", Collections.singletonList("cm01_port_1"), @@ -962,7 +964,7 @@ public class ConsolidationServiceTest { consolidationData); portTypeToIdList = new ArrayList<>(); - portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_3")); + portTypeToIdList.add(new ImmutablePair<>(CM_01_PORT_TYPE, "cm01_port_3")); TestUtils.updateComputeTemplateConsolidationData( mainST, computeNodeTypeName, "server_ps03", Collections.singletonList("cm01_port_2"), @@ -973,7 +975,7 @@ public class ConsolidationServiceTest { consolidationData); TestUtils.initPortConsolidationData(mainST, consolidationData); - TestUtils.updatePortConsolidationData(mainST, "cm01_port_1", null, null, null, null, null, + TestUtils.updatePortConsolidationData(mainST, "cm01_port_1", CM_01_PORT_TYPE, null, null, null, null, null, consolidationData); @@ -995,7 +997,7 @@ public class ConsolidationServiceTest { .initComputeNodeTypeInConsolidationData(mainST, computeNodeTypeName, consolidationData); List> portTypeToIdList = new ArrayList<>(); - portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_1")); + portTypeToIdList.add(new ImmutablePair<>(CM_01_PORT_TYPE, "cm01_port_1")); TestUtils.updateComputeTemplateConsolidationData( mainST, computeNodeTypeName, "server_ps01", Collections.singletonList("cm01_port_1"), @@ -1006,7 +1008,7 @@ public class ConsolidationServiceTest { consolidationData); portTypeToIdList = new ArrayList<>(); - portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_2")); + portTypeToIdList.add(new ImmutablePair<>(CM_01_PORT_TYPE, "cm01_port_2")); TestUtils.updateComputeTemplateConsolidationData( mainST, computeNodeTypeName, "server_ps02", Collections.singletonList("cm01_port_1"), @@ -1017,7 +1019,7 @@ public class ConsolidationServiceTest { consolidationData); portTypeToIdList = new ArrayList<>(); - portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_3")); + portTypeToIdList.add(new ImmutablePair<>(CM_01_PORT_TYPE, "cm01_port_3")); TestUtils.updateComputeTemplateConsolidationData( mainST, computeNodeTypeName, "server_ps03", Collections.singletonList("cm01_port_1"), @@ -1028,7 +1030,7 @@ public class ConsolidationServiceTest { consolidationData); TestUtils.initPortConsolidationData(mainST, consolidationData); - TestUtils.updatePortConsolidationData(mainST, "cm01_port_1", null, null, null, null, null, + TestUtils.updatePortConsolidationData(mainST, "cm01_port_1", CM_01_PORT_TYPE, null, null, null, null, null, consolidationData); @@ -1050,7 +1052,7 @@ public class ConsolidationServiceTest { .initComputeNodeTypeInConsolidationData(mainST, computeNodeTypeName, consolidationData); List> portTypeToIdList = new ArrayList<>(); - portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_1")); + portTypeToIdList.add(new ImmutablePair<>(CM_01_PORT_TYPE, "cm01_port_1")); TestUtils.updateComputeTemplateConsolidationData( mainST, computeNodeTypeName, "server_ps01", Collections.singletonList("cm01_port_1"), @@ -1061,7 +1063,7 @@ public class ConsolidationServiceTest { consolidationData); portTypeToIdList = new ArrayList<>(); - portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_2")); + portTypeToIdList.add(new ImmutablePair<>(CM_01_PORT_TYPE, "cm01_port_2")); TestUtils.updateComputeTemplateConsolidationData( mainST, computeNodeTypeName, "server_ps02", Collections.singletonList("cm01_port_1"), @@ -1072,7 +1074,7 @@ public class ConsolidationServiceTest { consolidationData); portTypeToIdList = new ArrayList<>(); - portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_3")); + portTypeToIdList.add(new ImmutablePair<>(CM_01_PORT_TYPE, "cm01_port_3")); TestUtils.updateComputeTemplateConsolidationData( mainST, computeNodeTypeName, "server_ps03", Collections.singletonList("cm01_port_1"), @@ -1083,7 +1085,7 @@ public class ConsolidationServiceTest { consolidationData); TestUtils.initPortConsolidationData(mainST, consolidationData); - TestUtils.updatePortConsolidationData(mainST, "cm01_port_1", null, null, null, null, null, + TestUtils.updatePortConsolidationData(mainST, "cm01_port_1", CM_01_PORT_TYPE, null, null, null, null, null, consolidationData); @@ -1105,7 +1107,7 @@ public class ConsolidationServiceTest { .initComputeNodeTypeInConsolidationData(mainST, computeNodeTypeName, consolidationData); List> portTypeToIdList = new ArrayList<>(); - portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_1")); + portTypeToIdList.add(new ImmutablePair<>(CM_01_PORT_TYPE, "cm01_port_1")); TestUtils.updateComputeTemplateConsolidationData( mainST, computeNodeTypeName, "server_ps01", Collections.singletonList("cm01_port_1"), @@ -1117,7 +1119,7 @@ public class ConsolidationServiceTest { consolidationData); portTypeToIdList = new ArrayList<>(); - portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_2")); + portTypeToIdList.add(new ImmutablePair<>(CM_01_PORT_TYPE, "cm01_port_2")); TestUtils.updateComputeTemplateConsolidationData( mainST, computeNodeTypeName, "server_ps02", Collections.singletonList("cm01_port_1"), @@ -1128,7 +1130,7 @@ public class ConsolidationServiceTest { consolidationData); portTypeToIdList = new ArrayList<>(); - portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_3")); + portTypeToIdList.add(new ImmutablePair<>(CM_01_PORT_TYPE, "cm01_port_3")); TestUtils.updateComputeTemplateConsolidationData( mainST, computeNodeTypeName, "server_ps03", Collections.singletonList("cm01_port_1"), @@ -1139,7 +1141,7 @@ public class ConsolidationServiceTest { consolidationData); TestUtils.initPortConsolidationData(mainST, consolidationData); - TestUtils.updatePortConsolidationData(mainST, "cm01_port_1", null, null, null, null, null, + TestUtils.updatePortConsolidationData(mainST, "cm01_port_1", CM_01_PORT_TYPE, null, null, null, null, null, consolidationData); @@ -1161,7 +1163,7 @@ public class ConsolidationServiceTest { .initComputeNodeTypeInConsolidationData(mainST, computeNodeTypeName, consolidationData); List> portTypeToIdList = new ArrayList<>(); - portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_1")); + portTypeToIdList.add(new ImmutablePair<>(CM_01_PORT_TYPE, "cm01_port_1")); TestUtils.updateComputeTemplateConsolidationData( mainST, computeNodeTypeName, "server_ps01", Collections.singletonList("cm01_port_1"), @@ -1173,7 +1175,7 @@ public class ConsolidationServiceTest { consolidationData); portTypeToIdList = new ArrayList<>(); - portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_2")); + portTypeToIdList.add(new ImmutablePair<>(CM_01_PORT_TYPE, "cm01_port_2")); TestUtils.updateComputeTemplateConsolidationData( mainST, computeNodeTypeName, "server_ps02", Collections.singletonList("cm01_port_1"), @@ -1184,7 +1186,7 @@ public class ConsolidationServiceTest { consolidationData); portTypeToIdList = new ArrayList<>(); - portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_3")); + portTypeToIdList.add(new ImmutablePair<>(CM_01_PORT_TYPE, "cm01_port_3")); TestUtils.updateComputeTemplateConsolidationData( mainST, computeNodeTypeName, "server_ps03", Collections.singletonList("cm01_port_1"), @@ -1195,18 +1197,18 @@ public class ConsolidationServiceTest { consolidationData); TestUtils.initPortConsolidationData(mainST, consolidationData); - TestUtils.updatePortConsolidationData(mainST, "cm01_port_1", - Collections.singletonList("node_in_1"), Collections.singletonList("net_id_1"), + TestUtils.updatePortConsolidationData(mainST, "cm01_port_1", CM_01_PORT_TYPE, + Collections.singletonList("node_in_1"), Collections.singletonList("net_id_1"), Collections.singletonList("group_id_1"), null, null, consolidationData); - TestUtils.updatePortConsolidationData(mainST, "cm01_port_2", - Collections.singletonList("node_in_1"), Collections.singletonList("net_id_1"), + TestUtils.updatePortConsolidationData(mainST, "cm01_port_2", CM_01_PORT_TYPE, + Collections.singletonList("node_in_1"), Collections.singletonList("net_id_1"), Collections.singletonList("group_id_1"), null, null, consolidationData); - TestUtils.updatePortConsolidationData(mainST, "cm01_port_3", - Collections.singletonList("node_in_1"), Collections.singletonList("net_id_1"), + TestUtils.updatePortConsolidationData(mainST, "cm01_port_3", CM_01_PORT_TYPE, + Collections.singletonList("node_in_1"), Collections.singletonList("net_id_1"), Collections.singletonList("group_id_1"), null, null, consolidationData); @@ -1229,7 +1231,7 @@ public class ConsolidationServiceTest { .initComputeNodeTypeInConsolidationData(mainST, computeNodeTypeName, consolidationData); List> portTypeToIdList = new ArrayList<>(); - portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_1")); + portTypeToIdList.add(new ImmutablePair<>(CM_01_PORT_TYPE, "cm01_port_1")); TestUtils.updateComputeTemplateConsolidationData( mainST, computeNodeTypeName, "server_ps01", Collections.singletonList("cm01_port_1"), @@ -1241,7 +1243,7 @@ public class ConsolidationServiceTest { consolidationData); portTypeToIdList = new ArrayList<>(); - portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_2")); + portTypeToIdList.add(new ImmutablePair<>(CM_01_PORT_TYPE, "cm01_port_2")); TestUtils.updateComputeTemplateConsolidationData( mainST, computeNodeTypeName, "server_ps02", Collections.singletonList("cm01_port_1"), @@ -1252,7 +1254,7 @@ public class ConsolidationServiceTest { consolidationData); portTypeToIdList = new ArrayList<>(); - portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_3")); + portTypeToIdList.add(new ImmutablePair<>(CM_01_PORT_TYPE, "cm01_port_3")); TestUtils.updateComputeTemplateConsolidationData( mainST, computeNodeTypeName, "server_ps03", Collections.singletonList("cm01_port_1"), @@ -1263,18 +1265,18 @@ public class ConsolidationServiceTest { consolidationData); TestUtils.initPortConsolidationData(mainST, consolidationData); - TestUtils.updatePortConsolidationData(mainST, "cm01_port_1", - Collections.singletonList("node_in_1"), Collections.singletonList("net_id_1"), + TestUtils.updatePortConsolidationData(mainST, "cm01_port_1", CM_01_PORT_TYPE, + Collections.singletonList("node_in_1"), Collections.singletonList("net_id_1"), Collections.singletonList("group_id_1"), null, null, consolidationData); - TestUtils.updatePortConsolidationData(mainST, "cm01_port_2", - Collections.singletonList("node_in_1"), Collections.singletonList("net_id_1"), + TestUtils.updatePortConsolidationData(mainST, "cm01_port_2", CM_01_PORT_TYPE, + Collections.singletonList("node_in_1"), Collections.singletonList("net_id_1"), Collections.singletonList("group_id_1"), null, null, consolidationData); - TestUtils.updatePortConsolidationData(mainST, "cm01_port_3", - Collections.singletonList("node_in_2"), Collections.singletonList("net_id_1"), + TestUtils.updatePortConsolidationData(mainST, "cm01_port_3", CM_01_PORT_TYPE, + Collections.singletonList("node_in_2"), Collections.singletonList("net_id_1"), Collections.singletonList("group_id_1"), null, null, consolidationData); @@ -1297,7 +1299,7 @@ public class ConsolidationServiceTest { .initComputeNodeTypeInConsolidationData(mainST, computeNodeTypeName, consolidationData); List> portTypeToIdList = new ArrayList<>(); - portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_1")); + portTypeToIdList.add(new ImmutablePair<>(CM_01_PORT_TYPE, "cm01_port_1")); TestUtils.updateComputeTemplateConsolidationData( mainST, computeNodeTypeName, "server_ps01", Collections.singletonList("cm01_port_1"), @@ -1309,7 +1311,7 @@ public class ConsolidationServiceTest { consolidationData); portTypeToIdList = new ArrayList<>(); - portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_2")); + portTypeToIdList.add(new ImmutablePair<>(CM_01_PORT_TYPE, "cm01_port_2")); TestUtils.updateComputeTemplateConsolidationData( mainST, computeNodeTypeName, "server_ps02", Collections.singletonList("cm01_port_1"), @@ -1320,7 +1322,7 @@ public class ConsolidationServiceTest { consolidationData); portTypeToIdList = new ArrayList<>(); - portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_3")); + portTypeToIdList.add(new ImmutablePair<>(CM_01_PORT_TYPE, "cm01_port_3")); TestUtils.updateComputeTemplateConsolidationData( mainST, computeNodeTypeName, "server_ps03", Collections.singletonList("cm01_port_1"), @@ -1331,18 +1333,18 @@ public class ConsolidationServiceTest { consolidationData); TestUtils.initPortConsolidationData(mainST, consolidationData); - TestUtils.updatePortConsolidationData(mainST, "cm01_port_1", - Collections.singletonList("node_in_1"), Collections.singletonList("net_id_1"), + TestUtils.updatePortConsolidationData(mainST, "cm01_port_1", CM_01_PORT_TYPE, + Collections.singletonList("node_in_1"), Collections.singletonList("net_id_1"), Collections.singletonList("group_id_1"), null, null, consolidationData); - TestUtils.updatePortConsolidationData(mainST, "cm01_port_2", - Collections.singletonList("node_in_1"), Collections.singletonList("net_id_1"), + TestUtils.updatePortConsolidationData(mainST, "cm01_port_2", CM_01_PORT_TYPE, + Collections.singletonList("node_in_1"), Collections.singletonList("net_id_1"), Collections.singletonList("group_id_1"), null, null, consolidationData); - TestUtils.updatePortConsolidationData(mainST, "cm01_port_3", - Collections.singletonList("node_in_1"), Collections.singletonList("net_id_2"), + TestUtils.updatePortConsolidationData(mainST, "cm01_port_3", CM_01_PORT_TYPE, + Collections.singletonList("node_in_1"), Collections.singletonList("net_id_2"), Collections.singletonList("group_id_1"), null, null, consolidationData); @@ -1365,7 +1367,7 @@ public class ConsolidationServiceTest { .initComputeNodeTypeInConsolidationData(mainST, computeNodeTypeName, consolidationData); List> portTypeToIdList = new ArrayList<>(); - portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_1")); + portTypeToIdList.add(new ImmutablePair<>(CM_01_PORT_TYPE, "cm01_port_1")); TestUtils.updateComputeTemplateConsolidationData( mainST, computeNodeTypeName, "server_ps01", Collections.singletonList("cm01_port_1"), @@ -1377,7 +1379,7 @@ public class ConsolidationServiceTest { consolidationData); portTypeToIdList = new ArrayList<>(); - portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_2")); + portTypeToIdList.add(new ImmutablePair<>(CM_01_PORT_TYPE, "cm01_port_2")); TestUtils.updateComputeTemplateConsolidationData( mainST, computeNodeTypeName, "server_ps02", Collections.singletonList("cm01_port_1"), @@ -1388,7 +1390,7 @@ public class ConsolidationServiceTest { consolidationData); portTypeToIdList = new ArrayList<>(); - portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_3")); + portTypeToIdList.add(new ImmutablePair<>(CM_01_PORT_TYPE, "cm01_port_3")); TestUtils.updateComputeTemplateConsolidationData( mainST, computeNodeTypeName, "server_ps03", Collections.singletonList("cm01_port_1"), @@ -1399,16 +1401,16 @@ public class ConsolidationServiceTest { consolidationData); TestUtils.initPortConsolidationData(mainST, consolidationData); - TestUtils.updatePortConsolidationData(mainST, "cm01_port_1", - Collections.singletonList("node_in_1"), Collections.singletonList("net_id_1"), + TestUtils.updatePortConsolidationData(mainST, "cm01_port_1", CM_01_PORT_TYPE, + Collections.singletonList("node_in_1"), Collections.singletonList("net_id_1"), Arrays.asList("group_id_1", "group_id_2"), null, null, consolidationData); - TestUtils.updatePortConsolidationData(mainST, "cm01_port_2", - Collections.singletonList("node_in_1"), Collections.singletonList("net_id_1"), + TestUtils.updatePortConsolidationData(mainST, "cm01_port_2", CM_01_PORT_TYPE, + Collections.singletonList("node_in_1"), Collections.singletonList("net_id_1"), Arrays.asList("group_id_1", "group_id_2"), null, null, consolidationData); - TestUtils.updatePortConsolidationData(mainST, "cm01_port_3", - Collections.singletonList("node_in_1"), Collections.singletonList("net_id_1"), + TestUtils.updatePortConsolidationData(mainST, "cm01_port_3", CM_01_PORT_TYPE, + Collections.singletonList("node_in_1"), Collections.singletonList("net_id_1"), Arrays.asList("group_id_1", "group_id_3"), null, null, consolidationData); @@ -1430,7 +1432,7 @@ public class ConsolidationServiceTest { .initComputeNodeTypeInConsolidationData(mainST, computeNodeTypeName, consolidationData); List> portTypeToIdList = new ArrayList<>(); - portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_1")); + portTypeToIdList.add(new ImmutablePair<>(CM_01_PORT_TYPE, "cm01_port_1")); TestUtils.updateComputeTemplateConsolidationData( mainST, @@ -1443,7 +1445,7 @@ public class ConsolidationServiceTest { consolidationData); portTypeToIdList = new ArrayList<>(); - portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_2")); + portTypeToIdList.add(new ImmutablePair<>(CM_01_PORT_TYPE, "cm01_port_2")); TestUtils.updateComputeTemplateConsolidationData( mainST, computeNodeTypeName, "server_ps02", Collections.singletonList("cm01_port_1"), @@ -1454,7 +1456,7 @@ public class ConsolidationServiceTest { consolidationData); portTypeToIdList = new ArrayList<>(); - portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_3")); + portTypeToIdList.add(new ImmutablePair<>(CM_01_PORT_TYPE, "cm01_port_3")); TestUtils.updateComputeTemplateConsolidationData( mainST, computeNodeTypeName, "server_ps03", Collections.singletonList("cm01_port_1"), @@ -1465,16 +1467,16 @@ public class ConsolidationServiceTest { consolidationData); TestUtils.initPortConsolidationData(mainST, consolidationData); - TestUtils.updatePortConsolidationData(mainST, "cm01_port_1", - Collections.singletonList("node_in_1"), Collections.singletonList("net_id_1"), + TestUtils.updatePortConsolidationData(mainST, "cm01_port_1", CM_01_PORT_TYPE, + Collections.singletonList("node_in_1"), Collections.singletonList("net_id_1"), Arrays.asList("group_id_1", "group_id_2"), null, null, consolidationData); - TestUtils.updatePortConsolidationData(mainST, "cm01_port_2", - Collections.singletonList("node_in_1"), Collections.singletonList("net_id_1"), + TestUtils.updatePortConsolidationData(mainST, "cm01_port_2", CM_01_PORT_TYPE, + Collections.singletonList("node_in_1"), Collections.singletonList("net_id_1"), Arrays.asList("group_id_1", "group_id_2"), null, null, consolidationData); - TestUtils.updatePortConsolidationData(mainST, "cm01_port_3", - Collections.singletonList("node_in_1"), Collections.singletonList("net_id_1"), + TestUtils.updatePortConsolidationData(mainST, "cm01_port_3", CM_01_PORT_TYPE, + Collections.singletonList("node_in_1"), Collections.singletonList("net_id_1"), Arrays.asList("group_id_1", "group_id_2"), null, null, consolidationData); @@ -1496,7 +1498,7 @@ public class ConsolidationServiceTest { .initComputeNodeTypeInConsolidationData(mainST, computeNodeTypeName, consolidationData); List> portTypeToIdList = new ArrayList<>(); - portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_1")); + portTypeToIdList.add(new ImmutablePair<>(CM_01_PORT_TYPE, "cm01_port_1")); TestUtils.updateComputeTemplateConsolidationData( mainST, @@ -1509,7 +1511,7 @@ public class ConsolidationServiceTest { consolidationData); portTypeToIdList = new ArrayList<>(); - portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_2")); + portTypeToIdList.add(new ImmutablePair<>(CM_01_PORT_TYPE, "cm01_port_2")); TestUtils.updateComputeTemplateConsolidationData( mainST, computeNodeTypeName, "server_ps02", Collections.singletonList("cm01_port_1"), @@ -1520,7 +1522,7 @@ public class ConsolidationServiceTest { consolidationData); portTypeToIdList = new ArrayList<>(); - portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_3")); + portTypeToIdList.add(new ImmutablePair<>(CM_01_PORT_TYPE, "cm01_port_3")); TestUtils.updateComputeTemplateConsolidationData( mainST, computeNodeTypeName, "server_ps03", Collections.singletonList("cm01_port_1"), @@ -1531,16 +1533,16 @@ public class ConsolidationServiceTest { consolidationData); TestUtils.initPortConsolidationData(mainST, consolidationData); - TestUtils.updatePortConsolidationData(mainST, "cm01_port_1", - Collections.singletonList("node_in_1"), Collections.singletonList("net_id_1"), + TestUtils.updatePortConsolidationData(mainST, "cm01_port_1", CM_01_PORT_TYPE, + Collections.singletonList("node_in_1"), Collections.singletonList("net_id_1"), Arrays.asList("group_id_1", "group_id_2"), null, null, consolidationData); - TestUtils.updatePortConsolidationData(mainST, "cm01_port_2", - Collections.singletonList("node_in_1"), Collections.singletonList("net_id_1"), + TestUtils.updatePortConsolidationData(mainST, "cm01_port_2", CM_01_PORT_TYPE, + Collections.singletonList("node_in_1"), Collections.singletonList("net_id_1"), Arrays.asList("group_id_1", "group_id_2"), null, null, consolidationData); - TestUtils.updatePortConsolidationData(mainST, "cm01_port_3", - Collections.singletonList("node_in_1"), Collections.singletonList("net_id_1"), + TestUtils.updatePortConsolidationData(mainST, "cm01_port_3", CM_01_PORT_TYPE, + Collections.singletonList("node_in_1"), Collections.singletonList("net_id_1"), Arrays.asList("group_id_1", "group_id_2"), null, null, consolidationData); @@ -1562,7 +1564,7 @@ public class ConsolidationServiceTest { .initComputeNodeTypeInConsolidationData(mainST, computeNodeTypeName, consolidationData); List> portTypeToIdList = new ArrayList<>(); - portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_1")); + portTypeToIdList.add(new ImmutablePair<>(CM_01_PORT_TYPE, "cm01_port_1")); TestUtils.updateComputeTemplateConsolidationData( mainST, @@ -1575,7 +1577,7 @@ public class ConsolidationServiceTest { consolidationData); portTypeToIdList = new ArrayList<>(); - portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_2")); + portTypeToIdList.add(new ImmutablePair<>(CM_01_PORT_TYPE, "cm01_port_2")); TestUtils.updateComputeTemplateConsolidationData( mainST, computeNodeTypeName, "server_ps02", Collections.singletonList("cm01_port_1"), @@ -1586,7 +1588,7 @@ public class ConsolidationServiceTest { consolidationData); portTypeToIdList = new ArrayList<>(); - portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_3")); + portTypeToIdList.add(new ImmutablePair<>(CM_01_PORT_TYPE, "cm01_port_3")); TestUtils.updateComputeTemplateConsolidationData( mainST, computeNodeTypeName, "server_ps03", Collections.singletonList("cm01_port_1"), @@ -1599,6 +1601,8 @@ public class ConsolidationServiceTest { TestUtils.initPortConsolidationData(mainST, consolidationData); List portNodeTemplateIds = Arrays.asList("cm01_port_1", "cm01_port_2", "cm01_port_3"); + List toUpdatePortTypeIds = + Arrays.asList("cm01_port", "cm01_port", "cm01_port"); List> nodesConnectedInIds = Arrays.asList(Collections.singletonList("node_in_1"), Collections.singletonList("node_in_1"), @@ -1618,7 +1622,7 @@ public class ConsolidationServiceTest { Arrays.asList(null, null, null); TestUtils.updateMultiplePortConsolidationDatas( - mainST, portNodeTemplateIds, nodesConnectedInIds, nodesConnectedOutIds, groupIds, + mainST, portNodeTemplateIds, toUpdatePortTypeIds, nodesConnectedInIds, nodesConnectedOutIds, groupIds, getAttrInIds, getAttrOut, consolidationData); translationContext.setConsolidationData(consolidationData); @@ -1640,7 +1644,7 @@ public class ConsolidationServiceTest { .initComputeNodeTypeInConsolidationData(mainST, computeNodeTypeName, consolidationData); List> portTypeToIdList = new ArrayList<>(); - portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_1")); + portTypeToIdList.add(new ImmutablePair<>(CM_01_PORT_TYPE, "cm01_port_1")); TestUtils.updateComputeTemplateConsolidationData( mainST, @@ -1653,7 +1657,7 @@ public class ConsolidationServiceTest { consolidationData); portTypeToIdList = new ArrayList<>(); - portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_2")); + portTypeToIdList.add(new ImmutablePair<>(CM_01_PORT_TYPE, "cm01_port_2")); TestUtils.updateComputeTemplateConsolidationData( mainST, computeNodeTypeName, "server_ps02", Collections.singletonList("cm01_port_1"), @@ -1664,7 +1668,7 @@ public class ConsolidationServiceTest { consolidationData); portTypeToIdList = new ArrayList<>(); - portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_3")); + portTypeToIdList.add(new ImmutablePair<>(CM_01_PORT_TYPE, "cm01_port_3")); TestUtils.updateComputeTemplateConsolidationData( mainST, computeNodeTypeName, "server_ps03", Collections.singletonList("cm01_port_1"), @@ -1677,6 +1681,8 @@ public class ConsolidationServiceTest { TestUtils.initPortConsolidationData(mainST, consolidationData); List portNodeTemplateIds = Arrays.asList("cm01_port_1", "cm01_port_2", "cm01_port_3"); + List toUpdatePortTypeIds = + Arrays.asList("cm01_port", "cm01_port", "cm01_port"); List> nodesConnectedInIds = Arrays.asList(Collections.singletonList("node_in_1"), Collections.singletonList("node_in_1"), @@ -1696,7 +1702,7 @@ public class ConsolidationServiceTest { Arrays.asList(null, null, null); TestUtils.updateMultiplePortConsolidationDatas( - mainST, portNodeTemplateIds, nodesConnectedInIds, nodesConnectedOutIds, groupIds, + mainST, portNodeTemplateIds, toUpdatePortTypeIds, nodesConnectedInIds, nodesConnectedOutIds, groupIds, getAttrInIds, getAttrOut, consolidationData); translationContext.setConsolidationData(consolidationData); @@ -1718,7 +1724,7 @@ public class ConsolidationServiceTest { .initComputeNodeTypeInConsolidationData(mainST, computeNodeTypeName, consolidationData); List> portTypeToIdList = new ArrayList<>(); - portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_1")); + portTypeToIdList.add(new ImmutablePair<>(CM_01_PORT_TYPE, "cm01_port_1")); TestUtils.updateComputeTemplateConsolidationData( mainST, @@ -1731,7 +1737,7 @@ public class ConsolidationServiceTest { consolidationData); portTypeToIdList = new ArrayList<>(); - portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_2")); + portTypeToIdList.add(new ImmutablePair<>(CM_01_PORT_TYPE, "cm01_port_2")); TestUtils.updateComputeTemplateConsolidationData( mainST, computeNodeTypeName, "server_ps02", Collections.singletonList("cm01_port_1"), @@ -1742,7 +1748,7 @@ public class ConsolidationServiceTest { consolidationData); portTypeToIdList = new ArrayList<>(); - portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_3")); + portTypeToIdList.add(new ImmutablePair<>(CM_01_PORT_TYPE, "cm01_port_3")); TestUtils.updateComputeTemplateConsolidationData( mainST, computeNodeTypeName, "server_ps03", Collections.singletonList("cm01_port_1"), @@ -1755,6 +1761,8 @@ public class ConsolidationServiceTest { TestUtils.initPortConsolidationData(mainST, consolidationData); List portNodeTemplateIds = Arrays.asList("cm01_port_1", "cm01_port_2", "cm01_port_3"); + List toUpdatePortTypeIds = + Arrays.asList("cm01_port", "cm01_port", "cm01_port"); List> nodesConnectedInIds = Arrays.asList(Collections.singletonList("node_in_1"), Collections.singletonList("node_in_1"), @@ -1774,7 +1782,7 @@ public class ConsolidationServiceTest { Arrays.asList(null, null, null); TestUtils.updateMultiplePortConsolidationDatas( - mainST, portNodeTemplateIds, nodesConnectedInIds, nodesConnectedOutIds, groupIds, + mainST, portNodeTemplateIds, toUpdatePortTypeIds, nodesConnectedInIds, nodesConnectedOutIds, groupIds, getAttrInIds, getAttrOut, consolidationData); translationContext.setConsolidationData(consolidationData); @@ -1796,7 +1804,7 @@ public class ConsolidationServiceTest { GetAttrFuncData getAttrFuncData = new GetAttrFuncData("name", "c1_name"); List> portTypeToIdList = new ArrayList<>(); - portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_1")); + portTypeToIdList.add(new ImmutablePair<>(CM_01_PORT_TYPE, "cm01_port_1")); TestUtils.updateComputeTemplateConsolidationData( mainST, computeNodeTypeName, "server_ps01", Collections.singletonList("cm01_port_1"), @@ -1810,7 +1818,7 @@ public class ConsolidationServiceTest { consolidationData); portTypeToIdList = new ArrayList<>(); - portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_2")); + portTypeToIdList.add(new ImmutablePair<>(CM_01_PORT_TYPE, "cm01_port_2")); TestUtils.updateComputeTemplateConsolidationData( mainST, computeNodeTypeName, "server_ps02", Collections.singletonList("cm01_port_1"), @@ -1823,7 +1831,7 @@ public class ConsolidationServiceTest { consolidationData); portTypeToIdList = new ArrayList<>(); - portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_3")); + portTypeToIdList.add(new ImmutablePair<>(CM_01_PORT_TYPE, "cm01_port_3")); TestUtils.updateComputeTemplateConsolidationData( mainST, computeNodeTypeName, "server_ps03", Collections.singletonList("cm01_port_1"), @@ -1836,18 +1844,18 @@ public class ConsolidationServiceTest { consolidationData); TestUtils.initPortConsolidationData(mainST, consolidationData); - TestUtils.updatePortConsolidationData(mainST, "cm01_port_1", - Collections.singletonList("node_in_1"), Collections.singletonList("net_id_1"), + TestUtils.updatePortConsolidationData(mainST, "cm01_port_1", CM_01_PORT_TYPE, + Collections.singletonList("node_in_1"), Collections.singletonList("net_id_1"), Arrays.asList("group_id_1", "group_id_2"), Collections.singletonList("sm01_port_2"), null, consolidationData); - TestUtils.updatePortConsolidationData(mainST, "cm01_port_2", - Collections.singletonList("node_in_1"), Collections.singletonList("net_id_1"), + TestUtils.updatePortConsolidationData(mainST, "cm01_port_2", CM_01_PORT_TYPE, + Collections.singletonList("node_in_1"), Collections.singletonList("net_id_1"), Arrays.asList("group_id_1", "group_id_2"), Collections.singletonList("sm01_port_1"), null, consolidationData); - TestUtils.updatePortConsolidationData(mainST, "cm01_port_3", - Collections.singletonList("node_in_1"), Collections.singletonList("net_id_1"), + TestUtils.updatePortConsolidationData(mainST, "cm01_port_3", CM_01_PORT_TYPE, + Collections.singletonList("node_in_1"), Collections.singletonList("net_id_1"), Arrays.asList("group_id_1", "group_id_2"), Collections.singletonList("rm01_port_1"), null, consolidationData); @@ -1871,8 +1879,8 @@ public class ConsolidationServiceTest { GetAttrFuncData getAttrFuncData = new GetAttrFuncData("name", "c1_name"); List> portTypeToIdList = new ArrayList<>(); - portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_1")); - portTypeToIdList.add(new ImmutablePair<>("sm01_port", "sm01_port_1")); + portTypeToIdList.add(new ImmutablePair<>(CM_01_PORT_TYPE, "cm01_port_1")); + portTypeToIdList.add(new ImmutablePair<>(SM_01_PORT_TYPE, "sm01_port_1")); TestUtils.updateComputeTemplateConsolidationData( mainST, computeNodeTypeName, "server_ps01", Collections.singletonList("cm01_port_1"), @@ -1886,8 +1894,8 @@ public class ConsolidationServiceTest { consolidationData); portTypeToIdList = new ArrayList<>(); - portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_2")); - portTypeToIdList.add(new ImmutablePair<>("sm01_port", "sm01_port_2")); + portTypeToIdList.add(new ImmutablePair<>(CM_01_PORT_TYPE, "cm01_port_2")); + portTypeToIdList.add(new ImmutablePair<>(SM_01_PORT_TYPE, "sm01_port_2")); TestUtils.updateComputeTemplateConsolidationData( mainST, computeNodeTypeName, "server_ps02", Collections.singletonList("cm01_port_1"), @@ -1900,8 +1908,8 @@ public class ConsolidationServiceTest { consolidationData); portTypeToIdList = new ArrayList<>(); - portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_3")); - portTypeToIdList.add(new ImmutablePair<>("sm01_port", "sm01_port_3")); + portTypeToIdList.add(new ImmutablePair<>(CM_01_PORT_TYPE, "cm01_port_3")); + portTypeToIdList.add(new ImmutablePair<>(SM_01_PORT_TYPE, "sm01_port_3")); TestUtils.updateComputeTemplateConsolidationData( mainST, computeNodeTypeName, "server_ps03", Collections.singletonList("cm01_port_1"), @@ -1919,6 +1927,8 @@ public class ConsolidationServiceTest { Arrays.asList("cm01_port_1", "cm01_port_2", "cm01_port_3", "sm01_port_1", "sm01_port_2", "sm01_port_3"); + List toUpdatePortTypeIds = + Arrays.asList("cm01_port", "cm01_port", "cm01_port", "sm01_port", "sm01_port", "sm01_port"); List> nodesConnectedInIds = Arrays.asList(Collections.singletonList("node_in_1"), Collections.singletonList("node_in_1"), Collections.singletonList @@ -1948,7 +1958,7 @@ public class ConsolidationServiceTest { Arrays.asList(null, null, null, null, null, null); - TestUtils.updateMultiplePortConsolidationDatas(mainST, portNodeTemplateIds, + TestUtils.updateMultiplePortConsolidationDatas(mainST, portNodeTemplateIds, toUpdatePortTypeIds, nodesConnectedInIds, nodesConnectedOutIds, groupIds, getAttrInIds, getAttrOut, consolidationData); @@ -1970,8 +1980,8 @@ public class ConsolidationServiceTest { .initComputeNodeTypeInConsolidationData(mainST, computeNodeTypeName, consolidationData); List> portTypeToIdList = new ArrayList<>(); - portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_1")); - portTypeToIdList.add(new ImmutablePair<>("sm01_port", "sm01_port_1")); + portTypeToIdList.add(new ImmutablePair<>(CM_01_PORT_TYPE, "cm01_port_1")); + portTypeToIdList.add(new ImmutablePair<>(SM_01_PORT_TYPE, "sm01_port_1")); TestUtils.updateComputeTemplateConsolidationData( mainST, computeNodeTypeName, "server_ps01", Collections.singletonList("cm01_port_1"), @@ -1983,8 +1993,8 @@ public class ConsolidationServiceTest { consolidationData); portTypeToIdList = new ArrayList<>(); - portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_2")); - portTypeToIdList.add(new ImmutablePair<>("sm01_port", "sm01_port_2")); + portTypeToIdList.add(new ImmutablePair<>(CM_01_PORT_TYPE, "cm01_port_2")); + portTypeToIdList.add(new ImmutablePair<>(SM_01_PORT_TYPE, "sm01_port_2")); TestUtils.updateComputeTemplateConsolidationData( mainST, computeNodeTypeName, "server_ps02", Collections.singletonList("cm01_port_1"), @@ -1995,8 +2005,8 @@ public class ConsolidationServiceTest { consolidationData); portTypeToIdList = new ArrayList<>(); - portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_3")); - portTypeToIdList.add(new ImmutablePair<>("sm01_port", "sm01_port_3")); + portTypeToIdList.add(new ImmutablePair<>(CM_01_PORT_TYPE, "cm01_port_3")); + portTypeToIdList.add(new ImmutablePair<>(SM_01_PORT_TYPE, "sm01_port_3")); TestUtils.updateComputeTemplateConsolidationData( mainST, computeNodeTypeName, "server_ps03", Collections.singletonList("cm01_port_1"), @@ -2013,6 +2023,8 @@ public class ConsolidationServiceTest { Arrays.asList("cm01_port_1", "cm01_port_2", "cm01_port_3", "sm01_port_1", "sm01_port_2", "sm01_port_3"); + List toUpdatePortTypeIds = + Arrays.asList("cm01_port", "cm01_port", "cm01_port", "sm01_port", "sm01_port", "sm01_port"); List> nodesConnectedInIds = Arrays.asList(Collections.singletonList("node_in_1"), Collections.singletonList("node_in_1"), Collections.singletonList @@ -2048,7 +2060,7 @@ public class ConsolidationServiceTest { Collections.singletonList( new ImmutablePair<>("cm01_port_3", getAttrFuncData))); - TestUtils.updateMultiplePortConsolidationDatas(mainST, portNodeTemplateIds, + TestUtils.updateMultiplePortConsolidationDatas(mainST, portNodeTemplateIds, toUpdatePortTypeIds, nodesConnectedInIds, nodesConnectedOutIds, groupIds, getAttrInIds, getAttrOut, consolidationData); @@ -2070,8 +2082,8 @@ public class ConsolidationServiceTest { .initComputeNodeTypeInConsolidationData(mainST, computeNodeTypeName, consolidationData); List> portTypeToIdList = new ArrayList<>(); - portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_1")); - portTypeToIdList.add(new ImmutablePair<>("sm01_port", "sm01_port_1")); + portTypeToIdList.add(new ImmutablePair<>(CM_01_PORT_TYPE, "cm01_port_1")); + portTypeToIdList.add(new ImmutablePair<>(SM_01_PORT_TYPE, "sm01_port_1")); TestUtils.updateComputeTemplateConsolidationData( mainST, computeNodeTypeName, "server_ps01", Collections.singletonList("cm01_port_1"), @@ -2083,8 +2095,8 @@ public class ConsolidationServiceTest { consolidationData); portTypeToIdList = new ArrayList<>(); - portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_2")); - portTypeToIdList.add(new ImmutablePair<>("sm01_port", "sm01_port_2")); + portTypeToIdList.add(new ImmutablePair<>(CM_01_PORT_TYPE, "cm01_port_2")); + portTypeToIdList.add(new ImmutablePair<>(SM_01_PORT_TYPE, "sm01_port_2")); TestUtils.updateComputeTemplateConsolidationData( mainST, computeNodeTypeName, "server_ps02", Collections.singletonList("cm01_port_1"), @@ -2095,8 +2107,8 @@ public class ConsolidationServiceTest { consolidationData); portTypeToIdList = new ArrayList<>(); - portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_3")); - portTypeToIdList.add(new ImmutablePair<>("sm01_port", "sm01_port_3")); + portTypeToIdList.add(new ImmutablePair<>(CM_01_PORT_TYPE, "cm01_port_3")); + portTypeToIdList.add(new ImmutablePair<>(SM_01_PORT_TYPE, "sm01_port_3")); TestUtils.updateComputeTemplateConsolidationData( mainST, computeNodeTypeName, "server_ps03", Collections.singletonList("cm01_port_1"), @@ -2113,6 +2125,8 @@ public class ConsolidationServiceTest { Arrays.asList("cm01_port_1", "cm01_port_2", "cm01_port_3", "sm01_port_1", "sm01_port_2", "sm01_port_3"); + List toUpdatePortTypeIds = + Arrays.asList("cm01_port", "cm01_port", "cm01_port", "sm01_port", "sm01_port", "sm01_port"); List> nodesConnectedInIds = Arrays.asList(Collections.singletonList("node_in_1"), Collections.singletonList("node_in_1"), Collections.singletonList @@ -2147,7 +2161,7 @@ public class ConsolidationServiceTest { Collections.singletonList( new ImmutablePair<>("cm01_port_3", getAttrFuncData))); - TestUtils.updateMultiplePortConsolidationDatas(mainST, portNodeTemplateIds, + TestUtils.updateMultiplePortConsolidationDatas(mainST, portNodeTemplateIds, toUpdatePortTypeIds, nodesConnectedInIds, nodesConnectedOutIds, groupIds, getAttrInIds, getAttrOut, consolidationData); @@ -2337,18 +2351,18 @@ public class ConsolidationServiceTest { TestUtils .initComputeNodeTypeInConsolidationData(mainST, computeNodeTypeName, consolidationData); - updateComputeConsolidationData("server_ps01", computeNodeTypeName, "cm01_port", + updateComputeConsolidationData("server_ps01", computeNodeTypeName, CM_01_PORT_TYPE, "cm01_port_1", consolidationData); - updateComputeConsolidationData("server_ps02", computeNodeTypeName, "cm01_port", + updateComputeConsolidationData("server_ps02", computeNodeTypeName, CM_01_PORT_TYPE, "cm01_port_2", consolidationData); TestUtils.initPortConsolidationData(mainST, consolidationData); - TestUtils.updatePortConsolidationData(mainST, "cm01_port_1", - null, null, null, null, null, + TestUtils.updatePortConsolidationData(mainST, "cm01_port_1", CM_01_PORT_TYPE, + null, null, null, null, null, consolidationData); - TestUtils.updatePortConsolidationData(mainST, "cm01_port_2", - null, null, null, null, null, + TestUtils.updatePortConsolidationData(mainST, "cm01_port_2", CM_01_PORT_TYPE, + null, null, null, null, null, consolidationData); } @@ -2495,9 +2509,9 @@ public class ConsolidationServiceTest { TestUtils .initComputeNodeTypeInConsolidationData(mainST, computeNodeTypeName, consolidationData); - updateComputeConsolidationData("server_ps01", computeNodeTypeName, "cm01_port", + updateComputeConsolidationData("server_ps01", computeNodeTypeName, CM_01_PORT_TYPE, "cm01_port_1", consolidationData); - updateComputeConsolidationData("server_ps02", computeNodeTypeName, "cm01_port", + updateComputeConsolidationData("server_ps02", computeNodeTypeName, CM_01_PORT_TYPE, "cm01_port_2", consolidationData); GetAttrFuncData getAttrFuncData = new GetAttrFuncData("name", "c1_name"); @@ -2507,11 +2521,11 @@ public class ConsolidationServiceTest { new ImmutablePair<>("interface_2", getAttrFuncData); TestUtils.initPortConsolidationData(mainST, consolidationData); - TestUtils.updatePortConsolidationData(mainST, "cm01_port_1", - null, null, null, null, null, + TestUtils.updatePortConsolidationData(mainST, "cm01_port_1", CM_01_PORT_TYPE, + null, null, null, null, null, consolidationData); - TestUtils.updatePortConsolidationData(mainST, "cm01_port_2", - null, null, null, null, null, + TestUtils.updatePortConsolidationData(mainST, "cm01_port_2", CM_01_PORT_TYPE, + null, null, null, null, null, consolidationData); TestUtils diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/UnifiedCompositionServiceTest.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/UnifiedCompositionServiceTest.java index 92faf85541..a5eb165327 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/UnifiedCompositionServiceTest.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/UnifiedCompositionServiceTest.java @@ -75,13 +75,27 @@ public class UnifiedCompositionServiceTest { private static final String OUT_PREFIX = "/out"; private static final String FSB1_template = "FSB1_template"; private static final String FSB2_template = "FSB2_template"; - private static final String FSB3_template = "FSB3_template"; private static final String FSB1_INTERNAL = "FSB1_Internal"; private static final String FSB2_INTERNAL = "FSB2_Internal"; private static final String FSB1_INTERNAL_1 = "FSB1_Internal_1"; private static final String FSB1_INTERNAL_2 = "FSB1_Internal_2"; private static final String FSB2_INTERNAL_1 = "FSB2_Internal_1"; private static final String FSB2_INTERNAL_2 = "FSB2_Internal_2"; + + //New ports according to naming convention + //Ports with same port types + private static final String FSB1_INTERNAL_PORT_TYPE_0 = "FSB1_Internal_port_0"; + private static final String FSB1_0_INTERNAL_PORT_0 = "FSB1_0_Internal_port_0"; + private static final String FSB1_1_INTERNAL_PORT_0 = "FSB1_1_Internal_port_0"; + + //For compute type FSB + private static final String FSB_INTERNAL_PORT_TYPE_0 = "FSB_Internal_port_0"; + private static final String FSB_INTERNAL_PORT_TYPE_1 = "FSB_Internal_port_1"; + private static final String FSB_2_INTERNAL_PORT_0 = "FSB_2_Internal_port_0"; + private static final String FSB_2_INTERNAL_PORT_1 = "FSB_2_Internal_port_1"; + private static final String FSB_1_INTERNAL_PORT_0 = "FSB_1_Internal_port_0"; + private static final String FSB_1_INTERNAL_PORT_1 = "FSB_1_Internal_port_1"; + private static final String PORT = "port"; private static final String PORT_1 = "port_1"; private static final String PORT_2 = "port_2"; @@ -149,9 +163,9 @@ public class UnifiedCompositionServiceTest { @Test public void createSubstitutionStNoOutputParamAndDuplicatePortType() throws Exception { List> portTypeToIdList = new ArrayList<>(); - portTypeToIdList.add(new ImmutablePair<>(FSB1_INTERNAL, FSB1_INTERNAL_1)); - portTypeToIdList.add(new ImmutablePair<>(FSB2_INTERNAL, FSB2_INTERNAL_2)); - portTypeToIdList.add(new ImmutablePair<>(FSB2_INTERNAL, FSB2_INTERNAL_1)); + portTypeToIdList.add(new ImmutablePair<>(FSB1_INTERNAL_PORT_TYPE_0, FSB1_0_INTERNAL_PORT_0)); + portTypeToIdList.add(new ImmutablePair<>(FSB1_INTERNAL_PORT_TYPE_0, FSB1_1_INTERNAL_PORT_0)); + portTypeToIdList.add(new ImmutablePair<>(FSB1_INTERNAL_1, FSB1_INTERNAL_1)); portTypeToIdList.add(new ImmutablePair<>(FSB1_OAM, FSB1_OAM)); loadInputAndOutputData(BASE_DIRECTORY + "creSubstitutionServiceTemplate/NoOutParamDuplicatePortType"); @@ -174,8 +188,8 @@ public class UnifiedCompositionServiceTest { @Test public void createSubstitutionStWithOutputParamNoConsolidation() throws Exception { List> portTypeToIdList = new ArrayList<>(); - portTypeToIdList.add(new ImmutablePair<>(FSB1_INTERNAL, FSB1_INTERNAL_1)); - portTypeToIdList.add(new ImmutablePair<>(FSB2_INTERNAL, FSB2_INTERNAL_2)); + portTypeToIdList.add(new ImmutablePair<>(FSB1_INTERNAL_1, FSB1_INTERNAL_1)); + portTypeToIdList.add(new ImmutablePair<>(FSB2_INTERNAL_2, FSB2_INTERNAL_2)); portTypeToIdList.add(new ImmutablePair<>(FSB1_OAM, FSB1_OAM)); loadInputAndOutputData(BASE_DIRECTORY + "creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation"); @@ -201,8 +215,8 @@ public class UnifiedCompositionServiceTest { public void createSubstitutionStWithOutputParamWithConsolidation() throws Exception { List unifiedCompositionDataList = new ArrayList<>(); List> portTypeToIdList1 = new ArrayList<>(); - portTypeToIdList1.add(new ImmutablePair<>(FSB1_INTERNAL, FSB1_INTERNAL_1)); - portTypeToIdList1.add(new ImmutablePair<>(FSB2_INTERNAL, FSB2_INTERNAL_2)); + portTypeToIdList1.add(new ImmutablePair<>(FSB_INTERNAL_PORT_TYPE_1, FSB_1_INTERNAL_PORT_1)); + portTypeToIdList1.add(new ImmutablePair<>(FSB_INTERNAL_PORT_TYPE_0, FSB_1_INTERNAL_PORT_0)); loadInputAndOutputData(BASE_DIRECTORY + "creSubstitutionServiceTemplate/WithOutputParameters/consolidation"); UnifiedCompositionData unifiedCompositionData1 = @@ -212,8 +226,8 @@ public class UnifiedCompositionServiceTest { unifiedCompositionDataList.add(unifiedCompositionData1); List> portTypeToIdList2 = new ArrayList<>(); - portTypeToIdList2.add(new ImmutablePair<>(FSB1_INTERNAL, FSB1_INTERNAL_2)); - portTypeToIdList2.add(new ImmutablePair<>(FSB2_INTERNAL, FSB2_INTERNAL_1)); + portTypeToIdList2.add(new ImmutablePair<>(FSB_INTERNAL_PORT_TYPE_1, FSB_2_INTERNAL_PORT_1)); + portTypeToIdList2.add(new ImmutablePair<>(FSB_INTERNAL_PORT_TYPE_0, FSB_2_INTERNAL_PORT_0)); UnifiedCompositionData unifiedCompositionData2 = createCompositionData(FSB2_template, portTypeToIdList2); @@ -257,8 +271,8 @@ public class UnifiedCompositionServiceTest { @Test public void createSubstitutionStWithIndex() throws Exception { List> portTypeToIdList = new ArrayList<>(); - portTypeToIdList.add(new ImmutablePair<>(FSB1_INTERNAL, FSB1_INTERNAL_1)); - portTypeToIdList.add(new ImmutablePair<>(FSB2_INTERNAL, FSB2_INTERNAL_2)); + portTypeToIdList.add(new ImmutablePair<>(FSB_INTERNAL_PORT_TYPE_0, FSB_1_INTERNAL_PORT_0)); + portTypeToIdList.add(new ImmutablePair<>(FSB_INTERNAL_PORT_TYPE_1, FSB_1_INTERNAL_PORT_1)); portTypeToIdList.add(new ImmutablePair<>(FSB1_OAM, FSB1_OAM)); loadInputAndOutputData(BASE_DIRECTORY + "creSubstitutionServiceTemplate/WithIndex"); @@ -285,8 +299,8 @@ public class UnifiedCompositionServiceTest { UnifiedCompositionData data = createComputeUnifiedCompositionData(FSB1_template); List> portTypeToIdList = new ArrayList<>(); - portTypeToIdList.add(new ImmutablePair<>(FSB1_INTERNAL, FSB1_INTERNAL_1)); - portTypeToIdList.add(new ImmutablePair<>(FSB2_INTERNAL, FSB2_INTERNAL_2)); + portTypeToIdList.add(new ImmutablePair<>(FSB_INTERNAL_PORT_TYPE_1, FSB_1_INTERNAL_PORT_1)); + portTypeToIdList.add(new ImmutablePair<>(FSB_INTERNAL_PORT_TYPE_0, FSB_2_INTERNAL_PORT_0)); portTypeToIdList.add(new ImmutablePair<>(FSB1_OAM, FSB1_OAM)); addPortDataToCompositionData(portTypeToIdList, data); @@ -316,8 +330,8 @@ public class UnifiedCompositionServiceTest { UnifiedCompositionData data = createComputeUnifiedCompositionData(FSB1_template); List> portTypeToIdList = new ArrayList<>(); - portTypeToIdList.add(new ImmutablePair<>(FSB1_INTERNAL, FSB1_INTERNAL_1)); - portTypeToIdList.add(new ImmutablePair<>(FSB1_INTERNAL, FSB1_INTERNAL_2)); + portTypeToIdList.add(new ImmutablePair<>(FSB1_INTERNAL_1, FSB1_INTERNAL_1)); + portTypeToIdList.add(new ImmutablePair<>(FSB1_INTERNAL_2, FSB1_INTERNAL_2)); addPortDataToCompositionData(portTypeToIdList, data); List unifiedCompositionDataList = new LinkedList<>(); @@ -403,8 +417,8 @@ public class UnifiedCompositionServiceTest { UnifiedCompositionData data = createComputeUnifiedCompositionData(FSB1_template); List> portTypeToIdList = new ArrayList<>(); - portTypeToIdList.add(new ImmutablePair<>(FSB1_INTERNAL, FSB1_INTERNAL_1)); - portTypeToIdList.add(new ImmutablePair<>(FSB2_INTERNAL, FSB2_INTERNAL_2)); + portTypeToIdList.add(new ImmutablePair<>(FSB_INTERNAL_PORT_TYPE_0, FSB_2_INTERNAL_PORT_0)); + portTypeToIdList.add(new ImmutablePair<>(FSB_INTERNAL_PORT_TYPE_1, FSB_1_INTERNAL_PORT_1)); portTypeToIdList.add(new ImmutablePair<>(FSB1_OAM, FSB1_OAM)); addPortDataToCompositionData(portTypeToIdList, data); @@ -500,8 +514,8 @@ public class UnifiedCompositionServiceTest { UnifiedCompositionData data = createComputeUnifiedCompositionData(FSB1_template); List> portTypeToIdList = new ArrayList<>(); - portTypeToIdList.add(new ImmutablePair<>(FSB1_INTERNAL, FSB1_INTERNAL_1)); - portTypeToIdList.add(new ImmutablePair<>(FSB2_INTERNAL, FSB2_INTERNAL_2)); + portTypeToIdList.add(new ImmutablePair<>(FSB_INTERNAL_PORT_TYPE_1, FSB_1_INTERNAL_PORT_1)); + portTypeToIdList.add(new ImmutablePair<>(FSB_INTERNAL_PORT_TYPE_0, FSB_2_INTERNAL_PORT_0)); portTypeToIdList.add(new ImmutablePair<>(FSB1_OAM, FSB1_OAM)); addPortDataToCompositionData(portTypeToIdList, data); @@ -558,8 +572,8 @@ public class UnifiedCompositionServiceTest { loadInputAndOutputData(BASE_DIRECTORY + "updGroupsConnectivity/noConsolidation"); UnifiedCompositionData data = createComputeUnifiedCompositionData("server_smp1"); List> portTypeToIdList = new ArrayList<>(); - portTypeToIdList.add(new ImmutablePair<>(PORT, PORT_1)); - portTypeToIdList.add(new ImmutablePair<>(PORT, PORT_2)); + portTypeToIdList.add(new ImmutablePair<>(PORT_1, PORT_1)); + portTypeToIdList.add(new ImmutablePair<>(PORT_2, PORT_2)); addPortDataToCompositionData(portTypeToIdList, data); //Add groups @@ -619,8 +633,8 @@ public class UnifiedCompositionServiceTest { @Test public void updOutParamGetAttrInNoConsolidationTest() throws Exception { List> portTypeToIdList = new ArrayList<>(); - portTypeToIdList.add(new ImmutablePair<>(FSB1_INTERNAL, FSB1_INTERNAL_1)); - portTypeToIdList.add(new ImmutablePair<>(FSB2_INTERNAL, FSB2_INTERNAL_2)); + portTypeToIdList.add(new ImmutablePair<>(FSB1_INTERNAL_1, FSB1_INTERNAL_1)); + portTypeToIdList.add(new ImmutablePair<>(FSB2_INTERNAL_2, FSB2_INTERNAL_2)); portTypeToIdList.add(new ImmutablePair<>(FSB1_OAM, FSB1_OAM)); loadInputAndOutputData(BASE_DIRECTORY + "updOutputGetAttrIn/noConsolidation"); @@ -646,8 +660,8 @@ public class UnifiedCompositionServiceTest { public void updOutParamGetAttrInWithConsolidationTest() throws Exception { List unifiedCompositionDataList = new ArrayList<>(); List> portTypeToIdList1 = new ArrayList<>(); - portTypeToIdList1.add(new ImmutablePair<>(FSB1_INTERNAL, FSB1_INTERNAL_1)); - portTypeToIdList1.add(new ImmutablePair<>(FSB2_INTERNAL, FSB2_INTERNAL_2)); + portTypeToIdList1.add(new ImmutablePair<>(FSB1_INTERNAL_1, FSB1_INTERNAL_1)); + portTypeToIdList1.add(new ImmutablePair<>(FSB2_INTERNAL_2, FSB2_INTERNAL_2)); loadInputAndOutputData(BASE_DIRECTORY + "updOutputGetAttrIn/consolidation"); UnifiedCompositionData unifiedCompositionData1 = @@ -657,8 +671,8 @@ public class UnifiedCompositionServiceTest { unifiedCompositionDataList.add(unifiedCompositionData1); List> portTypeToIdList2 = new ArrayList<>(); - portTypeToIdList2.add(new ImmutablePair<>(FSB1_INTERNAL, FSB1_INTERNAL_2)); - portTypeToIdList2.add(new ImmutablePair<>(FSB2_INTERNAL, FSB2_INTERNAL_1)); + portTypeToIdList2.add(new ImmutablePair<>(FSB1_INTERNAL_2, FSB1_INTERNAL_2)); + portTypeToIdList2.add(new ImmutablePair<>(FSB2_INTERNAL_1, FSB2_INTERNAL_1)); UnifiedCompositionData unifiedCompositionData2 = createCompositionData(FSB2_template, portTypeToIdList2); @@ -681,8 +695,8 @@ public class UnifiedCompositionServiceTest { @Test public void updNodeGetAttrInNoConsolidationTest() throws Exception { List> portTypeToIdList = new ArrayList<>(); - portTypeToIdList.add(new ImmutablePair<>(FSB1_INTERNAL, FSB1_INTERNAL_1)); - portTypeToIdList.add(new ImmutablePair<>(FSB2_INTERNAL, FSB2_INTERNAL_2)); + portTypeToIdList.add(new ImmutablePair<>(FSB_INTERNAL_PORT_TYPE_1, FSB_1_INTERNAL_PORT_1)); + portTypeToIdList.add(new ImmutablePair<>(FSB_INTERNAL_PORT_TYPE_0, FSB_2_INTERNAL_PORT_0)); portTypeToIdList.add(new ImmutablePair<>(FSB1_OAM, FSB1_OAM)); loadInputAndOutputData(BASE_DIRECTORY + "updNodesGetAttrIn/noConsolidation"); @@ -709,8 +723,8 @@ public class UnifiedCompositionServiceTest { public void updNodeGetAttrInWithConsolidationTest() throws Exception { List unifiedCompositionDataList = new ArrayList<>(); List> portTypeToIdList1 = new ArrayList<>(); - portTypeToIdList1.add(new ImmutablePair<>(FSB1_INTERNAL, FSB1_INTERNAL_1)); - portTypeToIdList1.add(new ImmutablePair<>(FSB2_INTERNAL, FSB2_INTERNAL_2)); + portTypeToIdList1.add(new ImmutablePair<>(FSB_INTERNAL_PORT_TYPE_1, FSB_1_INTERNAL_PORT_1)); + portTypeToIdList1.add(new ImmutablePair<>(FSB_INTERNAL_PORT_TYPE_0, FSB_1_INTERNAL_PORT_0)); loadInputAndOutputData(BASE_DIRECTORY + "updNodesGetAttrIn/consolidation"); UnifiedCompositionData unifiedCompositionData1 = @@ -720,8 +734,8 @@ public class UnifiedCompositionServiceTest { unifiedCompositionDataList.add(unifiedCompositionData1); List> portTypeToIdList2 = new ArrayList<>(); - portTypeToIdList2.add(new ImmutablePair<>(FSB1_INTERNAL, FSB1_INTERNAL_2)); - portTypeToIdList2.add(new ImmutablePair<>(FSB2_INTERNAL, FSB2_INTERNAL_1)); + portTypeToIdList2.add(new ImmutablePair<>(FSB_INTERNAL_PORT_TYPE_1, FSB_2_INTERNAL_PORT_1)); + portTypeToIdList2.add(new ImmutablePair<>(FSB_INTERNAL_PORT_TYPE_0, FSB_2_INTERNAL_PORT_0)); UnifiedCompositionData unifiedCompositionData2 = createCompositionData(FSB2_template, portTypeToIdList2); @@ -746,8 +760,8 @@ public class UnifiedCompositionServiceTest { @Test public void updNodesGetAttrFromInnerNodesTest() throws Exception { List> portTypeToIdList = new ArrayList<>(); - portTypeToIdList.add(new ImmutablePair<>(FSB1_INTERNAL, FSB1_INTERNAL_1)); - portTypeToIdList.add(new ImmutablePair<>(FSB2_INTERNAL, FSB2_INTERNAL_2)); + portTypeToIdList.add(new ImmutablePair<>(FSB_INTERNAL_PORT_TYPE_1, FSB_1_INTERNAL_PORT_1)); + portTypeToIdList.add(new ImmutablePair<>(FSB_INTERNAL_PORT_TYPE_0, FSB_1_INTERNAL_PORT_0)); portTypeToIdList.add(new ImmutablePair<>(FSB1_OAM, FSB1_OAM)); loadInputAndOutputData(BASE_DIRECTORY + @@ -779,8 +793,8 @@ public class UnifiedCompositionServiceTest { public void updNodesGetAttrFromConsolidationNodesTest() throws Exception { List unifiedCompositionDataList = new ArrayList<>(); List> portTypeToIdList1 = new ArrayList<>(); - portTypeToIdList1.add(new ImmutablePair<>(FSB1_INTERNAL, FSB1_INTERNAL_1)); - portTypeToIdList1.add(new ImmutablePair<>(FSB2_INTERNAL, FSB2_INTERNAL_2)); + portTypeToIdList1.add(new ImmutablePair<>(FSB_INTERNAL_PORT_TYPE_1, FSB_1_INTERNAL_PORT_1)); + portTypeToIdList1.add(new ImmutablePair<>(FSB_INTERNAL_PORT_TYPE_0, FSB_1_INTERNAL_PORT_0)); loadInputAndOutputData(BASE_DIRECTORY + "creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation"); @@ -791,8 +805,8 @@ public class UnifiedCompositionServiceTest { unifiedCompositionDataList.add(unifiedCompositionData1); List> portTypeToIdList2 = new ArrayList<>(); - portTypeToIdList2.add(new ImmutablePair<>(FSB1_INTERNAL, FSB1_INTERNAL_2)); - portTypeToIdList2.add(new ImmutablePair<>(FSB2_INTERNAL, FSB2_INTERNAL_1)); + portTypeToIdList2.add(new ImmutablePair<>(FSB_INTERNAL_PORT_TYPE_1, FSB_2_INTERNAL_PORT_1)); + portTypeToIdList2.add(new ImmutablePair<>(FSB_INTERNAL_PORT_TYPE_0, FSB_2_INTERNAL_PORT_0)); UnifiedCompositionData unifiedCompositionData2 = createCompositionData(FSB2_template, portTypeToIdList2); @@ -887,8 +901,8 @@ public class UnifiedCompositionServiceTest { loadInputAndOutputData(BASE_DIRECTORY + "fixNewAbstractNodeTemplate/noConsolidation"); List> portTypeToIdList = new ArrayList<>(); - portTypeToIdList.add(new ImmutablePair<>(FSB1_INTERNAL, FSB1_INTERNAL_1)); - portTypeToIdList.add(new ImmutablePair<>(FSB1_INTERNAL, FSB1_INTERNAL_2)); + portTypeToIdList.add(new ImmutablePair<>(FSB1_INTERNAL_1, FSB1_INTERNAL_1)); + portTypeToIdList.add(new ImmutablePair<>(FSB1_INTERNAL_2, FSB1_INTERNAL_2)); NodeTemplate cleanedComputeNodeTemplate = getMockNode( @@ -969,11 +983,11 @@ public class UnifiedCompositionServiceTest { context.getTranslatedServiceTemplates() .put(MAIN_SERVICE_TEMPLATE_YAML, inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML)); - UnifiedCompositionData unifiedComposition = createUnifiedCompositionOnlyNested("server_pcm_001"); - UnifiedCompositionTo unifiedCompositionTo = new UnifiedCompositionTo( - inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML), inputServiceTemplates.get(nestedFileName), null, - context, null); - unifiedCompositionService.handleUnifiedNestedDefinition(unifiedCompositionTo, unifiedComposition); + UnifiedCompositionData unifiedComposition = createUnifiedCompositionOnlyNested("server_pcm_001"); + UnifiedCompositionTo unifiedCompositionTo = new UnifiedCompositionTo( + inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML), inputServiceTemplates.get(nestedFileName), null, + context, null); + unifiedCompositionService.handleUnifiedNestedDefinition(unifiedCompositionTo, unifiedComposition); checkSTResults(expectedOutserviceTemplates, nestedFileName, context.getTranslatedServiceTemplates().get(nestedFileName), @@ -1012,17 +1026,17 @@ public class UnifiedCompositionServiceTest { context.getTranslatedServiceTemplates() .put(MAIN_SERVICE_TEMPLATE_YAML, inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML)); - UnifiedCompositionData unifiedComposition = - createUnifiedCompositionOnlyNested("server_pcm_001"); - UnifiedCompositionTo unifiedCompositionTo1 = new UnifiedCompositionTo(inputServiceTemplates - .get(MAIN_SERVICE_TEMPLATE_YAML), inputServiceTemplates.get(nestedFileName1), null, - context, null); - unifiedCompositionService.handleUnifiedNestedDefinition(unifiedCompositionTo1, unifiedComposition); - unifiedComposition = createUnifiedCompositionOnlyNested("server_oam_001"); - UnifiedCompositionTo unifiedCompositionTo2 = new UnifiedCompositionTo(inputServiceTemplates - .get(MAIN_SERVICE_TEMPLATE_YAML), inputServiceTemplates.get(nestedFileName2), null, - context, null); - unifiedCompositionService.handleUnifiedNestedDefinition(unifiedCompositionTo2, unifiedComposition); + UnifiedCompositionData unifiedComposition = + createUnifiedCompositionOnlyNested("server_pcm_001"); + UnifiedCompositionTo unifiedCompositionTo1 = new UnifiedCompositionTo(inputServiceTemplates + .get(MAIN_SERVICE_TEMPLATE_YAML), inputServiceTemplates.get(nestedFileName1), null, + context, null); + unifiedCompositionService.handleUnifiedNestedDefinition(unifiedCompositionTo1, unifiedComposition); + unifiedComposition = createUnifiedCompositionOnlyNested("server_oam_001"); + UnifiedCompositionTo unifiedCompositionTo2 = new UnifiedCompositionTo(inputServiceTemplates + .get(MAIN_SERVICE_TEMPLATE_YAML), inputServiceTemplates.get(nestedFileName2), null, + context, null); + unifiedCompositionService.handleUnifiedNestedDefinition(unifiedCompositionTo2, unifiedComposition); checkSTResults(expectedOutserviceTemplates, nestedFileName1, context.getTranslatedServiceTemplates().get(nestedFileName1), @@ -1144,8 +1158,8 @@ public class UnifiedCompositionServiceTest { loadInputAndOutputData(BASE_DIRECTORY + "inputoutputparamtype"); ConsolidationData consolidationData = new ConsolidationData(); List> portTypeToIdList = new ArrayList<>(); - portTypeToIdList.add(new ImmutablePair<>("FSB1_Port", "FSB1_Port_1")); - portTypeToIdList.add(new ImmutablePair<>("VMI", "VMI_1")); + portTypeToIdList.add(new ImmutablePair<>("FSB1_Port_1", "FSB1_Port_1")); + portTypeToIdList.add(new ImmutablePair<>("VMI_1", "VMI_1")); UnifiedCompositionData unifiedCompositionData = createCompositionData(FSB1, portTypeToIdList); @@ -1335,7 +1349,7 @@ public class UnifiedCompositionServiceTest { Multimap nodeConnectedOut = TestUtils.getNodeConnectedOutList(portNodeTemplate, "link"); PortTemplateConsolidationData portTemplateConsolidationData = - TestUtils.createPortTemplateConsolidationData(port.getRight()); + TestUtils.createPortTemplateConsolidationData(port.getRight(), port.getLeft()); portTemplateConsolidationData.setNodesConnectedOut(nodeConnectedOut); unifiedCompositionData.addPortTemplateConsolidationData(portTemplateConsolidationData); } @@ -1349,17 +1363,17 @@ public class UnifiedCompositionServiceTest { UnifiedCompositionData data2 = createComputeUnifiedCompositionData(FSB2_template); List> portTypeToIdList = new ArrayList<>(); - ImmutablePair portTypePair1 = new ImmutablePair<>(FSB1_INTERNAL, - FSB1_INTERNAL_1); - ImmutablePair portTypePair2 = new ImmutablePair<>(FSB2_INTERNAL, - FSB2_INTERNAL_1); + ImmutablePair portTypePair1 = new ImmutablePair<>(FSB_INTERNAL_PORT_TYPE_0, + FSB_1_INTERNAL_PORT_0); + ImmutablePair portTypePair2 = new ImmutablePair<>(FSB_INTERNAL_PORT_TYPE_1, + FSB_1_INTERNAL_PORT_1); portTypeToIdList.add(portTypePair1); portTypeToIdList.add(portTypePair2); addPortDataToCompositionData(portTypeToIdList, data1); portTypeToIdList.remove(portTypePair1); portTypeToIdList.remove(portTypePair2); - portTypeToIdList.add(new ImmutablePair<>(FSB1_INTERNAL, FSB1_INTERNAL_2)); - portTypeToIdList.add(new ImmutablePair<>(FSB2_INTERNAL, FSB2_INTERNAL_2)); + portTypeToIdList.add(new ImmutablePair<>(FSB_INTERNAL_PORT_TYPE_0, FSB_2_INTERNAL_PORT_0)); + portTypeToIdList.add(new ImmutablePair<>(FSB_INTERNAL_PORT_TYPE_1, FSB_2_INTERNAL_PORT_1)); addPortDataToCompositionData(portTypeToIdList, data2); unifiedCompositionDataList.add(data1); @@ -1421,7 +1435,7 @@ public class UnifiedCompositionServiceTest { Multimap portNodeConnectedOut = TestUtils.getNodeConnectedOutList(portNodeTemplate, "link"); PortTemplateConsolidationData portTemplateConsolidationData = TestUtils - .createPortTemplateConsolidationData(port.getRight()); + .createPortTemplateConsolidationData(port.getRight(), port.getLeft()); portTemplateConsolidationData.setNodesConnectedOut(portNodeConnectedOut); //Add node connected in info to test data @@ -1454,12 +1468,12 @@ public class UnifiedCompositionServiceTest { private void addGetAttrForPort(UnifiedCompositionData unifiedCompositionData) { for (PortTemplateConsolidationData portTemplateConsolidationData : unifiedCompositionData .getPortTemplateConsolidationDataList()) { - if (portTemplateConsolidationData.getNodeTemplateId().equals(FSB1_INTERNAL_1)) { + if (portTemplateConsolidationData.getNodeTemplateId().equals(FSB_1_INTERNAL_PORT_1)) { addGetAttInUnifiedCompositionData(portTemplateConsolidationData, "network_name", NETWORK_ID, JSA_NET1); addGetAttInUnifiedCompositionData(portTemplateConsolidationData, SIZE, DEVICE_OWNER, CMAUI_VOLUME1); - } else if (portTemplateConsolidationData.getNodeTemplateId().equals(FSB2_INTERNAL_2)) { + } else if (portTemplateConsolidationData.getNodeTemplateId().equals(FSB_2_INTERNAL_PORT_0)) { addGetAttInUnifiedCompositionData(portTemplateConsolidationData, TENANT_ID, NETWORK_ID, JSA_NET1); addGetAttInUnifiedCompositionData(portTemplateConsolidationData, "qos_policy", @@ -1491,7 +1505,7 @@ public class UnifiedCompositionServiceTest { private void addGetAttrForPortInnerUC(UnifiedCompositionData unifiedCompositionData) { for (PortTemplateConsolidationData portTemplateConsolidationData : unifiedCompositionData .getPortTemplateConsolidationDataList()) { - if (portTemplateConsolidationData.getNodeTemplateId().equals(FSB1_INTERNAL_1)) { + if (portTemplateConsolidationData.getNodeTemplateId().equals(FSB_1_INTERNAL_PORT_1)) { addGetAttInUnifiedCompositionData(portTemplateConsolidationData, AVAILABILITY_ZONE, MYATTR, FSB1_template); addGetAttInUnifiedCompositionData(portTemplateConsolidationData, "metadata", diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/buildconsolidationdata/ConsolidationDataTestUtil.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/buildconsolidationdata/ConsolidationDataTestUtil.java index 1fedc7b09c..b2fa3e7666 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/buildconsolidationdata/ConsolidationDataTestUtil.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/buildconsolidationdata/ConsolidationDataTestUtil.java @@ -394,7 +394,7 @@ public class ConsolidationDataTestUtil { portMap.put(portNode, new LinkedHashMap<>()); } Map> portTypMaps = portMap.get(portNode); - String id = ConsolidationDataUtil.getPortType(nodeName); + String id = ConsolidationDataUtil.getPortType(nodeName, "a"); if (!portTypMaps.containsKey(id)) { portTypMaps.put(id, new ArrayList<>()); } diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/unifiedmodel/commands/PortNewNodeTemplateIdGeneratorTest.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/unifiedmodel/commands/PortNewNodeTemplateIdGeneratorTest.java index 9d8f6a972f..6791614a19 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/unifiedmodel/commands/PortNewNodeTemplateIdGeneratorTest.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/unifiedmodel/commands/PortNewNodeTemplateIdGeneratorTest.java @@ -57,7 +57,7 @@ public class PortNewNodeTemplateIdGeneratorTest { Optional nodeTemplateId = unifiedSubstitutionNodeTemplateIdGenerator.generate(unifiedCompositionTo, PCM_PORT_0); if (nodeTemplateId.isPresent()) { - Assert.assertEquals(nodeTemplateId.get(), "pcm_server_pcm_port"); + Assert.assertEquals(nodeTemplateId.get(), "pcm_server_pcm_port_0"); } else { Assert.fail(); } diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/in/base_vIECCF.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/in/base_vIECCF.yml index 6025cd8344..d6794e1dd2 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/in/base_vIECCF.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/in/base_vIECCF.yml @@ -280,13 +280,13 @@ resources: networks: - port: - get_resource: plt_internal_0_port_0 + get_resource: plt_0_internal_port_0 - port: - get_resource: plt_oam_0_port_0 + get_resource: plt_0_oam_port_0 - port: - get_resource: plt_data_0_port_0 + get_resource: plt_0_data_port_0 user_data_format: RAW user_data: str_replace: @@ -340,20 +340,20 @@ resources: networks: - get_attr: - - plt_internal_0_port_0 + - plt_0_internal_port_0 - network_id - get_attr: - - plt_oam_0_port_0 + - plt_0_oam_port_0 - network_id - get_attr: - - plt_data_0_port_0 + - plt_0_data_port_0 - network_id mcas_mate_id: m002 pair_uuid: {get_param: plt_pair_uuid} shared_vol1: {get_param: plt_volume_shared_id_0} - plt_internal_0_port_0: + plt_0_internal_port_0: type: OS::Neutron::Port properties: name: @@ -372,7 +372,7 @@ resources: metadata: os_net: {get_resource: internal_net_0 } - plt_internal_0_port_1: + plt_1_internal_port_0: type: OS::Neutron::Port properties: name: @@ -391,7 +391,7 @@ resources: metadata: os_net: {get_resource: internal_net_0 } - plt_oam_0_port_0: + plt_0_oam_port_0: type: OS::Neutron::Port properties: name: @@ -421,7 +421,7 @@ resources: os_net: { get_param: oam_net_id } ext_net: oam - plt_oam_0_port_1: + plt_1_oam_port_0: type: OS::Neutron::Port properties: name: @@ -448,7 +448,7 @@ resources: os_net: { get_param: oam_net_id } ext_net: oam - plt_data_0_port_0: + plt_0_data_port_0: type: OS::Neutron::Port properties: name: @@ -478,7 +478,7 @@ resources: os_net: { get_param: data_net_id } ext_net: data - plt_data_0_port_1: + plt_1_data_port_0: type: OS::Neutron::Port properties: name: @@ -529,13 +529,13 @@ resources: networks: - port: - get_resource: plt_internal_0_port_1 + get_resource: plt_1_internal_port_0 - port: - get_resource: plt_oam_0_port_1 + get_resource: plt_1_oam_port_0 - port: - get_resource: plt_data_0_port_1 + get_resource: plt_1_data_port_0 user_data_format: RAW user_data: str_replace: @@ -688,13 +688,13 @@ resources: networks: - port: - get_resource: iox_internal_0_port_0 + get_resource: iox_0_internal_port_0 - port: - get_resource: iox_oam_0_port_0 + get_resource: iox_0_oam_port_0 - port: - get_resource: iox_data_0_port_0 + get_resource: iox_0_data_port_0 user_data_format: RAW user_data: str_replace: @@ -744,20 +744,20 @@ resources: networks: - get_attr: - - iox_internal_0_port_0 + - iox_0_internal_port_0 - network_id - get_attr: - - iox_oam_0_port_0 + - iox_0_oam_port_0 - network_id - get_attr: - - iox_data_0_port_0 + - iox_0_data_port_0 - network_id mcas_mate_id: m004 pair_uuid: {get_param: iox_pair_uuid} # shared_vol1: {get_param: iox_volume_shared_0} - iox_internal_0_port_0: + iox_0_internal_port_0: type: OS::Neutron::Port properties: name: @@ -776,7 +776,7 @@ resources: metadata: os_net: {get_resource: internal_net_0 } - iox_oam_0_port_0: + iox_0_oam_port_0: type: OS::Neutron::Port properties: name: @@ -800,7 +800,7 @@ resources: metadata: os_net: { get_param: oam_net_id } ext_net: io - iox_data_0_port_0: + iox_0_data_port_0: type: OS::Neutron::Port properties: name: @@ -844,13 +844,13 @@ resources: networks: - port: - get_resource: iox_internal_0_port_1 + get_resource: iox_1_internal_port_0 - port: - get_resource: iox_oam_0_port_1 + get_resource: iox_1_oam_port_0 - port: - get_resource: iox_data_0_port_1 + get_resource: iox_1_data_port_0 user_data_format: RAW user_data: str_replace: @@ -913,7 +913,7 @@ resources: mcas_mate_id: m003 pair_uuid: {get_param: iox_pair_uuid} # shared_vol1: {get_param: iox_volume_shared_0} - iox_internal_0_port_1: + iox_1_internal_port_0: type: OS::Neutron::Port properties: name: @@ -933,7 +933,7 @@ resources: metadata: os_net: {get_resource: internal_net_0 } - iox_oam_0_port_1: + iox_1_oam_port_0: type: OS::Neutron::Port properties: name: @@ -962,7 +962,7 @@ resources: metadata: os_net: { get_param: oam_net_id } ext_net: io - iox_data_0_port_1: + iox_1_data_port_0: type: OS::Neutron::Port properties: name: @@ -1059,13 +1059,13 @@ resources: networks: - port: - get_resource: app_internal_0_port_0 + get_resource: app_0_internal_port_0 - port: - get_resource: app_oam_0_port_0 + get_resource: app_0_oam_port_0 - port: - get_resource: app_data_0_port_0 + get_resource: app_0_data_port_0 user_data_format: RAW user_data: str_replace: @@ -1114,17 +1114,17 @@ resources: networks: - get_attr: - - app_internal_0_port_0 + - app_0_internal_port_0 - network_id - get_attr: - - app_oam_0_port_0 + - app_0_oam_port_0 - network_id - get_attr: - - app_data_0_port_0 + - app_0_data_port_0 - network_id - app_internal_0_port_0: + app_0_internal_port_0: type: OS::Neutron::Port properties: name: @@ -1143,7 +1143,7 @@ resources: metadata: os_net: {get_resource: internal_net_0 } - app_oam_0_port_0: + app_0_oam_port_0: type: OS::Neutron::Port properties: name: @@ -1162,7 +1162,7 @@ resources: os_net: { get_param: oam_net_id } ext_net: oam - app_data_0_port_0: + app_0_data_port_0: type: OS::Neutron::Port properties: name: @@ -1204,13 +1204,13 @@ resources: networks: - port: - get_resource: app_internal_0_port_1 + get_resource: app_1_internal_port_0 - port: - get_resource: app_oam_0_port_1 + get_resource: app_1_oam_port_0 - port: - get_resource: app_data_0_port_1 + get_resource: app_1_data_port_0 user_data_format: RAW user_data: str_replace: @@ -1270,7 +1270,7 @@ resources: get_attr: - app_data_1_port_0 - network_id - app_internal_0_port_1: + app_1_internal_port_0: type: OS::Neutron::Port properties: name: @@ -1289,7 +1289,7 @@ resources: metadata: os_net: {get_resource: internal_net_0 } - app_oam_0_port_1: + app_1_oam_port_0: type: OS::Neutron::Port properties: name: @@ -1311,7 +1311,7 @@ resources: os_net: { get_param: oam_net_id } ext_net: oam - app_data_0_port_1: + app_1_data_port_0: type: OS::Neutron::Port properties: name: @@ -1353,13 +1353,13 @@ resources: networks: - port: - get_resource: app_internal_0_port_2 + get_resource: app_2_internal_port_0 - port: - get_resource: app_oam_0_port_2 + get_resource: app_2_oam_port_0 - port: - get_resource: app_data_0_port_2 + get_resource: app_2_data_port_0 user_data_format: RAW user_data: str_replace: @@ -1418,7 +1418,7 @@ resources: get_attr: - app_data_2_port_0 - network_id - app_internal_0_port_2: + app_2_internal_port_0: type: OS::Neutron::Port properties: name: @@ -1437,7 +1437,7 @@ resources: metadata: os_net: {get_resource: internal_net_0 } - app_oam_0_port_2: + app_2_oam_port_0: type: OS::Neutron::Port properties: name: @@ -1459,7 +1459,7 @@ resources: os_net: { get_param: oam_net_id } ext_net: oam - app_data_0_port_2: + app_2_data_port_0: type: OS::Neutron::Port properties: name: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/GlobalSubstitutionTypesServiceTemplate.yaml index c2bde7bca1..fc83a30f88 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,39 +8,33 @@ node_types: org.openecomp.resource.abstract.nodes.plt: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_plt_data_0_port_related_networks: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_plt_oam_0_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_plt_oam_0_port_subnetpoolid: + port_plt_oam_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_plt_internal_0_port_allowed_address_pairs: + port_plt_data_port_0_allowed_address_pairs: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.heat.network.AddressPair - port_plt_oam_0_port_security_groups: + port_plt_oam_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements + port_plt_oam_port_0_network_role: + type: string + required: true + status: SUPPORTED compute_plt_config_drive: type: list required: true status: SUPPORTED entry_schema: type: boolean - port_plt_data_0_port_subnetpoolid: + port_plt_data_port_0_network_role_tag: type: string required: true status: SUPPORTED @@ -48,145 +42,153 @@ node_types: type: string required: true status: SUPPORTED - port_plt_internal_0_port_vlan_requirements: + port_plt_internal_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_plt_data_0_port_fixed_ips: + port_plt_data_port_0_network_role: + type: string + required: true + status: SUPPORTED + port_plt_internal_port_0_replacement_policy: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps + type: string + port_plt_data_port_0_security_groups: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json vm_image_name: type: string required: true status: SUPPORTED - compute_plt_availability_zone: + port_plt_oam_port_0_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_plt_oam_0_port_name: + compute_plt_availability_zone: type: list required: true status: SUPPORTED entry_schema: type: string - port_plt_internal_0_port_security_groups: - type: list - required: true - status: SUPPORTED - entry_schema: - type: json - port_plt_internal_0_port_network_role_tag: + port_plt_internal_port_0_network_role: type: string required: true status: SUPPORTED - port_plt_oam_0_port_ip_requirements: + port_plt_data_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_plt_data_0_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_plt_data_0_port_allowed_address_pairs: + port_plt_data_port_0_replacement_policy: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.network.AddressPair - port_plt_internal_0_port_subnetpoolid: + type: string + port_plt_internal_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_plt_data_0_port_ip_requirements: + port_plt_data_port_0_order: + type: integer + required: true + status: SUPPORTED + port_plt_oam_port_0_security_groups: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_plt_internal_0_port_network: + type: json + port_plt_oam_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_plt_internal_port_0_allowed_address_pairs: type: list required: true status: SUPPORTED entry_schema: - type: string - compute_plt_metadata: + type: org.openecomp.datatypes.heat.network.AddressPair + port_plt_internal_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: json - port_plt_data_0_port_security_groups: + type: org.openecomp.datatypes.network.IpRequirements + compute_plt_metadata: type: list required: true status: SUPPORTED entry_schema: type: json - port_plt_oam_0_port_related_networks: + port_plt_internal_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_plt_internal_0_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_plt_oam_port_0_fixed_ips: + type: list required: true status: SUPPORTED - port_plt_data_0_port_order: - type: integer + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_plt_internal_port_0_security_groups: + type: list required: true status: SUPPORTED - port_plt_data_0_port_vlan_requirements: + entry_schema: + type: json + port_plt_data_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_plt_data_0_port_network_role_tag: - type: string - required: true - status: SUPPORTED - port_plt_internal_0_port_order: - type: integer - required: true - status: SUPPORTED - port_plt_internal_0_port_ip_requirements: + port_plt_oam_port_0_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_plt_oam_0_port_fixed_ips: + type: string + port_plt_oam_port_0_replacement_policy: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_plt_oam_0_port_network_role_tag: - type: string - required: true - status: SUPPORTED - port_plt_internal_0_port_name: + type: string + port_plt_oam_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: string - port_plt_internal_0_port_related_networks: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_plt_data_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_plt_oam_0_port_order: + port_plt_internal_port_0_order: + type: integer + required: true + status: SUPPORTED + port_plt_internal_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_plt_oam_port_0_order: type: integer required: true status: SUPPORTED @@ -196,56 +198,40 @@ node_types: status: SUPPORTED entry_schema: type: string - port_plt_oam_0_port_network_role: + port_plt_oam_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_plt_oam_0_port_allowed_address_pairs: - type: list + port_plt_internal_port_0_network_role_tag: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.network.AddressPair - port_plt_data_0_port_name: - type: list + port_plt_data_port_0_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: string - port_plt_data_0_port_exCP_naming: + port_plt_data_port_0_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_plt_internal_0_port_network_role: - type: string - required: true - status: SUPPORTED compute_plt_user_data_format: type: list required: true status: SUPPORTED entry_schema: type: string - port_plt_internal_0_port_replacement_policy: + port_plt_internal_port_0_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_plt_data_0_port_network: + port_plt_data_port_0_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: string - port_plt_data_0_port_network_role: - type: string - required: true - status: SUPPORTED - port_plt_internal_0_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED + type: org.openecomp.datatypes.heat.neutron.port.FixedIps index_value: type: integer description: Index value of this substitution service template runtime instance @@ -254,62 +240,76 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_plt_oam_0_port_network: + port_plt_data_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_plt_internal_port_0_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_plt_oam_0_port_replacement_policy: + port_plt_oam_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_plt_data_0_port_replacement_policy: + type: org.openecomp.datatypes.network.VlanRequirements + compute_plt_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_plt_oam_0_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_plt_internal_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - compute_plt_name: + port_plt_data_port_0_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_plt_oam_0_port_vlan_requirements: + port_plt_data_port_0_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: string + port_plt_oam_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_plt_oam_port_0_allowed_address_pairs: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.heat.network.AddressPair requirements: - - dependency_plt_plt_internal_0_port: + - dependency_plt_plt_data_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_plt_plt_internal_0_port: + - link_plt_plt_data_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_plt_plt_data_0_port: + - dependency_plt_plt_oam_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_plt_plt_data_0_port: + - link_plt_plt_oam_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -329,21 +329,32 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_plt_plt_oam_0_port: + - dependency_plt_plt_internal_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_plt_plt_oam_0_port: + - link_plt_plt_internal_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: - network.outgoing.bytes.rate_plt_plt_oam_0_port: + network.incoming.packets_plt_plt_oam_port_0: + 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 + attachment_plt_plt_internal_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes.rate_plt_plt_internal_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -355,6 +366,14 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_plt_plt_data_port_0: + 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 disk.iops_plt: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -367,6 +386,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes.rate_plt_plt_data_port_0: + 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_plt: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -379,13 +404,13 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.read.bytes_plt: + network.outgoing.packets.rate_plt_plt_internal_port_0: 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_plt_plt_internal_0_port: + disk.read.bytes_plt: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -403,118 +428,120 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.read.bytes.rate_plt: + network.outpoing.packets_plt_plt_oam_port_0: 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_plt: - type: tosca.capabilities.Endpoint.Admin - occurrences: - - 1 - - UNBOUNDED - disk.read.requests_plt: + network.outgoing.bytes.rate_plt_plt_internal_port_0: 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_plt_plt_oam_0_port: + network.outgoing.packets.rate_plt_plt_oam_port_0: 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_plt: + network.outgoing.bytes_plt_plt_internal_port_0: 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 - attachment_plt_plt_data_0_port: - type: tosca.capabilities.Attachment + disk.device.read.bytes.rate_plt: + 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_plt: - type: tosca.capabilities.Node + network.incoming.bytes.rate_plt_plt_oam_port_0: + 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_plt: + network.incoming.bytes_plt_plt_internal_port_0: 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_plt: + network.incoming.bytes_plt_plt_oam_port_0: 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_plt_plt_internal_0_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + endpoint_plt: + type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED - disk.device.write.bytes_plt: + disk.read.requests_plt: 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_plt_plt_oam_0_port: + disk.device.write.requests.rate_plt: 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_plt_plt_internal_0_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_plt: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.incoming.bytes_plt_plt_internal_0_port: + cpu_plt: 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.packets.rate_plt_plt_oam_0_port: + network.incoming.packets_plt_plt_data_port_0: 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_plt_plt_oam_0_port: + disk.write.requests_plt: 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_plt_plt_data_0_port: + disk.device.write.bytes_plt: 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 - attachment_plt_plt_internal_0_port: - type: tosca.capabilities.Attachment + feature_plt_plt_internal_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - binding_plt: + binding_plt_plt_oam_port_0: 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 + feature_plt_plt_oam_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_plt_plt_oam_0_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_plt: + type: tosca.capabilities.network.Bindable occurrences: - 1 - UNBOUNDED @@ -530,19 +557,17 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_plt_plt_data_0_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_plt_plt_oam_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_plt_plt_internal_0_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_plt_plt_data_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - binding_plt_plt_internal_0_port: + binding_plt_plt_internal_port_0: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface @@ -550,11 +575,6 @@ node_types: occurrences: - 0 - UNBOUNDED - feature_plt_plt_internal_0_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED instance_plt: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -567,198 +587,178 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.write.bytes.rate_plt: + network.incoming.packets.rate_plt_plt_internal_port_0: 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.ephemeral.size_plt: + network.outgoing.bytes_plt_plt_data_port_0: 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_plt: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_plt_plt_data_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - binding_plt_plt_oam_0_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 - memory.usage_plt: + disk.write.bytes.rate_plt: 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 - attachment_plt_plt_oam_0_port: - type: tosca.capabilities.Attachment + network.outgoing.packets.rate_plt_plt_data_port_0: + 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_plt_plt_oam_0_port: + disk.ephemeral.size_plt: 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_plt: + cpu_util_plt: 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_plt_plt_oam_0_port: - type: org.openecomp.capabilities.Forwarder + attachment_plt_plt_data_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - binding_plt_plt_data_0_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 - disk.device.read.requests_plt: + network.incoming.packets.rate_plt_plt_data_port_0: 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_plt: + network.incoming.packets.rate_plt_plt_oam_port_0: 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.packets.rate_plt_plt_internal_0_port: + network.outgoing.bytes_plt_plt_oam_port_0: 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_plt: - type: tosca.capabilities.Scalable + memory.usage_plt: + 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_plt_plt_oam_0_port: + network.outgoing.bytes.rate_plt_plt_data_port_0: 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.packets.rate_plt_plt_data_0_port: + network.outpoing.packets_plt_plt_data_port_0: 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_plt_plt_data_0_port: + disk.device.capacity_plt: 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_plt: + disk.device.read.requests_plt: 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_plt_plt_oam_0_port: - type: tosca.capabilities.Node + forwarder_plt_plt_internal_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_plt_plt_internal_0_port: + memory.resident_plt: 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_plt: + scalable_plt: + type: tosca.capabilities.Scalable + occurrences: + - 1 + - UNBOUNDED + network.outpoing.packets_plt_plt_internal_port_0: 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_plt: + network.incoming.bytes_plt_plt_data_port_0: 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_plt_plt_data_0_port: + network.outgoing.bytes.rate_plt_plt_oam_port_0: 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_plt: + disk.usage_plt: 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_plt: + network.incoming.packets_plt_plt_internal_port_0: 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_plt_plt_data_0_port: - type: tosca.capabilities.Node + memory_plt: + 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_plt_plt_data_0_port: + disk.root.size_plt: 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_plt: + cpu.delta_plt: 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_plt_plt_data_0_port: + disk.device.write.requests_plt: 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_plt: - type: tosca.capabilities.OperatingSystem - occurrences: - - 1 - - UNBOUNDED - network.outgoing.bytes.rate_plt_plt_internal_0_port: + disk.device.read.requests.rate_plt: 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_plt_plt_internal_0_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - network.incoming.packets_plt_plt_data_0_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + os_plt: + type: tosca.capabilities.OperatingSystem occurrences: - 1 - UNBOUNDED @@ -793,66 +793,66 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_plt_plt_data_0_port: - type: org.openecomp.capabilities.Forwarder + attachment_plt_plt_oam_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED org.openecomp.resource.abstract.nodes.app: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_app_data_0_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED compute_app_scheduler_hints: type: list required: true status: SUPPORTED entry_schema: type: json - port_app_internal_0_port_ip_requirements: + port_app_data_port_0_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_app_data_0_port_network_role: + type: string + port_app_internal_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + vm_flavor_name: type: string required: true status: SUPPORTED - port_app_oam_0_port_replacement_policy: + port_app_oam_port_0_security_groups: type: list required: true status: SUPPORTED entry_schema: - type: string - port_app_oam_0_port_network: + type: json + port_app_internal_port_0_allowed_address_pairs: type: list required: true status: SUPPORTED entry_schema: - type: string - vm_flavor_name: - type: string + type: org.openecomp.datatypes.heat.network.AddressPair + port_app_oam_port_0_network: + type: list required: true status: SUPPORTED - port_app_data_0_port_fixed_ips: + entry_schema: + type: string + port_app_internal_port_0_name: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps + type: string vm_image_name: type: string required: true status: SUPPORTED - port_app_oam_0_port_name: - type: list + port_app_internal_port_0_network_role: + type: string required: true status: SUPPORTED - entry_schema: - type: string compute_app_availability_zone: type: list required: true @@ -865,216 +865,216 @@ node_types: status: SUPPORTED entry_schema: type: boolean - port_app_oam_0_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_app_data_0_port_network: + port_app_data_port_0_replacement_policy: type: list required: true status: SUPPORTED entry_schema: type: string - port_app_data_0_port_network_role_tag: - type: string - required: true - status: SUPPORTED - port_app_oam_0_port_network_role_tag: - type: string - required: true - status: SUPPORTED - port_app_data_0_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_app_oam_port_0_ip_requirements: + type: list required: true status: SUPPORTED - port_app_data_0_port_vlan_requirements: + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_app_data_port_0_name: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_app_internal_0_port_network_role_tag: - type: string + type: string + port_app_oam_port_0_order: + type: integer required: true status: SUPPORTED - port_app_internal_0_port_related_networks: + port_app_oam_port_0_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_app_oam_0_port_network_role: - type: string + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_app_internal_port_0_replacement_policy: + type: list required: true status: SUPPORTED - compute_app_metadata: + entry_schema: + type: string + port_app_data_port_0_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: json - port_app_data_0_port_related_networks: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_app_data_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_app_data_0_port_ip_requirements: + type: org.openecomp.datatypes.network.VlanRequirements + port_app_data_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + compute_app_metadata: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_app_internal_0_port_network_role: - type: string + type: json + port_app_oam_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_app_internal_0_port_subnetpoolid: - type: string + port_app_internal_port_0_order: + type: integer required: true status: SUPPORTED - port_app_internal_0_port_allowed_address_pairs: - type: list + port_app_oam_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.network.AddressPair - port_app_oam_0_port_related_networks: + port_app_internal_port_0_security_groups: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_app_data_0_port_subnetpoolid: + type: json + port_app_oam_port_0_network_role: type: string required: true status: SUPPORTED - port_app_oam_0_port_subnetpoolid: + port_app_internal_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_app_internal_0_port_order: - type: integer + port_app_data_port_0_network_role: + type: string required: true status: SUPPORTED - port_app_internal_0_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_app_internal_port_0_vlan_requirements: + type: list required: true status: SUPPORTED - port_app_data_0_port_name: + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_app_oam_port_0_replacement_policy: type: list required: true status: SUPPORTED entry_schema: type: string - port_app_oam_0_port_ip_requirements: + port_app_data_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_app_oam_0_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_app_data_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_app_internal_0_port_network: + port_app_data_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: string - port_app_data_0_port_security_groups: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_app_internal_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: json - port_app_oam_0_port_order: - type: integer + type: org.openecomp.datatypes.network.IpRequirements + port_app_data_port_0_network_role_tag: + type: string required: true status: SUPPORTED - port_app_internal_0_port_vlan_requirements: - type: list - required: true + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_app_internal_0_port_replacement_policy: + constraints: + - greater_or_equal: 0 + compute_app_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_app_internal_0_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_app_data_0_port_order: - type: integer + port_app_oam_port_0_related_networks: + type: list required: true status: SUPPORTED - port_app_oam_0_port_security_groups: + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_app_data_port_0_security_groups: type: list required: true status: SUPPORTED entry_schema: type: json - port_app_internal_0_port_name: + port_app_oam_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - index_value: + type: org.openecomp.datatypes.network.VlanRequirements + port_app_oam_port_0_subnetpoolid: + type: string + required: true + status: SUPPORTED + port_app_data_port_0_order: type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 + required: true status: SUPPORTED - constraints: - - greater_or_equal: 0 - port_app_oam_0_port_fixed_ips: - type: list + port_app_data_port_0_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_app_data_0_port_replacement_policy: + port_app_internal_port_0_network: type: list required: true status: SUPPORTED entry_schema: type: string - compute_app_name: + compute_app_image_update_policy: type: list required: true status: SUPPORTED entry_schema: type: string - port_app_oam_0_port_vlan_requirements: + port_app_internal_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_app_internal_0_port_security_groups: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_app_oam_port_0_name: type: list required: true status: SUPPORTED entry_schema: - type: json - compute_app_image_update_policy: - type: list + type: string + port_app_oam_port_0_network_role_tag: + type: string required: true status: SUPPORTED - entry_schema: - type: string compute_app_user_data_format: type: list required: true status: SUPPORTED entry_schema: type: string + port_app_internal_port_0_network_role_tag: + type: string + required: true + status: SUPPORTED + port_app_internal_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED requirements: - dependency_app: capability: tosca.capabilities.Node @@ -1090,40 +1090,40 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_app_app_internal_0_port: + - dependency_app_app_data_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_app_app_internal_0_port: + - link_app_app_data_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_app_app_oam_0_port: + - dependency_app_app_internal_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_app_app_oam_0_port: + - link_app_app_internal_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_app_app_data_0_port: + - dependency_app_app_oam_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_app_app_data_0_port: + - link_app_app_oam_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -1136,8 +1136,9 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_app_app_oam_0_port: - type: tosca.capabilities.Node + network.incoming.bytes_app_app_data_port_0: + 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 @@ -1159,25 +1160,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_app_app_oam_0_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.incoming.bytes.rate_app_app_data_0_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.incoming.bytes_app_app_oam_0_port: + network.outpoing.packets_app_app_internal_port_0: 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_app_app_internal_0_port: + network.outgoing.bytes.rate_app_app_data_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1214,8 +1203,15 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_app_app_oam_0_port: - type: org.openecomp.capabilities.Forwarder + network.outgoing.packets.rate_app_app_oam_port_0: + 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_app_app_internal_port_0: + 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 @@ -1225,7 +1221,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_app_app_oam_0_port: + network.incoming.bytes.rate_app_app_oam_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1243,13 +1239,11 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_app_app_data_0_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 + network.outgoing.bytes_app_app_internal_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - - 0 + - 1 - UNBOUNDED disk.device.read.requests.rate_app: type: org.openecomp.capabilities.metric.Ceilometer @@ -1257,20 +1251,41 @@ node_types: occurrences: - 1 - UNBOUNDED - vcpus_app: + network.outgoing.bytes.rate_app_app_oam_port_0: 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_app: + network.incoming.bytes.rate_app_app_data_port_0: 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_app_app_internal_0_port: - type: tosca.capabilities.Node + network.outgoing.bytes_app_app_oam_port_0: + 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_app: + 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_app_app_internal_port_0: + 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 + disk.device.read.requests_app: + 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 @@ -1280,12 +1295,17 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_app_app_internal_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED endpoint_app: type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_app_app_data_0_port: + network.incoming.bytes.rate_app_app_internal_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1309,6 +1329,11 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_app_app_data_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED disk.latency_app: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1321,174 +1346,171 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_app_app_oam_0_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED os_app: type: tosca.capabilities.OperatingSystem occurrences: - 1 - UNBOUNDED - network.incoming.packets_app_app_internal_0_port: + network.outgoing.bytes_app_app_data_port_0: 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_app_app_oam_0_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_app_app_oam_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_app_app_internal_0_port: + memory_app: 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_app_app_oam_0_port: + disk.read.requests_app: 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_app_app_internal_0_port: + forwarder_app_app_oam_port_0: type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - memory_app: + disk.write.bytes_app: 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_app: + binding_app_app_data_port_0: + 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 + disk.allocation_app: 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_app_app_oam_0_port: + network.incoming.packets_app_app_data_port_0: 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_app_app_data_0_port: + memory.resident_app: 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_app: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_app_app_oam_port_0: + 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 + feature_app_app_internal_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.allocation_app: + cpu_app: 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_app_app_internal_0_port: + disk.usage_app: 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 - attachment_app_app_data_0_port: - type: tosca.capabilities.Attachment + feature_app: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_app_app_oam_0_port: + disk.read.bytes_app: 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.packets.rate_app_app_internal_0_port: + network.outpoing.packets_app_app_data_port_0: 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_app_app_internal_0_port: + network.incoming.bytes_app_app_oam_port_0: 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_app: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + scalable_app: + type: tosca.capabilities.Scalable occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_app_app_oam_0_port: + network.incoming.bytes_app_app_internal_port_0: 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_app_app_data_0_port: + network.outgoing.bytes.rate_app_app_internal_port_0: 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_app: + network.outpoing.packets_app_app_oam_port_0: 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_app_app_data_0_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - disk.usage_app: + network.incoming.packets.rate_app_app_data_port_0: 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_app: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - disk.read.bytes_app: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_app_app_internal_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - scalable_app: - type: tosca.capabilities.Scalable + forwarder_app_app_data_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_app_app_data_0_port: + disk.device.read.bytes.rate_app: 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_app: + disk.device.allocation_app: 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_app: + network.incoming.packets.rate_app_app_internal_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1505,75 +1527,53 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_app_app_oam_0_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 disk.device.usage_app: 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_app_app_data_0_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_app_app_data_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_app_app_data_0_port: + network.outgoing.packets.rate_app_app_internal_port_0: 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_app_app_internal_0_port: + network.incoming.packets.rate_app_app_oam_port_0: 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_app_app_data_0_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - disk.write.requests_app: + network.incoming.packets_app_app_oam_port_0: 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_app_app_internal_0_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_app: + disk.write.requests_app: 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 - attachment_app_app_internal_0_port: + attachment_app_app_oam_port_0: type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - network.incoming.packets_app_app_data_0_port: + network.outgoing.packets.rate_app_app_data_port_0: 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_app_app_internal_0_port: + instance_app: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1588,70 +1588,48 @@ node_types: org.openecomp.resource.abstract.nodes.iox: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_iox_data_0_port_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_iox_oam_0_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_iox_internal_0_port_network: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_iox_data_0_port_name: - type: list + port_iox_oam_port_0_network_role: + type: string required: true status: SUPPORTED - entry_schema: - type: string - port_iox_data_0_port_related_networks: + port_iox_oam_port_0_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - vm_flavor_name: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_iox_data_port_0_network_role: type: string required: true status: SUPPORTED - port_iox_data_0_port_subnetpoolid: + vm_flavor_name: type: string required: true status: SUPPORTED - port_iox_data_0_port_allowed_address_pairs: - type: list + port_iox_oam_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.network.AddressPair - port_iox_internal_0_port_ip_requirements: - type: list + port_iox_data_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements vm_image_name: type: string required: true status: SUPPORTED - port_iox_oam_0_port_name: + port_iox_oam_port_0_replacement_policy: type: list required: true status: SUPPORTED entry_schema: type: string - port_iox_oam_0_port_network_role_tag: - type: string + port_iox_oam_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_iox_oam_0_port_subnetpoolid: - type: string + port_iox_internal_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED compute_iox_user_data_format: @@ -1660,145 +1638,175 @@ node_types: status: SUPPORTED entry_schema: type: string - port_iox_data_0_port_fixed_ips: - type: list + port_iox_internal_port_0_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_iox_internal_0_port_allowed_address_pairs: + port_iox_data_port_0_allowed_address_pairs: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.heat.network.AddressPair - compute_iox_config_drive: + port_iox_data_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: boolean - port_iox_internal_0_port_order: - type: integer - required: true - status: SUPPORTED - port_iox_oam_0_port_replacement_policy: + type: org.openecomp.datatypes.network.IpRequirements + port_iox_internal_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: string - port_iox_data_0_port_security_groups: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + compute_iox_config_drive: type: list required: true status: SUPPORTED entry_schema: - type: json - port_iox_internal_0_port_vlan_requirements: + type: boolean + port_iox_internal_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - compute_iox_image_update_policy: + port_iox_internal_port_0_order: + type: integer + required: true + status: SUPPORTED + port_iox_data_port_0_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_iox_oam_0_port_order: + port_iox_internal_port_0_network_role_tag: + type: string + required: true + status: SUPPORTED + port_iox_oam_port_0_order: type: integer required: true status: SUPPORTED - port_iox_oam_0_port_network: + compute_iox_image_update_policy: type: list required: true status: SUPPORTED entry_schema: type: string - port_iox_oam_0_port_related_networks: + port_iox_data_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_iox_internal_0_port_security_groups: + type: org.openecomp.datatypes.network.VlanRequirements + port_iox_data_port_0_network_role_tag: + type: string + required: true + status: SUPPORTED + port_iox_internal_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: json - port_iox_oam_0_port_vlan_requirements: + type: org.openecomp.datatypes.network.IpRequirements + port_iox_oam_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_iox_data_0_port_order: + port_iox_data_port_0_order: type: integer required: true status: SUPPORTED - port_iox_internal_0_port_name: + compute_iox_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_iox_oam_0_port_fixed_ips: + port_iox_oam_port_0_allowed_address_pairs: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_iox_data_0_port_vlan_requirements: + type: org.openecomp.datatypes.heat.network.AddressPair + port_iox_oam_port_0_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - compute_iox_name: + type: string + port_iox_internal_port_0_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_iox_data_0_port_network: + port_iox_internal_port_0_allowed_address_pairs: type: list required: true status: SUPPORTED entry_schema: - type: string - port_iox_internal_0_port_replacement_policy: + type: org.openecomp.datatypes.heat.network.AddressPair + port_iox_oam_port_0_network_role_tag: + type: string + required: true + status: SUPPORTED + port_iox_data_port_0_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: string - port_iox_internal_0_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_iox_data_port_0_subnetpoolid: + type: string required: true status: SUPPORTED - port_iox_data_0_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_iox_oam_port_0_security_groups: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_iox_internal_port_0_security_groups: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_iox_oam_port_0_ip_requirements: + type: list required: true status: SUPPORTED - port_iox_data_0_port_exCP_naming: + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_iox_data_port_0_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_iox_oam_0_port_network_role: - type: string + port_iox_data_port_0_related_networks: + type: list required: true status: SUPPORTED - port_iox_internal_0_port_network_role: - type: string + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_iox_data_port_0_security_groups: + type: list required: true status: SUPPORTED - port_iox_data_0_port_network_role: - type: string + entry_schema: + type: json + port_iox_internal_port_0_network: + type: list required: true status: SUPPORTED - port_iox_data_0_port_replacement_policy: + entry_schema: + type: string + port_iox_internal_port_0_replacement_policy: type: list required: true status: SUPPORTED @@ -1810,6 +1818,12 @@ node_types: status: SUPPORTED entry_schema: type: json + port_iox_data_port_0_name: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string index_value: type: integer description: Index value of this substitution service template runtime instance @@ -1818,23 +1832,15 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_iox_internal_0_port_network_role_tag: + port_iox_internal_port_0_network_role: type: string required: true status: SUPPORTED - port_iox_internal_0_port_related_networks: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_iox_oam_0_port_allowed_address_pairs: - type: list + port_iox_internal_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.network.AddressPair - port_iox_internal_0_port_subnetpoolid: + port_iox_oam_port_0_subnetpoolid: type: string required: true status: SUPPORTED @@ -1844,44 +1850,25 @@ node_types: status: SUPPORTED entry_schema: type: string - port_iox_oam_0_port_security_groups: + port_iox_oam_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: json - port_iox_oam_0_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_iox_oam_0_port_ip_requirements: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_iox_data_port_0_replacement_policy: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_iox_internal_0_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_iox_data_0_port_network_role_tag: - type: string + type: string + port_iox_oam_port_0_name: + type: list required: true status: SUPPORTED + entry_schema: + type: string requirements: - - dependency_iox_iox_data_0_port: - capability: tosca.capabilities.Node - node: tosca.nodes.Root - relationship: tosca.relationships.DependsOn - occurrences: - - 0 - - UNBOUNDED - - link_iox_iox_data_0_port: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - dependency_iox: capability: tosca.capabilities.Node node: tosca.nodes.Root @@ -1896,38 +1883,46 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_iox_iox_oam_0_port: + - dependency_iox_iox_internal_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_iox_iox_oam_0_port: + - link_iox_iox_internal_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_iox_iox_internal_0_port: + - dependency_iox_iox_oam_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_iox_iox_internal_0_port: + - link_iox_iox_oam_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - capabilities: - forwarder_iox_iox_oam_0_port: - type: org.openecomp.capabilities.Forwarder + - dependency_iox_iox_data_port_0: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn occurrences: - - 1 + - 0 - UNBOUNDED + - link_iox_iox_data_port_0: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 + capabilities: cpu.delta_iox: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1946,19 +1941,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_iox_iox_data_0_port: + disk.device.read.bytes_iox: 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_iox: + disk.read.requests_iox: 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_iox: + network.incoming.packets_iox_iox_data_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1970,13 +1965,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_iox_iox_oam_0_port: + network.outpoing.packets_iox_iox_internal_port_0: 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_iox_iox_internal_0_port: + network.incoming.packets.rate_iox_iox_data_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2006,121 +2001,122 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.write.requests_iox: + network.outgoing.packets.rate_iox_iox_internal_port_0: 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_iox: + network.incoming.packets_iox_iox_internal_port_0: 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_iox_iox_data_0_port: - type: tosca.capabilities.Node + disk.device.write.requests_iox: + 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_iox: + disk.device.allocation_iox: 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_iox: + disk.root.size_iox: 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.iops_iox: + network.outgoing.bytes.rate_iox_iox_oam_port_0: 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_iox_iox_data_0_port: + vcpus_iox: 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_iox: + disk.device.iops_iox: 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_iox_iox_oam_0_port: + network.outgoing.bytes_iox_iox_data_port_0: 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 - attachment_iox_iox_data_0_port: - type: tosca.capabilities.Attachment + disk.read.bytes.rate_iox: + 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_iox_iox_oam_0_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_iox_iox_oam_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.latency_iox: + network.outgoing.bytes_iox_iox_internal_port_0: 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_iox_iox_data_0_port: + binding_iox_iox_data_port_0: + 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 + network.incoming.packets.rate_iox_iox_internal_port_0: 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_iox_iox_internal_0_port: + disk.latency_iox: 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_iox: + network.incoming.bytes.rate_iox_iox_data_port_0: 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_iox_iox_oam_0_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 - network.incoming.bytes_iox_iox_data_0_port: + network.incoming.packets.rate_iox_iox_oam_port_0: 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_iox: + cpu_util_iox: 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.iops_iox: + disk.device.capacity_iox: 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_iox_iox_internal_0_port: + disk.iops_iox: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2131,14 +2127,6 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_iox_iox_internal_0_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 disk.device.read.requests_iox: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2151,28 +2139,17 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_iox_iox_internal_0_port: + attachment_iox_iox_data_port_0: type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_iox_iox_internal_0_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_iox: 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_iox_iox_oam_0_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.usage_iox: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2189,45 +2166,41 @@ node_types: occurrences: - 1 - UNBOUNDED - memory.resident_iox: + network.incoming.bytes_iox_iox_data_port_0: 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_iox: + memory.resident_iox: 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.packets.rate_iox_iox_internal_0_port: + disk.device.write.bytes_iox: 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_iox_iox_data_0_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 + attachment_iox_iox_oam_port_0: + type: tosca.capabilities.Attachment occurrences: - - 0 + - 1 - UNBOUNDED - network.outgoing.bytes.rate_iox_iox_oam_0_port: + network.incoming.packets_iox_iox_oam_port_0: 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_iox_iox_internal_0_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_iox_iox_internal_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_iox_iox_oam_0_port: + network.outpoing.packets_iox_iox_oam_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2239,7 +2212,20 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_iox_iox_oam_0_port: + forwarder_iox_iox_internal_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + binding_iox_iox_oam_port_0: + 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 + network.incoming.bytes_iox_iox_internal_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2255,6 +2241,14 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_iox_iox_internal_port_0: + 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 host_iox: type: tosca.capabilities.Container valid_source_types: @@ -2262,107 +2256,113 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.write.requests.rate_iox: + network.outgoing.packets.rate_iox_iox_oam_port_0: 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_iox: + disk.write.requests.rate_iox: 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_iox: + disk.write.bytes.rate_iox: 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_iox_iox_oam_0_port: + disk.read.bytes_iox: 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 - instance_iox: + network.outgoing.bytes.rate_iox_iox_internal_port_0: 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.ephemeral.size_iox: + instance_iox: 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_iox_iox_data_0_port: + disk.ephemeral.size_iox: 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 - attachment_iox_iox_oam_0_port: + attachment_iox_iox_internal_port_0: type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - feature_iox_iox_internal_0_port: - type: tosca.capabilities.Node + forwarder_iox_iox_data_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - network.incoming.packets_iox_iox_internal_0_port: + network.incoming.bytes.rate_iox_iox_internal_port_0: 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_iox_iox_oam_0_port: + forwarder_iox_iox_oam_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes_iox_iox_oam_port_0: 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_iox_iox_data_0_port: - type: org.openecomp.capabilities.Forwarder + feature_iox_iox_data_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.device.read.bytes.rate_iox: + network.incoming.bytes.rate_iox_iox_oam_port_0: 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_iox_iox_data_0_port: + network.outgoing.bytes_iox_iox_oam_port_0: 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_iox_iox_data_0_port: + disk.device.read.bytes.rate_iox: 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_iox: + network.outpoing.packets_iox_iox_data_port_0: 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_iox_iox_internal_0_port: + network.outgoing.bytes.rate_iox_iox_data_port_0: 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_iox_iox_internal_0_port: - type: org.openecomp.capabilities.Forwarder + disk.device.write.bytes.rate_iox: + 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 @@ -2372,7 +2372,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_iox_iox_data_0_port: + network.outgoing.packets.rate_iox_iox_data_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: 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 bc241a4c9c..40695ff356 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 @@ -902,92 +902,97 @@ topology_template: directives: - substitutable properties: - port_iox_data_0_port_ip_requirements: - - ip_version: 6 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false - port_iox_internal_0_port_network: - - internal_net_0 - port_iox_data_0_port_name: - - str_replace: - template: $vnf_name-iox_data_1_port_0 - params: - $vnf_name: - get_input: vnf_name + port_iox_oam_port_0_fixed_ips: + - ip_address: + get_input: + - iox_oam_ips + - 1 vm_flavor_name: get_input: iox_flavor_name - port_iox_data_0_port_allowed_address_pairs: + port_iox_data_port_0_mac_requirements: + mac_count_required: + is_required: false + vm_image_name: + get_input: iox_image_name + port_iox_oam_port_0_replacement_policy: + - AUTO + port_iox_oam_port_0_mac_requirements: + mac_count_required: + is_required: false + port_iox_internal_port_0_mac_requirements: + mac_count_required: + is_required: false + compute_iox_user_data_format: + - RAW + port_iox_data_port_0_allowed_address_pairs: - ip_address: get_attribute: - network:data:vip:m004:m003 - fixed_ips - 0 - ip_address - port_iox_internal_0_port_ip_requirements: - - ip_version: 4 + port_iox_data_port_0_ip_requirements: + - ip_version: 6 ip_count_required: - is_required: false + is_required: true floating_ip_count_required: is_required: false - vm_image_name: - get_input: iox_image_name - port_iox_oam_0_port_name: - - str_replace: - template: $vnf_name-iox_oam_1_port_0 - params: - $vnf_name: - get_input: vnf_name - port_iox_oam_0_port_network_role_tag: oam - compute_iox_user_data_format: - - RAW - port_iox_data_0_port_fixed_ips: - - ip_address: - get_input: - - iox_data_v6_ips - - 1 - port_iox_internal_0_port_allowed_address_pairs: - - ip_address: - get_input: internal_subnet_cidr compute_iox_config_drive: - true - port_iox_oam_0_port_replacement_policy: - - AUTO - port_iox_data_0_port_security_groups: - - get_input: data_security_groups + port_iox_data_port_0_network: + - get_input: data_net_id compute_iox_image_update_policy: - REBUILD - port_iox_oam_0_port_network: + port_iox_data_port_0_network_role_tag: data + port_iox_internal_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + compute_iox_name: + - get_input: + - iox_names + - 1 + port_iox_oam_port_0_allowed_address_pairs: + - ip_address: + get_attribute: + - network:io:vip:m004:m003 + - fixed_ips + - 0 + - ip_address + port_iox_oam_port_0_network: - get_input: oam_net_id - port_iox_internal_0_port_security_groups: - - get_input: iox_security_groups - port_iox_internal_0_port_name: + port_iox_internal_port_0_name: - str_replace: template: $vnf_name-iox_internal_1_port_0 params: $vnf_name: get_input: vnf_name - port_iox_oam_0_port_fixed_ips: + port_iox_internal_port_0_allowed_address_pairs: + - ip_address: + get_input: internal_subnet_cidr + port_iox_oam_port_0_network_role_tag: oam + port_iox_data_port_0_fixed_ips: - ip_address: get_input: - - iox_oam_ips + - iox_data_v6_ips - 1 - compute_iox_name: - - get_input: - - iox_names - - 1 - port_iox_data_0_port_network: - - get_input: data_net_id - port_iox_internal_0_port_replacement_policy: - - AUTO - port_iox_internal_0_port_mac_requirements: - mac_count_required: - is_required: false - port_iox_data_0_port_mac_requirements: - mac_count_required: + port_iox_oam_port_0_security_groups: + - get_input: oam_security_groups + port_iox_internal_port_0_security_groups: + - get_input: iox_security_groups + port_iox_oam_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: is_required: false - port_iox_data_0_port_replacement_policy: + port_iox_data_port_0_security_groups: + - get_input: data_security_groups + port_iox_internal_port_0_network: + - internal_net_0 + port_iox_internal_port_0_replacement_policy: - AUTO compute_iox_metadata: - vf_module_id: @@ -999,27 +1004,22 @@ topology_template: get_input: vnf_name vf_module_name: get_input: vf_module_name - port_iox_oam_0_port_allowed_address_pairs: - - ip_address: - get_attribute: - - network:io:vip:m004:m003 - - fixed_ips - - 0 - - ip_address + port_iox_data_port_0_name: + - str_replace: + template: $vnf_name-iox_data_1_port_0 + params: + $vnf_name: + get_input: vnf_name compute_iox_availability_zone: - get_input: availability_zone_1 - port_iox_oam_0_port_security_groups: - - get_input: oam_security_groups - port_iox_oam_0_port_mac_requirements: - mac_count_required: - is_required: false - port_iox_oam_0_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false - port_iox_data_0_port_network_role_tag: data + port_iox_data_port_0_replacement_policy: + - AUTO + port_iox_oam_port_0_name: + - str_replace: + template: $vnf_name-iox_oam_1_port_0 + params: + $vnf_name: + get_input: vnf_name service_template_filter: substitute_service_template: Nested_ioxServiceTemplate.yaml count: 1 @@ -1029,7 +1029,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_iox_iox_internal_0_port: + - link_iox_iox_internal_port_0: capability: tosca.capabilities.network.Linkable node: internal_net_0 relationship: tosca.relationships.network.LinksTo @@ -1038,42 +1038,55 @@ topology_template: directives: - substitutable properties: - port_app_data_0_port_mac_requirements: - mac_count_required: - is_required: false compute_app_scheduler_hints: - group: app_server_group_group - port_app_internal_0_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: + port_app_data_port_0_network: + - get_input: data_net_id + port_app_internal_port_0_mac_requirements: + mac_count_required: is_required: false - port_app_oam_0_port_replacement_policy: - - AUTO - port_app_oam_0_port_network: - - get_input: oam_net_id vm_flavor_name: get_input: app_flavor_name - vm_image_name: - get_input: app_image_name - port_app_oam_0_port_name: + port_app_oam_port_0_security_groups: + - get_input: oam_security_groups + port_app_internal_port_0_allowed_address_pairs: + - ip_address: + get_input: internal_subnet_cidr + port_app_oam_port_0_network: + - get_input: oam_net_id + port_app_internal_port_0_name: - str_replace: - template: $vnf_name-app_oam_2_port_0 + template: $vnf_name-app_internal_2_port_0 params: $vnf_name: get_input: vnf_name + vm_image_name: + get_input: app_image_name compute_app_availability_zone: - get_input: availability_zone_0 compute_app_config_drive: - true - port_app_oam_0_port_mac_requirements: - mac_count_required: + port_app_data_port_0_replacement_policy: + - AUTO + port_app_oam_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: is_required: false - port_app_data_0_port_network: - - get_input: data_net_id - port_app_data_0_port_network_role_tag: data - port_app_oam_0_port_network_role_tag: oam + port_app_data_port_0_name: + - str_replace: + template: $vnf_name-app_data_2_port_0 + params: + $vnf_name: + get_input: vnf_name + port_app_oam_port_0_fixed_ips: + - ip_address: + get_input: + - app_oam_ips + - 2 + port_app_internal_port_0_replacement_policy: + - AUTO compute_app_metadata: - vf_module_id: get_input: vf_module_id @@ -1084,59 +1097,46 @@ topology_template: get_input: vnf_name vf_module_name: get_input: vf_module_name - port_app_data_0_port_ip_requirements: + port_app_oam_port_0_mac_requirements: + mac_count_required: + is_required: false + port_app_internal_port_0_security_groups: + - get_input: app_security_groups + port_app_oam_port_0_replacement_policy: + - AUTO + port_app_data_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_app_internal_0_port_allowed_address_pairs: - - ip_address: - get_input: internal_subnet_cidr - port_app_data_0_port_name: - - str_replace: - template: $vnf_name-app_data_2_port_0 - params: - $vnf_name: - get_input: vnf_name - port_app_oam_0_port_ip_requirements: + port_app_data_port_0_mac_requirements: + mac_count_required: + is_required: false + port_app_internal_port_0_ip_requirements: - ip_version: 4 ip_count_required: - is_required: true - floating_ip_count_required: is_required: false - port_app_internal_0_port_network: - - internal_net_0 - port_app_data_0_port_security_groups: - - get_input: data_security_groups - port_app_internal_0_port_replacement_policy: - - AUTO - port_app_internal_0_port_mac_requirements: - mac_count_required: + floating_ip_count_required: is_required: false - port_app_oam_0_port_security_groups: - - get_input: oam_security_groups - port_app_internal_0_port_name: - - str_replace: - template: $vnf_name-app_internal_2_port_0 - params: - $vnf_name: - get_input: vnf_name - port_app_oam_0_port_fixed_ips: - - ip_address: - get_input: - - app_oam_ips - - 2 - port_app_data_0_port_replacement_policy: - - AUTO + port_app_data_port_0_network_role_tag: data compute_app_name: - get_input: - app_names - 2 - port_app_internal_0_port_security_groups: - - get_input: app_security_groups + port_app_data_port_0_security_groups: + - get_input: data_security_groups + port_app_internal_port_0_network: + - internal_net_0 compute_app_image_update_policy: - REBUILD + port_app_oam_port_0_name: + - str_replace: + template: $vnf_name-app_oam_2_port_0 + params: + $vnf_name: + get_input: vnf_name + port_app_oam_port_0_network_role_tag: oam compute_app_user_data_format: - RAW service_template_filter: @@ -1148,7 +1148,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_app_app_internal_0_port: + - link_app_app_internal_port_0: capability: tosca.capabilities.network.Linkable node: internal_net_0 relationship: tosca.relationships.network.LinksTo @@ -1187,87 +1187,92 @@ topology_template: directives: - substitutable properties: - port_iox_data_0_port_ip_requirements: - - ip_version: 6 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false - port_iox_internal_0_port_network: - - internal_net_0 - port_iox_data_0_port_name: - - str_replace: - template: $vnf_name-iox_data_0_port_0 - params: - $vnf_name: - get_input: vnf_name vm_flavor_name: get_input: iox_flavor_name - port_iox_data_0_port_allowed_address_pairs: + port_iox_data_port_0_mac_requirements: + mac_count_required: + is_required: false + vm_image_name: + get_input: iox_image_name + port_iox_oam_port_0_replacement_policy: + - AUTO + port_iox_oam_port_0_mac_requirements: + mac_count_required: + is_required: false + port_iox_internal_port_0_mac_requirements: + mac_count_required: + is_required: false + compute_iox_user_data_format: + - RAW + port_iox_data_port_0_allowed_address_pairs: - ip_address: get_attribute: - network:data:vip:m004:m003 - fixed_ips - 0 - ip_address - port_iox_internal_0_port_ip_requirements: + port_iox_data_port_0_ip_requirements: + - ip_version: 6 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + compute_iox_config_drive: + - true + port_iox_data_port_0_network: + - get_input: data_net_id + compute_iox_image_update_policy: + - REBUILD + port_iox_data_port_0_network_role_tag: data + port_iox_internal_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - vm_image_name: - get_input: iox_image_name - port_iox_oam_0_port_name: + compute_iox_name: + - get_input: + - iox_names + - 0 + port_iox_oam_port_0_allowed_address_pairs: + - ip_address: + get_attribute: + - network:io:vip:m004:m003 + - fixed_ips + - 0 + - ip_address + port_iox_oam_port_0_network: + - get_input: oam_net_id + port_iox_internal_port_0_name: - str_replace: - template: $vnf_name-iox_oam_0_port_0 + template: $vnf_name-iox_internal_0_port_0 params: $vnf_name: get_input: vnf_name - port_iox_oam_0_port_network_role_tag: oam - compute_iox_user_data_format: - - RAW - port_iox_data_0_port_fixed_ips: + port_iox_internal_port_0_allowed_address_pairs: + - ip_address: + get_input: internal_subnet_cidr + port_iox_oam_port_0_network_role_tag: oam + port_iox_data_port_0_fixed_ips: - ip_address: get_input: - iox_data_v6_ips - 0 - port_iox_internal_0_port_allowed_address_pairs: - - ip_address: - get_input: internal_subnet_cidr - compute_iox_config_drive: - - true - port_iox_oam_0_port_replacement_policy: - - AUTO - port_iox_data_0_port_security_groups: - - get_input: data_security_groups - compute_iox_image_update_policy: - - REBUILD - port_iox_oam_0_port_network: - - get_input: oam_net_id - port_iox_internal_0_port_security_groups: + port_iox_oam_port_0_security_groups: + - get_input: oam_security_groups + port_iox_internal_port_0_security_groups: - get_input: iox_security_groups - port_iox_internal_0_port_name: - - str_replace: - template: $vnf_name-iox_internal_0_port_0 - params: - $vnf_name: - get_input: vnf_name - compute_iox_name: - - get_input: - - iox_names - - 0 - port_iox_data_0_port_network: - - get_input: data_net_id - port_iox_internal_0_port_replacement_policy: - - AUTO - port_iox_internal_0_port_mac_requirements: - mac_count_required: + port_iox_oam_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: is_required: false - port_iox_data_0_port_mac_requirements: - mac_count_required: + floating_ip_count_required: is_required: false - port_iox_data_0_port_replacement_policy: + port_iox_data_port_0_security_groups: + - get_input: data_security_groups + port_iox_internal_port_0_network: + - internal_net_0 + port_iox_internal_port_0_replacement_policy: - AUTO compute_iox_metadata: - vf_module_id: @@ -1279,27 +1284,22 @@ topology_template: get_input: vnf_name vf_module_name: get_input: vf_module_name - port_iox_oam_0_port_allowed_address_pairs: - - ip_address: - get_attribute: - - network:io:vip:m004:m003 - - fixed_ips - - 0 - - ip_address + port_iox_data_port_0_name: + - str_replace: + template: $vnf_name-iox_data_0_port_0 + params: + $vnf_name: + get_input: vnf_name compute_iox_availability_zone: - get_input: availability_zone_0 - port_iox_oam_0_port_security_groups: - - get_input: oam_security_groups - port_iox_oam_0_port_mac_requirements: - mac_count_required: - is_required: false - port_iox_oam_0_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false - port_iox_data_0_port_network_role_tag: data + port_iox_data_port_0_replacement_policy: + - AUTO + port_iox_oam_port_0_name: + - str_replace: + template: $vnf_name-iox_oam_0_port_0 + params: + $vnf_name: + get_input: vnf_name service_template_filter: substitute_service_template: Nested_ioxServiceTemplate.yaml count: 1 @@ -1309,7 +1309,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_iox_iox_internal_0_port: + - link_iox_iox_internal_port_0: capability: tosca.capabilities.network.Linkable node: internal_net_0 relationship: tosca.relationships.network.LinksTo @@ -1318,47 +1318,60 @@ topology_template: directives: - substitutable properties: - port_app_data_0_port_mac_requirements: - mac_count_required: - is_required: false compute_app_scheduler_hints: - group: app_server_group_group - port_app_internal_0_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: + port_app_data_port_0_network: + - get_input: data_net_id + port_app_internal_port_0_mac_requirements: + mac_count_required: is_required: false - port_app_oam_0_port_replacement_policy: - - AUTO - port_app_oam_0_port_network: - - get_input: oam_net_id vm_flavor_name: get_input: app_flavor_name - port_app_data_0_port_fixed_ips: + port_app_oam_port_0_security_groups: + - get_input: oam_security_groups + port_app_internal_port_0_allowed_address_pairs: - ip_address: - get_input: - - app_data_v6_ips - - 1 - vm_image_name: - get_input: app_image_name - port_app_oam_0_port_name: + get_input: internal_subnet_cidr + port_app_oam_port_0_network: + - get_input: oam_net_id + port_app_internal_port_0_name: - str_replace: - template: $vnf_name-app_oam_1_port_0 + template: $vnf_name-app_internal_1_port_0 params: $vnf_name: get_input: vnf_name + vm_image_name: + get_input: app_image_name compute_app_availability_zone: - get_input: availability_zone_1 compute_app_config_drive: - true - port_app_oam_0_port_mac_requirements: - mac_count_required: + port_app_data_port_0_replacement_policy: + - AUTO + port_app_oam_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: is_required: false - port_app_data_0_port_network: - - get_input: data_net_id - port_app_data_0_port_network_role_tag: data - port_app_oam_0_port_network_role_tag: oam + port_app_data_port_0_name: + - str_replace: + template: $vnf_name-app_data_1_port_0 + params: + $vnf_name: + get_input: vnf_name + port_app_oam_port_0_fixed_ips: + - ip_address: + get_input: + - app_oam_ips + - 1 + port_app_internal_port_0_replacement_policy: + - AUTO + port_app_data_port_0_fixed_ips: + - ip_address: + get_input: + - app_data_v6_ips + - 1 compute_app_metadata: - vf_module_id: get_input: vf_module_id @@ -1369,59 +1382,46 @@ topology_template: get_input: vnf_name vf_module_name: get_input: vf_module_name - port_app_data_0_port_ip_requirements: + port_app_oam_port_0_mac_requirements: + mac_count_required: + is_required: false + port_app_internal_port_0_security_groups: + - get_input: app_security_groups + port_app_oam_port_0_replacement_policy: + - AUTO + port_app_data_port_0_ip_requirements: - ip_version: 6 ip_count_required: is_required: true floating_ip_count_required: is_required: false - port_app_internal_0_port_allowed_address_pairs: - - ip_address: - get_input: internal_subnet_cidr - port_app_data_0_port_name: - - str_replace: - template: $vnf_name-app_data_1_port_0 - params: - $vnf_name: - get_input: vnf_name - port_app_oam_0_port_ip_requirements: + port_app_data_port_0_mac_requirements: + mac_count_required: + is_required: false + port_app_internal_port_0_ip_requirements: - ip_version: 4 ip_count_required: - is_required: true - floating_ip_count_required: is_required: false - port_app_internal_0_port_network: - - internal_net_0 - port_app_data_0_port_security_groups: - - get_input: data_security_groups - port_app_internal_0_port_replacement_policy: - - AUTO - port_app_internal_0_port_mac_requirements: - mac_count_required: + floating_ip_count_required: is_required: false - port_app_oam_0_port_security_groups: - - get_input: oam_security_groups - port_app_internal_0_port_name: - - str_replace: - template: $vnf_name-app_internal_1_port_0 - params: - $vnf_name: - get_input: vnf_name - port_app_oam_0_port_fixed_ips: - - ip_address: - get_input: - - app_oam_ips - - 1 - port_app_data_0_port_replacement_policy: - - AUTO + port_app_data_port_0_network_role_tag: data compute_app_name: - get_input: - app_names - 1 - port_app_internal_0_port_security_groups: - - get_input: app_security_groups + port_app_data_port_0_security_groups: + - get_input: data_security_groups + port_app_internal_port_0_network: + - internal_net_0 compute_app_image_update_policy: - REBUILD + port_app_oam_port_0_name: + - str_replace: + template: $vnf_name-app_oam_1_port_0 + params: + $vnf_name: + get_input: vnf_name + port_app_oam_port_0_network_role_tag: oam compute_app_user_data_format: - RAW service_template_filter: @@ -1433,7 +1433,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_app_app_internal_0_port: + - link_app_app_internal_port_0: capability: tosca.capabilities.network.Linkable node: internal_net_0 relationship: tosca.relationships.network.LinksTo @@ -1442,47 +1442,55 @@ topology_template: directives: - substitutable properties: - port_app_data_0_port_mac_requirements: - mac_count_required: - is_required: false compute_app_scheduler_hints: - group: app_server_group_group - port_app_internal_0_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: + port_app_data_port_0_network: + - get_input: data_net_id + port_app_internal_port_0_mac_requirements: + mac_count_required: is_required: false - port_app_oam_0_port_replacement_policy: - - AUTO - port_app_oam_0_port_network: - - get_input: oam_net_id vm_flavor_name: get_input: app_flavor_name - port_app_data_0_port_fixed_ips: + port_app_oam_port_0_security_groups: + - get_input: oam_security_groups + port_app_internal_port_0_allowed_address_pairs: - ip_address: - get_input: - - app_data_v6_ips - - 0 - vm_image_name: - get_input: app_image_name - port_app_oam_0_port_name: + get_input: internal_subnet_cidr + port_app_oam_port_0_network: + - get_input: oam_net_id + port_app_internal_port_0_name: - str_replace: - template: $vnf_name-app_oam_0_port_0 + template: $vnf_name-app_internal_0_port_0 params: $vnf_name: get_input: vnf_name + vm_image_name: + get_input: app_image_name compute_app_availability_zone: - get_input: availability_zone_0 compute_app_config_drive: - true - port_app_oam_0_port_mac_requirements: - mac_count_required: + port_app_data_port_0_replacement_policy: + - AUTO + port_app_oam_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: is_required: false - port_app_data_0_port_network: - - get_input: data_net_id - port_app_data_0_port_network_role_tag: data - port_app_oam_0_port_network_role_tag: oam + floating_ip_count_required: + is_required: false + port_app_data_port_0_name: + - str_replace: + template: $vnf_name-app_data_0_port_0 + params: + $vnf_name: + get_input: vnf_name + port_app_internal_port_0_replacement_policy: + - AUTO + port_app_data_port_0_fixed_ips: + - ip_address: + get_input: + - app_data_v6_ips + - 0 compute_app_metadata: - vf_module_id: get_input: vf_module_id @@ -1493,54 +1501,46 @@ topology_template: get_input: vnf_name vf_module_name: get_input: vf_module_name - port_app_data_0_port_ip_requirements: + port_app_oam_port_0_mac_requirements: + mac_count_required: + is_required: false + port_app_internal_port_0_security_groups: + - get_input: app_security_groups + port_app_oam_port_0_replacement_policy: + - AUTO + port_app_data_port_0_ip_requirements: - ip_version: 6 ip_count_required: is_required: true floating_ip_count_required: is_required: false - port_app_internal_0_port_allowed_address_pairs: - - ip_address: - get_input: internal_subnet_cidr - port_app_data_0_port_name: - - str_replace: - template: $vnf_name-app_data_0_port_0 - params: - $vnf_name: - get_input: vnf_name - port_app_oam_0_port_ip_requirements: + port_app_data_port_0_mac_requirements: + mac_count_required: + is_required: false + port_app_internal_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_app_internal_0_port_network: - - internal_net_0 - port_app_data_0_port_security_groups: - - get_input: data_security_groups - port_app_internal_0_port_replacement_policy: - - AUTO - port_app_internal_0_port_mac_requirements: - mac_count_required: - is_required: false - port_app_oam_0_port_security_groups: - - get_input: oam_security_groups - port_app_internal_0_port_name: - - str_replace: - template: $vnf_name-app_internal_0_port_0 - params: - $vnf_name: - get_input: vnf_name - port_app_data_0_port_replacement_policy: - - AUTO + port_app_data_port_0_network_role_tag: data compute_app_name: - get_input: - app_names - 0 - port_app_internal_0_port_security_groups: - - get_input: app_security_groups + port_app_data_port_0_security_groups: + - get_input: data_security_groups + port_app_internal_port_0_network: + - internal_net_0 compute_app_image_update_policy: - REBUILD + port_app_oam_port_0_name: + - str_replace: + template: $vnf_name-app_oam_0_port_0 + params: + $vnf_name: + get_input: vnf_name + port_app_oam_port_0_network_role_tag: oam compute_app_user_data_format: - RAW service_template_filter: @@ -1552,7 +1552,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_app_app_internal_0_port: + - link_app_app_internal_port_0: capability: tosca.capabilities.network.Linkable node: internal_net_0 relationship: tosca.relationships.network.LinksTo @@ -1583,56 +1583,61 @@ topology_template: directives: - substitutable properties: - port_plt_internal_0_port_allowed_address_pairs: + port_plt_oam_port_0_network_role_tag: oam + port_plt_data_port_0_allowed_address_pairs: - ip_address: - get_input: internal_subnet_cidr - port_plt_oam_0_port_security_groups: - - get_input: oam_security_groups + get_attribute: + - network:data:vip:m001:m002 + - fixed_ips + - 0 + - ip_address + port_plt_oam_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false compute_plt_config_drive: - true + port_plt_data_port_0_network_role_tag: data vm_flavor_name: get_input: plt_flavor_name - port_plt_data_0_port_fixed_ips: - - ip_address: - get_input: - - plt_data_v6_ips - - 1 + port_plt_internal_port_0_replacement_policy: + - AUTO + port_plt_data_port_0_security_groups: + - get_input: data_security_groups vm_image_name: get_input: plt_image_name - compute_plt_availability_zone: - - get_input: availability_zone_1 - port_plt_oam_0_port_name: + port_plt_oam_port_0_name: - str_replace: template: $vnf_name-plt_oam_0_port_0 params: $vnf_name: get_input: vnf_name - port_plt_internal_0_port_security_groups: - - get_input: plt_security_groups - port_plt_oam_0_port_ip_requirements: - - ip_version: 4 + compute_plt_availability_zone: + - get_input: availability_zone_1 + port_plt_data_port_0_ip_requirements: + - ip_version: 6 ip_count_required: - is_required: false + is_required: true floating_ip_count_required: is_required: false - port_plt_data_0_port_mac_requirements: + port_plt_data_port_0_replacement_policy: + - AUTO + port_plt_oam_port_0_security_groups: + - get_input: oam_security_groups + port_plt_oam_port_0_mac_requirements: mac_count_required: is_required: false - port_plt_data_0_port_allowed_address_pairs: + port_plt_internal_port_0_allowed_address_pairs: - ip_address: - get_attribute: - - network:data:vip:m001:m002 - - fixed_ips - - 0 - - ip_address - port_plt_data_0_port_ip_requirements: - - ip_version: 6 + get_input: internal_subnet_cidr + port_plt_internal_port_0_ip_requirements: + - ip_version: 4 ip_count_required: - is_required: true + is_required: false floating_ip_count_required: is_required: false - port_plt_internal_0_port_network: - - internal_net_0 compute_plt_metadata: - vf_module_id: get_input: vf_module_id @@ -1643,59 +1648,54 @@ topology_template: get_input: vnf_name vf_module_name: get_input: vf_module_name - port_plt_data_0_port_security_groups: - - get_input: data_security_groups - port_plt_internal_0_port_mac_requirements: + port_plt_internal_port_0_security_groups: + - get_input: plt_security_groups + port_plt_oam_port_0_network: + - get_input: oam_net_id + port_plt_oam_port_0_replacement_policy: + - AUTO + port_plt_internal_port_0_mac_requirements: mac_count_required: is_required: false - port_plt_data_0_port_network_role_tag: data - port_plt_internal_0_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: + compute_plt_image_update_policy: + - REBUILD + compute_plt_user_data_format: + - RAW + port_plt_internal_port_0_network: + - internal_net_0 + port_plt_data_port_0_fixed_ips: + - ip_address: + get_input: + - plt_data_v6_ips + - 1 + port_plt_data_port_0_mac_requirements: + mac_count_required: is_required: false - port_plt_oam_0_port_network_role_tag: oam - port_plt_internal_0_port_name: + port_plt_internal_port_0_name: - str_replace: template: $vnf_name-plt_internal_0_port_0 params: $vnf_name: get_input: vnf_name - compute_plt_image_update_policy: - - REBUILD - port_plt_oam_0_port_allowed_address_pairs: - - ip_address: - get_attribute: - - network:oam:vip:m001:m002 - - fixed_ips - - 0 - - ip_address - port_plt_data_0_port_name: + compute_plt_name: + - get_input: + - plt_names + - 1 + port_plt_data_port_0_name: - str_replace: template: $vnf_name-plt_data_0_port_0 params: $vnf_name: get_input: vnf_name - compute_plt_user_data_format: - - RAW - port_plt_internal_0_port_replacement_policy: - - AUTO - port_plt_data_0_port_network: + port_plt_data_port_0_network: - get_input: data_net_id - port_plt_oam_0_port_network: - - get_input: oam_net_id - port_plt_oam_0_port_replacement_policy: - - AUTO - port_plt_data_0_port_replacement_policy: - - AUTO - port_plt_oam_0_port_mac_requirements: - mac_count_required: - is_required: false - compute_plt_name: - - get_input: - - plt_names - - 1 + port_plt_oam_port_0_allowed_address_pairs: + - ip_address: + get_attribute: + - network:oam:vip:m001:m002 + - fixed_ips + - 0 + - ip_address service_template_filter: substitute_service_template: Nested_pltServiceTemplate.yaml count: 1 @@ -1705,7 +1705,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_plt_plt_internal_0_port: + - link_plt_plt_internal_port_0: capability: tosca.capabilities.network.Linkable node: internal_net_0 relationship: tosca.relationships.network.LinksTo @@ -1714,56 +1714,61 @@ topology_template: directives: - substitutable properties: - port_plt_internal_0_port_allowed_address_pairs: + port_plt_oam_port_0_network_role_tag: oam + port_plt_data_port_0_allowed_address_pairs: - ip_address: - get_input: internal_subnet_cidr - port_plt_oam_0_port_security_groups: - - get_input: oam_security_groups + get_attribute: + - network:data:vip:m001:m002 + - fixed_ips + - 0 + - ip_address + port_plt_oam_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false compute_plt_config_drive: - true + port_plt_data_port_0_network_role_tag: data vm_flavor_name: get_input: plt_flavor_name - port_plt_data_0_port_fixed_ips: - - ip_address: - get_input: - - plt_data_v6_ips - - 0 + port_plt_internal_port_0_replacement_policy: + - AUTO + port_plt_data_port_0_security_groups: + - get_input: data_security_groups vm_image_name: get_input: plt_image_name - compute_plt_availability_zone: - - get_input: availability_zone_0 - port_plt_oam_0_port_name: + port_plt_oam_port_0_name: - str_replace: template: $vnf_name-plt_oam_0_port_0 params: $vnf_name: get_input: vnf_name - port_plt_internal_0_port_security_groups: - - get_input: plt_security_groups - port_plt_oam_0_port_ip_requirements: - - ip_version: 4 + compute_plt_availability_zone: + - get_input: availability_zone_0 + port_plt_data_port_0_ip_requirements: + - ip_version: 6 ip_count_required: is_required: true floating_ip_count_required: is_required: false - port_plt_data_0_port_mac_requirements: + port_plt_data_port_0_replacement_policy: + - AUTO + port_plt_oam_port_0_security_groups: + - get_input: oam_security_groups + port_plt_oam_port_0_mac_requirements: mac_count_required: is_required: false - port_plt_data_0_port_allowed_address_pairs: + port_plt_internal_port_0_allowed_address_pairs: - ip_address: - get_attribute: - - network:data:vip:m001:m002 - - fixed_ips - - 0 - - ip_address - port_plt_data_0_port_ip_requirements: - - ip_version: 6 + get_input: internal_subnet_cidr + port_plt_internal_port_0_ip_requirements: + - ip_version: 4 ip_count_required: - is_required: true + is_required: false floating_ip_count_required: is_required: false - port_plt_internal_0_port_network: - - internal_net_0 compute_plt_metadata: - vf_module_id: get_input: vf_module_id @@ -1774,64 +1779,59 @@ topology_template: get_input: vnf_name vf_module_name: get_input: vf_module_name - port_plt_data_0_port_security_groups: - - get_input: data_security_groups - port_plt_internal_0_port_mac_requirements: - mac_count_required: - is_required: false - port_plt_data_0_port_network_role_tag: data - port_plt_internal_0_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false - port_plt_oam_0_port_fixed_ips: + port_plt_oam_port_0_fixed_ips: - ip_address: get_input: - plt_oam_ips - 0 - port_plt_oam_0_port_network_role_tag: oam - port_plt_internal_0_port_name: - - str_replace: - template: $vnf_name-plt_internal_0_port_0 - params: - $vnf_name: - get_input: vnf_name + port_plt_internal_port_0_security_groups: + - get_input: plt_security_groups + port_plt_oam_port_0_network: + - get_input: oam_net_id + port_plt_oam_port_0_replacement_policy: + - AUTO + port_plt_internal_port_0_mac_requirements: + mac_count_required: + is_required: false compute_plt_image_update_policy: - REBUILD - port_plt_oam_0_port_allowed_address_pairs: + compute_plt_user_data_format: + - RAW + port_plt_internal_port_0_network: + - internal_net_0 + port_plt_data_port_0_fixed_ips: - ip_address: - get_attribute: - - network:oam:vip:m001:m002 - - fixed_ips + get_input: + - plt_data_v6_ips - 0 - - ip_address - port_plt_data_0_port_name: + port_plt_data_port_0_mac_requirements: + mac_count_required: + is_required: false + port_plt_internal_port_0_name: - str_replace: - template: $vnf_name-plt_data_0_port_0 + template: $vnf_name-plt_internal_0_port_0 params: $vnf_name: get_input: vnf_name - compute_plt_user_data_format: - - RAW - port_plt_internal_0_port_replacement_policy: - - AUTO - port_plt_data_0_port_network: - - get_input: data_net_id - port_plt_oam_0_port_network: - - get_input: oam_net_id - port_plt_oam_0_port_replacement_policy: - - AUTO - port_plt_data_0_port_replacement_policy: - - AUTO - port_plt_oam_0_port_mac_requirements: - mac_count_required: - is_required: false compute_plt_name: - get_input: - plt_names - 0 + port_plt_data_port_0_name: + - str_replace: + template: $vnf_name-plt_data_0_port_0 + params: + $vnf_name: + get_input: vnf_name + port_plt_data_port_0_network: + - get_input: data_net_id + port_plt_oam_port_0_allowed_address_pairs: + - ip_address: + get_attribute: + - network:oam:vip:m001:m002 + - fixed_ips + - 0 + - ip_address service_template_filter: substitute_service_template: Nested_pltServiceTemplate.yaml count: 1 @@ -1841,7 +1841,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_plt_plt_internal_0_port: + - link_plt_plt_internal_port_0: capability: tosca.capabilities.network.Linkable node: internal_net_0 relationship: tosca.relationships.network.LinksTo @@ -1943,4 +1943,4 @@ topology_template: get_input: vnf_name container_type: host targets: - - app_server_group_group + - app_server_group_group \ 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/catalogInstances/computewithtwosameporttypes/out/Nested_appServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_appServiceTemplate.yaml index 081b35ad6d..a6bb612c4a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_appServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_appServiceTemplate.yaml @@ -11,48 +11,48 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_app_data_0_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true compute_app_scheduler_hints: type: list required: true entry_schema: type: json - port_app_internal_0_port_ip_requirements: + port_app_data_port_0_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_app_data_0_port_network_role: + type: string + port_app_internal_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + vm_flavor_name: type: string required: true - port_app_oam_0_port_replacement_policy: + port_app_oam_port_0_security_groups: type: list required: true entry_schema: - type: string - port_app_oam_0_port_network: + type: json + port_app_internal_port_0_allowed_address_pairs: type: list required: true entry_schema: - type: string - vm_flavor_name: - type: string + type: org.openecomp.datatypes.heat.network.AddressPair + port_app_oam_port_0_network: + type: list required: true - port_app_data_0_port_fixed_ips: + entry_schema: + type: string + port_app_internal_port_0_name: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps + type: string vm_image_name: type: string required: true - port_app_oam_0_port_name: - type: list + port_app_internal_port_0_network_role: + type: string required: true - entry_schema: - type: string compute_app_availability_zone: type: list required: true @@ -63,134 +63,106 @@ topology_template: required: true entry_schema: type: boolean - port_app_oam_0_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_app_data_0_port_network: + port_app_data_port_0_replacement_policy: type: list required: true entry_schema: type: string - port_app_data_0_port_network_role_tag: - type: string - required: true - port_app_oam_0_port_network_role_tag: - type: string - required: true - port_app_data_0_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_app_data_0_port_vlan_requirements: + port_app_oam_port_0_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_app_internal_0_port_network_role_tag: - type: string - required: true - port_app_internal_0_port_related_networks: + type: org.openecomp.datatypes.network.IpRequirements + port_app_data_port_0_name: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_app_oam_0_port_network_role: - type: string + type: string + port_app_oam_port_0_order: + type: integer required: true - compute_app_metadata: + port_app_oam_port_0_fixed_ips: type: list required: true entry_schema: - type: json - port_app_data_0_port_related_networks: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_app_internal_port_0_replacement_policy: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_app_data_0_port_ip_requirements: + type: string + port_app_data_port_0_fixed_ips: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_app_internal_0_port_network_role: - type: string - required: true - port_app_internal_0_port_subnetpoolid: - type: string - required: true - port_app_internal_0_port_allowed_address_pairs: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_app_data_port_0_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.network.AddressPair - port_app_oam_0_port_related_networks: + type: org.openecomp.datatypes.network.VlanRequirements + port_app_data_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + compute_app_metadata: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_app_data_0_port_subnetpoolid: - type: string - required: true - port_app_oam_0_port_subnetpoolid: - type: string + type: json + port_app_oam_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_app_internal_0_port_order: + port_app_internal_port_0_order: type: integer required: true - port_app_internal_0_port_exCP_naming: + port_app_oam_port_0_exCP_naming: type: org.openecomp.datatypes.Naming required: true - port_app_data_0_port_name: + port_app_internal_port_0_security_groups: type: list required: true entry_schema: - type: string - port_app_oam_0_port_ip_requirements: - type: list + type: json + port_app_oam_port_0_network_role: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_app_oam_0_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_app_internal_port_0_subnetpoolid: + type: string required: true - port_app_internal_0_port_network: - type: list + port_app_data_port_0_network_role: + type: string required: true - entry_schema: - type: string - port_app_data_0_port_security_groups: + port_app_internal_port_0_vlan_requirements: type: list required: true entry_schema: - type: json - port_app_oam_0_port_order: - type: integer - required: true - port_app_internal_0_port_vlan_requirements: + type: org.openecomp.datatypes.network.VlanRequirements + port_app_oam_port_0_replacement_policy: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_app_internal_0_port_replacement_policy: + type: string + port_app_data_port_0_ip_requirements: type: list required: true entry_schema: - type: string - port_app_internal_0_port_mac_requirements: + type: org.openecomp.datatypes.network.IpRequirements + port_app_data_port_0_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true - port_app_data_0_port_order: - type: integer - required: true - port_app_oam_0_port_security_groups: + port_app_data_port_0_related_networks: type: list required: true entry_schema: - type: json - port_app_internal_0_port_name: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_app_internal_port_0_ip_requirements: type: list required: true entry_schema: - type: string + type: org.openecomp.datatypes.network.IpRequirements + port_app_data_port_0_network_role_tag: + type: string + required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -198,41 +170,69 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_app_oam_0_port_fixed_ips: + compute_app_name: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_app_data_0_port_replacement_policy: + type: string + port_app_oam_port_0_related_networks: type: list required: true entry_schema: - type: string - compute_app_name: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_app_data_port_0_security_groups: type: list required: true entry_schema: - type: string - port_app_oam_0_port_vlan_requirements: + type: json + port_app_oam_port_0_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_app_internal_0_port_security_groups: + port_app_oam_port_0_subnetpoolid: + type: string + required: true + port_app_data_port_0_order: + type: integer + required: true + port_app_data_port_0_subnetpoolid: + type: string + required: true + port_app_internal_port_0_network: type: list required: true entry_schema: - type: json + type: string compute_app_image_update_policy: type: list required: true entry_schema: type: string + port_app_internal_port_0_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_app_oam_port_0_name: + type: list + required: true + entry_schema: + type: string + port_app_oam_port_0_network_role_tag: + type: string + required: true compute_app_user_data_format: type: list required: true entry_schema: type: string + port_app_internal_port_0_network_role_tag: + type: string + required: true + port_app_internal_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true node_templates: app: type: org.openecomp.resource.vfc.compute.nodes.heat.app @@ -269,139 +269,139 @@ topology_template: get_input: - compute_app_user_data_format - index_value - app_app_internal_0_port: + app_app_data_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_app_internal_0_port_replacement_policy + - port_app_data_port_0_replacement_policy - index_value mac_requirements: - get_input: port_app_internal_0_port_mac_requirements - allowed_address_pairs: - get_input: port_app_internal_0_port_allowed_address_pairs + get_input: port_app_data_port_0_mac_requirements order: - get_input: port_app_internal_0_port_order + get_input: port_app_data_port_0_order security_groups: get_input: - - port_app_internal_0_port_security_groups + - port_app_data_port_0_security_groups - index_value exCP_naming: - get_input: port_app_internal_0_port_exCP_naming + get_input: port_app_data_port_0_exCP_naming vlan_requirements: - get_input: port_app_internal_0_port_vlan_requirements + get_input: port_app_data_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_app_internal_0_port_related_networks + get_input: port_app_data_port_0_related_networks ip_requirements: - get_input: port_app_internal_0_port_ip_requirements + get_input: port_app_data_port_0_ip_requirements network_role_tag: - get_input: port_app_internal_0_port_network_role_tag + get_input: port_app_data_port_0_network_role_tag network_role: - get_input: port_app_internal_0_port_network_role + get_input: port_app_data_port_0_network_role subnetpoolid: - get_input: port_app_internal_0_port_subnetpoolid + get_input: port_app_data_port_0_subnetpoolid + fixed_ips: + get_input: + - port_app_data_port_0_fixed_ips + - index_value name: get_input: - - port_app_internal_0_port_name + - port_app_data_port_0_name - index_value network: get_input: - - port_app_internal_0_port_network + - port_app_data_port_0_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: app relationship: tosca.relationships.network.BindsTo - app_app_oam_0_port: + app_app_internal_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_app_oam_0_port_replacement_policy + - port_app_internal_port_0_replacement_policy - index_value mac_requirements: - get_input: port_app_oam_0_port_mac_requirements + get_input: port_app_internal_port_0_mac_requirements + allowed_address_pairs: + get_input: port_app_internal_port_0_allowed_address_pairs order: - get_input: port_app_oam_0_port_order + get_input: port_app_internal_port_0_order security_groups: get_input: - - port_app_oam_0_port_security_groups + - port_app_internal_port_0_security_groups - index_value exCP_naming: - get_input: port_app_oam_0_port_exCP_naming + get_input: port_app_internal_port_0_exCP_naming vlan_requirements: - get_input: port_app_oam_0_port_vlan_requirements + get_input: port_app_internal_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_app_oam_0_port_related_networks + get_input: port_app_internal_port_0_related_networks ip_requirements: - get_input: port_app_oam_0_port_ip_requirements + get_input: port_app_internal_port_0_ip_requirements network_role_tag: - get_input: port_app_oam_0_port_network_role_tag + get_input: port_app_internal_port_0_network_role_tag network_role: - get_input: port_app_oam_0_port_network_role + get_input: port_app_internal_port_0_network_role subnetpoolid: - get_input: port_app_oam_0_port_subnetpoolid - fixed_ips: - get_input: - - port_app_oam_0_port_fixed_ips - - index_value + get_input: port_app_internal_port_0_subnetpoolid name: get_input: - - port_app_oam_0_port_name + - port_app_internal_port_0_name - index_value network: get_input: - - port_app_oam_0_port_network + - port_app_internal_port_0_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: app relationship: tosca.relationships.network.BindsTo - app_app_data_0_port: + app_app_oam_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_app_data_0_port_replacement_policy + - port_app_oam_port_0_replacement_policy - index_value mac_requirements: - get_input: port_app_data_0_port_mac_requirements + get_input: port_app_oam_port_0_mac_requirements order: - get_input: port_app_data_0_port_order + get_input: port_app_oam_port_0_order security_groups: get_input: - - port_app_data_0_port_security_groups + - port_app_oam_port_0_security_groups - index_value exCP_naming: - get_input: port_app_data_0_port_exCP_naming + get_input: port_app_oam_port_0_exCP_naming vlan_requirements: - get_input: port_app_data_0_port_vlan_requirements + get_input: port_app_oam_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_app_data_0_port_related_networks + get_input: port_app_oam_port_0_related_networks ip_requirements: - get_input: port_app_data_0_port_ip_requirements + get_input: port_app_oam_port_0_ip_requirements network_role_tag: - get_input: port_app_data_0_port_network_role_tag + get_input: port_app_oam_port_0_network_role_tag network_role: - get_input: port_app_data_0_port_network_role + get_input: port_app_oam_port_0_network_role subnetpoolid: - get_input: port_app_data_0_port_subnetpoolid + get_input: port_app_oam_port_0_subnetpoolid fixed_ips: get_input: - - port_app_data_0_port_fixed_ips + - port_app_oam_port_0_fixed_ips - index_value name: get_input: - - port_app_data_0_port_name + - port_app_oam_port_0_name - index_value network: get_input: - - port_app_data_0_port_network + - port_app_oam_port_0_network - index_value requirements: - binding: @@ -414,9 +414,9 @@ topology_template: disk.device.write.requests_app: - app - disk.device.write.requests - feature_app_app_oam_0_port: - - app_app_oam_0_port - - feature + network.incoming.bytes_app_app_data_port_0: + - app_app_data_port_0 + - network.incoming.bytes disk.device.capacity_app: - app - disk.device.capacity @@ -426,18 +426,12 @@ topology_template: disk.device.iops_app: - app - disk.device.iops - network.incoming.packets.rate_app_app_oam_0_port: - - app_app_oam_0_port - - network.incoming.packets.rate - network.incoming.bytes.rate_app_app_data_0_port: - - app_app_data_0_port - - network.incoming.bytes.rate - network.incoming.bytes_app_app_oam_0_port: - - app_app_oam_0_port - - network.incoming.bytes - network.incoming.packets.rate_app_app_internal_0_port: - - app_app_internal_0_port - - network.incoming.packets.rate + network.outpoing.packets_app_app_internal_port_0: + - app_app_internal_port_0 + - network.outpoing.packets + network.outgoing.bytes.rate_app_app_data_port_0: + - app_app_data_port_0 + - network.outgoing.bytes.rate cpu.delta_app: - app - cpu.delta @@ -453,45 +447,60 @@ topology_template: disk.device.latency_app: - app - disk.device.latency - forwarder_app_app_oam_0_port: - - app_app_oam_0_port - - forwarder + network.outgoing.packets.rate_app_app_oam_port_0: + - app_app_oam_port_0 + - network.outgoing.packets.rate + network.incoming.packets_app_app_internal_port_0: + - app_app_internal_port_0 + - network.incoming.packets disk.ephemeral.size_app: - app - disk.ephemeral.size - network.outgoing.bytes_app_app_oam_0_port: - - app_app_oam_0_port - - network.outgoing.bytes + network.incoming.bytes.rate_app_app_oam_port_0: + - app_app_oam_port_0 + - network.incoming.bytes.rate disk.device.write.requests.rate_app: - app - disk.device.write.requests.rate disk.device.read.bytes_app: - app - disk.device.read.bytes - binding_app_app_data_0_port: - - app_app_data_0_port - - binding + network.outgoing.bytes_app_app_internal_port_0: + - app_app_internal_port_0 + - network.outgoing.bytes disk.device.read.requests.rate_app: - app - disk.device.read.requests.rate + network.outgoing.bytes.rate_app_app_oam_port_0: + - app_app_oam_port_0 + - network.outgoing.bytes.rate + network.incoming.bytes.rate_app_app_data_port_0: + - app_app_data_port_0 + - network.incoming.bytes.rate + network.outgoing.bytes_app_app_oam_port_0: + - app_app_oam_port_0 + - network.outgoing.bytes vcpus_app: - app - vcpus + binding_app_app_internal_port_0: + - app_app_internal_port_0 + - binding disk.device.read.requests_app: - app - disk.device.read.requests - feature_app_app_internal_0_port: - - app_app_internal_0_port - - feature cpu_util_app: - app - cpu_util + attachment_app_app_internal_port_0: + - app_app_internal_port_0 + - attachment endpoint_app: - app - endpoint - network.incoming.packets.rate_app_app_data_0_port: - - app_app_data_0_port - - network.incoming.packets.rate + network.incoming.bytes.rate_app_app_internal_port_0: + - app_app_internal_port_0 + - network.incoming.bytes.rate disk.iops_app: - app - disk.iops @@ -501,81 +510,57 @@ topology_template: disk.read.bytes.rate_app: - app - disk.read.bytes.rate + attachment_app_app_data_port_0: + - app_app_data_port_0 + - attachment disk.latency_app: - app - disk.latency memory.usage_app: - app - memory.usage - attachment_app_app_oam_0_port: - - app_app_oam_0_port - - attachment os_app: - app - os - network.incoming.packets_app_app_internal_0_port: - - app_app_internal_0_port - - network.incoming.packets - network.incoming.packets_app_app_oam_0_port: - - app_app_oam_0_port - - network.incoming.packets - network.outgoing.bytes.rate_app_app_internal_0_port: - - app_app_internal_0_port - - network.outgoing.bytes.rate - network.outgoing.bytes.rate_app_app_oam_0_port: - - app_app_oam_0_port - - network.outgoing.bytes.rate - forwarder_app_app_internal_0_port: - - app_app_internal_0_port - - forwarder + network.outgoing.bytes_app_app_data_port_0: + - app_app_data_port_0 + - network.outgoing.bytes + feature_app_app_oam_port_0: + - app_app_oam_port_0 + - feature memory_app: - app - memory disk.read.requests_app: - app - disk.read.requests - network.outpoing.packets_app_app_oam_0_port: - - app_app_oam_0_port - - network.outpoing.packets - network.incoming.bytes_app_app_data_0_port: - - app_app_data_0_port - - network.incoming.bytes + forwarder_app_app_oam_port_0: + - app_app_oam_port_0 + - forwarder disk.write.bytes_app: - app - disk.write.bytes + binding_app_app_data_port_0: + - app_app_data_port_0 + - binding disk.allocation_app: - app - disk.allocation - network.outgoing.bytes_app_app_internal_0_port: - - app_app_internal_0_port - - network.outgoing.bytes - attachment_app_app_data_0_port: - - app_app_data_0_port - - attachment - network.incoming.bytes.rate_app_app_oam_0_port: - - app_app_oam_0_port - - network.incoming.bytes.rate - network.outgoing.packets.rate_app_app_internal_0_port: - - app_app_internal_0_port - - network.outgoing.packets.rate - network.incoming.bytes.rate_app_app_internal_0_port: - - app_app_internal_0_port - - network.incoming.bytes.rate + network.incoming.packets_app_app_data_port_0: + - app_app_data_port_0 + - network.incoming.packets memory.resident_app: - app - memory.resident - network.outgoing.packets.rate_app_app_oam_0_port: - - app_app_oam_0_port - - network.outgoing.packets.rate - network.outgoing.bytes.rate_app_app_data_0_port: - - app_app_data_0_port - - network.outgoing.bytes.rate + binding_app_app_oam_port_0: + - app_app_oam_port_0 + - binding + feature_app_app_internal_port_0: + - app_app_internal_port_0 + - feature cpu_app: - app - cpu - feature_app_app_data_0_port: - - app_app_data_0_port - - feature disk.usage_app: - app - disk.usage @@ -585,85 +570,100 @@ topology_template: disk.read.bytes_app: - app - disk.read.bytes + network.outpoing.packets_app_app_data_port_0: + - app_app_data_port_0 + - network.outpoing.packets + network.incoming.bytes_app_app_oam_port_0: + - app_app_oam_port_0 + - network.incoming.bytes scalable_app: - app - scalable - network.outgoing.packets.rate_app_app_data_0_port: - - app_app_data_0_port - - network.outgoing.packets.rate + network.incoming.bytes_app_app_internal_port_0: + - app_app_internal_port_0 + - network.incoming.bytes + network.outgoing.bytes.rate_app_app_internal_port_0: + - app_app_internal_port_0 + - network.outgoing.bytes.rate + network.outpoing.packets_app_app_oam_port_0: + - app_app_oam_port_0 + - network.outpoing.packets + network.incoming.packets.rate_app_app_data_port_0: + - app_app_data_port_0 + - network.incoming.packets.rate + forwarder_app_app_internal_port_0: + - app_app_internal_port_0 + - forwarder + forwarder_app_app_data_port_0: + - app_app_data_port_0 + - forwarder disk.device.read.bytes.rate_app: - app - disk.device.read.bytes.rate disk.device.allocation_app: - app - disk.device.allocation + network.incoming.packets.rate_app_app_internal_port_0: + - app_app_internal_port_0 + - network.incoming.packets.rate binding_app: - app - binding disk.device.write.bytes.rate_app: - app - disk.device.write.bytes.rate - binding_app_app_oam_0_port: - - app_app_oam_0_port - - binding disk.device.usage_app: - app - disk.device.usage - network.outpoing.packets_app_app_data_0_port: - - app_app_data_0_port - - network.outpoing.packets - network.outgoing.bytes_app_app_data_0_port: - - app_app_data_0_port - - network.outgoing.bytes - network.incoming.bytes_app_app_internal_0_port: - - app_app_internal_0_port - - network.incoming.bytes - forwarder_app_app_data_0_port: - - app_app_data_0_port - - forwarder + feature_app_app_data_port_0: + - app_app_data_port_0 + - feature + network.outgoing.packets.rate_app_app_internal_port_0: + - app_app_internal_port_0 + - network.outgoing.packets.rate + network.incoming.packets.rate_app_app_oam_port_0: + - app_app_oam_port_0 + - network.incoming.packets.rate + network.incoming.packets_app_app_oam_port_0: + - app_app_oam_port_0 + - network.incoming.packets disk.write.requests_app: - app - disk.write.requests - binding_app_app_internal_0_port: - - app_app_internal_0_port - - binding + attachment_app_app_oam_port_0: + - app_app_oam_port_0 + - attachment + network.outgoing.packets.rate_app_app_data_port_0: + - app_app_data_port_0 + - network.outgoing.packets.rate instance_app: - app - instance - attachment_app_app_internal_0_port: - - app_app_internal_0_port - - attachment - network.incoming.packets_app_app_data_0_port: - - app_app_data_0_port - - network.incoming.packets - network.outpoing.packets_app_app_internal_0_port: - - app_app_internal_0_port - - network.outpoing.packets disk.capacity_app: - app - disk.capacity requirements: - link_app_app_oam_0_port: - - app_app_oam_0_port - - link - dependency_app_app_internal_0_port: - - app_app_internal_0_port + dependency_app_app_oam_port_0: + - app_app_oam_port_0 + - dependency + dependency_app_app_data_port_0: + - app_app_data_port_0 - dependency dependency_app: - app - dependency - dependency_app_app_oam_0_port: - - app_app_oam_0_port - - dependency + link_app_app_data_port_0: + - app_app_data_port_0 + - link + link_app_app_internal_port_0: + - app_app_internal_port_0 + - link local_storage_app: - app - local_storage - link_app_app_internal_0_port: - - app_app_internal_0_port - - link - link_app_app_data_0_port: - - app_app_data_0_port + link_app_app_oam_port_0: + - app_app_oam_port_0 - link - dependency_app_app_data_0_port: - - app_app_data_0_port + dependency_app_app_internal_port_0: + - app_app_internal_port_0 - 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/catalogInstances/computewithtwosameporttypes/out/Nested_ioxServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_ioxServiceTemplate.yaml index 49e8ee1c5c..2e97fde0fb 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_ioxServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_ioxServiceTemplate.yaml @@ -11,177 +11,183 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_iox_data_0_port_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_iox_oam_0_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_iox_internal_0_port_network: - type: list - required: true - entry_schema: - type: string - port_iox_data_0_port_name: - type: list + port_iox_oam_port_0_network_role: + type: string required: true - entry_schema: - type: string - port_iox_data_0_port_related_networks: + port_iox_oam_port_0_fixed_ips: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - vm_flavor_name: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_iox_data_port_0_network_role: type: string required: true - port_iox_data_0_port_subnetpoolid: + vm_flavor_name: type: string required: true - port_iox_data_0_port_allowed_address_pairs: - type: list + port_iox_oam_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: org.openecomp.datatypes.heat.network.AddressPair - port_iox_internal_0_port_ip_requirements: - type: list + port_iox_data_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements vm_image_name: type: string required: true - port_iox_oam_0_port_name: + port_iox_oam_port_0_replacement_policy: type: list required: true entry_schema: type: string - port_iox_oam_0_port_network_role_tag: - type: string + port_iox_oam_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_iox_oam_0_port_subnetpoolid: - type: string + port_iox_internal_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true compute_iox_user_data_format: type: list required: true entry_schema: type: string - port_iox_data_0_port_fixed_ips: - type: list + port_iox_internal_port_0_subnetpoolid: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_iox_internal_0_port_allowed_address_pairs: + port_iox_data_port_0_allowed_address_pairs: type: list required: true entry_schema: type: org.openecomp.datatypes.heat.network.AddressPair - compute_iox_config_drive: + port_iox_data_port_0_ip_requirements: type: list required: true entry_schema: - type: boolean - port_iox_internal_0_port_order: - type: integer - required: true - port_iox_oam_0_port_replacement_policy: + type: org.openecomp.datatypes.network.IpRequirements + port_iox_internal_port_0_related_networks: type: list required: true entry_schema: - type: string - port_iox_data_0_port_security_groups: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + compute_iox_config_drive: type: list required: true entry_schema: - type: json - port_iox_internal_0_port_vlan_requirements: + type: boolean + port_iox_internal_port_0_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - compute_iox_image_update_policy: + port_iox_internal_port_0_order: + type: integer + required: true + port_iox_data_port_0_network: type: list required: true entry_schema: type: string - port_iox_oam_0_port_order: + port_iox_internal_port_0_network_role_tag: + type: string + required: true + port_iox_oam_port_0_order: type: integer required: true - port_iox_oam_0_port_network: + compute_iox_image_update_policy: type: list required: true entry_schema: type: string - port_iox_oam_0_port_related_networks: + port_iox_data_port_0_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_iox_internal_0_port_security_groups: + type: org.openecomp.datatypes.network.VlanRequirements + port_iox_data_port_0_network_role_tag: + type: string + required: true + port_iox_internal_port_0_ip_requirements: type: list required: true entry_schema: - type: json - port_iox_oam_0_port_vlan_requirements: + type: org.openecomp.datatypes.network.IpRequirements + port_iox_oam_port_0_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_iox_data_0_port_order: + port_iox_data_port_0_order: type: integer required: true - port_iox_internal_0_port_name: + compute_iox_name: type: list required: true entry_schema: type: string - port_iox_oam_0_port_fixed_ips: + port_iox_oam_port_0_allowed_address_pairs: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_iox_data_0_port_vlan_requirements: + type: org.openecomp.datatypes.heat.network.AddressPair + port_iox_oam_port_0_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - compute_iox_name: + type: string + port_iox_internal_port_0_name: type: list required: true entry_schema: type: string - port_iox_data_0_port_network: + port_iox_internal_port_0_allowed_address_pairs: type: list required: true entry_schema: - type: string - port_iox_internal_0_port_replacement_policy: + type: org.openecomp.datatypes.heat.network.AddressPair + port_iox_oam_port_0_network_role_tag: + type: string + required: true + port_iox_data_port_0_fixed_ips: type: list required: true entry_schema: - type: string - port_iox_internal_0_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_iox_data_port_0_subnetpoolid: + type: string required: true - port_iox_data_0_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_iox_oam_port_0_security_groups: + type: list + required: true + entry_schema: + type: json + port_iox_internal_port_0_security_groups: + type: list required: true - port_iox_data_0_port_exCP_naming: + entry_schema: + type: json + port_iox_oam_port_0_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_iox_data_port_0_exCP_naming: type: org.openecomp.datatypes.Naming required: true - port_iox_oam_0_port_network_role: - type: string + port_iox_data_port_0_related_networks: + type: list required: true - port_iox_internal_0_port_network_role: - type: string + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_iox_data_port_0_security_groups: + type: list required: true - port_iox_data_0_port_network_role: - type: string + entry_schema: + type: json + port_iox_internal_port_0_network: + type: list required: true - port_iox_data_0_port_replacement_policy: + entry_schema: + type: string + port_iox_internal_port_0_replacement_policy: type: list required: true entry_schema: @@ -191,6 +197,11 @@ topology_template: required: true entry_schema: type: json + port_iox_data_port_0_name: + type: list + required: true + entry_schema: + type: string index_value: type: integer description: Index value of this substitution service template runtime instance @@ -198,20 +209,13 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_iox_internal_0_port_network_role_tag: + port_iox_internal_port_0_network_role: type: string required: true - port_iox_internal_0_port_related_networks: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_iox_oam_0_port_allowed_address_pairs: - type: list + port_iox_internal_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: org.openecomp.datatypes.heat.network.AddressPair - port_iox_internal_0_port_subnetpoolid: + port_iox_oam_port_0_subnetpoolid: type: string required: true compute_iox_availability_zone: @@ -219,75 +223,22 @@ topology_template: required: true entry_schema: type: string - port_iox_oam_0_port_security_groups: + port_iox_oam_port_0_related_networks: type: list required: true entry_schema: - type: json - port_iox_oam_0_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_iox_oam_0_port_ip_requirements: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_iox_data_port_0_replacement_policy: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_iox_internal_0_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_iox_data_0_port_network_role_tag: - type: string + type: string + port_iox_oam_port_0_name: + type: list required: true + entry_schema: + type: string node_templates: - iox_iox_data_0_port: - type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port - properties: - replacement_policy: - get_input: - - port_iox_data_0_port_replacement_policy - - index_value - mac_requirements: - get_input: port_iox_data_0_port_mac_requirements - allowed_address_pairs: - get_input: port_iox_data_0_port_allowed_address_pairs - order: - get_input: port_iox_data_0_port_order - security_groups: - get_input: - - port_iox_data_0_port_security_groups - - index_value - exCP_naming: - get_input: port_iox_data_0_port_exCP_naming - vlan_requirements: - get_input: port_iox_data_0_port_vlan_requirements - subinterface_indicator: false - related_networks: - get_input: port_iox_data_0_port_related_networks - ip_requirements: - get_input: port_iox_data_0_port_ip_requirements - network_role_tag: - get_input: port_iox_data_0_port_network_role_tag - network_role: - get_input: port_iox_data_0_port_network_role - subnetpoolid: - get_input: port_iox_data_0_port_subnetpoolid - fixed_ips: - get_input: - - port_iox_data_0_port_fixed_ips - - index_value - name: - get_input: - - port_iox_data_0_port_name - - index_value - network: - get_input: - - port_iox_data_0_port_network - - index_value - requirements: - - binding: - capability: tosca.capabilities.network.Bindable - node: iox - relationship: tosca.relationships.network.BindsTo iox: type: org.openecomp.resource.vfc.compute.nodes.heat.iox properties: @@ -319,94 +270,143 @@ topology_template: get_input: - compute_iox_user_data_format - index_value - iox_iox_oam_0_port: + iox_iox_internal_port_0: + type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port + properties: + replacement_policy: + get_input: + - port_iox_internal_port_0_replacement_policy + - index_value + mac_requirements: + get_input: port_iox_internal_port_0_mac_requirements + allowed_address_pairs: + get_input: port_iox_internal_port_0_allowed_address_pairs + order: + get_input: port_iox_internal_port_0_order + security_groups: + get_input: + - port_iox_internal_port_0_security_groups + - index_value + exCP_naming: + get_input: port_iox_internal_port_0_exCP_naming + vlan_requirements: + get_input: port_iox_internal_port_0_vlan_requirements + subinterface_indicator: false + related_networks: + get_input: port_iox_internal_port_0_related_networks + ip_requirements: + get_input: port_iox_internal_port_0_ip_requirements + network_role_tag: + get_input: port_iox_internal_port_0_network_role_tag + network_role: + get_input: port_iox_internal_port_0_network_role + subnetpoolid: + get_input: port_iox_internal_port_0_subnetpoolid + name: + get_input: + - port_iox_internal_port_0_name + - index_value + network: + get_input: + - port_iox_internal_port_0_network + - index_value + requirements: + - binding: + capability: tosca.capabilities.network.Bindable + node: iox + relationship: tosca.relationships.network.BindsTo + iox_iox_oam_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_iox_oam_0_port_replacement_policy + - port_iox_oam_port_0_replacement_policy - index_value mac_requirements: - get_input: port_iox_oam_0_port_mac_requirements + get_input: port_iox_oam_port_0_mac_requirements allowed_address_pairs: - get_input: port_iox_oam_0_port_allowed_address_pairs + get_input: port_iox_oam_port_0_allowed_address_pairs order: - get_input: port_iox_oam_0_port_order + get_input: port_iox_oam_port_0_order security_groups: get_input: - - port_iox_oam_0_port_security_groups + - port_iox_oam_port_0_security_groups - index_value exCP_naming: - get_input: port_iox_oam_0_port_exCP_naming + get_input: port_iox_oam_port_0_exCP_naming vlan_requirements: - get_input: port_iox_oam_0_port_vlan_requirements + get_input: port_iox_oam_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_iox_oam_0_port_related_networks + get_input: port_iox_oam_port_0_related_networks ip_requirements: - get_input: port_iox_oam_0_port_ip_requirements + get_input: port_iox_oam_port_0_ip_requirements network_role_tag: - get_input: port_iox_oam_0_port_network_role_tag + get_input: port_iox_oam_port_0_network_role_tag network_role: - get_input: port_iox_oam_0_port_network_role + get_input: port_iox_oam_port_0_network_role subnetpoolid: - get_input: port_iox_oam_0_port_subnetpoolid + get_input: port_iox_oam_port_0_subnetpoolid fixed_ips: get_input: - - port_iox_oam_0_port_fixed_ips + - port_iox_oam_port_0_fixed_ips - index_value name: get_input: - - port_iox_oam_0_port_name + - port_iox_oam_port_0_name - index_value network: get_input: - - port_iox_oam_0_port_network + - port_iox_oam_port_0_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: iox relationship: tosca.relationships.network.BindsTo - iox_iox_internal_0_port: + iox_iox_data_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_iox_internal_0_port_replacement_policy + - port_iox_data_port_0_replacement_policy - index_value mac_requirements: - get_input: port_iox_internal_0_port_mac_requirements + get_input: port_iox_data_port_0_mac_requirements allowed_address_pairs: - get_input: port_iox_internal_0_port_allowed_address_pairs + get_input: port_iox_data_port_0_allowed_address_pairs order: - get_input: port_iox_internal_0_port_order + get_input: port_iox_data_port_0_order security_groups: get_input: - - port_iox_internal_0_port_security_groups + - port_iox_data_port_0_security_groups - index_value exCP_naming: - get_input: port_iox_internal_0_port_exCP_naming + get_input: port_iox_data_port_0_exCP_naming vlan_requirements: - get_input: port_iox_internal_0_port_vlan_requirements + get_input: port_iox_data_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_iox_internal_0_port_related_networks + get_input: port_iox_data_port_0_related_networks ip_requirements: - get_input: port_iox_internal_0_port_ip_requirements + get_input: port_iox_data_port_0_ip_requirements network_role_tag: - get_input: port_iox_internal_0_port_network_role_tag + get_input: port_iox_data_port_0_network_role_tag network_role: - get_input: port_iox_internal_0_port_network_role + get_input: port_iox_data_port_0_network_role subnetpoolid: - get_input: port_iox_internal_0_port_subnetpoolid + get_input: port_iox_data_port_0_subnetpoolid + fixed_ips: + get_input: + - port_iox_data_port_0_fixed_ips + - index_value name: get_input: - - port_iox_internal_0_port_name + - port_iox_data_port_0_name - index_value network: get_input: - - port_iox_internal_0_port_network + - port_iox_data_port_0_network - index_value requirements: - binding: @@ -416,9 +416,6 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.iox capabilities: - forwarder_iox_iox_oam_0_port: - - iox_iox_oam_0_port - - forwarder cpu.delta_iox: - iox - cpu.delta @@ -428,23 +425,23 @@ topology_template: memory_iox: - iox - memory - network.outgoing.packets.rate_iox_iox_data_0_port: - - iox_iox_data_0_port - - network.outgoing.packets.rate disk.device.read.bytes_iox: - iox - disk.device.read.bytes disk.read.requests_iox: - iox - disk.read.requests + network.incoming.packets_iox_iox_data_port_0: + - iox_iox_data_port_0 + - network.incoming.packets disk.write.requests_iox: - iox - disk.write.requests - network.incoming.bytes_iox_iox_oam_0_port: - - iox_iox_oam_0_port - - network.incoming.bytes - network.incoming.packets.rate_iox_iox_internal_0_port: - - iox_iox_internal_0_port + network.outpoing.packets_iox_iox_internal_port_0: + - iox_iox_internal_port_0 + - network.outpoing.packets + network.incoming.packets.rate_iox_iox_data_port_0: + - iox_iox_data_port_0 - network.incoming.packets.rate disk.device.read.requests.rate_iox: - iox @@ -458,90 +455,81 @@ topology_template: disk.write.bytes_iox: - iox - disk.write.bytes + network.outgoing.packets.rate_iox_iox_internal_port_0: + - iox_iox_internal_port_0 + - network.outgoing.packets.rate + network.incoming.packets_iox_iox_internal_port_0: + - iox_iox_internal_port_0 + - network.incoming.packets disk.device.write.requests_iox: - iox - disk.device.write.requests disk.device.allocation_iox: - iox - disk.device.allocation - feature_iox_iox_data_0_port: - - iox_iox_data_0_port - - feature disk.root.size_iox: - iox - disk.root.size + network.outgoing.bytes.rate_iox_iox_oam_port_0: + - iox_iox_oam_port_0 + - network.outgoing.bytes.rate vcpus_iox: - iox - vcpus disk.device.iops_iox: - iox - disk.device.iops - network.outgoing.bytes.rate_iox_iox_data_0_port: - - iox_iox_data_0_port - - network.outgoing.bytes.rate + network.outgoing.bytes_iox_iox_data_port_0: + - iox_iox_data_port_0 + - network.outgoing.bytes disk.read.bytes.rate_iox: - iox - disk.read.bytes.rate - network.outgoing.bytes_iox_iox_oam_0_port: - - iox_iox_oam_0_port + feature_iox_iox_oam_port_0: + - iox_iox_oam_port_0 + - feature + network.outgoing.bytes_iox_iox_internal_port_0: + - iox_iox_internal_port_0 - network.outgoing.bytes - attachment_iox_iox_data_0_port: - - iox_iox_data_0_port - - attachment - network.incoming.packets.rate_iox_iox_oam_0_port: - - iox_iox_oam_0_port + binding_iox_iox_data_port_0: + - iox_iox_data_port_0 + - binding + network.incoming.packets.rate_iox_iox_internal_port_0: + - iox_iox_internal_port_0 - network.incoming.packets.rate disk.latency_iox: - iox - disk.latency - network.incoming.packets.rate_iox_iox_data_0_port: - - iox_iox_data_0_port + network.incoming.bytes.rate_iox_iox_data_port_0: + - iox_iox_data_port_0 + - network.incoming.bytes.rate + network.incoming.packets.rate_iox_iox_oam_port_0: + - iox_iox_oam_port_0 - network.incoming.packets.rate - network.incoming.bytes_iox_iox_internal_0_port: - - iox_iox_internal_0_port - - network.incoming.bytes cpu_util_iox: - iox - cpu_util - binding_iox_iox_oam_0_port: - - iox_iox_oam_0_port - - binding - network.incoming.bytes_iox_iox_data_0_port: - - iox_iox_data_0_port - - network.incoming.bytes disk.device.capacity_iox: - iox - disk.device.capacity disk.iops_iox: - iox - disk.iops - network.outpoing.packets_iox_iox_internal_0_port: - - iox_iox_internal_0_port - - network.outpoing.packets endpoint_iox: - iox - endpoint - binding_iox_iox_internal_0_port: - - iox_iox_internal_0_port - - binding disk.device.read.requests_iox: - iox - disk.device.read.requests memory.usage_iox: - iox - memory.usage - attachment_iox_iox_internal_0_port: - - iox_iox_internal_0_port + attachment_iox_iox_data_port_0: + - iox_iox_data_port_0 - attachment - network.outgoing.bytes_iox_iox_internal_0_port: - - iox_iox_internal_0_port - - network.outgoing.bytes cpu_iox: - iox - cpu - feature_iox_iox_oam_0_port: - - iox_iox_oam_0_port - - feature disk.usage_iox: - iox - disk.usage @@ -551,42 +539,54 @@ topology_template: feature_iox: - iox - feature + network.incoming.bytes_iox_iox_data_port_0: + - iox_iox_data_port_0 + - network.incoming.bytes memory.resident_iox: - iox - memory.resident disk.device.write.bytes_iox: - iox - disk.device.write.bytes - network.outgoing.packets.rate_iox_iox_internal_0_port: - - iox_iox_internal_0_port - - network.outgoing.packets.rate - binding_iox_iox_data_0_port: - - iox_iox_data_0_port - - binding - network.outgoing.bytes.rate_iox_iox_oam_0_port: - - iox_iox_oam_0_port - - network.outgoing.bytes.rate - network.incoming.bytes.rate_iox_iox_internal_0_port: - - iox_iox_internal_0_port - - network.incoming.bytes.rate - network.incoming.bytes.rate_iox_iox_oam_0_port: - - iox_iox_oam_0_port - - network.incoming.bytes.rate + attachment_iox_iox_oam_port_0: + - iox_iox_oam_port_0 + - attachment + network.incoming.packets_iox_iox_oam_port_0: + - iox_iox_oam_port_0 + - network.incoming.packets + feature_iox_iox_internal_port_0: + - iox_iox_internal_port_0 + - feature + network.outpoing.packets_iox_iox_oam_port_0: + - iox_iox_oam_port_0 + - network.outpoing.packets disk.allocation_iox: - iox - disk.allocation - network.outgoing.packets.rate_iox_iox_oam_0_port: - - iox_iox_oam_0_port - - network.outgoing.packets.rate + forwarder_iox_iox_internal_port_0: + - iox_iox_internal_port_0 + - forwarder + binding_iox_iox_oam_port_0: + - iox_iox_oam_port_0 + - binding + network.incoming.bytes_iox_iox_internal_port_0: + - iox_iox_internal_port_0 + - network.incoming.bytes binding_iox: - iox - binding os_iox: - iox - os + binding_iox_iox_internal_port_0: + - iox_iox_internal_port_0 + - binding host_iox: - iox - host + network.outgoing.packets.rate_iox_iox_oam_port_0: + - iox_iox_oam_port_0 + - network.outgoing.packets.rate disk.write.requests.rate_iox: - iox - disk.write.requests.rate @@ -596,79 +596,79 @@ topology_template: disk.read.bytes_iox: - iox - disk.read.bytes - network.incoming.packets_iox_iox_oam_0_port: - - iox_iox_oam_0_port - - network.incoming.packets + network.outgoing.bytes.rate_iox_iox_internal_port_0: + - iox_iox_internal_port_0 + - network.outgoing.bytes.rate instance_iox: - iox - instance disk.ephemeral.size_iox: - iox - disk.ephemeral.size - network.outpoing.packets_iox_iox_data_0_port: - - iox_iox_data_0_port - - network.outpoing.packets - attachment_iox_iox_oam_0_port: - - iox_iox_oam_0_port + attachment_iox_iox_internal_port_0: + - iox_iox_internal_port_0 - attachment - feature_iox_iox_internal_0_port: - - iox_iox_internal_0_port - - feature - network.incoming.packets_iox_iox_internal_0_port: - - iox_iox_internal_0_port - - network.incoming.packets - network.outpoing.packets_iox_iox_oam_0_port: - - iox_iox_oam_0_port - - network.outpoing.packets - forwarder_iox_iox_data_0_port: - - iox_iox_data_0_port + forwarder_iox_iox_data_port_0: + - iox_iox_data_port_0 - forwarder + network.incoming.bytes.rate_iox_iox_internal_port_0: + - iox_iox_internal_port_0 + - network.incoming.bytes.rate + forwarder_iox_iox_oam_port_0: + - iox_iox_oam_port_0 + - forwarder + network.incoming.bytes_iox_iox_oam_port_0: + - iox_iox_oam_port_0 + - network.incoming.bytes + feature_iox_iox_data_port_0: + - iox_iox_data_port_0 + - feature + network.incoming.bytes.rate_iox_iox_oam_port_0: + - iox_iox_oam_port_0 + - network.incoming.bytes.rate + network.outgoing.bytes_iox_iox_oam_port_0: + - iox_iox_oam_port_0 + - network.outgoing.bytes disk.device.read.bytes.rate_iox: - iox - disk.device.read.bytes.rate - network.incoming.bytes.rate_iox_iox_data_0_port: - - iox_iox_data_0_port - - network.incoming.bytes.rate - network.incoming.packets_iox_iox_data_0_port: - - iox_iox_data_0_port - - network.incoming.packets + network.outpoing.packets_iox_iox_data_port_0: + - iox_iox_data_port_0 + - network.outpoing.packets + network.outgoing.bytes.rate_iox_iox_data_port_0: + - iox_iox_data_port_0 + - network.outgoing.bytes.rate disk.device.write.bytes.rate_iox: - iox - disk.device.write.bytes.rate - network.outgoing.bytes.rate_iox_iox_internal_0_port: - - iox_iox_internal_0_port - - network.outgoing.bytes.rate - forwarder_iox_iox_internal_0_port: - - iox_iox_internal_0_port - - forwarder disk.device.usage_iox: - iox - disk.device.usage - network.outgoing.bytes_iox_iox_data_0_port: - - iox_iox_data_0_port - - network.outgoing.bytes + network.outgoing.packets.rate_iox_iox_data_port_0: + - iox_iox_data_port_0 + - network.outgoing.packets.rate requirements: - dependency_iox_iox_internal_0_port: - - iox_iox_internal_0_port + dependency_iox_iox_data_port_0: + - iox_iox_data_port_0 - dependency - link_iox_iox_oam_0_port: - - iox_iox_oam_0_port - - link dependency_iox: - iox - dependency - dependency_iox_iox_data_0_port: - - iox_iox_data_0_port + dependency_iox_iox_oam_port_0: + - iox_iox_oam_port_0 - dependency - link_iox_iox_data_0_port: - - iox_iox_data_0_port - - link - link_iox_iox_internal_0_port: - - iox_iox_internal_0_port + link_iox_iox_internal_port_0: + - iox_iox_internal_port_0 - link + dependency_iox_iox_internal_port_0: + - iox_iox_internal_port_0 + - dependency local_storage_iox: - iox - local_storage - dependency_iox_iox_oam_0_port: - - iox_iox_oam_0_port - - dependency + link_iox_iox_data_port_0: + - iox_iox_data_port_0 + - link + link_iox_iox_oam_port_0: + - iox_iox_oam_port_0 + - link \ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_pltServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_pltServiceTemplate.yaml index bc794e70bd..27818cb820 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_pltServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_pltServiceTemplate.yaml @@ -11,151 +11,153 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_plt_data_0_port_related_networks: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_plt_oam_0_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_plt_oam_0_port_subnetpoolid: + port_plt_oam_port_0_network_role_tag: type: string required: true - port_plt_internal_0_port_allowed_address_pairs: + port_plt_data_port_0_allowed_address_pairs: type: list required: true entry_schema: type: org.openecomp.datatypes.heat.network.AddressPair - port_plt_oam_0_port_security_groups: + port_plt_oam_port_0_ip_requirements: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements + port_plt_oam_port_0_network_role: + type: string + required: true compute_plt_config_drive: type: list required: true entry_schema: type: boolean - port_plt_data_0_port_subnetpoolid: + port_plt_data_port_0_network_role_tag: type: string required: true vm_flavor_name: type: string required: true - port_plt_internal_0_port_vlan_requirements: + port_plt_internal_port_0_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_plt_data_0_port_fixed_ips: + port_plt_data_port_0_network_role: + type: string + required: true + port_plt_internal_port_0_replacement_policy: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps + type: string + port_plt_data_port_0_security_groups: + type: list + required: true + entry_schema: + type: json vm_image_name: type: string required: true - compute_plt_availability_zone: + port_plt_oam_port_0_name: type: list required: true entry_schema: type: string - port_plt_oam_0_port_name: + compute_plt_availability_zone: type: list required: true entry_schema: type: string - port_plt_internal_0_port_security_groups: - type: list - required: true - entry_schema: - type: json - port_plt_internal_0_port_network_role_tag: + port_plt_internal_port_0_network_role: type: string required: true - port_plt_oam_0_port_ip_requirements: + port_plt_data_port_0_ip_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_plt_data_0_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_plt_data_0_port_allowed_address_pairs: + port_plt_data_port_0_replacement_policy: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.network.AddressPair - port_plt_internal_0_port_subnetpoolid: + type: string + port_plt_internal_port_0_subnetpoolid: type: string required: true - port_plt_data_0_port_ip_requirements: + port_plt_data_port_0_order: + type: integer + required: true + port_plt_oam_port_0_security_groups: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_plt_internal_0_port_network: + type: json + port_plt_oam_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_plt_internal_port_0_allowed_address_pairs: type: list required: true entry_schema: - type: string - compute_plt_metadata: + type: org.openecomp.datatypes.heat.network.AddressPair + port_plt_internal_port_0_ip_requirements: type: list required: true entry_schema: - type: json - port_plt_data_0_port_security_groups: + type: org.openecomp.datatypes.network.IpRequirements + compute_plt_metadata: type: list required: true entry_schema: type: json - port_plt_oam_0_port_related_networks: + port_plt_internal_port_0_related_networks: type: list required: true entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_plt_internal_0_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_plt_oam_port_0_fixed_ips: + type: list required: true - port_plt_data_0_port_order: - type: integer + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_plt_internal_port_0_security_groups: + type: list required: true - port_plt_data_0_port_vlan_requirements: + entry_schema: + type: json + port_plt_data_port_0_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_plt_data_0_port_network_role_tag: - type: string - required: true - port_plt_internal_0_port_order: - type: integer - required: true - port_plt_internal_0_port_ip_requirements: + port_plt_oam_port_0_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_plt_oam_0_port_fixed_ips: + type: string + port_plt_oam_port_0_replacement_policy: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_plt_oam_0_port_network_role_tag: - type: string - required: true - port_plt_internal_0_port_name: + type: string + port_plt_oam_port_0_related_networks: type: list required: true entry_schema: - type: string - port_plt_internal_0_port_related_networks: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_plt_data_port_0_related_networks: type: list required: true entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_plt_oam_0_port_order: + port_plt_internal_port_0_order: + type: integer + required: true + port_plt_internal_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_plt_oam_port_0_order: type: integer required: true compute_plt_image_update_policy: @@ -163,46 +165,33 @@ topology_template: required: true entry_schema: type: string - port_plt_oam_0_port_network_role: + port_plt_oam_port_0_subnetpoolid: type: string required: true - port_plt_oam_0_port_allowed_address_pairs: - type: list + port_plt_internal_port_0_network_role_tag: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.heat.network.AddressPair - port_plt_data_0_port_name: - type: list + port_plt_data_port_0_subnetpoolid: + type: string required: true - entry_schema: - type: string - port_plt_data_0_port_exCP_naming: + port_plt_data_port_0_exCP_naming: type: org.openecomp.datatypes.Naming required: true - port_plt_internal_0_port_network_role: - type: string - required: true compute_plt_user_data_format: type: list required: true entry_schema: type: string - port_plt_internal_0_port_replacement_policy: + port_plt_internal_port_0_network: type: list required: true entry_schema: type: string - port_plt_data_0_port_network: + port_plt_data_port_0_fixed_ips: type: list required: true entry_schema: - type: string - port_plt_data_0_port_network_role: - type: string - required: true - port_plt_internal_0_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true + type: org.openecomp.datatypes.heat.neutron.port.FixedIps index_value: type: integer description: Index value of this substitution service template runtime instance @@ -210,123 +199,138 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_plt_oam_0_port_network: + port_plt_data_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_plt_internal_port_0_name: type: list required: true entry_schema: type: string - port_plt_oam_0_port_replacement_policy: + port_plt_oam_port_0_vlan_requirements: type: list required: true entry_schema: - type: string - port_plt_data_0_port_replacement_policy: + type: org.openecomp.datatypes.network.VlanRequirements + compute_plt_name: type: list required: true entry_schema: type: string - port_plt_oam_0_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_plt_internal_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - compute_plt_name: + port_plt_data_port_0_name: type: list required: true entry_schema: type: string - port_plt_oam_0_port_vlan_requirements: + port_plt_data_port_0_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: string + port_plt_oam_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_plt_oam_port_0_allowed_address_pairs: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.heat.network.AddressPair node_templates: - plt_plt_internal_0_port: + plt_plt_data_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_plt_internal_0_port_replacement_policy + - port_plt_data_port_0_replacement_policy - index_value mac_requirements: - get_input: port_plt_internal_0_port_mac_requirements + get_input: port_plt_data_port_0_mac_requirements allowed_address_pairs: - get_input: port_plt_internal_0_port_allowed_address_pairs + get_input: port_plt_data_port_0_allowed_address_pairs order: - get_input: port_plt_internal_0_port_order + get_input: port_plt_data_port_0_order security_groups: get_input: - - port_plt_internal_0_port_security_groups + - port_plt_data_port_0_security_groups - index_value exCP_naming: - get_input: port_plt_internal_0_port_exCP_naming + get_input: port_plt_data_port_0_exCP_naming vlan_requirements: - get_input: port_plt_internal_0_port_vlan_requirements + get_input: port_plt_data_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_plt_internal_0_port_related_networks + get_input: port_plt_data_port_0_related_networks ip_requirements: - get_input: port_plt_internal_0_port_ip_requirements + get_input: port_plt_data_port_0_ip_requirements network_role_tag: - get_input: port_plt_internal_0_port_network_role_tag + get_input: port_plt_data_port_0_network_role_tag network_role: - get_input: port_plt_internal_0_port_network_role + get_input: port_plt_data_port_0_network_role subnetpoolid: - get_input: port_plt_internal_0_port_subnetpoolid + get_input: port_plt_data_port_0_subnetpoolid + fixed_ips: + get_input: + - port_plt_data_port_0_fixed_ips + - index_value name: get_input: - - port_plt_internal_0_port_name + - port_plt_data_port_0_name - index_value network: get_input: - - port_plt_internal_0_port_network + - port_plt_data_port_0_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: plt relationship: tosca.relationships.network.BindsTo - plt_plt_data_0_port: + plt_plt_oam_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_plt_data_0_port_replacement_policy + - port_plt_oam_port_0_replacement_policy - index_value mac_requirements: - get_input: port_plt_data_0_port_mac_requirements + get_input: port_plt_oam_port_0_mac_requirements allowed_address_pairs: - get_input: port_plt_data_0_port_allowed_address_pairs + get_input: port_plt_oam_port_0_allowed_address_pairs order: - get_input: port_plt_data_0_port_order + get_input: port_plt_oam_port_0_order security_groups: get_input: - - port_plt_data_0_port_security_groups + - port_plt_oam_port_0_security_groups - index_value exCP_naming: - get_input: port_plt_data_0_port_exCP_naming + get_input: port_plt_oam_port_0_exCP_naming vlan_requirements: - get_input: port_plt_data_0_port_vlan_requirements + get_input: port_plt_oam_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_plt_data_0_port_related_networks + get_input: port_plt_oam_port_0_related_networks ip_requirements: - get_input: port_plt_data_0_port_ip_requirements + get_input: port_plt_oam_port_0_ip_requirements network_role_tag: - get_input: port_plt_data_0_port_network_role_tag + get_input: port_plt_oam_port_0_network_role_tag network_role: - get_input: port_plt_data_0_port_network_role + get_input: port_plt_oam_port_0_network_role subnetpoolid: - get_input: port_plt_data_0_port_subnetpoolid + get_input: port_plt_oam_port_0_subnetpoolid fixed_ips: get_input: - - port_plt_data_0_port_fixed_ips + - port_plt_oam_port_0_fixed_ips - index_value name: get_input: - - port_plt_data_0_port_name + - port_plt_oam_port_0_name - index_value network: get_input: - - port_plt_data_0_port_network + - port_plt_oam_port_0_network - index_value requirements: - binding: @@ -364,49 +368,45 @@ topology_template: get_input: - compute_plt_user_data_format - index_value - plt_plt_oam_0_port: + plt_plt_internal_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_plt_oam_0_port_replacement_policy + - port_plt_internal_port_0_replacement_policy - index_value mac_requirements: - get_input: port_plt_oam_0_port_mac_requirements + get_input: port_plt_internal_port_0_mac_requirements allowed_address_pairs: - get_input: port_plt_oam_0_port_allowed_address_pairs + get_input: port_plt_internal_port_0_allowed_address_pairs order: - get_input: port_plt_oam_0_port_order + get_input: port_plt_internal_port_0_order security_groups: get_input: - - port_plt_oam_0_port_security_groups + - port_plt_internal_port_0_security_groups - index_value exCP_naming: - get_input: port_plt_oam_0_port_exCP_naming + get_input: port_plt_internal_port_0_exCP_naming vlan_requirements: - get_input: port_plt_oam_0_port_vlan_requirements + get_input: port_plt_internal_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_plt_oam_0_port_related_networks + get_input: port_plt_internal_port_0_related_networks ip_requirements: - get_input: port_plt_oam_0_port_ip_requirements + get_input: port_plt_internal_port_0_ip_requirements network_role_tag: - get_input: port_plt_oam_0_port_network_role_tag + get_input: port_plt_internal_port_0_network_role_tag network_role: - get_input: port_plt_oam_0_port_network_role + get_input: port_plt_internal_port_0_network_role subnetpoolid: - get_input: port_plt_oam_0_port_subnetpoolid - fixed_ips: - get_input: - - port_plt_oam_0_port_fixed_ips - - index_value + get_input: port_plt_internal_port_0_subnetpoolid name: get_input: - - port_plt_oam_0_port_name + - port_plt_internal_port_0_name - index_value network: get_input: - - port_plt_oam_0_port_network + - port_plt_internal_port_0_network - index_value requirements: - binding: @@ -416,219 +416,219 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.plt capabilities: - network.outgoing.bytes.rate_plt_plt_oam_0_port: - - plt_plt_oam_0_port - - network.outgoing.bytes.rate + network.incoming.packets_plt_plt_oam_port_0: + - plt_plt_oam_port_0 + - network.incoming.packets + attachment_plt_plt_internal_port_0: + - plt_plt_internal_port_0 + - attachment + network.incoming.bytes.rate_plt_plt_internal_port_0: + - plt_plt_internal_port_0 + - network.incoming.bytes.rate disk.device.usage_plt: - plt - disk.device.usage + binding_plt_plt_data_port_0: + - plt_plt_data_port_0 + - binding disk.iops_plt: - plt - disk.iops disk.read.bytes.rate_plt: - plt - disk.read.bytes.rate + network.incoming.bytes.rate_plt_plt_data_port_0: + - plt_plt_data_port_0 + - network.incoming.bytes.rate disk.device.allocation_plt: - plt - disk.device.allocation disk.device.write.bytes.rate_plt: - plt - disk.device.write.bytes.rate + network.outgoing.packets.rate_plt_plt_internal_port_0: + - plt_plt_internal_port_0 + - network.outgoing.packets.rate disk.read.bytes_plt: - plt - disk.read.bytes - network.incoming.packets_plt_plt_internal_0_port: - - plt_plt_internal_0_port - - network.incoming.packets disk.capacity_plt: - plt - disk.capacity disk.write.bytes_plt: - plt - disk.write.bytes + network.outpoing.packets_plt_plt_oam_port_0: + - plt_plt_oam_port_0 + - network.outpoing.packets + network.outgoing.bytes.rate_plt_plt_internal_port_0: + - plt_plt_internal_port_0 + - network.outgoing.bytes.rate + network.outgoing.packets.rate_plt_plt_oam_port_0: + - plt_plt_oam_port_0 + - network.outgoing.packets.rate + network.outgoing.bytes_plt_plt_internal_port_0: + - plt_plt_internal_port_0 + - network.outgoing.bytes disk.device.read.bytes.rate_plt: - plt - disk.device.read.bytes.rate + network.incoming.bytes.rate_plt_plt_oam_port_0: + - plt_plt_oam_port_0 + - network.incoming.bytes.rate + network.incoming.bytes_plt_plt_internal_port_0: + - plt_plt_internal_port_0 + - network.incoming.bytes + network.incoming.bytes_plt_plt_oam_port_0: + - plt_plt_oam_port_0 + - network.incoming.bytes endpoint_plt: - plt - endpoint disk.read.requests_plt: - plt - disk.read.requests - network.outpoing.packets_plt_plt_oam_0_port: - - plt_plt_oam_0_port - - network.outpoing.packets disk.device.write.requests.rate_plt: - plt - disk.device.write.requests.rate - attachment_plt_plt_data_0_port: - - plt_plt_data_0_port - - attachment feature_plt: - plt - feature cpu_plt: - plt - cpu + network.incoming.packets_plt_plt_data_port_0: + - plt_plt_data_port_0 + - network.incoming.packets disk.write.requests_plt: - plt - disk.write.requests - network.incoming.packets.rate_plt_plt_internal_0_port: - - plt_plt_internal_0_port - - network.incoming.packets.rate disk.device.write.bytes_plt: - plt - disk.device.write.bytes - network.outgoing.bytes_plt_plt_oam_0_port: - - plt_plt_oam_0_port - - network.outgoing.bytes - network.outpoing.packets_plt_plt_internal_0_port: - - plt_plt_internal_0_port - - network.outpoing.packets - network.incoming.bytes_plt_plt_internal_0_port: - - plt_plt_internal_0_port - - network.incoming.bytes - network.outgoing.packets.rate_plt_plt_oam_0_port: - - plt_plt_oam_0_port - - network.outgoing.packets.rate - network.incoming.bytes_plt_plt_oam_0_port: - - plt_plt_oam_0_port - - network.incoming.bytes - network.incoming.bytes_plt_plt_data_0_port: - - plt_plt_data_0_port - - network.incoming.bytes - attachment_plt_plt_internal_0_port: - - plt_plt_internal_0_port - - attachment + feature_plt_plt_internal_port_0: + - plt_plt_internal_port_0 + - feature + binding_plt_plt_oam_port_0: + - plt_plt_oam_port_0 + - binding + feature_plt_plt_oam_port_0: + - plt_plt_oam_port_0 + - feature binding_plt: - plt - binding - network.incoming.bytes.rate_plt_plt_oam_0_port: - - plt_plt_oam_0_port - - network.incoming.bytes.rate disk.device.read.bytes_plt: - plt - disk.device.read.bytes disk.device.latency_plt: - plt - disk.device.latency - network.incoming.packets.rate_plt_plt_data_0_port: - - plt_plt_data_0_port - - network.incoming.packets.rate - network.outgoing.bytes_plt_plt_internal_0_port: - - plt_plt_internal_0_port - - network.outgoing.bytes - binding_plt_plt_internal_0_port: - - plt_plt_internal_0_port + forwarder_plt_plt_oam_port_0: + - plt_plt_oam_port_0 + - forwarder + forwarder_plt_plt_data_port_0: + - plt_plt_data_port_0 + - forwarder + binding_plt_plt_internal_port_0: + - plt_plt_internal_port_0 - binding - feature_plt_plt_internal_0_port: - - plt_plt_internal_0_port - - feature instance_plt: - plt - instance disk.latency_plt: - plt - disk.latency + network.incoming.packets.rate_plt_plt_internal_port_0: + - plt_plt_internal_port_0 + - network.incoming.packets.rate + network.outgoing.bytes_plt_plt_data_port_0: + - plt_plt_data_port_0 + - network.outgoing.bytes + feature_plt_plt_data_port_0: + - plt_plt_data_port_0 + - feature disk.write.bytes.rate_plt: - plt - disk.write.bytes.rate + network.outgoing.packets.rate_plt_plt_data_port_0: + - plt_plt_data_port_0 + - network.outgoing.packets.rate disk.ephemeral.size_plt: - plt - disk.ephemeral.size cpu_util_plt: - plt - cpu_util - binding_plt_plt_oam_0_port: - - plt_plt_oam_0_port - - binding + attachment_plt_plt_data_port_0: + - plt_plt_data_port_0 + - attachment + network.incoming.packets.rate_plt_plt_data_port_0: + - plt_plt_data_port_0 + - network.incoming.packets.rate + network.incoming.packets.rate_plt_plt_oam_port_0: + - plt_plt_oam_port_0 + - network.incoming.packets.rate + network.outgoing.bytes_plt_plt_oam_port_0: + - plt_plt_oam_port_0 + - network.outgoing.bytes memory.usage_plt: - plt - memory.usage - attachment_plt_plt_oam_0_port: - - plt_plt_oam_0_port - - attachment - network.incoming.packets_plt_plt_oam_0_port: - - plt_plt_oam_0_port - - network.incoming.packets + network.outgoing.bytes.rate_plt_plt_data_port_0: + - plt_plt_data_port_0 + - network.outgoing.bytes.rate + network.outpoing.packets_plt_plt_data_port_0: + - plt_plt_data_port_0 + - network.outpoing.packets disk.device.capacity_plt: - plt - disk.device.capacity - forwarder_plt_plt_oam_0_port: - - plt_plt_oam_0_port - - forwarder - binding_plt_plt_data_0_port: - - plt_plt_data_0_port - - binding disk.device.read.requests_plt: - plt - disk.device.read.requests + forwarder_plt_plt_internal_port_0: + - plt_plt_internal_port_0 + - forwarder memory.resident_plt: - plt - memory.resident - network.outgoing.packets.rate_plt_plt_internal_0_port: - - plt_plt_internal_0_port - - network.outgoing.packets.rate scalable_plt: - plt - scalable - network.incoming.packets.rate_plt_plt_oam_0_port: - - plt_plt_oam_0_port - - network.incoming.packets.rate - network.outgoing.packets.rate_plt_plt_data_0_port: - - plt_plt_data_0_port - - network.outgoing.packets.rate - network.incoming.bytes.rate_plt_plt_data_0_port: - - plt_plt_data_0_port - - network.incoming.bytes.rate + network.outpoing.packets_plt_plt_internal_port_0: + - plt_plt_internal_port_0 + - network.outpoing.packets + network.incoming.bytes_plt_plt_data_port_0: + - plt_plt_data_port_0 + - network.incoming.bytes + network.outgoing.bytes.rate_plt_plt_oam_port_0: + - plt_plt_oam_port_0 + - network.outgoing.bytes.rate disk.usage_plt: - plt - disk.usage - feature_plt_plt_oam_0_port: - - plt_plt_oam_0_port - - feature - network.incoming.bytes.rate_plt_plt_internal_0_port: - - plt_plt_internal_0_port - - network.incoming.bytes.rate + network.incoming.packets_plt_plt_internal_port_0: + - plt_plt_internal_port_0 + - network.incoming.packets memory_plt: - plt - memory disk.root.size_plt: - plt - disk.root.size - network.outgoing.bytes_plt_plt_data_0_port: - - plt_plt_data_0_port - - network.outgoing.bytes cpu.delta_plt: - plt - cpu.delta disk.device.write.requests_plt: - plt - disk.device.write.requests - feature_plt_plt_data_0_port: - - plt_plt_data_0_port - - feature - network.outgoing.bytes.rate_plt_plt_data_0_port: - - plt_plt_data_0_port - - network.outgoing.bytes.rate disk.device.read.requests.rate_plt: - plt - disk.device.read.requests.rate - network.outpoing.packets_plt_plt_data_0_port: - - plt_plt_data_0_port - - network.outpoing.packets os_plt: - plt - os - network.outgoing.bytes.rate_plt_plt_internal_0_port: - - plt_plt_internal_0_port - - network.outgoing.bytes.rate - forwarder_plt_plt_internal_0_port: - - plt_plt_internal_0_port - - forwarder - network.incoming.packets_plt_plt_data_0_port: - - plt_plt_data_0_port - - network.incoming.packets disk.allocation_plt: - plt - disk.allocation @@ -644,31 +644,31 @@ topology_template: disk.write.requests.rate_plt: - plt - disk.write.requests.rate - forwarder_plt_plt_data_0_port: - - plt_plt_data_0_port - - forwarder + attachment_plt_plt_oam_port_0: + - plt_plt_oam_port_0 + - attachment requirements: local_storage_plt: - plt - local_storage - link_plt_plt_internal_0_port: - - plt_plt_internal_0_port - - link - dependency_plt_plt_oam_0_port: - - plt_plt_oam_0_port + dependency_plt_plt_oam_port_0: + - plt_plt_oam_port_0 - dependency - dependency_plt_plt_data_0_port: - - plt_plt_data_0_port + dependency_plt_plt_internal_port_0: + - plt_plt_internal_port_0 - dependency - link_plt_plt_data_0_port: - - plt_plt_data_0_port + link_plt_plt_internal_port_0: + - plt_plt_internal_port_0 - link - dependency_plt_plt_internal_0_port: - - plt_plt_internal_0_port + link_plt_plt_data_port_0: + - plt_plt_data_port_0 + - link + dependency_plt_plt_data_port_0: + - plt_plt_data_port_0 - dependency - link_plt_plt_oam_0_port: - - plt_plt_oam_0_port + link_plt_plt_oam_port_0: + - plt_plt_oam_port_0 - link dependency_plt: - plt - - 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/catalogInstances/threeComputesSameTypeDiffImageName/in/hot-mog-0108-bs1271.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/in/hot-mog-0108-bs1271.yml index c23187ef59..8f33c9f183 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/in/hot-mog-0108-bs1271.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/in/hot-mog-0108-bs1271.yml @@ -46,7 +46,7 @@ resources: flavor: {get_param: pd_flavor_name} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: pd01_port_0} + - port: {get_resource: pd_server_0_port_0} user_data_format: RAW server_ps_02: @@ -58,7 +58,7 @@ resources: flavor: {get_param: pd_flavor_name} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: pd01_port_1} + - port: {get_resource: pd_server_1_port_0} user_data_format: RAW server_ps_3: @@ -70,18 +70,18 @@ resources: flavor: {get_param: pd_flavor_name} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: pd01_port_2} + - port: {get_resource: pd_server_2_port_0} user_data_format: RAW - pd01_port_0: + pd_server_0_port_0: type: OS::Neutron::Port properties: network: {get_resource: packet_internal_network} - pd01_port_1: + pd_server_1_port_0: type: OS::Neutron::Port properties: network: {get_resource: packet_internal_network} - pd01_port_2: + pd_server_2_port_0: type: OS::Neutron::Port properties: network: {get_resource: packet_internal_network} diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/GlobalSubstitutionTypesServiceTemplate.yaml index 6c0bcc4b92..d73f4cc5bf 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,6 +8,16 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_pd_server_port_0_subnetpoolid: + type: string + required: true + status: SUPPORTED + port_pd_server_port_0_network: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string index_value: type: integer description: Index value of this substitution service template runtime instance @@ -28,57 +38,39 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_pd01_port_related_networks: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - vm_flavor_name: + port_pd_server_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - vm_image_name: + vm_flavor_name: type: string required: true status: SUPPORTED - port_pd01_port_ip_requirements: + port_pd_server_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_pd01_port_order: - type: integer + port_pd_server_port_0_network_role: + type: string required: true status: SUPPORTED - port_pd01_port_subnetpoolid: + vm_image_name: type: string required: true status: SUPPORTED - port_pd01_port_network_role: - type: string + port_pd_server_port_0_related_networks: + type: list required: true status: SUPPORTED - port_pd01_port_network_role_tag: - type: string + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd_server_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_pd01_port_vlan_requirements: + port_pd_server_port_0_vlan_requirements: type: list required: true status: SUPPORTED @@ -90,6 +82,14 @@ node_types: status: SUPPORTED entry_schema: type: string + port_pd_server_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_pd_server_port_0_order: + type: integer + required: true + status: SUPPORTED requirements: - dependency_pd_server: capability: tosca.capabilities.Node @@ -105,14 +105,14 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pd01_port: + - dependency_pd_server_pd_server_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd01_port: + - link_pd_server_pd_server_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -130,6 +130,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.packets.rate_pd_server_pd_server_port_0: + 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_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -148,9 +154,8 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pd01_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_pd_server_pd_server_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED @@ -165,7 +170,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd01_port: + network.outgoing.bytes.rate_pd_server_pd_server_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -201,12 +206,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd01_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.iops_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -225,13 +224,18 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pd01_port: + vcpus_pd_server: 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_pd_server: + attachment_pd_server_pd_server_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes.rate_pd_server_pd_server_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -254,11 +258,6 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pd01_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED disk.capacity_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -277,6 +276,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes_pd_server_pd_server_port_0: + 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_pd_server: type: tosca.capabilities.network.Bindable occurrences: @@ -299,7 +304,12 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_pd01_port: + feature_pd_server_pd_server_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + binding_pd_server_pd_server_port_0: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface @@ -313,37 +323,31 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pd_server_pd01_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.incoming.packets_pd_server_pd01_port: + disk.device.read.requests.rate_pd_server: 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_pd_server: + disk.root.size_pd_server: 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_pd_server: + disk.device.read.bytes_pd_server: 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_pd_server: + disk.device.write.bytes_pd_server: 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_pd_server: + network.incoming.packets_pd_server_pd_server_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -368,17 +372,12 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pd01_port: + network.outgoing.bytes_pd_server_pd_server_port_0: 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_pd_server_pd01_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED disk.write.requests.rate_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -397,12 +396,13 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_pd01_port: - type: tosca.capabilities.Node + disk.device.latency_pd_server: + 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_pd_server: + network.incoming.packets.rate_pd_server_pd_server_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -420,13 +420,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pd01_port: + disk.device.iops_pd_server: 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.iops_pd_server: + network.outpoing.packets_pd_server_pd_server_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: 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 616ac37069..3085b13d81 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 @@ -141,6 +141,8 @@ topology_template: directives: - substitutable properties: + port_pd_server_port_0_network: + - packet_internal_network compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: @@ -149,21 +151,19 @@ topology_template: - 2 vm_flavor_name: get_input: pd_flavor_name - port_pd01_port_mac_requirements: - mac_count_required: - is_required: false - vm_image_name: - get_input: diff_image_name - port_pd01_port_ip_requirements: + port_pd_server_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_network: - - packet_internal_network + vm_image_name: + get_input: diff_image_name compute_pd_server_user_data_format: - RAW + port_pd_server_port_0_mac_requirements: + mac_count_required: + is_required: false service_template_filter: substitute_service_template: Nested_pd_serverServiceTemplate.yaml count: 1 @@ -173,7 +173,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_pd_server_pd01_port: + - link_pd_server_pd_server_port_0: capability: tosca.capabilities.network.Linkable node: packet_internal_network relationship: tosca.relationships.network.LinksTo @@ -182,6 +182,8 @@ topology_template: directives: - substitutable properties: + port_pd_server_port_0_network: + - packet_internal_network compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: @@ -190,21 +192,19 @@ topology_template: - 0 vm_flavor_name: get_input: pd_flavor_name - port_pd01_port_mac_requirements: - mac_count_required: - is_required: false - vm_image_name: - get_input: pd_image_name - port_pd01_port_ip_requirements: + port_pd_server_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_network: - - packet_internal_network + vm_image_name: + get_input: pd_image_name compute_pd_server_user_data_format: - RAW + port_pd_server_port_0_mac_requirements: + mac_count_required: + is_required: false service_template_filter: substitute_service_template: Nested_pd_serverServiceTemplate.yaml count: 1 @@ -214,7 +214,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_pd_server_pd01_port: + - link_pd_server_pd_server_port_0: capability: tosca.capabilities.network.Linkable node: packet_internal_network relationship: tosca.relationships.network.LinksTo @@ -223,6 +223,8 @@ topology_template: directives: - substitutable properties: + port_pd_server_port_0_network: + - packet_internal_network compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: @@ -231,21 +233,19 @@ topology_template: - 1 vm_flavor_name: get_input: pd_flavor_name - port_pd01_port_mac_requirements: - mac_count_required: - is_required: false - vm_image_name: - get_input: pd_image_name - port_pd01_port_ip_requirements: + port_pd_server_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_network: - - packet_internal_network + vm_image_name: + get_input: pd_image_name compute_pd_server_user_data_format: - RAW + port_pd_server_port_0_mac_requirements: + mac_count_required: + is_required: false service_template_filter: substitute_service_template: Nested_pd_serverServiceTemplate.yaml count: 1 @@ -255,7 +255,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_pd_server_pd01_port: + - link_pd_server_pd_server_port_0: capability: tosca.capabilities.network.Linkable node: packet_internal_network relationship: tosca.relationships.network.LinksTo @@ -269,4 +269,4 @@ topology_template: - packet_internal_network - abstract_pd_server_0 - abstract_pd_server_1 - - abstract_pd_server_2 + - abstract_pd_server_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/catalogInstances/threeComputesSameTypeDiffImageName/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/Nested_pd_serverServiceTemplate.yaml index 2d01270aaf..6b19a99ee9 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/Nested_pd_serverServiceTemplate.yaml @@ -11,6 +11,14 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pd_server_port_0_subnetpoolid: + type: string + required: true + port_pd_server_port_0_network: + type: list + required: true + entry_schema: + type: string index_value: type: integer description: Index value of this substitution service template runtime instance @@ -28,46 +36,32 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_pd01_port_related_networks: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - vm_flavor_name: + port_pd_server_port_0_network_role_tag: type: string required: true - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - vm_image_name: + vm_flavor_name: type: string required: true - port_pd01_port_ip_requirements: + port_pd_server_port_0_ip_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: - type: list - required: true - entry_schema: - type: string - port_pd01_port_order: - type: integer - required: true - port_pd01_port_subnetpoolid: + port_pd_server_port_0_network_role: type: string required: true - port_pd01_port_network_role: + vm_image_name: type: string required: true - port_pd01_port_network_role_tag: - type: string + port_pd_server_port_0_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd_server_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - port_pd01_port_vlan_requirements: + port_pd_server_port_0_vlan_requirements: type: list required: true entry_schema: @@ -77,6 +71,12 @@ topology_template: required: true entry_schema: type: string + port_pd_server_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_pd_server_port_0_order: + type: integer + required: true node_templates: pd_server: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server @@ -97,31 +97,31 @@ topology_template: get_input: - compute_pd_server_user_data_format - index_value - pd_server_pd01_port: + pd_server_pd_server_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd01_port_exCP_naming + get_input: port_pd_server_port_0_exCP_naming vlan_requirements: - get_input: port_pd01_port_vlan_requirements + get_input: port_pd_server_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_pd01_port_related_networks + get_input: port_pd_server_port_0_related_networks ip_requirements: - get_input: port_pd01_port_ip_requirements + get_input: port_pd_server_port_0_ip_requirements network_role_tag: - get_input: port_pd01_port_network_role_tag + get_input: port_pd_server_port_0_network_role_tag mac_requirements: - get_input: port_pd01_port_mac_requirements + get_input: port_pd_server_port_0_mac_requirements order: - get_input: port_pd01_port_order + get_input: port_pd_server_port_0_order network_role: - get_input: port_pd01_port_network_role + get_input: port_pd_server_port_0_network_role subnetpoolid: - get_input: port_pd01_port_subnetpoolid + get_input: port_pd_server_port_0_subnetpoolid network: get_input: - - port_pd01_port_network + - port_pd_server_port_0_network - index_value requirements: - binding: @@ -137,6 +137,9 @@ topology_template: disk.read.bytes.rate_pd_server: - pd_server - disk.read.bytes.rate + network.outgoing.packets.rate_pd_server_pd_server_port_0: + - pd_server_pd_server_port_0 + - network.outgoing.packets.rate memory.usage_pd_server: - pd_server - memory.usage @@ -146,18 +149,18 @@ topology_template: disk.device.usage_pd_server: - pd_server - disk.device.usage - network.outgoing.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.packets.rate + forwarder_pd_server_pd_server_port_0: + - pd_server_pd_server_port_0 + - forwarder os_pd_server: - pd_server - os disk.write.bytes.rate_pd_server: - pd_server - disk.write.bytes.rate - network.incoming.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes + network.outgoing.bytes.rate_pd_server_pd_server_port_0: + - pd_server_pd_server_port_0 + - network.outgoing.bytes.rate cpu_pd_server: - pd_server - cpu @@ -173,9 +176,6 @@ topology_template: disk.device.read.bytes.rate_pd_server: - pd_server - disk.device.read.bytes.rate - network.outgoing.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes disk.iops_pd_server: - pd_server - disk.iops @@ -185,12 +185,15 @@ topology_template: cpu.delta_pd_server: - pd_server - cpu.delta - network.incoming.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets.rate vcpus_pd_server: - pd_server - vcpus + attachment_pd_server_pd_server_port_0: + - pd_server_pd_server_port_0 + - attachment + network.incoming.bytes.rate_pd_server_pd_server_port_0: + - pd_server_pd_server_port_0 + - network.incoming.bytes.rate disk.device.write.bytes.rate_pd_server: - pd_server - disk.device.write.bytes.rate @@ -200,9 +203,6 @@ topology_template: endpoint_pd_server: - pd_server - endpoint - attachment_pd_server_pd01_port: - - pd_server_pd01_port - - attachment disk.capacity_pd_server: - pd_server - disk.capacity @@ -212,6 +212,9 @@ topology_template: disk.allocation_pd_server: - pd_server - disk.allocation + network.incoming.bytes_pd_server_pd_server_port_0: + - pd_server_pd_server_port_0 + - network.incoming.bytes binding_pd_server: - pd_server - binding @@ -224,18 +227,15 @@ topology_template: disk.usage_pd_server: - pd_server - disk.usage - binding_pd_server_pd01_port: - - pd_server_pd01_port + feature_pd_server_pd_server_port_0: + - pd_server_pd_server_port_0 + - feature + binding_pd_server_pd_server_port_0: + - pd_server_pd_server_port_0 - binding disk.write.bytes_pd_server: - pd_server - disk.write.bytes - network.incoming.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes.rate - network.incoming.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -248,6 +248,9 @@ topology_template: disk.device.write.bytes_pd_server: - pd_server - disk.device.write.bytes + network.incoming.packets_pd_server_pd_server_port_0: + - pd_server_pd_server_port_0 + - network.incoming.packets disk.device.read.requests_pd_server: - pd_server - disk.device.read.requests @@ -257,12 +260,9 @@ topology_template: host_pd_server: - pd_server - host - network.outpoing.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.outpoing.packets - forwarder_pd_server_pd01_port: - - pd_server_pd01_port - - forwarder + network.outgoing.bytes_pd_server_pd_server_port_0: + - pd_server_pd_server_port_0 + - network.outgoing.bytes disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate @@ -272,34 +272,34 @@ topology_template: disk.write.requests_pd_server: - pd_server - disk.write.requests - feature_pd_server_pd01_port: - - pd_server_pd01_port - - feature disk.device.latency_pd_server: - pd_server - disk.device.latency + network.incoming.packets.rate_pd_server_pd_server_port_0: + - pd_server_pd_server_port_0 + - network.incoming.packets.rate disk.latency_pd_server: - pd_server - disk.latency disk.device.capacity_pd_server: - pd_server - disk.device.capacity - network.outgoing.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes.rate disk.device.iops_pd_server: - pd_server - disk.device.iops + network.outpoing.packets_pd_server_pd_server_port_0: + - pd_server_pd_server_port_0 + - network.outpoing.packets requirements: local_storage_pd_server: - pd_server - local_storage - link_pd_server_pd01_port: - - pd_server_pd01_port + link_pd_server_pd_server_port_0: + - pd_server_pd_server_port_0 - link - dependency_pd_server_pd01_port: - - pd_server_pd01_port - - dependency dependency_pd_server: - pd_server + - dependency + dependency_pd_server_pd_server_port_0: + - pd_server_pd_server_port_0 - 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/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/in/hot-mog-0108-bs1271.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/in/hot-mog-0108-bs1271.yml index b5cd4ffd61..717449cab2 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/in/hot-mog-0108-bs1271.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/in/hot-mog-0108-bs1271.yml @@ -90,7 +90,7 @@ resources: flavor: {get_attr: [network_policy_server, name]} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: pd01_port_0} + - port: {get_resource: pd_server_0_port_0} user_data_format: RAW server_ps_02: @@ -102,7 +102,7 @@ resources: flavor: {get_attr: [network_policy_server, name]} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: pd01_port_1} + - port: {get_resource: pd_server_1_port_0} user_data_format: RAW server_ps_03: @@ -114,18 +114,18 @@ resources: flavor: {get_attr: [network_policy_server, name]} availability_zone: {get_attr: [server_ps_01, show]} networks: - - port: {get_resource: pd01_port_2} + - port: {get_resource: pd_server_2_port_0} user_data_format: RAW - pd01_port_0: + pd_server_0_port_0: type: OS::Neutron::Port properties: network: {get_param: oam_net_name} - pd01_port_1: + pd_server_1_port_0: type: OS::Neutron::Port properties: network: {get_param: oam_net_name} - pd01_port_2: + pd_server_2_port_0: type: OS::Neutron::Port properties: network: {get_param: oam_net_name} diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/GlobalSubstitutionTypesServiceTemplate.yaml index 6c0bcc4b92..d73f4cc5bf 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,6 +8,16 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_pd_server_port_0_subnetpoolid: + type: string + required: true + status: SUPPORTED + port_pd_server_port_0_network: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string index_value: type: integer description: Index value of this substitution service template runtime instance @@ -28,57 +38,39 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_pd01_port_related_networks: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - vm_flavor_name: + port_pd_server_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - vm_image_name: + vm_flavor_name: type: string required: true status: SUPPORTED - port_pd01_port_ip_requirements: + port_pd_server_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_pd01_port_order: - type: integer + port_pd_server_port_0_network_role: + type: string required: true status: SUPPORTED - port_pd01_port_subnetpoolid: + vm_image_name: type: string required: true status: SUPPORTED - port_pd01_port_network_role: - type: string + port_pd_server_port_0_related_networks: + type: list required: true status: SUPPORTED - port_pd01_port_network_role_tag: - type: string + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd_server_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_pd01_port_vlan_requirements: + port_pd_server_port_0_vlan_requirements: type: list required: true status: SUPPORTED @@ -90,6 +82,14 @@ node_types: status: SUPPORTED entry_schema: type: string + port_pd_server_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_pd_server_port_0_order: + type: integer + required: true + status: SUPPORTED requirements: - dependency_pd_server: capability: tosca.capabilities.Node @@ -105,14 +105,14 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pd01_port: + - dependency_pd_server_pd_server_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd01_port: + - link_pd_server_pd_server_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -130,6 +130,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.packets.rate_pd_server_pd_server_port_0: + 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_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -148,9 +154,8 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pd01_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_pd_server_pd_server_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED @@ -165,7 +170,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd01_port: + network.outgoing.bytes.rate_pd_server_pd_server_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -201,12 +206,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd01_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.iops_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -225,13 +224,18 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pd01_port: + vcpus_pd_server: 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_pd_server: + attachment_pd_server_pd_server_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes.rate_pd_server_pd_server_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -254,11 +258,6 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pd01_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED disk.capacity_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -277,6 +276,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes_pd_server_pd_server_port_0: + 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_pd_server: type: tosca.capabilities.network.Bindable occurrences: @@ -299,7 +304,12 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_pd01_port: + feature_pd_server_pd_server_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + binding_pd_server_pd_server_port_0: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface @@ -313,37 +323,31 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pd_server_pd01_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.incoming.packets_pd_server_pd01_port: + disk.device.read.requests.rate_pd_server: 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_pd_server: + disk.root.size_pd_server: 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_pd_server: + disk.device.read.bytes_pd_server: 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_pd_server: + disk.device.write.bytes_pd_server: 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_pd_server: + network.incoming.packets_pd_server_pd_server_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -368,17 +372,12 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pd01_port: + network.outgoing.bytes_pd_server_pd_server_port_0: 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_pd_server_pd01_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED disk.write.requests.rate_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -397,12 +396,13 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_pd01_port: - type: tosca.capabilities.Node + disk.device.latency_pd_server: + 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_pd_server: + network.incoming.packets.rate_pd_server_pd_server_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -420,13 +420,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pd01_port: + disk.device.iops_pd_server: 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.iops_pd_server: + network.outpoing.packets_pd_server_pd_server_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: 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 28836651f6..14c0261606 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 @@ -323,6 +323,8 @@ topology_template: directives: - substitutable properties: + port_pd_server_port_0_network: + - get_input: oam_net_name compute_pd_server_availability_zone: - get_attribute: - abstract_pd_server_0 @@ -331,26 +333,24 @@ topology_template: - get_input: - pd_server_names - 2 + port_pd_server_port_0_network_role_tag: oam vm_flavor_name: get_attribute: - network_policy_server - name - port_pd01_port_mac_requirements: - mac_count_required: - is_required: false - vm_image_name: - get_input: pd_image_name - port_pd01_port_ip_requirements: + port_pd_server_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_network: - - get_input: oam_net_name - port_pd01_port_network_role_tag: oam + vm_image_name: + get_input: pd_image_name compute_pd_server_user_data_format: - RAW + port_pd_server_port_0_mac_requirements: + mac_count_required: + is_required: false service_template_filter: substitute_service_template: Nested_pd_serverServiceTemplate.yaml count: 1 @@ -369,32 +369,32 @@ topology_template: directives: - substitutable properties: + port_pd_server_port_0_network: + - get_input: oam_net_name compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: - get_input: - pd_server_names - 0 + port_pd_server_port_0_network_role_tag: oam vm_flavor_name: get_attribute: - network_policy_server - name - port_pd01_port_mac_requirements: - mac_count_required: - is_required: false - vm_image_name: - get_input: pd_image_name - port_pd01_port_ip_requirements: + port_pd_server_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_network: - - get_input: oam_net_name - port_pd01_port_network_role_tag: oam + vm_image_name: + get_input: pd_image_name compute_pd_server_user_data_format: - RAW + port_pd_server_port_0_mac_requirements: + mac_count_required: + is_required: false service_template_filter: substitute_service_template: Nested_pd_serverServiceTemplate.yaml count: 1 @@ -408,32 +408,32 @@ topology_template: directives: - substitutable properties: + port_pd_server_port_0_network: + - get_input: oam_net_name compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: - get_input: - pd_server_names - 1 + port_pd_server_port_0_network_role_tag: oam vm_flavor_name: get_attribute: - network_policy_server - name - port_pd01_port_mac_requirements: - mac_count_required: - is_required: false - vm_image_name: - get_input: pd_image_name - port_pd01_port_ip_requirements: + port_pd_server_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_network: - - get_input: oam_net_name - port_pd01_port_network_role_tag: oam + vm_image_name: + get_input: pd_image_name compute_pd_server_user_data_format: - RAW + port_pd_server_port_0_mac_requirements: + mac_count_required: + is_required: false service_template_filter: substitute_service_template: Nested_pd_serverServiceTemplate.yaml count: 1 @@ -452,4 +452,4 @@ topology_template: - network_policy_server - abstract_pd_server_0 - abstract_pd_server_1 - - abstract_pd_server_2 + - abstract_pd_server_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/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/Nested_pd_serverServiceTemplate.yaml index 2d01270aaf..6b19a99ee9 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/Nested_pd_serverServiceTemplate.yaml @@ -11,6 +11,14 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pd_server_port_0_subnetpoolid: + type: string + required: true + port_pd_server_port_0_network: + type: list + required: true + entry_schema: + type: string index_value: type: integer description: Index value of this substitution service template runtime instance @@ -28,46 +36,32 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_pd01_port_related_networks: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - vm_flavor_name: + port_pd_server_port_0_network_role_tag: type: string required: true - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - vm_image_name: + vm_flavor_name: type: string required: true - port_pd01_port_ip_requirements: + port_pd_server_port_0_ip_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: - type: list - required: true - entry_schema: - type: string - port_pd01_port_order: - type: integer - required: true - port_pd01_port_subnetpoolid: + port_pd_server_port_0_network_role: type: string required: true - port_pd01_port_network_role: + vm_image_name: type: string required: true - port_pd01_port_network_role_tag: - type: string + port_pd_server_port_0_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd_server_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - port_pd01_port_vlan_requirements: + port_pd_server_port_0_vlan_requirements: type: list required: true entry_schema: @@ -77,6 +71,12 @@ topology_template: required: true entry_schema: type: string + port_pd_server_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_pd_server_port_0_order: + type: integer + required: true node_templates: pd_server: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server @@ -97,31 +97,31 @@ topology_template: get_input: - compute_pd_server_user_data_format - index_value - pd_server_pd01_port: + pd_server_pd_server_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd01_port_exCP_naming + get_input: port_pd_server_port_0_exCP_naming vlan_requirements: - get_input: port_pd01_port_vlan_requirements + get_input: port_pd_server_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_pd01_port_related_networks + get_input: port_pd_server_port_0_related_networks ip_requirements: - get_input: port_pd01_port_ip_requirements + get_input: port_pd_server_port_0_ip_requirements network_role_tag: - get_input: port_pd01_port_network_role_tag + get_input: port_pd_server_port_0_network_role_tag mac_requirements: - get_input: port_pd01_port_mac_requirements + get_input: port_pd_server_port_0_mac_requirements order: - get_input: port_pd01_port_order + get_input: port_pd_server_port_0_order network_role: - get_input: port_pd01_port_network_role + get_input: port_pd_server_port_0_network_role subnetpoolid: - get_input: port_pd01_port_subnetpoolid + get_input: port_pd_server_port_0_subnetpoolid network: get_input: - - port_pd01_port_network + - port_pd_server_port_0_network - index_value requirements: - binding: @@ -137,6 +137,9 @@ topology_template: disk.read.bytes.rate_pd_server: - pd_server - disk.read.bytes.rate + network.outgoing.packets.rate_pd_server_pd_server_port_0: + - pd_server_pd_server_port_0 + - network.outgoing.packets.rate memory.usage_pd_server: - pd_server - memory.usage @@ -146,18 +149,18 @@ topology_template: disk.device.usage_pd_server: - pd_server - disk.device.usage - network.outgoing.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.packets.rate + forwarder_pd_server_pd_server_port_0: + - pd_server_pd_server_port_0 + - forwarder os_pd_server: - pd_server - os disk.write.bytes.rate_pd_server: - pd_server - disk.write.bytes.rate - network.incoming.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes + network.outgoing.bytes.rate_pd_server_pd_server_port_0: + - pd_server_pd_server_port_0 + - network.outgoing.bytes.rate cpu_pd_server: - pd_server - cpu @@ -173,9 +176,6 @@ topology_template: disk.device.read.bytes.rate_pd_server: - pd_server - disk.device.read.bytes.rate - network.outgoing.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes disk.iops_pd_server: - pd_server - disk.iops @@ -185,12 +185,15 @@ topology_template: cpu.delta_pd_server: - pd_server - cpu.delta - network.incoming.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets.rate vcpus_pd_server: - pd_server - vcpus + attachment_pd_server_pd_server_port_0: + - pd_server_pd_server_port_0 + - attachment + network.incoming.bytes.rate_pd_server_pd_server_port_0: + - pd_server_pd_server_port_0 + - network.incoming.bytes.rate disk.device.write.bytes.rate_pd_server: - pd_server - disk.device.write.bytes.rate @@ -200,9 +203,6 @@ topology_template: endpoint_pd_server: - pd_server - endpoint - attachment_pd_server_pd01_port: - - pd_server_pd01_port - - attachment disk.capacity_pd_server: - pd_server - disk.capacity @@ -212,6 +212,9 @@ topology_template: disk.allocation_pd_server: - pd_server - disk.allocation + network.incoming.bytes_pd_server_pd_server_port_0: + - pd_server_pd_server_port_0 + - network.incoming.bytes binding_pd_server: - pd_server - binding @@ -224,18 +227,15 @@ topology_template: disk.usage_pd_server: - pd_server - disk.usage - binding_pd_server_pd01_port: - - pd_server_pd01_port + feature_pd_server_pd_server_port_0: + - pd_server_pd_server_port_0 + - feature + binding_pd_server_pd_server_port_0: + - pd_server_pd_server_port_0 - binding disk.write.bytes_pd_server: - pd_server - disk.write.bytes - network.incoming.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes.rate - network.incoming.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -248,6 +248,9 @@ topology_template: disk.device.write.bytes_pd_server: - pd_server - disk.device.write.bytes + network.incoming.packets_pd_server_pd_server_port_0: + - pd_server_pd_server_port_0 + - network.incoming.packets disk.device.read.requests_pd_server: - pd_server - disk.device.read.requests @@ -257,12 +260,9 @@ topology_template: host_pd_server: - pd_server - host - network.outpoing.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.outpoing.packets - forwarder_pd_server_pd01_port: - - pd_server_pd01_port - - forwarder + network.outgoing.bytes_pd_server_pd_server_port_0: + - pd_server_pd_server_port_0 + - network.outgoing.bytes disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate @@ -272,34 +272,34 @@ topology_template: disk.write.requests_pd_server: - pd_server - disk.write.requests - feature_pd_server_pd01_port: - - pd_server_pd01_port - - feature disk.device.latency_pd_server: - pd_server - disk.device.latency + network.incoming.packets.rate_pd_server_pd_server_port_0: + - pd_server_pd_server_port_0 + - network.incoming.packets.rate disk.latency_pd_server: - pd_server - disk.latency disk.device.capacity_pd_server: - pd_server - disk.device.capacity - network.outgoing.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes.rate disk.device.iops_pd_server: - pd_server - disk.device.iops + network.outpoing.packets_pd_server_pd_server_port_0: + - pd_server_pd_server_port_0 + - network.outpoing.packets requirements: local_storage_pd_server: - pd_server - local_storage - link_pd_server_pd01_port: - - pd_server_pd01_port + link_pd_server_pd_server_port_0: + - pd_server_pd_server_port_0 - link - dependency_pd_server_pd01_port: - - pd_server_pd01_port - - dependency dependency_pd_server: - pd_server + - dependency + dependency_pd_server_pd_server_port_0: + - pd_server_pd_server_port_0 - 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/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/in/hot-mog-0108-bs1271.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/in/hot-mog-0108-bs1271.yml index 836d3d2bdd..7b84aee9fd 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/in/hot-mog-0108-bs1271.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/in/hot-mog-0108-bs1271.yml @@ -42,7 +42,7 @@ resources: flavor: {get_param: pd_flavor_name} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: pd01_port_0} + - port: {get_resource: pd_server_0_port_0} user_data_format: RAW server_ps_02: @@ -54,7 +54,7 @@ resources: flavor: {get_param: pd_flavor_name} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: pd01_port_1} + - port: {get_resource: pd_server_1_port_0} user_data_format: RAW server_ps_3: @@ -66,18 +66,18 @@ resources: flavor: {get_param: pd_flavor_name} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: pd01_port_2} + - port: {get_resource: pd_server_2_port_0} user_data_format: RAW - pd01_port_0: + pd_server_0_port_0: type: OS::Neutron::Port properties: network: {get_resource: packet_internal_network} - pd01_port_1: + pd_server_1_port_0: type: OS::Neutron::Port properties: network: {get_resource: packet_internal_network} - pd01_port_2: + pd_server_2_port_0: type: OS::Neutron::Port properties: network: {get_resource: packet_external_network} diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/GlobalSubstitutionTypesServiceTemplate.yaml index 6c0bcc4b92..d73f4cc5bf 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,6 +8,16 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_pd_server_port_0_subnetpoolid: + type: string + required: true + status: SUPPORTED + port_pd_server_port_0_network: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string index_value: type: integer description: Index value of this substitution service template runtime instance @@ -28,57 +38,39 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_pd01_port_related_networks: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - vm_flavor_name: + port_pd_server_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - vm_image_name: + vm_flavor_name: type: string required: true status: SUPPORTED - port_pd01_port_ip_requirements: + port_pd_server_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_pd01_port_order: - type: integer + port_pd_server_port_0_network_role: + type: string required: true status: SUPPORTED - port_pd01_port_subnetpoolid: + vm_image_name: type: string required: true status: SUPPORTED - port_pd01_port_network_role: - type: string + port_pd_server_port_0_related_networks: + type: list required: true status: SUPPORTED - port_pd01_port_network_role_tag: - type: string + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd_server_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_pd01_port_vlan_requirements: + port_pd_server_port_0_vlan_requirements: type: list required: true status: SUPPORTED @@ -90,6 +82,14 @@ node_types: status: SUPPORTED entry_schema: type: string + port_pd_server_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_pd_server_port_0_order: + type: integer + required: true + status: SUPPORTED requirements: - dependency_pd_server: capability: tosca.capabilities.Node @@ -105,14 +105,14 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pd01_port: + - dependency_pd_server_pd_server_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd01_port: + - link_pd_server_pd_server_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -130,6 +130,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.packets.rate_pd_server_pd_server_port_0: + 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_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -148,9 +154,8 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pd01_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_pd_server_pd_server_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED @@ -165,7 +170,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd01_port: + network.outgoing.bytes.rate_pd_server_pd_server_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -201,12 +206,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd01_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.iops_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -225,13 +224,18 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pd01_port: + vcpus_pd_server: 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_pd_server: + attachment_pd_server_pd_server_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes.rate_pd_server_pd_server_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -254,11 +258,6 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pd01_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED disk.capacity_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -277,6 +276,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes_pd_server_pd_server_port_0: + 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_pd_server: type: tosca.capabilities.network.Bindable occurrences: @@ -299,7 +304,12 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_pd01_port: + feature_pd_server_pd_server_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + binding_pd_server_pd_server_port_0: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface @@ -313,37 +323,31 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pd_server_pd01_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.incoming.packets_pd_server_pd01_port: + disk.device.read.requests.rate_pd_server: 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_pd_server: + disk.root.size_pd_server: 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_pd_server: + disk.device.read.bytes_pd_server: 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_pd_server: + disk.device.write.bytes_pd_server: 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_pd_server: + network.incoming.packets_pd_server_pd_server_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -368,17 +372,12 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pd01_port: + network.outgoing.bytes_pd_server_pd_server_port_0: 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_pd_server_pd01_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED disk.write.requests.rate_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -397,12 +396,13 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_pd01_port: - type: tosca.capabilities.Node + disk.device.latency_pd_server: + 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_pd_server: + network.incoming.packets.rate_pd_server_pd_server_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -420,13 +420,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pd01_port: + disk.device.iops_pd_server: 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.iops_pd_server: + network.outpoing.packets_pd_server_pd_server_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: 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 3ae6fa0b26..3cc04b9978 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 @@ -132,6 +132,8 @@ topology_template: directives: - substitutable properties: + port_pd_server_port_0_network: + - packet_external_network compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: @@ -140,21 +142,19 @@ topology_template: - 2 vm_flavor_name: get_input: pd_flavor_name - port_pd01_port_mac_requirements: - mac_count_required: - is_required: false - vm_image_name: - get_input: pd_image_name - port_pd01_port_ip_requirements: + port_pd_server_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_network: - - packet_external_network + vm_image_name: + get_input: pd_image_name compute_pd_server_user_data_format: - RAW + port_pd_server_port_0_mac_requirements: + mac_count_required: + is_required: false service_template_filter: substitute_service_template: Nested_pd_serverServiceTemplate.yaml count: 1 @@ -164,7 +164,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_pd_server_pd01_port: + - link_pd_server_pd_server_port_0: capability: tosca.capabilities.network.Linkable node: packet_external_network relationship: tosca.relationships.network.LinksTo @@ -178,6 +178,8 @@ topology_template: directives: - substitutable properties: + port_pd_server_port_0_network: + - packet_internal_network compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: @@ -186,21 +188,19 @@ topology_template: - 0 vm_flavor_name: get_input: pd_flavor_name - port_pd01_port_mac_requirements: - mac_count_required: - is_required: false - vm_image_name: - get_input: pd_image_name - port_pd01_port_ip_requirements: + port_pd_server_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_network: - - packet_internal_network + vm_image_name: + get_input: pd_image_name compute_pd_server_user_data_format: - RAW + port_pd_server_port_0_mac_requirements: + mac_count_required: + is_required: false service_template_filter: substitute_service_template: Nested_pd_serverServiceTemplate.yaml count: 1 @@ -210,7 +210,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_pd_server_pd01_port: + - link_pd_server_pd_server_port_0: capability: tosca.capabilities.network.Linkable node: packet_internal_network relationship: tosca.relationships.network.LinksTo @@ -219,6 +219,8 @@ topology_template: directives: - substitutable properties: + port_pd_server_port_0_network: + - packet_internal_network compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: @@ -227,21 +229,19 @@ topology_template: - 1 vm_flavor_name: get_input: pd_flavor_name - port_pd01_port_mac_requirements: - mac_count_required: - is_required: false - vm_image_name: - get_input: pd_image_name - port_pd01_port_ip_requirements: + port_pd_server_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_network: - - packet_internal_network + vm_image_name: + get_input: pd_image_name compute_pd_server_user_data_format: - RAW + port_pd_server_port_0_mac_requirements: + mac_count_required: + is_required: false service_template_filter: substitute_service_template: Nested_pd_serverServiceTemplate.yaml count: 1 @@ -251,7 +251,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_pd_server_pd01_port: + - link_pd_server_pd_server_port_0: capability: tosca.capabilities.network.Linkable node: packet_internal_network relationship: tosca.relationships.network.LinksTo @@ -267,4 +267,4 @@ topology_template: - network_policy_server - abstract_pd_server_0 - abstract_pd_server_1 - - abstract_pd_server_2 + - abstract_pd_server_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/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/Nested_pd_serverServiceTemplate.yaml index 2d01270aaf..6b19a99ee9 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/Nested_pd_serverServiceTemplate.yaml @@ -11,6 +11,14 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pd_server_port_0_subnetpoolid: + type: string + required: true + port_pd_server_port_0_network: + type: list + required: true + entry_schema: + type: string index_value: type: integer description: Index value of this substitution service template runtime instance @@ -28,46 +36,32 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_pd01_port_related_networks: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - vm_flavor_name: + port_pd_server_port_0_network_role_tag: type: string required: true - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - vm_image_name: + vm_flavor_name: type: string required: true - port_pd01_port_ip_requirements: + port_pd_server_port_0_ip_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: - type: list - required: true - entry_schema: - type: string - port_pd01_port_order: - type: integer - required: true - port_pd01_port_subnetpoolid: + port_pd_server_port_0_network_role: type: string required: true - port_pd01_port_network_role: + vm_image_name: type: string required: true - port_pd01_port_network_role_tag: - type: string + port_pd_server_port_0_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd_server_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - port_pd01_port_vlan_requirements: + port_pd_server_port_0_vlan_requirements: type: list required: true entry_schema: @@ -77,6 +71,12 @@ topology_template: required: true entry_schema: type: string + port_pd_server_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_pd_server_port_0_order: + type: integer + required: true node_templates: pd_server: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server @@ -97,31 +97,31 @@ topology_template: get_input: - compute_pd_server_user_data_format - index_value - pd_server_pd01_port: + pd_server_pd_server_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd01_port_exCP_naming + get_input: port_pd_server_port_0_exCP_naming vlan_requirements: - get_input: port_pd01_port_vlan_requirements + get_input: port_pd_server_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_pd01_port_related_networks + get_input: port_pd_server_port_0_related_networks ip_requirements: - get_input: port_pd01_port_ip_requirements + get_input: port_pd_server_port_0_ip_requirements network_role_tag: - get_input: port_pd01_port_network_role_tag + get_input: port_pd_server_port_0_network_role_tag mac_requirements: - get_input: port_pd01_port_mac_requirements + get_input: port_pd_server_port_0_mac_requirements order: - get_input: port_pd01_port_order + get_input: port_pd_server_port_0_order network_role: - get_input: port_pd01_port_network_role + get_input: port_pd_server_port_0_network_role subnetpoolid: - get_input: port_pd01_port_subnetpoolid + get_input: port_pd_server_port_0_subnetpoolid network: get_input: - - port_pd01_port_network + - port_pd_server_port_0_network - index_value requirements: - binding: @@ -137,6 +137,9 @@ topology_template: disk.read.bytes.rate_pd_server: - pd_server - disk.read.bytes.rate + network.outgoing.packets.rate_pd_server_pd_server_port_0: + - pd_server_pd_server_port_0 + - network.outgoing.packets.rate memory.usage_pd_server: - pd_server - memory.usage @@ -146,18 +149,18 @@ topology_template: disk.device.usage_pd_server: - pd_server - disk.device.usage - network.outgoing.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.packets.rate + forwarder_pd_server_pd_server_port_0: + - pd_server_pd_server_port_0 + - forwarder os_pd_server: - pd_server - os disk.write.bytes.rate_pd_server: - pd_server - disk.write.bytes.rate - network.incoming.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes + network.outgoing.bytes.rate_pd_server_pd_server_port_0: + - pd_server_pd_server_port_0 + - network.outgoing.bytes.rate cpu_pd_server: - pd_server - cpu @@ -173,9 +176,6 @@ topology_template: disk.device.read.bytes.rate_pd_server: - pd_server - disk.device.read.bytes.rate - network.outgoing.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes disk.iops_pd_server: - pd_server - disk.iops @@ -185,12 +185,15 @@ topology_template: cpu.delta_pd_server: - pd_server - cpu.delta - network.incoming.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets.rate vcpus_pd_server: - pd_server - vcpus + attachment_pd_server_pd_server_port_0: + - pd_server_pd_server_port_0 + - attachment + network.incoming.bytes.rate_pd_server_pd_server_port_0: + - pd_server_pd_server_port_0 + - network.incoming.bytes.rate disk.device.write.bytes.rate_pd_server: - pd_server - disk.device.write.bytes.rate @@ -200,9 +203,6 @@ topology_template: endpoint_pd_server: - pd_server - endpoint - attachment_pd_server_pd01_port: - - pd_server_pd01_port - - attachment disk.capacity_pd_server: - pd_server - disk.capacity @@ -212,6 +212,9 @@ topology_template: disk.allocation_pd_server: - pd_server - disk.allocation + network.incoming.bytes_pd_server_pd_server_port_0: + - pd_server_pd_server_port_0 + - network.incoming.bytes binding_pd_server: - pd_server - binding @@ -224,18 +227,15 @@ topology_template: disk.usage_pd_server: - pd_server - disk.usage - binding_pd_server_pd01_port: - - pd_server_pd01_port + feature_pd_server_pd_server_port_0: + - pd_server_pd_server_port_0 + - feature + binding_pd_server_pd_server_port_0: + - pd_server_pd_server_port_0 - binding disk.write.bytes_pd_server: - pd_server - disk.write.bytes - network.incoming.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes.rate - network.incoming.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -248,6 +248,9 @@ topology_template: disk.device.write.bytes_pd_server: - pd_server - disk.device.write.bytes + network.incoming.packets_pd_server_pd_server_port_0: + - pd_server_pd_server_port_0 + - network.incoming.packets disk.device.read.requests_pd_server: - pd_server - disk.device.read.requests @@ -257,12 +260,9 @@ topology_template: host_pd_server: - pd_server - host - network.outpoing.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.outpoing.packets - forwarder_pd_server_pd01_port: - - pd_server_pd01_port - - forwarder + network.outgoing.bytes_pd_server_pd_server_port_0: + - pd_server_pd_server_port_0 + - network.outgoing.bytes disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate @@ -272,34 +272,34 @@ topology_template: disk.write.requests_pd_server: - pd_server - disk.write.requests - feature_pd_server_pd01_port: - - pd_server_pd01_port - - feature disk.device.latency_pd_server: - pd_server - disk.device.latency + network.incoming.packets.rate_pd_server_pd_server_port_0: + - pd_server_pd_server_port_0 + - network.incoming.packets.rate disk.latency_pd_server: - pd_server - disk.latency disk.device.capacity_pd_server: - pd_server - disk.device.capacity - network.outgoing.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes.rate disk.device.iops_pd_server: - pd_server - disk.device.iops + network.outpoing.packets_pd_server_pd_server_port_0: + - pd_server_pd_server_port_0 + - network.outpoing.packets requirements: local_storage_pd_server: - pd_server - local_storage - link_pd_server_pd01_port: - - pd_server_pd01_port + link_pd_server_pd_server_port_0: + - pd_server_pd_server_port_0 - link - dependency_pd_server_pd01_port: - - pd_server_pd01_port - - dependency dependency_pd_server: - pd_server + - dependency + dependency_pd_server_pd_server_port_0: + - pd_server_pd_server_port_0 - 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/catalogInstances/twoNovaWithDiffProperties/in/hot-mog-0108-bs1271.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/twoNovaWithDiffProperties/in/hot-mog-0108-bs1271.yml index b244e98761..c50059b67a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/twoNovaWithDiffProperties/in/hot-mog-0108-bs1271.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/twoNovaWithDiffProperties/in/hot-mog-0108-bs1271.yml @@ -46,7 +46,7 @@ resources: flavor: {get_param: pd_flavor_name} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: pd01_port_0} + - port: {get_resource: pd_server_0_port_0} user_data_format: RAW key_name: key_name image_update_policy: image_update_policy @@ -60,16 +60,16 @@ resources: flavor: {get_param: pd_flavor_name} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: pd01_port_1} + - port: {get_resource: pd_server_1_port_0} user_data_format: RAW key_name: key_name personality: personality - pd01_port_0: + pd_server_0_port_0: type: OS::Neutron::Port properties: network: {get_resource: packet_internal_network} - pd01_port_1: + pd_server_1_port_0: type: OS::Neutron::Port properties: network: {get_resource: packet_internal_network} diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/twoNovaWithDiffProperties/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/twoNovaWithDiffProperties/out/GlobalSubstitutionTypesServiceTemplate.yaml index 1e5c15347c..32bbbd47da 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/twoNovaWithDiffProperties/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/twoNovaWithDiffProperties/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,12 +8,22 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_pd_server_port_0_subnetpoolid: + type: string + required: true + status: SUPPORTED compute_pd_server_key_name: type: list required: true status: SUPPORTED entry_schema: type: string + port_pd_server_port_0_network: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string index_value: type: integer description: Index value of this substitution service template runtime instance @@ -34,8 +44,8 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_port_0_network_role_tag: + type: string required: true status: SUPPORTED compute_pd_server_personality: @@ -50,53 +60,35 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_related_networks: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true status: SUPPORTED - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - vm_image_name: - type: string - required: true - status: SUPPORTED - port_pd01_port_ip_requirements: + port_pd_server_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_pd01_port_order: - type: integer + port_pd_server_port_0_network_role: + type: string required: true status: SUPPORTED - port_pd01_port_subnetpoolid: + vm_image_name: type: string required: true status: SUPPORTED - port_pd01_port_network_role: - type: string + port_pd_server_port_0_related_networks: + type: list required: true status: SUPPORTED - port_pd01_port_network_role_tag: - type: string + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd_server_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_pd01_port_vlan_requirements: + port_pd_server_port_0_vlan_requirements: type: list required: true status: SUPPORTED @@ -108,6 +100,14 @@ node_types: status: SUPPORTED entry_schema: type: string + port_pd_server_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_pd_server_port_0_order: + type: integer + required: true + status: SUPPORTED requirements: - dependency_pd_server: capability: tosca.capabilities.Node @@ -123,14 +123,14 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pd01_port: + - dependency_pd_server_pd_server_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd01_port: + - link_pd_server_pd_server_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -148,6 +148,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.packets.rate_pd_server_pd_server_port_0: + 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_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -166,9 +172,8 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pd01_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_pd_server_pd_server_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED @@ -183,7 +188,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd01_port: + network.outgoing.bytes.rate_pd_server_pd_server_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -219,12 +224,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd01_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.iops_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -243,13 +242,18 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pd01_port: + vcpus_pd_server: 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_pd_server: + attachment_pd_server_pd_server_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes.rate_pd_server_pd_server_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -272,11 +276,6 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pd01_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED disk.capacity_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -295,6 +294,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes_pd_server_pd_server_port_0: + 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_pd_server: type: tosca.capabilities.network.Bindable occurrences: @@ -317,7 +322,12 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_pd01_port: + feature_pd_server_pd_server_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + binding_pd_server_pd_server_port_0: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface @@ -331,37 +341,31 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pd_server_pd01_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.incoming.packets_pd_server_pd01_port: + disk.device.read.requests.rate_pd_server: 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_pd_server: + disk.root.size_pd_server: 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_pd_server: + disk.device.read.bytes_pd_server: 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_pd_server: + disk.device.write.bytes_pd_server: 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_pd_server: + network.incoming.packets_pd_server_pd_server_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -386,17 +390,12 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pd01_port: + network.outgoing.bytes_pd_server_pd_server_port_0: 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_pd_server_pd01_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED disk.write.requests.rate_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -415,12 +414,13 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_pd01_port: - type: tosca.capabilities.Node + disk.device.latency_pd_server: + 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_pd_server: + network.incoming.packets.rate_pd_server_pd_server_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -438,13 +438,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pd01_port: + disk.device.iops_pd_server: 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.iops_pd_server: + network.outpoing.packets_pd_server_pd_server_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: 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 172582fd24..929d3083df 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 @@ -161,6 +161,8 @@ topology_template: properties: compute_pd_server_key_name: - key_name + port_pd_server_port_0_network: + - packet_internal_network compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: @@ -171,21 +173,19 @@ topology_template: - image_update_policy vm_flavor_name: get_input: pd_flavor_name - port_pd01_port_mac_requirements: - mac_count_required: - is_required: false - vm_image_name: - get_input: pd_image_name - port_pd01_port_ip_requirements: + port_pd_server_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_network: - - packet_internal_network + vm_image_name: + get_input: pd_image_name compute_pd_server_user_data_format: - RAW + port_pd_server_port_0_mac_requirements: + mac_count_required: + is_required: false service_template_filter: substitute_service_template: Nested_pd_serverServiceTemplate.yaml count: 1 @@ -195,7 +195,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_pd_server_pd01_port: + - link_pd_server_pd_server_port_0: capability: tosca.capabilities.network.Linkable node: packet_internal_network relationship: tosca.relationships.network.LinksTo @@ -206,6 +206,8 @@ topology_template: properties: compute_pd_server_key_name: - key_name + port_pd_server_port_0_network: + - packet_internal_network compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: @@ -216,21 +218,19 @@ topology_template: - personality vm_flavor_name: get_input: pd_flavor_name - port_pd01_port_mac_requirements: - mac_count_required: - is_required: false - vm_image_name: - get_input: diff_image_name - port_pd01_port_ip_requirements: + port_pd_server_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_network: - - packet_internal_network + vm_image_name: + get_input: diff_image_name compute_pd_server_user_data_format: - RAW + port_pd_server_port_0_mac_requirements: + mac_count_required: + is_required: false service_template_filter: substitute_service_template: Nested_pd_serverServiceTemplate.yaml count: 1 @@ -240,7 +240,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_pd_server_pd01_port: + - link_pd_server_pd_server_port_0: capability: tosca.capabilities.network.Linkable node: packet_internal_network relationship: tosca.relationships.network.LinksTo @@ -254,4 +254,4 @@ topology_template: - pd01_port_2 - packet_internal_network - abstract_pd_server_0 - - 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/catalogInstances/twoNovaWithDiffProperties/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/twoNovaWithDiffProperties/out/Nested_pd_serverServiceTemplate.yaml index 81bfd43686..a77c82dd8c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/twoNovaWithDiffProperties/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/twoNovaWithDiffProperties/out/Nested_pd_serverServiceTemplate.yaml @@ -11,11 +11,19 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pd_server_port_0_subnetpoolid: + type: string + required: true compute_pd_server_key_name: type: list required: true entry_schema: type: string + port_pd_server_port_0_network: + type: list + required: true + entry_schema: + type: string index_value: type: integer description: Index value of this substitution service template runtime instance @@ -33,8 +41,8 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_port_0_network_role_tag: + type: string required: true compute_pd_server_personality: type: list @@ -46,43 +54,29 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_related_networks: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - vm_image_name: - type: string - required: true - port_pd01_port_ip_requirements: + port_pd_server_port_0_ip_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: - type: list - required: true - entry_schema: - type: string - port_pd01_port_order: - type: integer - required: true - port_pd01_port_subnetpoolid: + port_pd_server_port_0_network_role: type: string required: true - port_pd01_port_network_role: + vm_image_name: type: string required: true - port_pd01_port_network_role_tag: - type: string + port_pd_server_port_0_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd_server_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - port_pd01_port_vlan_requirements: + port_pd_server_port_0_vlan_requirements: type: list required: true entry_schema: @@ -92,6 +86,12 @@ topology_template: required: true entry_schema: type: string + port_pd_server_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_pd_server_port_0_order: + type: integer + required: true node_templates: pd_server: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server @@ -124,31 +124,31 @@ topology_template: get_input: - compute_pd_server_user_data_format - index_value - pd_server_pd01_port: + pd_server_pd_server_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd01_port_exCP_naming + get_input: port_pd_server_port_0_exCP_naming vlan_requirements: - get_input: port_pd01_port_vlan_requirements + get_input: port_pd_server_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_pd01_port_related_networks + get_input: port_pd_server_port_0_related_networks ip_requirements: - get_input: port_pd01_port_ip_requirements + get_input: port_pd_server_port_0_ip_requirements network_role_tag: - get_input: port_pd01_port_network_role_tag + get_input: port_pd_server_port_0_network_role_tag mac_requirements: - get_input: port_pd01_port_mac_requirements + get_input: port_pd_server_port_0_mac_requirements order: - get_input: port_pd01_port_order + get_input: port_pd_server_port_0_order network_role: - get_input: port_pd01_port_network_role + get_input: port_pd_server_port_0_network_role subnetpoolid: - get_input: port_pd01_port_subnetpoolid + get_input: port_pd_server_port_0_subnetpoolid network: get_input: - - port_pd01_port_network + - port_pd_server_port_0_network - index_value requirements: - binding: @@ -164,6 +164,9 @@ topology_template: disk.read.bytes.rate_pd_server: - pd_server - disk.read.bytes.rate + network.outgoing.packets.rate_pd_server_pd_server_port_0: + - pd_server_pd_server_port_0 + - network.outgoing.packets.rate memory.usage_pd_server: - pd_server - memory.usage @@ -173,18 +176,18 @@ topology_template: disk.device.usage_pd_server: - pd_server - disk.device.usage - network.outgoing.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.packets.rate + forwarder_pd_server_pd_server_port_0: + - pd_server_pd_server_port_0 + - forwarder os_pd_server: - pd_server - os disk.write.bytes.rate_pd_server: - pd_server - disk.write.bytes.rate - network.incoming.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes + network.outgoing.bytes.rate_pd_server_pd_server_port_0: + - pd_server_pd_server_port_0 + - network.outgoing.bytes.rate cpu_pd_server: - pd_server - cpu @@ -200,9 +203,6 @@ topology_template: disk.device.read.bytes.rate_pd_server: - pd_server - disk.device.read.bytes.rate - network.outgoing.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes disk.iops_pd_server: - pd_server - disk.iops @@ -212,12 +212,15 @@ topology_template: cpu.delta_pd_server: - pd_server - cpu.delta - network.incoming.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets.rate vcpus_pd_server: - pd_server - vcpus + attachment_pd_server_pd_server_port_0: + - pd_server_pd_server_port_0 + - attachment + network.incoming.bytes.rate_pd_server_pd_server_port_0: + - pd_server_pd_server_port_0 + - network.incoming.bytes.rate disk.device.write.bytes.rate_pd_server: - pd_server - disk.device.write.bytes.rate @@ -227,9 +230,6 @@ topology_template: endpoint_pd_server: - pd_server - endpoint - attachment_pd_server_pd01_port: - - pd_server_pd01_port - - attachment disk.capacity_pd_server: - pd_server - disk.capacity @@ -239,6 +239,9 @@ topology_template: disk.allocation_pd_server: - pd_server - disk.allocation + network.incoming.bytes_pd_server_pd_server_port_0: + - pd_server_pd_server_port_0 + - network.incoming.bytes binding_pd_server: - pd_server - binding @@ -251,18 +254,15 @@ topology_template: disk.usage_pd_server: - pd_server - disk.usage - binding_pd_server_pd01_port: - - pd_server_pd01_port + feature_pd_server_pd_server_port_0: + - pd_server_pd_server_port_0 + - feature + binding_pd_server_pd_server_port_0: + - pd_server_pd_server_port_0 - binding disk.write.bytes_pd_server: - pd_server - disk.write.bytes - network.incoming.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes.rate - network.incoming.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -275,6 +275,9 @@ topology_template: disk.device.write.bytes_pd_server: - pd_server - disk.device.write.bytes + network.incoming.packets_pd_server_pd_server_port_0: + - pd_server_pd_server_port_0 + - network.incoming.packets disk.device.read.requests_pd_server: - pd_server - disk.device.read.requests @@ -284,12 +287,9 @@ topology_template: host_pd_server: - pd_server - host - network.outpoing.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.outpoing.packets - forwarder_pd_server_pd01_port: - - pd_server_pd01_port - - forwarder + network.outgoing.bytes_pd_server_pd_server_port_0: + - pd_server_pd_server_port_0 + - network.outgoing.bytes disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate @@ -299,34 +299,34 @@ topology_template: disk.write.requests_pd_server: - pd_server - disk.write.requests - feature_pd_server_pd01_port: - - pd_server_pd01_port - - feature disk.device.latency_pd_server: - pd_server - disk.device.latency + network.incoming.packets.rate_pd_server_pd_server_port_0: + - pd_server_pd_server_port_0 + - network.incoming.packets.rate disk.latency_pd_server: - pd_server - disk.latency disk.device.capacity_pd_server: - pd_server - disk.device.capacity - network.outgoing.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes.rate disk.device.iops_pd_server: - pd_server - disk.device.iops + network.outpoing.packets_pd_server_pd_server_port_0: + - pd_server_pd_server_port_0 + - network.outpoing.packets requirements: local_storage_pd_server: - pd_server - local_storage - link_pd_server_pd01_port: - - pd_server_pd01_port + link_pd_server_pd_server_port_0: + - pd_server_pd_server_port_0 - link - dependency_pd_server_pd01_port: - - pd_server_pd01_port - - dependency dependency_pd_server: - pd_server + - dependency + dependency_pd_server_pd_server_port_0: + - pd_server_pd_server_port_0 - 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/dynamicPorts/dependsOnFromNestedToNested/in/DPA3_New_VNF_TSBGv_base.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromNestedToNested/in/DPA3_New_VNF_TSBGv_base.yaml index 28a9051a7b..7a6dcc3517 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromNestedToNested/in/DPA3_New_VNF_TSBGv_base.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromNestedToNested/in/DPA3_New_VNF_TSBGv_base.yaml @@ -161,7 +161,7 @@ parameters: description: A valid OpenStack UUID must be provided resources: - sbg_sc_internal_0_port_0: + sbg_sc_internal_0_port: type: OS::Neutron::Port properties: replacement_policy: AUTO @@ -218,6 +218,6 @@ resources: delete_on_termination : "false" flavor: { get_param: sbg_sc_flavor_name } networks: - - port: { get_resource: sbg_sc_internal_0_port_0 } + - port: { get_resource: sbg_sc_internal_0_port } config_drive: "true" 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/dynamicPorts/dependsOnFromNovaToNestedPort/in/DPA3_New_VNF_TSBGv_base.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromNovaToNestedPort/in/DPA3_New_VNF_TSBGv_base.yaml index b3d1dda896..90a7ed940d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromNovaToNestedPort/in/DPA3_New_VNF_TSBGv_base.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromNovaToNestedPort/in/DPA3_New_VNF_TSBGv_base.yaml @@ -80,7 +80,7 @@ parameters: description: A valid OpenStack UUID must be provided resources: - sbg_sc_internal_0_port_0: + sbg_sc_internal_0_port: type: OS::Neutron::Port depends_on: [ sbg_pl_trunk_subport_avpn_group_0 ] properties: @@ -124,6 +124,6 @@ resources: delete_on_termination : "false" flavor: { get_param: sbg_sc_flavor_name } networks: - - port: { get_resource: sbg_sc_internal_0_port_0 } + - port: { get_resource: sbg_sc_internal_0_port } config_drive: "true" 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/dynamicPorts/dependsOnFromPortToNested/in/DPA3_New_VNF_TSBGv_base.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromPortToNested/in/DPA3_New_VNF_TSBGv_base.yaml index ee25b400dd..f998664769 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromPortToNested/in/DPA3_New_VNF_TSBGv_base.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromPortToNested/in/DPA3_New_VNF_TSBGv_base.yaml @@ -161,7 +161,7 @@ parameters: description: A valid OpenStack UUID must be provided resources: - sbg_sc_internal_0_port_0: + sbg_sc_internal_0_port: type: OS::Neutron::Port properties: replacement_policy: AUTO @@ -174,7 +174,7 @@ resources: - ip_address: { get_param: sbg_boot_floating_ip } mac_address: { get_param: [sbg_internal_mac_addresses ,0] } - sbg_sc_management_1_port_0: + sbg_sc_management_1_port: type: OS::Neutron::Port properties: replacement_policy: AUTO @@ -216,7 +216,7 @@ resources: delete_on_termination : "false" flavor: { get_param: sbg_sc_flavor_name } networks: - - port: { get_resource: sbg_sc_internal_0_port_0 } - - port: { get_resource: sbg_sc_management_1_port_0 } + - port: { get_resource: sbg_sc_internal_0_port } + - port: { get_resource: sbg_sc_management_1_port } config_drive: "true" 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/dynamicPorts/dependsOnFromVfcToNested/in/DPA3_New_VNF_TSBGv_base.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromVfcToNested/in/DPA3_New_VNF_TSBGv_base.yaml index d4c517fd04..3c1cc8f2b9 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromVfcToNested/in/DPA3_New_VNF_TSBGv_base.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromVfcToNested/in/DPA3_New_VNF_TSBGv_base.yaml @@ -161,7 +161,7 @@ parameters: description: A valid OpenStack UUID must be provided resources: - sbg_sc_internal_0_port_0: + sbg_sc_internal_0_port: type: OS::Neutron::Port properties: replacement_policy: AUTO @@ -174,7 +174,7 @@ resources: - ip_address: { get_param: sbg_boot_floating_ip } mac_address: { get_param: [sbg_internal_mac_addresses ,0] } - sbg_sc_management_1_port_0: + sbg_sc_management_1_port: type: OS::Neutron::Port properties: replacement_policy: AUTO @@ -225,7 +225,7 @@ resources: delete_on_termination : "false" flavor: { get_param: sbg_sc_flavor_name } networks: - - port: { get_resource: sbg_sc_internal_0_port_0 } - - port: { get_resource: sbg_sc_management_1_port_0 } + - port: { get_resource: sbg_sc_internal_0_port } + - port: { get_resource: sbg_sc_management_1_port } config_drive: "true" 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/dynamicPorts/dynamicPortsWithDependsOn/in/DPA3_New_VNF_TSBGv_base.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dynamicPortsWithDependsOn/in/DPA3_New_VNF_TSBGv_base.yaml index 7a06f07481..5535e6b1d4 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dynamicPortsWithDependsOn/in/DPA3_New_VNF_TSBGv_base.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dynamicPortsWithDependsOn/in/DPA3_New_VNF_TSBGv_base.yaml @@ -293,7 +293,7 @@ parameters: description: A valid OpenStack UUID must be provided resources: - sbg_sc_internal_0_port_0: + sbg_sc_internal_0_port: type: OS::Neutron::Port properties: replacement_policy: AUTO @@ -306,7 +306,7 @@ resources: - ip_address: { get_param: sbg_boot_floating_ip } mac_address: { get_param: [sbg_internal_mac_addresses ,0] } - sbg_sc_management_1_port_0: + sbg_sc_management_1_port: type: OS::Neutron::Port properties: replacement_policy: AUTO @@ -351,7 +351,7 @@ resources: sbg_sc_0: type: OS::Nova::Server - depends_on: [ sbg_sc_internal_0_port_0, sbg_sc_management_1_port_0 ] + depends_on: [ sbg_sc_internal_0_port, sbg_sc_management_1_port ] properties: name: { get_param: [sbg_sc_names, 0]} metadata: @@ -367,7 +367,7 @@ resources: delete_on_termination : "false" flavor: { get_param: sbg_sc_flavor_name } networks: - - port: { get_resource: sbg_sc_internal_0_port_0 } - - port: { get_resource: sbg_sc_management_1_port_0 } + - port: { get_resource: sbg_sc_internal_0_port } + - port: { get_resource: sbg_sc_management_1_port } config_drive: "true" 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/mixPatterns/connectivityBetweenPatterns/in/hot-mog-0108-bs1271.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/in/hot-mog-0108-bs1271.yml index e020410e32..e8e36c11c6 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/in/hot-mog-0108-bs1271.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/in/hot-mog-0108-bs1271.yml @@ -52,14 +52,14 @@ resources: flavor: {get_param: pd_flavor_name} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: 1a_t1_port_0} - - port: {get_resource: 1a_t2_port_0} + - port: {get_resource: 1a_t1_port} + - port: {get_resource: 1a_t2_port} user_data_format: RAW scheduler_hints: { group: { get_resource: BE_Affinity } } metadata: { connectivityTo1B01 : {get_attr : [1b01_single_1B, instance_name]}, connectivityTo1B02 : {get_attr : [1b02_single_1B, instance_name,{get_attr : [1b01_single_1B, instance_name]}]}, - connectivityTo1C1_T2_0 : {get_attr : [1c1_t2_port_0, tenant_id]}, - connectivityTo1C1_T2_1 : {get_attr : [1c1_t2_port_1, tenant_id]}, + connectivityTo1C1_T2_0 : {get_attr : [1c1_scalling_instance_0_t2_port_0, tenant_id]}, + connectivityTo1C1_T2_1 : {get_attr : [1c1_scalling_instance_1_t2_port_0, tenant_id]}, connectivityTo1C2_1 : {get_attr : [1c201_catalog_instance_1C2, instance_name]}, connectivityTo1C2_2 : {get_attr : [1c202_scalling_instance_1C2, instance_name]}, connectivityTo4PNested : {get_attr : [4p_nested, server_pcm_id]}, @@ -67,11 +67,11 @@ resources: } - 1a_t1_port_0: + 1a_t1_port: type: OS::Neutron::Port properties: network: {get_resource: a_single_1a_network} - 1a_t2_port_0: + 1a_t2_port: type: OS::Neutron::Port properties: network: {get_param: ppds_net_name} @@ -91,24 +91,24 @@ resources: flavor: {get_param: pd_flavor_name} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: 1b_t1_port_0} - - port: {get_resource: 1b_t2_port_0} + - port: {get_resource: b_single_1b_0_t1_port_0} + - port: {get_resource: b_single_1b_0_t2_port_0} user_data_format: RAW scheduler_hints: { group: { get_resource: BE_Affinity } } - metadata: { connectivityTo1C1_T1_0 : {get_attr : [1c1_t1_port_0, tenant_id]}, - connectivityTo1C1_T1_1 : {get_attr : [1c1_t1_port_1, tenant_id]}, + metadata: { connectivityTo1C1_T1_0 : {get_attr : [1c1_scalling_instance_0_t1_port_0, tenant_id]}, + connectivityTo1C1_T1_1 : {get_attr : [1c1_scalling_instance_1_t1_port_0, tenant_id]}, connectivityTo1C2_1 : {get_attr : [1c201_catalog_instance_1C2, instance_name]}, connectivityTo1C2_2 : {get_attr : [1c202_scalling_instance_1C2, instance_name]}, connectivityTo4PNested : {get_attr : [4p_nested, server_pcm_id]}, connectivityToNoUnifiedNested : {get_attr : [nestedNoUnified, portId]} } - 1b_t1_port_0: + b_single_1b_0_t1_port_0: type: OS::Neutron::Port properties: network: {get_attr: [1b01_single_1B, accessIPv6]} - 1b_t2_port_0: + b_single_1b_0_t2_port_0: type: OS::Neutron::Port properties: network: {get_resource: b_single_1b_network} @@ -127,18 +127,18 @@ resources: flavor: {get_param: pd_flavor_name} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: 1b_t1_port_1} - - port: {get_resource: 1b_t2_port_1} + - port: {get_resource: b_single_1b_1_t1_port_0} + - port: {get_resource: b_single_1b_1_t2_port_0} user_data_format: RAW scheduler_hints: { group: { get_resource: BE_Affinity } } - 1b_t1_port_1: + b_single_1b_1_t1_port_0: type: OS::Neutron::Port properties: network: {get_param: oam_net_name} - value_specs: {get_attr: [1a_t1_port_0, tenant_id]} + value_specs: {get_attr: [1a_t1_port, tenant_id]} - 1b_t2_port_1: + b_single_1b_1_t2_port_0: type: OS::Neutron::Port properties: network: {get_resource: b_single_1b_network} @@ -151,8 +151,8 @@ resources: flavor: {get_param: pd_flavor_name} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: 1c1_t1_port_0} - - port: {get_resource: 1c1_t2_port_0} + - port: {get_resource: 1c1_scalling_instance_0_t1_port_0} + - port: {get_resource: 1c1_scalling_instance_0_t2_port_0} user_data_format: RAW1 scheduler_hints: { group: { get_resource: BE_Affinity } } metadata: { connectivityTo1B01 : {get_attr : [1b01_single_1B, instance_name]}, @@ -164,18 +164,18 @@ resources: connectivityToNoUnifiedNested : {get_attr : [nestedNoUnified, portId]} } - 1c1_t1_port_0: + 1c1_scalling_instance_0_t1_port_0: type: OS::Neutron::Port properties: network: {get_resource: 1c1_scalling_instance_network} fixed_ips: [{"ip_address": {get_param: [myIPs, 1]}}] - name: 1c1_t1_port_0 - 1c1_t2_port_0: + name: 1c1_scalling_instance_0_t1_port_0 + 1c1_scalling_instance_0_t2_port_0: type: OS::Neutron::Port properties: network: {get_param: ppds_net_name} fixed_ips: [{"ip_address": {get_param: [myIPs, 1]}}] - name: 1c1_t2_port_0 + name: 1c1_scalling_instance_0_t2_port_0 1c1_scalling_instance_network: type: OS::Neutron::Net @@ -191,24 +191,24 @@ resources: flavor: {get_param: pd_flavor_name} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: 1c1_t1_port_1} - - port: {get_resource: 1c1_t2_port_1} + - port: {get_resource: 1c1_scalling_instance_1_t1_port_0} + - port: {get_resource: 1c1_scalling_instance_1_t2_port_0} user_data_format: RAW2 scheduler_hints: { group: { get_resource: BE_Affinity } } - 1c1_t1_port_1: + 1c1_scalling_instance_1_t1_port_0: type: OS::Neutron::Port properties: network: {get_resource: 1c1_scalling_instance_network} fixed_ips: [{"ip_address": {get_param: [myIPs, 1]}}] - name: 1c1_t1_port_1 + name: 1c1_scalling_instance_1_t1_port_0 - 1c1_t2_port_1: + 1c1_scalling_instance_1_t2_port_0: type: OS::Neutron::Port properties: network: {get_param: ppds_net_name} fixed_ips: [{"ip_address": {get_param: [myIPs, 1]}}] - name: 1c1_t2_port_1 + name: 1c1_scalling_instance_1_t2_port_0 1c201_catalog_instance_1C2: type: OS::Nova::Server @@ -218,24 +218,24 @@ resources: flavor: {get_param: pd_flavor_name} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: 1c2_t1_port_0} - - port: {get_resource: 1c2_t2_port_0} + - port: {get_resource: 1c2_catalog_instance_0_t1_port_0} + - port: {get_resource: 1c2_catalog_instance_0_t2_port_0} user_data_format: RAW1 scheduler_hints: { group: { get_resource: BE_Affinity } } metadata: { connectivityTo1B01 : {get_attr : [1b01_single_1B, instance_name]}, connectivityTo1B02 : {get_attr : [1b02_single_1B, instance_name]}, connectivityTo1A : {get_attr : [1a_single_1A, instance_name]}, - connectivityTo1C1_T2_0 : {get_attr : [1c1_t2_port_0, tenant_id]}, - connectivityTo1C1_T2_1 : {get_attr : [1c1_t2_port_1, tenant_id]}, + connectivityTo1C1_T2_0 : {get_attr : [1c1_scalling_instance_0_t2_port_0, tenant_id]}, + connectivityTo1C1_T2_1 : {get_attr : [1c1_scalling_instance_1_t2_port_0, tenant_id]}, connectivityTo4PNested : {get_attr : [4p_nested, server_pcm_id]}, connectivityToNoUnifiedNested : {get_attr : [nestedNoUnified, portId]} } - 1c2_t1_port_0: + 1c2_catalog_instance_0_t1_port_0: type: OS::Neutron::Port properties: network: {get_param: oam_net_name} - 1c2_t2_port_0: + 1c2_catalog_instance_0_t2_port_0: type: OS::Neutron::Port properties: network: {get_resource: 1c2_catalog_instance_network} @@ -254,16 +254,16 @@ resources: flavor: {get_param: pd_flavor_name} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: 1c2_t1_port_1} - - port: {get_resource: 1c2_t2_port_1} + - port: {get_resource: 1c2_catalog_instance_1_t1_port_0} + - port: {get_resource: 1c2_catalog_instance_1_t2_port_0} user_data_format: {get_attr: [1c201_catalog_instance_1C2, instance_name]} scheduler_hints: { group: { get_resource: BE_Affinity } } - 1c2_t1_port_1: + 1c2_catalog_instance_1_t1_port_0: type: OS::Neutron::Port properties: network: {get_param: oam_net_name} - 1c2_t2_port_1: + 1c2_catalog_instance_1_t2_port_0: type: OS::Neutron::Port properties: network: {get_resource: 1c2_catalog_instance_network} @@ -279,8 +279,8 @@ resources: server_group: { get_resource: BE_Affinity } connectivityChk: {connectivityTo1B01 : {get_attr : [1b01_single_1B, instance_name]}, connectivityTo1B02 : {get_attr : [1b02_single_1B, instance_name,{get_attr : [1b01_single_1B, instance_name]}]}, - connectivityTo1C1_T2_0 : {get_attr : [1c1_t2_port_0, tenant_id]}, - connectivityTo1C1_T2_1 : {get_attr : [1c1_t2_port_1, tenant_id]}, + connectivityTo1C1_T2_0 : {get_attr : [1c1_scalling_instance_0_t2_port_0, tenant_id]}, + connectivityTo1C1_T2_1 : {get_attr : [1c1_scalling_instance_1_t2_port_0, tenant_id]}, connectivityTo1C2_1 : {get_attr : [1c201_catalog_instance_1C2, instance_name]}, connectivityTo1C2_2 : {get_attr : [1c202_scalling_instance_1C2, instance_name]}, connectivityTo1A : {get_attr : [1a_single_1A, instance_name]} @@ -304,8 +304,8 @@ resources: server_group: { get_resource: BE_Affinity } connectivityChk: {connectivityTo1B01 : {get_attr : [1b01_single_1B, instance_name]}, connectivityTo1B02 : {get_attr : [1b02_single_1B, instance_name,{get_attr : [1b01_single_1B, instance_name]}]}, - connectivityTo1C1_T2_0 : {get_attr : [1c1_t2_port_0, tenant_id]}, - connectivityTo1C1_T2_1 : {get_attr : [1c1_t2_port_1, tenant_id]}, + connectivityTo1C1_T2_0 : {get_attr : [1c1_scalling_instance_0_t2_port_0, tenant_id]}, + connectivityTo1C1_T2_1 : {get_attr : [1c1_scalling_instance_1_t2_port_0, tenant_id]}, connectivityTo1C2_1 : {get_attr : [1c201_catalog_instance_1C2, instance_name]}, connectivityTo1C2_2 : {get_attr : [1c202_scalling_instance_1C2, instance_name]}, connectivityTo1A : {get_attr : [1a_single_1A, instance_name]} @@ -335,20 +335,20 @@ resources: depends_on: - nestedNoUnified - 4p_nested - - 1c2_t1_port_1 - - 1c2_t1_port_0 + - 1c2_catalog_instance_1_t1_port_0 + - 1c2_catalog_instance_0_t1_port_0 - 1c201_catalog_instance_1C2 - 1c202_scalling_instance_1C2 - 1c101_scalling_instance_1C1 - 1c102_scalling_instance_1C1 - - 1c1_t2_port_0 - - 1c1_t2_port_1 + - 1c1_scalling_instance_0_t2_port_0 + - 1c1_scalling_instance_1_t2_port_0 - 1b01_single_1B - 1b02_single_1B - - 1b_t1_port_0 - - 1b_t1_port_1 + - b_single_1b_0_t1_port_0 + - b_single_1b_1_t1_port_0 - 1a_single_1A - - 1a_t1_port_0 + - 1a_t1_port properties: name: get_param: net_name @@ -357,11 +357,11 @@ resources: type: OS::Neutron::Net properties: name: { get_attr: [nestedNoUnified, portId, {get_attr: [4p_nested, server_pcm_id]}]} - dhcp_agent_ids: { get_attr: [1c2_t1_port_1, tenant_id, {get_attr: [1c2_t1_port_0, tenant_id, {get_attr: [1c201_catalog_instance_1C2, instance_name, {get_attr: [1c202_scalling_instance_1C2,instance_name]}]}]}]} - tenant_id: { get_attr:[1c101_scalling_instance_1C1, instance_name, {get_attr:[1c102_scalling_instance_1C1, instance_name, {get_attr:[1c1_t2_port_0, tenant_id, {get_attr:[1c1_t2_port_1, tenant_id]}]}]}]} - value_specs: {get_attr:[1b01_single_1B, instance_name, get_attr:[1b02_single_1B,instance_name, {get_attr:[1b_t1_port_0, tenant_id, {get_attr:[1b_t1_port_1, tenant_id]}]}]] } + dhcp_agent_ids: { get_attr: [1c2_catalog_instance_1_t1_port_0, tenant_id, {get_attr: [1c2_catalog_instance_0_t1_port_0, tenant_id, {get_attr: [1c201_catalog_instance_1C2, instance_name, {get_attr: [1c202_scalling_instance_1C2,instance_name]}]}]}]} + tenant_id: { get_attr:[1c101_scalling_instance_1C1, instance_name, {get_attr:[1c102_scalling_instance_1C1, instance_name, {get_attr:[1c1_scalling_instance_0_t2_port_0, tenant_id, {get_attr:[1c1_scalling_instance_1_t2_port_0, tenant_id]}]}]}]} + value_specs: {get_attr:[1b01_single_1B, instance_name, get_attr:[1b02_single_1B,instance_name, {get_attr:[b_single_1b_0_t1_port_0, tenant_id, {get_attr:[b_single_1b_1_t1_port_0, tenant_id]}]}]] } qos_policy: {get_attr:[1a_single_1A, instance_name]} - admin_state_up: {get_attr:[1a_t1_port_0, tenant_id]} + admin_state_up: {get_attr:[1a_t1_port, tenant_id]} BE_Affinity: type: OS::Nova::ServerGroup @@ -373,12 +373,12 @@ outputs: out1: value: { get_attr: [nestedNoUnified, portId, {get_attr: [4p_nested, server_pcm_id]}]} out2: - value: { get_attr: [1c2_t1_port_1, tenant_id, {get_attr: [1c2_t1_port_0, tenant_id, {get_attr: [1c201_catalog_instance_1C2, instance_name, {get_attr: [1c202_scalling_instance_1C2,instance_name]}]}]}]} + value: { get_attr: [1c2_catalog_instance_1_t1_port_0, tenant_id, {get_attr: [1c2_catalog_instance_0_t1_port_0, tenant_id, {get_attr: [1c201_catalog_instance_1C2, instance_name, {get_attr: [1c202_scalling_instance_1C2,instance_name]}]}]}]} out3: - value: { get_attr:[1c101_scalling_instance_1C1, instance_name, {get_attr:[1c102_scalling_instance_1C1, instance_name, {get_attr:[1c1_t2_port_0, tenant_id, {get_attr:[1c1_t2_port_1, tenant_id]}]}]}]} + value: { get_attr:[1c101_scalling_instance_1C1, instance_name, {get_attr:[1c102_scalling_instance_1C1, instance_name, {get_attr:[1c1_scalling_instance_0_t2_port_0, tenant_id, {get_attr:[1c1_scalling_instance_1_t2_port_0, tenant_id]}]}]}]} out4: - value: {get_attr:[1b01_single_1B, instance_name, get_attr:[1b02_single_1B,instance_name, {get_attr:[1b_t1_port_0, tenant_id, {get_attr:[1b_t1_port_1, tenant_id]}]}]] } + value: {get_attr:[1b01_single_1B, instance_name, get_attr:[1b02_single_1B,instance_name, {get_attr:[b_single_1b_0_t1_port_0, tenant_id, {get_attr:[b_single_1b_1_t1_port_0, tenant_id]}]}]] } out5: value: {get_attr:[1a_single_1A, instance_name]} out6: - value: {get_attr:[1a_t1_port_0, tenant_id]} \ No newline at end of file + value: {get_attr:[1a_t1_port, tenant_id]} \ 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/connectivityBetweenPatterns/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/GlobalSubstitutionTypesServiceTemplate.yaml index f32cc59857..9456835eca 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -2136,86 +2136,78 @@ node_types: org.openecomp.resource.abstract.nodes.1c2_catalog_instance: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_1c2_t2_port_order: - type: integer - required: true - status: SUPPORTED - compute_1c2_catalog_instance_availability_zone: + port_1c2_catalog_instance_t1_port_0_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_1c2_t2_port_subnetpoolid: - type: string + port_1c2_catalog_instance_t2_port_0_vlan_requirements: + type: list required: true status: SUPPORTED - port_1c2_t1_port_related_networks: + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + compute_1c2_catalog_instance_availability_zone: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_1c2_t2_port_network_role: - type: string + type: string + port_1c2_catalog_instance_t1_port_0_ip_requirements: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements vm_flavor_name: type: string required: true status: SUPPORTED - port_1c2_t2_port_network_role_tag: + port_1c2_catalog_instance_t2_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_1c2_t1_port_vlan_requirements: + port_1c2_catalog_instance_t2_port_0_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: string vm_image_name: type: string required: true status: SUPPORTED - port_1c2_t2_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_1c2_catalog_instance_t1_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_1c2_t1_port_order: - type: integer + port_1c2_catalog_instance_t2_port_0_network_role: + type: string required: true status: SUPPORTED - port_1c2_t1_port_subnetpoolid: + port_1c2_catalog_instance_t1_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_1c2_t2_port_ip_requirements: - type: list + port_1c2_catalog_instance_t2_port_0_order: + type: integer required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_1c2_t2_port_related_networks: + port_1c2_catalog_instance_t2_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_1c2_t1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_1c2_t1_port_network_role: - type: string + port_1c2_catalog_instance_t1_port_0_order: + type: integer required: true status: SUPPORTED - port_1c2_t2_port_network: - type: list + port_1c2_catalog_instance_t2_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: string index_value: type: integer description: Index value of this substitution service template runtime instance @@ -2236,42 +2228,50 @@ node_types: status: SUPPORTED entry_schema: type: string - port_1c2_t1_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_1c2_catalog_instance_t2_port_0_ip_requirements: + type: list required: true status: SUPPORTED - port_1c2_t1_port_network: + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_1c2_catalog_instance_t1_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: string - port_1c2_t2_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_1c2_catalog_instance_t2_port_0_subnetpoolid: + type: string required: true status: SUPPORTED - port_1c2_t2_port_vlan_requirements: - type: list + port_1c2_catalog_instance_t1_port_0_network_role: + type: string + required: true + status: SUPPORTED + port_1c2_catalog_instance_t1_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements compute_1c2_catalog_instance_user_data_format: type: list required: true status: SUPPORTED entry_schema: type: string - port_1c2_t1_port_network_role_tag: - type: string - required: true - status: SUPPORTED - port_1c2_t1_port_ip_requirements: + port_1c2_catalog_instance_t1_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: org.openecomp.datatypes.network.VlanRequirements + port_1c2_catalog_instance_t2_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_1c2_catalog_instance_t1_port_0_network_role_tag: + type: string + required: true + status: SUPPORTED compute_1c2_catalog_instance_scheduler_hints: type: list required: true @@ -2282,7 +2282,7 @@ node_types: 1c2_catalog_instance_instance_name: type: string status: SUPPORTED - 1c2_catalog_instance_1c2_t1_port_tenant_id: + 1c2_catalog_instance_1c2_catalog_instance_t1_port_0_tenant_id: type: string status: SUPPORTED requirements: @@ -2300,27 +2300,27 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_1c2_catalog_instance_1c2_t2_port: + - dependency_1c2_catalog_instance_1c2_catalog_instance_t1_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_1c2_catalog_instance_1c2_t2_port: + - link_1c2_catalog_instance_1c2_catalog_instance_t1_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_1c2_catalog_instance_1c2_t1_port: + - dependency_1c2_catalog_instance_1c2_catalog_instance_t2_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_1c2_catalog_instance_1c2_t1_port: + - link_1c2_catalog_instance_1c2_catalog_instance_t2_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -2333,12 +2333,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_1c2_catalog_instance_1c2_t2_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.bytes.rate_1c2_catalog_instance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2351,9 +2345,8 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_1c2_catalog_instance_1c2_t1_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_1c2_catalog_instance_1c2_catalog_instance_t1_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED @@ -2363,73 +2356,78 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_1c2_catalog_instance_1c2_t2_port: + cpu_util_1c2_catalog_instance: 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_1c2_catalog_instance_1c2_t2_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 + network.incoming.bytes.rate_1c2_catalog_instance_1c2_catalog_instance_t2_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - - 0 + - 1 - UNBOUNDED - network.incoming.packets_1c2_catalog_instance_1c2_t1_port: + cpu_1c2_catalog_instance: 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_1c2_catalog_instance: + disk.read.requests_1c2_catalog_instance: 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_1c2_catalog_instance_1c2_t2_port: + network.outpoing.packets_1c2_catalog_instance_1c2_catalog_instance_t2_port_0: 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_1c2_catalog_instance_1c2_t1_port: - type: tosca.capabilities.Node + disk.ephemeral.size_1c2_catalog_instance: + 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 - attachment_1c2_catalog_instance_1c2_t1_port: - type: tosca.capabilities.Attachment + disk.device.write.bytes_1c2_catalog_instance: + 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_1c2_catalog_instance_1c2_t2_port: + memory.resident_1c2_catalog_instance: 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_1c2_catalog_instance: + network.outpoing.packets_1c2_catalog_instance_1c2_catalog_instance_t1_port_0: 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_1c2_catalog_instance: + disk.device.write.requests.rate_1c2_catalog_instance: 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_1c2_catalog_instance_1c2_t1_port: + os_1c2_catalog_instance: + type: tosca.capabilities.OperatingSystem + occurrences: + - 1 + - UNBOUNDED + disk.device.iops_1c2_catalog_instance: 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_1c2_catalog_instance_1c2_t1_port: + binding_1c2_catalog_instance_1c2_catalog_instance_t1_port_0: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface @@ -2437,42 +2435,30 @@ node_types: occurrences: - 0 - UNBOUNDED - disk.ephemeral.size_1c2_catalog_instance: - 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_1c2_catalog_instance: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_1c2_catalog_instance_1c2_catalog_instance_t1_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - memory.resident_1c2_catalog_instance: + network.outgoing.bytes_1c2_catalog_instance_1c2_catalog_instance_t1_port_0: 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_1c2_catalog_instance: + network.outgoing.bytes.rate_1c2_catalog_instance_1c2_catalog_instance_t1_port_0: 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_1c2_catalog_instance_1c2_t1_port: + network.outgoing.packets.rate_1c2_catalog_instance_1c2_catalog_instance_t1_port_0: 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_1c2_catalog_instance: - type: tosca.capabilities.OperatingSystem - occurrences: - - 1 - - UNBOUNDED - disk.device.iops_1c2_catalog_instance: + network.incoming.packets_1c2_catalog_instance_1c2_catalog_instance_t1_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2489,19 +2475,19 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.latency_1c2_catalog_instance: + network.incoming.bytes.rate_1c2_catalog_instance_1c2_catalog_instance_t1_port_0: 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_1c2_catalog_instance_1c2_t1_port: + disk.latency_1c2_catalog_instance: 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_1c2_catalog_instance_1c2_t1_port: + network.incoming.bytes_1c2_catalog_instance_1c2_catalog_instance_t1_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2513,15 +2499,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_1c2_catalog_instance_1c2_t2_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_1c2_catalog_instance_1c2_catalog_instance_t1_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - network.incoming.packets_1c2_catalog_instance_1c2_t2_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_1c2_catalog_instance_1c2_catalog_instance_t2_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED @@ -2537,29 +2521,19 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_1c2_catalog_instance_1c2_t2_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - forwarder_1c2_catalog_instance_1c2_t1_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - network.outgoing.packets.rate_1c2_catalog_instance_1c2_t1_port: + disk.read.bytes_1c2_catalog_instance: 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_1c2_catalog_instance: + instance_1c2_catalog_instance: 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 - instance_1c2_catalog_instance: + network.incoming.packets.rate_1c2_catalog_instance_1c2_catalog_instance_t2_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2583,11 +2557,6 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_1c2_catalog_instance_1c2_t2_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED disk.device.allocation_1c2_catalog_instance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2600,12 +2569,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_1c2_catalog_instance_1c2_t2_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.device.read.requests_1c2_catalog_instance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2648,29 +2611,54 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_1c2_catalog_instance_1c2_t2_port: + binding_1c2_catalog_instance_1c2_catalog_instance_t2_port_0: + 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 + network.incoming.packets_1c2_catalog_instance_1c2_catalog_instance_t2_port_0: + 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_1c2_catalog_instance_1c2_catalog_instance_t2_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes_1c2_catalog_instance_1c2_catalog_instance_t2_port_0: 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_1c2_catalog_instance: + network.outgoing.bytes.rate_1c2_catalog_instance_1c2_catalog_instance_t2_port_0: 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_1c2_catalog_instance: - type: tosca.capabilities.Node + disk.usage_1c2_catalog_instance: + 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_1c2_catalog_instance_1c2_t1_port: + network.outgoing.packets.rate_1c2_catalog_instance_1c2_catalog_instance_t2_port_0: 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_1c2_catalog_instance: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED memory_1c2_catalog_instance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2700,8 +2688,20 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_1c2_catalog_instance_1c2_t2_port: - type: tosca.capabilities.Node + forwarder_1c2_catalog_instance_1c2_catalog_instance_t2_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets.rate_1c2_catalog_instance_1c2_catalog_instance_t1_port_0: + 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_1c2_catalog_instance_1c2_catalog_instance_t2_port_0: + 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 @@ -2714,16 +2714,16 @@ node_types: org.openecomp.resource.abstract.nodes.pcma_server_1: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_pcm_port_0_network_role: - type: string - required: true - status: SUPPORTED port_pcm_port_1_related_networks: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pcm_port_0_network_role: + type: string + required: true + status: SUPPORTED port_pcm_port_1_network_role_tag: type: string required: true @@ -2782,11 +2782,11 @@ node_types: type: string required: true status: SUPPORTED - port_pcm_port_0_exCP_naming: + port_pcm_port_1_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_pcm_port_1_exCP_naming: + port_pcm_port_0_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED @@ -2800,18 +2800,18 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pcm_port_0_ip_requirements: + port_pcm_port_1_security_groups: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pcm_port_1_security_groups: + type: json + port_pcm_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements compute_pcma_server_config_drive: type: list required: true @@ -2860,16 +2860,16 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pcm_port_0_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED port_pcm_port_1_ip_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements + port_pcm_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED port_pcm_port_1_order: type: integer required: true @@ -3303,43 +3303,55 @@ node_types: org.openecomp.resource.abstract.nodes.b_single_1b: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_1b_t1_port_order: - type: integer + port_b_single_1b_t1_port_0_network_role_tag: + type: string + required: true + status: SUPPORTED + port_b_single_1b_t1_port_0_related_networks: + type: list required: true status: SUPPORTED - port_1b_t1_port_network_role: + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_b_single_1b_t2_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_1b_t1_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_b_single_1b_t1_port_0_network_role: + type: string + required: true + status: SUPPORTED + port_b_single_1b_t2_port_0_network: + type: list required: true status: SUPPORTED + entry_schema: + type: string vm_flavor_name: type: string required: true status: SUPPORTED - port_1b_t2_port_related_networks: + port_b_single_1b_t1_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_1b_t1_port_ip_requirements: + type: org.openecomp.datatypes.network.VlanRequirements + port_b_single_1b_t2_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_image_name: type: string required: true status: SUPPORTED - port_1b_t2_port_network_role: - type: string + port_b_single_1b_t2_port_0_order: + type: integer required: true status: SUPPORTED - port_1b_t2_port_order: + port_b_single_1b_t1_port_0_order: type: integer required: true status: SUPPORTED @@ -3349,34 +3361,32 @@ node_types: status: SUPPORTED entry_schema: type: string - port_1b_t2_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_1b_t2_port_network_role_tag: - type: string + port_b_single_1b_t2_port_0_vlan_requirements: + type: list required: true status: SUPPORTED - port_1b_t2_port_subnetpoolid: + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_b_single_1b_t2_port_0_network_role: type: string required: true status: SUPPORTED - port_1b_t1_port_related_networks: + port_b_single_1b_t1_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_1b_t2_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED + type: org.openecomp.datatypes.network.IpRequirements compute_b_single_1b_availability_zone: type: list required: true status: SUPPORTED entry_schema: type: string + port_b_single_1b_t1_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED index_value: type: integer description: Index value of this substitution service template runtime instance @@ -3391,19 +3401,15 @@ node_types: status: SUPPORTED entry_schema: type: json - port_1b_t2_port_vlan_requirements: - type: list + port_b_single_1b_t1_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_1b_t2_port_ip_requirements: - type: list + port_b_single_1b_t1_port_0_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_1b_t1_port_network_role_tag: + port_b_single_1b_t2_port_0_network_role_tag: type: string required: true status: SUPPORTED @@ -3413,26 +3419,20 @@ node_types: status: SUPPORTED entry_schema: type: json - port_1b_t1_port_subnetpoolid: - type: string + port_b_single_1b_t2_port_0_ip_requirements: + type: list required: true status: SUPPORTED - port_1b_t1_port_mac_requirements: + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_b_single_1b_t2_port_0_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_1b_t2_port_network: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_1b_t1_port_vlan_requirements: - type: list + port_b_single_1b_t2_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements compute_b_single_1b_name: type: list required: true @@ -3443,7 +3443,7 @@ node_types: b_single_1b_instance_name: type: string status: SUPPORTED - b_single_1b_1b_t1_port_tenant_id: + b_single_1b_b_single_1b_t1_port_0_tenant_id: type: string status: SUPPORTED requirements: @@ -3461,43 +3461,33 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_b_single_1b_1b_t1_port: + - dependency_b_single_1b_b_single_1b_t2_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_b_single_1b_1b_t1_port: + - link_b_single_1b_b_single_1b_t2_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_b_single_1b_1b_t2_port: + - dependency_b_single_1b_b_single_1b_t1_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_b_single_1b_1b_t2_port: + - link_b_single_1b_b_single_1b_t1_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: - attachment_b_single_1b_1b_t2_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - forwarder_b_single_1b_1b_t2_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED endpoint_b_single_1b: type: tosca.capabilities.Endpoint.Admin occurrences: @@ -3514,23 +3504,56 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_b_single_1b_1b_t2_port: + network.incoming.bytes_b_single_1b_b_single_1b_t1_port_0: 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_b_single_1b_1b_t2_port: + network.incoming.packets.rate_b_single_1b_b_single_1b_t2_port_0: 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_b_single_1b_1b_t1_port: - type: org.openecomp.capabilities.Forwarder + network.incoming.bytes_b_single_1b_b_single_1b_t2_port_0: + 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_b_single_1b_b_single_1b_t1_port_0: + 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 + feature_b_single_1b_b_single_1b_t2_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED + feature_b_single_1b_b_single_1b_t1_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes.rate_b_single_1b_b_single_1b_t1_port_0: + 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_b_single_1b_b_single_1b_t2_port_0: + 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 scalable_b_single_1b: type: tosca.capabilities.Scalable occurrences: @@ -3547,6 +3570,16 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_b_single_1b_b_single_1b_t2_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + forwarder_b_single_1b_b_single_1b_t1_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED vcpus_b_single_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3559,25 +3592,25 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.read.requests.rate_b_single_1b: + network.incoming.bytes.rate_b_single_1b_b_single_1b_t2_port_0: 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_b_single_1b_1b_t2_port: + disk.device.read.requests.rate_b_single_1b: 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 - instance_b_single_1b: + network.incoming.packets.rate_b_single_1b_b_single_1b_t1_port_0: 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_b_single_1b_1b_t1_port: + instance_b_single_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -3601,49 +3634,43 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_b_single_1b_1b_t1_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.device.allocation_b_single_1b: 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.packets.rate_b_single_1b_1b_t2_port: + network.outgoing.packets.rate_b_single_1b_b_single_1b_t2_port_0: 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_b_single_1b: + network.outpoing.packets_b_single_1b_b_single_1b_t1_port_0: 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_b_single_1b: + network.outgoing.bytes_b_single_1b_b_single_1b_t2_port_0: 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_b_single_1b_1b_t2_port: + disk.device.capacity_b_single_1b: 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_b_single_1b_1b_t1_port: + disk.latency_b_single_1b: 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 - attachment_b_single_1b_1b_t1_port: + attachment_b_single_1b_b_single_1b_t1_port_0: type: tosca.capabilities.Attachment occurrences: - 1 @@ -3654,14 +3681,6 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_b_single_1b_1b_t2_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 disk.ephemeral.size_b_single_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3674,25 +3693,25 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_b_single_1b_1b_t2_port: + disk.device.iops_b_single_1b: 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.iops_b_single_1b: + disk.read.requests_b_single_1b: 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_b_single_1b: + memory.resident_b_single_1b: 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_b_single_1b: + network.outgoing.bytes.rate_b_single_1b_b_single_1b_t2_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -3704,12 +3723,13 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_b_single_1b_1b_t1_port: - type: tosca.capabilities.Node + network.incoming.packets_b_single_1b_b_single_1b_t1_port_0: + 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_b_single_1b_1b_t2_port: + network.outgoing.bytes.rate_b_single_1b_b_single_1b_t1_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -3751,7 +3771,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_b_single_1b_1b_t1_port: + network.incoming.packets_b_single_1b_b_single_1b_t2_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -3769,63 +3789,48 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_b_single_1b_1b_t1_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.device.read.requests_b_single_1b: 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_b_single_1b_1b_t1_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_b_single_1b_b_single_1b_t2_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - binding_b_single_1b_1b_t1_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 - network.outpoing.packets_b_single_1b_1b_t1_port: + disk.device.write.requests.rate_b_single_1b: 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_b_single_1b: + network.outgoing.packets.rate_b_single_1b_b_single_1b_t1_port_0: 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_b_single_1b: + network.outpoing.packets_b_single_1b_b_single_1b_t2_port_0: 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_b_single_1b: + memory.usage_b_single_1b: 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_b_single_1b_1b_t2_port: + network.outgoing.bytes_b_single_1b_b_single_1b_t1_port_0: 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_b_single_1b_1b_t1_port: + disk.write.bytes.rate_b_single_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -3867,112 +3872,91 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_b_single_1b_1b_t2_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED org.openecomp.resource.abstract.nodes.1c1_scalling_instance: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_1c1_t1_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_1c1_t2_port_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements compute_1c1_scalling_instance_user_data_format: type: list required: true status: SUPPORTED entry_schema: type: string - port_1c1_t2_port_related_networks: + port_1c1_scalling_instance_t1_port_0_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_1c1_t2_port_network_role_tag: - type: string - required: true - status: SUPPORTED - vm_flavor_name: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_1c1_scalling_instance_t1_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_1c1_t1_port_related_networks: + port_1c1_scalling_instance_t2_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_1c1_t1_port_ip_requirements: + port_1c1_scalling_instance_t1_port_0_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - vm_image_name: + type: string + vm_flavor_name: type: string required: true status: SUPPORTED - compute_1c1_scalling_instance_name: + port_1c1_scalling_instance_t2_port_0_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: string - port_1c1_t1_port_name: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_1c1_scalling_instance_t1_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_1c1_t1_port_network: - type: list + type: org.openecomp.datatypes.network.IpRequirements + port_1c1_scalling_instance_t1_port_0_network_role: + type: string required: true status: SUPPORTED - entry_schema: - type: string - port_1c1_t2_port_fixed_ips: - type: list + port_1c1_scalling_instance_t2_port_0_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_1c1_t2_port_network: - type: list + port_1c1_scalling_instance_t2_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: string - port_1c1_t1_port_fixed_ips: - type: list + vm_image_name: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_1c1_t1_port_vlan_requirements: + compute_1c1_scalling_instance_name: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_1c1_t2_port_ip_requirements: - type: list + type: string + port_1c1_scalling_instance_t2_port_0_network_role: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_1c1_t1_port_mac_requirements: + port_1c1_scalling_instance_t1_port_0_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED + port_1c1_scalling_instance_t1_port_0_subnetpoolid: + type: string + required: true + status: SUPPORTED + port_1c1_scalling_instance_t2_port_0_order: + type: integer + required: true + status: SUPPORTED index_value: type: integer description: Index value of this substitution service template runtime instance @@ -3981,85 +3965,101 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_1c1_t2_port_network_role: - type: string + port_1c1_scalling_instance_t1_port_0_order: + type: integer required: true status: SUPPORTED - port_1c1_t2_port_order: - type: integer + port_1c1_scalling_instance_t2_port_0_vlan_requirements: + type: list required: true status: SUPPORTED - port_1c1_t2_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_1c1_scalling_instance_t1_port_0_name: + type: list required: true status: SUPPORTED + entry_schema: + type: string compute_1c1_scalling_instance_availability_zone: type: list required: true status: SUPPORTED entry_schema: type: string - port_1c1_t2_port_subnetpoolid: - type: string + port_1c1_scalling_instance_t2_port_0_ip_requirements: + type: list required: true status: SUPPORTED - port_1c1_t2_port_name: + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_1c1_scalling_instance_t2_port_0_name: type: list required: true status: SUPPORTED entry_schema: type: string + port_1c1_scalling_instance_t2_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_1c1_scalling_instance_t1_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED compute_1c1_scalling_instance_scheduler_hints: type: list required: true status: SUPPORTED entry_schema: type: json - port_1c1_t2_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_1c1_scalling_instance_t1_port_0_vlan_requirements: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements compute_1c1_scalling_instance_metadata: type: list required: true status: SUPPORTED entry_schema: type: json - port_1c1_t1_port_subnetpoolid: + port_1c1_scalling_instance_t2_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_1c1_t1_port_network_role_tag: - type: string - required: true - status: SUPPORTED - port_1c1_t1_port_network_role: - type: string + port_1c1_scalling_instance_t1_port_0_related_networks: + type: list required: true status: SUPPORTED - port_1c1_t1_port_order: - type: integer + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_1c1_scalling_instance_t2_port_0_network: + type: list required: true status: SUPPORTED + entry_schema: + type: string attributes: - 1c1_scalling_instance_1c1_t1_port_tenant_id: + 1c1_scalling_instance_instance_name: type: string status: SUPPORTED - 1c1_scalling_instance_instance_name: + 1c1_scalling_instance_1c1_scalling_instance_t1_port_0_tenant_id: type: string status: SUPPORTED - 1c1_scalling_instance_1c1_t2_port_tenant_id: + 1c1_scalling_instance_1c1_scalling_instance_t2_port_0_tenant_id: type: string status: SUPPORTED requirements: - - dependency_1c1_scalling_instance_1c1_t1_port: + - dependency_1c1_scalling_instance_1c1_scalling_instance_t2_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_1c1_scalling_instance_1c1_t1_port: + - link_1c1_scalling_instance_1c1_scalling_instance_t2_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -4079,14 +4079,14 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_1c1_scalling_instance_1c1_t2_port: + - dependency_1c1_scalling_instance_1c1_scalling_instance_t1_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_1c1_scalling_instance_1c1_t2_port: + - link_1c1_scalling_instance_1c1_scalling_instance_t1_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -4122,17 +4122,26 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_1c1_scalling_instance_1c1_t2_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_1c1_scalling_instance_1c1_scalling_instance_t2_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_1c1_scalling_instance_1c1_t2_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_1c1_scalling_instance_1c1_scalling_instance_t1_port_0: + 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: - - 1 + - 0 + - UNBOUNDED + binding_1c1_scalling_instance_1c1_scalling_instance_t2_port_0: + 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 disk.usage_1c1_scalling_instance: type: org.openecomp.capabilities.metric.Ceilometer @@ -4140,13 +4149,12 @@ node_types: occurrences: - 1 - UNBOUNDED - memory.resident_1c1_scalling_instance: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_1c1_scalling_instance_1c1_scalling_instance_t2_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_1c1_scalling_instance_1c1_t2_port: + memory.resident_1c1_scalling_instance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -4158,7 +4166,7 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_1c1_scalling_instance_1c1_t2_port: + forwarder_1c1_scalling_instance_1c1_scalling_instance_t1_port_0: type: org.openecomp.capabilities.Forwarder occurrences: - 1 @@ -4169,18 +4177,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_1c1_scalling_instance_1c1_t1_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.incoming.bytes_1c1_scalling_instance_1c1_t1_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.write.bytes.rate_1c1_scalling_instance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4193,7 +4189,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_1c1_scalling_instance_1c1_t1_port: + network.outgoing.bytes.rate_1c1_scalling_instance_1c1_scalling_instance_t1_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -4204,24 +4200,19 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.write.requests.rate_1c1_scalling_instance: + network.outgoing.bytes.rate_1c1_scalling_instance_1c1_scalling_instance_t2_port_0: 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_1c1_scalling_instance_1c1_t1_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - disk.read.bytes.rate_1c1_scalling_instance: + disk.device.write.requests.rate_1c1_scalling_instance: 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_1c1_scalling_instance_1c1_t2_port: + disk.read.bytes.rate_1c1_scalling_instance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -4238,14 +4229,6 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_1c1_scalling_instance_1c1_t2_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 disk.device.write.bytes_1c1_scalling_instance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4258,19 +4241,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_1c1_scalling_instance_1c1_t2_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 vcpus_1c1_scalling_instance: 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_1c1_scalling_instance_1c1_t1_port: + network.incoming.packets_1c1_scalling_instance_1c1_scalling_instance_t2_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -4283,33 +4260,38 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.packets.rate_1c1_scalling_instance_1c1_scalling_instance_t1_port_0: + 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_1c1_scalling_instance: 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_1c1_scalling_instance_1c1_t1_port: - type: tosca.capabilities.Node + network.incoming.packets.rate_1c1_scalling_instance_1c1_scalling_instance_t1_port_0: + 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_1c1_scalling_instance_1c1_t1_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 + feature_1c1_scalling_instance_1c1_scalling_instance_t1_port_0: + type: tosca.capabilities.Node occurrences: - - 0 + - 1 - UNBOUNDED - disk.device.read.requests.rate_1c1_scalling_instance: + network.outpoing.packets_1c1_scalling_instance_1c1_scalling_instance_t2_port_0: 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 - attachment_1c1_scalling_instance_1c1_t2_port: - type: tosca.capabilities.Attachment + disk.device.read.requests.rate_1c1_scalling_instance: + 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 @@ -4319,12 +4301,17 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_1c1_scalling_instance_1c1_t1_port: + network.incoming.bytes.rate_1c1_scalling_instance_1c1_scalling_instance_t1_port_0: 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 + attachment_1c1_scalling_instance_1c1_scalling_instance_t1_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED disk.device.iops_1c1_scalling_instance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4337,6 +4324,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes_1c1_scalling_instance_1c1_scalling_instance_t2_port_0: + 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_1c1_scalling_instance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4355,6 +4348,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes_1c1_scalling_instance_1c1_scalling_instance_t2_port_0: + 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_1c1_scalling_instance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4367,19 +4366,19 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.write.requests_1c1_scalling_instance: + network.outgoing.bytes_1c1_scalling_instance_1c1_scalling_instance_t1_port_0: 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_1c1_scalling_instance_1c1_t1_port: + network.incoming.packets_1c1_scalling_instance_1c1_scalling_instance_t1_port_0: 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_1c1_scalling_instance_1c1_t2_port: + disk.device.write.requests_1c1_scalling_instance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -4402,70 +4401,71 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_1c1_scalling_instance_1c1_t1_port: + disk.allocation_1c1_scalling_instance: 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.allocation_1c1_scalling_instance: + memory.usage_1c1_scalling_instance: 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_1c1_scalling_instance_1c1_t2_port: - type: tosca.capabilities.Node + os_1c1_scalling_instance: + type: tosca.capabilities.OperatingSystem occurrences: - 1 - UNBOUNDED - memory.usage_1c1_scalling_instance: + disk.iops_1c1_scalling_instance: 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_1c1_scalling_instance_1c1_t2_port: + network.outgoing.packets.rate_1c1_scalling_instance_1c1_scalling_instance_t2_port_0: 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_1c1_scalling_instance_1c1_t2_port: + network.outpoing.packets_1c1_scalling_instance_1c1_scalling_instance_t1_port_0: 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_1c1_scalling_instance: - type: tosca.capabilities.OperatingSystem + cpu.delta_1c1_scalling_instance: + 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.iops_1c1_scalling_instance: + memory_1c1_scalling_instance: 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_1c1_scalling_instance_1c1_t1_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_1c1_scalling_instance_1c1_scalling_instance_t2_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - attachment_1c1_scalling_instance_1c1_t1_port: - type: tosca.capabilities.Attachment + network.incoming.bytes.rate_1c1_scalling_instance_1c1_scalling_instance_t2_port_0: + 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_1c1_scalling_instance: + network.incoming.bytes_1c1_scalling_instance_1c1_scalling_instance_t1_port_0: 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_1c1_scalling_instance: + network.incoming.packets.rate_1c1_scalling_instance_1c1_scalling_instance_t2_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -5058,43 +5058,55 @@ node_types: org.openecomp.resource.abstract.nodes.b_single_1b_1: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_1b_t1_port_order: - type: integer + port_b_single_1b_t1_port_0_network_role_tag: + type: string required: true status: SUPPORTED - port_1b_t1_port_network_role: + port_b_single_1b_t1_port_0_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_b_single_1b_t2_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_1b_t1_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_b_single_1b_t1_port_0_network_role: + type: string + required: true + status: SUPPORTED + port_b_single_1b_t2_port_0_network: + type: list required: true status: SUPPORTED + entry_schema: + type: string vm_flavor_name: type: string required: true status: SUPPORTED - port_1b_t2_port_related_networks: + port_b_single_1b_t1_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_1b_t1_port_ip_requirements: + type: org.openecomp.datatypes.network.VlanRequirements + port_b_single_1b_t2_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_image_name: type: string required: true status: SUPPORTED - port_1b_t2_port_network_role: - type: string + port_b_single_1b_t2_port_0_order: + type: integer required: true status: SUPPORTED - port_1b_t2_port_order: + port_b_single_1b_t1_port_0_order: type: integer required: true status: SUPPORTED @@ -5104,34 +5116,38 @@ node_types: status: SUPPORTED entry_schema: type: string - port_1b_t2_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_1b_t2_port_network_role_tag: - type: string + port_b_single_1b_t2_port_0_vlan_requirements: + type: list required: true status: SUPPORTED - port_1b_t2_port_subnetpoolid: + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_b_single_1b_t2_port_0_network_role: type: string required: true status: SUPPORTED - port_1b_t1_port_related_networks: + port_b_single_1b_t1_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_1b_t2_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + type: org.openecomp.datatypes.network.IpRequirements + port_b_single_1b_t1_port_0_value_specs: + type: list required: true status: SUPPORTED + entry_schema: + type: json compute_b_single_1b_availability_zone: type: list required: true status: SUPPORTED entry_schema: type: string + port_b_single_1b_t1_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED index_value: type: integer description: Index value of this substitution service template runtime instance @@ -5146,54 +5162,38 @@ node_types: status: SUPPORTED entry_schema: type: json - port_1b_t2_port_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_1b_t2_port_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_1b_t1_port_value_specs: - type: list + port_b_single_1b_t1_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json - port_1b_t1_port_network_role_tag: + port_b_single_1b_t1_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_1b_t1_port_subnetpoolid: + port_b_single_1b_t2_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_1b_t1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_1b_t2_port_network: + port_b_single_1b_t1_port_0_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_1b_t1_port_vlan_requirements: + port_b_single_1b_t2_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_1b_t1_port_network: - type: list + type: org.openecomp.datatypes.network.IpRequirements + port_b_single_1b_t2_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_b_single_1b_t2_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: string compute_b_single_1b_name: type: list required: true @@ -5204,7 +5204,7 @@ node_types: b_single_1b_instance_name: type: string status: SUPPORTED - b_single_1b_1b_t1_port_tenant_id: + b_single_1b_b_single_1b_t1_port_0_tenant_id: type: string status: SUPPORTED requirements: @@ -5222,43 +5222,33 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_b_single_1b_1b_t1_port: + - dependency_b_single_1b_b_single_1b_t2_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_b_single_1b_1b_t1_port: + - link_b_single_1b_b_single_1b_t2_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_b_single_1b_1b_t2_port: + - dependency_b_single_1b_b_single_1b_t1_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_b_single_1b_1b_t2_port: + - link_b_single_1b_b_single_1b_t1_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: - attachment_b_single_1b_1b_t2_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - forwarder_b_single_1b_1b_t2_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED endpoint_b_single_1b: type: tosca.capabilities.Endpoint.Admin occurrences: @@ -5275,23 +5265,56 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_b_single_1b_1b_t2_port: + network.incoming.bytes_b_single_1b_b_single_1b_t1_port_0: 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_b_single_1b_1b_t2_port: + network.incoming.packets.rate_b_single_1b_b_single_1b_t2_port_0: 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_b_single_1b_1b_t1_port: - type: org.openecomp.capabilities.Forwarder + network.incoming.bytes_b_single_1b_b_single_1b_t2_port_0: + 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_b_single_1b_b_single_1b_t1_port_0: + 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 + feature_b_single_1b_b_single_1b_t2_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + feature_b_single_1b_b_single_1b_t1_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes.rate_b_single_1b_b_single_1b_t1_port_0: + 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_b_single_1b_b_single_1b_t2_port_0: + 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 scalable_b_single_1b: type: tosca.capabilities.Scalable occurrences: @@ -5308,6 +5331,16 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_b_single_1b_b_single_1b_t2_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + forwarder_b_single_1b_b_single_1b_t1_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED vcpus_b_single_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -5320,25 +5353,25 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.read.requests.rate_b_single_1b: + network.incoming.bytes.rate_b_single_1b_b_single_1b_t2_port_0: 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_b_single_1b_1b_t2_port: + disk.device.read.requests.rate_b_single_1b: 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 - instance_b_single_1b: + network.incoming.packets.rate_b_single_1b_b_single_1b_t1_port_0: 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_b_single_1b_1b_t1_port: + instance_b_single_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -5362,49 +5395,43 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_b_single_1b_1b_t1_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.device.allocation_b_single_1b: 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.packets.rate_b_single_1b_1b_t2_port: + network.outgoing.packets.rate_b_single_1b_b_single_1b_t2_port_0: 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_b_single_1b: + network.outpoing.packets_b_single_1b_b_single_1b_t1_port_0: 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_b_single_1b: + network.outgoing.bytes_b_single_1b_b_single_1b_t2_port_0: 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_b_single_1b_1b_t2_port: + disk.device.capacity_b_single_1b: 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_b_single_1b_1b_t1_port: + disk.latency_b_single_1b: 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 - attachment_b_single_1b_1b_t1_port: + attachment_b_single_1b_b_single_1b_t1_port_0: type: tosca.capabilities.Attachment occurrences: - 1 @@ -5415,14 +5442,6 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_b_single_1b_1b_t2_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 disk.ephemeral.size_b_single_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -5435,25 +5454,25 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_b_single_1b_1b_t2_port: + disk.device.iops_b_single_1b: 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.iops_b_single_1b: + disk.read.requests_b_single_1b: 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_b_single_1b: + memory.resident_b_single_1b: 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_b_single_1b: + network.outgoing.bytes.rate_b_single_1b_b_single_1b_t2_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -5465,12 +5484,13 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_b_single_1b_1b_t1_port: - type: tosca.capabilities.Node + network.incoming.packets_b_single_1b_b_single_1b_t1_port_0: + 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_b_single_1b_1b_t2_port: + network.outgoing.bytes.rate_b_single_1b_b_single_1b_t1_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -5512,7 +5532,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_b_single_1b_1b_t1_port: + network.incoming.packets_b_single_1b_b_single_1b_t2_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -5530,63 +5550,48 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_b_single_1b_1b_t1_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.device.read.requests_b_single_1b: 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_b_single_1b_1b_t1_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_b_single_1b_b_single_1b_t2_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - binding_b_single_1b_1b_t1_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 - network.outpoing.packets_b_single_1b_1b_t1_port: + disk.device.write.requests.rate_b_single_1b: 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_b_single_1b: + network.outgoing.packets.rate_b_single_1b_b_single_1b_t1_port_0: 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_b_single_1b: + network.outpoing.packets_b_single_1b_b_single_1b_t2_port_0: 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_b_single_1b: + memory.usage_b_single_1b: 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_b_single_1b_1b_t2_port: + network.outgoing.bytes_b_single_1b_b_single_1b_t1_port_0: 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_b_single_1b_1b_t1_port: + disk.write.bytes.rate_b_single_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -5627,9 +5632,4 @@ node_types: type: tosca.capabilities.network.Bindable occurrences: - 1 - - UNBOUNDED - feature_b_single_1b_1b_t2_port: - type: tosca.capabilities.Node - 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/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 76b05fba29..a29747f664 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 @@ -216,30 +216,26 @@ topology_template: directives: - substitutable properties: + port_b_single_1b_t2_port_0_network: + - b_single_1b_network vm_flavor_name: get_input: pd_flavor_name - port_1b_t1_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false vm_image_name: get_input: pd_image_name compute_b_single_1b_user_data_format: - RAW - port_1b_t2_port_mac_requirements: - mac_count_required: + port_b_single_1b_t1_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: is_required: false compute_b_single_1b_availability_zone: - get_input: availabilityzone_name compute_b_single_1b_scheduler_hints: - group: BE_Affinity_group - port_1b_t2_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: + port_b_single_1b_t1_port_0_mac_requirements: + mac_count_required: is_required: false compute_b_single_1b_metadata: - connectivityTo4PNested: @@ -261,16 +257,20 @@ topology_template: connectivityTo1C1_T1_1: get_attribute: - abstract_1c1_scalling_instance - - 1c1_scalling_instance_1c1_t1_port_tenant_id + - 1c1_scalling_instance_1c1_scalling_instance_t1_port_0_tenant_id connectivityTo1C1_T1_0: get_attribute: - abstract_1c1_scalling_instance - - 1c1_scalling_instance_1c1_t1_port_tenant_id - port_1b_t1_port_mac_requirements: + - 1c1_scalling_instance_1c1_scalling_instance_t1_port_0_tenant_id + port_b_single_1b_t2_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_b_single_1b_t2_port_0_mac_requirements: mac_count_required: is_required: false - port_1b_t2_port_network: - - b_single_1b_network compute_b_single_1b_name: - get_input: - b_single_1b_names @@ -284,7 +284,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_b_single_1b_1b_t2_port: + - link_b_single_1b_b_single_1b_t2_port_0: capability: tosca.capabilities.network.Linkable node: b_single_1b_network relationship: tosca.relationships.network.LinksTo @@ -296,31 +296,7 @@ topology_template: compute_1c1_scalling_instance_user_data_format: - RAW2 - RAW1 - port_1c1_t2_port_network_role_tag: ppds - vm_flavor_name: - get_input: pd_flavor_name - port_1c1_t1_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false - vm_image_name: - get_input: pd_image_name - compute_1c1_scalling_instance_name: - - get_input: - - 1c1_scalling_instance_names - - 2 - - get_input: - - 1c1_scalling_instance_names - - 1 - port_1c1_t1_port_name: - - 1c1_t1_port_1 - - 1c1_t1_port_0 - port_1c1_t1_port_network: - - 1c1_scalling_instance_network - - 1c1_scalling_instance_network - port_1c1_t2_port_fixed_ips: + port_1c1_scalling_instance_t1_port_0_fixed_ips: - - ip_address: get_input: - myIPs @@ -329,10 +305,12 @@ topology_template: get_input: - myIPs - 1 - port_1c1_t2_port_network: - - get_input: ppds_net_name - - get_input: ppds_net_name - port_1c1_t1_port_fixed_ips: + port_1c1_scalling_instance_t1_port_0_network: + - 1c1_scalling_instance_network + - 1c1_scalling_instance_network + vm_flavor_name: + get_input: pd_flavor_name + port_1c1_scalling_instance_t2_port_0_fixed_ips: - - ip_address: get_input: - myIPs @@ -341,24 +319,42 @@ topology_template: get_input: - myIPs - 1 - port_1c1_t2_port_ip_requirements: + port_1c1_scalling_instance_t1_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false - port_1c1_t1_port_mac_requirements: + port_1c1_scalling_instance_t2_port_0_mac_requirements: mac_count_required: is_required: false - port_1c1_t2_port_mac_requirements: + vm_image_name: + get_input: pd_image_name + compute_1c1_scalling_instance_name: + - get_input: + - 1c1_scalling_instance_names + - 2 + - get_input: + - 1c1_scalling_instance_names + - 1 + port_1c1_scalling_instance_t1_port_0_mac_requirements: mac_count_required: is_required: false + port_1c1_scalling_instance_t1_port_0_name: + - 1c1_scalling_instance_1_t1_port_0 + - 1c1_scalling_instance_0_t1_port_0 compute_1c1_scalling_instance_availability_zone: - get_input: availabilityzone_name - get_input: availabilityzone_name - port_1c1_t2_port_name: - - 1c1_t2_port_1 - - 1c1_t2_port_0 + port_1c1_scalling_instance_t2_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + port_1c1_scalling_instance_t2_port_0_name: + - 1c1_scalling_instance_1_t2_port_0 + - 1c1_scalling_instance_0_t2_port_0 compute_1c1_scalling_instance_scheduler_hints: - group: BE_Affinity_group - group: BE_Affinity_group @@ -392,6 +388,10 @@ topology_template: get_attribute: - abstract_b_single_1b - b_single_1b_instance_name + port_1c1_scalling_instance_t2_port_0_network_role_tag: ppds + port_1c1_scalling_instance_t2_port_0_network: + - get_input: ppds_net_name + - get_input: ppds_net_name service_template_filter: substitute_service_template: Nested_1c1_scalling_instanceServiceTemplate.yaml count: 2 @@ -401,7 +401,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_1c1_scalling_instance_1c1_t1_port: + - link_1c1_scalling_instance_1c1_scalling_instance_t1_port_0: capability: tosca.capabilities.network.Linkable node: 1c1_scalling_instance_network relationship: tosca.relationships.network.LinksTo @@ -448,11 +448,11 @@ topology_template: - instance_name connectivityTo1C1_T2_1: get_attribute: - - 1c1_t2_port_1 + - 1c1_scalling_instance_1_t2_port_0 - tenant_id connectivityTo1C1_T2_0: get_attribute: - - 1c1_t2_port_0 + - 1c1_scalling_instance_0_t2_port_0 - tenant_id pcm_image_name: get_input: pcm_image_name @@ -490,23 +490,28 @@ topology_template: directives: - substitutable properties: + port_1c2_catalog_instance_t1_port_0_network: + - get_input: oam_net_name compute_1c2_catalog_instance_availability_zone: - get_input: availabilityzone_name - vm_flavor_name: - get_input: pd_flavor_name - vm_image_name: - get_input: pd_image_name - port_1c2_t2_port_ip_requirements: + port_1c2_catalog_instance_t1_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_1c2_t1_port_mac_requirements: + vm_flavor_name: + get_input: pd_flavor_name + port_1c2_catalog_instance_t2_port_0_network: + - 1c2_catalog_instance_network + vm_image_name: + get_input: pd_image_name + port_1c2_catalog_instance_t1_port_0_mac_requirements: + mac_count_required: + is_required: false + port_1c2_catalog_instance_t2_port_0_mac_requirements: mac_count_required: is_required: false - port_1c2_t2_port_network: - - 1c2_catalog_instance_network compute_1c2_catalog_instance_metadata: - connectivityTo4PNested: get_attribute: @@ -531,29 +536,24 @@ topology_template: connectivityTo1C1_T2_1: get_attribute: - abstract_1c1_scalling_instance - - 1c1_scalling_instance_1c1_t2_port_tenant_id + - 1c1_scalling_instance_1c1_scalling_instance_t2_port_0_tenant_id connectivityTo1C1_T2_0: get_attribute: - abstract_1c1_scalling_instance - - 1c1_scalling_instance_1c1_t2_port_tenant_id + - 1c1_scalling_instance_1c1_scalling_instance_t2_port_0_tenant_id compute_1c2_catalog_instance_name: - get_input: - 1c2_catalog_instance_names - 1 - port_1c2_t1_port_network: - - get_input: oam_net_name - port_1c2_t2_port_mac_requirements: - mac_count_required: - is_required: false - compute_1c2_catalog_instance_user_data_format: - - RAW1 - port_1c2_t1_port_network_role_tag: oam - port_1c2_t1_port_ip_requirements: + port_1c2_catalog_instance_t2_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false + compute_1c2_catalog_instance_user_data_format: + - RAW1 + port_1c2_catalog_instance_t1_port_0_network_role_tag: oam compute_1c2_catalog_instance_scheduler_hints: - group: BE_Affinity_group service_template_filter: @@ -565,7 +565,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_1c2_catalog_instance_1c2_t2_port: + - link_1c2_catalog_instance_1c2_catalog_instance_t2_port_0: capability: tosca.capabilities.network.Linkable node: 1c2_catalog_instance_network relationship: tosca.relationships.network.LinksTo @@ -574,43 +574,43 @@ topology_template: directives: - substitutable properties: + port_1c2_catalog_instance_t1_port_0_network: + - get_input: oam_net_name compute_1c2_catalog_instance_availability_zone: - get_input: availabilityzone_name - vm_flavor_name: - get_input: pd_flavor_name - vm_image_name: - get_input: pd_image_name - port_1c2_t2_port_ip_requirements: + port_1c2_catalog_instance_t1_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_1c2_t1_port_mac_requirements: + vm_flavor_name: + get_input: pd_flavor_name + port_1c2_catalog_instance_t2_port_0_network: + - 1c2_catalog_instance_network + vm_image_name: + get_input: pd_image_name + port_1c2_catalog_instance_t1_port_0_mac_requirements: + mac_count_required: + is_required: false + port_1c2_catalog_instance_t2_port_0_mac_requirements: mac_count_required: is_required: false - port_1c2_t2_port_network: - - 1c2_catalog_instance_network compute_1c2_catalog_instance_name: - get_input: - 1c2_catalog_instance_names - 2 - port_1c2_t1_port_network: - - get_input: oam_net_name - port_1c2_t2_port_mac_requirements: - mac_count_required: - is_required: false - compute_1c2_catalog_instance_user_data_format: - - get_attribute: - - abstract_1c2_catalog_instance_0 - - 1c2_catalog_instance_instance_name - port_1c2_t1_port_network_role_tag: oam - port_1c2_t1_port_ip_requirements: + port_1c2_catalog_instance_t2_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false + compute_1c2_catalog_instance_user_data_format: + - get_attribute: + - abstract_1c2_catalog_instance_0 + - 1c2_catalog_instance_instance_name + port_1c2_catalog_instance_t1_port_0_network_role_tag: oam compute_1c2_catalog_instance_scheduler_hints: - group: BE_Affinity_group service_template_filter: @@ -622,7 +622,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_1c2_catalog_instance_1c2_t2_port: + - link_1c2_catalog_instance_1c2_catalog_instance_t2_port_0: capability: tosca.capabilities.network.Linkable node: 1c2_catalog_instance_network relationship: tosca.relationships.network.LinksTo @@ -637,10 +637,10 @@ topology_template: dhcp_agent_ids: get_attribute: - abstract_1c2_catalog_instance_1 - - 1c2_catalog_instance_1c2_t1_port_tenant_id + - 1c2_catalog_instance_1c2_catalog_instance_t1_port_0_tenant_id - get_attribute: - abstract_1c2_catalog_instance_0 - - 1c2_catalog_instance_1c2_t1_port_tenant_id + - 1c2_catalog_instance_1c2_catalog_instance_t1_port_0_tenant_id - get_attribute: - abstract_1c2_catalog_instance_0 - 1c2_catalog_instance_instance_name @@ -656,10 +656,10 @@ topology_template: - 1c1_scalling_instance_instance_name - get_attribute: - abstract_1c1_scalling_instance - - 1c1_scalling_instance_1c1_t2_port_tenant_id + - 1c1_scalling_instance_1c1_scalling_instance_t2_port_0_tenant_id - get_attribute: - abstract_1c1_scalling_instance - - 1c1_scalling_instance_1c1_t2_port_tenant_id + - 1c1_scalling_instance_1c1_scalling_instance_t2_port_0_tenant_id admin_state_up: get_attribute: - abstract_a_single_1a @@ -684,10 +684,10 @@ topology_template: - b_single_1b_instance_name - get_attribute: - abstract_b_single_1b - - b_single_1b_1b_t1_port_tenant_id + - b_single_1b_b_single_1b_t1_port_0_tenant_id - get_attribute: - abstract_b_single_1b_1 - - b_single_1b_1b_t1_port_tenant_id + - b_single_1b_b_single_1b_t1_port_0_tenant_id dependsOn_network: type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net properties: @@ -695,11 +695,11 @@ topology_template: get_input: net_name requirements: - dependency: - capability: feature_1c2_catalog_instance_1c2_t1_port + capability: feature_1c2_catalog_instance_1c2_catalog_instance_t1_port_0 node: abstract_1c2_catalog_instance_1 relationship: tosca.relationships.DependsOn - dependency: - capability: feature_1c2_catalog_instance_1c2_t1_port + capability: feature_1c2_catalog_instance_1c2_catalog_instance_t1_port_0 node: abstract_1c2_catalog_instance_0 relationship: tosca.relationships.DependsOn - dependency: @@ -715,7 +715,7 @@ topology_template: node: abstract_1c1_scalling_instance relationship: tosca.relationships.DependsOn - dependency: - capability: feature_1c1_scalling_instance_1c1_t2_port + capability: feature_1c1_scalling_instance_1c1_scalling_instance_t2_port_0 node: abstract_1c1_scalling_instance relationship: tosca.relationships.DependsOn - dependency: @@ -727,11 +727,11 @@ topology_template: node: abstract_b_single_1b_1 relationship: tosca.relationships.DependsOn - dependency: - capability: feature_b_single_1b_1b_t1_port + capability: feature_b_single_1b_b_single_1b_t1_port_0 node: abstract_b_single_1b relationship: tosca.relationships.DependsOn - dependency: - capability: feature_b_single_1b_1b_t1_port + capability: feature_b_single_1b_b_single_1b_t1_port_0 node: abstract_b_single_1b_1 relationship: tosca.relationships.DependsOn - dependency: @@ -778,11 +778,11 @@ topology_template: connectivityTo1C1_T2_1: get_attribute: - abstract_1c1_scalling_instance - - 1c1_scalling_instance_1c1_t2_port_tenant_id + - 1c1_scalling_instance_1c1_scalling_instance_t2_port_0_tenant_id connectivityTo1C1_T2_0: get_attribute: - abstract_1c1_scalling_instance - - 1c1_scalling_instance_1c1_t2_port_tenant_id + - 1c1_scalling_instance_1c1_scalling_instance_t2_port_0_tenant_id port_1a_t1_port_ip_requirements: - ip_version: 4 ip_count_required: @@ -870,11 +870,11 @@ topology_template: connectivityTo1C1_T2_1: get_attribute: - abstract_1c1_scalling_instance - - 1c1_scalling_instance_1c1_t2_port_tenant_id + - 1c1_scalling_instance_1c1_scalling_instance_t2_port_0_tenant_id connectivityTo1C1_T2_0: get_attribute: - abstract_1c1_scalling_instance - - 1c1_scalling_instance_1c1_t2_port_tenant_id + - 1c1_scalling_instance_1c1_scalling_instance_t2_port_0_tenant_id pcm_image_name: get_input: pcm_image_name security_group_name: jsa_security_group @@ -998,43 +998,43 @@ topology_template: directives: - substitutable properties: + port_b_single_1b_t1_port_0_network_role_tag: oam + port_b_single_1b_t2_port_0_network: + - b_single_1b_network vm_flavor_name: get_input: pd_flavor_name - port_1b_t1_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false vm_image_name: get_input: pd_image_name compute_b_single_1b_user_data_format: - RAW - port_1b_t2_port_mac_requirements: - mac_count_required: + port_b_single_1b_t1_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: is_required: false + port_b_single_1b_t1_port_0_value_specs: + - get_attribute: + - abstract_a_single_1a + - a_single_1a_1a_t1_port_tenant_id compute_b_single_1b_availability_zone: - get_input: availabilityzone_name compute_b_single_1b_scheduler_hints: - group: BE_Affinity_group - port_1b_t2_port_ip_requirements: + port_b_single_1b_t1_port_0_mac_requirements: + mac_count_required: + is_required: false + port_b_single_1b_t1_port_0_network: + - get_input: oam_net_name + port_b_single_1b_t2_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_1b_t1_port_value_specs: - - get_attribute: - - abstract_a_single_1a - - a_single_1a_1a_t1_port_tenant_id - port_1b_t1_port_network_role_tag: oam - port_1b_t1_port_mac_requirements: + port_b_single_1b_t2_port_0_mac_requirements: mac_count_required: is_required: false - port_1b_t2_port_network: - - b_single_1b_network - port_1b_t1_port_network: - - get_input: oam_net_name compute_b_single_1b_name: - get_input: - b_single_1b_names @@ -1048,7 +1048,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_b_single_1b_1b_t2_port: + - link_b_single_1b_b_single_1b_t2_port_0: capability: tosca.capabilities.network.Linkable node: b_single_1b_network relationship: tosca.relationships.network.LinksTo @@ -1099,10 +1099,10 @@ topology_template: value: get_attribute: - abstract_1c2_catalog_instance_1 - - 1c2_catalog_instance_1c2_t1_port_tenant_id + - 1c2_catalog_instance_1c2_catalog_instance_t1_port_0_tenant_id - get_attribute: - abstract_1c2_catalog_instance_0 - - 1c2_catalog_instance_1c2_t1_port_tenant_id + - 1c2_catalog_instance_1c2_catalog_instance_t1_port_0_tenant_id - get_attribute: - abstract_1c2_catalog_instance_0 - 1c2_catalog_instance_instance_name @@ -1119,10 +1119,10 @@ topology_template: - 1c1_scalling_instance_instance_name - get_attribute: - abstract_1c1_scalling_instance - - 1c1_scalling_instance_1c1_t2_port_tenant_id + - 1c1_scalling_instance_1c1_scalling_instance_t2_port_0_tenant_id - get_attribute: - abstract_1c1_scalling_instance - - 1c1_scalling_instance_1c1_t2_port_tenant_id + - 1c1_scalling_instance_1c1_scalling_instance_t2_port_0_tenant_id out4: value: get_attribute: @@ -1133,10 +1133,10 @@ topology_template: - b_single_1b_instance_name - get_attribute: - abstract_b_single_1b - - b_single_1b_1b_t1_port_tenant_id + - b_single_1b_b_single_1b_t1_port_0_tenant_id - get_attribute: - abstract_b_single_1b_1 - - b_single_1b_1b_t1_port_tenant_id + - b_single_1b_b_single_1b_t1_port_0_tenant_id out5: value: get_attribute: 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_1c1_scalling_instanceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c1_scalling_instanceServiceTemplate.yaml index 03cc64cfd6..c0e8f0f023 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c1_scalling_instanceServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c1_scalling_instanceServiceTemplate.yaml @@ -11,86 +11,71 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_1c1_t1_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_1c1_t2_port_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements compute_1c1_scalling_instance_user_data_format: type: list required: true entry_schema: type: string - port_1c1_t2_port_related_networks: + port_1c1_scalling_instance_t1_port_0_fixed_ips: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_1c1_t2_port_network_role_tag: - type: string - required: true - vm_flavor_name: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_1c1_scalling_instance_t1_port_0_network_role_tag: type: string required: true - port_1c1_t1_port_related_networks: + port_1c1_scalling_instance_t2_port_0_related_networks: type: list required: true entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_1c1_t1_port_ip_requirements: + port_1c1_scalling_instance_t1_port_0_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - vm_image_name: + type: string + vm_flavor_name: type: string required: true - compute_1c1_scalling_instance_name: + port_1c1_scalling_instance_t2_port_0_fixed_ips: type: list required: true entry_schema: - type: string - port_1c1_t1_port_name: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_1c1_scalling_instance_t1_port_0_ip_requirements: type: list required: true entry_schema: - type: string - port_1c1_t1_port_network: - type: list + type: org.openecomp.datatypes.network.IpRequirements + port_1c1_scalling_instance_t1_port_0_network_role: + type: string required: true - entry_schema: - type: string - port_1c1_t2_port_fixed_ips: - type: list + port_1c1_scalling_instance_t2_port_0_subnetpoolid: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_1c1_t2_port_network: - type: list + port_1c1_scalling_instance_t2_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: string - port_1c1_t1_port_fixed_ips: - type: list + vm_image_name: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_1c1_t1_port_vlan_requirements: + compute_1c1_scalling_instance_name: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_1c1_t2_port_ip_requirements: - type: list + type: string + port_1c1_scalling_instance_t2_port_0_network_role: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_1c1_t1_port_mac_requirements: + port_1c1_scalling_instance_t1_port_0_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true + port_1c1_scalling_instance_t1_port_0_subnetpoolid: + type: string + required: true + port_1c1_scalling_instance_t2_port_0_order: + type: integer + required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -98,87 +83,102 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_1c1_t2_port_network_role: - type: string - required: true - port_1c1_t2_port_order: + port_1c1_scalling_instance_t1_port_0_order: type: integer required: true - port_1c1_t2_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_1c1_scalling_instance_t2_port_0_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_1c1_scalling_instance_t1_port_0_name: + type: list required: true + entry_schema: + type: string compute_1c1_scalling_instance_availability_zone: type: list required: true entry_schema: type: string - port_1c1_t2_port_subnetpoolid: - type: string + port_1c1_scalling_instance_t2_port_0_ip_requirements: + type: list required: true - port_1c1_t2_port_name: + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_1c1_scalling_instance_t2_port_0_name: type: list required: true entry_schema: type: string + port_1c1_scalling_instance_t2_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_1c1_scalling_instance_t1_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true compute_1c1_scalling_instance_scheduler_hints: type: list required: true entry_schema: type: json - port_1c1_t2_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_1c1_scalling_instance_t1_port_0_vlan_requirements: + type: list required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements compute_1c1_scalling_instance_metadata: type: list required: true entry_schema: type: json - port_1c1_t1_port_subnetpoolid: + port_1c1_scalling_instance_t2_port_0_network_role_tag: type: string required: true - port_1c1_t1_port_network_role_tag: - type: string - required: true - port_1c1_t1_port_network_role: - type: string + port_1c1_scalling_instance_t1_port_0_related_networks: + type: list required: true - port_1c1_t1_port_order: - type: integer + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_1c1_scalling_instance_t2_port_0_network: + type: list required: true + entry_schema: + type: string node_templates: - 1c1_scalling_instance_1c1_t1_port: + 1c1_scalling_instance_1c1_scalling_instance_t2_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_requirements: - get_input: port_1c1_t1_port_mac_requirements + get_input: port_1c1_scalling_instance_t2_port_0_mac_requirements order: - get_input: port_1c1_t1_port_order + get_input: port_1c1_scalling_instance_t2_port_0_order exCP_naming: - get_input: port_1c1_t1_port_exCP_naming + get_input: port_1c1_scalling_instance_t2_port_0_exCP_naming vlan_requirements: - get_input: port_1c1_t1_port_vlan_requirements + get_input: port_1c1_scalling_instance_t2_port_0_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_1c1_t1_port_ip_requirements + get_input: port_1c1_scalling_instance_t2_port_0_ip_requirements related_networks: - get_input: port_1c1_t1_port_related_networks + get_input: port_1c1_scalling_instance_t2_port_0_related_networks network_role_tag: - get_input: port_1c1_t1_port_network_role_tag + get_input: port_1c1_scalling_instance_t2_port_0_network_role_tag network_role: - get_input: port_1c1_t1_port_network_role + get_input: port_1c1_scalling_instance_t2_port_0_network_role fixed_ips: get_input: - - port_1c1_t1_port_fixed_ips + - port_1c1_scalling_instance_t2_port_0_fixed_ips - index_value subnetpoolid: - get_input: port_1c1_t1_port_subnetpoolid + get_input: port_1c1_scalling_instance_t2_port_0_subnetpoolid name: get_input: - - port_1c1_t1_port_name + - port_1c1_scalling_instance_t2_port_0_name - index_value network: get_input: - - port_1c1_t1_port_network + - port_1c1_scalling_instance_t2_port_0_network - index_value requirements: - binding: @@ -212,39 +212,39 @@ topology_template: get_input: - compute_1c1_scalling_instance_user_data_format - index_value - 1c1_scalling_instance_1c1_t2_port: + 1c1_scalling_instance_1c1_scalling_instance_t1_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_requirements: - get_input: port_1c1_t2_port_mac_requirements + get_input: port_1c1_scalling_instance_t1_port_0_mac_requirements order: - get_input: port_1c1_t2_port_order + get_input: port_1c1_scalling_instance_t1_port_0_order exCP_naming: - get_input: port_1c1_t2_port_exCP_naming + get_input: port_1c1_scalling_instance_t1_port_0_exCP_naming vlan_requirements: - get_input: port_1c1_t2_port_vlan_requirements + get_input: port_1c1_scalling_instance_t1_port_0_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_1c1_t2_port_ip_requirements + get_input: port_1c1_scalling_instance_t1_port_0_ip_requirements related_networks: - get_input: port_1c1_t2_port_related_networks + get_input: port_1c1_scalling_instance_t1_port_0_related_networks network_role_tag: - get_input: port_1c1_t2_port_network_role_tag + get_input: port_1c1_scalling_instance_t1_port_0_network_role_tag network_role: - get_input: port_1c1_t2_port_network_role + get_input: port_1c1_scalling_instance_t1_port_0_network_role fixed_ips: get_input: - - port_1c1_t2_port_fixed_ips + - port_1c1_scalling_instance_t1_port_0_fixed_ips - index_value subnetpoolid: - get_input: port_1c1_t2_port_subnetpoolid + get_input: port_1c1_scalling_instance_t1_port_0_subnetpoolid name: get_input: - - port_1c1_t2_port_name + - port_1c1_scalling_instance_t1_port_0_name - index_value network: get_input: - - port_1c1_t2_port_network + - port_1c1_scalling_instance_t1_port_0_network - index_value requirements: - binding: @@ -252,23 +252,23 @@ topology_template: node: 1c1_scalling_instance relationship: tosca.relationships.network.BindsTo outputs: - 1c1_scalling_instance_1c1_t1_port_tenant_id: - type: string - value: - get_attribute: - - 1c1_scalling_instance_1c1_t1_port - - tenant_id 1c1_scalling_instance_instance_name: type: string value: get_attribute: - 1c1_scalling_instance - instance_name - 1c1_scalling_instance_1c1_t2_port_tenant_id: + 1c1_scalling_instance_1c1_scalling_instance_t1_port_0_tenant_id: + type: string + value: + get_attribute: + - 1c1_scalling_instance_1c1_scalling_instance_t1_port_0 + - tenant_id + 1c1_scalling_instance_1c1_scalling_instance_t2_port_0_tenant_id: type: string value: get_attribute: - - 1c1_scalling_instance_1c1_t2_port + - 1c1_scalling_instance_1c1_scalling_instance_t2_port_0 - tenant_id substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.1c1_scalling_instance @@ -288,114 +288,111 @@ topology_template: disk.read.bytes_1c1_scalling_instance: - 1c1_scalling_instance - disk.read.bytes - network.outgoing.packets.rate_1c1_scalling_instance_1c1_t2_port: - - 1c1_scalling_instance_1c1_t2_port - - network.outgoing.packets.rate - network.incoming.packets.rate_1c1_scalling_instance_1c1_t2_port: - - 1c1_scalling_instance_1c1_t2_port - - network.incoming.packets.rate + attachment_1c1_scalling_instance_1c1_scalling_instance_t2_port_0: + - 1c1_scalling_instance_1c1_scalling_instance_t2_port_0 + - attachment + binding_1c1_scalling_instance_1c1_scalling_instance_t1_port_0: + - 1c1_scalling_instance_1c1_scalling_instance_t1_port_0 + - binding + binding_1c1_scalling_instance_1c1_scalling_instance_t2_port_0: + - 1c1_scalling_instance_1c1_scalling_instance_t2_port_0 + - binding disk.usage_1c1_scalling_instance: - 1c1_scalling_instance - disk.usage + forwarder_1c1_scalling_instance_1c1_scalling_instance_t2_port_0: + - 1c1_scalling_instance_1c1_scalling_instance_t2_port_0 + - forwarder memory.resident_1c1_scalling_instance: - 1c1_scalling_instance - memory.resident - network.incoming.bytes.rate_1c1_scalling_instance_1c1_t2_port: - - 1c1_scalling_instance_1c1_t2_port - - network.incoming.bytes.rate cpu_1c1_scalling_instance: - 1c1_scalling_instance - cpu - forwarder_1c1_scalling_instance_1c1_t2_port: - - 1c1_scalling_instance_1c1_t2_port + forwarder_1c1_scalling_instance_1c1_scalling_instance_t1_port_0: + - 1c1_scalling_instance_1c1_scalling_instance_t1_port_0 - forwarder disk.write.bytes_1c1_scalling_instance: - 1c1_scalling_instance - disk.write.bytes - network.incoming.packets.rate_1c1_scalling_instance_1c1_t1_port: - - 1c1_scalling_instance_1c1_t1_port - - network.incoming.packets.rate - network.incoming.bytes_1c1_scalling_instance_1c1_t1_port: - - 1c1_scalling_instance_1c1_t1_port - - network.incoming.bytes disk.write.bytes.rate_1c1_scalling_instance: - 1c1_scalling_instance - disk.write.bytes.rate disk.device.allocation_1c1_scalling_instance: - 1c1_scalling_instance - disk.device.allocation - network.incoming.bytes.rate_1c1_scalling_instance_1c1_t1_port: - - 1c1_scalling_instance_1c1_t1_port - - network.incoming.bytes.rate + network.outgoing.bytes.rate_1c1_scalling_instance_1c1_scalling_instance_t1_port_0: + - 1c1_scalling_instance_1c1_scalling_instance_t1_port_0 + - network.outgoing.bytes.rate feature_1c1_scalling_instance: - 1c1_scalling_instance - feature + network.outgoing.bytes.rate_1c1_scalling_instance_1c1_scalling_instance_t2_port_0: + - 1c1_scalling_instance_1c1_scalling_instance_t2_port_0 + - network.outgoing.bytes.rate disk.device.write.requests.rate_1c1_scalling_instance: - 1c1_scalling_instance - disk.device.write.requests.rate - forwarder_1c1_scalling_instance_1c1_t1_port: - - 1c1_scalling_instance_1c1_t1_port - - forwarder disk.read.bytes.rate_1c1_scalling_instance: - 1c1_scalling_instance - disk.read.bytes.rate - network.outpoing.packets_1c1_scalling_instance_1c1_t2_port: - - 1c1_scalling_instance_1c1_t2_port - - network.outpoing.packets scalable_1c1_scalling_instance: - 1c1_scalling_instance - scalable disk.device.read.bytes_1c1_scalling_instance: - 1c1_scalling_instance - disk.device.read.bytes - binding_1c1_scalling_instance_1c1_t2_port: - - 1c1_scalling_instance_1c1_t2_port - - binding disk.device.write.bytes_1c1_scalling_instance: - 1c1_scalling_instance - disk.device.write.bytes disk.read.requests_1c1_scalling_instance: - 1c1_scalling_instance - disk.read.requests - network.incoming.packets_1c1_scalling_instance_1c1_t2_port: - - 1c1_scalling_instance_1c1_t2_port - - network.incoming.packets vcpus_1c1_scalling_instance: - 1c1_scalling_instance - vcpus - network.outgoing.bytes_1c1_scalling_instance_1c1_t1_port: - - 1c1_scalling_instance_1c1_t1_port - - network.outgoing.bytes + network.incoming.packets_1c1_scalling_instance_1c1_scalling_instance_t2_port_0: + - 1c1_scalling_instance_1c1_scalling_instance_t2_port_0 + - network.incoming.packets host_1c1_scalling_instance: - 1c1_scalling_instance - host + network.outgoing.packets.rate_1c1_scalling_instance_1c1_scalling_instance_t1_port_0: + - 1c1_scalling_instance_1c1_scalling_instance_t1_port_0 + - network.outgoing.packets.rate disk.write.requests_1c1_scalling_instance: - 1c1_scalling_instance - disk.write.requests - feature_1c1_scalling_instance_1c1_t1_port: - - 1c1_scalling_instance_1c1_t1_port + network.incoming.packets.rate_1c1_scalling_instance_1c1_scalling_instance_t1_port_0: + - 1c1_scalling_instance_1c1_scalling_instance_t1_port_0 + - network.incoming.packets.rate + feature_1c1_scalling_instance_1c1_scalling_instance_t1_port_0: + - 1c1_scalling_instance_1c1_scalling_instance_t1_port_0 - feature - binding_1c1_scalling_instance_1c1_t1_port: - - 1c1_scalling_instance_1c1_t1_port - - binding + network.outpoing.packets_1c1_scalling_instance_1c1_scalling_instance_t2_port_0: + - 1c1_scalling_instance_1c1_scalling_instance_t2_port_0 + - network.outpoing.packets disk.device.read.requests.rate_1c1_scalling_instance: - 1c1_scalling_instance - disk.device.read.requests.rate - attachment_1c1_scalling_instance_1c1_t2_port: - - 1c1_scalling_instance_1c1_t2_port - - attachment disk.device.read.bytes.rate_1c1_scalling_instance: - 1c1_scalling_instance - disk.device.read.bytes.rate - network.outgoing.packets.rate_1c1_scalling_instance_1c1_t1_port: - - 1c1_scalling_instance_1c1_t1_port - - network.outgoing.packets.rate + network.incoming.bytes.rate_1c1_scalling_instance_1c1_scalling_instance_t1_port_0: + - 1c1_scalling_instance_1c1_scalling_instance_t1_port_0 + - network.incoming.bytes.rate + attachment_1c1_scalling_instance_1c1_scalling_instance_t1_port_0: + - 1c1_scalling_instance_1c1_scalling_instance_t1_port_0 + - attachment disk.device.iops_1c1_scalling_instance: - 1c1_scalling_instance - disk.device.iops disk.device.capacity_1c1_scalling_instance: - 1c1_scalling_instance - disk.device.capacity + network.incoming.bytes_1c1_scalling_instance_1c1_scalling_instance_t2_port_0: + - 1c1_scalling_instance_1c1_scalling_instance_t2_port_0 + - network.incoming.bytes disk.capacity_1c1_scalling_instance: - 1c1_scalling_instance - disk.capacity @@ -405,21 +402,24 @@ topology_template: cpu_util_1c1_scalling_instance: - 1c1_scalling_instance - cpu_util + network.outgoing.bytes_1c1_scalling_instance_1c1_scalling_instance_t2_port_0: + - 1c1_scalling_instance_1c1_scalling_instance_t2_port_0 + - network.outgoing.bytes disk.device.read.requests_1c1_scalling_instance: - 1c1_scalling_instance - disk.device.read.requests disk.device.write.bytes.rate_1c1_scalling_instance: - 1c1_scalling_instance - disk.device.write.bytes.rate + network.outgoing.bytes_1c1_scalling_instance_1c1_scalling_instance_t1_port_0: + - 1c1_scalling_instance_1c1_scalling_instance_t1_port_0 + - network.outgoing.bytes + network.incoming.packets_1c1_scalling_instance_1c1_scalling_instance_t1_port_0: + - 1c1_scalling_instance_1c1_scalling_instance_t1_port_0 + - network.incoming.packets disk.device.write.requests_1c1_scalling_instance: - 1c1_scalling_instance - disk.device.write.requests - network.outgoing.bytes.rate_1c1_scalling_instance_1c1_t1_port: - - 1c1_scalling_instance_1c1_t1_port - - network.outgoing.bytes.rate - network.outgoing.bytes_1c1_scalling_instance_1c1_t2_port: - - 1c1_scalling_instance_1c1_t2_port - - network.outgoing.bytes disk.latency_1c1_scalling_instance: - 1c1_scalling_instance - disk.latency @@ -429,42 +429,42 @@ topology_template: disk.device.usage_1c1_scalling_instance: - 1c1_scalling_instance - disk.device.usage - network.incoming.packets_1c1_scalling_instance_1c1_t1_port: - - 1c1_scalling_instance_1c1_t1_port - - network.incoming.packets disk.allocation_1c1_scalling_instance: - 1c1_scalling_instance - disk.allocation - feature_1c1_scalling_instance_1c1_t2_port: - - 1c1_scalling_instance_1c1_t2_port - - feature memory.usage_1c1_scalling_instance: - 1c1_scalling_instance - memory.usage - network.incoming.bytes_1c1_scalling_instance_1c1_t2_port: - - 1c1_scalling_instance_1c1_t2_port - - network.incoming.bytes - network.outgoing.bytes.rate_1c1_scalling_instance_1c1_t2_port: - - 1c1_scalling_instance_1c1_t2_port - - network.outgoing.bytes.rate os_1c1_scalling_instance: - 1c1_scalling_instance - os disk.iops_1c1_scalling_instance: - 1c1_scalling_instance - disk.iops - network.outpoing.packets_1c1_scalling_instance_1c1_t1_port: - - 1c1_scalling_instance_1c1_t1_port + network.outgoing.packets.rate_1c1_scalling_instance_1c1_scalling_instance_t2_port_0: + - 1c1_scalling_instance_1c1_scalling_instance_t2_port_0 + - network.outgoing.packets.rate + network.outpoing.packets_1c1_scalling_instance_1c1_scalling_instance_t1_port_0: + - 1c1_scalling_instance_1c1_scalling_instance_t1_port_0 - network.outpoing.packets - attachment_1c1_scalling_instance_1c1_t1_port: - - 1c1_scalling_instance_1c1_t1_port - - attachment cpu.delta_1c1_scalling_instance: - 1c1_scalling_instance - cpu.delta memory_1c1_scalling_instance: - 1c1_scalling_instance - memory + feature_1c1_scalling_instance_1c1_scalling_instance_t2_port_0: + - 1c1_scalling_instance_1c1_scalling_instance_t2_port_0 + - feature + network.incoming.bytes.rate_1c1_scalling_instance_1c1_scalling_instance_t2_port_0: + - 1c1_scalling_instance_1c1_scalling_instance_t2_port_0 + - network.incoming.bytes.rate + network.incoming.bytes_1c1_scalling_instance_1c1_scalling_instance_t1_port_0: + - 1c1_scalling_instance_1c1_scalling_instance_t1_port_0 + - network.incoming.bytes + network.incoming.packets.rate_1c1_scalling_instance_1c1_scalling_instance_t2_port_0: + - 1c1_scalling_instance_1c1_scalling_instance_t2_port_0 + - network.incoming.packets.rate instance_1c1_scalling_instance: - 1c1_scalling_instance - instance @@ -472,17 +472,17 @@ topology_template: dependency_1c1_scalling_instance: - 1c1_scalling_instance - dependency - link_1c1_scalling_instance_1c1_t1_port: - - 1c1_scalling_instance_1c1_t1_port - - link - dependency_1c1_scalling_instance_1c1_t2_port: - - 1c1_scalling_instance_1c1_t2_port + dependency_1c1_scalling_instance_1c1_scalling_instance_t1_port_0: + - 1c1_scalling_instance_1c1_scalling_instance_t1_port_0 - dependency - dependency_1c1_scalling_instance_1c1_t1_port: - - 1c1_scalling_instance_1c1_t1_port + dependency_1c1_scalling_instance_1c1_scalling_instance_t2_port_0: + - 1c1_scalling_instance_1c1_scalling_instance_t2_port_0 - dependency - link_1c1_scalling_instance_1c1_t2_port: - - 1c1_scalling_instance_1c1_t2_port + link_1c1_scalling_instance_1c1_scalling_instance_t2_port_0: + - 1c1_scalling_instance_1c1_scalling_instance_t2_port_0 + - link + link_1c1_scalling_instance_1c1_scalling_instance_t1_port_0: + - 1c1_scalling_instance_1c1_scalling_instance_t1_port_0 - link local_storage_1c1_scalling_instance: - 1c1_scalling_instance 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_1c2_catalog_instanceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c2_catalog_instanceServiceTemplate.yaml index f3cf7861ae..d6f798fadf 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c2_catalog_instanceServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c2_catalog_instanceServiceTemplate.yaml @@ -11,69 +11,63 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_1c2_t2_port_order: - type: integer - required: true - compute_1c2_catalog_instance_availability_zone: + port_1c2_catalog_instance_t1_port_0_network: type: list required: true entry_schema: type: string - port_1c2_t2_port_subnetpoolid: - type: string + port_1c2_catalog_instance_t2_port_0_vlan_requirements: + type: list required: true - port_1c2_t1_port_related_networks: + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + compute_1c2_catalog_instance_availability_zone: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_1c2_t2_port_network_role: - type: string + type: string + port_1c2_catalog_instance_t1_port_0_ip_requirements: + type: list required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements vm_flavor_name: type: string required: true - port_1c2_t2_port_network_role_tag: + port_1c2_catalog_instance_t2_port_0_network_role_tag: type: string required: true - port_1c2_t1_port_vlan_requirements: + port_1c2_catalog_instance_t2_port_0_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: string vm_image_name: type: string required: true - port_1c2_t2_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_1c2_catalog_instance_t1_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_1c2_t1_port_order: - type: integer + port_1c2_catalog_instance_t2_port_0_network_role: + type: string required: true - port_1c2_t1_port_subnetpoolid: + port_1c2_catalog_instance_t1_port_0_subnetpoolid: type: string required: true - port_1c2_t2_port_ip_requirements: - type: list + port_1c2_catalog_instance_t2_port_0_order: + type: integer required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_1c2_t2_port_related_networks: + port_1c2_catalog_instance_t2_port_0_related_networks: type: list required: true entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_1c2_t1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_1c2_t1_port_network_role: - type: string + port_1c2_catalog_instance_t1_port_0_order: + type: integer required: true - port_1c2_t2_port_network: - type: list + port_1c2_catalog_instance_t2_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: string index_value: type: integer description: Index value of this substitution service template runtime instance @@ -91,35 +85,41 @@ topology_template: required: true entry_schema: type: string - port_1c2_t1_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_1c2_t1_port_network: + port_1c2_catalog_instance_t2_port_0_ip_requirements: type: list required: true entry_schema: - type: string - port_1c2_t2_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_1c2_t2_port_vlan_requirements: + type: org.openecomp.datatypes.network.IpRequirements + port_1c2_catalog_instance_t1_port_0_related_networks: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_1c2_catalog_instance_t2_port_0_subnetpoolid: + type: string + required: true + port_1c2_catalog_instance_t1_port_0_network_role: + type: string + required: true + port_1c2_catalog_instance_t1_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true compute_1c2_catalog_instance_user_data_format: type: list required: true entry_schema: type: string - port_1c2_t1_port_network_role_tag: - type: string - required: true - port_1c2_t1_port_ip_requirements: + port_1c2_catalog_instance_t1_port_0_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: org.openecomp.datatypes.network.VlanRequirements + port_1c2_catalog_instance_t2_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_1c2_catalog_instance_t1_port_0_network_role_tag: + type: string + required: true compute_1c2_catalog_instance_scheduler_hints: type: list required: true @@ -153,62 +153,62 @@ topology_template: get_input: - compute_1c2_catalog_instance_user_data_format - index_value - 1c2_catalog_instance_1c2_t2_port: + 1c2_catalog_instance_1c2_catalog_instance_t1_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_1c2_t2_port_exCP_naming + get_input: port_1c2_catalog_instance_t1_port_0_exCP_naming vlan_requirements: - get_input: port_1c2_t2_port_vlan_requirements + get_input: port_1c2_catalog_instance_t1_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_1c2_t2_port_related_networks + get_input: port_1c2_catalog_instance_t1_port_0_related_networks ip_requirements: - get_input: port_1c2_t2_port_ip_requirements + get_input: port_1c2_catalog_instance_t1_port_0_ip_requirements network_role_tag: - get_input: port_1c2_t2_port_network_role_tag + get_input: port_1c2_catalog_instance_t1_port_0_network_role_tag mac_requirements: - get_input: port_1c2_t2_port_mac_requirements + get_input: port_1c2_catalog_instance_t1_port_0_mac_requirements order: - get_input: port_1c2_t2_port_order + get_input: port_1c2_catalog_instance_t1_port_0_order network_role: - get_input: port_1c2_t2_port_network_role + get_input: port_1c2_catalog_instance_t1_port_0_network_role subnetpoolid: - get_input: port_1c2_t2_port_subnetpoolid + get_input: port_1c2_catalog_instance_t1_port_0_subnetpoolid network: get_input: - - port_1c2_t2_port_network + - port_1c2_catalog_instance_t1_port_0_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: 1c2_catalog_instance relationship: tosca.relationships.network.BindsTo - 1c2_catalog_instance_1c2_t1_port: + 1c2_catalog_instance_1c2_catalog_instance_t2_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_1c2_t1_port_exCP_naming + get_input: port_1c2_catalog_instance_t2_port_0_exCP_naming vlan_requirements: - get_input: port_1c2_t1_port_vlan_requirements + get_input: port_1c2_catalog_instance_t2_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_1c2_t1_port_related_networks + get_input: port_1c2_catalog_instance_t2_port_0_related_networks ip_requirements: - get_input: port_1c2_t1_port_ip_requirements + get_input: port_1c2_catalog_instance_t2_port_0_ip_requirements network_role_tag: - get_input: port_1c2_t1_port_network_role_tag + get_input: port_1c2_catalog_instance_t2_port_0_network_role_tag mac_requirements: - get_input: port_1c2_t1_port_mac_requirements + get_input: port_1c2_catalog_instance_t2_port_0_mac_requirements order: - get_input: port_1c2_t1_port_order + get_input: port_1c2_catalog_instance_t2_port_0_order network_role: - get_input: port_1c2_t1_port_network_role + get_input: port_1c2_catalog_instance_t2_port_0_network_role subnetpoolid: - get_input: port_1c2_t1_port_subnetpoolid + get_input: port_1c2_catalog_instance_t2_port_0_subnetpoolid network: get_input: - - port_1c2_t1_port_network + - port_1c2_catalog_instance_t2_port_0_network - index_value requirements: - binding: @@ -222,11 +222,11 @@ topology_template: get_attribute: - 1c2_catalog_instance - instance_name - 1c2_catalog_instance_1c2_t1_port_tenant_id: + 1c2_catalog_instance_1c2_catalog_instance_t1_port_0_tenant_id: type: string value: get_attribute: - - 1c2_catalog_instance_1c2_t1_port + - 1c2_catalog_instance_1c2_catalog_instance_t1_port_0 - tenant_id substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.1c2_catalog_instance @@ -234,57 +234,33 @@ topology_template: disk.device.capacity_1c2_catalog_instance: - 1c2_catalog_instance - disk.device.capacity - network.incoming.packets.rate_1c2_catalog_instance_1c2_t2_port: - - 1c2_catalog_instance_1c2_t2_port - - network.incoming.packets.rate disk.read.bytes.rate_1c2_catalog_instance: - 1c2_catalog_instance - disk.read.bytes.rate memory.usage_1c2_catalog_instance: - 1c2_catalog_instance - memory.usage - network.outpoing.packets_1c2_catalog_instance_1c2_t1_port: - - 1c2_catalog_instance_1c2_t1_port - - network.outpoing.packets + attachment_1c2_catalog_instance_1c2_catalog_instance_t1_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_t1_port_0 + - attachment disk.write.bytes.rate_1c2_catalog_instance: - 1c2_catalog_instance - disk.write.bytes.rate - network.incoming.bytes.rate_1c2_catalog_instance_1c2_t2_port: - - 1c2_catalog_instance_1c2_t2_port - - network.incoming.bytes.rate - binding_1c2_catalog_instance_1c2_t2_port: - - 1c2_catalog_instance_1c2_t2_port - - binding - network.incoming.packets_1c2_catalog_instance_1c2_t1_port: - - 1c2_catalog_instance_1c2_t1_port - - network.incoming.packets cpu_util_1c2_catalog_instance: - 1c2_catalog_instance - cpu_util - network.outpoing.packets_1c2_catalog_instance_1c2_t2_port: - - 1c2_catalog_instance_1c2_t2_port - - network.outpoing.packets - feature_1c2_catalog_instance_1c2_t1_port: - - 1c2_catalog_instance_1c2_t1_port - - feature - attachment_1c2_catalog_instance_1c2_t1_port: - - 1c2_catalog_instance_1c2_t1_port - - attachment - network.incoming.bytes_1c2_catalog_instance_1c2_t2_port: - - 1c2_catalog_instance_1c2_t2_port - - network.incoming.bytes + network.incoming.bytes.rate_1c2_catalog_instance_1c2_catalog_instance_t2_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_t2_port_0 + - network.incoming.bytes.rate cpu_1c2_catalog_instance: - 1c2_catalog_instance - cpu disk.read.requests_1c2_catalog_instance: - 1c2_catalog_instance - disk.read.requests - network.incoming.bytes.rate_1c2_catalog_instance_1c2_t1_port: - - 1c2_catalog_instance_1c2_t1_port - - network.incoming.bytes.rate - binding_1c2_catalog_instance_1c2_t1_port: - - 1c2_catalog_instance_1c2_t1_port - - binding + network.outpoing.packets_1c2_catalog_instance_1c2_catalog_instance_t2_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_t2_port_0 + - network.outpoing.packets disk.ephemeral.size_1c2_catalog_instance: - 1c2_catalog_instance - disk.ephemeral.size @@ -294,63 +270,75 @@ topology_template: memory.resident_1c2_catalog_instance: - 1c2_catalog_instance - memory.resident + network.outpoing.packets_1c2_catalog_instance_1c2_catalog_instance_t1_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_t1_port_0 + - network.outpoing.packets disk.device.write.requests.rate_1c2_catalog_instance: - 1c2_catalog_instance - disk.device.write.requests.rate - network.incoming.bytes_1c2_catalog_instance_1c2_t1_port: - - 1c2_catalog_instance_1c2_t1_port - - network.incoming.bytes os_1c2_catalog_instance: - 1c2_catalog_instance - os disk.device.iops_1c2_catalog_instance: - 1c2_catalog_instance - disk.device.iops + binding_1c2_catalog_instance_1c2_catalog_instance_t1_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_t1_port_0 + - binding + feature_1c2_catalog_instance_1c2_catalog_instance_t1_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_t1_port_0 + - feature + network.outgoing.bytes_1c2_catalog_instance_1c2_catalog_instance_t1_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_t1_port_0 + - network.outgoing.bytes + network.outgoing.bytes.rate_1c2_catalog_instance_1c2_catalog_instance_t1_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_t1_port_0 + - network.outgoing.bytes.rate + network.outgoing.packets.rate_1c2_catalog_instance_1c2_catalog_instance_t1_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_t1_port_0 + - network.outgoing.packets.rate + network.incoming.packets_1c2_catalog_instance_1c2_catalog_instance_t1_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_t1_port_0 + - network.incoming.packets endpoint_1c2_catalog_instance: - 1c2_catalog_instance - endpoint disk.allocation_1c2_catalog_instance: - 1c2_catalog_instance - disk.allocation + network.incoming.bytes.rate_1c2_catalog_instance_1c2_catalog_instance_t1_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_t1_port_0 + - network.incoming.bytes.rate disk.latency_1c2_catalog_instance: - 1c2_catalog_instance - disk.latency - network.outgoing.bytes.rate_1c2_catalog_instance_1c2_t1_port: - - 1c2_catalog_instance_1c2_t1_port - - network.outgoing.bytes.rate - network.outgoing.bytes_1c2_catalog_instance_1c2_t1_port: - - 1c2_catalog_instance_1c2_t1_port - - network.outgoing.bytes + network.incoming.bytes_1c2_catalog_instance_1c2_catalog_instance_t1_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_t1_port_0 + - network.incoming.bytes disk.iops_1c2_catalog_instance: - 1c2_catalog_instance - disk.iops - network.outgoing.packets.rate_1c2_catalog_instance_1c2_t2_port: - - 1c2_catalog_instance_1c2_t2_port - - network.outgoing.packets.rate - network.incoming.packets_1c2_catalog_instance_1c2_t2_port: - - 1c2_catalog_instance_1c2_t2_port - - network.incoming.packets + forwarder_1c2_catalog_instance_1c2_catalog_instance_t1_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_t1_port_0 + - forwarder + attachment_1c2_catalog_instance_1c2_catalog_instance_t2_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_t2_port_0 + - attachment vcpus_1c2_catalog_instance: - 1c2_catalog_instance - vcpus disk.device.latency_1c2_catalog_instance: - 1c2_catalog_instance - disk.device.latency - attachment_1c2_catalog_instance_1c2_t2_port: - - 1c2_catalog_instance_1c2_t2_port - - attachment - forwarder_1c2_catalog_instance_1c2_t1_port: - - 1c2_catalog_instance_1c2_t1_port - - forwarder - network.outgoing.packets.rate_1c2_catalog_instance_1c2_t1_port: - - 1c2_catalog_instance_1c2_t1_port - - network.outgoing.packets.rate disk.read.bytes_1c2_catalog_instance: - 1c2_catalog_instance - disk.read.bytes instance_1c2_catalog_instance: - 1c2_catalog_instance - instance + network.incoming.packets.rate_1c2_catalog_instance_1c2_catalog_instance_t2_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_t2_port_0 + - network.incoming.packets.rate disk.capacity_1c2_catalog_instance: - 1c2_catalog_instance - disk.capacity @@ -360,18 +348,12 @@ topology_template: disk.device.read.bytes.rate_1c2_catalog_instance: - 1c2_catalog_instance - disk.device.read.bytes.rate - forwarder_1c2_catalog_instance_1c2_t2_port: - - 1c2_catalog_instance_1c2_t2_port - - forwarder disk.device.allocation_1c2_catalog_instance: - 1c2_catalog_instance - disk.device.allocation disk.device.read.bytes_1c2_catalog_instance: - 1c2_catalog_instance - disk.device.read.bytes - network.outgoing.bytes.rate_1c2_catalog_instance_1c2_t2_port: - - 1c2_catalog_instance_1c2_t2_port - - network.outgoing.bytes.rate disk.device.read.requests_1c2_catalog_instance: - 1c2_catalog_instance - disk.device.read.requests @@ -393,18 +375,30 @@ topology_template: disk.device.usage_1c2_catalog_instance: - 1c2_catalog_instance - disk.device.usage - network.outgoing.bytes_1c2_catalog_instance_1c2_t2_port: - - 1c2_catalog_instance_1c2_t2_port + binding_1c2_catalog_instance_1c2_catalog_instance_t2_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_t2_port_0 + - binding + network.incoming.packets_1c2_catalog_instance_1c2_catalog_instance_t2_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_t2_port_0 + - network.incoming.packets + feature_1c2_catalog_instance_1c2_catalog_instance_t2_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_t2_port_0 + - feature + network.outgoing.bytes_1c2_catalog_instance_1c2_catalog_instance_t2_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_t2_port_0 - network.outgoing.bytes + network.outgoing.bytes.rate_1c2_catalog_instance_1c2_catalog_instance_t2_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_t2_port_0 + - network.outgoing.bytes.rate disk.usage_1c2_catalog_instance: - 1c2_catalog_instance - disk.usage + network.outgoing.packets.rate_1c2_catalog_instance_1c2_catalog_instance_t2_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_t2_port_0 + - network.outgoing.packets.rate feature_1c2_catalog_instance: - 1c2_catalog_instance - feature - network.incoming.packets.rate_1c2_catalog_instance_1c2_t1_port: - - 1c2_catalog_instance_1c2_t1_port - - network.incoming.packets.rate memory_1c2_catalog_instance: - 1c2_catalog_instance - memory @@ -420,28 +414,34 @@ topology_template: cpu.delta_1c2_catalog_instance: - 1c2_catalog_instance - cpu.delta - feature_1c2_catalog_instance_1c2_t2_port: - - 1c2_catalog_instance_1c2_t2_port - - feature + forwarder_1c2_catalog_instance_1c2_catalog_instance_t2_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_t2_port_0 + - forwarder + network.incoming.packets.rate_1c2_catalog_instance_1c2_catalog_instance_t1_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_t1_port_0 + - network.incoming.packets.rate + network.incoming.bytes_1c2_catalog_instance_1c2_catalog_instance_t2_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_t2_port_0 + - network.incoming.bytes disk.device.read.requests.rate_1c2_catalog_instance: - 1c2_catalog_instance - disk.device.read.requests.rate requirements: - link_1c2_catalog_instance_1c2_t1_port: - - 1c2_catalog_instance_1c2_t1_port - - link dependency_1c2_catalog_instance: - 1c2_catalog_instance - dependency local_storage_1c2_catalog_instance: - 1c2_catalog_instance - local_storage - dependency_1c2_catalog_instance_1c2_t1_port: - - 1c2_catalog_instance_1c2_t1_port + dependency_1c2_catalog_instance_1c2_catalog_instance_t2_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_t2_port_0 - dependency - dependency_1c2_catalog_instance_1c2_t2_port: - - 1c2_catalog_instance_1c2_t2_port + link_1c2_catalog_instance_1c2_catalog_instance_t2_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_t2_port_0 + - link + dependency_1c2_catalog_instance_1c2_catalog_instance_t1_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_t1_port_0 - dependency - link_1c2_catalog_instance_1c2_t2_port: - - 1c2_catalog_instance_1c2_t2_port + link_1c2_catalog_instance_1c2_catalog_instance_t1_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_t1_port_0 - link \ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_b_single_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_b_single_1bServiceTemplate.yaml index 163cde466b..333dc912e4 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_b_single_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_b_single_1bServiceTemplate.yaml @@ -11,35 +11,45 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_1b_t1_port_order: - type: integer + port_b_single_1b_t1_port_0_network_role_tag: + type: string + required: true + port_b_single_1b_t1_port_0_related_networks: + type: list required: true - port_1b_t1_port_network_role: + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_b_single_1b_t2_port_0_subnetpoolid: type: string required: true - port_1b_t1_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_b_single_1b_t1_port_0_network_role: + type: string + required: true + port_b_single_1b_t2_port_0_network: + type: list required: true + entry_schema: + type: string vm_flavor_name: type: string required: true - port_1b_t2_port_related_networks: + port_b_single_1b_t1_port_0_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_1b_t1_port_ip_requirements: + type: org.openecomp.datatypes.network.VlanRequirements + port_b_single_1b_t2_port_0_related_networks: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_image_name: type: string required: true - port_1b_t2_port_network_role: - type: string + port_b_single_1b_t2_port_0_order: + type: integer required: true - port_1b_t2_port_order: + port_b_single_1b_t1_port_0_order: type: integer required: true compute_b_single_1b_user_data_format: @@ -47,28 +57,27 @@ topology_template: required: true entry_schema: type: string - port_1b_t2_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_1b_t2_port_network_role_tag: - type: string + port_b_single_1b_t2_port_0_vlan_requirements: + type: list required: true - port_1b_t2_port_subnetpoolid: + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_b_single_1b_t2_port_0_network_role: type: string required: true - port_1b_t1_port_related_networks: + port_b_single_1b_t1_port_0_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_1b_t2_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true + type: org.openecomp.datatypes.network.IpRequirements compute_b_single_1b_availability_zone: type: list required: true entry_schema: type: string + port_b_single_1b_t1_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -81,17 +90,13 @@ topology_template: required: true entry_schema: type: json - port_1b_t2_port_vlan_requirements: - type: list + port_b_single_1b_t1_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_1b_t2_port_ip_requirements: - type: list + port_b_single_1b_t1_port_0_subnetpoolid: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_1b_t1_port_network_role_tag: + port_b_single_1b_t2_port_0_network_role_tag: type: string required: true compute_b_single_1b_metadata: @@ -99,22 +104,17 @@ topology_template: required: true entry_schema: type: json - port_1b_t1_port_subnetpoolid: - type: string - required: true - port_1b_t1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_1b_t2_port_network: + port_b_single_1b_t2_port_0_ip_requirements: type: list required: true entry_schema: - type: string - port_1b_t1_port_vlan_requirements: - type: list + type: org.openecomp.datatypes.network.IpRequirements + port_b_single_1b_t2_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_b_single_1b_t2_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements compute_b_single_1b_name: type: list required: true @@ -148,63 +148,63 @@ topology_template: get_input: - compute_b_single_1b_user_data_format - index_value - b_single_1b_1b_t1_port: + b_single_1b_b_single_1b_t2_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_1b_t1_port_exCP_naming + get_input: port_b_single_1b_t2_port_0_exCP_naming vlan_requirements: - get_input: port_1b_t1_port_vlan_requirements + get_input: port_b_single_1b_t2_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_1b_t1_port_related_networks + get_input: port_b_single_1b_t2_port_0_related_networks ip_requirements: - get_input: port_1b_t1_port_ip_requirements + get_input: port_b_single_1b_t2_port_0_ip_requirements network_role_tag: - get_input: port_1b_t1_port_network_role_tag + get_input: port_b_single_1b_t2_port_0_network_role_tag mac_requirements: - get_input: port_1b_t1_port_mac_requirements + get_input: port_b_single_1b_t2_port_0_mac_requirements order: - get_input: port_1b_t1_port_order + get_input: port_b_single_1b_t2_port_0_order network_role: - get_input: port_1b_t1_port_network_role + get_input: port_b_single_1b_t2_port_0_network_role subnetpoolid: - get_input: port_1b_t1_port_subnetpoolid + get_input: port_b_single_1b_t2_port_0_subnetpoolid network: - get_attribute: - - b_single_1b - - accessIPv6 + get_input: + - port_b_single_1b_t2_port_0_network + - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: b_single_1b relationship: tosca.relationships.network.BindsTo - b_single_1b_1b_t2_port: + b_single_1b_b_single_1b_t1_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_1b_t2_port_exCP_naming + get_input: port_b_single_1b_t1_port_0_exCP_naming vlan_requirements: - get_input: port_1b_t2_port_vlan_requirements + get_input: port_b_single_1b_t1_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_1b_t2_port_related_networks + get_input: port_b_single_1b_t1_port_0_related_networks ip_requirements: - get_input: port_1b_t2_port_ip_requirements + get_input: port_b_single_1b_t1_port_0_ip_requirements network_role_tag: - get_input: port_1b_t2_port_network_role_tag + get_input: port_b_single_1b_t1_port_0_network_role_tag mac_requirements: - get_input: port_1b_t2_port_mac_requirements + get_input: port_b_single_1b_t1_port_0_mac_requirements order: - get_input: port_1b_t2_port_order + get_input: port_b_single_1b_t1_port_0_order network_role: - get_input: port_1b_t2_port_network_role + get_input: port_b_single_1b_t1_port_0_network_role subnetpoolid: - get_input: port_1b_t2_port_subnetpoolid + get_input: port_b_single_1b_t1_port_0_subnetpoolid network: - get_input: - - port_1b_t2_port_network - - index_value + get_attribute: + - b_single_1b + - accessIPv6 requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -217,21 +217,15 @@ topology_template: get_attribute: - b_single_1b - instance_name - b_single_1b_1b_t1_port_tenant_id: + b_single_1b_b_single_1b_t1_port_0_tenant_id: type: string value: get_attribute: - - b_single_1b_1b_t1_port + - b_single_1b_b_single_1b_t1_port_0 - tenant_id substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.b_single_1b capabilities: - attachment_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port - - attachment - forwarder_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port - - forwarder endpoint_b_single_1b: - b_single_1b - endpoint @@ -241,15 +235,30 @@ topology_template: disk.iops_b_single_1b: - b_single_1b - disk.iops - network.incoming.bytes.rate_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port + network.incoming.bytes_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 + - network.incoming.bytes + network.incoming.packets.rate_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - network.incoming.packets.rate + network.incoming.bytes_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - network.incoming.bytes + binding_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 + - binding + feature_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - feature + feature_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 + - feature + network.incoming.bytes.rate_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 - network.incoming.bytes.rate - network.outgoing.bytes.rate_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port - - network.outgoing.bytes.rate - forwarder_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - forwarder + binding_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - binding scalable_b_single_1b: - b_single_1b - scalable @@ -259,24 +268,30 @@ topology_template: os_b_single_1b: - b_single_1b - os + forwarder_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - forwarder + forwarder_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 + - forwarder vcpus_b_single_1b: - b_single_1b - vcpus cpu_b_single_1b: - b_single_1b - cpu + network.incoming.bytes.rate_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - network.incoming.bytes.rate disk.device.read.requests.rate_b_single_1b: - b_single_1b - disk.device.read.requests.rate - network.incoming.packets.rate_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port + network.incoming.packets.rate_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 - network.incoming.packets.rate instance_b_single_1b: - b_single_1b - instance - network.incoming.bytes.rate_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - network.incoming.bytes.rate disk.read.bytes_b_single_1b: - b_single_1b - disk.read.bytes @@ -286,45 +301,36 @@ topology_template: disk.usage_b_single_1b: - b_single_1b - disk.usage - network.incoming.bytes_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - network.incoming.bytes disk.device.allocation_b_single_1b: - b_single_1b - disk.device.allocation - network.outgoing.packets.rate_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port + network.outgoing.packets.rate_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 - network.outgoing.packets.rate + network.outpoing.packets_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 + - network.outpoing.packets + network.outgoing.bytes_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - network.outgoing.bytes disk.device.capacity_b_single_1b: - b_single_1b - disk.device.capacity disk.latency_b_single_1b: - b_single_1b - disk.latency - network.incoming.packets_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port - - network.incoming.packets - network.incoming.packets.rate_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - network.incoming.packets.rate - attachment_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port + attachment_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 - attachment disk.device.write.requests_b_single_1b: - b_single_1b - disk.device.write.requests - binding_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port - - binding disk.ephemeral.size_b_single_1b: - b_single_1b - disk.ephemeral.size disk.write.requests.rate_b_single_1b: - b_single_1b - disk.write.requests.rate - network.outpoing.packets_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port - - network.outpoing.packets disk.device.iops_b_single_1b: - b_single_1b - disk.device.iops @@ -334,15 +340,18 @@ topology_template: memory.resident_b_single_1b: - b_single_1b - memory.resident + network.outgoing.bytes.rate_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - network.outgoing.bytes.rate disk.root.size_b_single_1b: - b_single_1b - disk.root.size - feature_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - feature - network.outgoing.bytes_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port - - network.outgoing.bytes + network.incoming.packets_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 + - network.incoming.packets + network.outgoing.bytes.rate_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 + - network.outgoing.bytes.rate disk.capacity_b_single_1b: - b_single_1b - disk.capacity @@ -361,45 +370,39 @@ topology_template: disk.write.requests_b_single_1b: - b_single_1b - disk.write.requests - network.outgoing.packets.rate_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - network.outgoing.packets.rate + network.incoming.packets_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - network.incoming.packets disk.device.usage_b_single_1b: - b_single_1b - disk.device.usage disk.read.bytes.rate_b_single_1b: - b_single_1b - disk.read.bytes.rate - network.outgoing.bytes_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - network.outgoing.bytes disk.device.read.requests_b_single_1b: - b_single_1b - disk.device.read.requests - network.incoming.packets_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - network.incoming.packets - binding_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - binding - network.outpoing.packets_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - network.outpoing.packets + attachment_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - attachment disk.device.write.requests.rate_b_single_1b: - b_single_1b - disk.device.write.requests.rate + network.outgoing.packets.rate_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 + - network.outgoing.packets.rate + network.outpoing.packets_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - network.outpoing.packets memory.usage_b_single_1b: - b_single_1b - memory.usage + network.outgoing.bytes_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 + - network.outgoing.bytes disk.write.bytes.rate_b_single_1b: - b_single_1b - disk.write.bytes.rate - network.incoming.bytes_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port - - network.incoming.bytes - network.outgoing.bytes.rate_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - network.outgoing.bytes.rate cpu.delta_b_single_1b: - b_single_1b - cpu.delta @@ -418,25 +421,22 @@ topology_template: binding_b_single_1b: - b_single_1b - binding - feature_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port - - feature requirements: local_storage_b_single_1b: - b_single_1b - local_storage - dependency_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - dependency + link_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 + - link dependency_b_single_1b: - b_single_1b - dependency - link_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port - - link - link_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - link - dependency_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port - - dependency \ No newline at end of file + dependency_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - dependency + dependency_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 + - dependency + link_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - link \ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_b_single_1b_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_b_single_1b_1ServiceTemplate.yaml index d2a4c87502..fc750eeb73 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_b_single_1b_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_b_single_1b_1ServiceTemplate.yaml @@ -11,35 +11,45 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_1b_t1_port_order: - type: integer + port_b_single_1b_t1_port_0_network_role_tag: + type: string + required: true + port_b_single_1b_t1_port_0_related_networks: + type: list required: true - port_1b_t1_port_network_role: + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_b_single_1b_t2_port_0_subnetpoolid: type: string required: true - port_1b_t1_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_b_single_1b_t1_port_0_network_role: + type: string required: true + port_b_single_1b_t2_port_0_network: + type: list + required: true + entry_schema: + type: string vm_flavor_name: type: string required: true - port_1b_t2_port_related_networks: + port_b_single_1b_t1_port_0_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_1b_t1_port_ip_requirements: + type: org.openecomp.datatypes.network.VlanRequirements + port_b_single_1b_t2_port_0_related_networks: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_image_name: type: string required: true - port_1b_t2_port_network_role: - type: string + port_b_single_1b_t2_port_0_order: + type: integer required: true - port_1b_t2_port_order: + port_b_single_1b_t1_port_0_order: type: integer required: true compute_b_single_1b_user_data_format: @@ -47,28 +57,32 @@ topology_template: required: true entry_schema: type: string - port_1b_t2_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_1b_t2_port_network_role_tag: - type: string + port_b_single_1b_t2_port_0_vlan_requirements: + type: list required: true - port_1b_t2_port_subnetpoolid: + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_b_single_1b_t2_port_0_network_role: type: string required: true - port_1b_t1_port_related_networks: + port_b_single_1b_t1_port_0_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_1b_t2_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + type: org.openecomp.datatypes.network.IpRequirements + port_b_single_1b_t1_port_0_value_specs: + type: list required: true + entry_schema: + type: json compute_b_single_1b_availability_zone: type: list required: true entry_schema: type: string + port_b_single_1b_t1_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -81,45 +95,31 @@ topology_template: required: true entry_schema: type: json - port_1b_t2_port_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_1b_t2_port_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_1b_t1_port_value_specs: - type: list + port_b_single_1b_t1_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json - port_1b_t1_port_network_role_tag: + port_b_single_1b_t1_port_0_subnetpoolid: type: string required: true - port_1b_t1_port_subnetpoolid: + port_b_single_1b_t2_port_0_network_role_tag: type: string required: true - port_1b_t1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_1b_t2_port_network: + port_b_single_1b_t1_port_0_network: type: list required: true entry_schema: type: string - port_1b_t1_port_vlan_requirements: + port_b_single_1b_t2_port_0_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_1b_t1_port_network: - type: list + type: org.openecomp.datatypes.network.IpRequirements + port_b_single_1b_t2_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_b_single_1b_t2_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: string compute_b_single_1b_name: type: list required: true @@ -149,66 +149,66 @@ topology_template: get_input: - compute_b_single_1b_user_data_format - index_value - b_single_1b_1b_t1_port: + b_single_1b_b_single_1b_t2_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - mac_requirements: - get_input: port_1b_t1_port_mac_requirements - order: - get_input: port_1b_t1_port_order - value_specs: - get_input: - - port_1b_t1_port_value_specs - - index_value exCP_naming: - get_input: port_1b_t1_port_exCP_naming + get_input: port_b_single_1b_t2_port_0_exCP_naming vlan_requirements: - get_input: port_1b_t1_port_vlan_requirements + get_input: port_b_single_1b_t2_port_0_vlan_requirements subinterface_indicator: false - ip_requirements: - get_input: port_1b_t1_port_ip_requirements related_networks: - get_input: port_1b_t1_port_related_networks + get_input: port_b_single_1b_t2_port_0_related_networks + ip_requirements: + get_input: port_b_single_1b_t2_port_0_ip_requirements network_role_tag: - get_input: port_1b_t1_port_network_role_tag + get_input: port_b_single_1b_t2_port_0_network_role_tag + mac_requirements: + get_input: port_b_single_1b_t2_port_0_mac_requirements + order: + get_input: port_b_single_1b_t2_port_0_order network_role: - get_input: port_1b_t1_port_network_role + get_input: port_b_single_1b_t2_port_0_network_role subnetpoolid: - get_input: port_1b_t1_port_subnetpoolid + get_input: port_b_single_1b_t2_port_0_subnetpoolid network: get_input: - - port_1b_t1_port_network + - port_b_single_1b_t2_port_0_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: b_single_1b relationship: tosca.relationships.network.BindsTo - b_single_1b_1b_t2_port: + b_single_1b_b_single_1b_t1_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + mac_requirements: + get_input: port_b_single_1b_t1_port_0_mac_requirements + order: + get_input: port_b_single_1b_t1_port_0_order + value_specs: + get_input: + - port_b_single_1b_t1_port_0_value_specs + - index_value exCP_naming: - get_input: port_1b_t2_port_exCP_naming + get_input: port_b_single_1b_t1_port_0_exCP_naming vlan_requirements: - get_input: port_1b_t2_port_vlan_requirements + get_input: port_b_single_1b_t1_port_0_vlan_requirements subinterface_indicator: false - related_networks: - get_input: port_1b_t2_port_related_networks ip_requirements: - get_input: port_1b_t2_port_ip_requirements + get_input: port_b_single_1b_t1_port_0_ip_requirements + related_networks: + get_input: port_b_single_1b_t1_port_0_related_networks network_role_tag: - get_input: port_1b_t2_port_network_role_tag - mac_requirements: - get_input: port_1b_t2_port_mac_requirements - order: - get_input: port_1b_t2_port_order + get_input: port_b_single_1b_t1_port_0_network_role_tag network_role: - get_input: port_1b_t2_port_network_role + get_input: port_b_single_1b_t1_port_0_network_role subnetpoolid: - get_input: port_1b_t2_port_subnetpoolid + get_input: port_b_single_1b_t1_port_0_subnetpoolid network: get_input: - - port_1b_t2_port_network + - port_b_single_1b_t1_port_0_network - index_value requirements: - binding: @@ -222,21 +222,15 @@ topology_template: get_attribute: - b_single_1b - instance_name - b_single_1b_1b_t1_port_tenant_id: + b_single_1b_b_single_1b_t1_port_0_tenant_id: type: string value: get_attribute: - - b_single_1b_1b_t1_port + - b_single_1b_b_single_1b_t1_port_0 - tenant_id substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.b_single_1b_1 capabilities: - attachment_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port - - attachment - forwarder_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port - - forwarder endpoint_b_single_1b: - b_single_1b - endpoint @@ -246,15 +240,30 @@ topology_template: disk.iops_b_single_1b: - b_single_1b - disk.iops - network.incoming.bytes.rate_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port + network.incoming.bytes_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 + - network.incoming.bytes + network.incoming.packets.rate_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - network.incoming.packets.rate + network.incoming.bytes_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - network.incoming.bytes + binding_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 + - binding + feature_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - feature + feature_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 + - feature + network.incoming.bytes.rate_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 - network.incoming.bytes.rate - network.outgoing.bytes.rate_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port - - network.outgoing.bytes.rate - forwarder_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - forwarder + binding_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - binding scalable_b_single_1b: - b_single_1b - scalable @@ -264,24 +273,30 @@ topology_template: os_b_single_1b: - b_single_1b - os + forwarder_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - forwarder + forwarder_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 + - forwarder vcpus_b_single_1b: - b_single_1b - vcpus cpu_b_single_1b: - b_single_1b - cpu + network.incoming.bytes.rate_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - network.incoming.bytes.rate disk.device.read.requests.rate_b_single_1b: - b_single_1b - disk.device.read.requests.rate - network.incoming.packets.rate_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port + network.incoming.packets.rate_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 - network.incoming.packets.rate instance_b_single_1b: - b_single_1b - instance - network.incoming.bytes.rate_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - network.incoming.bytes.rate disk.read.bytes_b_single_1b: - b_single_1b - disk.read.bytes @@ -291,45 +306,36 @@ topology_template: disk.usage_b_single_1b: - b_single_1b - disk.usage - network.incoming.bytes_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - network.incoming.bytes disk.device.allocation_b_single_1b: - b_single_1b - disk.device.allocation - network.outgoing.packets.rate_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port + network.outgoing.packets.rate_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 - network.outgoing.packets.rate + network.outpoing.packets_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 + - network.outpoing.packets + network.outgoing.bytes_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - network.outgoing.bytes disk.device.capacity_b_single_1b: - b_single_1b - disk.device.capacity disk.latency_b_single_1b: - b_single_1b - disk.latency - network.incoming.packets_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port - - network.incoming.packets - network.incoming.packets.rate_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - network.incoming.packets.rate - attachment_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port + attachment_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 - attachment disk.device.write.requests_b_single_1b: - b_single_1b - disk.device.write.requests - binding_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port - - binding disk.ephemeral.size_b_single_1b: - b_single_1b - disk.ephemeral.size disk.write.requests.rate_b_single_1b: - b_single_1b - disk.write.requests.rate - network.outpoing.packets_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port - - network.outpoing.packets disk.device.iops_b_single_1b: - b_single_1b - disk.device.iops @@ -339,15 +345,18 @@ topology_template: memory.resident_b_single_1b: - b_single_1b - memory.resident + network.outgoing.bytes.rate_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - network.outgoing.bytes.rate disk.root.size_b_single_1b: - b_single_1b - disk.root.size - feature_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - feature - network.outgoing.bytes_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port - - network.outgoing.bytes + network.incoming.packets_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 + - network.incoming.packets + network.outgoing.bytes.rate_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 + - network.outgoing.bytes.rate disk.capacity_b_single_1b: - b_single_1b - disk.capacity @@ -366,45 +375,39 @@ topology_template: disk.write.requests_b_single_1b: - b_single_1b - disk.write.requests - network.outgoing.packets.rate_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - network.outgoing.packets.rate + network.incoming.packets_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - network.incoming.packets disk.device.usage_b_single_1b: - b_single_1b - disk.device.usage disk.read.bytes.rate_b_single_1b: - b_single_1b - disk.read.bytes.rate - network.outgoing.bytes_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - network.outgoing.bytes disk.device.read.requests_b_single_1b: - b_single_1b - disk.device.read.requests - network.incoming.packets_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - network.incoming.packets - binding_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - binding - network.outpoing.packets_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - network.outpoing.packets + attachment_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - attachment disk.device.write.requests.rate_b_single_1b: - b_single_1b - disk.device.write.requests.rate + network.outgoing.packets.rate_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 + - network.outgoing.packets.rate + network.outpoing.packets_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - network.outpoing.packets memory.usage_b_single_1b: - b_single_1b - memory.usage + network.outgoing.bytes_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 + - network.outgoing.bytes disk.write.bytes.rate_b_single_1b: - b_single_1b - disk.write.bytes.rate - network.incoming.bytes_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port - - network.incoming.bytes - network.outgoing.bytes.rate_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - network.outgoing.bytes.rate cpu.delta_b_single_1b: - b_single_1b - cpu.delta @@ -423,25 +426,22 @@ topology_template: binding_b_single_1b: - b_single_1b - binding - feature_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port - - feature requirements: local_storage_b_single_1b: - b_single_1b - local_storage - dependency_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - dependency + link_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 + - link dependency_b_single_1b: - b_single_1b - dependency - link_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port - - link - link_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - link - dependency_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port - - dependency \ No newline at end of file + dependency_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - dependency + dependency_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 + - dependency + link_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - link \ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_pcma_server_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_pcma_server_1ServiceTemplate.yaml index a149bdc39c..25ffdd165b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_pcma_server_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_pcma_server_1ServiceTemplate.yaml @@ -11,14 +11,14 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_pcm_port_0_network_role: - type: string - required: true port_pcm_port_1_related_networks: type: list required: true entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pcm_port_0_network_role: + type: string + required: true port_pcm_port_1_network_role_tag: type: string required: true @@ -65,10 +65,10 @@ topology_template: port_pcm_port_0_network_role_tag: type: string required: true - port_pcm_port_0_exCP_naming: + port_pcm_port_1_exCP_naming: type: org.openecomp.datatypes.Naming required: true - port_pcm_port_1_exCP_naming: + port_pcm_port_0_exCP_naming: type: org.openecomp.datatypes.Naming required: true port_pcm_port_1_network_role: @@ -79,16 +79,16 @@ topology_template: required: true entry_schema: type: string - port_pcm_port_0_ip_requirements: + port_pcm_port_1_security_groups: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pcm_port_1_security_groups: + type: json + port_pcm_port_0_ip_requirements: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements compute_pcma_server_config_drive: type: list required: true @@ -129,14 +129,14 @@ topology_template: required: true entry_schema: type: string - port_pcm_port_0_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true port_pcm_port_1_ip_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements + port_pcm_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true port_pcm_port_1_order: type: integer required: true 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 394046886b..06c80bf68b 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 @@ -127,14 +127,14 @@ topology_template: port_pcm_port_0_network_role_tag: cps port_pcm_port_1_network: - get_input: oam_net_name + port_pcm_port_1_security_groups: + - - get_input: security_group_name port_pcm_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false - port_pcm_port_1_security_groups: - - - get_input: security_group_name compute_pcma_server_config_drive: - true compute_pcma_server_user_data_format: @@ -149,15 +149,15 @@ topology_template: get_input: oam_net_ip compute_pcma_server_name: - get_input: pcma_server_name - port_pcm_port_0_mac_requirements: - mac_count_required: - is_required: false port_pcm_port_1_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false + port_pcm_port_0_mac_requirements: + mac_count_required: + is_required: false service_template_filter: substitute_service_template: Nested_pcma_server_1ServiceTemplate.yaml count: 1 @@ -669,4 +669,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/in/hot-mog-0108-bs1271.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/in/hot-mog-0108-bs1271.yml index 13dddd64c4..0eb84eeb20 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/in/hot-mog-0108-bs1271.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/in/hot-mog-0108-bs1271.yml @@ -55,16 +55,16 @@ resources: flavor: {get_param: pd_flavor_name} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: 1a_t1_port_0} - - port: {get_resource: 1a_t2_port_0} + - port: {get_resource: a_single_1a_t1_port_0} + - port: {get_resource: a_single_1a_t2_port_0} user_data_format: RAW scheduler_hints: { group: { get_resource: BE_Affinity } } - 1a_t1_port_0: + a_single_1a_t1_port_0: type: OS::Neutron::Port properties: network: {get_resource: a_single_1a_network} - 1a_t2_port_0: + a_single_1a_t2_port_0: type: OS::Neutron::Port properties: network: {get_param: ppds_net_name} @@ -79,7 +79,7 @@ resources: type: nested-pcm_v0.1.yaml depends_on: - 1a_single_1A - - 1b_t1_port_0 + - b_single_1b_0_t1_port_0 - nestedWithNoNovaHadDependencyToIt properties: pcm_server_name: { get_param: [pcm_server_names, 0] } @@ -107,17 +107,17 @@ resources: flavor: {get_param: pd_flavor_name} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: 1b_t1_port_0} - - port: {get_resource: 1b_t2_port_0} + - port: {get_resource: b_single_1b_0_t1_port_0} + - port: {get_resource: b_single_1b_0_t2_port_0} user_data_format: RAW scheduler_hints: { group: { get_resource: BE_Affinity } } - 1b_t1_port_0: + b_single_1b_0_t1_port_0: type: OS::Neutron::Port properties: network: {get_attr: [1b01_single_1B, accessIPv6]} - 1b_t2_port_0: + b_single_1b_0_t2_port_0: type: OS::Neutron::Port properties: network: {get_resource: b_single_1b_network} @@ -136,17 +136,17 @@ resources: flavor: {get_param: pd_flavor_name} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: 1b_t1_port_1} - - port: {get_resource: 1b_t2_port_1} + - port: {get_resource: b_single_1b_1_t1_port_0} + - port: {get_resource: b_single_1b_1_t2_port_0} user_data_format: RAW scheduler_hints: { group: { get_resource: BE_Affinity } } - 1b_t1_port_1: + b_single_1b_1_t1_port_0: type: OS::Neutron::Port properties: network: {get_param: oam_net_name} - 1b_t2_port_1: + b_single_1b_1_t2_port_0: type: OS::Neutron::Port properties: network: {get_resource: b_single_1b_network} @@ -161,23 +161,23 @@ resources: flavor: {get_param: pd_flavor_name} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: 1c1_t1_port_0} - - port: {get_resource: 1c1_t2_port_0} + - port: {get_resource: 1c1_scalling_instance_0_t1_port_0} + - port: {get_resource: 1c1_scalling_instance_0_t2_port_0} user_data_format: RAW1 scheduler_hints: { group: { get_resource: BE_Affinity } } - 1c1_t1_port_0: + 1c1_scalling_instance_0_t1_port_0: type: OS::Neutron::Port properties: network: {get_resource: 1c1_scalling_instance_network} fixed_ips: [{"ip_address": {get_param: [myIPs, 1]}}] - name: 1c1_t1_port_0 - 1c1_t2_port_0: + name: 1c1_scalling_instance_0_t1_port_0 + 1c1_scalling_instance_0_t2_port_0: type: OS::Neutron::Port properties: network: {get_param: ppds_net_name} fixed_ips: [{"ip_address": {get_param: [myIPs, 1]}}] - name: 1c1_t2_port_0 + name: 1c1_scalling_instance_0_t2_port_0 1c1_scalling_instance_network: type: OS::Neutron::Net @@ -195,24 +195,24 @@ resources: flavor: {get_param: pd_flavor_name} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: 1c1_t1_port_1} - - port: {get_resource: 1c1_t2_port_1} + - port: {get_resource: 1c1_scalling_instance_1_t1_port_0} + - port: {get_resource: 1c1_scalling_instance_1_t2_port_0} user_data_format: RAW2 scheduler_hints: { group: { get_resource: BE_Affinity } } - 1c1_t1_port_1: + 1c1_scalling_instance_1_t1_port_0: type: OS::Neutron::Port properties: network: {get_resource: 1c1_scalling_instance_network} fixed_ips: [{"ip_address": {get_param: [myIPs, 1]}}] - name: 1c1_t1_port_1 + name: 1c1_scalling_instance_1_t1_port_0 - 1c1_t2_port_1: + 1c1_scalling_instance_1_t2_port_0: type: OS::Neutron::Port properties: network: {get_param: ppds_net_name} fixed_ips: [{"ip_address": {get_param: [myIPs, 1]}}] - name: 1c1_t2_port_1 + name: 1c1_scalling_instance_1_t2_port_0 1c201_catalog_instance_1C2: type: OS::Nova::Server @@ -222,18 +222,18 @@ resources: flavor: {get_param: pd_flavor_name} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: 1c2_t1_port_0} - - port: {get_resource: 1c2_t2_port_0} + - port: {get_resource: 1c2_catalog_instance_0_t1_port_0} + - port: {get_resource: 1c2_catalog_instance_0_t2_port_0} user_data_format: RAW1 scheduler_hints: { group: { get_resource: BE_Affinity } } - 1c2_t1_port_0: + 1c2_catalog_instance_0_t1_port_0: type: OS::Neutron::Port depends_on: - nestedWithNoNovaHadDependencyToIt properties: network: {get_param: oam_net_name} - 1c2_t2_port_0: + 1c2_catalog_instance_0_t2_port_0: type: OS::Neutron::Port properties: network: {get_resource: 1c2_catalog_instance_network} @@ -252,18 +252,18 @@ resources: flavor: {get_param: pd_flavor_name} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: 1c2_t1_port_1} - - port: {get_resource: 1c2_t2_port_1} + - port: {get_resource: 1c2_catalog_instance_1_t1_port_0} + - port: {get_resource: 1c2_catalog_instance_1_t2_port_0} user_data_format: {get_attr: [1c201_catalog_instance_1C2, instance_name]} scheduler_hints: { group: { get_resource: BE_Affinity } } - 1c2_t1_port_1: + 1c2_catalog_instance_1_t1_port_0: type: OS::Neutron::Port depends_on: - nestedWithNoNovaHadDependencyToIt properties: network: {get_param: oam_net_name} - 1c2_t2_port_1: + 1c2_catalog_instance_1_t2_port_0: type: OS::Neutron::Port properties: network: {get_resource: 1c2_catalog_instance_network} @@ -272,7 +272,7 @@ resources: nestedNoNestedSingleComputePattern: type: nested-no_vfc_v0.1.yaml depends_on: - - 1c2_t2_port_1 + - 1c2_catalog_instance_1_t2_port_0 - nestedWithNoNovaHadDependencyToIt properties: pcm_server_name: { get_param: [pcm_server_names, 0] } @@ -287,8 +287,8 @@ resources: depends_on: - 1a_single_1A - 4p_nested - - 1b_t1_port_0 - - 1b_t1_port_1 + - b_single_1b_0_t1_port_0 + - b_single_1b_1_t1_port_0 - 1c101_scalling_instance_1C1 - 1c102_scalling_instance_1C1 - 1c201_catalog_instance_1C2 @@ -329,20 +329,20 @@ resources: depends_on: - nestedNoNestedSingleComputePattern - 4p_nested - - 1c2_t1_port_1 - - 1c2_t1_port_0 + - 1c2_catalog_instance_1_t1_port_0 + - 1c2_catalog_instance_0_t1_port_0 - 1c201_catalog_instance_1C2 - 1c202_scalling_instance_1C2 - 1c101_scalling_instance_1C1 - 1c102_scalling_instance_1C1 - - 1c1_t2_port_0 - - 1c1_t2_port_1 + - 1c1_scalling_instance_0_t2_port_0 + - 1c1_scalling_instance_1_t2_port_0 - 1b01_single_1B - 1b02_single_1B - - 1b_t1_port_0 - - 1b_t1_port_1 + - b_single_1b_0_t1_port_0 + - b_single_1b_1_t1_port_0 - 1a_single_1A - - 1a_t1_port_0 + - a_single_1a_t1_port_0 - nestedWithNoNovaHadDependencyToIt properties: name: @@ -352,11 +352,11 @@ resources: type: OS::Neutron::Net properties: name: { get_attr: [nestedNoNestedSingleComputePattern, portId, {get_attr: [4p_nested, server_pcm_id]}]} - dhcp_agent_ids: { get_attr: [1c2_t1_port_1, tenant_id, {get_attr: [1c2_t1_port_0, tenant_id, {get_attr: [1c201_catalog_instance_1C2, instance_name, {get_attr: [1c202_scalling_instance_1C2,instance_name]}]}]}]} - tenant_id: { get_attr:[1c101_scalling_instance_1C1, instance_name, {get_attr:[1c102_scalling_instance_1C1, instance_name, {get_attr:[1c1_t2_port_0, tenant_id, {get_attr:[1c1_t2_port_1, tenant_id]}]}]}]} - value_specs: {get_attr:[1b01_single_1B, instance_name, get_attr:[1b02_single_1B,instance_name, {get_attr:[1b_t1_port_0, tenant_id, {get_attr:[1b_t1_port_1, tenant_id]}]}]] } + dhcp_agent_ids: { get_attr: [1c2_catalog_instance_1_t1_port_0, tenant_id, {get_attr: [1c2_catalog_instance_0_t1_port_0, tenant_id, {get_attr: [1c201_catalog_instance_1C2, instance_name, {get_attr: [1c202_scalling_instance_1C2,instance_name]}]}]}]} + tenant_id: { get_attr:[1c101_scalling_instance_1C1, instance_name, {get_attr:[1c102_scalling_instance_1C1, instance_name, {get_attr:[1c1_scalling_instance_0_t2_port_0, tenant_id, {get_attr:[1c1_scalling_instance_1_t2_port_0, tenant_id]}]}]}]} + value_specs: {get_attr:[1b01_single_1B, instance_name, get_attr:[1b02_single_1B,instance_name, {get_attr:[b_single_1b_0_t1_port_0, tenant_id, {get_attr:[b_single_1b_1_t1_port_0, tenant_id]}]}]] } qos_policy: {get_attr:[1a_single_1A, instance_name]} - admin_state_up: {get_attr:[1a_t1_port_0, tenant_id]} + admin_state_up: {get_attr:[a_single_1a_t1_port_0, tenant_id]} BE_Affinity: type: OS::Nova::ServerGroup @@ -368,15 +368,15 @@ outputs: out1: value: { get_attr: [nestedNoNestedSingleComputePattern, portId, {get_attr: [4p_nested, server_pcm_id]}]} out2: - value: { get_attr: [1c2_t1_port_1, tenant_id, {get_attr: [1c2_t1_port_0, tenant_id, {get_attr: [1c201_catalog_instance_1C2, instance_name, {get_attr: [1c202_scalling_instance_1C2,instance_name]}]}]}]} + value: { get_attr: [1c2_catalog_instance_1_t1_port_0, tenant_id, {get_attr: [1c2_catalog_instance_0_t1_port_0, tenant_id, {get_attr: [1c201_catalog_instance_1C2, instance_name, {get_attr: [1c202_scalling_instance_1C2,instance_name]}]}]}]} out3: - value: { get_attr:[1c101_scalling_instance_1C1, instance_name, {get_attr:[1c102_scalling_instance_1C1, instance_name, {get_attr:[1c1_t2_port_0, tenant_id, {get_attr:[1c1_t2_port_1, tenant_id]}]}]}]} + value: { get_attr:[1c101_scalling_instance_1C1, instance_name, {get_attr:[1c102_scalling_instance_1C1, instance_name, {get_attr:[1c1_scalling_instance_0_t2_port_0, tenant_id, {get_attr:[1c1_scalling_instance_1_t2_port_0, tenant_id]}]}]}]} out4: - value: {get_attr:[1b01_single_1B, instance_name, get_attr:[1b02_single_1B,instance_name, {get_attr:[1b_t1_port_0, tenant_id, {get_attr:[1b_t1_port_1, tenant_id]}]}]] } + value: {get_attr:[1b01_single_1B, instance_name, get_attr:[1b02_single_1B,instance_name, {get_attr:[b_single_1b_0_t1_port_0, tenant_id, {get_attr:[b_single_1b_1_t1_port_0, tenant_id]}]}]] } out5: value: {get_attr:[1a_single_1A, instance_name]} out6: - value: {get_attr:[1a_t1_port_0, tenant_id]} + value: {get_attr:[a_single_1a_t1_port_0, tenant_id]} out7: value: {get_attr:[nestedWithNoNovaHadDependencyToIt, output1]} diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml index f444f3afe4..b6567195b3 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -946,44 +946,48 @@ node_types: org.openecomp.resource.abstract.nodes.pcma_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_pcm_port_3_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_pcm_port_2_network_role: + port_pcm_port_2_0_subnetpoolid: type: string required: true status: SUPPORTED - port_pcm_port_2_fixed_ips: + port_pcm_port_2_0_security_groups: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_pcm_port_3_network_role: - type: string + type: json + port_pcm_port_2_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_pcm_port_3_vlan_requirements: + port_pcm_port_2_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements + port_pcm_port_3_0_fixed_ips: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps vm_flavor_name: type: string required: true status: SUPPORTED - port_pcm_port_3_security_groups: + port_pcm_port_3_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: json - port_pcm_port_3_order: - type: integer + type: org.openecomp.datatypes.network.IpRequirements + port_pcm_port_3_0_related_networks: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments compute_pcma_server_availability_zone: type: list required: true @@ -994,62 +998,48 @@ node_types: type: string required: true status: SUPPORTED - port_pcm_port_2_security_groups: + port_pcm_port_3_0_security_groups: type: list required: true status: SUPPORTED entry_schema: type: json - port_pcm_port_2_exCP_naming: + port_pcm_port_2_0_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_pcm_port_3_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pcm_port_2_subnetpoolid: - type: string - required: true - status: SUPPORTED - port_pcm_port_2_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_pcm_port_2_vlan_requirements: + port_pcm_port_2_0_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pcm_port_3_subnetpoolid: + type: string + port_pcm_port_2_0_network_role_tag: type: string required: true status: SUPPORTED - port_pcm_port_3_network_role_tag: + port_pcm_port_3_0_network_role_tag: type: string required: true status: SUPPORTED - compute_pcma_server_config_drive: + port_pcm_port_3_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: boolean - port_pcm_port_3_fixed_ips: + type: org.openecomp.datatypes.network.VlanRequirements + port_pcm_port_2_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_pcm_port_3_related_networks: + type: org.openecomp.datatypes.network.IpRequirements + compute_pcma_server_config_drive: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments + type: boolean index_value: type: integer description: Index value of this substitution service template runtime instance @@ -1064,42 +1054,44 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pcm_port_2_order: - type: integer + port_pcm_port_3_0_network: + type: list required: true status: SUPPORTED - port_pcm_port_3_exCP_naming: - type: org.openecomp.datatypes.Naming + entry_schema: + type: string + port_pcm_port_2_0_network_role: + type: string required: true status: SUPPORTED - port_pcm_port_2_network: + port_pcm_port_2_0_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pcm_port_2_ip_requirements: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pcm_port_2_0_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pcm_port_2_network_role_tag: - type: string + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_pcm_port_2_0_order: + type: integer required: true status: SUPPORTED - port_pcm_port_2_related_networks: - type: list + port_pcm_port_3_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pcm_port_3_network: - type: list + port_pcm_port_3_0_subnetpoolid: + type: string + required: true + status: SUPPORTED + port_pcm_port_3_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: string compute_pcma_server_scheduler_hints: type: list required: true @@ -1112,6 +1104,14 @@ node_types: status: SUPPORTED entry_schema: type: string + port_pcm_port_3_0_network_role: + type: string + required: true + status: SUPPORTED + port_pcm_port_3_0_order: + type: integer + required: true + status: SUPPORTED requirements: - dependency_pcma_server: capability: tosca.capabilities.Node @@ -1127,27 +1127,27 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pcma_server_pcm_port_3: + - dependency_pcma_server_pcm_port_2_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pcma_server_pcm_port_3: + - link_pcma_server_pcm_port_2_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_pcma_server_pcm_port_2: + - dependency_pcma_server_pcm_port_3_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pcma_server_pcm_port_2: + - link_pcma_server_pcm_port_3_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -1160,6 +1160,30 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets_pcma_server_pcm_port_3_0: + 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.packets.rate_pcma_server_pcm_port_2_0: + 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_pcma_server_pcm_port_2_0: + 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_pcma_server_pcm_port_2_0: + 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_pcma_server: type: tosca.capabilities.Scalable occurrences: @@ -1184,13 +1208,13 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.usage_pcma_server: + network.outpoing.packets_pcma_server_pcm_port_2_0: 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_pcma_server_pcm_port_3: + disk.usage_pcma_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1208,17 +1232,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pcma_server_pcm_port_2: - 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 - attachment_pcma_server_pcm_port_2: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED endpoint_pcma_server: type: tosca.capabilities.Endpoint.Admin occurrences: @@ -1229,16 +1242,13 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pcma_server_pcm_port_3: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - network.incoming.bytes.rate_pcma_server_pcm_port_2: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_pcma_server_pcm_port_2_0: + 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: - - 1 + - 0 - UNBOUNDED memory.usage_pcma_server: type: org.openecomp.capabilities.metric.Ceilometer @@ -1246,23 +1256,14 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pcma_server_pcm_port_3: + network.outgoing.bytes_pcma_server_pcm_port_2_0: 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_pcma_server_pcm_port_3: - 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 - network.incoming.bytes.rate_pcma_server_pcm_port_3: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_pcma_server_pcm_port_3_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -1272,9 +1273,8 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pcma_server_pcm_port_2: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_pcma_server_pcm_port_3_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED @@ -1290,132 +1290,115 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.read.bytes.rate_pcma_server: + network.incoming.packets.rate_pcma_server_pcm_port_3_0: 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_pcma_server_pcm_port_3: + disk.read.bytes.rate_pcma_server: 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_pcma_server_pcm_port_2: - 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 os_pcma_server: type: tosca.capabilities.OperatingSystem occurrences: - 1 - UNBOUNDED - network.incoming.packets_pcma_server_pcm_port_2: + network.incoming.bytes_pcma_server_pcm_port_3_0: 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_pcma_server_pcm_port_3: + disk.device.read.requests_pcma_server: 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.packets.rate_pcma_server_pcm_port_3: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_pcma_server_pcm_port_3_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pcma_server_pcm_port_2: + disk.write.bytes.rate_pcma_server: 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_pcma_server_pcm_port_2: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - disk.device.read.requests_pcma_server: + disk.device.write.requests.rate_pcma_server: 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_pcma_server_pcm_port_3: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - disk.write.bytes.rate_pcma_server: + cpu_util_pcma_server: 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.packets.rate_pcma_server_pcm_port_2: + disk.device.write.bytes_pcma_server: 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_pcma_server: + disk.device.read.bytes.rate_pcma_server: 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_pcma_server: + disk.device.usage_pcma_server: 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_pcma_server: + disk.read.requests_pcma_server: 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_pcma_server: + disk.allocation_pcma_server: 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_pcma_server: + network.outgoing.packets.rate_pcma_server_pcm_port_3_0: 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_pcma_server: + network.incoming.bytes.rate_pcma_server_pcm_port_3_0: 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.allocation_pcma_server: + network.incoming.packets_pcma_server_pcm_port_2_0: 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_pcma_server_pcm_port_2: - type: tosca.capabilities.Node + network.outgoing.bytes.rate_pcma_server_pcm_port_3_0: + 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_pcma_server_pcm_port_3: - type: tosca.capabilities.Node + network.outpoing.packets_pcma_server_pcm_port_3_0: + 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 @@ -1466,25 +1449,43 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pcma_server_pcm_port_2_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + binding_pcma_server_pcm_port_3_0: + 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 disk.write.bytes_pcma_server: 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_pcma_server: + network.outgoing.bytes_pcma_server_pcm_port_3_0: 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_pcma_server_pcm_port_2: + disk.write.requests_pcma_server: 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_pcma_server_pcm_port_3: + feature_pcma_server_pcm_port_2_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets.rate_pcma_server_pcm_port_2_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1496,31 +1497,30 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.iops_pcma_server: + network.incoming.bytes_pcma_server_pcm_port_2_0: 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 - instance_pcma_server: + disk.device.iops_pcma_server: 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_pcma_server_pcm_port_3: + instance_pcma_server: 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_pcma_server: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_pcma_server_pcm_port_2_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pcma_server_pcm_port_2: + disk.device.latency_pcma_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2128,86 +2128,78 @@ node_types: org.openecomp.resource.abstract.nodes.1c2_catalog_instance: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_1c2_t2_port_order: - type: integer - required: true - status: SUPPORTED - compute_1c2_catalog_instance_availability_zone: + port_1c2_catalog_instance_t1_port_0_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_1c2_t2_port_subnetpoolid: - type: string + port_1c2_catalog_instance_t2_port_0_vlan_requirements: + type: list required: true status: SUPPORTED - port_1c2_t1_port_related_networks: + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + compute_1c2_catalog_instance_availability_zone: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_1c2_t2_port_network_role: - type: string + type: string + port_1c2_catalog_instance_t1_port_0_ip_requirements: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements vm_flavor_name: type: string required: true status: SUPPORTED - port_1c2_t2_port_network_role_tag: + port_1c2_catalog_instance_t2_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_1c2_t1_port_vlan_requirements: + port_1c2_catalog_instance_t2_port_0_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: string vm_image_name: type: string required: true status: SUPPORTED - port_1c2_t2_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_1c2_catalog_instance_t1_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_1c2_t1_port_order: - type: integer + port_1c2_catalog_instance_t2_port_0_network_role: + type: string required: true status: SUPPORTED - port_1c2_t1_port_subnetpoolid: + port_1c2_catalog_instance_t1_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_1c2_t2_port_ip_requirements: - type: list + port_1c2_catalog_instance_t2_port_0_order: + type: integer required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_1c2_t2_port_related_networks: + port_1c2_catalog_instance_t2_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_1c2_t1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_1c2_t1_port_network_role: - type: string + port_1c2_catalog_instance_t1_port_0_order: + type: integer required: true status: SUPPORTED - port_1c2_t2_port_network: - type: list + port_1c2_catalog_instance_t2_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: string index_value: type: integer description: Index value of this substitution service template runtime instance @@ -2222,42 +2214,50 @@ node_types: status: SUPPORTED entry_schema: type: string - port_1c2_t1_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_1c2_catalog_instance_t2_port_0_ip_requirements: + type: list required: true status: SUPPORTED - port_1c2_t1_port_network: + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_1c2_catalog_instance_t1_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: string - port_1c2_t2_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_1c2_catalog_instance_t2_port_0_subnetpoolid: + type: string required: true status: SUPPORTED - port_1c2_t2_port_vlan_requirements: - type: list + port_1c2_catalog_instance_t1_port_0_network_role: + type: string + required: true + status: SUPPORTED + port_1c2_catalog_instance_t1_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements compute_1c2_catalog_instance_user_data_format: type: list required: true status: SUPPORTED entry_schema: type: string - port_1c2_t1_port_network_role_tag: - type: string - required: true - status: SUPPORTED - port_1c2_t1_port_ip_requirements: + port_1c2_catalog_instance_t1_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: org.openecomp.datatypes.network.VlanRequirements + port_1c2_catalog_instance_t2_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_1c2_catalog_instance_t1_port_0_network_role_tag: + type: string + required: true + status: SUPPORTED compute_1c2_catalog_instance_scheduler_hints: type: list required: true @@ -2268,7 +2268,7 @@ node_types: 1c2_catalog_instance_instance_name: type: string status: SUPPORTED - 1c2_catalog_instance_1c2_t1_port_tenant_id: + 1c2_catalog_instance_1c2_catalog_instance_t1_port_0_tenant_id: type: string status: SUPPORTED requirements: @@ -2286,27 +2286,27 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_1c2_catalog_instance_1c2_t2_port: + - dependency_1c2_catalog_instance_1c2_catalog_instance_t1_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_1c2_catalog_instance_1c2_t2_port: + - link_1c2_catalog_instance_1c2_catalog_instance_t1_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_1c2_catalog_instance_1c2_t1_port: + - dependency_1c2_catalog_instance_1c2_catalog_instance_t2_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_1c2_catalog_instance_1c2_t1_port: + - link_1c2_catalog_instance_1c2_catalog_instance_t2_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -2319,103 +2319,101 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_1c2_catalog_instance_1c2_t2_port: + disk.read.bytes.rate_1c2_catalog_instance: 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_1c2_catalog_instance: + memory.usage_1c2_catalog_instance: 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_1c2_catalog_instance: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_1c2_catalog_instance_1c2_catalog_instance_t1_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - network.outpoing.packets_1c2_catalog_instance_1c2_t1_port: + disk.write.bytes.rate_1c2_catalog_instance: 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_1c2_catalog_instance: + cpu_util_1c2_catalog_instance: 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_1c2_catalog_instance_1c2_t2_port: + network.incoming.bytes.rate_1c2_catalog_instance_1c2_catalog_instance_t2_port_0: 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_1c2_catalog_instance_1c2_t2_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 - network.incoming.packets_1c2_catalog_instance_1c2_t1_port: + cpu_1c2_catalog_instance: 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_1c2_catalog_instance: + disk.read.requests_1c2_catalog_instance: 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_1c2_catalog_instance_1c2_t2_port: + network.outpoing.packets_1c2_catalog_instance_1c2_catalog_instance_t2_port_0: 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_1c2_catalog_instance_1c2_t1_port: - type: tosca.capabilities.Node + disk.ephemeral.size_1c2_catalog_instance: + 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 - attachment_1c2_catalog_instance_1c2_t1_port: - type: tosca.capabilities.Attachment + disk.device.write.bytes_1c2_catalog_instance: + 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_1c2_catalog_instance_1c2_t2_port: + memory.resident_1c2_catalog_instance: 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_1c2_catalog_instance: + network.outpoing.packets_1c2_catalog_instance_1c2_catalog_instance_t1_port_0: 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_1c2_catalog_instance: + disk.device.write.requests.rate_1c2_catalog_instance: 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_1c2_catalog_instance_1c2_t1_port: + os_1c2_catalog_instance: + type: tosca.capabilities.OperatingSystem + occurrences: + - 1 + - UNBOUNDED + disk.device.iops_1c2_catalog_instance: 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_1c2_catalog_instance_1c2_t1_port: + binding_1c2_catalog_instance_1c2_catalog_instance_t1_port_0: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface @@ -2423,42 +2421,30 @@ node_types: occurrences: - 0 - UNBOUNDED - disk.ephemeral.size_1c2_catalog_instance: - 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_1c2_catalog_instance: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_1c2_catalog_instance_1c2_catalog_instance_t1_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - memory.resident_1c2_catalog_instance: + network.outgoing.bytes_1c2_catalog_instance_1c2_catalog_instance_t1_port_0: 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_1c2_catalog_instance: + network.outgoing.bytes.rate_1c2_catalog_instance_1c2_catalog_instance_t1_port_0: 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_1c2_catalog_instance_1c2_t1_port: + network.outgoing.packets.rate_1c2_catalog_instance_1c2_catalog_instance_t1_port_0: 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_1c2_catalog_instance: - type: tosca.capabilities.OperatingSystem - occurrences: - - 1 - - UNBOUNDED - disk.device.iops_1c2_catalog_instance: + network.incoming.packets_1c2_catalog_instance_1c2_catalog_instance_t1_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2475,19 +2461,19 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.latency_1c2_catalog_instance: + network.incoming.bytes.rate_1c2_catalog_instance_1c2_catalog_instance_t1_port_0: 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_1c2_catalog_instance_1c2_t1_port: + disk.latency_1c2_catalog_instance: 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_1c2_catalog_instance_1c2_t1_port: + network.incoming.bytes_1c2_catalog_instance_1c2_catalog_instance_t1_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2499,15 +2485,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_1c2_catalog_instance_1c2_t2_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_1c2_catalog_instance_1c2_catalog_instance_t1_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - network.incoming.packets_1c2_catalog_instance_1c2_t2_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_1c2_catalog_instance_1c2_catalog_instance_t2_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED @@ -2523,29 +2507,19 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_1c2_catalog_instance_1c2_t2_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - forwarder_1c2_catalog_instance_1c2_t1_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - network.outgoing.packets.rate_1c2_catalog_instance_1c2_t1_port: + disk.read.bytes_1c2_catalog_instance: 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_1c2_catalog_instance: + instance_1c2_catalog_instance: 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 - instance_1c2_catalog_instance: + network.incoming.packets.rate_1c2_catalog_instance_1c2_catalog_instance_t2_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2569,11 +2543,6 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_1c2_catalog_instance_1c2_t2_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED disk.device.allocation_1c2_catalog_instance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2586,12 +2555,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_1c2_catalog_instance_1c2_t2_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.device.read.requests_1c2_catalog_instance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2634,29 +2597,54 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_1c2_catalog_instance_1c2_t2_port: + binding_1c2_catalog_instance_1c2_catalog_instance_t2_port_0: + 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 + network.incoming.packets_1c2_catalog_instance_1c2_catalog_instance_t2_port_0: 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_1c2_catalog_instance: + feature_1c2_catalog_instance_1c2_catalog_instance_t2_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes_1c2_catalog_instance_1c2_catalog_instance_t2_port_0: 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_1c2_catalog_instance: - type: tosca.capabilities.Node + network.outgoing.bytes.rate_1c2_catalog_instance_1c2_catalog_instance_t2_port_0: + 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_1c2_catalog_instance: + 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_1c2_catalog_instance_1c2_t1_port: + network.outgoing.packets.rate_1c2_catalog_instance_1c2_catalog_instance_t2_port_0: 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_1c2_catalog_instance: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED memory_1c2_catalog_instance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2686,8 +2674,20 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_1c2_catalog_instance_1c2_t2_port: - type: tosca.capabilities.Node + forwarder_1c2_catalog_instance_1c2_catalog_instance_t2_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets.rate_1c2_catalog_instance_1c2_catalog_instance_t1_port_0: + 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_1c2_catalog_instance_1c2_catalog_instance_t2_port_0: + 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 @@ -2700,104 +2700,84 @@ node_types: org.openecomp.resource.abstract.nodes.pcma_server_1: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_pcm_port_1_related_networks: - type: list + port_pcm_port_0_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pcm_port_0_network_role: - type: string + port_pcm_port_1_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_pcm_port_1_network_role_tag: + port_pcm_port_1_0_order: + type: integer + required: true + status: SUPPORTED + vm_flavor_name: type: string required: true status: SUPPORTED - port_pcm_port_0_fixed_ips: - type: list + port_pcm_port_0_0_order: + type: integer required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_pcm_port_0_vlan_requirements: + compute_pcma_server_availability_zone: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - vm_flavor_name: - type: string - required: true - status: SUPPORTED - port_pcm_port_0_security_groups: + type: string + port_pcm_port_0_0_security_groups: type: list required: true status: SUPPORTED entry_schema: type: json - compute_pcma_server_availability_zone: + port_pcm_port_1_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pcm_port_0_order: - type: integer - required: true - status: SUPPORTED - port_pcm_port_0_subnetpoolid: - type: string + type: org.openecomp.datatypes.network.VlanRequirements + port_pcm_port_0_0_network: + type: list required: true status: SUPPORTED + entry_schema: + type: string vm_image_name: type: string required: true status: SUPPORTED - port_pcm_port_0_related_networks: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pcm_port_1_subnetpoolid: + port_pcm_port_1_0_subnetpoolid: type: string required: true status: SUPPORTED - port_pcm_port_0_network_role_tag: + port_pcm_port_0_0_network_role_tag: type: string required: true status: SUPPORTED - port_pcm_port_1_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pcm_port_1_0_ip_requirements: + type: list required: true status: SUPPORTED - port_pcm_port_0_exCP_naming: + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pcm_port_0_0_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_pcm_port_1_network_role: + port_pcm_port_1_0_network_role_tag: type: string required: true status: SUPPORTED - port_pcm_port_1_network: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_pcm_port_1_security_groups: - type: list + port_pcm_port_1_0_network_role: + type: string required: true status: SUPPORTED - entry_schema: - type: json - port_pcm_port_0_ip_requirements: - type: list + port_pcm_port_1_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements compute_pcma_server_config_drive: type: list required: true @@ -2818,48 +2798,68 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pcm_port_0_network: + port_pcm_port_0_0_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pcm_port_1_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pcm_port_0_0_subnetpoolid: + type: string required: true status: SUPPORTED - port_pcm_port_1_vlan_requirements: + port_pcm_port_0_0_network_role: + type: string + required: true + status: SUPPORTED + port_pcm_port_1_0_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pcm_port_1_fixed_ips: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pcm_port_0_0_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pcm_port_1_0_security_groups: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_pcm_port_0_0_fixed_ips: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.heat.neutron.port.FixedIps - compute_pcma_server_name: + port_pcm_port_1_0_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pcm_port_1_ip_requirements: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_pcm_port_0_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pcm_port_0_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + type: org.openecomp.datatypes.network.VlanRequirements + compute_pcma_server_name: + type: list required: true status: SUPPORTED - port_pcm_port_1_order: - type: integer + entry_schema: + type: string + port_pcm_port_1_0_network: + type: list required: true status: SUPPORTED + entry_schema: + type: string requirements: - dependency_pcma_server: capability: tosca.capabilities.Node @@ -2875,27 +2875,27 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pcma_server_pcm_port_0: + - dependency_pcma_server_pcm_port_0_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pcma_server_pcm_port_0: + - link_pcma_server_pcm_port_0_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_pcma_server_pcm_port_1: + - dependency_pcma_server_pcm_port_1_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pcma_server_pcm_port_1: + - link_pcma_server_pcm_port_1_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -2908,6 +2908,18 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes.rate_pcma_server_pcm_port_0_0: + 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_pcma_server_pcm_port_1_0: + 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_pcma_server: type: tosca.capabilities.Scalable occurrences: @@ -2919,6 +2931,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes.rate_pcma_server_pcm_port_0_0: + 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_pcma_server: type: tosca.capabilities.Container valid_source_types: @@ -2932,46 +2950,36 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.usage_pcma_server: + network.outgoing.packets.rate_pcma_server_pcm_port_0_0: 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 - attachment_pcma_server_pcm_port_0: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - disk.read.bytes_pcma_server: + network.outpoing.packets_pcma_server_pcm_port_0_0: 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.iops_pcma_server: + disk.usage_pcma_server: 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_pcma_server_pcm_port_0: + disk.read.bytes_pcma_server: 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_pcma_server_pcm_port_1: + disk.iops_pcma_server: 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 - attachment_pcma_server_pcm_port_1: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED endpoint_pcma_server: type: tosca.capabilities.Endpoint.Admin occurrences: @@ -2988,19 +2996,12 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_pcma_server_pcm_port_0: - 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_pcma_server_pcm_port_1: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_pcma_server_pcm_port_1_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pcma_server_pcm_port_0: + network.outgoing.bytes_pcma_server_pcm_port_0_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -3012,7 +3013,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pcma_server_pcm_port_1: + network.incoming.packets.rate_pcma_server_pcm_port_1_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -3036,32 +3037,12 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pcma_server_pcm_port_0: - 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_pcma_server_pcm_port_0: - 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 - network.incoming.packets_pcma_server_pcm_port_1: - 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_pcma_server: - type: tosca.capabilities.OperatingSystem + feature_pcma_server_pcm_port_1_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - binding_pcma_server_pcm_port_1: + binding_pcma_server_pcm_port_0_0: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface @@ -3069,19 +3050,14 @@ node_types: occurrences: - 0 - UNBOUNDED - network.incoming.packets.rate_pcma_server_pcm_port_1: - 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_pcma_server_pcm_port_0: - type: org.openecomp.capabilities.Forwarder + os_pcma_server: + type: tosca.capabilities.OperatingSystem occurrences: - 1 - UNBOUNDED - forwarder_pcma_server_pcm_port_1: - type: org.openecomp.capabilities.Forwarder + network.incoming.bytes_pcma_server_pcm_port_1_0: + 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 @@ -3097,9 +3073,8 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pcma_server_pcm_port_1: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_pcma_server_pcm_port_1_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED @@ -3109,61 +3084,63 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pcma_server_pcm_port_0: + cpu_util_pcma_server: 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.packets.rate_pcma_server_pcm_port_0: + disk.device.write.bytes_pcma_server: 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_pcma_server: + disk.device.read.bytes.rate_pcma_server: 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_pcma_server: + disk.device.usage_pcma_server: 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_pcma_server: + disk.read.requests_pcma_server: 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_pcma_server: + disk.allocation_pcma_server: 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_pcma_server: + network.incoming.packets_pcma_server_pcm_port_0_0: 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.allocation_pcma_server: + network.incoming.bytes.rate_pcma_server_pcm_port_1_0: 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_pcma_server_pcm_port_0: - type: tosca.capabilities.Node + network.outgoing.bytes.rate_pcma_server_pcm_port_1_0: + 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_pcma_server_pcm_port_1: - type: tosca.capabilities.Node + network.outgoing.packets.rate_pcma_server_pcm_port_1_0: + 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 @@ -3173,6 +3150,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_pcma_server_pcm_port_1_0: + 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_pcma_server: type: tosca.capabilities.network.Bindable occurrences: @@ -3220,24 +3203,42 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pcma_server_pcm_port_0: + forwarder_pcma_server_pcm_port_0_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes_pcma_server_pcm_port_1_0: 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_pcma_server: + network.incoming.packets.rate_pcma_server_pcm_port_0_0: 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_pcma_server_pcm_port_1: + feature_pcma_server_pcm_port_0_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + disk.write.requests_pcma_server: 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_pcma_server_pcm_port_1_0: + 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 disk.write.requests.rate_pcma_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3250,82 +3251,93 @@ node_types: occurrences: - 1 - UNBOUNDED - instance_pcma_server: + network.incoming.bytes_pcma_server_pcm_port_0_0: 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_pcma_server: + instance_pcma_server: 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_pcma_server: + disk.device.latency_pcma_server: 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_pcma_server: + disk.capacity_pcma_server: 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_pcma_server_pcm_port_1: + disk.device.capacity_pcma_server: 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_pcma_server_pcm_port_0: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_pcma_server_pcm_port_0_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED org.openecomp.resource.abstract.nodes.b_single_1b: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_1b_t1_port_order: - type: integer + port_b_single_1b_t1_port_0_network_role_tag: + type: string + required: true + status: SUPPORTED + port_b_single_1b_t1_port_0_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_b_single_1b_t2_port_0_subnetpoolid: + type: string required: true status: SUPPORTED - port_1b_t1_port_network_role: + port_b_single_1b_t1_port_0_network_role: type: string required: true status: SUPPORTED - port_1b_t1_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_b_single_1b_t2_port_0_network: + type: list required: true status: SUPPORTED + entry_schema: + type: string vm_flavor_name: type: string required: true status: SUPPORTED - port_1b_t2_port_related_networks: + port_b_single_1b_t1_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_1b_t1_port_ip_requirements: + type: org.openecomp.datatypes.network.VlanRequirements + port_b_single_1b_t2_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_image_name: type: string required: true status: SUPPORTED - port_1b_t2_port_network_role: - type: string + port_b_single_1b_t2_port_0_order: + type: integer required: true status: SUPPORTED - port_1b_t2_port_order: + port_b_single_1b_t1_port_0_order: type: integer required: true status: SUPPORTED @@ -3335,34 +3347,32 @@ node_types: status: SUPPORTED entry_schema: type: string - port_1b_t2_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_1b_t2_port_network_role_tag: - type: string + port_b_single_1b_t2_port_0_vlan_requirements: + type: list required: true status: SUPPORTED - port_1b_t2_port_subnetpoolid: + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_b_single_1b_t2_port_0_network_role: type: string required: true status: SUPPORTED - port_1b_t1_port_related_networks: + port_b_single_1b_t1_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_1b_t2_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED + type: org.openecomp.datatypes.network.IpRequirements compute_b_single_1b_availability_zone: type: list required: true status: SUPPORTED entry_schema: type: string + port_b_single_1b_t1_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED index_value: type: integer description: Index value of this substitution service template runtime instance @@ -3377,42 +3387,32 @@ node_types: status: SUPPORTED entry_schema: type: json - port_1b_t2_port_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_1b_t2_port_ip_requirements: - type: list + port_b_single_1b_t1_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_1b_t1_port_network_role_tag: + port_b_single_1b_t1_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_1b_t1_port_subnetpoolid: + port_b_single_1b_t2_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_1b_t1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_1b_t2_port_network: + port_b_single_1b_t2_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_1b_t1_port_vlan_requirements: - type: list + type: org.openecomp.datatypes.network.IpRequirements + port_b_single_1b_t2_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_b_single_1b_t2_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements compute_b_single_1b_name: type: list required: true @@ -3423,7 +3423,7 @@ node_types: b_single_1b_instance_name: type: string status: SUPPORTED - b_single_1b_1b_t1_port_tenant_id: + b_single_1b_b_single_1b_t1_port_0_tenant_id: type: string status: SUPPORTED requirements: @@ -3441,43 +3441,33 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_b_single_1b_1b_t1_port: + - dependency_b_single_1b_b_single_1b_t2_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_b_single_1b_1b_t1_port: + - link_b_single_1b_b_single_1b_t2_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_b_single_1b_1b_t2_port: + - dependency_b_single_1b_b_single_1b_t1_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_b_single_1b_1b_t2_port: + - link_b_single_1b_b_single_1b_t1_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: - attachment_b_single_1b_1b_t2_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - forwarder_b_single_1b_1b_t2_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED endpoint_b_single_1b: type: tosca.capabilities.Endpoint.Admin occurrences: @@ -3494,23 +3484,56 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_b_single_1b_1b_t2_port: + network.incoming.bytes_b_single_1b_b_single_1b_t1_port_0: 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_b_single_1b_1b_t2_port: + network.incoming.packets.rate_b_single_1b_b_single_1b_t2_port_0: 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_b_single_1b_1b_t1_port: - type: org.openecomp.capabilities.Forwarder + network.incoming.bytes_b_single_1b_b_single_1b_t2_port_0: + 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_b_single_1b_b_single_1b_t1_port_0: + 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 + feature_b_single_1b_b_single_1b_t2_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED + feature_b_single_1b_b_single_1b_t1_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes.rate_b_single_1b_b_single_1b_t1_port_0: + 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_b_single_1b_b_single_1b_t2_port_0: + 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 scalable_b_single_1b: type: tosca.capabilities.Scalable occurrences: @@ -3527,6 +3550,16 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_b_single_1b_b_single_1b_t2_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + forwarder_b_single_1b_b_single_1b_t1_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED vcpus_b_single_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3539,25 +3572,25 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.read.requests.rate_b_single_1b: + network.incoming.bytes.rate_b_single_1b_b_single_1b_t2_port_0: 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_b_single_1b_1b_t2_port: + disk.device.read.requests.rate_b_single_1b: 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 - instance_b_single_1b: + network.incoming.packets.rate_b_single_1b_b_single_1b_t1_port_0: 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_b_single_1b_1b_t1_port: + instance_b_single_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -3581,49 +3614,43 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_b_single_1b_1b_t1_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.device.allocation_b_single_1b: 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.packets.rate_b_single_1b_1b_t2_port: + network.outgoing.packets.rate_b_single_1b_b_single_1b_t2_port_0: 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_b_single_1b: + network.outpoing.packets_b_single_1b_b_single_1b_t1_port_0: 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_b_single_1b: + network.outgoing.bytes_b_single_1b_b_single_1b_t2_port_0: 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_b_single_1b_1b_t2_port: + disk.device.capacity_b_single_1b: 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_b_single_1b_1b_t1_port: + disk.latency_b_single_1b: 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 - attachment_b_single_1b_1b_t1_port: + attachment_b_single_1b_b_single_1b_t1_port_0: type: tosca.capabilities.Attachment occurrences: - 1 @@ -3634,14 +3661,6 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_b_single_1b_1b_t2_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 disk.ephemeral.size_b_single_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3654,25 +3673,25 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_b_single_1b_1b_t2_port: + disk.device.iops_b_single_1b: 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.iops_b_single_1b: + disk.read.requests_b_single_1b: 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_b_single_1b: + memory.resident_b_single_1b: 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_b_single_1b: + network.outgoing.bytes.rate_b_single_1b_b_single_1b_t2_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -3684,12 +3703,13 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_b_single_1b_1b_t1_port: - type: tosca.capabilities.Node + network.incoming.packets_b_single_1b_b_single_1b_t1_port_0: + 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_b_single_1b_1b_t2_port: + network.outgoing.bytes.rate_b_single_1b_b_single_1b_t1_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -3731,7 +3751,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_b_single_1b_1b_t1_port: + network.incoming.packets_b_single_1b_b_single_1b_t2_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -3749,63 +3769,48 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_b_single_1b_1b_t1_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.device.read.requests_b_single_1b: 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_b_single_1b_1b_t1_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_b_single_1b_b_single_1b_t2_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - binding_b_single_1b_1b_t1_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 - network.outpoing.packets_b_single_1b_1b_t1_port: + disk.device.write.requests.rate_b_single_1b: 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_b_single_1b: + network.outgoing.packets.rate_b_single_1b_b_single_1b_t1_port_0: 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_b_single_1b: + network.outpoing.packets_b_single_1b_b_single_1b_t2_port_0: 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_b_single_1b: + memory.usage_b_single_1b: 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_b_single_1b_1b_t2_port: + network.outgoing.bytes_b_single_1b_b_single_1b_t1_port_0: 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_b_single_1b_1b_t1_port: + disk.write.bytes.rate_b_single_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -3847,112 +3852,91 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_b_single_1b_1b_t2_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED org.openecomp.resource.abstract.nodes.1c1_scalling_instance: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_1c1_t1_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_1c1_t2_port_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements compute_1c1_scalling_instance_user_data_format: type: list required: true status: SUPPORTED entry_schema: type: string - port_1c1_t2_port_related_networks: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_1c1_t2_port_network_role_tag: - type: string - required: true - status: SUPPORTED - vm_flavor_name: - type: string - required: true - status: SUPPORTED - port_1c1_t1_port_related_networks: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_1c1_t1_port_ip_requirements: + port_1c1_scalling_instance_t1_port_0_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - vm_image_name: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_1c1_scalling_instance_t1_port_0_network_role_tag: type: string required: true status: SUPPORTED - compute_1c1_scalling_instance_name: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_1c1_t1_port_name: + port_1c1_scalling_instance_t2_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: string - port_1c1_t1_port_network: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_1c1_scalling_instance_t1_port_0_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_1c1_t2_port_fixed_ips: + vm_flavor_name: + type: string + required: true + status: SUPPORTED + port_1c1_scalling_instance_t2_port_0_fixed_ips: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_1c1_t2_port_network: + port_1c1_scalling_instance_t1_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_1c1_t1_port_fixed_ips: - type: list + type: org.openecomp.datatypes.network.IpRequirements + port_1c1_scalling_instance_t1_port_0_network_role: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_1c1_t1_port_vlan_requirements: - type: list + port_1c1_scalling_instance_t2_port_0_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_1c1_t2_port_ip_requirements: + port_1c1_scalling_instance_t2_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + vm_image_name: + type: string + required: true + status: SUPPORTED + compute_1c1_scalling_instance_name: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_1c1_t1_port_mac_requirements: + type: string + port_1c1_scalling_instance_t2_port_0_network_role: + type: string + required: true + status: SUPPORTED + port_1c1_scalling_instance_t1_port_0_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED + port_1c1_scalling_instance_t1_port_0_subnetpoolid: + type: string + required: true + status: SUPPORTED + port_1c1_scalling_instance_t2_port_0_order: + type: integer + required: true + status: SUPPORTED index_value: type: integer description: Index value of this substitution service template runtime instance @@ -3961,76 +3945,92 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_1c1_t2_port_network_role: - type: string + port_1c1_scalling_instance_t1_port_0_order: + type: integer required: true status: SUPPORTED - port_1c1_t2_port_order: - type: integer + port_1c1_scalling_instance_t2_port_0_vlan_requirements: + type: list required: true status: SUPPORTED - port_1c1_t2_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_1c1_scalling_instance_t1_port_0_name: + type: list required: true status: SUPPORTED + entry_schema: + type: string compute_1c1_scalling_instance_availability_zone: type: list required: true status: SUPPORTED entry_schema: type: string - port_1c1_t2_port_subnetpoolid: - type: string + port_1c1_scalling_instance_t2_port_0_ip_requirements: + type: list required: true status: SUPPORTED - port_1c1_t2_port_name: + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_1c1_scalling_instance_t2_port_0_name: type: list required: true status: SUPPORTED entry_schema: type: string + port_1c1_scalling_instance_t2_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_1c1_scalling_instance_t1_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED compute_1c1_scalling_instance_scheduler_hints: type: list required: true status: SUPPORTED entry_schema: type: json - port_1c1_t2_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_1c1_t1_port_subnetpoolid: - type: string + port_1c1_scalling_instance_t1_port_0_vlan_requirements: + type: list required: true status: SUPPORTED - port_1c1_t1_port_network_role_tag: + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_1c1_scalling_instance_t2_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_1c1_t1_port_network_role: - type: string + port_1c1_scalling_instance_t1_port_0_related_networks: + type: list required: true status: SUPPORTED - port_1c1_t1_port_order: - type: integer + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_1c1_scalling_instance_t2_port_0_network: + type: list required: true status: SUPPORTED + entry_schema: + type: string attributes: 1c1_scalling_instance_instance_name: type: string status: SUPPORTED - 1c1_scalling_instance_1c1_t2_port_tenant_id: + 1c1_scalling_instance_1c1_scalling_instance_t2_port_0_tenant_id: type: string status: SUPPORTED requirements: - - dependency_1c1_scalling_instance_1c1_t1_port: + - dependency_1c1_scalling_instance_1c1_scalling_instance_t2_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_1c1_scalling_instance_1c1_t1_port: + - link_1c1_scalling_instance_1c1_scalling_instance_t2_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -4050,14 +4050,14 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_1c1_scalling_instance_1c1_t2_port: + - dependency_1c1_scalling_instance_1c1_scalling_instance_t1_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_1c1_scalling_instance_1c1_t2_port: + - link_1c1_scalling_instance_1c1_scalling_instance_t1_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -4093,17 +4093,26 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_1c1_scalling_instance_1c1_t2_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_1c1_scalling_instance_1c1_scalling_instance_t2_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_1c1_scalling_instance_1c1_t2_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_1c1_scalling_instance_1c1_scalling_instance_t1_port_0: + 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: - - 1 + - 0 + - UNBOUNDED + binding_1c1_scalling_instance_1c1_scalling_instance_t2_port_0: + 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 disk.usage_1c1_scalling_instance: type: org.openecomp.capabilities.metric.Ceilometer @@ -4111,13 +4120,12 @@ node_types: occurrences: - 1 - UNBOUNDED - memory.resident_1c1_scalling_instance: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_1c1_scalling_instance_1c1_scalling_instance_t2_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_1c1_scalling_instance_1c1_t2_port: + memory.resident_1c1_scalling_instance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -4129,7 +4137,7 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_1c1_scalling_instance_1c1_t2_port: + forwarder_1c1_scalling_instance_1c1_scalling_instance_t1_port_0: type: org.openecomp.capabilities.Forwarder occurrences: - 1 @@ -4140,18 +4148,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_1c1_scalling_instance_1c1_t1_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.incoming.bytes_1c1_scalling_instance_1c1_t1_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.write.bytes.rate_1c1_scalling_instance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4164,7 +4160,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_1c1_scalling_instance_1c1_t1_port: + network.outgoing.bytes.rate_1c1_scalling_instance_1c1_scalling_instance_t1_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -4175,24 +4171,19 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.write.requests.rate_1c1_scalling_instance: + network.outgoing.bytes.rate_1c1_scalling_instance_1c1_scalling_instance_t2_port_0: 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_1c1_scalling_instance_1c1_t1_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - disk.read.bytes.rate_1c1_scalling_instance: + disk.device.write.requests.rate_1c1_scalling_instance: 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_1c1_scalling_instance_1c1_t2_port: + disk.read.bytes.rate_1c1_scalling_instance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -4209,14 +4200,6 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_1c1_scalling_instance_1c1_t2_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 disk.device.write.bytes_1c1_scalling_instance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4229,19 +4212,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_1c1_scalling_instance_1c1_t2_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 vcpus_1c1_scalling_instance: 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_1c1_scalling_instance_1c1_t1_port: + network.incoming.packets_1c1_scalling_instance_1c1_scalling_instance_t2_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -4254,33 +4231,38 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.packets.rate_1c1_scalling_instance_1c1_scalling_instance_t1_port_0: + 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_1c1_scalling_instance: 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_1c1_scalling_instance_1c1_t1_port: - type: tosca.capabilities.Node + network.incoming.packets.rate_1c1_scalling_instance_1c1_scalling_instance_t1_port_0: + 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_1c1_scalling_instance_1c1_t1_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 + feature_1c1_scalling_instance_1c1_scalling_instance_t1_port_0: + type: tosca.capabilities.Node occurrences: - - 0 + - 1 - UNBOUNDED - disk.device.read.requests.rate_1c1_scalling_instance: + network.outpoing.packets_1c1_scalling_instance_1c1_scalling_instance_t2_port_0: 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 - attachment_1c1_scalling_instance_1c1_t2_port: - type: tosca.capabilities.Attachment + disk.device.read.requests.rate_1c1_scalling_instance: + 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 @@ -4290,12 +4272,17 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_1c1_scalling_instance_1c1_t1_port: + network.incoming.bytes.rate_1c1_scalling_instance_1c1_scalling_instance_t1_port_0: 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 + attachment_1c1_scalling_instance_1c1_scalling_instance_t1_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED disk.device.iops_1c1_scalling_instance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4308,6 +4295,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes_1c1_scalling_instance_1c1_scalling_instance_t2_port_0: + 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_1c1_scalling_instance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4326,6 +4319,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes_1c1_scalling_instance_1c1_scalling_instance_t2_port_0: + 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_1c1_scalling_instance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4338,19 +4337,19 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.write.requests_1c1_scalling_instance: + network.outgoing.bytes_1c1_scalling_instance_1c1_scalling_instance_t1_port_0: 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_1c1_scalling_instance_1c1_t1_port: + network.incoming.packets_1c1_scalling_instance_1c1_scalling_instance_t1_port_0: 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_1c1_scalling_instance_1c1_t2_port: + disk.device.write.requests_1c1_scalling_instance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -4373,70 +4372,71 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_1c1_scalling_instance_1c1_t1_port: + disk.allocation_1c1_scalling_instance: 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.allocation_1c1_scalling_instance: + memory.usage_1c1_scalling_instance: 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_1c1_scalling_instance_1c1_t2_port: - type: tosca.capabilities.Node + os_1c1_scalling_instance: + type: tosca.capabilities.OperatingSystem occurrences: - 1 - UNBOUNDED - memory.usage_1c1_scalling_instance: + disk.iops_1c1_scalling_instance: 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_1c1_scalling_instance_1c1_t2_port: + network.outgoing.packets.rate_1c1_scalling_instance_1c1_scalling_instance_t2_port_0: 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_1c1_scalling_instance_1c1_t2_port: + network.outpoing.packets_1c1_scalling_instance_1c1_scalling_instance_t1_port_0: 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_1c1_scalling_instance: - type: tosca.capabilities.OperatingSystem + cpu.delta_1c1_scalling_instance: + 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.iops_1c1_scalling_instance: + memory_1c1_scalling_instance: 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_1c1_scalling_instance_1c1_t1_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_1c1_scalling_instance_1c1_scalling_instance_t2_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - attachment_1c1_scalling_instance_1c1_t1_port: - type: tosca.capabilities.Attachment + network.incoming.bytes.rate_1c1_scalling_instance_1c1_scalling_instance_t2_port_0: + 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_1c1_scalling_instance: + network.incoming.bytes_1c1_scalling_instance_1c1_scalling_instance_t1_port_0: 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_1c1_scalling_instance: + network.incoming.packets.rate_1c1_scalling_instance_1c1_scalling_instance_t2_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -4451,41 +4451,39 @@ node_types: org.openecomp.resource.abstract.nodes.a_single_1a: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_1a_t1_port_ip_requirements: + port_a_single_1a_t1_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_1a_t2_port_network_role_tag: - type: string - required: true - status: SUPPORTED - vm_flavor_name: - type: string + type: org.openecomp.datatypes.network.VlanRequirements + port_a_single_1a_t1_port_0_order: + type: integer required: true status: SUPPORTED - port_1a_t2_port_network_role: - type: string + port_a_single_1a_t2_port_0_order: + type: integer required: true status: SUPPORTED - port_1a_t2_port_network: + port_a_single_1a_t2_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_1a_t1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + type: org.openecomp.datatypes.network.VlanRequirements + vm_flavor_name: + type: string required: true status: SUPPORTED - port_1a_t1_port_network: - type: list + port_a_single_1a_t2_port_0_network_role_tag: + type: string required: true status: SUPPORTED - entry_schema: - type: string - port_1a_t1_port_subnetpoolid: + port_a_single_1a_t1_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_a_single_1a_t1_port_0_subnetpoolid: type: string required: true status: SUPPORTED @@ -4493,28 +4491,36 @@ node_types: type: string required: true status: SUPPORTED - port_1a_t2_port_related_networks: + port_a_single_1a_t2_port_0_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_1a_t2_port_ip_requirements: + type: string + port_a_single_1a_t1_port_0_network_role_tag: + type: string + required: true + status: SUPPORTED + port_a_single_1a_t1_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_1a_t1_port_vlan_requirements: - type: list + port_a_single_1a_t2_port_0_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_1a_t1_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_a_single_1a_t2_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_a_single_1a_t1_port_0_network: + type: list required: true status: SUPPORTED + entry_schema: + type: string compute_a_single_1a_availability_zone: type: list required: true @@ -4535,42 +4541,36 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_1a_t1_port_related_networks: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_1a_t1_port_network_role_tag: + port_a_single_1a_t1_port_0_network_role: type: string required: true status: SUPPORTED - port_1a_t1_port_network_role: - type: string + port_a_single_1a_t1_port_0_related_networks: + type: list required: true status: SUPPORTED - port_1a_t1_port_order: - type: integer + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_a_single_1a_t1_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_1a_t2_port_exCP_naming: + port_a_single_1a_t2_port_0_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_1a_t2_port_vlan_requirements: + port_a_single_1a_t2_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_1a_t2_port_subnetpoolid: - type: string - required: true - status: SUPPORTED - port_1a_t2_port_order: - type: integer + type: org.openecomp.datatypes.network.IpRequirements + port_a_single_1a_t2_port_0_related_networks: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments compute_a_single_1a_user_data_format: type: list required: true @@ -4583,26 +4583,26 @@ node_types: status: SUPPORTED entry_schema: type: string - port_1a_t2_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_a_single_1a_t2_port_0_network_role: + type: string required: true status: SUPPORTED attributes: - a_single_1a_instance_name: + a_single_1a_a_single_1a_t1_port_0_tenant_id: type: string status: SUPPORTED - a_single_1a_1a_t1_port_tenant_id: + a_single_1a_instance_name: type: string status: SUPPORTED requirements: - - dependency_a_single_1a_1a_t1_port: + - dependency_a_single_1a_a_single_1a_t2_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_a_single_1a_1a_t1_port: + - link_a_single_1a_a_single_1a_t2_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -4622,14 +4622,14 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_a_single_1a_1a_t2_port: + - dependency_a_single_1a_a_single_1a_t1_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_a_single_1a_1a_t2_port: + - link_a_single_1a_a_single_1a_t1_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -4642,29 +4642,36 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_a_single_1a_1a_t2_port: + disk.usage_a_single_1a: 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_a_single_1a: + network.incoming.bytes.rate_a_single_1a_a_single_1a_t2_port_0: 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 - attachment_a_single_1a_1a_t2_port: - type: tosca.capabilities.Attachment + scalable_a_single_1a: + type: tosca.capabilities.Scalable occurrences: - 1 - UNBOUNDED - scalable_a_single_1a: - type: tosca.capabilities.Scalable + network.incoming.packets.rate_a_single_1a_a_single_1a_t2_port_0: + 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_a_single_1a_a_single_1a_t2_port_0: + 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_a_single_1a_1a_t2_port: + network.incoming.bytes.rate_a_single_1a_a_single_1a_t1_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -4694,44 +4701,38 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_a_single_1a_1a_t2_port: + cpu.delta_a_single_1a: 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_a_single_1a: + network.incoming.bytes_a_single_1a_a_single_1a_t1_port_0: 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_a_single_1a_1a_t1_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED disk.device.write.requests_a_single_1a: 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_a_single_1a_1a_t1_port: + disk.iops_a_single_1a: 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.iops_a_single_1a: + network.outgoing.bytes_a_single_1a_a_single_1a_t2_port_0: 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_a_single_1a_1a_t1_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_a_single_1a_a_single_1a_t1_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED @@ -4752,15 +4753,8 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_a_single_1a_1a_t1_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.packets.rate_a_single_1a_1a_t2_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_a_single_1a_a_single_1a_t1_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED @@ -4776,14 +4770,22 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_a_single_1a_a_single_1a_t2_port_0: + 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 disk.write.bytes.rate_a_single_1a: 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 - attachment_a_single_1a_1a_t1_port: - type: tosca.capabilities.Attachment + feature_a_single_1a_a_single_1a_t2_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -4799,8 +4801,9 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_a_single_1a_1a_t2_port: - type: org.openecomp.capabilities.Forwarder + network.outpoing.packets_a_single_1a_a_single_1a_t1_port_0: + 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 @@ -4810,15 +4813,7 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_a_single_1a_1a_t2_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 - network.incoming.packets_a_single_1a_1a_t2_port: + network.outgoing.packets.rate_a_single_1a_a_single_1a_t2_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -4853,12 +4848,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_a_single_1a_1a_t2_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.device.allocation_a_single_1a: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4871,36 +4860,25 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_a_single_1a_1a_t1_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - network.outpoing.packets_a_single_1a_1a_t2_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.outpoing.packets_a_single_1a_1a_t1_port: + disk.device.read.bytes.rate_a_single_1a: 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_a_single_1a: + disk.device.write.bytes_a_single_1a: 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_a_single_1a: + disk.device.write.bytes.rate_a_single_1a: 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_a_single_1a: + network.incoming.packets_a_single_1a_a_single_1a_t2_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -4918,30 +4896,31 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_a_single_1a_1a_t1_port: + network.incoming.packets_a_single_1a_a_single_1a_t1_port_0: 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_a_single_1a_1a_t2_port: - type: tosca.capabilities.Node + network.outgoing.bytes.rate_a_single_1a_a_single_1a_t2_port_0: + 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_a_single_1a: + network.outgoing.bytes.rate_a_single_1a_a_single_1a_t1_port_0: 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_a_single_1a: + disk.capacity_a_single_1a: 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_a_single_1a_1a_t1_port: + disk.device.read.bytes_a_single_1a: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -4952,12 +4931,17 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_a_single_1a_1a_t1_port: + network.outgoing.bytes_a_single_1a_a_single_1a_t1_port_0: 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_a_single_1a_a_single_1a_t2_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.ephemeral.size_a_single_1a: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4970,13 +4954,16 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_a_single_1a_1a_t1_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 + attachment_a_single_1a_a_single_1a_t2_port_0: + type: tosca.capabilities.Attachment occurrences: - - 0 + - 1 + - UNBOUNDED + network.incoming.packets.rate_a_single_1a_a_single_1a_t1_port_0: + 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.iops_a_single_1a: type: org.openecomp.capabilities.metric.Ceilometer @@ -4990,31 +4977,44 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.read.requests.rate_a_single_1a: + network.outpoing.packets_a_single_1a_a_single_1a_t2_port_0: 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_a_single_1a: + disk.device.read.requests.rate_a_single_1a: 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_a_single_1a: + feature_a_single_1a_a_single_1a_t1_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + disk.device.capacity_a_single_1a: 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_a_single_1a_1a_t2_port: + binding_a_single_1a_a_single_1a_t1_port_0: + 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 + disk.write.requests.rate_a_single_1a: 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_a_single_1a_1a_t1_port: + network.outgoing.packets.rate_a_single_1a_a_single_1a_t1_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -5023,43 +5023,55 @@ node_types: org.openecomp.resource.abstract.nodes.b_single_1b_1: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_1b_t1_port_order: - type: integer + port_b_single_1b_t1_port_0_network_role_tag: + type: string + required: true + status: SUPPORTED + port_b_single_1b_t1_port_0_related_networks: + type: list required: true status: SUPPORTED - port_1b_t1_port_network_role: + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_b_single_1b_t2_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_1b_t1_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_b_single_1b_t1_port_0_network_role: + type: string + required: true + status: SUPPORTED + port_b_single_1b_t2_port_0_network: + type: list required: true status: SUPPORTED + entry_schema: + type: string vm_flavor_name: type: string required: true status: SUPPORTED - port_1b_t2_port_related_networks: + port_b_single_1b_t1_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_1b_t1_port_ip_requirements: + type: org.openecomp.datatypes.network.VlanRequirements + port_b_single_1b_t2_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_image_name: type: string required: true status: SUPPORTED - port_1b_t2_port_network_role: - type: string + port_b_single_1b_t2_port_0_order: + type: integer required: true status: SUPPORTED - port_1b_t2_port_order: + port_b_single_1b_t1_port_0_order: type: integer required: true status: SUPPORTED @@ -5069,34 +5081,32 @@ node_types: status: SUPPORTED entry_schema: type: string - port_1b_t2_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_1b_t2_port_network_role_tag: - type: string + port_b_single_1b_t2_port_0_vlan_requirements: + type: list required: true status: SUPPORTED - port_1b_t2_port_subnetpoolid: + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_b_single_1b_t2_port_0_network_role: type: string required: true status: SUPPORTED - port_1b_t1_port_related_networks: + port_b_single_1b_t1_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_1b_t2_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED + type: org.openecomp.datatypes.network.IpRequirements compute_b_single_1b_availability_zone: type: list required: true status: SUPPORTED entry_schema: type: string + port_b_single_1b_t1_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED index_value: type: integer description: Index value of this substitution service template runtime instance @@ -5111,48 +5121,38 @@ node_types: status: SUPPORTED entry_schema: type: json - port_1b_t2_port_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_1b_t2_port_ip_requirements: - type: list + port_b_single_1b_t1_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_1b_t1_port_network_role_tag: + port_b_single_1b_t1_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_1b_t1_port_subnetpoolid: + port_b_single_1b_t2_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_1b_t1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_1b_t2_port_network: + port_b_single_1b_t1_port_0_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_1b_t1_port_vlan_requirements: + port_b_single_1b_t2_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_1b_t1_port_network: - type: list + type: org.openecomp.datatypes.network.IpRequirements + port_b_single_1b_t2_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_b_single_1b_t2_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: string compute_b_single_1b_name: type: list required: true @@ -5163,7 +5163,7 @@ node_types: b_single_1b_instance_name: type: string status: SUPPORTED - b_single_1b_1b_t1_port_tenant_id: + b_single_1b_b_single_1b_t1_port_0_tenant_id: type: string status: SUPPORTED requirements: @@ -5181,43 +5181,33 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_b_single_1b_1b_t1_port: + - dependency_b_single_1b_b_single_1b_t2_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_b_single_1b_1b_t1_port: + - link_b_single_1b_b_single_1b_t2_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_b_single_1b_1b_t2_port: + - dependency_b_single_1b_b_single_1b_t1_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_b_single_1b_1b_t2_port: + - link_b_single_1b_b_single_1b_t1_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: - attachment_b_single_1b_1b_t2_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - forwarder_b_single_1b_1b_t2_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED endpoint_b_single_1b: type: tosca.capabilities.Endpoint.Admin occurrences: @@ -5234,23 +5224,56 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_b_single_1b_1b_t2_port: + network.incoming.bytes_b_single_1b_b_single_1b_t1_port_0: 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_b_single_1b_1b_t2_port: + network.incoming.packets.rate_b_single_1b_b_single_1b_t2_port_0: 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_b_single_1b_1b_t1_port: - type: org.openecomp.capabilities.Forwarder + network.incoming.bytes_b_single_1b_b_single_1b_t2_port_0: + 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_b_single_1b_b_single_1b_t1_port_0: + 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 + feature_b_single_1b_b_single_1b_t2_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + feature_b_single_1b_b_single_1b_t1_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes.rate_b_single_1b_b_single_1b_t1_port_0: + 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_b_single_1b_b_single_1b_t2_port_0: + 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 scalable_b_single_1b: type: tosca.capabilities.Scalable occurrences: @@ -5267,6 +5290,16 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_b_single_1b_b_single_1b_t2_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + forwarder_b_single_1b_b_single_1b_t1_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED vcpus_b_single_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -5279,25 +5312,25 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.read.requests.rate_b_single_1b: + network.incoming.bytes.rate_b_single_1b_b_single_1b_t2_port_0: 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_b_single_1b_1b_t2_port: + disk.device.read.requests.rate_b_single_1b: 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 - instance_b_single_1b: + network.incoming.packets.rate_b_single_1b_b_single_1b_t1_port_0: 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_b_single_1b_1b_t1_port: + instance_b_single_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -5321,49 +5354,43 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_b_single_1b_1b_t1_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.device.allocation_b_single_1b: 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.packets.rate_b_single_1b_1b_t2_port: + network.outgoing.packets.rate_b_single_1b_b_single_1b_t2_port_0: 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_b_single_1b: + network.outpoing.packets_b_single_1b_b_single_1b_t1_port_0: 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_b_single_1b: + network.outgoing.bytes_b_single_1b_b_single_1b_t2_port_0: 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_b_single_1b_1b_t2_port: + disk.device.capacity_b_single_1b: 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_b_single_1b_1b_t1_port: + disk.latency_b_single_1b: 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 - attachment_b_single_1b_1b_t1_port: + attachment_b_single_1b_b_single_1b_t1_port_0: type: tosca.capabilities.Attachment occurrences: - 1 @@ -5374,14 +5401,6 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_b_single_1b_1b_t2_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 disk.ephemeral.size_b_single_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -5394,25 +5413,25 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_b_single_1b_1b_t2_port: + disk.device.iops_b_single_1b: 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.iops_b_single_1b: + disk.read.requests_b_single_1b: 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_b_single_1b: + memory.resident_b_single_1b: 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_b_single_1b: + network.outgoing.bytes.rate_b_single_1b_b_single_1b_t2_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -5424,12 +5443,13 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_b_single_1b_1b_t1_port: - type: tosca.capabilities.Node + network.incoming.packets_b_single_1b_b_single_1b_t1_port_0: + 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_b_single_1b_1b_t2_port: + network.outgoing.bytes.rate_b_single_1b_b_single_1b_t1_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -5471,7 +5491,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_b_single_1b_1b_t1_port: + network.incoming.packets_b_single_1b_b_single_1b_t2_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -5489,63 +5509,48 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_b_single_1b_1b_t1_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.device.read.requests_b_single_1b: 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_b_single_1b_1b_t1_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_b_single_1b_b_single_1b_t2_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - binding_b_single_1b_1b_t1_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 - network.outpoing.packets_b_single_1b_1b_t1_port: + disk.device.write.requests.rate_b_single_1b: 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_b_single_1b: + network.outgoing.packets.rate_b_single_1b_b_single_1b_t1_port_0: 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_b_single_1b: + network.outpoing.packets_b_single_1b_b_single_1b_t2_port_0: 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_b_single_1b: + memory.usage_b_single_1b: 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_b_single_1b_1b_t2_port: + network.outgoing.bytes_b_single_1b_b_single_1b_t1_port_0: 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_b_single_1b_1b_t1_port: + disk.write.bytes.rate_b_single_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -5587,11 +5592,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_b_single_1b_1b_t2_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED org.openecomp.resource.abstract.nodes.heat.nested-no-nova: derived_from: org.openecomp.resource.abstract.nodes.AbstractSubstitute properties: 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 a7aec720a7..7a0d3d0944 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/MainServiceTemplate.yaml @@ -243,36 +243,36 @@ topology_template: directives: - substitutable properties: + port_b_single_1b_t2_port_0_network: + - b_single_1b_network vm_flavor_name: get_input: pd_flavor_name - port_1b_t1_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false vm_image_name: get_input: pd_image_name compute_b_single_1b_user_data_format: - RAW - port_1b_t2_port_mac_requirements: - mac_count_required: + port_b_single_1b_t1_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: is_required: false compute_b_single_1b_availability_zone: - get_input: availabilityzone_name compute_b_single_1b_scheduler_hints: - group: BE_Affinity_group - port_1b_t2_port_ip_requirements: + port_b_single_1b_t1_port_0_mac_requirements: + mac_count_required: + is_required: false + port_b_single_1b_t2_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_1b_t1_port_mac_requirements: + port_b_single_1b_t2_port_0_mac_requirements: mac_count_required: is_required: false - port_1b_t2_port_network: - - b_single_1b_network compute_b_single_1b_name: - get_input: - b_single_1b_names @@ -286,7 +286,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_b_single_1b_1b_t2_port: + - link_b_single_1b_b_single_1b_t2_port_0: capability: tosca.capabilities.network.Linkable node: b_single_1b_network relationship: tosca.relationships.network.LinksTo @@ -298,31 +298,7 @@ topology_template: compute_1c1_scalling_instance_user_data_format: - RAW2 - RAW1 - port_1c1_t2_port_network_role_tag: ppds - vm_flavor_name: - get_input: pd_flavor_name - port_1c1_t1_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false - vm_image_name: - get_input: pd_image_name - compute_1c1_scalling_instance_name: - - get_input: - - 1c1_scalling_instance_names - - 2 - - get_input: - - 1c1_scalling_instance_names - - 1 - port_1c1_t1_port_name: - - 1c1_t1_port_1 - - 1c1_t1_port_0 - port_1c1_t1_port_network: - - 1c1_scalling_instance_network - - 1c1_scalling_instance_network - port_1c1_t2_port_fixed_ips: + port_1c1_scalling_instance_t1_port_0_fixed_ips: - - ip_address: get_input: - myIPs @@ -331,10 +307,12 @@ topology_template: get_input: - myIPs - 1 - port_1c1_t2_port_network: - - get_input: ppds_net_name - - get_input: ppds_net_name - port_1c1_t1_port_fixed_ips: + port_1c1_scalling_instance_t1_port_0_network: + - 1c1_scalling_instance_network + - 1c1_scalling_instance_network + vm_flavor_name: + get_input: pd_flavor_name + port_1c1_scalling_instance_t2_port_0_fixed_ips: - - ip_address: get_input: - myIPs @@ -343,27 +321,49 @@ topology_template: get_input: - myIPs - 1 - port_1c1_t2_port_ip_requirements: + port_1c1_scalling_instance_t1_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false - port_1c1_t1_port_mac_requirements: + port_1c1_scalling_instance_t2_port_0_mac_requirements: mac_count_required: is_required: false - port_1c1_t2_port_mac_requirements: + vm_image_name: + get_input: pd_image_name + compute_1c1_scalling_instance_name: + - get_input: + - 1c1_scalling_instance_names + - 2 + - get_input: + - 1c1_scalling_instance_names + - 1 + port_1c1_scalling_instance_t1_port_0_mac_requirements: mac_count_required: is_required: false + port_1c1_scalling_instance_t1_port_0_name: + - 1c1_scalling_instance_1_t1_port_0 + - 1c1_scalling_instance_0_t1_port_0 compute_1c1_scalling_instance_availability_zone: - get_input: availabilityzone_name - get_input: availabilityzone_name - port_1c1_t2_port_name: - - 1c1_t2_port_1 - - 1c1_t2_port_0 + port_1c1_scalling_instance_t2_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + port_1c1_scalling_instance_t2_port_0_name: + - 1c1_scalling_instance_1_t2_port_0 + - 1c1_scalling_instance_0_t2_port_0 compute_1c1_scalling_instance_scheduler_hints: - group: BE_Affinity_group - group: BE_Affinity_group + port_1c1_scalling_instance_t2_port_0_network_role_tag: ppds + port_1c1_scalling_instance_t2_port_0_network: + - get_input: ppds_net_name + - get_input: ppds_net_name service_template_filter: substitute_service_template: Nested_1c1_scalling_instanceServiceTemplate.yaml count: 2 @@ -373,7 +373,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_1c1_scalling_instance_1c1_t1_port: + - link_1c1_scalling_instance_1c1_scalling_instance_t1_port_0: capability: tosca.capabilities.network.Linkable node: 1c1_scalling_instance_network relationship: tosca.relationships.network.LinksTo @@ -439,41 +439,41 @@ topology_template: directives: - substitutable properties: + port_1c2_catalog_instance_t1_port_0_network: + - get_input: oam_net_name compute_1c2_catalog_instance_availability_zone: - get_input: availabilityzone_name - vm_flavor_name: - get_input: pd_flavor_name - vm_image_name: - get_input: pd_image_name - port_1c2_t2_port_ip_requirements: + port_1c2_catalog_instance_t1_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_1c2_t1_port_mac_requirements: + vm_flavor_name: + get_input: pd_flavor_name + port_1c2_catalog_instance_t2_port_0_network: + - 1c2_catalog_instance_network + vm_image_name: + get_input: pd_image_name + port_1c2_catalog_instance_t1_port_0_mac_requirements: + mac_count_required: + is_required: false + port_1c2_catalog_instance_t2_port_0_mac_requirements: mac_count_required: is_required: false - port_1c2_t2_port_network: - - 1c2_catalog_instance_network compute_1c2_catalog_instance_name: - get_input: - 1c2_catalog_instance_names - 1 - port_1c2_t1_port_network: - - get_input: oam_net_name - port_1c2_t2_port_mac_requirements: - mac_count_required: - is_required: false - compute_1c2_catalog_instance_user_data_format: - - RAW1 - port_1c2_t1_port_network_role_tag: oam - port_1c2_t1_port_ip_requirements: + port_1c2_catalog_instance_t2_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false + compute_1c2_catalog_instance_user_data_format: + - RAW1 + port_1c2_catalog_instance_t1_port_0_network_role_tag: oam compute_1c2_catalog_instance_scheduler_hints: - group: BE_Affinity_group service_template_filter: @@ -485,7 +485,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_1c2_catalog_instance_1c2_t2_port: + - link_1c2_catalog_instance_1c2_catalog_instance_t2_port_0: capability: tosca.capabilities.network.Linkable node: 1c2_catalog_instance_network relationship: tosca.relationships.network.LinksTo @@ -494,43 +494,43 @@ topology_template: directives: - substitutable properties: + port_1c2_catalog_instance_t1_port_0_network: + - get_input: oam_net_name compute_1c2_catalog_instance_availability_zone: - get_input: availabilityzone_name - vm_flavor_name: - get_input: pd_flavor_name - vm_image_name: - get_input: pd_image_name - port_1c2_t2_port_ip_requirements: + port_1c2_catalog_instance_t1_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_1c2_t1_port_mac_requirements: + vm_flavor_name: + get_input: pd_flavor_name + port_1c2_catalog_instance_t2_port_0_network: + - 1c2_catalog_instance_network + vm_image_name: + get_input: pd_image_name + port_1c2_catalog_instance_t1_port_0_mac_requirements: + mac_count_required: + is_required: false + port_1c2_catalog_instance_t2_port_0_mac_requirements: mac_count_required: is_required: false - port_1c2_t2_port_network: - - 1c2_catalog_instance_network compute_1c2_catalog_instance_name: - get_input: - 1c2_catalog_instance_names - 2 - port_1c2_t1_port_network: - - get_input: oam_net_name - port_1c2_t2_port_mac_requirements: - mac_count_required: - is_required: false - compute_1c2_catalog_instance_user_data_format: - - get_attribute: - - abstract_1c2_catalog_instance_0 - - 1c2_catalog_instance_instance_name - port_1c2_t1_port_network_role_tag: oam - port_1c2_t1_port_ip_requirements: + port_1c2_catalog_instance_t2_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false + compute_1c2_catalog_instance_user_data_format: + - get_attribute: + - abstract_1c2_catalog_instance_0 + - 1c2_catalog_instance_instance_name + port_1c2_catalog_instance_t1_port_0_network_role_tag: oam compute_1c2_catalog_instance_scheduler_hints: - group: BE_Affinity_group service_template_filter: @@ -542,7 +542,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_1c2_catalog_instance_1c2_t2_port: + - link_1c2_catalog_instance_1c2_catalog_instance_t2_port_0: capability: tosca.capabilities.network.Linkable node: 1c2_catalog_instance_network relationship: tosca.relationships.network.LinksTo @@ -566,10 +566,10 @@ topology_template: dhcp_agent_ids: get_attribute: - abstract_1c2_catalog_instance_1 - - 1c2_catalog_instance_1c2_t1_port_tenant_id + - 1c2_catalog_instance_1c2_catalog_instance_t1_port_0_tenant_id - get_attribute: - abstract_1c2_catalog_instance_0 - - 1c2_catalog_instance_1c2_t1_port_tenant_id + - 1c2_catalog_instance_1c2_catalog_instance_t1_port_0_tenant_id - get_attribute: - abstract_1c2_catalog_instance_0 - 1c2_catalog_instance_instance_name @@ -585,14 +585,14 @@ topology_template: - 1c1_scalling_instance_instance_name - get_attribute: - abstract_1c1_scalling_instance - - 1c1_scalling_instance_1c1_t2_port_tenant_id + - 1c1_scalling_instance_1c1_scalling_instance_t2_port_0_tenant_id - get_attribute: - abstract_1c1_scalling_instance - - 1c1_scalling_instance_1c1_t2_port_tenant_id + - 1c1_scalling_instance_1c1_scalling_instance_t2_port_0_tenant_id admin_state_up: get_attribute: - abstract_a_single_1a - - a_single_1a_1a_t1_port_tenant_id + - a_single_1a_a_single_1a_t1_port_0_tenant_id qos_policy: get_attribute: - abstract_a_single_1a @@ -613,10 +613,10 @@ topology_template: - b_single_1b_instance_name - get_attribute: - abstract_b_single_1b - - b_single_1b_1b_t1_port_tenant_id + - b_single_1b_b_single_1b_t1_port_0_tenant_id - get_attribute: - abstract_b_single_1b_1 - - b_single_1b_1b_t1_port_tenant_id + - b_single_1b_b_single_1b_t1_port_0_tenant_id dependsOn_network: type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net properties: @@ -624,11 +624,11 @@ topology_template: get_input: net_name requirements: - dependency: - capability: feature_1c2_catalog_instance_1c2_t1_port + capability: feature_1c2_catalog_instance_1c2_catalog_instance_t1_port_0 node: abstract_1c2_catalog_instance_1 relationship: tosca.relationships.DependsOn - dependency: - capability: feature_1c2_catalog_instance_1c2_t1_port + capability: feature_1c2_catalog_instance_1c2_catalog_instance_t1_port_0 node: abstract_1c2_catalog_instance_0 relationship: tosca.relationships.DependsOn - dependency: @@ -644,7 +644,7 @@ topology_template: node: abstract_1c1_scalling_instance relationship: tosca.relationships.DependsOn - dependency: - capability: feature_1c1_scalling_instance_1c1_t2_port + capability: feature_1c1_scalling_instance_1c1_scalling_instance_t2_port_0 node: abstract_1c1_scalling_instance relationship: tosca.relationships.DependsOn - dependency: @@ -656,11 +656,11 @@ topology_template: node: abstract_b_single_1b_1 relationship: tosca.relationships.DependsOn - dependency: - capability: feature_b_single_1b_1b_t1_port + capability: feature_b_single_1b_b_single_1b_t1_port_0 node: abstract_b_single_1b relationship: tosca.relationships.DependsOn - dependency: - capability: feature_b_single_1b_1b_t1_port + capability: feature_b_single_1b_b_single_1b_t1_port_0 node: abstract_b_single_1b_1 relationship: tosca.relationships.DependsOn - dependency: @@ -668,7 +668,7 @@ topology_template: node: abstract_a_single_1a relationship: tosca.relationships.DependsOn - dependency: - capability: feature_a_single_1a_1a_t1_port + capability: feature_a_single_1a_a_single_1a_t1_port_0 node: abstract_a_single_1a relationship: tosca.relationships.DependsOn abstract_a_single_1a: @@ -676,43 +676,43 @@ topology_template: directives: - substitutable properties: - port_1a_t1_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false - port_1a_t2_port_network_role_tag: ppds vm_flavor_name: get_input: pd_flavor_name - port_1a_t2_port_network: - - get_input: ppds_net_name - port_1a_t1_port_mac_requirements: + port_a_single_1a_t2_port_0_network_role_tag: ppds + port_a_single_1a_t1_port_0_mac_requirements: mac_count_required: is_required: false - port_1a_t1_port_network: - - a_single_1a_network vm_image_name: get_input: pd_image_name - port_1a_t2_port_ip_requirements: + port_a_single_1a_t2_port_0_network: + - get_input: ppds_net_name + port_a_single_1a_t1_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false + port_a_single_1a_t2_port_0_mac_requirements: + mac_count_required: + is_required: false + port_a_single_1a_t1_port_0_network: + - a_single_1a_network compute_a_single_1a_availability_zone: - get_input: availabilityzone_name compute_a_single_1a_scheduler_hints: - group: BE_Affinity_group + port_a_single_1a_t2_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false compute_a_single_1a_user_data_format: - RAW compute_a_single_1a_name: - get_input: - a_single_1a_names - 0 - port_1a_t2_port_mac_requirements: - mac_count_required: - is_required: false service_template_filter: substitute_service_template: Nested_a_single_1aServiceTemplate.yaml count: 1 @@ -722,7 +722,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_a_single_1a_1a_t1_port: + - link_a_single_1a_a_single_1a_t1_port_0: capability: tosca.capabilities.network.Linkable node: a_single_1a_network relationship: tosca.relationships.network.LinksTo @@ -832,39 +832,39 @@ topology_template: directives: - substitutable properties: + port_b_single_1b_t1_port_0_network_role_tag: oam + port_b_single_1b_t2_port_0_network: + - b_single_1b_network vm_flavor_name: get_input: pd_flavor_name - port_1b_t1_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false vm_image_name: get_input: pd_image_name compute_b_single_1b_user_data_format: - RAW - port_1b_t2_port_mac_requirements: - mac_count_required: + port_b_single_1b_t1_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: is_required: false compute_b_single_1b_availability_zone: - get_input: availabilityzone_name compute_b_single_1b_scheduler_hints: - group: BE_Affinity_group - port_1b_t2_port_ip_requirements: + port_b_single_1b_t1_port_0_mac_requirements: + mac_count_required: + is_required: false + port_b_single_1b_t1_port_0_network: + - get_input: oam_net_name + port_b_single_1b_t2_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_1b_t1_port_network_role_tag: oam - port_1b_t1_port_mac_requirements: + port_b_single_1b_t2_port_0_mac_requirements: mac_count_required: is_required: false - port_1b_t2_port_network: - - b_single_1b_network - port_1b_t1_port_network: - - get_input: oam_net_name compute_b_single_1b_name: - get_input: - b_single_1b_names @@ -878,7 +878,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_b_single_1b_1b_t2_port: + - link_b_single_1b_b_single_1b_t2_port_0: capability: tosca.capabilities.network.Linkable node: b_single_1b_network relationship: tosca.relationships.network.LinksTo @@ -931,10 +931,10 @@ topology_template: value: get_attribute: - abstract_1c2_catalog_instance_1 - - 1c2_catalog_instance_1c2_t1_port_tenant_id + - 1c2_catalog_instance_1c2_catalog_instance_t1_port_0_tenant_id - get_attribute: - abstract_1c2_catalog_instance_0 - - 1c2_catalog_instance_1c2_t1_port_tenant_id + - 1c2_catalog_instance_1c2_catalog_instance_t1_port_0_tenant_id - get_attribute: - abstract_1c2_catalog_instance_0 - 1c2_catalog_instance_instance_name @@ -951,10 +951,10 @@ topology_template: - 1c1_scalling_instance_instance_name - get_attribute: - abstract_1c1_scalling_instance - - 1c1_scalling_instance_1c1_t2_port_tenant_id + - 1c1_scalling_instance_1c1_scalling_instance_t2_port_0_tenant_id - get_attribute: - abstract_1c1_scalling_instance - - 1c1_scalling_instance_1c1_t2_port_tenant_id + - 1c1_scalling_instance_1c1_scalling_instance_t2_port_0_tenant_id out4: value: get_attribute: @@ -965,10 +965,10 @@ topology_template: - b_single_1b_instance_name - get_attribute: - abstract_b_single_1b - - b_single_1b_1b_t1_port_tenant_id + - b_single_1b_b_single_1b_t1_port_0_tenant_id - get_attribute: - abstract_b_single_1b_1 - - b_single_1b_1b_t1_port_tenant_id + - b_single_1b_b_single_1b_t1_port_0_tenant_id out5: value: get_attribute: @@ -986,7 +986,7 @@ topology_template: value: get_attribute: - abstract_a_single_1a - - a_single_1a_1a_t1_port_tenant_id + - a_single_1a_a_single_1a_t1_port_0_tenant_id out7: value: get_attribute: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c1_scalling_instanceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c1_scalling_instanceServiceTemplate.yaml index 15620d7809..5be7399e92 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c1_scalling_instanceServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c1_scalling_instanceServiceTemplate.yaml @@ -11,86 +11,71 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_1c1_t1_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_1c1_t2_port_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements compute_1c1_scalling_instance_user_data_format: type: list required: true entry_schema: type: string - port_1c1_t2_port_related_networks: + port_1c1_scalling_instance_t1_port_0_fixed_ips: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_1c1_t2_port_network_role_tag: - type: string - required: true - vm_flavor_name: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_1c1_scalling_instance_t1_port_0_network_role_tag: type: string required: true - port_1c1_t1_port_related_networks: + port_1c1_scalling_instance_t2_port_0_related_networks: type: list required: true entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_1c1_t1_port_ip_requirements: + port_1c1_scalling_instance_t1_port_0_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - vm_image_name: + type: string + vm_flavor_name: type: string required: true - compute_1c1_scalling_instance_name: + port_1c1_scalling_instance_t2_port_0_fixed_ips: type: list required: true entry_schema: - type: string - port_1c1_t1_port_name: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_1c1_scalling_instance_t1_port_0_ip_requirements: type: list required: true entry_schema: - type: string - port_1c1_t1_port_network: - type: list + type: org.openecomp.datatypes.network.IpRequirements + port_1c1_scalling_instance_t1_port_0_network_role: + type: string required: true - entry_schema: - type: string - port_1c1_t2_port_fixed_ips: - type: list + port_1c1_scalling_instance_t2_port_0_subnetpoolid: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_1c1_t2_port_network: - type: list + port_1c1_scalling_instance_t2_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: string - port_1c1_t1_port_fixed_ips: - type: list + vm_image_name: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_1c1_t1_port_vlan_requirements: + compute_1c1_scalling_instance_name: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_1c1_t2_port_ip_requirements: - type: list + type: string + port_1c1_scalling_instance_t2_port_0_network_role: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_1c1_t1_port_mac_requirements: + port_1c1_scalling_instance_t1_port_0_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true + port_1c1_scalling_instance_t1_port_0_subnetpoolid: + type: string + required: true + port_1c1_scalling_instance_t2_port_0_order: + type: integer + required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -98,82 +83,97 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_1c1_t2_port_network_role: - type: string - required: true - port_1c1_t2_port_order: + port_1c1_scalling_instance_t1_port_0_order: type: integer required: true - port_1c1_t2_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_1c1_scalling_instance_t2_port_0_vlan_requirements: + type: list required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_1c1_scalling_instance_t1_port_0_name: + type: list + required: true + entry_schema: + type: string compute_1c1_scalling_instance_availability_zone: type: list required: true entry_schema: type: string - port_1c1_t2_port_subnetpoolid: - type: string + port_1c1_scalling_instance_t2_port_0_ip_requirements: + type: list required: true - port_1c1_t2_port_name: + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_1c1_scalling_instance_t2_port_0_name: type: list required: true entry_schema: type: string + port_1c1_scalling_instance_t2_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_1c1_scalling_instance_t1_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true compute_1c1_scalling_instance_scheduler_hints: type: list required: true entry_schema: type: json - port_1c1_t2_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_1c1_t1_port_subnetpoolid: - type: string + port_1c1_scalling_instance_t1_port_0_vlan_requirements: + type: list required: true - port_1c1_t1_port_network_role_tag: + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_1c1_scalling_instance_t2_port_0_network_role_tag: type: string required: true - port_1c1_t1_port_network_role: - type: string + port_1c1_scalling_instance_t1_port_0_related_networks: + type: list required: true - port_1c1_t1_port_order: - type: integer + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_1c1_scalling_instance_t2_port_0_network: + type: list required: true + entry_schema: + type: string node_templates: - 1c1_scalling_instance_1c1_t1_port: + 1c1_scalling_instance_1c1_scalling_instance_t2_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_requirements: - get_input: port_1c1_t1_port_mac_requirements + get_input: port_1c1_scalling_instance_t2_port_0_mac_requirements order: - get_input: port_1c1_t1_port_order + get_input: port_1c1_scalling_instance_t2_port_0_order exCP_naming: - get_input: port_1c1_t1_port_exCP_naming + get_input: port_1c1_scalling_instance_t2_port_0_exCP_naming vlan_requirements: - get_input: port_1c1_t1_port_vlan_requirements + get_input: port_1c1_scalling_instance_t2_port_0_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_1c1_t1_port_ip_requirements + get_input: port_1c1_scalling_instance_t2_port_0_ip_requirements related_networks: - get_input: port_1c1_t1_port_related_networks + get_input: port_1c1_scalling_instance_t2_port_0_related_networks network_role_tag: - get_input: port_1c1_t1_port_network_role_tag + get_input: port_1c1_scalling_instance_t2_port_0_network_role_tag network_role: - get_input: port_1c1_t1_port_network_role + get_input: port_1c1_scalling_instance_t2_port_0_network_role fixed_ips: get_input: - - port_1c1_t1_port_fixed_ips + - port_1c1_scalling_instance_t2_port_0_fixed_ips - index_value subnetpoolid: - get_input: port_1c1_t1_port_subnetpoolid + get_input: port_1c1_scalling_instance_t2_port_0_subnetpoolid name: get_input: - - port_1c1_t1_port_name + - port_1c1_scalling_instance_t2_port_0_name - index_value network: get_input: - - port_1c1_t1_port_network + - port_1c1_scalling_instance_t2_port_0_network - index_value requirements: - binding: @@ -203,39 +203,39 @@ topology_template: get_input: - compute_1c1_scalling_instance_user_data_format - index_value - 1c1_scalling_instance_1c1_t2_port: + 1c1_scalling_instance_1c1_scalling_instance_t1_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_requirements: - get_input: port_1c1_t2_port_mac_requirements + get_input: port_1c1_scalling_instance_t1_port_0_mac_requirements order: - get_input: port_1c1_t2_port_order + get_input: port_1c1_scalling_instance_t1_port_0_order exCP_naming: - get_input: port_1c1_t2_port_exCP_naming + get_input: port_1c1_scalling_instance_t1_port_0_exCP_naming vlan_requirements: - get_input: port_1c1_t2_port_vlan_requirements + get_input: port_1c1_scalling_instance_t1_port_0_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_1c1_t2_port_ip_requirements + get_input: port_1c1_scalling_instance_t1_port_0_ip_requirements related_networks: - get_input: port_1c1_t2_port_related_networks + get_input: port_1c1_scalling_instance_t1_port_0_related_networks network_role_tag: - get_input: port_1c1_t2_port_network_role_tag + get_input: port_1c1_scalling_instance_t1_port_0_network_role_tag network_role: - get_input: port_1c1_t2_port_network_role + get_input: port_1c1_scalling_instance_t1_port_0_network_role fixed_ips: get_input: - - port_1c1_t2_port_fixed_ips + - port_1c1_scalling_instance_t1_port_0_fixed_ips - index_value subnetpoolid: - get_input: port_1c1_t2_port_subnetpoolid + get_input: port_1c1_scalling_instance_t1_port_0_subnetpoolid name: get_input: - - port_1c1_t2_port_name + - port_1c1_scalling_instance_t1_port_0_name - index_value network: get_input: - - port_1c1_t2_port_network + - port_1c1_scalling_instance_t1_port_0_network - index_value requirements: - binding: @@ -249,11 +249,11 @@ topology_template: get_attribute: - 1c1_scalling_instance - instance_name - 1c1_scalling_instance_1c1_t2_port_tenant_id: + 1c1_scalling_instance_1c1_scalling_instance_t2_port_0_tenant_id: type: string value: get_attribute: - - 1c1_scalling_instance_1c1_t2_port + - 1c1_scalling_instance_1c1_scalling_instance_t2_port_0 - tenant_id substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.1c1_scalling_instance @@ -273,114 +273,111 @@ topology_template: disk.read.bytes_1c1_scalling_instance: - 1c1_scalling_instance - disk.read.bytes - network.outgoing.packets.rate_1c1_scalling_instance_1c1_t2_port: - - 1c1_scalling_instance_1c1_t2_port - - network.outgoing.packets.rate - network.incoming.packets.rate_1c1_scalling_instance_1c1_t2_port: - - 1c1_scalling_instance_1c1_t2_port - - network.incoming.packets.rate + attachment_1c1_scalling_instance_1c1_scalling_instance_t2_port_0: + - 1c1_scalling_instance_1c1_scalling_instance_t2_port_0 + - attachment + binding_1c1_scalling_instance_1c1_scalling_instance_t1_port_0: + - 1c1_scalling_instance_1c1_scalling_instance_t1_port_0 + - binding + binding_1c1_scalling_instance_1c1_scalling_instance_t2_port_0: + - 1c1_scalling_instance_1c1_scalling_instance_t2_port_0 + - binding disk.usage_1c1_scalling_instance: - 1c1_scalling_instance - disk.usage + forwarder_1c1_scalling_instance_1c1_scalling_instance_t2_port_0: + - 1c1_scalling_instance_1c1_scalling_instance_t2_port_0 + - forwarder memory.resident_1c1_scalling_instance: - 1c1_scalling_instance - memory.resident - network.incoming.bytes.rate_1c1_scalling_instance_1c1_t2_port: - - 1c1_scalling_instance_1c1_t2_port - - network.incoming.bytes.rate cpu_1c1_scalling_instance: - 1c1_scalling_instance - cpu - forwarder_1c1_scalling_instance_1c1_t2_port: - - 1c1_scalling_instance_1c1_t2_port + forwarder_1c1_scalling_instance_1c1_scalling_instance_t1_port_0: + - 1c1_scalling_instance_1c1_scalling_instance_t1_port_0 - forwarder disk.write.bytes_1c1_scalling_instance: - 1c1_scalling_instance - disk.write.bytes - network.incoming.packets.rate_1c1_scalling_instance_1c1_t1_port: - - 1c1_scalling_instance_1c1_t1_port - - network.incoming.packets.rate - network.incoming.bytes_1c1_scalling_instance_1c1_t1_port: - - 1c1_scalling_instance_1c1_t1_port - - network.incoming.bytes disk.write.bytes.rate_1c1_scalling_instance: - 1c1_scalling_instance - disk.write.bytes.rate disk.device.allocation_1c1_scalling_instance: - 1c1_scalling_instance - disk.device.allocation - network.incoming.bytes.rate_1c1_scalling_instance_1c1_t1_port: - - 1c1_scalling_instance_1c1_t1_port - - network.incoming.bytes.rate + network.outgoing.bytes.rate_1c1_scalling_instance_1c1_scalling_instance_t1_port_0: + - 1c1_scalling_instance_1c1_scalling_instance_t1_port_0 + - network.outgoing.bytes.rate feature_1c1_scalling_instance: - 1c1_scalling_instance - feature + network.outgoing.bytes.rate_1c1_scalling_instance_1c1_scalling_instance_t2_port_0: + - 1c1_scalling_instance_1c1_scalling_instance_t2_port_0 + - network.outgoing.bytes.rate disk.device.write.requests.rate_1c1_scalling_instance: - 1c1_scalling_instance - disk.device.write.requests.rate - forwarder_1c1_scalling_instance_1c1_t1_port: - - 1c1_scalling_instance_1c1_t1_port - - forwarder disk.read.bytes.rate_1c1_scalling_instance: - 1c1_scalling_instance - disk.read.bytes.rate - network.outpoing.packets_1c1_scalling_instance_1c1_t2_port: - - 1c1_scalling_instance_1c1_t2_port - - network.outpoing.packets scalable_1c1_scalling_instance: - 1c1_scalling_instance - scalable disk.device.read.bytes_1c1_scalling_instance: - 1c1_scalling_instance - disk.device.read.bytes - binding_1c1_scalling_instance_1c1_t2_port: - - 1c1_scalling_instance_1c1_t2_port - - binding disk.device.write.bytes_1c1_scalling_instance: - 1c1_scalling_instance - disk.device.write.bytes disk.read.requests_1c1_scalling_instance: - 1c1_scalling_instance - disk.read.requests - network.incoming.packets_1c1_scalling_instance_1c1_t2_port: - - 1c1_scalling_instance_1c1_t2_port - - network.incoming.packets vcpus_1c1_scalling_instance: - 1c1_scalling_instance - vcpus - network.outgoing.bytes_1c1_scalling_instance_1c1_t1_port: - - 1c1_scalling_instance_1c1_t1_port - - network.outgoing.bytes + network.incoming.packets_1c1_scalling_instance_1c1_scalling_instance_t2_port_0: + - 1c1_scalling_instance_1c1_scalling_instance_t2_port_0 + - network.incoming.packets host_1c1_scalling_instance: - 1c1_scalling_instance - host + network.outgoing.packets.rate_1c1_scalling_instance_1c1_scalling_instance_t1_port_0: + - 1c1_scalling_instance_1c1_scalling_instance_t1_port_0 + - network.outgoing.packets.rate disk.write.requests_1c1_scalling_instance: - 1c1_scalling_instance - disk.write.requests - feature_1c1_scalling_instance_1c1_t1_port: - - 1c1_scalling_instance_1c1_t1_port + network.incoming.packets.rate_1c1_scalling_instance_1c1_scalling_instance_t1_port_0: + - 1c1_scalling_instance_1c1_scalling_instance_t1_port_0 + - network.incoming.packets.rate + feature_1c1_scalling_instance_1c1_scalling_instance_t1_port_0: + - 1c1_scalling_instance_1c1_scalling_instance_t1_port_0 - feature - binding_1c1_scalling_instance_1c1_t1_port: - - 1c1_scalling_instance_1c1_t1_port - - binding + network.outpoing.packets_1c1_scalling_instance_1c1_scalling_instance_t2_port_0: + - 1c1_scalling_instance_1c1_scalling_instance_t2_port_0 + - network.outpoing.packets disk.device.read.requests.rate_1c1_scalling_instance: - 1c1_scalling_instance - disk.device.read.requests.rate - attachment_1c1_scalling_instance_1c1_t2_port: - - 1c1_scalling_instance_1c1_t2_port - - attachment disk.device.read.bytes.rate_1c1_scalling_instance: - 1c1_scalling_instance - disk.device.read.bytes.rate - network.outgoing.packets.rate_1c1_scalling_instance_1c1_t1_port: - - 1c1_scalling_instance_1c1_t1_port - - network.outgoing.packets.rate + network.incoming.bytes.rate_1c1_scalling_instance_1c1_scalling_instance_t1_port_0: + - 1c1_scalling_instance_1c1_scalling_instance_t1_port_0 + - network.incoming.bytes.rate + attachment_1c1_scalling_instance_1c1_scalling_instance_t1_port_0: + - 1c1_scalling_instance_1c1_scalling_instance_t1_port_0 + - attachment disk.device.iops_1c1_scalling_instance: - 1c1_scalling_instance - disk.device.iops disk.device.capacity_1c1_scalling_instance: - 1c1_scalling_instance - disk.device.capacity + network.incoming.bytes_1c1_scalling_instance_1c1_scalling_instance_t2_port_0: + - 1c1_scalling_instance_1c1_scalling_instance_t2_port_0 + - network.incoming.bytes disk.capacity_1c1_scalling_instance: - 1c1_scalling_instance - disk.capacity @@ -390,21 +387,24 @@ topology_template: cpu_util_1c1_scalling_instance: - 1c1_scalling_instance - cpu_util + network.outgoing.bytes_1c1_scalling_instance_1c1_scalling_instance_t2_port_0: + - 1c1_scalling_instance_1c1_scalling_instance_t2_port_0 + - network.outgoing.bytes disk.device.read.requests_1c1_scalling_instance: - 1c1_scalling_instance - disk.device.read.requests disk.device.write.bytes.rate_1c1_scalling_instance: - 1c1_scalling_instance - disk.device.write.bytes.rate + network.outgoing.bytes_1c1_scalling_instance_1c1_scalling_instance_t1_port_0: + - 1c1_scalling_instance_1c1_scalling_instance_t1_port_0 + - network.outgoing.bytes + network.incoming.packets_1c1_scalling_instance_1c1_scalling_instance_t1_port_0: + - 1c1_scalling_instance_1c1_scalling_instance_t1_port_0 + - network.incoming.packets disk.device.write.requests_1c1_scalling_instance: - 1c1_scalling_instance - disk.device.write.requests - network.outgoing.bytes.rate_1c1_scalling_instance_1c1_t1_port: - - 1c1_scalling_instance_1c1_t1_port - - network.outgoing.bytes.rate - network.outgoing.bytes_1c1_scalling_instance_1c1_t2_port: - - 1c1_scalling_instance_1c1_t2_port - - network.outgoing.bytes disk.latency_1c1_scalling_instance: - 1c1_scalling_instance - disk.latency @@ -414,42 +414,42 @@ topology_template: disk.device.usage_1c1_scalling_instance: - 1c1_scalling_instance - disk.device.usage - network.incoming.packets_1c1_scalling_instance_1c1_t1_port: - - 1c1_scalling_instance_1c1_t1_port - - network.incoming.packets disk.allocation_1c1_scalling_instance: - 1c1_scalling_instance - disk.allocation - feature_1c1_scalling_instance_1c1_t2_port: - - 1c1_scalling_instance_1c1_t2_port - - feature memory.usage_1c1_scalling_instance: - 1c1_scalling_instance - memory.usage - network.incoming.bytes_1c1_scalling_instance_1c1_t2_port: - - 1c1_scalling_instance_1c1_t2_port - - network.incoming.bytes - network.outgoing.bytes.rate_1c1_scalling_instance_1c1_t2_port: - - 1c1_scalling_instance_1c1_t2_port - - network.outgoing.bytes.rate os_1c1_scalling_instance: - 1c1_scalling_instance - os disk.iops_1c1_scalling_instance: - 1c1_scalling_instance - disk.iops - network.outpoing.packets_1c1_scalling_instance_1c1_t1_port: - - 1c1_scalling_instance_1c1_t1_port + network.outgoing.packets.rate_1c1_scalling_instance_1c1_scalling_instance_t2_port_0: + - 1c1_scalling_instance_1c1_scalling_instance_t2_port_0 + - network.outgoing.packets.rate + network.outpoing.packets_1c1_scalling_instance_1c1_scalling_instance_t1_port_0: + - 1c1_scalling_instance_1c1_scalling_instance_t1_port_0 - network.outpoing.packets - attachment_1c1_scalling_instance_1c1_t1_port: - - 1c1_scalling_instance_1c1_t1_port - - attachment cpu.delta_1c1_scalling_instance: - 1c1_scalling_instance - cpu.delta memory_1c1_scalling_instance: - 1c1_scalling_instance - memory + feature_1c1_scalling_instance_1c1_scalling_instance_t2_port_0: + - 1c1_scalling_instance_1c1_scalling_instance_t2_port_0 + - feature + network.incoming.bytes.rate_1c1_scalling_instance_1c1_scalling_instance_t2_port_0: + - 1c1_scalling_instance_1c1_scalling_instance_t2_port_0 + - network.incoming.bytes.rate + network.incoming.bytes_1c1_scalling_instance_1c1_scalling_instance_t1_port_0: + - 1c1_scalling_instance_1c1_scalling_instance_t1_port_0 + - network.incoming.bytes + network.incoming.packets.rate_1c1_scalling_instance_1c1_scalling_instance_t2_port_0: + - 1c1_scalling_instance_1c1_scalling_instance_t2_port_0 + - network.incoming.packets.rate instance_1c1_scalling_instance: - 1c1_scalling_instance - instance @@ -457,17 +457,17 @@ topology_template: dependency_1c1_scalling_instance: - 1c1_scalling_instance - dependency - link_1c1_scalling_instance_1c1_t1_port: - - 1c1_scalling_instance_1c1_t1_port - - link - dependency_1c1_scalling_instance_1c1_t2_port: - - 1c1_scalling_instance_1c1_t2_port + dependency_1c1_scalling_instance_1c1_scalling_instance_t1_port_0: + - 1c1_scalling_instance_1c1_scalling_instance_t1_port_0 - dependency - dependency_1c1_scalling_instance_1c1_t1_port: - - 1c1_scalling_instance_1c1_t1_port + dependency_1c1_scalling_instance_1c1_scalling_instance_t2_port_0: + - 1c1_scalling_instance_1c1_scalling_instance_t2_port_0 - dependency - link_1c1_scalling_instance_1c1_t2_port: - - 1c1_scalling_instance_1c1_t2_port + link_1c1_scalling_instance_1c1_scalling_instance_t2_port_0: + - 1c1_scalling_instance_1c1_scalling_instance_t2_port_0 + - link + link_1c1_scalling_instance_1c1_scalling_instance_t1_port_0: + - 1c1_scalling_instance_1c1_scalling_instance_t1_port_0 - link local_storage_1c1_scalling_instance: - 1c1_scalling_instance diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c2_catalog_instanceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c2_catalog_instanceServiceTemplate.yaml index ff4f00e722..07e9605032 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c2_catalog_instanceServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c2_catalog_instanceServiceTemplate.yaml @@ -11,69 +11,63 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_1c2_t2_port_order: - type: integer - required: true - compute_1c2_catalog_instance_availability_zone: + port_1c2_catalog_instance_t1_port_0_network: type: list required: true entry_schema: type: string - port_1c2_t2_port_subnetpoolid: - type: string + port_1c2_catalog_instance_t2_port_0_vlan_requirements: + type: list required: true - port_1c2_t1_port_related_networks: + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + compute_1c2_catalog_instance_availability_zone: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_1c2_t2_port_network_role: - type: string + type: string + port_1c2_catalog_instance_t1_port_0_ip_requirements: + type: list required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements vm_flavor_name: type: string required: true - port_1c2_t2_port_network_role_tag: + port_1c2_catalog_instance_t2_port_0_network_role_tag: type: string required: true - port_1c2_t1_port_vlan_requirements: + port_1c2_catalog_instance_t2_port_0_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: string vm_image_name: type: string required: true - port_1c2_t2_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_1c2_catalog_instance_t1_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_1c2_t1_port_order: - type: integer + port_1c2_catalog_instance_t2_port_0_network_role: + type: string required: true - port_1c2_t1_port_subnetpoolid: + port_1c2_catalog_instance_t1_port_0_subnetpoolid: type: string required: true - port_1c2_t2_port_ip_requirements: - type: list + port_1c2_catalog_instance_t2_port_0_order: + type: integer required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_1c2_t2_port_related_networks: + port_1c2_catalog_instance_t2_port_0_related_networks: type: list required: true entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_1c2_t1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_1c2_t1_port_network_role: - type: string + port_1c2_catalog_instance_t1_port_0_order: + type: integer required: true - port_1c2_t2_port_network: - type: list + port_1c2_catalog_instance_t2_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: string index_value: type: integer description: Index value of this substitution service template runtime instance @@ -86,35 +80,41 @@ topology_template: required: true entry_schema: type: string - port_1c2_t1_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_1c2_t1_port_network: + port_1c2_catalog_instance_t2_port_0_ip_requirements: type: list required: true entry_schema: - type: string - port_1c2_t2_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_1c2_t2_port_vlan_requirements: + type: org.openecomp.datatypes.network.IpRequirements + port_1c2_catalog_instance_t1_port_0_related_networks: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_1c2_catalog_instance_t2_port_0_subnetpoolid: + type: string + required: true + port_1c2_catalog_instance_t1_port_0_network_role: + type: string + required: true + port_1c2_catalog_instance_t1_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true compute_1c2_catalog_instance_user_data_format: type: list required: true entry_schema: type: string - port_1c2_t1_port_network_role_tag: - type: string - required: true - port_1c2_t1_port_ip_requirements: + port_1c2_catalog_instance_t1_port_0_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: org.openecomp.datatypes.network.VlanRequirements + port_1c2_catalog_instance_t2_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_1c2_catalog_instance_t1_port_0_network_role_tag: + type: string + required: true compute_1c2_catalog_instance_scheduler_hints: type: list required: true @@ -144,62 +144,62 @@ topology_template: get_input: - compute_1c2_catalog_instance_user_data_format - index_value - 1c2_catalog_instance_1c2_t2_port: + 1c2_catalog_instance_1c2_catalog_instance_t1_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_1c2_t2_port_exCP_naming + get_input: port_1c2_catalog_instance_t1_port_0_exCP_naming vlan_requirements: - get_input: port_1c2_t2_port_vlan_requirements + get_input: port_1c2_catalog_instance_t1_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_1c2_t2_port_related_networks + get_input: port_1c2_catalog_instance_t1_port_0_related_networks ip_requirements: - get_input: port_1c2_t2_port_ip_requirements + get_input: port_1c2_catalog_instance_t1_port_0_ip_requirements network_role_tag: - get_input: port_1c2_t2_port_network_role_tag + get_input: port_1c2_catalog_instance_t1_port_0_network_role_tag mac_requirements: - get_input: port_1c2_t2_port_mac_requirements + get_input: port_1c2_catalog_instance_t1_port_0_mac_requirements order: - get_input: port_1c2_t2_port_order + get_input: port_1c2_catalog_instance_t1_port_0_order network_role: - get_input: port_1c2_t2_port_network_role + get_input: port_1c2_catalog_instance_t1_port_0_network_role subnetpoolid: - get_input: port_1c2_t2_port_subnetpoolid + get_input: port_1c2_catalog_instance_t1_port_0_subnetpoolid network: get_input: - - port_1c2_t2_port_network + - port_1c2_catalog_instance_t1_port_0_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: 1c2_catalog_instance relationship: tosca.relationships.network.BindsTo - 1c2_catalog_instance_1c2_t1_port: + 1c2_catalog_instance_1c2_catalog_instance_t2_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_1c2_t1_port_exCP_naming + get_input: port_1c2_catalog_instance_t2_port_0_exCP_naming vlan_requirements: - get_input: port_1c2_t1_port_vlan_requirements + get_input: port_1c2_catalog_instance_t2_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_1c2_t1_port_related_networks + get_input: port_1c2_catalog_instance_t2_port_0_related_networks ip_requirements: - get_input: port_1c2_t1_port_ip_requirements + get_input: port_1c2_catalog_instance_t2_port_0_ip_requirements network_role_tag: - get_input: port_1c2_t1_port_network_role_tag + get_input: port_1c2_catalog_instance_t2_port_0_network_role_tag mac_requirements: - get_input: port_1c2_t1_port_mac_requirements + get_input: port_1c2_catalog_instance_t2_port_0_mac_requirements order: - get_input: port_1c2_t1_port_order + get_input: port_1c2_catalog_instance_t2_port_0_order network_role: - get_input: port_1c2_t1_port_network_role + get_input: port_1c2_catalog_instance_t2_port_0_network_role subnetpoolid: - get_input: port_1c2_t1_port_subnetpoolid + get_input: port_1c2_catalog_instance_t2_port_0_subnetpoolid network: get_input: - - port_1c2_t1_port_network + - port_1c2_catalog_instance_t2_port_0_network - index_value requirements: - binding: @@ -213,11 +213,11 @@ topology_template: get_attribute: - 1c2_catalog_instance - instance_name - 1c2_catalog_instance_1c2_t1_port_tenant_id: + 1c2_catalog_instance_1c2_catalog_instance_t1_port_0_tenant_id: type: string value: get_attribute: - - 1c2_catalog_instance_1c2_t1_port + - 1c2_catalog_instance_1c2_catalog_instance_t1_port_0 - tenant_id substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.1c2_catalog_instance @@ -225,57 +225,33 @@ topology_template: disk.device.capacity_1c2_catalog_instance: - 1c2_catalog_instance - disk.device.capacity - network.incoming.packets.rate_1c2_catalog_instance_1c2_t2_port: - - 1c2_catalog_instance_1c2_t2_port - - network.incoming.packets.rate disk.read.bytes.rate_1c2_catalog_instance: - 1c2_catalog_instance - disk.read.bytes.rate memory.usage_1c2_catalog_instance: - 1c2_catalog_instance - memory.usage - network.outpoing.packets_1c2_catalog_instance_1c2_t1_port: - - 1c2_catalog_instance_1c2_t1_port - - network.outpoing.packets + attachment_1c2_catalog_instance_1c2_catalog_instance_t1_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_t1_port_0 + - attachment disk.write.bytes.rate_1c2_catalog_instance: - 1c2_catalog_instance - disk.write.bytes.rate - network.incoming.bytes.rate_1c2_catalog_instance_1c2_t2_port: - - 1c2_catalog_instance_1c2_t2_port - - network.incoming.bytes.rate - binding_1c2_catalog_instance_1c2_t2_port: - - 1c2_catalog_instance_1c2_t2_port - - binding - network.incoming.packets_1c2_catalog_instance_1c2_t1_port: - - 1c2_catalog_instance_1c2_t1_port - - network.incoming.packets cpu_util_1c2_catalog_instance: - 1c2_catalog_instance - cpu_util - network.outpoing.packets_1c2_catalog_instance_1c2_t2_port: - - 1c2_catalog_instance_1c2_t2_port - - network.outpoing.packets - feature_1c2_catalog_instance_1c2_t1_port: - - 1c2_catalog_instance_1c2_t1_port - - feature - attachment_1c2_catalog_instance_1c2_t1_port: - - 1c2_catalog_instance_1c2_t1_port - - attachment - network.incoming.bytes_1c2_catalog_instance_1c2_t2_port: - - 1c2_catalog_instance_1c2_t2_port - - network.incoming.bytes + network.incoming.bytes.rate_1c2_catalog_instance_1c2_catalog_instance_t2_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_t2_port_0 + - network.incoming.bytes.rate cpu_1c2_catalog_instance: - 1c2_catalog_instance - cpu disk.read.requests_1c2_catalog_instance: - 1c2_catalog_instance - disk.read.requests - network.incoming.bytes.rate_1c2_catalog_instance_1c2_t1_port: - - 1c2_catalog_instance_1c2_t1_port - - network.incoming.bytes.rate - binding_1c2_catalog_instance_1c2_t1_port: - - 1c2_catalog_instance_1c2_t1_port - - binding + network.outpoing.packets_1c2_catalog_instance_1c2_catalog_instance_t2_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_t2_port_0 + - network.outpoing.packets disk.ephemeral.size_1c2_catalog_instance: - 1c2_catalog_instance - disk.ephemeral.size @@ -285,63 +261,75 @@ topology_template: memory.resident_1c2_catalog_instance: - 1c2_catalog_instance - memory.resident + network.outpoing.packets_1c2_catalog_instance_1c2_catalog_instance_t1_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_t1_port_0 + - network.outpoing.packets disk.device.write.requests.rate_1c2_catalog_instance: - 1c2_catalog_instance - disk.device.write.requests.rate - network.incoming.bytes_1c2_catalog_instance_1c2_t1_port: - - 1c2_catalog_instance_1c2_t1_port - - network.incoming.bytes os_1c2_catalog_instance: - 1c2_catalog_instance - os disk.device.iops_1c2_catalog_instance: - 1c2_catalog_instance - disk.device.iops + binding_1c2_catalog_instance_1c2_catalog_instance_t1_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_t1_port_0 + - binding + feature_1c2_catalog_instance_1c2_catalog_instance_t1_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_t1_port_0 + - feature + network.outgoing.bytes_1c2_catalog_instance_1c2_catalog_instance_t1_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_t1_port_0 + - network.outgoing.bytes + network.outgoing.bytes.rate_1c2_catalog_instance_1c2_catalog_instance_t1_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_t1_port_0 + - network.outgoing.bytes.rate + network.outgoing.packets.rate_1c2_catalog_instance_1c2_catalog_instance_t1_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_t1_port_0 + - network.outgoing.packets.rate + network.incoming.packets_1c2_catalog_instance_1c2_catalog_instance_t1_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_t1_port_0 + - network.incoming.packets endpoint_1c2_catalog_instance: - 1c2_catalog_instance - endpoint disk.allocation_1c2_catalog_instance: - 1c2_catalog_instance - disk.allocation + network.incoming.bytes.rate_1c2_catalog_instance_1c2_catalog_instance_t1_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_t1_port_0 + - network.incoming.bytes.rate disk.latency_1c2_catalog_instance: - 1c2_catalog_instance - disk.latency - network.outgoing.bytes.rate_1c2_catalog_instance_1c2_t1_port: - - 1c2_catalog_instance_1c2_t1_port - - network.outgoing.bytes.rate - network.outgoing.bytes_1c2_catalog_instance_1c2_t1_port: - - 1c2_catalog_instance_1c2_t1_port - - network.outgoing.bytes + network.incoming.bytes_1c2_catalog_instance_1c2_catalog_instance_t1_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_t1_port_0 + - network.incoming.bytes disk.iops_1c2_catalog_instance: - 1c2_catalog_instance - disk.iops - network.outgoing.packets.rate_1c2_catalog_instance_1c2_t2_port: - - 1c2_catalog_instance_1c2_t2_port - - network.outgoing.packets.rate - network.incoming.packets_1c2_catalog_instance_1c2_t2_port: - - 1c2_catalog_instance_1c2_t2_port - - network.incoming.packets + forwarder_1c2_catalog_instance_1c2_catalog_instance_t1_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_t1_port_0 + - forwarder + attachment_1c2_catalog_instance_1c2_catalog_instance_t2_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_t2_port_0 + - attachment vcpus_1c2_catalog_instance: - 1c2_catalog_instance - vcpus disk.device.latency_1c2_catalog_instance: - 1c2_catalog_instance - disk.device.latency - attachment_1c2_catalog_instance_1c2_t2_port: - - 1c2_catalog_instance_1c2_t2_port - - attachment - forwarder_1c2_catalog_instance_1c2_t1_port: - - 1c2_catalog_instance_1c2_t1_port - - forwarder - network.outgoing.packets.rate_1c2_catalog_instance_1c2_t1_port: - - 1c2_catalog_instance_1c2_t1_port - - network.outgoing.packets.rate disk.read.bytes_1c2_catalog_instance: - 1c2_catalog_instance - disk.read.bytes instance_1c2_catalog_instance: - 1c2_catalog_instance - instance + network.incoming.packets.rate_1c2_catalog_instance_1c2_catalog_instance_t2_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_t2_port_0 + - network.incoming.packets.rate disk.capacity_1c2_catalog_instance: - 1c2_catalog_instance - disk.capacity @@ -351,18 +339,12 @@ topology_template: disk.device.read.bytes.rate_1c2_catalog_instance: - 1c2_catalog_instance - disk.device.read.bytes.rate - forwarder_1c2_catalog_instance_1c2_t2_port: - - 1c2_catalog_instance_1c2_t2_port - - forwarder disk.device.allocation_1c2_catalog_instance: - 1c2_catalog_instance - disk.device.allocation disk.device.read.bytes_1c2_catalog_instance: - 1c2_catalog_instance - disk.device.read.bytes - network.outgoing.bytes.rate_1c2_catalog_instance_1c2_t2_port: - - 1c2_catalog_instance_1c2_t2_port - - network.outgoing.bytes.rate disk.device.read.requests_1c2_catalog_instance: - 1c2_catalog_instance - disk.device.read.requests @@ -384,18 +366,30 @@ topology_template: disk.device.usage_1c2_catalog_instance: - 1c2_catalog_instance - disk.device.usage - network.outgoing.bytes_1c2_catalog_instance_1c2_t2_port: - - 1c2_catalog_instance_1c2_t2_port + binding_1c2_catalog_instance_1c2_catalog_instance_t2_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_t2_port_0 + - binding + network.incoming.packets_1c2_catalog_instance_1c2_catalog_instance_t2_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_t2_port_0 + - network.incoming.packets + feature_1c2_catalog_instance_1c2_catalog_instance_t2_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_t2_port_0 + - feature + network.outgoing.bytes_1c2_catalog_instance_1c2_catalog_instance_t2_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_t2_port_0 - network.outgoing.bytes + network.outgoing.bytes.rate_1c2_catalog_instance_1c2_catalog_instance_t2_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_t2_port_0 + - network.outgoing.bytes.rate disk.usage_1c2_catalog_instance: - 1c2_catalog_instance - disk.usage + network.outgoing.packets.rate_1c2_catalog_instance_1c2_catalog_instance_t2_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_t2_port_0 + - network.outgoing.packets.rate feature_1c2_catalog_instance: - 1c2_catalog_instance - feature - network.incoming.packets.rate_1c2_catalog_instance_1c2_t1_port: - - 1c2_catalog_instance_1c2_t1_port - - network.incoming.packets.rate memory_1c2_catalog_instance: - 1c2_catalog_instance - memory @@ -411,28 +405,34 @@ topology_template: cpu.delta_1c2_catalog_instance: - 1c2_catalog_instance - cpu.delta - feature_1c2_catalog_instance_1c2_t2_port: - - 1c2_catalog_instance_1c2_t2_port - - feature + forwarder_1c2_catalog_instance_1c2_catalog_instance_t2_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_t2_port_0 + - forwarder + network.incoming.packets.rate_1c2_catalog_instance_1c2_catalog_instance_t1_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_t1_port_0 + - network.incoming.packets.rate + network.incoming.bytes_1c2_catalog_instance_1c2_catalog_instance_t2_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_t2_port_0 + - network.incoming.bytes disk.device.read.requests.rate_1c2_catalog_instance: - 1c2_catalog_instance - disk.device.read.requests.rate requirements: - link_1c2_catalog_instance_1c2_t1_port: - - 1c2_catalog_instance_1c2_t1_port - - link dependency_1c2_catalog_instance: - 1c2_catalog_instance - dependency local_storage_1c2_catalog_instance: - 1c2_catalog_instance - local_storage - dependency_1c2_catalog_instance_1c2_t1_port: - - 1c2_catalog_instance_1c2_t1_port + dependency_1c2_catalog_instance_1c2_catalog_instance_t2_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_t2_port_0 - dependency - dependency_1c2_catalog_instance_1c2_t2_port: - - 1c2_catalog_instance_1c2_t2_port + link_1c2_catalog_instance_1c2_catalog_instance_t2_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_t2_port_0 + - link + dependency_1c2_catalog_instance_1c2_catalog_instance_t1_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_t1_port_0 - dependency - link_1c2_catalog_instance_1c2_t2_port: - - 1c2_catalog_instance_1c2_t2_port + link_1c2_catalog_instance_1c2_catalog_instance_t1_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_t1_port_0 - link \ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_a_single_1aServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_a_single_1aServiceTemplate.yaml index 37ef56746b..d100be8424 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_a_single_1aServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_a_single_1aServiceTemplate.yaml @@ -11,57 +11,61 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_1a_t1_port_ip_requirements: + port_a_single_1a_t1_port_0_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_1a_t2_port_network_role_tag: - type: string + type: org.openecomp.datatypes.network.VlanRequirements + port_a_single_1a_t1_port_0_order: + type: integer required: true + port_a_single_1a_t2_port_0_order: + type: integer + required: true + port_a_single_1a_t2_port_0_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements vm_flavor_name: type: string required: true - port_1a_t2_port_network_role: + port_a_single_1a_t2_port_0_network_role_tag: type: string required: true - port_1a_t2_port_network: - type: list - required: true - entry_schema: - type: string - port_1a_t1_port_mac_requirements: + port_a_single_1a_t1_port_0_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true - port_1a_t1_port_network: - type: list - required: true - entry_schema: - type: string - port_1a_t1_port_subnetpoolid: + port_a_single_1a_t1_port_0_subnetpoolid: type: string required: true vm_image_name: type: string required: true - port_1a_t2_port_related_networks: + port_a_single_1a_t2_port_0_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_1a_t2_port_ip_requirements: + type: string + port_a_single_1a_t1_port_0_network_role_tag: + type: string + required: true + port_a_single_1a_t1_port_0_ip_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_1a_t1_port_vlan_requirements: + port_a_single_1a_t2_port_0_subnetpoolid: + type: string + required: true + port_a_single_1a_t2_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_a_single_1a_t1_port_0_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_1a_t1_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true + type: string compute_a_single_1a_availability_zone: type: list required: true @@ -79,34 +83,30 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_1a_t1_port_related_networks: + port_a_single_1a_t1_port_0_network_role: + type: string + required: true + port_a_single_1a_t1_port_0_related_networks: type: list required: true entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_1a_t1_port_network_role_tag: - type: string - required: true - port_1a_t1_port_network_role: - type: string - required: true - port_1a_t1_port_order: - type: integer + port_a_single_1a_t1_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - port_1a_t2_port_exCP_naming: + port_a_single_1a_t2_port_0_exCP_naming: type: org.openecomp.datatypes.Naming required: true - port_1a_t2_port_vlan_requirements: + port_a_single_1a_t2_port_0_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_1a_t2_port_subnetpoolid: - type: string - required: true - port_1a_t2_port_order: - type: integer + type: org.openecomp.datatypes.network.IpRequirements + port_a_single_1a_t2_port_0_related_networks: + type: list required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments compute_a_single_1a_user_data_format: type: list required: true @@ -117,35 +117,35 @@ topology_template: required: true entry_schema: type: string - port_1a_t2_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_a_single_1a_t2_port_0_network_role: + type: string required: true node_templates: - a_single_1a_1a_t1_port: + a_single_1a_a_single_1a_t2_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_1a_t1_port_exCP_naming + get_input: port_a_single_1a_t2_port_0_exCP_naming vlan_requirements: - get_input: port_1a_t1_port_vlan_requirements + get_input: port_a_single_1a_t2_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_1a_t1_port_related_networks + get_input: port_a_single_1a_t2_port_0_related_networks ip_requirements: - get_input: port_1a_t1_port_ip_requirements + get_input: port_a_single_1a_t2_port_0_ip_requirements network_role_tag: - get_input: port_1a_t1_port_network_role_tag + get_input: port_a_single_1a_t2_port_0_network_role_tag mac_requirements: - get_input: port_1a_t1_port_mac_requirements + get_input: port_a_single_1a_t2_port_0_mac_requirements order: - get_input: port_1a_t1_port_order + get_input: port_a_single_1a_t2_port_0_order network_role: - get_input: port_1a_t1_port_network_role + get_input: port_a_single_1a_t2_port_0_network_role subnetpoolid: - get_input: port_1a_t1_port_subnetpoolid + get_input: port_a_single_1a_t2_port_0_subnetpoolid network: get_input: - - port_1a_t1_port_network + - port_a_single_1a_t2_port_0_network - index_value requirements: - binding: @@ -175,31 +175,31 @@ topology_template: get_input: - compute_a_single_1a_user_data_format - index_value - a_single_1a_1a_t2_port: + a_single_1a_a_single_1a_t1_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_1a_t2_port_exCP_naming + get_input: port_a_single_1a_t1_port_0_exCP_naming vlan_requirements: - get_input: port_1a_t2_port_vlan_requirements + get_input: port_a_single_1a_t1_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_1a_t2_port_related_networks + get_input: port_a_single_1a_t1_port_0_related_networks ip_requirements: - get_input: port_1a_t2_port_ip_requirements + get_input: port_a_single_1a_t1_port_0_ip_requirements network_role_tag: - get_input: port_1a_t2_port_network_role_tag + get_input: port_a_single_1a_t1_port_0_network_role_tag mac_requirements: - get_input: port_1a_t2_port_mac_requirements + get_input: port_a_single_1a_t1_port_0_mac_requirements order: - get_input: port_1a_t2_port_order + get_input: port_a_single_1a_t1_port_0_order network_role: - get_input: port_1a_t2_port_network_role + get_input: port_a_single_1a_t1_port_0_network_role subnetpoolid: - get_input: port_1a_t2_port_subnetpoolid + get_input: port_a_single_1a_t1_port_0_subnetpoolid network: get_input: - - port_1a_t2_port_network + - port_a_single_1a_t1_port_0_network - index_value requirements: - binding: @@ -207,39 +207,42 @@ topology_template: node: a_single_1a relationship: tosca.relationships.network.BindsTo outputs: - a_single_1a_instance_name: + a_single_1a_a_single_1a_t1_port_0_tenant_id: type: string value: get_attribute: - - a_single_1a - - instance_name - a_single_1a_1a_t1_port_tenant_id: + - a_single_1a_a_single_1a_t1_port_0 + - tenant_id + a_single_1a_instance_name: type: string value: get_attribute: - - a_single_1a_1a_t1_port - - tenant_id + - a_single_1a + - instance_name substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.a_single_1a capabilities: disk.read.bytes_a_single_1a: - a_single_1a - disk.read.bytes - network.incoming.bytes.rate_a_single_1a_1a_t2_port: - - a_single_1a_1a_t2_port - - network.incoming.bytes.rate disk.usage_a_single_1a: - a_single_1a - disk.usage - attachment_a_single_1a_1a_t2_port: - - a_single_1a_1a_t2_port - - attachment + network.incoming.bytes.rate_a_single_1a_a_single_1a_t2_port_0: + - a_single_1a_a_single_1a_t2_port_0 + - network.incoming.bytes.rate scalable_a_single_1a: - a_single_1a - scalable - network.outgoing.bytes.rate_a_single_1a_1a_t2_port: - - a_single_1a_1a_t2_port - - network.outgoing.bytes.rate + network.incoming.packets.rate_a_single_1a_a_single_1a_t2_port_0: + - a_single_1a_a_single_1a_t2_port_0 + - network.incoming.packets.rate + network.incoming.bytes_a_single_1a_a_single_1a_t2_port_0: + - a_single_1a_a_single_1a_t2_port_0 + - network.incoming.bytes + network.incoming.bytes.rate_a_single_1a_a_single_1a_t1_port_0: + - a_single_1a_a_single_1a_t1_port_0 + - network.incoming.bytes.rate host_a_single_1a: - a_single_1a - host @@ -252,27 +255,24 @@ topology_template: memory.resident_a_single_1a: - a_single_1a - memory.resident - network.incoming.packets.rate_a_single_1a_1a_t2_port: - - a_single_1a_1a_t2_port - - network.incoming.packets.rate cpu.delta_a_single_1a: - a_single_1a - cpu.delta - forwarder_a_single_1a_1a_t1_port: - - a_single_1a_1a_t1_port - - forwarder + network.incoming.bytes_a_single_1a_a_single_1a_t1_port_0: + - a_single_1a_a_single_1a_t1_port_0 + - network.incoming.bytes disk.device.write.requests_a_single_1a: - a_single_1a - disk.device.write.requests - network.incoming.bytes.rate_a_single_1a_1a_t1_port: - - a_single_1a_1a_t1_port - - network.incoming.bytes.rate disk.iops_a_single_1a: - a_single_1a - disk.iops - network.incoming.bytes_a_single_1a_1a_t1_port: - - a_single_1a_1a_t1_port - - network.incoming.bytes + network.outgoing.bytes_a_single_1a_a_single_1a_t2_port_0: + - a_single_1a_a_single_1a_t2_port_0 + - network.outgoing.bytes + forwarder_a_single_1a_a_single_1a_t1_port_0: + - a_single_1a_a_single_1a_t1_port_0 + - forwarder cpu_util_a_single_1a: - a_single_1a - cpu_util @@ -282,42 +282,39 @@ topology_template: disk.device.usage_a_single_1a: - a_single_1a - disk.device.usage - network.incoming.packets.rate_a_single_1a_1a_t1_port: - - a_single_1a_1a_t1_port - - network.incoming.packets.rate - network.outgoing.packets.rate_a_single_1a_1a_t2_port: - - a_single_1a_1a_t2_port - - network.outgoing.packets.rate + attachment_a_single_1a_a_single_1a_t1_port_0: + - a_single_1a_a_single_1a_t1_port_0 + - attachment disk.read.requests_a_single_1a: - a_single_1a - disk.read.requests disk.read.bytes.rate_a_single_1a: - a_single_1a - disk.read.bytes.rate + binding_a_single_1a_a_single_1a_t2_port_0: + - a_single_1a_a_single_1a_t2_port_0 + - binding disk.write.bytes.rate_a_single_1a: - a_single_1a - disk.write.bytes.rate - attachment_a_single_1a_1a_t1_port: - - a_single_1a_1a_t1_port - - attachment + feature_a_single_1a_a_single_1a_t2_port_0: + - a_single_1a_a_single_1a_t2_port_0 + - feature cpu_a_single_1a: - a_single_1a - cpu memory.usage_a_single_1a: - a_single_1a - memory.usage - forwarder_a_single_1a_1a_t2_port: - - a_single_1a_1a_t2_port - - forwarder + network.outpoing.packets_a_single_1a_a_single_1a_t1_port_0: + - a_single_1a_a_single_1a_t1_port_0 + - network.outpoing.packets disk.device.write.requests.rate_a_single_1a: - a_single_1a - disk.device.write.requests.rate - binding_a_single_1a_1a_t2_port: - - a_single_1a_1a_t2_port - - binding - network.incoming.packets_a_single_1a_1a_t2_port: - - a_single_1a_1a_t2_port - - network.incoming.packets + network.outgoing.packets.rate_a_single_1a_a_single_1a_t2_port_0: + - a_single_1a_a_single_1a_t2_port_0 + - network.outgoing.packets.rate disk.device.read.requests_a_single_1a: - a_single_1a - disk.device.read.requests @@ -333,24 +330,12 @@ topology_template: disk.latency_a_single_1a: - a_single_1a - disk.latency - network.outgoing.bytes_a_single_1a_1a_t2_port: - - a_single_1a_1a_t2_port - - network.outgoing.bytes disk.device.allocation_a_single_1a: - a_single_1a - disk.device.allocation disk.write.bytes_a_single_1a: - a_single_1a - disk.write.bytes - feature_a_single_1a_1a_t1_port: - - a_single_1a_1a_t1_port - - feature - network.outpoing.packets_a_single_1a_1a_t2_port: - - a_single_1a_1a_t2_port - - network.outpoing.packets - network.outpoing.packets_a_single_1a_1a_t1_port: - - a_single_1a_1a_t1_port - - network.outpoing.packets disk.device.read.bytes.rate_a_single_1a: - a_single_1a - disk.device.read.bytes.rate @@ -360,78 +345,93 @@ topology_template: disk.device.write.bytes.rate_a_single_1a: - a_single_1a - disk.device.write.bytes.rate + network.incoming.packets_a_single_1a_a_single_1a_t2_port_0: + - a_single_1a_a_single_1a_t2_port_0 + - network.incoming.packets memory_a_single_1a: - a_single_1a - memory disk.allocation_a_single_1a: - a_single_1a - disk.allocation - network.outgoing.packets.rate_a_single_1a_1a_t1_port: - - a_single_1a_1a_t1_port - - network.outgoing.packets.rate - feature_a_single_1a_1a_t2_port: - - a_single_1a_1a_t2_port - - feature + network.incoming.packets_a_single_1a_a_single_1a_t1_port_0: + - a_single_1a_a_single_1a_t1_port_0 + - network.incoming.packets + network.outgoing.bytes.rate_a_single_1a_a_single_1a_t2_port_0: + - a_single_1a_a_single_1a_t2_port_0 + - network.outgoing.bytes.rate + network.outgoing.bytes.rate_a_single_1a_a_single_1a_t1_port_0: + - a_single_1a_a_single_1a_t1_port_0 + - network.outgoing.bytes.rate disk.capacity_a_single_1a: - a_single_1a - disk.capacity disk.device.read.bytes_a_single_1a: - a_single_1a - disk.device.read.bytes - network.incoming.packets_a_single_1a_1a_t1_port: - - a_single_1a_1a_t1_port - - network.incoming.packets feature_a_single_1a: - a_single_1a - feature - network.outgoing.bytes_a_single_1a_1a_t1_port: - - a_single_1a_1a_t1_port + network.outgoing.bytes_a_single_1a_a_single_1a_t1_port_0: + - a_single_1a_a_single_1a_t1_port_0 - network.outgoing.bytes + forwarder_a_single_1a_a_single_1a_t2_port_0: + - a_single_1a_a_single_1a_t2_port_0 + - forwarder disk.ephemeral.size_a_single_1a: - a_single_1a - disk.ephemeral.size vcpus_a_single_1a: - a_single_1a - vcpus - binding_a_single_1a_1a_t1_port: - - a_single_1a_1a_t1_port - - binding + attachment_a_single_1a_a_single_1a_t2_port_0: + - a_single_1a_a_single_1a_t2_port_0 + - attachment + network.incoming.packets.rate_a_single_1a_a_single_1a_t1_port_0: + - a_single_1a_a_single_1a_t1_port_0 + - network.incoming.packets.rate disk.device.iops_a_single_1a: - a_single_1a - disk.device.iops disk.write.requests_a_single_1a: - a_single_1a - disk.write.requests + network.outpoing.packets_a_single_1a_a_single_1a_t2_port_0: + - a_single_1a_a_single_1a_t2_port_0 + - network.outpoing.packets disk.device.read.requests.rate_a_single_1a: - a_single_1a - disk.device.read.requests.rate + feature_a_single_1a_a_single_1a_t1_port_0: + - a_single_1a_a_single_1a_t1_port_0 + - feature disk.device.capacity_a_single_1a: - a_single_1a - disk.device.capacity + binding_a_single_1a_a_single_1a_t1_port_0: + - a_single_1a_a_single_1a_t1_port_0 + - binding disk.write.requests.rate_a_single_1a: - a_single_1a - disk.write.requests.rate - network.incoming.bytes_a_single_1a_1a_t2_port: - - a_single_1a_1a_t2_port - - network.incoming.bytes - network.outgoing.bytes.rate_a_single_1a_1a_t1_port: - - a_single_1a_1a_t1_port - - network.outgoing.bytes.rate + network.outgoing.packets.rate_a_single_1a_a_single_1a_t1_port_0: + - a_single_1a_a_single_1a_t1_port_0 + - network.outgoing.packets.rate requirements: - link_a_single_1a_1a_t2_port: - - a_single_1a_1a_t2_port + link_a_single_1a_a_single_1a_t2_port_0: + - a_single_1a_a_single_1a_t2_port_0 - link - link_a_single_1a_1a_t1_port: - - a_single_1a_1a_t1_port + link_a_single_1a_a_single_1a_t1_port_0: + - a_single_1a_a_single_1a_t1_port_0 - link dependency_a_single_1a: - a_single_1a - dependency - dependency_a_single_1a_1a_t2_port: - - a_single_1a_1a_t2_port + dependency_a_single_1a_a_single_1a_t2_port_0: + - a_single_1a_a_single_1a_t2_port_0 - dependency - dependency_a_single_1a_1a_t1_port: - - a_single_1a_1a_t1_port + dependency_a_single_1a_a_single_1a_t1_port_0: + - a_single_1a_a_single_1a_t1_port_0 - dependency local_storage_a_single_1a: - 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/dependencyConnectivity/out/Nested_b_single_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_b_single_1bServiceTemplate.yaml index 8bf062f993..cd92a68dd2 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_b_single_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_b_single_1bServiceTemplate.yaml @@ -11,35 +11,45 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_1b_t1_port_order: - type: integer + port_b_single_1b_t1_port_0_network_role_tag: + type: string + required: true + port_b_single_1b_t1_port_0_related_networks: + type: list required: true - port_1b_t1_port_network_role: + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_b_single_1b_t2_port_0_subnetpoolid: type: string required: true - port_1b_t1_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_b_single_1b_t1_port_0_network_role: + type: string + required: true + port_b_single_1b_t2_port_0_network: + type: list required: true + entry_schema: + type: string vm_flavor_name: type: string required: true - port_1b_t2_port_related_networks: + port_b_single_1b_t1_port_0_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_1b_t1_port_ip_requirements: + type: org.openecomp.datatypes.network.VlanRequirements + port_b_single_1b_t2_port_0_related_networks: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_image_name: type: string required: true - port_1b_t2_port_network_role: - type: string + port_b_single_1b_t2_port_0_order: + type: integer required: true - port_1b_t2_port_order: + port_b_single_1b_t1_port_0_order: type: integer required: true compute_b_single_1b_user_data_format: @@ -47,28 +57,27 @@ topology_template: required: true entry_schema: type: string - port_1b_t2_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_1b_t2_port_network_role_tag: - type: string + port_b_single_1b_t2_port_0_vlan_requirements: + type: list required: true - port_1b_t2_port_subnetpoolid: + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_b_single_1b_t2_port_0_network_role: type: string required: true - port_1b_t1_port_related_networks: + port_b_single_1b_t1_port_0_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_1b_t2_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true + type: org.openecomp.datatypes.network.IpRequirements compute_b_single_1b_availability_zone: type: list required: true entry_schema: type: string + port_b_single_1b_t1_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -81,35 +90,26 @@ topology_template: required: true entry_schema: type: json - port_1b_t2_port_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_1b_t2_port_ip_requirements: - type: list + port_b_single_1b_t1_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_1b_t1_port_network_role_tag: + port_b_single_1b_t1_port_0_subnetpoolid: type: string required: true - port_1b_t1_port_subnetpoolid: + port_b_single_1b_t2_port_0_network_role_tag: type: string required: true - port_1b_t1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_1b_t2_port_network: + port_b_single_1b_t2_port_0_ip_requirements: type: list required: true entry_schema: - type: string - port_1b_t1_port_vlan_requirements: - type: list + type: org.openecomp.datatypes.network.IpRequirements + port_b_single_1b_t2_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_b_single_1b_t2_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements compute_b_single_1b_name: type: list required: true @@ -139,63 +139,63 @@ topology_template: get_input: - compute_b_single_1b_user_data_format - index_value - b_single_1b_1b_t1_port: + b_single_1b_b_single_1b_t2_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_1b_t1_port_exCP_naming + get_input: port_b_single_1b_t2_port_0_exCP_naming vlan_requirements: - get_input: port_1b_t1_port_vlan_requirements + get_input: port_b_single_1b_t2_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_1b_t1_port_related_networks + get_input: port_b_single_1b_t2_port_0_related_networks ip_requirements: - get_input: port_1b_t1_port_ip_requirements + get_input: port_b_single_1b_t2_port_0_ip_requirements network_role_tag: - get_input: port_1b_t1_port_network_role_tag + get_input: port_b_single_1b_t2_port_0_network_role_tag mac_requirements: - get_input: port_1b_t1_port_mac_requirements + get_input: port_b_single_1b_t2_port_0_mac_requirements order: - get_input: port_1b_t1_port_order + get_input: port_b_single_1b_t2_port_0_order network_role: - get_input: port_1b_t1_port_network_role + get_input: port_b_single_1b_t2_port_0_network_role subnetpoolid: - get_input: port_1b_t1_port_subnetpoolid + get_input: port_b_single_1b_t2_port_0_subnetpoolid network: - get_attribute: - - b_single_1b - - accessIPv6 + get_input: + - port_b_single_1b_t2_port_0_network + - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: b_single_1b relationship: tosca.relationships.network.BindsTo - b_single_1b_1b_t2_port: + b_single_1b_b_single_1b_t1_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_1b_t2_port_exCP_naming + get_input: port_b_single_1b_t1_port_0_exCP_naming vlan_requirements: - get_input: port_1b_t2_port_vlan_requirements + get_input: port_b_single_1b_t1_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_1b_t2_port_related_networks + get_input: port_b_single_1b_t1_port_0_related_networks ip_requirements: - get_input: port_1b_t2_port_ip_requirements + get_input: port_b_single_1b_t1_port_0_ip_requirements network_role_tag: - get_input: port_1b_t2_port_network_role_tag + get_input: port_b_single_1b_t1_port_0_network_role_tag mac_requirements: - get_input: port_1b_t2_port_mac_requirements + get_input: port_b_single_1b_t1_port_0_mac_requirements order: - get_input: port_1b_t2_port_order + get_input: port_b_single_1b_t1_port_0_order network_role: - get_input: port_1b_t2_port_network_role + get_input: port_b_single_1b_t1_port_0_network_role subnetpoolid: - get_input: port_1b_t2_port_subnetpoolid + get_input: port_b_single_1b_t1_port_0_subnetpoolid network: - get_input: - - port_1b_t2_port_network - - index_value + get_attribute: + - b_single_1b + - accessIPv6 requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -208,21 +208,15 @@ topology_template: get_attribute: - b_single_1b - instance_name - b_single_1b_1b_t1_port_tenant_id: + b_single_1b_b_single_1b_t1_port_0_tenant_id: type: string value: get_attribute: - - b_single_1b_1b_t1_port + - b_single_1b_b_single_1b_t1_port_0 - tenant_id substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.b_single_1b capabilities: - attachment_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port - - attachment - forwarder_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port - - forwarder endpoint_b_single_1b: - b_single_1b - endpoint @@ -232,15 +226,30 @@ topology_template: disk.iops_b_single_1b: - b_single_1b - disk.iops - network.incoming.bytes.rate_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port + network.incoming.bytes_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 + - network.incoming.bytes + network.incoming.packets.rate_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - network.incoming.packets.rate + network.incoming.bytes_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - network.incoming.bytes + binding_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 + - binding + feature_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - feature + feature_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 + - feature + network.incoming.bytes.rate_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 - network.incoming.bytes.rate - network.outgoing.bytes.rate_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port - - network.outgoing.bytes.rate - forwarder_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - forwarder + binding_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - binding scalable_b_single_1b: - b_single_1b - scalable @@ -250,24 +259,30 @@ topology_template: os_b_single_1b: - b_single_1b - os + forwarder_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - forwarder + forwarder_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 + - forwarder vcpus_b_single_1b: - b_single_1b - vcpus cpu_b_single_1b: - b_single_1b - cpu + network.incoming.bytes.rate_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - network.incoming.bytes.rate disk.device.read.requests.rate_b_single_1b: - b_single_1b - disk.device.read.requests.rate - network.incoming.packets.rate_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port + network.incoming.packets.rate_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 - network.incoming.packets.rate instance_b_single_1b: - b_single_1b - instance - network.incoming.bytes.rate_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - network.incoming.bytes.rate disk.read.bytes_b_single_1b: - b_single_1b - disk.read.bytes @@ -277,45 +292,36 @@ topology_template: disk.usage_b_single_1b: - b_single_1b - disk.usage - network.incoming.bytes_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - network.incoming.bytes disk.device.allocation_b_single_1b: - b_single_1b - disk.device.allocation - network.outgoing.packets.rate_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port + network.outgoing.packets.rate_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 - network.outgoing.packets.rate + network.outpoing.packets_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 + - network.outpoing.packets + network.outgoing.bytes_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - network.outgoing.bytes disk.device.capacity_b_single_1b: - b_single_1b - disk.device.capacity disk.latency_b_single_1b: - b_single_1b - disk.latency - network.incoming.packets_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port - - network.incoming.packets - network.incoming.packets.rate_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - network.incoming.packets.rate - attachment_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port + attachment_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 - attachment disk.device.write.requests_b_single_1b: - b_single_1b - disk.device.write.requests - binding_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port - - binding disk.ephemeral.size_b_single_1b: - b_single_1b - disk.ephemeral.size disk.write.requests.rate_b_single_1b: - b_single_1b - disk.write.requests.rate - network.outpoing.packets_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port - - network.outpoing.packets disk.device.iops_b_single_1b: - b_single_1b - disk.device.iops @@ -325,15 +331,18 @@ topology_template: memory.resident_b_single_1b: - b_single_1b - memory.resident + network.outgoing.bytes.rate_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - network.outgoing.bytes.rate disk.root.size_b_single_1b: - b_single_1b - disk.root.size - feature_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - feature - network.outgoing.bytes_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port - - network.outgoing.bytes + network.incoming.packets_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 + - network.incoming.packets + network.outgoing.bytes.rate_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 + - network.outgoing.bytes.rate disk.capacity_b_single_1b: - b_single_1b - disk.capacity @@ -352,45 +361,39 @@ topology_template: disk.write.requests_b_single_1b: - b_single_1b - disk.write.requests - network.outgoing.packets.rate_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - network.outgoing.packets.rate + network.incoming.packets_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - network.incoming.packets disk.device.usage_b_single_1b: - b_single_1b - disk.device.usage disk.read.bytes.rate_b_single_1b: - b_single_1b - disk.read.bytes.rate - network.outgoing.bytes_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - network.outgoing.bytes disk.device.read.requests_b_single_1b: - b_single_1b - disk.device.read.requests - network.incoming.packets_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - network.incoming.packets - binding_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - binding - network.outpoing.packets_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - network.outpoing.packets + attachment_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - attachment disk.device.write.requests.rate_b_single_1b: - b_single_1b - disk.device.write.requests.rate + network.outgoing.packets.rate_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 + - network.outgoing.packets.rate + network.outpoing.packets_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - network.outpoing.packets memory.usage_b_single_1b: - b_single_1b - memory.usage + network.outgoing.bytes_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 + - network.outgoing.bytes disk.write.bytes.rate_b_single_1b: - b_single_1b - disk.write.bytes.rate - network.incoming.bytes_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port - - network.incoming.bytes - network.outgoing.bytes.rate_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - network.outgoing.bytes.rate cpu.delta_b_single_1b: - b_single_1b - cpu.delta @@ -409,25 +412,22 @@ topology_template: binding_b_single_1b: - b_single_1b - binding - feature_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port - - feature requirements: local_storage_b_single_1b: - b_single_1b - local_storage - dependency_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - dependency + link_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 + - link dependency_b_single_1b: - b_single_1b - dependency - link_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port - - link - link_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - link - dependency_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port - - dependency \ No newline at end of file + dependency_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - dependency + dependency_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 + - dependency + link_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - link \ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_b_single_1b_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_b_single_1b_1ServiceTemplate.yaml index 1da7eb2953..1eb37ca97d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_b_single_1b_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_b_single_1b_1ServiceTemplate.yaml @@ -11,35 +11,45 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_1b_t1_port_order: - type: integer + port_b_single_1b_t1_port_0_network_role_tag: + type: string + required: true + port_b_single_1b_t1_port_0_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_b_single_1b_t2_port_0_subnetpoolid: + type: string required: true - port_1b_t1_port_network_role: + port_b_single_1b_t1_port_0_network_role: type: string required: true - port_1b_t1_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_b_single_1b_t2_port_0_network: + type: list required: true + entry_schema: + type: string vm_flavor_name: type: string required: true - port_1b_t2_port_related_networks: + port_b_single_1b_t1_port_0_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_1b_t1_port_ip_requirements: + type: org.openecomp.datatypes.network.VlanRequirements + port_b_single_1b_t2_port_0_related_networks: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_image_name: type: string required: true - port_1b_t2_port_network_role: - type: string + port_b_single_1b_t2_port_0_order: + type: integer required: true - port_1b_t2_port_order: + port_b_single_1b_t1_port_0_order: type: integer required: true compute_b_single_1b_user_data_format: @@ -47,28 +57,27 @@ topology_template: required: true entry_schema: type: string - port_1b_t2_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_1b_t2_port_network_role_tag: - type: string + port_b_single_1b_t2_port_0_vlan_requirements: + type: list required: true - port_1b_t2_port_subnetpoolid: + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_b_single_1b_t2_port_0_network_role: type: string required: true - port_1b_t1_port_related_networks: + port_b_single_1b_t1_port_0_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_1b_t2_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true + type: org.openecomp.datatypes.network.IpRequirements compute_b_single_1b_availability_zone: type: list required: true entry_schema: type: string + port_b_single_1b_t1_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -81,40 +90,31 @@ topology_template: required: true entry_schema: type: json - port_1b_t2_port_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_1b_t2_port_ip_requirements: - type: list + port_b_single_1b_t1_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_1b_t1_port_network_role_tag: + port_b_single_1b_t1_port_0_subnetpoolid: type: string required: true - port_1b_t1_port_subnetpoolid: + port_b_single_1b_t2_port_0_network_role_tag: type: string required: true - port_1b_t1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_1b_t2_port_network: + port_b_single_1b_t1_port_0_network: type: list required: true entry_schema: type: string - port_1b_t1_port_vlan_requirements: + port_b_single_1b_t2_port_0_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_1b_t1_port_network: - type: list + type: org.openecomp.datatypes.network.IpRequirements + port_b_single_1b_t2_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_b_single_1b_t2_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: string compute_b_single_1b_name: type: list required: true @@ -144,62 +144,62 @@ topology_template: get_input: - compute_b_single_1b_user_data_format - index_value - b_single_1b_1b_t1_port: + b_single_1b_b_single_1b_t2_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_1b_t1_port_exCP_naming + get_input: port_b_single_1b_t2_port_0_exCP_naming vlan_requirements: - get_input: port_1b_t1_port_vlan_requirements + get_input: port_b_single_1b_t2_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_1b_t1_port_related_networks + get_input: port_b_single_1b_t2_port_0_related_networks ip_requirements: - get_input: port_1b_t1_port_ip_requirements + get_input: port_b_single_1b_t2_port_0_ip_requirements network_role_tag: - get_input: port_1b_t1_port_network_role_tag + get_input: port_b_single_1b_t2_port_0_network_role_tag mac_requirements: - get_input: port_1b_t1_port_mac_requirements + get_input: port_b_single_1b_t2_port_0_mac_requirements order: - get_input: port_1b_t1_port_order + get_input: port_b_single_1b_t2_port_0_order network_role: - get_input: port_1b_t1_port_network_role + get_input: port_b_single_1b_t2_port_0_network_role subnetpoolid: - get_input: port_1b_t1_port_subnetpoolid + get_input: port_b_single_1b_t2_port_0_subnetpoolid network: get_input: - - port_1b_t1_port_network + - port_b_single_1b_t2_port_0_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: b_single_1b relationship: tosca.relationships.network.BindsTo - b_single_1b_1b_t2_port: + b_single_1b_b_single_1b_t1_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_1b_t2_port_exCP_naming + get_input: port_b_single_1b_t1_port_0_exCP_naming vlan_requirements: - get_input: port_1b_t2_port_vlan_requirements + get_input: port_b_single_1b_t1_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_1b_t2_port_related_networks + get_input: port_b_single_1b_t1_port_0_related_networks ip_requirements: - get_input: port_1b_t2_port_ip_requirements + get_input: port_b_single_1b_t1_port_0_ip_requirements network_role_tag: - get_input: port_1b_t2_port_network_role_tag + get_input: port_b_single_1b_t1_port_0_network_role_tag mac_requirements: - get_input: port_1b_t2_port_mac_requirements + get_input: port_b_single_1b_t1_port_0_mac_requirements order: - get_input: port_1b_t2_port_order + get_input: port_b_single_1b_t1_port_0_order network_role: - get_input: port_1b_t2_port_network_role + get_input: port_b_single_1b_t1_port_0_network_role subnetpoolid: - get_input: port_1b_t2_port_subnetpoolid + get_input: port_b_single_1b_t1_port_0_subnetpoolid network: get_input: - - port_1b_t2_port_network + - port_b_single_1b_t1_port_0_network - index_value requirements: - binding: @@ -213,21 +213,15 @@ topology_template: get_attribute: - b_single_1b - instance_name - b_single_1b_1b_t1_port_tenant_id: + b_single_1b_b_single_1b_t1_port_0_tenant_id: type: string value: get_attribute: - - b_single_1b_1b_t1_port + - b_single_1b_b_single_1b_t1_port_0 - tenant_id substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.b_single_1b_1 capabilities: - attachment_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port - - attachment - forwarder_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port - - forwarder endpoint_b_single_1b: - b_single_1b - endpoint @@ -237,15 +231,30 @@ topology_template: disk.iops_b_single_1b: - b_single_1b - disk.iops - network.incoming.bytes.rate_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port + network.incoming.bytes_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 + - network.incoming.bytes + network.incoming.packets.rate_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - network.incoming.packets.rate + network.incoming.bytes_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - network.incoming.bytes + binding_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 + - binding + feature_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - feature + feature_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 + - feature + network.incoming.bytes.rate_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 - network.incoming.bytes.rate - network.outgoing.bytes.rate_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port - - network.outgoing.bytes.rate - forwarder_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - forwarder + binding_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - binding scalable_b_single_1b: - b_single_1b - scalable @@ -255,24 +264,30 @@ topology_template: os_b_single_1b: - b_single_1b - os + forwarder_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - forwarder + forwarder_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 + - forwarder vcpus_b_single_1b: - b_single_1b - vcpus cpu_b_single_1b: - b_single_1b - cpu + network.incoming.bytes.rate_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - network.incoming.bytes.rate disk.device.read.requests.rate_b_single_1b: - b_single_1b - disk.device.read.requests.rate - network.incoming.packets.rate_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port + network.incoming.packets.rate_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 - network.incoming.packets.rate instance_b_single_1b: - b_single_1b - instance - network.incoming.bytes.rate_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - network.incoming.bytes.rate disk.read.bytes_b_single_1b: - b_single_1b - disk.read.bytes @@ -282,45 +297,36 @@ topology_template: disk.usage_b_single_1b: - b_single_1b - disk.usage - network.incoming.bytes_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - network.incoming.bytes disk.device.allocation_b_single_1b: - b_single_1b - disk.device.allocation - network.outgoing.packets.rate_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port + network.outgoing.packets.rate_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 - network.outgoing.packets.rate + network.outpoing.packets_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 + - network.outpoing.packets + network.outgoing.bytes_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - network.outgoing.bytes disk.device.capacity_b_single_1b: - b_single_1b - disk.device.capacity disk.latency_b_single_1b: - b_single_1b - disk.latency - network.incoming.packets_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port - - network.incoming.packets - network.incoming.packets.rate_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - network.incoming.packets.rate - attachment_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port + attachment_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 - attachment disk.device.write.requests_b_single_1b: - b_single_1b - disk.device.write.requests - binding_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port - - binding disk.ephemeral.size_b_single_1b: - b_single_1b - disk.ephemeral.size disk.write.requests.rate_b_single_1b: - b_single_1b - disk.write.requests.rate - network.outpoing.packets_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port - - network.outpoing.packets disk.device.iops_b_single_1b: - b_single_1b - disk.device.iops @@ -330,15 +336,18 @@ topology_template: memory.resident_b_single_1b: - b_single_1b - memory.resident + network.outgoing.bytes.rate_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - network.outgoing.bytes.rate disk.root.size_b_single_1b: - b_single_1b - disk.root.size - feature_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - feature - network.outgoing.bytes_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port - - network.outgoing.bytes + network.incoming.packets_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 + - network.incoming.packets + network.outgoing.bytes.rate_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 + - network.outgoing.bytes.rate disk.capacity_b_single_1b: - b_single_1b - disk.capacity @@ -357,45 +366,39 @@ topology_template: disk.write.requests_b_single_1b: - b_single_1b - disk.write.requests - network.outgoing.packets.rate_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - network.outgoing.packets.rate + network.incoming.packets_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - network.incoming.packets disk.device.usage_b_single_1b: - b_single_1b - disk.device.usage disk.read.bytes.rate_b_single_1b: - b_single_1b - disk.read.bytes.rate - network.outgoing.bytes_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - network.outgoing.bytes disk.device.read.requests_b_single_1b: - b_single_1b - disk.device.read.requests - network.incoming.packets_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - network.incoming.packets - binding_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - binding - network.outpoing.packets_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - network.outpoing.packets + attachment_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - attachment disk.device.write.requests.rate_b_single_1b: - b_single_1b - disk.device.write.requests.rate + network.outgoing.packets.rate_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 + - network.outgoing.packets.rate + network.outpoing.packets_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - network.outpoing.packets memory.usage_b_single_1b: - b_single_1b - memory.usage + network.outgoing.bytes_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 + - network.outgoing.bytes disk.write.bytes.rate_b_single_1b: - b_single_1b - disk.write.bytes.rate - network.incoming.bytes_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port - - network.incoming.bytes - network.outgoing.bytes.rate_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - network.outgoing.bytes.rate cpu.delta_b_single_1b: - b_single_1b - cpu.delta @@ -414,25 +417,22 @@ topology_template: binding_b_single_1b: - b_single_1b - binding - feature_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port - - feature requirements: local_storage_b_single_1b: - b_single_1b - local_storage - dependency_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - dependency + link_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 + - link dependency_b_single_1b: - b_single_1b - dependency - link_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port - - link - link_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - link - dependency_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port - - dependency \ No newline at end of file + dependency_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - dependency + dependency_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 + - dependency + link_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - link \ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_pcma_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_pcma_serverServiceTemplate.yaml index 3b3e7bc0ed..3397b00ba8 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_pcma_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_pcma_serverServiceTemplate.yaml @@ -11,36 +11,40 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_pcm_port_3_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_pcm_port_2_network_role: + port_pcm_port_2_0_subnetpoolid: type: string required: true - port_pcm_port_2_fixed_ips: + port_pcm_port_2_0_security_groups: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_pcm_port_3_network_role: - type: string + type: json + port_pcm_port_2_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_pcm_port_3_vlan_requirements: + port_pcm_port_2_0_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements + port_pcm_port_3_0_fixed_ips: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps vm_flavor_name: type: string required: true - port_pcm_port_3_security_groups: + port_pcm_port_3_0_ip_requirements: type: list required: true entry_schema: - type: json - port_pcm_port_3_order: - type: integer + type: org.openecomp.datatypes.network.IpRequirements + port_pcm_port_3_0_related_networks: + type: list required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments compute_pcma_server_availability_zone: type: list required: true @@ -49,51 +53,40 @@ topology_template: vm_image_name: type: string required: true - port_pcm_port_2_security_groups: + port_pcm_port_3_0_security_groups: type: list required: true entry_schema: type: json - port_pcm_port_2_exCP_naming: + port_pcm_port_2_0_exCP_naming: type: org.openecomp.datatypes.Naming required: true - port_pcm_port_3_ip_requirements: + port_pcm_port_2_0_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pcm_port_2_subnetpoolid: - type: string - required: true - port_pcm_port_2_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_pcm_port_2_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pcm_port_3_subnetpoolid: + type: string + port_pcm_port_2_0_network_role_tag: type: string required: true - port_pcm_port_3_network_role_tag: + port_pcm_port_3_0_network_role_tag: type: string required: true - compute_pcma_server_config_drive: + port_pcm_port_3_0_vlan_requirements: type: list required: true entry_schema: - type: boolean - port_pcm_port_3_fixed_ips: + type: org.openecomp.datatypes.network.VlanRequirements + port_pcm_port_2_0_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_pcm_port_3_related_networks: + type: org.openecomp.datatypes.network.IpRequirements + compute_pcma_server_config_drive: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments + type: boolean index_value: type: integer description: Index value of this substitution service template runtime instance @@ -106,35 +99,36 @@ topology_template: required: true entry_schema: type: string - port_pcm_port_2_order: - type: integer - required: true - port_pcm_port_3_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_pcm_port_2_network: + port_pcm_port_3_0_network: type: list required: true entry_schema: type: string - port_pcm_port_2_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pcm_port_2_network_role_tag: + port_pcm_port_2_0_network_role: type: string required: true - port_pcm_port_2_related_networks: + port_pcm_port_2_0_related_networks: type: list required: true entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pcm_port_3_network: + port_pcm_port_2_0_fixed_ips: type: list required: true entry_schema: - type: string + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_pcm_port_2_0_order: + type: integer + required: true + port_pcm_port_3_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_pcm_port_3_0_subnetpoolid: + type: string + required: true + port_pcm_port_3_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true compute_pcma_server_scheduler_hints: type: list required: true @@ -145,6 +139,12 @@ topology_template: required: true entry_schema: type: string + port_pcm_port_3_0_network_role: + type: string + required: true + port_pcm_port_3_0_order: + type: integer + required: true node_templates: pcma_server: type: org.openecomp.resource.vfc.compute.nodes.heat.pcma_server @@ -173,78 +173,78 @@ topology_template: get_input: - compute_pcma_server_user_data_format - index_value - pcma_server_pcm_port_3: + pcma_server_pcm_port_2_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_requirements: - get_input: port_pcm_port_3_mac_requirements + get_input: port_pcm_port_2_0_mac_requirements order: - get_input: port_pcm_port_3_order + get_input: port_pcm_port_2_0_order security_groups: get_input: - - port_pcm_port_3_security_groups + - port_pcm_port_2_0_security_groups - index_value exCP_naming: - get_input: port_pcm_port_3_exCP_naming + get_input: port_pcm_port_2_0_exCP_naming vlan_requirements: - get_input: port_pcm_port_3_vlan_requirements + get_input: port_pcm_port_2_0_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_pcm_port_3_ip_requirements + get_input: port_pcm_port_2_0_ip_requirements related_networks: - get_input: port_pcm_port_3_related_networks + get_input: port_pcm_port_2_0_related_networks network_role_tag: - get_input: port_pcm_port_3_network_role_tag + get_input: port_pcm_port_2_0_network_role_tag network_role: - get_input: port_pcm_port_3_network_role + get_input: port_pcm_port_2_0_network_role fixed_ips: get_input: - - port_pcm_port_3_fixed_ips + - port_pcm_port_2_0_fixed_ips - index_value subnetpoolid: - get_input: port_pcm_port_3_subnetpoolid + get_input: port_pcm_port_2_0_subnetpoolid network: get_input: - - port_pcm_port_3_network + - port_pcm_port_2_0_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: pcma_server relationship: tosca.relationships.network.BindsTo - pcma_server_pcm_port_2: + pcma_server_pcm_port_3_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_requirements: - get_input: port_pcm_port_2_mac_requirements + get_input: port_pcm_port_3_0_mac_requirements order: - get_input: port_pcm_port_2_order + get_input: port_pcm_port_3_0_order security_groups: get_input: - - port_pcm_port_2_security_groups + - port_pcm_port_3_0_security_groups - index_value exCP_naming: - get_input: port_pcm_port_2_exCP_naming + get_input: port_pcm_port_3_0_exCP_naming vlan_requirements: - get_input: port_pcm_port_2_vlan_requirements + get_input: port_pcm_port_3_0_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_pcm_port_2_ip_requirements + get_input: port_pcm_port_3_0_ip_requirements related_networks: - get_input: port_pcm_port_2_related_networks + get_input: port_pcm_port_3_0_related_networks network_role_tag: - get_input: port_pcm_port_2_network_role_tag + get_input: port_pcm_port_3_0_network_role_tag network_role: - get_input: port_pcm_port_2_network_role + get_input: port_pcm_port_3_0_network_role fixed_ips: get_input: - - port_pcm_port_2_fixed_ips + - port_pcm_port_3_0_fixed_ips - index_value subnetpoolid: - get_input: port_pcm_port_2_subnetpoolid + get_input: port_pcm_port_3_0_subnetpoolid network: get_input: - - port_pcm_port_2_network + - port_pcm_port_3_0_network - index_value requirements: - binding: @@ -257,6 +257,18 @@ topology_template: cpu.delta_pcma_server: - pcma_server - cpu.delta + network.incoming.packets_pcma_server_pcm_port_3_0: + - pcma_server_pcm_port_3_0 + - network.incoming.packets + network.outgoing.packets.rate_pcma_server_pcm_port_2_0: + - pcma_server_pcm_port_2_0 + - network.outgoing.packets.rate + network.incoming.bytes.rate_pcma_server_pcm_port_2_0: + - pcma_server_pcm_port_2_0 + - network.incoming.bytes.rate + network.outgoing.bytes.rate_pcma_server_pcm_port_2_0: + - pcma_server_pcm_port_2_0 + - network.outgoing.bytes.rate scalable_pcma_server: - pcma_server - scalable @@ -269,99 +281,69 @@ topology_template: disk.device.read.requests.rate_pcma_server: - pcma_server - disk.device.read.requests.rate + network.outpoing.packets_pcma_server_pcm_port_2_0: + - pcma_server_pcm_port_2_0 + - network.outpoing.packets disk.usage_pcma_server: - pcma_server - disk.usage - network.outgoing.bytes.rate_pcma_server_pcm_port_3: - - pcma_server_pcm_port_3 - - network.outgoing.bytes.rate disk.read.bytes_pcma_server: - pcma_server - disk.read.bytes disk.iops_pcma_server: - pcma_server - disk.iops - network.outgoing.bytes.rate_pcma_server_pcm_port_2: - - pcma_server_pcm_port_2 - - network.outgoing.bytes.rate - attachment_pcma_server_pcm_port_2: - - pcma_server_pcm_port_2 - - attachment endpoint_pcma_server: - pcma_server - endpoint feature_pcma_server: - pcma_server - feature - attachment_pcma_server_pcm_port_3: - - pcma_server_pcm_port_3 - - attachment - network.incoming.bytes.rate_pcma_server_pcm_port_2: - - pcma_server_pcm_port_2 - - network.incoming.bytes.rate + binding_pcma_server_pcm_port_2_0: + - pcma_server_pcm_port_2_0 + - binding memory.usage_pcma_server: - pcma_server - memory.usage - network.outgoing.bytes_pcma_server_pcm_port_3: - - pcma_server_pcm_port_3 + network.outgoing.bytes_pcma_server_pcm_port_2_0: + - pcma_server_pcm_port_2_0 - network.outgoing.bytes - binding_pcma_server_pcm_port_3: - - pcma_server_pcm_port_3 - - binding - network.incoming.bytes.rate_pcma_server_pcm_port_3: - - pcma_server_pcm_port_3 - - network.incoming.bytes.rate + feature_pcma_server_pcm_port_3_0: + - pcma_server_pcm_port_3_0 + - feature memory_pcma_server: - pcma_server - memory - network.outgoing.bytes_pcma_server_pcm_port_2: - - pcma_server_pcm_port_2 - - network.outgoing.bytes + forwarder_pcma_server_pcm_port_3_0: + - pcma_server_pcm_port_3_0 + - forwarder cpu_pcma_server: - pcma_server - cpu disk.device.write.bytes.rate_pcma_server: - pcma_server - disk.device.write.bytes.rate + network.incoming.packets.rate_pcma_server_pcm_port_3_0: + - pcma_server_pcm_port_3_0 + - network.incoming.packets.rate disk.read.bytes.rate_pcma_server: - pcma_server - disk.read.bytes.rate - network.incoming.packets_pcma_server_pcm_port_3: - - pcma_server_pcm_port_3 - - network.incoming.packets - binding_pcma_server_pcm_port_2: - - pcma_server_pcm_port_2 - - binding os_pcma_server: - pcma_server - os - network.incoming.packets_pcma_server_pcm_port_2: - - pcma_server_pcm_port_2 - - network.incoming.packets - network.incoming.packets.rate_pcma_server_pcm_port_3: - - pcma_server_pcm_port_3 - - network.incoming.packets.rate - network.outgoing.packets.rate_pcma_server_pcm_port_3: - - pcma_server_pcm_port_3 - - network.outgoing.packets.rate - network.incoming.packets.rate_pcma_server_pcm_port_2: - - pcma_server_pcm_port_2 - - network.incoming.packets.rate - forwarder_pcma_server_pcm_port_2: - - pcma_server_pcm_port_2 - - forwarder + network.incoming.bytes_pcma_server_pcm_port_3_0: + - pcma_server_pcm_port_3_0 + - network.incoming.bytes disk.device.read.requests_pcma_server: - pcma_server - disk.device.read.requests - forwarder_pcma_server_pcm_port_3: - - pcma_server_pcm_port_3 - - forwarder + attachment_pcma_server_pcm_port_3_0: + - pcma_server_pcm_port_3_0 + - attachment disk.write.bytes.rate_pcma_server: - pcma_server - disk.write.bytes.rate - network.outgoing.packets.rate_pcma_server_pcm_port_2: - - pcma_server_pcm_port_2 - - network.outgoing.packets.rate disk.device.write.requests.rate_pcma_server: - pcma_server - disk.device.write.requests.rate @@ -383,12 +365,21 @@ topology_template: disk.allocation_pcma_server: - pcma_server - disk.allocation - feature_pcma_server_pcm_port_2: - - pcma_server_pcm_port_2 - - feature - feature_pcma_server_pcm_port_3: - - pcma_server_pcm_port_3 - - feature + network.outgoing.packets.rate_pcma_server_pcm_port_3_0: + - pcma_server_pcm_port_3_0 + - network.outgoing.packets.rate + network.incoming.bytes.rate_pcma_server_pcm_port_3_0: + - pcma_server_pcm_port_3_0 + - network.incoming.bytes.rate + network.incoming.packets_pcma_server_pcm_port_2_0: + - pcma_server_pcm_port_2_0 + - network.incoming.packets + network.outgoing.bytes.rate_pcma_server_pcm_port_3_0: + - pcma_server_pcm_port_3_0 + - network.outgoing.bytes.rate + network.outpoing.packets_pcma_server_pcm_port_3_0: + - pcma_server_pcm_port_3_0 + - network.outpoing.packets disk.ephemeral.size_pcma_server: - pcma_server - disk.ephemeral.size @@ -413,36 +404,45 @@ topology_template: disk.root.size_pcma_server: - pcma_server - disk.root.size + forwarder_pcma_server_pcm_port_2_0: + - pcma_server_pcm_port_2_0 + - forwarder + binding_pcma_server_pcm_port_3_0: + - pcma_server_pcm_port_3_0 + - binding disk.write.bytes_pcma_server: - pcma_server - disk.write.bytes + network.outgoing.bytes_pcma_server_pcm_port_3_0: + - pcma_server_pcm_port_3_0 + - network.outgoing.bytes disk.write.requests_pcma_server: - pcma_server - disk.write.requests - network.incoming.bytes_pcma_server_pcm_port_2: - - pcma_server_pcm_port_2 - - network.incoming.bytes - network.incoming.bytes_pcma_server_pcm_port_3: - - pcma_server_pcm_port_3 - - network.incoming.bytes + feature_pcma_server_pcm_port_2_0: + - pcma_server_pcm_port_2_0 + - feature + network.incoming.packets.rate_pcma_server_pcm_port_2_0: + - pcma_server_pcm_port_2_0 + - network.incoming.packets.rate disk.write.requests.rate_pcma_server: - pcma_server - disk.write.requests.rate + network.incoming.bytes_pcma_server_pcm_port_2_0: + - pcma_server_pcm_port_2_0 + - network.incoming.bytes disk.device.iops_pcma_server: - pcma_server - disk.device.iops instance_pcma_server: - pcma_server - instance - network.outpoing.packets_pcma_server_pcm_port_3: - - pcma_server_pcm_port_3 - - network.outpoing.packets + attachment_pcma_server_pcm_port_2_0: + - pcma_server_pcm_port_2_0 + - attachment disk.device.latency_pcma_server: - pcma_server - disk.device.latency - network.outpoing.packets_pcma_server_pcm_port_2: - - pcma_server_pcm_port_2 - - network.outpoing.packets disk.capacity_pcma_server: - pcma_server - disk.capacity @@ -450,21 +450,21 @@ topology_template: - pcma_server - disk.device.capacity requirements: - dependency_pcma_server_pcm_port_3: - - pcma_server_pcm_port_3 - - dependency dependency_pcma_server: - pcma_server - dependency - dependency_pcma_server_pcm_port_2: - - pcma_server_pcm_port_2 - - dependency local_storage_pcma_server: - pcma_server - local_storage - link_pcma_server_pcm_port_2: - - pcma_server_pcm_port_2 + link_pcma_server_pcm_port_2_0: + - pcma_server_pcm_port_2_0 + - link + link_pcma_server_pcm_port_3_0: + - pcma_server_pcm_port_3_0 - link - link_pcma_server_pcm_port_3: - - pcma_server_pcm_port_3 - - link \ No newline at end of file + dependency_pcma_server_pcm_port_2_0: + - pcma_server_pcm_port_2_0 + - dependency + dependency_pcma_server_pcm_port_3_0: + - pcma_server_pcm_port_3_0 + - dependency \ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_pcma_server_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_pcma_server_1ServiceTemplate.yaml index 25ffdd165b..7ecb793c39 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_pcma_server_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_pcma_server_1ServiceTemplate.yaml @@ -11,84 +11,67 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_pcm_port_1_related_networks: - type: list + port_pcm_port_0_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pcm_port_0_network_role: - type: string + port_pcm_port_1_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_pcm_port_1_0_order: + type: integer required: true - port_pcm_port_1_network_role_tag: + vm_flavor_name: type: string required: true - port_pcm_port_0_fixed_ips: + port_pcm_port_0_0_order: + type: integer + required: true + compute_pcma_server_availability_zone: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_pcm_port_0_vlan_requirements: + type: string + port_pcm_port_0_0_security_groups: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - vm_flavor_name: - type: string - required: true - port_pcm_port_0_security_groups: + type: json + port_pcm_port_1_0_vlan_requirements: type: list required: true entry_schema: - type: json - compute_pcma_server_availability_zone: + type: org.openecomp.datatypes.network.VlanRequirements + port_pcm_port_0_0_network: type: list required: true entry_schema: type: string - port_pcm_port_0_order: - type: integer - required: true - port_pcm_port_0_subnetpoolid: - type: string - required: true vm_image_name: type: string required: true - port_pcm_port_0_related_networks: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pcm_port_1_subnetpoolid: + port_pcm_port_1_0_subnetpoolid: type: string required: true - port_pcm_port_0_network_role_tag: + port_pcm_port_0_0_network_role_tag: type: string required: true - port_pcm_port_1_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pcm_port_1_0_ip_requirements: + type: list required: true - port_pcm_port_0_exCP_naming: + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pcm_port_0_0_exCP_naming: type: org.openecomp.datatypes.Naming required: true - port_pcm_port_1_network_role: + port_pcm_port_1_0_network_role_tag: type: string required: true - port_pcm_port_1_network: - type: list - required: true - entry_schema: - type: string - port_pcm_port_1_security_groups: - type: list + port_pcm_port_1_0_network_role: + type: string required: true - entry_schema: - type: json - port_pcm_port_0_ip_requirements: - type: list + port_pcm_port_1_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements compute_pcma_server_config_drive: type: list required: true @@ -106,40 +89,57 @@ topology_template: required: true entry_schema: type: string - port_pcm_port_0_network: + port_pcm_port_0_0_related_networks: type: list required: true entry_schema: - type: string - port_pcm_port_1_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pcm_port_0_0_subnetpoolid: + type: string required: true - port_pcm_port_1_vlan_requirements: + port_pcm_port_0_0_network_role: + type: string + required: true + port_pcm_port_1_0_related_networks: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pcm_port_1_fixed_ips: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pcm_port_0_0_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pcm_port_1_0_security_groups: + type: list + required: true + entry_schema: + type: json + port_pcm_port_0_0_fixed_ips: type: list required: true entry_schema: type: org.openecomp.datatypes.heat.neutron.port.FixedIps - compute_pcma_server_name: + port_pcm_port_1_0_fixed_ips: type: list required: true entry_schema: - type: string - port_pcm_port_1_ip_requirements: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_pcm_port_0_0_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pcm_port_0_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + type: org.openecomp.datatypes.network.VlanRequirements + compute_pcma_server_name: + type: list required: true - port_pcm_port_1_order: - type: integer + entry_schema: + type: string + port_pcm_port_1_0_network: + type: list required: true + entry_schema: + type: string node_templates: pcma_server: type: org.openecomp.resource.vfc.compute.nodes.heat.pcma_server @@ -164,78 +164,78 @@ topology_template: get_input: - compute_pcma_server_user_data_format - index_value - pcma_server_pcm_port_0: + pcma_server_pcm_port_0_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_requirements: - get_input: port_pcm_port_0_mac_requirements + get_input: port_pcm_port_0_0_mac_requirements order: - get_input: port_pcm_port_0_order + get_input: port_pcm_port_0_0_order security_groups: get_input: - - port_pcm_port_0_security_groups + - port_pcm_port_0_0_security_groups - index_value exCP_naming: - get_input: port_pcm_port_0_exCP_naming + get_input: port_pcm_port_0_0_exCP_naming vlan_requirements: - get_input: port_pcm_port_0_vlan_requirements + get_input: port_pcm_port_0_0_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_pcm_port_0_ip_requirements + get_input: port_pcm_port_0_0_ip_requirements related_networks: - get_input: port_pcm_port_0_related_networks + get_input: port_pcm_port_0_0_related_networks network_role_tag: - get_input: port_pcm_port_0_network_role_tag + get_input: port_pcm_port_0_0_network_role_tag network_role: - get_input: port_pcm_port_0_network_role + get_input: port_pcm_port_0_0_network_role fixed_ips: get_input: - - port_pcm_port_0_fixed_ips + - port_pcm_port_0_0_fixed_ips - index_value subnetpoolid: - get_input: port_pcm_port_0_subnetpoolid + get_input: port_pcm_port_0_0_subnetpoolid network: get_input: - - port_pcm_port_0_network + - port_pcm_port_0_0_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: pcma_server relationship: tosca.relationships.network.BindsTo - pcma_server_pcm_port_1: + pcma_server_pcm_port_1_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_requirements: - get_input: port_pcm_port_1_mac_requirements + get_input: port_pcm_port_1_0_mac_requirements order: - get_input: port_pcm_port_1_order + get_input: port_pcm_port_1_0_order security_groups: get_input: - - port_pcm_port_1_security_groups + - port_pcm_port_1_0_security_groups - index_value exCP_naming: - get_input: port_pcm_port_1_exCP_naming + get_input: port_pcm_port_1_0_exCP_naming vlan_requirements: - get_input: port_pcm_port_1_vlan_requirements + get_input: port_pcm_port_1_0_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_pcm_port_1_ip_requirements + get_input: port_pcm_port_1_0_ip_requirements related_networks: - get_input: port_pcm_port_1_related_networks + get_input: port_pcm_port_1_0_related_networks network_role_tag: - get_input: port_pcm_port_1_network_role_tag + get_input: port_pcm_port_1_0_network_role_tag network_role: - get_input: port_pcm_port_1_network_role + get_input: port_pcm_port_1_0_network_role fixed_ips: get_input: - - port_pcm_port_1_fixed_ips + - port_pcm_port_1_0_fixed_ips - index_value subnetpoolid: - get_input: port_pcm_port_1_subnetpoolid + get_input: port_pcm_port_1_0_subnetpoolid network: get_input: - - port_pcm_port_1_network + - port_pcm_port_1_0_network - index_value requirements: - binding: @@ -248,39 +248,42 @@ topology_template: cpu.delta_pcma_server: - pcma_server - cpu.delta + network.incoming.bytes.rate_pcma_server_pcm_port_0_0: + - pcma_server_pcm_port_0_0 + - network.incoming.bytes.rate + network.incoming.packets_pcma_server_pcm_port_1_0: + - pcma_server_pcm_port_1_0 + - network.incoming.packets scalable_pcma_server: - pcma_server - scalable vcpus_pcma_server: - pcma_server - vcpus + network.outgoing.bytes.rate_pcma_server_pcm_port_0_0: + - pcma_server_pcm_port_0_0 + - network.outgoing.bytes.rate host_pcma_server: - pcma_server - host disk.device.read.requests.rate_pcma_server: - pcma_server - disk.device.read.requests.rate + network.outgoing.packets.rate_pcma_server_pcm_port_0_0: + - pcma_server_pcm_port_0_0 + - network.outgoing.packets.rate + network.outpoing.packets_pcma_server_pcm_port_0_0: + - pcma_server_pcm_port_0_0 + - network.outpoing.packets disk.usage_pcma_server: - pcma_server - disk.usage - attachment_pcma_server_pcm_port_0: - - pcma_server_pcm_port_0 - - attachment disk.read.bytes_pcma_server: - pcma_server - disk.read.bytes disk.iops_pcma_server: - pcma_server - disk.iops - network.outgoing.bytes.rate_pcma_server_pcm_port_0: - - pcma_server_pcm_port_0 - - network.outgoing.bytes.rate - network.outgoing.bytes.rate_pcma_server_pcm_port_1: - - pcma_server_pcm_port_1 - - network.outgoing.bytes.rate - attachment_pcma_server_pcm_port_1: - - pcma_server_pcm_port_1 - - attachment endpoint_pcma_server: - pcma_server - endpoint @@ -290,21 +293,18 @@ topology_template: memory.usage_pcma_server: - pcma_server - memory.usage - network.incoming.packets_pcma_server_pcm_port_0: - - pcma_server_pcm_port_0 - - network.incoming.packets - network.incoming.bytes.rate_pcma_server_pcm_port_1: - - pcma_server_pcm_port_1 - - network.incoming.bytes.rate - network.outgoing.bytes_pcma_server_pcm_port_0: - - pcma_server_pcm_port_0 + forwarder_pcma_server_pcm_port_1_0: + - pcma_server_pcm_port_1_0 + - forwarder + network.outgoing.bytes_pcma_server_pcm_port_0_0: + - pcma_server_pcm_port_0_0 - network.outgoing.bytes memory_pcma_server: - pcma_server - memory - network.outgoing.bytes_pcma_server_pcm_port_1: - - pcma_server_pcm_port_1 - - network.outgoing.bytes + network.incoming.packets.rate_pcma_server_pcm_port_1_0: + - pcma_server_pcm_port_1_0 + - network.incoming.packets.rate cpu_pcma_server: - pcma_server - cpu @@ -314,48 +314,30 @@ topology_template: disk.read.bytes.rate_pcma_server: - pcma_server - disk.read.bytes.rate - network.incoming.packets.rate_pcma_server_pcm_port_0: - - pcma_server_pcm_port_0 - - network.incoming.packets.rate - binding_pcma_server_pcm_port_0: - - pcma_server_pcm_port_0 + feature_pcma_server_pcm_port_1_0: + - pcma_server_pcm_port_1_0 + - feature + binding_pcma_server_pcm_port_0_0: + - pcma_server_pcm_port_0_0 - binding - network.incoming.packets_pcma_server_pcm_port_1: - - pcma_server_pcm_port_1 - - network.incoming.packets os_pcma_server: - pcma_server - os - binding_pcma_server_pcm_port_1: - - pcma_server_pcm_port_1 - - binding - network.incoming.packets.rate_pcma_server_pcm_port_1: - - pcma_server_pcm_port_1 - - network.incoming.packets.rate - forwarder_pcma_server_pcm_port_0: - - pcma_server_pcm_port_0 - - forwarder - forwarder_pcma_server_pcm_port_1: - - pcma_server_pcm_port_1 - - forwarder + network.incoming.bytes_pcma_server_pcm_port_1_0: + - pcma_server_pcm_port_1_0 + - network.incoming.bytes disk.device.read.requests_pcma_server: - pcma_server - disk.device.read.requests disk.write.bytes.rate_pcma_server: - pcma_server - disk.write.bytes.rate - network.outgoing.packets.rate_pcma_server_pcm_port_1: - - pcma_server_pcm_port_1 - - network.outgoing.packets.rate + attachment_pcma_server_pcm_port_1_0: + - pcma_server_pcm_port_1_0 + - attachment disk.device.write.requests.rate_pcma_server: - pcma_server - disk.device.write.requests.rate - network.incoming.bytes.rate_pcma_server_pcm_port_0: - - pcma_server_pcm_port_0 - - network.incoming.bytes.rate - network.outgoing.packets.rate_pcma_server_pcm_port_0: - - pcma_server_pcm_port_0 - - network.outgoing.packets.rate cpu_util_pcma_server: - pcma_server - cpu_util @@ -374,15 +356,24 @@ topology_template: disk.allocation_pcma_server: - pcma_server - disk.allocation - feature_pcma_server_pcm_port_0: - - pcma_server_pcm_port_0 - - feature - feature_pcma_server_pcm_port_1: - - pcma_server_pcm_port_1 - - feature + network.incoming.packets_pcma_server_pcm_port_0_0: + - pcma_server_pcm_port_0_0 + - network.incoming.packets + network.incoming.bytes.rate_pcma_server_pcm_port_1_0: + - pcma_server_pcm_port_1_0 + - network.incoming.bytes.rate + network.outgoing.bytes.rate_pcma_server_pcm_port_1_0: + - pcma_server_pcm_port_1_0 + - network.outgoing.bytes.rate + network.outgoing.packets.rate_pcma_server_pcm_port_1_0: + - pcma_server_pcm_port_1_0 + - network.outgoing.packets.rate disk.ephemeral.size_pcma_server: - pcma_server - disk.ephemeral.size + network.outpoing.packets_pcma_server_pcm_port_1_0: + - pcma_server_pcm_port_1_0 + - network.outpoing.packets binding_pcma_server: - pcma_server - binding @@ -407,21 +398,33 @@ topology_template: disk.write.bytes_pcma_server: - pcma_server - disk.write.bytes - network.incoming.bytes_pcma_server_pcm_port_0: - - pcma_server_pcm_port_0 - - network.incoming.bytes + forwarder_pcma_server_pcm_port_0_0: + - pcma_server_pcm_port_0_0 + - forwarder + network.outgoing.bytes_pcma_server_pcm_port_1_0: + - pcma_server_pcm_port_1_0 + - network.outgoing.bytes + network.incoming.packets.rate_pcma_server_pcm_port_0_0: + - pcma_server_pcm_port_0_0 + - network.incoming.packets.rate + feature_pcma_server_pcm_port_0_0: + - pcma_server_pcm_port_0_0 + - feature disk.write.requests_pcma_server: - pcma_server - disk.write.requests - network.incoming.bytes_pcma_server_pcm_port_1: - - pcma_server_pcm_port_1 - - network.incoming.bytes + binding_pcma_server_pcm_port_1_0: + - pcma_server_pcm_port_1_0 + - binding disk.write.requests.rate_pcma_server: - pcma_server - disk.write.requests.rate disk.device.iops_pcma_server: - pcma_server - disk.device.iops + network.incoming.bytes_pcma_server_pcm_port_0_0: + - pcma_server_pcm_port_0_0 + - network.incoming.bytes instance_pcma_server: - pcma_server - instance @@ -434,28 +437,25 @@ topology_template: disk.device.capacity_pcma_server: - pcma_server - disk.device.capacity - network.outpoing.packets_pcma_server_pcm_port_1: - - pcma_server_pcm_port_1 - - network.outpoing.packets - network.outpoing.packets_pcma_server_pcm_port_0: - - pcma_server_pcm_port_0 - - network.outpoing.packets + attachment_pcma_server_pcm_port_0_0: + - pcma_server_pcm_port_0_0 + - attachment requirements: dependency_pcma_server: - pcma_server - dependency - dependency_pcma_server_pcm_port_1: - - pcma_server_pcm_port_1 - - dependency local_storage_pcma_server: - pcma_server - local_storage - link_pcma_server_pcm_port_0: - - pcma_server_pcm_port_0 + link_pcma_server_pcm_port_0_0: + - pcma_server_pcm_port_0_0 - link - link_pcma_server_pcm_port_1: - - pcma_server_pcm_port_1 + link_pcma_server_pcm_port_1_0: + - pcma_server_pcm_port_1_0 - link - dependency_pcma_server_pcm_port_0: - - pcma_server_pcm_port_0 + dependency_pcma_server_pcm_port_0_0: + - pcma_server_pcm_port_0_0 + - dependency + dependency_pcma_server_pcm_port_1_0: + - pcma_server_pcm_port_1_0 - dependency \ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/nested-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 96bccb85ef..77af97fb00 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 @@ -108,52 +108,52 @@ topology_template: directives: - substitutable properties: - port_pcm_port_1_network_role_tag: oam - port_pcm_port_0_fixed_ips: - - ip_address: - get_input: cps_net_ip + port_pcm_port_0_0_mac_requirements: + mac_count_required: + is_required: false + port_pcm_port_1_0_mac_requirements: + mac_count_required: + is_required: false vm_flavor_name: get_input: pcma_flavor_name - port_pcm_port_0_security_groups: - - - get_input: security_group_name compute_pcma_server_availability_zone: - get_input: availabilityzone_name + port_pcm_port_0_0_security_groups: + - - get_input: security_group_name + port_pcm_port_0_0_network: + - get_input: cps_net_name vm_image_name: get_input: pcma_image_name - port_pcm_port_0_network_role_tag: cps - port_pcm_port_1_network: - - get_input: oam_net_name - port_pcm_port_1_security_groups: - - - get_input: security_group_name - port_pcm_port_0_ip_requirements: + port_pcm_port_0_0_network_role_tag: cps + port_pcm_port_1_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false + port_pcm_port_1_0_network_role_tag: oam compute_pcma_server_config_drive: - true compute_pcma_server_user_data_format: - RAW - port_pcm_port_0_network: - - get_input: cps_net_name - port_pcm_port_1_mac_requirements: - mac_count_required: - is_required: false - port_pcm_port_1_fixed_ips: - - ip_address: - get_input: oam_net_ip - compute_pcma_server_name: - - get_input: pcma_server_name - port_pcm_port_1_ip_requirements: + port_pcm_port_0_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false - port_pcm_port_0_mac_requirements: - mac_count_required: - is_required: false + port_pcm_port_1_0_security_groups: + - - get_input: security_group_name + port_pcm_port_0_0_fixed_ips: + - ip_address: + get_input: cps_net_ip + port_pcm_port_1_0_fixed_ips: + - ip_address: + get_input: oam_net_ip + compute_pcma_server_name: + - get_input: pcma_server_name + port_pcm_port_1_0_network: + - get_input: oam_net_name service_template_filter: substitute_service_template: Nested_pcma_server_1ServiceTemplate.yaml count: 1 @@ -167,50 +167,50 @@ topology_template: directives: - substitutable properties: - port_pcm_port_3_mac_requirements: + port_pcm_port_2_0_security_groups: + - - get_input: security_group_name + port_pcm_port_2_0_mac_requirements: mac_count_required: is_required: false - port_pcm_port_2_fixed_ips: + port_pcm_port_3_0_fixed_ips: - ip_address: - get_input: cps_net_ip + get_input: oam_net_ip vm_flavor_name: get_input: pcma_flavor_name - port_pcm_port_3_security_groups: - - - get_input: security_group_name + port_pcm_port_3_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false compute_pcma_server_availability_zone: - get_input: availabilityzone_name vm_image_name: get_input: pcma_image_name - port_pcm_port_2_security_groups: + port_pcm_port_3_0_security_groups: - - get_input: security_group_name - port_pcm_port_3_ip_requirements: + port_pcm_port_2_0_network: + - get_input: cps_net_name + port_pcm_port_2_0_network_role_tag: cps + port_pcm_port_3_0_network_role_tag: oam + port_pcm_port_2_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false - port_pcm_port_2_mac_requirements: - mac_count_required: - is_required: false - port_pcm_port_3_network_role_tag: oam compute_pcma_server_config_drive: - true - port_pcm_port_3_fixed_ips: - - ip_address: - get_input: oam_net_ip compute_pcma_server_user_data_format: - RAW - port_pcm_port_2_network: - - get_input: cps_net_name - port_pcm_port_2_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false - port_pcm_port_2_network_role_tag: cps - port_pcm_port_3_network: + port_pcm_port_3_0_network: - get_input: oam_net_name + port_pcm_port_2_0_fixed_ips: + - ip_address: + get_input: cps_net_ip + port_pcm_port_3_0_mac_requirements: + mac_count_required: + is_required: false compute_pcma_server_scheduler_hints: - group: get_input: server_group @@ -241,19 +241,19 @@ topology_template: capabilities: network.outpoing.packets_pcm_port_2_0: - abstract_pcma_server - - network.outpoing.packets_pcma_server_pcm_port_2 + - network.outpoing.packets_pcma_server_pcm_port_2_0 disk.device.iops_server_pcma2: - abstract_pcma_server - disk.device.iops_pcma_server network.outgoing.bytes.rate_pcm_port_1_0: - abstract_pcma_server_1 - - network.outgoing.bytes.rate_pcma_server_pcm_port_1 + - network.outgoing.bytes.rate_pcma_server_pcm_port_1_0 disk.device.iops_server_pcma1: - abstract_pcma_server_1 - disk.device.iops_pcma_server network.incoming.bytes.rate_pcm_port_0_0: - abstract_pcma_server_1 - - network.incoming.bytes.rate_pcma_server_pcm_port_0 + - network.incoming.bytes.rate_pcma_server_pcm_port_0_0 disk.device.capacity_server_pcma2: - abstract_pcma_server - disk.device.capacity_pcma_server @@ -271,10 +271,10 @@ topology_template: - disk.write.requests.rate_pcma_server network.incoming.packets_pcm_port_1_0: - abstract_pcma_server_1 - - network.incoming.packets_pcma_server_pcm_port_1 + - network.incoming.packets_pcma_server_pcm_port_1_0 network.incoming.bytes_pcm_port_0_0: - abstract_pcma_server_1 - - network.incoming.bytes_pcma_server_pcm_port_0 + - network.incoming.bytes_pcma_server_pcm_port_0_0 disk.write.requests.rate_server_pcma2: - abstract_pcma_server - disk.write.requests.rate_pcma_server @@ -289,13 +289,13 @@ topology_template: - disk.device.read.bytes.rate_pcma_server feature_pcm_port_0_0: - abstract_pcma_server_1 - - feature_pcma_server_pcm_port_0 + - feature_pcma_server_pcm_port_0_0 disk.device.read.bytes.rate_server_pcma2: - abstract_pcma_server - disk.device.read.bytes.rate_pcma_server forwarder_pcm_port_0_0: - abstract_pcma_server_1 - - forwarder_pcma_server_pcm_port_0 + - forwarder_pcma_server_pcm_port_0_0 disk.device.latency_server_pcma2: - abstract_pcma_server - disk.device.latency_pcma_server @@ -313,16 +313,16 @@ topology_template: - disk.device.read.requests_pcma_server network.outgoing.packets.rate_pcm_port_3_0: - abstract_pcma_server - - network.outgoing.packets.rate_pcma_server_pcm_port_3 + - network.outgoing.packets.rate_pcma_server_pcm_port_3_0 disk.device.read.requests_server_pcma2: - abstract_pcma_server - disk.device.read.requests_pcma_server attachment_pcm_port_0_0: - abstract_pcma_server_1 - - attachment_pcma_server_pcm_port_0 + - attachment_pcma_server_pcm_port_0_0 network.incoming.packets.rate_pcm_port_0_0: - abstract_pcma_server_1 - - network.incoming.packets.rate_pcma_server_pcm_port_0 + - network.incoming.packets.rate_pcma_server_pcm_port_0_0 disk.write.bytes_server_pcma2: - abstract_pcma_server - disk.write.bytes_pcma_server @@ -343,10 +343,10 @@ topology_template: - binding_pcma_server network.outgoing.bytes_pcm_port_3_0: - abstract_pcma_server - - network.outgoing.bytes_pcma_server_pcm_port_3 + - network.outgoing.bytes_pcma_server_pcm_port_3_0 binding_pcm_port_1_0: - abstract_pcma_server_1 - - binding_pcma_server_pcm_port_1 + - binding_pcma_server_pcm_port_1_0 disk.write.bytes.rate_server_pcma2: - abstract_pcma_server - disk.write.bytes.rate_pcma_server @@ -361,13 +361,13 @@ topology_template: - disk.root.size_pcma_server network.outgoing.bytes_pcm_port_1_0: - abstract_pcma_server_1 - - network.outgoing.bytes_pcma_server_pcm_port_1 + - network.outgoing.bytes_pcma_server_pcm_port_1_0 network.outgoing.bytes.rate_pcm_port_0_0: - abstract_pcma_server_1 - - network.outgoing.bytes.rate_pcma_server_pcm_port_0 + - network.outgoing.bytes.rate_pcma_server_pcm_port_0_0 network.outpoing.packets_pcm_port_3_0: - abstract_pcma_server - - network.outpoing.packets_pcma_server_pcm_port_3 + - network.outpoing.packets_pcma_server_pcm_port_3_0 disk.iops_server_pcma2: - abstract_pcma_server - disk.iops_pcma_server @@ -376,7 +376,7 @@ topology_template: - disk.iops_pcma_server network.incoming.bytes.rate_pcm_port_3_0: - abstract_pcma_server - - network.incoming.bytes.rate_pcma_server_pcm_port_3 + - network.incoming.bytes.rate_pcma_server_pcm_port_3_0 disk.device.write.bytes.rate_server_pcma1: - abstract_pcma_server_1 - disk.device.write.bytes.rate_pcma_server @@ -385,22 +385,22 @@ topology_template: - disk.device.write.bytes.rate_pcma_server network.incoming.packets_pcm_port_0_0: - abstract_pcma_server_1 - - network.incoming.packets_pcma_server_pcm_port_0 + - network.incoming.packets_pcma_server_pcm_port_0_0 network.incoming.bytes_pcm_port_1_0: - abstract_pcma_server_1 - - network.incoming.bytes_pcma_server_pcm_port_1 + - network.incoming.bytes_pcma_server_pcm_port_1_0 disk.read.bytes_server_pcma1: - abstract_pcma_server_1 - disk.read.bytes_pcma_server feature_pcm_port_3_0: - abstract_pcma_server - - feature_pcma_server_pcm_port_3 + - feature_pcma_server_pcm_port_3_0 disk.read.bytes_server_pcma2: - abstract_pcma_server - disk.read.bytes_pcma_server forwarder_pcm_port_1_0: - abstract_pcma_server_1 - - forwarder_pcma_server_pcm_port_1 + - forwarder_pcma_server_pcm_port_1_0 cpu_util_server_pcma1: - abstract_pcma_server_1 - cpu_util_pcma_server @@ -409,16 +409,16 @@ topology_template: - cpu_util_pcma_server network.outgoing.packets.rate_pcm_port_2_0: - abstract_pcma_server - - network.outgoing.packets.rate_pcma_server_pcm_port_2 + - network.outgoing.packets.rate_pcma_server_pcm_port_2_0 attachment_pcm_port_3_0: - abstract_pcma_server - - attachment_pcma_server_pcm_port_3 + - attachment_pcma_server_pcm_port_3_0 feature_server_pcma2: - abstract_pcma_server - feature_pcma_server network.incoming.packets.rate_pcm_port_3_0: - abstract_pcma_server - - network.incoming.packets.rate_pcma_server_pcm_port_3 + - network.incoming.packets.rate_pcma_server_pcm_port_3_0 memory.usage_server_pcma2: - abstract_pcma_server - memory.usage_pcma_server @@ -430,10 +430,10 @@ topology_template: - feature_pcma_server network.outgoing.bytes_pcm_port_2_0: - abstract_pcma_server - - network.outgoing.bytes_pcma_server_pcm_port_2 + - network.outgoing.bytes_pcma_server_pcm_port_2_0 binding_pcm_port_0_0: - abstract_pcma_server_1 - - binding_pcma_server_pcm_port_0 + - binding_pcma_server_pcm_port_0_0 disk.read.bytes.rate_server_pcma1: - abstract_pcma_server_1 - disk.read.bytes.rate_pcma_server @@ -445,10 +445,10 @@ topology_template: - disk.device.read.bytes_pcma_server network.outpoing.packets_pcm_port_0_0: - abstract_pcma_server_1 - - network.outpoing.packets_pcma_server_pcm_port_0 + - network.outpoing.packets_pcma_server_pcm_port_0_0 network.outgoing.bytes_pcm_port_0_0: - abstract_pcma_server_1 - - network.outgoing.bytes_pcma_server_pcm_port_0 + - network.outgoing.bytes_pcma_server_pcm_port_0_0 endpoint_server_pcma2: - abstract_pcma_server - endpoint_pcma_server @@ -472,10 +472,10 @@ topology_template: - host_pcma_server network.incoming.bytes.rate_pcm_port_2_0: - abstract_pcma_server - - network.incoming.bytes.rate_pcma_server_pcm_port_2 + - network.incoming.bytes.rate_pcma_server_pcm_port_2_0 network.outgoing.bytes.rate_pcm_port_3_0: - abstract_pcma_server - - network.outgoing.bytes.rate_pcma_server_pcm_port_3 + - network.outgoing.bytes.rate_pcma_server_pcm_port_3_0 disk.ephemeral.size_server_pcma1: - abstract_pcma_server_1 - disk.ephemeral.size_pcma_server @@ -496,7 +496,7 @@ topology_template: - disk.device.write.requests.rate_pcma_server network.incoming.packets_pcm_port_3_0: - abstract_pcma_server - - network.incoming.packets_pcma_server_pcm_port_3 + - network.incoming.packets_pcma_server_pcm_port_3_0 scalable_server_pcma2: - abstract_pcma_server - scalable_pcma_server @@ -505,16 +505,16 @@ topology_template: - scalable_pcma_server network.incoming.bytes_pcm_port_2_0: - abstract_pcma_server - - network.incoming.bytes_pcma_server_pcm_port_2 + - network.incoming.bytes_pcma_server_pcm_port_2_0 feature_pcm_port_2_0: - abstract_pcma_server - - feature_pcma_server_pcm_port_2 + - feature_pcma_server_pcm_port_2_0 disk.device.write.requests_server_pcma1: - abstract_pcma_server_1 - disk.device.write.requests_pcma_server forwarder_pcm_port_2_0: - abstract_pcma_server - - forwarder_pcma_server_pcm_port_2 + - forwarder_pcma_server_pcm_port_2_0 disk.device.write.requests_server_pcma2: - abstract_pcma_server - disk.device.write.requests_pcma_server @@ -532,31 +532,31 @@ topology_template: - instance_pcma_server attachment_pcm_port_2_0: - abstract_pcma_server - - attachment_pcma_server_pcm_port_2 + - attachment_pcma_server_pcm_port_2_0 os_server_pcma1: - abstract_pcma_server_1 - os_pcma_server network.outgoing.packets.rate_pcm_port_1_0: - abstract_pcma_server_1 - - network.outgoing.packets.rate_pcma_server_pcm_port_1 + - network.outgoing.packets.rate_pcma_server_pcm_port_1_0 os_server_pcma2: - abstract_pcma_server - os_pcma_server network.incoming.packets.rate_pcm_port_2_0: - abstract_pcma_server - - network.incoming.packets.rate_pcma_server_pcm_port_2 + - network.incoming.packets.rate_pcma_server_pcm_port_2_0 binding_pcm_port_3_0: - abstract_pcma_server - - binding_pcma_server_pcm_port_3 + - binding_pcma_server_pcm_port_3_0 network.outpoing.packets_pcm_port_1_0: - abstract_pcma_server_1 - - network.outpoing.packets_pcma_server_pcm_port_1 + - network.outpoing.packets_pcma_server_pcm_port_1_0 network.incoming.bytes.rate_pcm_port_1_0: - abstract_pcma_server_1 - - network.incoming.bytes.rate_pcma_server_pcm_port_1 + - network.incoming.bytes.rate_pcma_server_pcm_port_1_0 network.outgoing.bytes.rate_pcm_port_2_0: - abstract_pcma_server - - network.outgoing.bytes.rate_pcma_server_pcm_port_2 + - network.outgoing.bytes.rate_pcma_server_pcm_port_2_0 disk.capacity_server_pcma1: - abstract_pcma_server_1 - disk.capacity_pcma_server @@ -565,7 +565,7 @@ topology_template: - disk.capacity_pcma_server network.incoming.packets_pcm_port_2_0: - abstract_pcma_server - - network.incoming.packets_pcma_server_pcm_port_2 + - network.incoming.packets_pcma_server_pcm_port_2_0 disk.write.requests_server_pcma1: - abstract_pcma_server_1 - disk.write.requests_pcma_server @@ -574,13 +574,13 @@ topology_template: - disk.write.requests_pcma_server network.incoming.bytes_pcm_port_3_0: - abstract_pcma_server - - network.incoming.bytes_pcma_server_pcm_port_3 + - network.incoming.bytes_pcma_server_pcm_port_3_0 forwarder_pcm_port_3_0: - abstract_pcma_server - - forwarder_pcma_server_pcm_port_3 + - forwarder_pcma_server_pcm_port_3_0 feature_pcm_port_1_0: - abstract_pcma_server_1 - - feature_pcma_server_pcm_port_1 + - feature_pcma_server_pcm_port_1_0 disk.usage_server_pcma2: - abstract_pcma_server - disk.usage_pcma_server @@ -601,7 +601,7 @@ topology_template: - memory.resident_pcma_server attachment_pcm_port_1_0: - abstract_pcma_server_1 - - attachment_pcma_server_pcm_port_1 + - attachment_pcma_server_pcm_port_1_0 disk.device.write.bytes_server_pcma2: - abstract_pcma_server - disk.device.write.bytes_pcma_server @@ -610,7 +610,7 @@ topology_template: - disk.allocation_pcma_server network.incoming.packets.rate_pcm_port_1_0: - abstract_pcma_server_1 - - network.incoming.packets.rate_pcma_server_pcm_port_1 + - network.incoming.packets.rate_pcma_server_pcm_port_1_0 disk.allocation_server_pcma2: - abstract_pcma_server - disk.allocation_pcma_server @@ -619,7 +619,7 @@ topology_template: - disk.device.write.bytes_pcma_server network.outgoing.packets.rate_pcm_port_0_0: - abstract_pcma_server_1 - - network.outgoing.packets.rate_pcma_server_pcm_port_0 + - network.outgoing.packets.rate_pcma_server_pcm_port_0_0 cpu_server_pcma1: - abstract_pcma_server_1 - cpu_pcma_server @@ -628,7 +628,7 @@ topology_template: - cpu_pcma_server binding_pcm_port_2_0: - abstract_pcma_server - - binding_pcma_server_pcm_port_2 + - binding_pcma_server_pcm_port_2_0 requirements: dependency_server_pcma2: - abstract_pcma_server @@ -644,25 +644,25 @@ topology_template: - local_storage_pcma_server dependency_pcm_port_3_0: - abstract_pcma_server - - dependency_pcma_server_pcm_port_3 + - dependency_pcma_server_pcm_port_3_0 link_pcm_port_1_0: - abstract_pcma_server_1 - - link_pcma_server_pcm_port_1 + - link_pcma_server_pcm_port_1_0 dependency_pcm_port_2_0: - abstract_pcma_server - - dependency_pcma_server_pcm_port_2 + - dependency_pcma_server_pcm_port_2_0 link_pcm_port_2_0: - abstract_pcma_server - - link_pcma_server_pcm_port_2 + - link_pcma_server_pcm_port_2_0 dependency_pcm_port_1_0: - abstract_pcma_server_1 - - dependency_pcma_server_pcm_port_1 + - dependency_pcma_server_pcm_port_1_0 dependency_pcm_port_0_0: - abstract_pcma_server_1 - - dependency_pcma_server_pcm_port_0 + - dependency_pcma_server_pcm_port_0_0 link_pcm_port_0_0: - abstract_pcma_server_1 - - link_pcma_server_pcm_port_0 + - link_pcma_server_pcm_port_0_0 link_pcm_port_3_0: - abstract_pcma_server - - link_pcma_server_pcm_port_3 + - link_pcma_server_pcm_port_3_0 \ 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/in/hot-mog-0108-bs1271.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/in/hot-mog-0108-bs1271.yml index 4b27b08012..031b929cc4 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/in/hot-mog-0108-bs1271.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/in/hot-mog-0108-bs1271.yml @@ -52,16 +52,16 @@ resources: flavor: {get_param: pd_flavor_name} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: 1a_t1_port_0} - - port: {get_resource: 1a_t2_port_0} + - port: {get_resource: 1a_t1_port} + - port: {get_resource: 1a_t2_port} user_data_format: RAW scheduler_hints: { group: { get_resource: BE_Affinity } } - 1a_t1_port_0: + 1a_t1_port: type: OS::Neutron::Port properties: network: {get_resource: a_single_1a_network} - 1a_t2_port_0: + 1a_t2_port: type: OS::Neutron::Port properties: network: {get_param: ppds_net_name} @@ -81,17 +81,17 @@ resources: flavor: {get_param: pd_flavor_name} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: 1b_t1_port_0} - - port: {get_resource: 1b_t2_port_0} + - port: {get_resource: b_single_1b_0_t1_port_0} + - port: {get_resource: b_single_1b_0_t2_port_0} user_data_format: RAW scheduler_hints: { group: { get_resource: BE_Affinity } } - 1b_t1_port_0: + b_single_1b_0_t1_port_0: type: OS::Neutron::Port properties: network: {get_attr: [1b01_single_1B, accessIPv6]} - 1b_t2_port_0: + b_single_1b_0_t2_port_0: type: OS::Neutron::Port properties: network: {get_resource: b_single_1b_network} @@ -110,17 +110,17 @@ resources: flavor: {get_param: pd_flavor_name} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: 1b_t1_port_1} - - port: {get_resource: 1b_t2_port_1} + - port: {get_resource: b_single_1b_1_t1_port_0} + - port: {get_resource: b_single_1b_1_t2_port_0} user_data_format: RAW scheduler_hints: { group: { get_resource: BE_Affinity } } - 1b_t1_port_1: + b_single_1b_1_t1_port_0: type: OS::Neutron::Port properties: network: {get_param: oam_net_name} - 1b_t2_port_1: + b_single_1b_1_t2_port_0: type: OS::Neutron::Port properties: network: {get_resource: b_single_1b_network} @@ -133,23 +133,23 @@ resources: flavor: {get_param: pd_flavor_name} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: 1c1_t1_port_0} - - port: {get_resource: 1c1_t2_port_0} + - port: {get_resource: 1c1_scalling_instance_0_t1_port_0} + - port: {get_resource: 1c1_scalling_instance_0_t2_port_0} user_data_format: RAW1 scheduler_hints: { group: { get_resource: BE_Affinity } } - 1c1_t1_port_0: + 1c1_scalling_instance_0_t1_port_0: type: OS::Neutron::Port properties: network: {get_resource: 1c1_scalling_instance_network} fixed_ips: [{"ip_address": {get_param: [myIPs, 1]}}] - name: 1c1_t1_port_0 - 1c1_t2_port_0: + name: 1c1_scalling_instance_0_t1_port_0 + 1c1_scalling_instance_0_t2_port_0: type: OS::Neutron::Port properties: network: {get_param: ppds_net_name} fixed_ips: [{"ip_address": {get_param: [myIPs, 1]}}] - name: 1c1_t2_port_0 + name: 1c1_scalling_instance_0_t2_port_0 1c1_scalling_instance_network: type: OS::Neutron::Net @@ -165,24 +165,24 @@ resources: flavor: {get_param: pd_flavor_name} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: 1c1_t1_port_1} - - port: {get_resource: 1c1_t2_port_1} + - port: {get_resource: 1c1_scalling_instance_1_t1_port_0} + - port: {get_resource: 1c1_scalling_instance_1_t2_port_0} user_data_format: RAW2 scheduler_hints: { group: { get_resource: BE_Affinity } } - 1c1_t1_port_1: + 1c1_scalling_instance_1_t1_port_0: type: OS::Neutron::Port properties: network: {get_resource: 1c1_scalling_instance_network} fixed_ips: [{"ip_address": {get_param: [myIPs, 1]}}] - name: 1c1_t1_port_1 + name: 1c1_scalling_instance_1_t1_port_0 - 1c1_t2_port_1: + 1c1_scalling_instance_1_t2_port_0: type: OS::Neutron::Port properties: network: {get_param: ppds_net_name} fixed_ips: [{"ip_address": {get_param: [myIPs, 1]}}] - name: 1c1_t2_port_1 + name: 1c1_scalling_instance_1_t2_port_0 1c201_catalog_instance_1C2: type: OS::Nova::Server @@ -192,16 +192,16 @@ resources: flavor: {get_param: pd_flavor_name} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: 1c2_t1_port_0} - - port: {get_resource: 1c2_t2_port_0} + - port: {get_resource: 1c2_catalog_instance_0_t1_port_0} + - port: {get_resource: 1c2_catalog_instance_0_t2_port_0} user_data_format: RAW1 scheduler_hints: { group: { get_resource: BE_Affinity } } - 1c2_t1_port_0: + 1c2_catalog_instance_0_t1_port_0: type: OS::Neutron::Port properties: network: {get_param: oam_net_name} - 1c2_t2_port_0: + 1c2_catalog_instance_0_t2_port_0: type: OS::Neutron::Port properties: network: {get_resource: 1c2_catalog_instance_network} @@ -212,7 +212,7 @@ resources: name: get_param: net_name - 1c202_scalling_instance_1C2: + 1c202_catalog_instance_1C2: type: OS::Nova::Server properties: name: {get_param: [1c2_catalog_instance_names, 2]} @@ -220,16 +220,16 @@ resources: flavor: {get_param: pd_flavor_name} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: 1c2_t1_port_1} - - port: {get_resource: 1c2_t2_port_1} + - port: {get_resource: 1c2_catalog_instance_1_t1_port_0} + - port: {get_resource: 1c2_catalog_instance_1_t2_port_0} user_data_format: {get_attr: [1c201_catalog_instance_1C2, instance_name]} scheduler_hints: { group: { get_resource: BE_Affinity } } - 1c2_t1_port_1: + 1c2_catalog_instance_1_t1_port_0: type: OS::Neutron::Port properties: network: {get_param: oam_net_name} - 1c2_t2_port_1: + 1c2_catalog_instance_1_t2_port_0: type: OS::Neutron::Port properties: network: {get_resource: 1c2_catalog_instance_network} @@ -284,20 +284,20 @@ resources: depends_on: - nestedNoUnified - 4p_nested - - 1c2_t1_port_1 - - 1c2_t1_port_0 + - 1c2_catalog_instance_1_t1_port_0 + - 1c2_catalog_instance_0_t1_port_0 - 1c201_catalog_instance_1C2 - - 1c202_scalling_instance_1C2 + - 1c202_catalog_instance_1C2 - 1c101_scalling_instance_1C1 - 1c102_scalling_instance_1C1 - - 1c1_t2_port_0 - - 1c1_t2_port_1 + - 1c1_scalling_instance_0_t2_port_0 + - 1c1_scalling_instance_1_t2_port_0 - 1b01_single_1B - 1b02_single_1B - - 1b_t1_port_0 - - 1b_t1_port_1 + - b_single_1b_0_t1_port_0 + - b_single_1b_1_t1_port_0 - 1a_single_1A - - 1a_t1_port_0 + - 1a_t1_port properties: name: get_param: net_name @@ -306,11 +306,11 @@ resources: type: OS::Neutron::Net properties: name: { get_attr: [nestedNoUnified, portId, {get_attr: [4p_nested, server_pcm_id]}]} - dhcp_agent_ids: { get_attr: [1c2_t1_port_1, tenant_id, {get_attr: [1c2_t1_port_0, tenant_id, {get_attr: [1c201_catalog_instance_1C2, instance_name, {get_attr: [1c202_scalling_instance_1C2,instance_name]}]}]}]} - tenant_id: { get_attr:[1c101_scalling_instance_1C1, instance_name, {get_attr:[1c102_scalling_instance_1C1, instance_name, {get_attr:[1c1_t2_port_0, tenant_id, {get_attr:[1c1_t2_port_1, tenant_id]}]}]}]} - value_specs: {get_attr:[1b01_single_1B, instance_name, get_attr:[1b02_single_1B,instance_name, {get_attr:[1b_t1_port_0, tenant_id, {get_attr:[1b_t1_port_1, tenant_id]}]}]] } + dhcp_agent_ids: { get_attr: [1c2_catalog_instance_1_t1_port_0, tenant_id, {get_attr: [1c2_catalog_instance_0_t1_port_0, tenant_id, {get_attr: [1c201_catalog_instance_1C2, instance_name, {get_attr: [1c202_catalog_instance_1C2,instance_name]}]}]}]} + tenant_id: { get_attr:[1c101_scalling_instance_1C1, instance_name, {get_attr:[1c102_scalling_instance_1C1, instance_name, {get_attr:[1c1_scalling_instance_0_t2_port_0, tenant_id, {get_attr:[1c1_scalling_instance_1_t2_port_0, tenant_id]}]}]}]} + value_specs: {get_attr:[1b01_single_1B, instance_name, get_attr:[1b02_single_1B,instance_name, {get_attr:[b_single_1b_0_t1_port_0, tenant_id, {get_attr:[b_single_1b_1_t1_port_0, tenant_id]}]}]] } qos_policy: {get_attr:[1a_single_1A, instance_name]} - admin_state_up: {get_attr:[1a_t1_port_0, tenant_id]} + admin_state_up: {get_attr:[1a_t1_port, tenant_id]} BE_Affinity: type: OS::Nova::ServerGroup @@ -322,13 +322,13 @@ outputs: out1: value: { get_attr: [nestedNoUnified, portId, {get_attr: [4p_nested, server_pcm_id]}]} out2: - value: { get_attr: [1c2_t1_port_1, tenant_id, {get_attr: [1c2_t1_port_0, tenant_id, {get_attr: [1c201_catalog_instance_1C2, instance_name, {get_attr: [1c202_scalling_instance_1C2,instance_name]}]}]}]} + value: { get_attr: [1c2_catalog_instance_1_t1_port_0, tenant_id, {get_attr: [1c2_catalog_instance_0_t1_port_0, tenant_id, {get_attr: [1c201_catalog_instance_1C2, instance_name, {get_attr: [1c202_catalog_instance_1C2,instance_name]}]}]}]} out3: - value: { get_attr:[1c101_scalling_instance_1C1, instance_name, {get_attr:[1c102_scalling_instance_1C1, instance_name, {get_attr:[1c1_t2_port_0, tenant_id, {get_attr:[1c1_t2_port_1, tenant_id]}]}]}]} + value: { get_attr:[1c101_scalling_instance_1C1, instance_name, {get_attr:[1c102_scalling_instance_1C1, instance_name, {get_attr:[1c1_scalling_instance_0_t2_port_0, tenant_id, {get_attr:[1c1_scalling_instance_1_t2_port_0, tenant_id]}]}]}]} out4: - value: {get_attr:[1b01_single_1B, instance_name, get_attr:[1b02_single_1B,instance_name, {get_attr:[1b_t1_port_0, tenant_id, {get_attr:[1b_t1_port_1, tenant_id]}]}]] } + value: {get_attr:[1b01_single_1B, instance_name, get_attr:[1b02_single_1B,instance_name, {get_attr:[b_single_1b_0_t1_port_0, tenant_id, {get_attr:[b_single_1b_1_t1_port_0, tenant_id]}]}]] } out5: value: {get_attr:[1a_single_1A, instance_name]} out6: - value: {get_attr:[1a_t1_port_0, tenant_id]} + value: {get_attr:[1a_t1_port, tenant_id]} diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/GlobalSubstitutionTypesServiceTemplate.yaml index 5e7d30fe60..e91c84e002 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -2128,86 +2128,78 @@ node_types: org.openecomp.resource.abstract.nodes.1c2_catalog_instance: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_1c2_t2_port_order: - type: integer - required: true - status: SUPPORTED - compute_1c2_catalog_instance_availability_zone: + port_1c2_catalog_instance_t1_port_0_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_1c2_t2_port_subnetpoolid: - type: string + port_1c2_catalog_instance_t2_port_0_vlan_requirements: + type: list required: true status: SUPPORTED - port_1c2_t1_port_related_networks: + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + compute_1c2_catalog_instance_availability_zone: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_1c2_t2_port_network_role: - type: string + type: string + port_1c2_catalog_instance_t1_port_0_ip_requirements: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements vm_flavor_name: type: string required: true status: SUPPORTED - port_1c2_t2_port_network_role_tag: + port_1c2_catalog_instance_t2_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_1c2_t1_port_vlan_requirements: + port_1c2_catalog_instance_t2_port_0_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: string vm_image_name: type: string required: true status: SUPPORTED - port_1c2_t2_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_1c2_catalog_instance_t1_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_1c2_t1_port_order: - type: integer + port_1c2_catalog_instance_t2_port_0_network_role: + type: string required: true status: SUPPORTED - port_1c2_t1_port_subnetpoolid: + port_1c2_catalog_instance_t1_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_1c2_t2_port_ip_requirements: - type: list + port_1c2_catalog_instance_t2_port_0_order: + type: integer required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_1c2_t2_port_related_networks: + port_1c2_catalog_instance_t2_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_1c2_t1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_1c2_t1_port_network_role: - type: string + port_1c2_catalog_instance_t1_port_0_order: + type: integer required: true status: SUPPORTED - port_1c2_t2_port_network: - type: list + port_1c2_catalog_instance_t2_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: string index_value: type: integer description: Index value of this substitution service template runtime instance @@ -2222,42 +2214,50 @@ node_types: status: SUPPORTED entry_schema: type: string - port_1c2_t1_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_1c2_catalog_instance_t2_port_0_ip_requirements: + type: list required: true status: SUPPORTED - port_1c2_t1_port_network: + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_1c2_catalog_instance_t1_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: string - port_1c2_t2_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_1c2_catalog_instance_t2_port_0_subnetpoolid: + type: string required: true status: SUPPORTED - port_1c2_t2_port_vlan_requirements: - type: list + port_1c2_catalog_instance_t1_port_0_network_role: + type: string + required: true + status: SUPPORTED + port_1c2_catalog_instance_t1_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements compute_1c2_catalog_instance_user_data_format: type: list required: true status: SUPPORTED entry_schema: type: string - port_1c2_t1_port_network_role_tag: - type: string - required: true - status: SUPPORTED - port_1c2_t1_port_ip_requirements: + port_1c2_catalog_instance_t1_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: org.openecomp.datatypes.network.VlanRequirements + port_1c2_catalog_instance_t2_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_1c2_catalog_instance_t1_port_0_network_role_tag: + type: string + required: true + status: SUPPORTED compute_1c2_catalog_instance_scheduler_hints: type: list required: true @@ -2268,7 +2268,7 @@ node_types: 1c2_catalog_instance_instance_name: type: string status: SUPPORTED - 1c2_catalog_instance_1c2_t1_port_tenant_id: + 1c2_catalog_instance_1c2_catalog_instance_t1_port_0_tenant_id: type: string status: SUPPORTED requirements: @@ -2286,27 +2286,27 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_1c2_catalog_instance_1c2_t2_port: + - dependency_1c2_catalog_instance_1c2_catalog_instance_t1_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_1c2_catalog_instance_1c2_t2_port: + - link_1c2_catalog_instance_1c2_catalog_instance_t1_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_1c2_catalog_instance_1c2_t1_port: + - dependency_1c2_catalog_instance_1c2_catalog_instance_t2_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_1c2_catalog_instance_1c2_t1_port: + - link_1c2_catalog_instance_1c2_catalog_instance_t2_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -2319,12 +2319,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_1c2_catalog_instance_1c2_t2_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.bytes.rate_1c2_catalog_instance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2337,9 +2331,8 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_1c2_catalog_instance_1c2_t1_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_1c2_catalog_instance_1c2_catalog_instance_t1_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED @@ -2349,73 +2342,78 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_1c2_catalog_instance_1c2_t2_port: + cpu_util_1c2_catalog_instance: 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_1c2_catalog_instance_1c2_t2_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 + network.incoming.bytes.rate_1c2_catalog_instance_1c2_catalog_instance_t2_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - - 0 + - 1 - UNBOUNDED - network.incoming.packets_1c2_catalog_instance_1c2_t1_port: + cpu_1c2_catalog_instance: 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_1c2_catalog_instance: + disk.read.requests_1c2_catalog_instance: 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_1c2_catalog_instance_1c2_t2_port: + network.outpoing.packets_1c2_catalog_instance_1c2_catalog_instance_t2_port_0: 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_1c2_catalog_instance_1c2_t1_port: - type: tosca.capabilities.Node + disk.ephemeral.size_1c2_catalog_instance: + 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 - attachment_1c2_catalog_instance_1c2_t1_port: - type: tosca.capabilities.Attachment + disk.device.write.bytes_1c2_catalog_instance: + 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_1c2_catalog_instance_1c2_t2_port: + memory.resident_1c2_catalog_instance: 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_1c2_catalog_instance: + network.outpoing.packets_1c2_catalog_instance_1c2_catalog_instance_t1_port_0: 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_1c2_catalog_instance: + disk.device.write.requests.rate_1c2_catalog_instance: 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_1c2_catalog_instance_1c2_t1_port: + os_1c2_catalog_instance: + type: tosca.capabilities.OperatingSystem + occurrences: + - 1 + - UNBOUNDED + disk.device.iops_1c2_catalog_instance: 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_1c2_catalog_instance_1c2_t1_port: + binding_1c2_catalog_instance_1c2_catalog_instance_t1_port_0: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface @@ -2423,42 +2421,30 @@ node_types: occurrences: - 0 - UNBOUNDED - disk.ephemeral.size_1c2_catalog_instance: - 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_1c2_catalog_instance: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_1c2_catalog_instance_1c2_catalog_instance_t1_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - memory.resident_1c2_catalog_instance: + network.outgoing.bytes_1c2_catalog_instance_1c2_catalog_instance_t1_port_0: 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_1c2_catalog_instance: + network.outgoing.bytes.rate_1c2_catalog_instance_1c2_catalog_instance_t1_port_0: 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_1c2_catalog_instance_1c2_t1_port: + network.outgoing.packets.rate_1c2_catalog_instance_1c2_catalog_instance_t1_port_0: 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_1c2_catalog_instance: - type: tosca.capabilities.OperatingSystem - occurrences: - - 1 - - UNBOUNDED - disk.device.iops_1c2_catalog_instance: + network.incoming.packets_1c2_catalog_instance_1c2_catalog_instance_t1_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2475,19 +2461,19 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.latency_1c2_catalog_instance: + network.incoming.bytes.rate_1c2_catalog_instance_1c2_catalog_instance_t1_port_0: 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_1c2_catalog_instance_1c2_t1_port: + disk.latency_1c2_catalog_instance: 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_1c2_catalog_instance_1c2_t1_port: + network.incoming.bytes_1c2_catalog_instance_1c2_catalog_instance_t1_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2499,15 +2485,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_1c2_catalog_instance_1c2_t2_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_1c2_catalog_instance_1c2_catalog_instance_t1_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - network.incoming.packets_1c2_catalog_instance_1c2_t2_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_1c2_catalog_instance_1c2_catalog_instance_t2_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED @@ -2523,29 +2507,19 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_1c2_catalog_instance_1c2_t2_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - forwarder_1c2_catalog_instance_1c2_t1_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - network.outgoing.packets.rate_1c2_catalog_instance_1c2_t1_port: + disk.read.bytes_1c2_catalog_instance: 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_1c2_catalog_instance: + instance_1c2_catalog_instance: 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 - instance_1c2_catalog_instance: + network.incoming.packets.rate_1c2_catalog_instance_1c2_catalog_instance_t2_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2569,11 +2543,6 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_1c2_catalog_instance_1c2_t2_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED disk.device.allocation_1c2_catalog_instance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2586,12 +2555,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_1c2_catalog_instance_1c2_t2_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.device.read.requests_1c2_catalog_instance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2634,29 +2597,54 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_1c2_catalog_instance_1c2_t2_port: + binding_1c2_catalog_instance_1c2_catalog_instance_t2_port_0: + 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 + network.incoming.packets_1c2_catalog_instance_1c2_catalog_instance_t2_port_0: 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_1c2_catalog_instance: + feature_1c2_catalog_instance_1c2_catalog_instance_t2_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes_1c2_catalog_instance_1c2_catalog_instance_t2_port_0: 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_1c2_catalog_instance: - type: tosca.capabilities.Node + network.outgoing.bytes.rate_1c2_catalog_instance_1c2_catalog_instance_t2_port_0: + 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_1c2_catalog_instance_1c2_t1_port: + disk.usage_1c2_catalog_instance: 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.packets.rate_1c2_catalog_instance_1c2_catalog_instance_t2_port_0: + 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_1c2_catalog_instance: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED memory_1c2_catalog_instance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2686,8 +2674,20 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_1c2_catalog_instance_1c2_t2_port: - type: tosca.capabilities.Node + forwarder_1c2_catalog_instance_1c2_catalog_instance_t2_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets.rate_1c2_catalog_instance_1c2_catalog_instance_t1_port_0: + 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_1c2_catalog_instance_1c2_catalog_instance_t2_port_0: + 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 @@ -2700,16 +2700,16 @@ node_types: org.openecomp.resource.abstract.nodes.pcma_server_1: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_pcm_port_0_network_role: - type: string - required: true - status: SUPPORTED port_pcm_port_1_related_networks: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pcm_port_0_network_role: + type: string + required: true + status: SUPPORTED port_pcm_port_1_network_role_tag: type: string required: true @@ -2768,11 +2768,11 @@ node_types: type: string required: true status: SUPPORTED - port_pcm_port_0_exCP_naming: + port_pcm_port_1_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_pcm_port_1_exCP_naming: + port_pcm_port_0_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED @@ -2786,18 +2786,18 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pcm_port_0_ip_requirements: + port_pcm_port_1_security_groups: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pcm_port_1_security_groups: + type: json + port_pcm_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements compute_pcma_server_config_drive: type: list required: true @@ -2846,16 +2846,16 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pcm_port_0_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED port_pcm_port_1_ip_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements + port_pcm_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED port_pcm_port_1_order: type: integer required: true @@ -3289,43 +3289,55 @@ node_types: org.openecomp.resource.abstract.nodes.b_single_1b: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_1b_t1_port_order: - type: integer + port_b_single_1b_t1_port_0_network_role_tag: + type: string + required: true + status: SUPPORTED + port_b_single_1b_t1_port_0_related_networks: + type: list required: true status: SUPPORTED - port_1b_t1_port_network_role: + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_b_single_1b_t2_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_1b_t1_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_b_single_1b_t1_port_0_network_role: + type: string + required: true + status: SUPPORTED + port_b_single_1b_t2_port_0_network: + type: list required: true status: SUPPORTED + entry_schema: + type: string vm_flavor_name: type: string required: true status: SUPPORTED - port_1b_t2_port_related_networks: + port_b_single_1b_t1_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_1b_t1_port_ip_requirements: + type: org.openecomp.datatypes.network.VlanRequirements + port_b_single_1b_t2_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_image_name: type: string required: true status: SUPPORTED - port_1b_t2_port_network_role: - type: string + port_b_single_1b_t2_port_0_order: + type: integer required: true status: SUPPORTED - port_1b_t2_port_order: + port_b_single_1b_t1_port_0_order: type: integer required: true status: SUPPORTED @@ -3335,34 +3347,32 @@ node_types: status: SUPPORTED entry_schema: type: string - port_1b_t2_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_1b_t2_port_network_role_tag: - type: string + port_b_single_1b_t2_port_0_vlan_requirements: + type: list required: true status: SUPPORTED - port_1b_t2_port_subnetpoolid: + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_b_single_1b_t2_port_0_network_role: type: string required: true status: SUPPORTED - port_1b_t1_port_related_networks: + port_b_single_1b_t1_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_1b_t2_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED + type: org.openecomp.datatypes.network.IpRequirements compute_b_single_1b_availability_zone: type: list required: true status: SUPPORTED entry_schema: type: string + port_b_single_1b_t1_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED index_value: type: integer description: Index value of this substitution service template runtime instance @@ -3377,42 +3387,32 @@ node_types: status: SUPPORTED entry_schema: type: json - port_1b_t2_port_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_1b_t2_port_ip_requirements: - type: list + port_b_single_1b_t1_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_1b_t1_port_network_role_tag: + port_b_single_1b_t1_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_1b_t1_port_subnetpoolid: + port_b_single_1b_t2_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_1b_t1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_1b_t2_port_network: + port_b_single_1b_t2_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_1b_t1_port_vlan_requirements: - type: list + type: org.openecomp.datatypes.network.IpRequirements + port_b_single_1b_t2_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_b_single_1b_t2_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements compute_b_single_1b_name: type: list required: true @@ -3423,7 +3423,7 @@ node_types: b_single_1b_instance_name: type: string status: SUPPORTED - b_single_1b_1b_t1_port_tenant_id: + b_single_1b_b_single_1b_t1_port_0_tenant_id: type: string status: SUPPORTED requirements: @@ -3441,43 +3441,33 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_b_single_1b_1b_t1_port: + - dependency_b_single_1b_b_single_1b_t2_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_b_single_1b_1b_t1_port: + - link_b_single_1b_b_single_1b_t2_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_b_single_1b_1b_t2_port: + - dependency_b_single_1b_b_single_1b_t1_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_b_single_1b_1b_t2_port: + - link_b_single_1b_b_single_1b_t1_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: - attachment_b_single_1b_1b_t2_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - forwarder_b_single_1b_1b_t2_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED endpoint_b_single_1b: type: tosca.capabilities.Endpoint.Admin occurrences: @@ -3494,23 +3484,56 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_b_single_1b_1b_t2_port: + network.incoming.bytes_b_single_1b_b_single_1b_t1_port_0: 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_b_single_1b_1b_t2_port: + network.incoming.packets.rate_b_single_1b_b_single_1b_t2_port_0: 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_b_single_1b_1b_t1_port: - type: org.openecomp.capabilities.Forwarder + network.incoming.bytes_b_single_1b_b_single_1b_t2_port_0: + 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_b_single_1b_b_single_1b_t1_port_0: + 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 + feature_b_single_1b_b_single_1b_t2_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + feature_b_single_1b_b_single_1b_t1_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes.rate_b_single_1b_b_single_1b_t1_port_0: + 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_b_single_1b_b_single_1b_t2_port_0: + 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 scalable_b_single_1b: type: tosca.capabilities.Scalable occurrences: @@ -3527,6 +3550,16 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_b_single_1b_b_single_1b_t2_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + forwarder_b_single_1b_b_single_1b_t1_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED vcpus_b_single_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3539,25 +3572,25 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.read.requests.rate_b_single_1b: + network.incoming.bytes.rate_b_single_1b_b_single_1b_t2_port_0: 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_b_single_1b_1b_t2_port: + disk.device.read.requests.rate_b_single_1b: 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 - instance_b_single_1b: + network.incoming.packets.rate_b_single_1b_b_single_1b_t1_port_0: 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_b_single_1b_1b_t1_port: + instance_b_single_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -3581,49 +3614,43 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_b_single_1b_1b_t1_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.device.allocation_b_single_1b: 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.packets.rate_b_single_1b_1b_t2_port: + network.outgoing.packets.rate_b_single_1b_b_single_1b_t2_port_0: 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_b_single_1b: + network.outpoing.packets_b_single_1b_b_single_1b_t1_port_0: 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_b_single_1b: + network.outgoing.bytes_b_single_1b_b_single_1b_t2_port_0: 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_b_single_1b_1b_t2_port: + disk.device.capacity_b_single_1b: 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_b_single_1b_1b_t1_port: + disk.latency_b_single_1b: 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 - attachment_b_single_1b_1b_t1_port: + attachment_b_single_1b_b_single_1b_t1_port_0: type: tosca.capabilities.Attachment occurrences: - 1 @@ -3634,14 +3661,6 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_b_single_1b_1b_t2_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 disk.ephemeral.size_b_single_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3654,25 +3673,25 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_b_single_1b_1b_t2_port: + disk.device.iops_b_single_1b: 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.iops_b_single_1b: + disk.read.requests_b_single_1b: 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_b_single_1b: + memory.resident_b_single_1b: 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_b_single_1b: + network.outgoing.bytes.rate_b_single_1b_b_single_1b_t2_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -3684,12 +3703,13 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_b_single_1b_1b_t1_port: - type: tosca.capabilities.Node + network.incoming.packets_b_single_1b_b_single_1b_t1_port_0: + 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_b_single_1b_1b_t2_port: + network.outgoing.bytes.rate_b_single_1b_b_single_1b_t1_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -3731,7 +3751,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_b_single_1b_1b_t1_port: + network.incoming.packets_b_single_1b_b_single_1b_t2_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -3749,63 +3769,48 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_b_single_1b_1b_t1_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.device.read.requests_b_single_1b: 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_b_single_1b_1b_t1_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_b_single_1b_b_single_1b_t2_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - binding_b_single_1b_1b_t1_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 - network.outpoing.packets_b_single_1b_1b_t1_port: + disk.device.write.requests.rate_b_single_1b: 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_b_single_1b: + network.outgoing.packets.rate_b_single_1b_b_single_1b_t1_port_0: 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_b_single_1b: + network.outpoing.packets_b_single_1b_b_single_1b_t2_port_0: 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_b_single_1b: + memory.usage_b_single_1b: 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_b_single_1b_1b_t2_port: + network.outgoing.bytes_b_single_1b_b_single_1b_t1_port_0: 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_b_single_1b_1b_t1_port: + disk.write.bytes.rate_b_single_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -3847,112 +3852,91 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_b_single_1b_1b_t2_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED org.openecomp.resource.abstract.nodes.1c1_scalling_instance: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_1c1_t1_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_1c1_t2_port_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements compute_1c1_scalling_instance_user_data_format: type: list required: true status: SUPPORTED entry_schema: type: string - port_1c1_t2_port_related_networks: + port_1c1_scalling_instance_t1_port_0_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_1c1_t2_port_network_role_tag: - type: string - required: true - status: SUPPORTED - vm_flavor_name: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_1c1_scalling_instance_t1_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_1c1_t1_port_related_networks: + port_1c1_scalling_instance_t2_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_1c1_t1_port_ip_requirements: + port_1c1_scalling_instance_t1_port_0_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - vm_image_name: + type: string + vm_flavor_name: type: string required: true status: SUPPORTED - compute_1c1_scalling_instance_name: + port_1c1_scalling_instance_t2_port_0_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: string - port_1c1_t1_port_name: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_1c1_scalling_instance_t1_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_1c1_t1_port_network: - type: list + type: org.openecomp.datatypes.network.IpRequirements + port_1c1_scalling_instance_t1_port_0_network_role: + type: string required: true status: SUPPORTED - entry_schema: - type: string - port_1c1_t2_port_fixed_ips: - type: list + port_1c1_scalling_instance_t2_port_0_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_1c1_t2_port_network: - type: list + port_1c1_scalling_instance_t2_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: string - port_1c1_t1_port_fixed_ips: - type: list + vm_image_name: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_1c1_t1_port_vlan_requirements: + compute_1c1_scalling_instance_name: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_1c1_t2_port_ip_requirements: - type: list + type: string + port_1c1_scalling_instance_t2_port_0_network_role: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_1c1_t1_port_mac_requirements: + port_1c1_scalling_instance_t1_port_0_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED + port_1c1_scalling_instance_t1_port_0_subnetpoolid: + type: string + required: true + status: SUPPORTED + port_1c1_scalling_instance_t2_port_0_order: + type: integer + required: true + status: SUPPORTED index_value: type: integer description: Index value of this substitution service template runtime instance @@ -3961,76 +3945,92 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_1c1_t2_port_network_role: - type: string + port_1c1_scalling_instance_t1_port_0_order: + type: integer required: true status: SUPPORTED - port_1c1_t2_port_order: - type: integer + port_1c1_scalling_instance_t2_port_0_vlan_requirements: + type: list required: true status: SUPPORTED - port_1c1_t2_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_1c1_scalling_instance_t1_port_0_name: + type: list required: true status: SUPPORTED + entry_schema: + type: string compute_1c1_scalling_instance_availability_zone: type: list required: true status: SUPPORTED entry_schema: type: string - port_1c1_t2_port_subnetpoolid: - type: string + port_1c1_scalling_instance_t2_port_0_ip_requirements: + type: list required: true status: SUPPORTED - port_1c1_t2_port_name: + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_1c1_scalling_instance_t2_port_0_name: type: list required: true status: SUPPORTED entry_schema: type: string + port_1c1_scalling_instance_t2_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_1c1_scalling_instance_t1_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED compute_1c1_scalling_instance_scheduler_hints: type: list required: true status: SUPPORTED entry_schema: type: json - port_1c1_t2_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_1c1_t1_port_subnetpoolid: - type: string + port_1c1_scalling_instance_t1_port_0_vlan_requirements: + type: list required: true status: SUPPORTED - port_1c1_t1_port_network_role_tag: + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_1c1_scalling_instance_t2_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_1c1_t1_port_network_role: - type: string + port_1c1_scalling_instance_t1_port_0_related_networks: + type: list required: true status: SUPPORTED - port_1c1_t1_port_order: - type: integer + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_1c1_scalling_instance_t2_port_0_network: + type: list required: true status: SUPPORTED + entry_schema: + type: string attributes: 1c1_scalling_instance_instance_name: type: string status: SUPPORTED - 1c1_scalling_instance_1c1_t2_port_tenant_id: + 1c1_scalling_instance_1c1_scalling_instance_t2_port_0_tenant_id: type: string status: SUPPORTED requirements: - - dependency_1c1_scalling_instance_1c1_t1_port: + - dependency_1c1_scalling_instance_1c1_scalling_instance_t2_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_1c1_scalling_instance_1c1_t1_port: + - link_1c1_scalling_instance_1c1_scalling_instance_t2_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -4050,14 +4050,14 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_1c1_scalling_instance_1c1_t2_port: + - dependency_1c1_scalling_instance_1c1_scalling_instance_t1_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_1c1_scalling_instance_1c1_t2_port: + - link_1c1_scalling_instance_1c1_scalling_instance_t1_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -4093,17 +4093,26 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_1c1_scalling_instance_1c1_t2_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_1c1_scalling_instance_1c1_scalling_instance_t2_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_1c1_scalling_instance_1c1_t2_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_1c1_scalling_instance_1c1_scalling_instance_t1_port_0: + 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 + binding_1c1_scalling_instance_1c1_scalling_instance_t2_port_0: + 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: - - 1 + - 0 - UNBOUNDED disk.usage_1c1_scalling_instance: type: org.openecomp.capabilities.metric.Ceilometer @@ -4111,13 +4120,12 @@ node_types: occurrences: - 1 - UNBOUNDED - memory.resident_1c1_scalling_instance: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_1c1_scalling_instance_1c1_scalling_instance_t2_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_1c1_scalling_instance_1c1_t2_port: + memory.resident_1c1_scalling_instance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -4129,7 +4137,7 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_1c1_scalling_instance_1c1_t2_port: + forwarder_1c1_scalling_instance_1c1_scalling_instance_t1_port_0: type: org.openecomp.capabilities.Forwarder occurrences: - 1 @@ -4140,18 +4148,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_1c1_scalling_instance_1c1_t1_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.incoming.bytes_1c1_scalling_instance_1c1_t1_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.write.bytes.rate_1c1_scalling_instance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4164,7 +4160,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_1c1_scalling_instance_1c1_t1_port: + network.outgoing.bytes.rate_1c1_scalling_instance_1c1_scalling_instance_t1_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -4175,24 +4171,19 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.write.requests.rate_1c1_scalling_instance: + network.outgoing.bytes.rate_1c1_scalling_instance_1c1_scalling_instance_t2_port_0: 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_1c1_scalling_instance_1c1_t1_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - disk.read.bytes.rate_1c1_scalling_instance: + disk.device.write.requests.rate_1c1_scalling_instance: 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_1c1_scalling_instance_1c1_t2_port: + disk.read.bytes.rate_1c1_scalling_instance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -4209,14 +4200,6 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_1c1_scalling_instance_1c1_t2_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 disk.device.write.bytes_1c1_scalling_instance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4229,19 +4212,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_1c1_scalling_instance_1c1_t2_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 vcpus_1c1_scalling_instance: 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_1c1_scalling_instance_1c1_t1_port: + network.incoming.packets_1c1_scalling_instance_1c1_scalling_instance_t2_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -4254,33 +4231,38 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.packets.rate_1c1_scalling_instance_1c1_scalling_instance_t1_port_0: + 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_1c1_scalling_instance: 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_1c1_scalling_instance_1c1_t1_port: - type: tosca.capabilities.Node + network.incoming.packets.rate_1c1_scalling_instance_1c1_scalling_instance_t1_port_0: + 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_1c1_scalling_instance_1c1_t1_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 + feature_1c1_scalling_instance_1c1_scalling_instance_t1_port_0: + type: tosca.capabilities.Node occurrences: - - 0 + - 1 - UNBOUNDED - disk.device.read.requests.rate_1c1_scalling_instance: + network.outpoing.packets_1c1_scalling_instance_1c1_scalling_instance_t2_port_0: 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 - attachment_1c1_scalling_instance_1c1_t2_port: - type: tosca.capabilities.Attachment + disk.device.read.requests.rate_1c1_scalling_instance: + 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 @@ -4290,12 +4272,17 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_1c1_scalling_instance_1c1_t1_port: + network.incoming.bytes.rate_1c1_scalling_instance_1c1_scalling_instance_t1_port_0: 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 + attachment_1c1_scalling_instance_1c1_scalling_instance_t1_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED disk.device.iops_1c1_scalling_instance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4308,6 +4295,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes_1c1_scalling_instance_1c1_scalling_instance_t2_port_0: + 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_1c1_scalling_instance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4326,6 +4319,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes_1c1_scalling_instance_1c1_scalling_instance_t2_port_0: + 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_1c1_scalling_instance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4338,19 +4337,19 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.write.requests_1c1_scalling_instance: + network.outgoing.bytes_1c1_scalling_instance_1c1_scalling_instance_t1_port_0: 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_1c1_scalling_instance_1c1_t1_port: + network.incoming.packets_1c1_scalling_instance_1c1_scalling_instance_t1_port_0: 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_1c1_scalling_instance_1c1_t2_port: + disk.device.write.requests_1c1_scalling_instance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -4373,70 +4372,71 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_1c1_scalling_instance_1c1_t1_port: + disk.allocation_1c1_scalling_instance: 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.allocation_1c1_scalling_instance: + memory.usage_1c1_scalling_instance: 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_1c1_scalling_instance_1c1_t2_port: - type: tosca.capabilities.Node + os_1c1_scalling_instance: + type: tosca.capabilities.OperatingSystem occurrences: - 1 - UNBOUNDED - memory.usage_1c1_scalling_instance: + disk.iops_1c1_scalling_instance: 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_1c1_scalling_instance_1c1_t2_port: + network.outgoing.packets.rate_1c1_scalling_instance_1c1_scalling_instance_t2_port_0: 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_1c1_scalling_instance_1c1_t2_port: + network.outpoing.packets_1c1_scalling_instance_1c1_scalling_instance_t1_port_0: 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_1c1_scalling_instance: - type: tosca.capabilities.OperatingSystem + cpu.delta_1c1_scalling_instance: + 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.iops_1c1_scalling_instance: + memory_1c1_scalling_instance: 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_1c1_scalling_instance_1c1_t1_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_1c1_scalling_instance_1c1_scalling_instance_t2_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - attachment_1c1_scalling_instance_1c1_t1_port: - type: tosca.capabilities.Attachment + network.incoming.bytes.rate_1c1_scalling_instance_1c1_scalling_instance_t2_port_0: + 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_1c1_scalling_instance: + network.incoming.bytes_1c1_scalling_instance_1c1_scalling_instance_t1_port_0: 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_1c1_scalling_instance: + network.incoming.packets.rate_1c1_scalling_instance_1c1_scalling_instance_t2_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -5023,43 +5023,55 @@ node_types: org.openecomp.resource.abstract.nodes.b_single_1b_1: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_1b_t1_port_order: - type: integer + port_b_single_1b_t1_port_0_network_role_tag: + type: string + required: true + status: SUPPORTED + port_b_single_1b_t1_port_0_related_networks: + type: list required: true status: SUPPORTED - port_1b_t1_port_network_role: + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_b_single_1b_t2_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_1b_t1_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_b_single_1b_t1_port_0_network_role: + type: string + required: true + status: SUPPORTED + port_b_single_1b_t2_port_0_network: + type: list required: true status: SUPPORTED + entry_schema: + type: string vm_flavor_name: type: string required: true status: SUPPORTED - port_1b_t2_port_related_networks: + port_b_single_1b_t1_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_1b_t1_port_ip_requirements: + type: org.openecomp.datatypes.network.VlanRequirements + port_b_single_1b_t2_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_image_name: type: string required: true status: SUPPORTED - port_1b_t2_port_network_role: - type: string + port_b_single_1b_t2_port_0_order: + type: integer required: true status: SUPPORTED - port_1b_t2_port_order: + port_b_single_1b_t1_port_0_order: type: integer required: true status: SUPPORTED @@ -5069,34 +5081,32 @@ node_types: status: SUPPORTED entry_schema: type: string - port_1b_t2_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_1b_t2_port_network_role_tag: - type: string + port_b_single_1b_t2_port_0_vlan_requirements: + type: list required: true status: SUPPORTED - port_1b_t2_port_subnetpoolid: + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_b_single_1b_t2_port_0_network_role: type: string required: true status: SUPPORTED - port_1b_t1_port_related_networks: + port_b_single_1b_t1_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_1b_t2_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED + type: org.openecomp.datatypes.network.IpRequirements compute_b_single_1b_availability_zone: type: list required: true status: SUPPORTED entry_schema: type: string + port_b_single_1b_t1_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED index_value: type: integer description: Index value of this substitution service template runtime instance @@ -5111,48 +5121,38 @@ node_types: status: SUPPORTED entry_schema: type: json - port_1b_t2_port_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_1b_t2_port_ip_requirements: - type: list + port_b_single_1b_t1_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_1b_t1_port_network_role_tag: + port_b_single_1b_t1_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_1b_t1_port_subnetpoolid: + port_b_single_1b_t2_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_1b_t1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_1b_t2_port_network: + port_b_single_1b_t1_port_0_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_1b_t1_port_vlan_requirements: + port_b_single_1b_t2_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_1b_t1_port_network: - type: list + type: org.openecomp.datatypes.network.IpRequirements + port_b_single_1b_t2_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_b_single_1b_t2_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: string compute_b_single_1b_name: type: list required: true @@ -5163,7 +5163,7 @@ node_types: b_single_1b_instance_name: type: string status: SUPPORTED - b_single_1b_1b_t1_port_tenant_id: + b_single_1b_b_single_1b_t1_port_0_tenant_id: type: string status: SUPPORTED requirements: @@ -5181,43 +5181,33 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_b_single_1b_1b_t1_port: + - dependency_b_single_1b_b_single_1b_t2_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_b_single_1b_1b_t1_port: + - link_b_single_1b_b_single_1b_t2_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_b_single_1b_1b_t2_port: + - dependency_b_single_1b_b_single_1b_t1_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_b_single_1b_1b_t2_port: + - link_b_single_1b_b_single_1b_t1_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: - attachment_b_single_1b_1b_t2_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - forwarder_b_single_1b_1b_t2_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED endpoint_b_single_1b: type: tosca.capabilities.Endpoint.Admin occurrences: @@ -5234,23 +5224,56 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_b_single_1b_1b_t2_port: + network.incoming.bytes_b_single_1b_b_single_1b_t1_port_0: 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_b_single_1b_1b_t2_port: + network.incoming.packets.rate_b_single_1b_b_single_1b_t2_port_0: 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_b_single_1b_1b_t1_port: - type: org.openecomp.capabilities.Forwarder + network.incoming.bytes_b_single_1b_b_single_1b_t2_port_0: + 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_b_single_1b_b_single_1b_t1_port_0: + 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 + feature_b_single_1b_b_single_1b_t2_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + feature_b_single_1b_b_single_1b_t1_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes.rate_b_single_1b_b_single_1b_t1_port_0: + 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_b_single_1b_b_single_1b_t2_port_0: + 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 scalable_b_single_1b: type: tosca.capabilities.Scalable occurrences: @@ -5267,6 +5290,16 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_b_single_1b_b_single_1b_t2_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + forwarder_b_single_1b_b_single_1b_t1_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED vcpus_b_single_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -5279,25 +5312,25 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.read.requests.rate_b_single_1b: + network.incoming.bytes.rate_b_single_1b_b_single_1b_t2_port_0: 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_b_single_1b_1b_t2_port: + disk.device.read.requests.rate_b_single_1b: 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 - instance_b_single_1b: + network.incoming.packets.rate_b_single_1b_b_single_1b_t1_port_0: 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_b_single_1b_1b_t1_port: + instance_b_single_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -5321,49 +5354,43 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_b_single_1b_1b_t1_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.device.allocation_b_single_1b: 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.packets.rate_b_single_1b_1b_t2_port: + network.outgoing.packets.rate_b_single_1b_b_single_1b_t2_port_0: 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_b_single_1b: + network.outpoing.packets_b_single_1b_b_single_1b_t1_port_0: 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_b_single_1b: + network.outgoing.bytes_b_single_1b_b_single_1b_t2_port_0: 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_b_single_1b_1b_t2_port: + disk.device.capacity_b_single_1b: 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_b_single_1b_1b_t1_port: + disk.latency_b_single_1b: 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 - attachment_b_single_1b_1b_t1_port: + attachment_b_single_1b_b_single_1b_t1_port_0: type: tosca.capabilities.Attachment occurrences: - 1 @@ -5374,14 +5401,6 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_b_single_1b_1b_t2_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 disk.ephemeral.size_b_single_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -5394,25 +5413,25 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_b_single_1b_1b_t2_port: + disk.device.iops_b_single_1b: 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.iops_b_single_1b: + disk.read.requests_b_single_1b: 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_b_single_1b: + memory.resident_b_single_1b: 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_b_single_1b: + network.outgoing.bytes.rate_b_single_1b_b_single_1b_t2_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -5424,12 +5443,13 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_b_single_1b_1b_t1_port: - type: tosca.capabilities.Node + network.incoming.packets_b_single_1b_b_single_1b_t1_port_0: + 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_b_single_1b_1b_t2_port: + network.outgoing.bytes.rate_b_single_1b_b_single_1b_t1_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -5471,7 +5491,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_b_single_1b_1b_t1_port: + network.incoming.packets_b_single_1b_b_single_1b_t2_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -5489,63 +5509,48 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_b_single_1b_1b_t1_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.device.read.requests_b_single_1b: 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_b_single_1b_1b_t1_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_b_single_1b_b_single_1b_t2_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - binding_b_single_1b_1b_t1_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 - network.outpoing.packets_b_single_1b_1b_t1_port: + disk.device.write.requests.rate_b_single_1b: 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_b_single_1b: + network.outgoing.packets.rate_b_single_1b_b_single_1b_t1_port_0: 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_b_single_1b: + network.outpoing.packets_b_single_1b_b_single_1b_t2_port_0: 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_b_single_1b: + memory.usage_b_single_1b: 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_b_single_1b_1b_t2_port: + network.outgoing.bytes_b_single_1b_b_single_1b_t1_port_0: 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_b_single_1b_1b_t1_port: + disk.write.bytes.rate_b_single_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -5586,9 +5591,4 @@ node_types: type: tosca.capabilities.network.Bindable occurrences: - 1 - - UNBOUNDED - feature_b_single_1b_1b_t2_port: - type: tosca.capabilities.Node - 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/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 e9a5f1bb52..ff015e9fbe 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 @@ -216,36 +216,36 @@ topology_template: directives: - substitutable properties: + port_b_single_1b_t2_port_0_network: + - b_single_1b_network vm_flavor_name: get_input: pd_flavor_name - port_1b_t1_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false vm_image_name: get_input: pd_image_name compute_b_single_1b_user_data_format: - RAW - port_1b_t2_port_mac_requirements: - mac_count_required: + port_b_single_1b_t1_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: is_required: false compute_b_single_1b_availability_zone: - get_input: availabilityzone_name compute_b_single_1b_scheduler_hints: - group: BE_Affinity_group - port_1b_t2_port_ip_requirements: + port_b_single_1b_t1_port_0_mac_requirements: + mac_count_required: + is_required: false + port_b_single_1b_t2_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_1b_t1_port_mac_requirements: + port_b_single_1b_t2_port_0_mac_requirements: mac_count_required: is_required: false - port_1b_t2_port_network: - - b_single_1b_network compute_b_single_1b_name: - get_input: - b_single_1b_names @@ -259,7 +259,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_b_single_1b_1b_t2_port: + - link_b_single_1b_b_single_1b_t2_port_0: capability: tosca.capabilities.network.Linkable node: b_single_1b_network relationship: tosca.relationships.network.LinksTo @@ -271,31 +271,7 @@ topology_template: compute_1c1_scalling_instance_user_data_format: - RAW2 - RAW1 - port_1c1_t2_port_network_role_tag: ppds - vm_flavor_name: - get_input: pd_flavor_name - port_1c1_t1_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false - vm_image_name: - get_input: pd_image_name - compute_1c1_scalling_instance_name: - - get_input: - - 1c1_scalling_instance_names - - 2 - - get_input: - - 1c1_scalling_instance_names - - 1 - port_1c1_t1_port_name: - - 1c1_t1_port_1 - - 1c1_t1_port_0 - port_1c1_t1_port_network: - - 1c1_scalling_instance_network - - 1c1_scalling_instance_network - port_1c1_t2_port_fixed_ips: + port_1c1_scalling_instance_t1_port_0_fixed_ips: - - ip_address: get_input: - myIPs @@ -304,10 +280,12 @@ topology_template: get_input: - myIPs - 1 - port_1c1_t2_port_network: - - get_input: ppds_net_name - - get_input: ppds_net_name - port_1c1_t1_port_fixed_ips: + port_1c1_scalling_instance_t1_port_0_network: + - 1c1_scalling_instance_network + - 1c1_scalling_instance_network + vm_flavor_name: + get_input: pd_flavor_name + port_1c1_scalling_instance_t2_port_0_fixed_ips: - - ip_address: get_input: - myIPs @@ -316,27 +294,49 @@ topology_template: get_input: - myIPs - 1 - port_1c1_t2_port_ip_requirements: + port_1c1_scalling_instance_t1_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false - port_1c1_t1_port_mac_requirements: + port_1c1_scalling_instance_t2_port_0_mac_requirements: mac_count_required: is_required: false - port_1c1_t2_port_mac_requirements: + vm_image_name: + get_input: pd_image_name + compute_1c1_scalling_instance_name: + - get_input: + - 1c1_scalling_instance_names + - 2 + - get_input: + - 1c1_scalling_instance_names + - 1 + port_1c1_scalling_instance_t1_port_0_mac_requirements: mac_count_required: is_required: false + port_1c1_scalling_instance_t1_port_0_name: + - 1c1_scalling_instance_1_t1_port_0 + - 1c1_scalling_instance_0_t1_port_0 compute_1c1_scalling_instance_availability_zone: - get_input: availabilityzone_name - get_input: availabilityzone_name - port_1c1_t2_port_name: - - 1c1_t2_port_1 - - 1c1_t2_port_0 + port_1c1_scalling_instance_t2_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + port_1c1_scalling_instance_t2_port_0_name: + - 1c1_scalling_instance_1_t2_port_0 + - 1c1_scalling_instance_0_t2_port_0 compute_1c1_scalling_instance_scheduler_hints: - group: BE_Affinity_group - group: BE_Affinity_group + port_1c1_scalling_instance_t2_port_0_network_role_tag: ppds + port_1c1_scalling_instance_t2_port_0_network: + - get_input: ppds_net_name + - get_input: ppds_net_name service_template_filter: substitute_service_template: Nested_1c1_scalling_instanceServiceTemplate.yaml count: 2 @@ -346,7 +346,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_1c1_scalling_instance_1c1_t1_port: + - link_1c1_scalling_instance_1c1_scalling_instance_t1_port_0: capability: tosca.capabilities.network.Linkable node: 1c1_scalling_instance_network relationship: tosca.relationships.network.LinksTo @@ -403,41 +403,41 @@ topology_template: directives: - substitutable properties: + port_1c2_catalog_instance_t1_port_0_network: + - get_input: oam_net_name compute_1c2_catalog_instance_availability_zone: - get_input: availabilityzone_name - vm_flavor_name: - get_input: pd_flavor_name - vm_image_name: - get_input: pd_image_name - port_1c2_t2_port_ip_requirements: + port_1c2_catalog_instance_t1_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_1c2_t1_port_mac_requirements: + vm_flavor_name: + get_input: pd_flavor_name + port_1c2_catalog_instance_t2_port_0_network: + - 1c2_catalog_instance_network + vm_image_name: + get_input: pd_image_name + port_1c2_catalog_instance_t1_port_0_mac_requirements: + mac_count_required: + is_required: false + port_1c2_catalog_instance_t2_port_0_mac_requirements: mac_count_required: is_required: false - port_1c2_t2_port_network: - - 1c2_catalog_instance_network compute_1c2_catalog_instance_name: - get_input: - 1c2_catalog_instance_names - 1 - port_1c2_t1_port_network: - - get_input: oam_net_name - port_1c2_t2_port_mac_requirements: - mac_count_required: - is_required: false - compute_1c2_catalog_instance_user_data_format: - - RAW1 - port_1c2_t1_port_network_role_tag: oam - port_1c2_t1_port_ip_requirements: + port_1c2_catalog_instance_t2_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false + compute_1c2_catalog_instance_user_data_format: + - RAW1 + port_1c2_catalog_instance_t1_port_0_network_role_tag: oam compute_1c2_catalog_instance_scheduler_hints: - group: BE_Affinity_group service_template_filter: @@ -449,7 +449,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_1c2_catalog_instance_1c2_t2_port: + - link_1c2_catalog_instance_1c2_catalog_instance_t2_port_0: capability: tosca.capabilities.network.Linkable node: 1c2_catalog_instance_network relationship: tosca.relationships.network.LinksTo @@ -458,43 +458,43 @@ topology_template: directives: - substitutable properties: + port_1c2_catalog_instance_t1_port_0_network: + - get_input: oam_net_name compute_1c2_catalog_instance_availability_zone: - get_input: availabilityzone_name - vm_flavor_name: - get_input: pd_flavor_name - vm_image_name: - get_input: pd_image_name - port_1c2_t2_port_ip_requirements: + port_1c2_catalog_instance_t1_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_1c2_t1_port_mac_requirements: + vm_flavor_name: + get_input: pd_flavor_name + port_1c2_catalog_instance_t2_port_0_network: + - 1c2_catalog_instance_network + vm_image_name: + get_input: pd_image_name + port_1c2_catalog_instance_t1_port_0_mac_requirements: + mac_count_required: + is_required: false + port_1c2_catalog_instance_t2_port_0_mac_requirements: mac_count_required: is_required: false - port_1c2_t2_port_network: - - 1c2_catalog_instance_network compute_1c2_catalog_instance_name: - get_input: - 1c2_catalog_instance_names - 2 - port_1c2_t1_port_network: - - get_input: oam_net_name - port_1c2_t2_port_mac_requirements: - mac_count_required: - is_required: false - compute_1c2_catalog_instance_user_data_format: - - get_attribute: - - abstract_1c2_catalog_instance_0 - - 1c2_catalog_instance_instance_name - port_1c2_t1_port_network_role_tag: oam - port_1c2_t1_port_ip_requirements: + port_1c2_catalog_instance_t2_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false + compute_1c2_catalog_instance_user_data_format: + - get_attribute: + - abstract_1c2_catalog_instance_0 + - 1c2_catalog_instance_instance_name + port_1c2_catalog_instance_t1_port_0_network_role_tag: oam compute_1c2_catalog_instance_scheduler_hints: - group: BE_Affinity_group service_template_filter: @@ -506,7 +506,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_1c2_catalog_instance_1c2_t2_port: + - link_1c2_catalog_instance_1c2_catalog_instance_t2_port_0: capability: tosca.capabilities.network.Linkable node: 1c2_catalog_instance_network relationship: tosca.relationships.network.LinksTo @@ -521,10 +521,10 @@ topology_template: dhcp_agent_ids: get_attribute: - abstract_1c2_catalog_instance_1 - - 1c2_catalog_instance_1c2_t1_port_tenant_id + - 1c2_catalog_instance_1c2_catalog_instance_t1_port_0_tenant_id - get_attribute: - abstract_1c2_catalog_instance_0 - - 1c2_catalog_instance_1c2_t1_port_tenant_id + - 1c2_catalog_instance_1c2_catalog_instance_t1_port_0_tenant_id - get_attribute: - abstract_1c2_catalog_instance_0 - 1c2_catalog_instance_instance_name @@ -540,10 +540,10 @@ topology_template: - 1c1_scalling_instance_instance_name - get_attribute: - abstract_1c1_scalling_instance - - 1c1_scalling_instance_1c1_t2_port_tenant_id + - 1c1_scalling_instance_1c1_scalling_instance_t2_port_0_tenant_id - get_attribute: - abstract_1c1_scalling_instance - - 1c1_scalling_instance_1c1_t2_port_tenant_id + - 1c1_scalling_instance_1c1_scalling_instance_t2_port_0_tenant_id admin_state_up: get_attribute: - abstract_a_single_1a @@ -568,10 +568,10 @@ topology_template: - b_single_1b_instance_name - get_attribute: - abstract_b_single_1b - - b_single_1b_1b_t1_port_tenant_id + - b_single_1b_b_single_1b_t1_port_0_tenant_id - get_attribute: - abstract_b_single_1b_1 - - b_single_1b_1b_t1_port_tenant_id + - b_single_1b_b_single_1b_t1_port_0_tenant_id dependsOn_network: type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net properties: @@ -579,11 +579,11 @@ topology_template: get_input: net_name requirements: - dependency: - capability: feature_1c2_catalog_instance_1c2_t1_port + capability: feature_1c2_catalog_instance_1c2_catalog_instance_t1_port_0 node: abstract_1c2_catalog_instance_1 relationship: tosca.relationships.DependsOn - dependency: - capability: feature_1c2_catalog_instance_1c2_t1_port + capability: feature_1c2_catalog_instance_1c2_catalog_instance_t1_port_0 node: abstract_1c2_catalog_instance_0 relationship: tosca.relationships.DependsOn - dependency: @@ -599,7 +599,7 @@ topology_template: node: abstract_1c1_scalling_instance relationship: tosca.relationships.DependsOn - dependency: - capability: feature_1c1_scalling_instance_1c1_t2_port + capability: feature_1c1_scalling_instance_1c1_scalling_instance_t2_port_0 node: abstract_1c1_scalling_instance relationship: tosca.relationships.DependsOn - dependency: @@ -611,11 +611,11 @@ topology_template: node: abstract_b_single_1b_1 relationship: tosca.relationships.DependsOn - dependency: - capability: feature_b_single_1b_1b_t1_port + capability: feature_b_single_1b_b_single_1b_t1_port_0 node: abstract_b_single_1b relationship: tosca.relationships.DependsOn - dependency: - capability: feature_b_single_1b_1b_t1_port + capability: feature_b_single_1b_b_single_1b_t1_port_0 node: abstract_b_single_1b_1 relationship: tosca.relationships.DependsOn - dependency: @@ -814,39 +814,39 @@ topology_template: directives: - substitutable properties: + port_b_single_1b_t1_port_0_network_role_tag: oam + port_b_single_1b_t2_port_0_network: + - b_single_1b_network vm_flavor_name: get_input: pd_flavor_name - port_1b_t1_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false vm_image_name: get_input: pd_image_name compute_b_single_1b_user_data_format: - RAW - port_1b_t2_port_mac_requirements: - mac_count_required: + port_b_single_1b_t1_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: is_required: false compute_b_single_1b_availability_zone: - get_input: availabilityzone_name compute_b_single_1b_scheduler_hints: - group: BE_Affinity_group - port_1b_t2_port_ip_requirements: + port_b_single_1b_t1_port_0_mac_requirements: + mac_count_required: + is_required: false + port_b_single_1b_t1_port_0_network: + - get_input: oam_net_name + port_b_single_1b_t2_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_1b_t1_port_network_role_tag: oam - port_1b_t1_port_mac_requirements: + port_b_single_1b_t2_port_0_mac_requirements: mac_count_required: is_required: false - port_1b_t2_port_network: - - b_single_1b_network - port_1b_t1_port_network: - - get_input: oam_net_name compute_b_single_1b_name: - get_input: - b_single_1b_names @@ -860,7 +860,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_b_single_1b_1b_t2_port: + - link_b_single_1b_b_single_1b_t2_port_0: capability: tosca.capabilities.network.Linkable node: b_single_1b_network relationship: tosca.relationships.network.LinksTo @@ -911,10 +911,10 @@ topology_template: value: get_attribute: - abstract_1c2_catalog_instance_1 - - 1c2_catalog_instance_1c2_t1_port_tenant_id + - 1c2_catalog_instance_1c2_catalog_instance_t1_port_0_tenant_id - get_attribute: - abstract_1c2_catalog_instance_0 - - 1c2_catalog_instance_1c2_t1_port_tenant_id + - 1c2_catalog_instance_1c2_catalog_instance_t1_port_0_tenant_id - get_attribute: - abstract_1c2_catalog_instance_0 - 1c2_catalog_instance_instance_name @@ -931,10 +931,10 @@ topology_template: - 1c1_scalling_instance_instance_name - get_attribute: - abstract_1c1_scalling_instance - - 1c1_scalling_instance_1c1_t2_port_tenant_id + - 1c1_scalling_instance_1c1_scalling_instance_t2_port_0_tenant_id - get_attribute: - abstract_1c1_scalling_instance - - 1c1_scalling_instance_1c1_t2_port_tenant_id + - 1c1_scalling_instance_1c1_scalling_instance_t2_port_0_tenant_id out4: value: get_attribute: @@ -945,10 +945,10 @@ topology_template: - b_single_1b_instance_name - get_attribute: - abstract_b_single_1b - - b_single_1b_1b_t1_port_tenant_id + - b_single_1b_b_single_1b_t1_port_0_tenant_id - get_attribute: - abstract_b_single_1b_1 - - b_single_1b_1b_t1_port_tenant_id + - b_single_1b_b_single_1b_t1_port_0_tenant_id out5: value: get_attribute: 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_1c1_scalling_instanceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c1_scalling_instanceServiceTemplate.yaml index 15620d7809..5be7399e92 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c1_scalling_instanceServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c1_scalling_instanceServiceTemplate.yaml @@ -11,86 +11,71 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_1c1_t1_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_1c1_t2_port_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements compute_1c1_scalling_instance_user_data_format: type: list required: true entry_schema: type: string - port_1c1_t2_port_related_networks: + port_1c1_scalling_instance_t1_port_0_fixed_ips: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_1c1_t2_port_network_role_tag: - type: string - required: true - vm_flavor_name: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_1c1_scalling_instance_t1_port_0_network_role_tag: type: string required: true - port_1c1_t1_port_related_networks: + port_1c1_scalling_instance_t2_port_0_related_networks: type: list required: true entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_1c1_t1_port_ip_requirements: + port_1c1_scalling_instance_t1_port_0_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - vm_image_name: + type: string + vm_flavor_name: type: string required: true - compute_1c1_scalling_instance_name: + port_1c1_scalling_instance_t2_port_0_fixed_ips: type: list required: true entry_schema: - type: string - port_1c1_t1_port_name: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_1c1_scalling_instance_t1_port_0_ip_requirements: type: list required: true entry_schema: - type: string - port_1c1_t1_port_network: - type: list + type: org.openecomp.datatypes.network.IpRequirements + port_1c1_scalling_instance_t1_port_0_network_role: + type: string required: true - entry_schema: - type: string - port_1c1_t2_port_fixed_ips: - type: list + port_1c1_scalling_instance_t2_port_0_subnetpoolid: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_1c1_t2_port_network: - type: list + port_1c1_scalling_instance_t2_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: string - port_1c1_t1_port_fixed_ips: - type: list + vm_image_name: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_1c1_t1_port_vlan_requirements: + compute_1c1_scalling_instance_name: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_1c1_t2_port_ip_requirements: - type: list + type: string + port_1c1_scalling_instance_t2_port_0_network_role: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_1c1_t1_port_mac_requirements: + port_1c1_scalling_instance_t1_port_0_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true + port_1c1_scalling_instance_t1_port_0_subnetpoolid: + type: string + required: true + port_1c1_scalling_instance_t2_port_0_order: + type: integer + required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -98,82 +83,97 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_1c1_t2_port_network_role: - type: string - required: true - port_1c1_t2_port_order: + port_1c1_scalling_instance_t1_port_0_order: type: integer required: true - port_1c1_t2_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_1c1_scalling_instance_t2_port_0_vlan_requirements: + type: list required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_1c1_scalling_instance_t1_port_0_name: + type: list + required: true + entry_schema: + type: string compute_1c1_scalling_instance_availability_zone: type: list required: true entry_schema: type: string - port_1c1_t2_port_subnetpoolid: - type: string + port_1c1_scalling_instance_t2_port_0_ip_requirements: + type: list required: true - port_1c1_t2_port_name: + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_1c1_scalling_instance_t2_port_0_name: type: list required: true entry_schema: type: string + port_1c1_scalling_instance_t2_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_1c1_scalling_instance_t1_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true compute_1c1_scalling_instance_scheduler_hints: type: list required: true entry_schema: type: json - port_1c1_t2_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_1c1_t1_port_subnetpoolid: - type: string + port_1c1_scalling_instance_t1_port_0_vlan_requirements: + type: list required: true - port_1c1_t1_port_network_role_tag: + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_1c1_scalling_instance_t2_port_0_network_role_tag: type: string required: true - port_1c1_t1_port_network_role: - type: string + port_1c1_scalling_instance_t1_port_0_related_networks: + type: list required: true - port_1c1_t1_port_order: - type: integer + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_1c1_scalling_instance_t2_port_0_network: + type: list required: true + entry_schema: + type: string node_templates: - 1c1_scalling_instance_1c1_t1_port: + 1c1_scalling_instance_1c1_scalling_instance_t2_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_requirements: - get_input: port_1c1_t1_port_mac_requirements + get_input: port_1c1_scalling_instance_t2_port_0_mac_requirements order: - get_input: port_1c1_t1_port_order + get_input: port_1c1_scalling_instance_t2_port_0_order exCP_naming: - get_input: port_1c1_t1_port_exCP_naming + get_input: port_1c1_scalling_instance_t2_port_0_exCP_naming vlan_requirements: - get_input: port_1c1_t1_port_vlan_requirements + get_input: port_1c1_scalling_instance_t2_port_0_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_1c1_t1_port_ip_requirements + get_input: port_1c1_scalling_instance_t2_port_0_ip_requirements related_networks: - get_input: port_1c1_t1_port_related_networks + get_input: port_1c1_scalling_instance_t2_port_0_related_networks network_role_tag: - get_input: port_1c1_t1_port_network_role_tag + get_input: port_1c1_scalling_instance_t2_port_0_network_role_tag network_role: - get_input: port_1c1_t1_port_network_role + get_input: port_1c1_scalling_instance_t2_port_0_network_role fixed_ips: get_input: - - port_1c1_t1_port_fixed_ips + - port_1c1_scalling_instance_t2_port_0_fixed_ips - index_value subnetpoolid: - get_input: port_1c1_t1_port_subnetpoolid + get_input: port_1c1_scalling_instance_t2_port_0_subnetpoolid name: get_input: - - port_1c1_t1_port_name + - port_1c1_scalling_instance_t2_port_0_name - index_value network: get_input: - - port_1c1_t1_port_network + - port_1c1_scalling_instance_t2_port_0_network - index_value requirements: - binding: @@ -203,39 +203,39 @@ topology_template: get_input: - compute_1c1_scalling_instance_user_data_format - index_value - 1c1_scalling_instance_1c1_t2_port: + 1c1_scalling_instance_1c1_scalling_instance_t1_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_requirements: - get_input: port_1c1_t2_port_mac_requirements + get_input: port_1c1_scalling_instance_t1_port_0_mac_requirements order: - get_input: port_1c1_t2_port_order + get_input: port_1c1_scalling_instance_t1_port_0_order exCP_naming: - get_input: port_1c1_t2_port_exCP_naming + get_input: port_1c1_scalling_instance_t1_port_0_exCP_naming vlan_requirements: - get_input: port_1c1_t2_port_vlan_requirements + get_input: port_1c1_scalling_instance_t1_port_0_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_1c1_t2_port_ip_requirements + get_input: port_1c1_scalling_instance_t1_port_0_ip_requirements related_networks: - get_input: port_1c1_t2_port_related_networks + get_input: port_1c1_scalling_instance_t1_port_0_related_networks network_role_tag: - get_input: port_1c1_t2_port_network_role_tag + get_input: port_1c1_scalling_instance_t1_port_0_network_role_tag network_role: - get_input: port_1c1_t2_port_network_role + get_input: port_1c1_scalling_instance_t1_port_0_network_role fixed_ips: get_input: - - port_1c1_t2_port_fixed_ips + - port_1c1_scalling_instance_t1_port_0_fixed_ips - index_value subnetpoolid: - get_input: port_1c1_t2_port_subnetpoolid + get_input: port_1c1_scalling_instance_t1_port_0_subnetpoolid name: get_input: - - port_1c1_t2_port_name + - port_1c1_scalling_instance_t1_port_0_name - index_value network: get_input: - - port_1c1_t2_port_network + - port_1c1_scalling_instance_t1_port_0_network - index_value requirements: - binding: @@ -249,11 +249,11 @@ topology_template: get_attribute: - 1c1_scalling_instance - instance_name - 1c1_scalling_instance_1c1_t2_port_tenant_id: + 1c1_scalling_instance_1c1_scalling_instance_t2_port_0_tenant_id: type: string value: get_attribute: - - 1c1_scalling_instance_1c1_t2_port + - 1c1_scalling_instance_1c1_scalling_instance_t2_port_0 - tenant_id substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.1c1_scalling_instance @@ -273,114 +273,111 @@ topology_template: disk.read.bytes_1c1_scalling_instance: - 1c1_scalling_instance - disk.read.bytes - network.outgoing.packets.rate_1c1_scalling_instance_1c1_t2_port: - - 1c1_scalling_instance_1c1_t2_port - - network.outgoing.packets.rate - network.incoming.packets.rate_1c1_scalling_instance_1c1_t2_port: - - 1c1_scalling_instance_1c1_t2_port - - network.incoming.packets.rate + attachment_1c1_scalling_instance_1c1_scalling_instance_t2_port_0: + - 1c1_scalling_instance_1c1_scalling_instance_t2_port_0 + - attachment + binding_1c1_scalling_instance_1c1_scalling_instance_t1_port_0: + - 1c1_scalling_instance_1c1_scalling_instance_t1_port_0 + - binding + binding_1c1_scalling_instance_1c1_scalling_instance_t2_port_0: + - 1c1_scalling_instance_1c1_scalling_instance_t2_port_0 + - binding disk.usage_1c1_scalling_instance: - 1c1_scalling_instance - disk.usage + forwarder_1c1_scalling_instance_1c1_scalling_instance_t2_port_0: + - 1c1_scalling_instance_1c1_scalling_instance_t2_port_0 + - forwarder memory.resident_1c1_scalling_instance: - 1c1_scalling_instance - memory.resident - network.incoming.bytes.rate_1c1_scalling_instance_1c1_t2_port: - - 1c1_scalling_instance_1c1_t2_port - - network.incoming.bytes.rate cpu_1c1_scalling_instance: - 1c1_scalling_instance - cpu - forwarder_1c1_scalling_instance_1c1_t2_port: - - 1c1_scalling_instance_1c1_t2_port + forwarder_1c1_scalling_instance_1c1_scalling_instance_t1_port_0: + - 1c1_scalling_instance_1c1_scalling_instance_t1_port_0 - forwarder disk.write.bytes_1c1_scalling_instance: - 1c1_scalling_instance - disk.write.bytes - network.incoming.packets.rate_1c1_scalling_instance_1c1_t1_port: - - 1c1_scalling_instance_1c1_t1_port - - network.incoming.packets.rate - network.incoming.bytes_1c1_scalling_instance_1c1_t1_port: - - 1c1_scalling_instance_1c1_t1_port - - network.incoming.bytes disk.write.bytes.rate_1c1_scalling_instance: - 1c1_scalling_instance - disk.write.bytes.rate disk.device.allocation_1c1_scalling_instance: - 1c1_scalling_instance - disk.device.allocation - network.incoming.bytes.rate_1c1_scalling_instance_1c1_t1_port: - - 1c1_scalling_instance_1c1_t1_port - - network.incoming.bytes.rate + network.outgoing.bytes.rate_1c1_scalling_instance_1c1_scalling_instance_t1_port_0: + - 1c1_scalling_instance_1c1_scalling_instance_t1_port_0 + - network.outgoing.bytes.rate feature_1c1_scalling_instance: - 1c1_scalling_instance - feature + network.outgoing.bytes.rate_1c1_scalling_instance_1c1_scalling_instance_t2_port_0: + - 1c1_scalling_instance_1c1_scalling_instance_t2_port_0 + - network.outgoing.bytes.rate disk.device.write.requests.rate_1c1_scalling_instance: - 1c1_scalling_instance - disk.device.write.requests.rate - forwarder_1c1_scalling_instance_1c1_t1_port: - - 1c1_scalling_instance_1c1_t1_port - - forwarder disk.read.bytes.rate_1c1_scalling_instance: - 1c1_scalling_instance - disk.read.bytes.rate - network.outpoing.packets_1c1_scalling_instance_1c1_t2_port: - - 1c1_scalling_instance_1c1_t2_port - - network.outpoing.packets scalable_1c1_scalling_instance: - 1c1_scalling_instance - scalable disk.device.read.bytes_1c1_scalling_instance: - 1c1_scalling_instance - disk.device.read.bytes - binding_1c1_scalling_instance_1c1_t2_port: - - 1c1_scalling_instance_1c1_t2_port - - binding disk.device.write.bytes_1c1_scalling_instance: - 1c1_scalling_instance - disk.device.write.bytes disk.read.requests_1c1_scalling_instance: - 1c1_scalling_instance - disk.read.requests - network.incoming.packets_1c1_scalling_instance_1c1_t2_port: - - 1c1_scalling_instance_1c1_t2_port - - network.incoming.packets vcpus_1c1_scalling_instance: - 1c1_scalling_instance - vcpus - network.outgoing.bytes_1c1_scalling_instance_1c1_t1_port: - - 1c1_scalling_instance_1c1_t1_port - - network.outgoing.bytes + network.incoming.packets_1c1_scalling_instance_1c1_scalling_instance_t2_port_0: + - 1c1_scalling_instance_1c1_scalling_instance_t2_port_0 + - network.incoming.packets host_1c1_scalling_instance: - 1c1_scalling_instance - host + network.outgoing.packets.rate_1c1_scalling_instance_1c1_scalling_instance_t1_port_0: + - 1c1_scalling_instance_1c1_scalling_instance_t1_port_0 + - network.outgoing.packets.rate disk.write.requests_1c1_scalling_instance: - 1c1_scalling_instance - disk.write.requests - feature_1c1_scalling_instance_1c1_t1_port: - - 1c1_scalling_instance_1c1_t1_port + network.incoming.packets.rate_1c1_scalling_instance_1c1_scalling_instance_t1_port_0: + - 1c1_scalling_instance_1c1_scalling_instance_t1_port_0 + - network.incoming.packets.rate + feature_1c1_scalling_instance_1c1_scalling_instance_t1_port_0: + - 1c1_scalling_instance_1c1_scalling_instance_t1_port_0 - feature - binding_1c1_scalling_instance_1c1_t1_port: - - 1c1_scalling_instance_1c1_t1_port - - binding + network.outpoing.packets_1c1_scalling_instance_1c1_scalling_instance_t2_port_0: + - 1c1_scalling_instance_1c1_scalling_instance_t2_port_0 + - network.outpoing.packets disk.device.read.requests.rate_1c1_scalling_instance: - 1c1_scalling_instance - disk.device.read.requests.rate - attachment_1c1_scalling_instance_1c1_t2_port: - - 1c1_scalling_instance_1c1_t2_port - - attachment disk.device.read.bytes.rate_1c1_scalling_instance: - 1c1_scalling_instance - disk.device.read.bytes.rate - network.outgoing.packets.rate_1c1_scalling_instance_1c1_t1_port: - - 1c1_scalling_instance_1c1_t1_port - - network.outgoing.packets.rate + network.incoming.bytes.rate_1c1_scalling_instance_1c1_scalling_instance_t1_port_0: + - 1c1_scalling_instance_1c1_scalling_instance_t1_port_0 + - network.incoming.bytes.rate + attachment_1c1_scalling_instance_1c1_scalling_instance_t1_port_0: + - 1c1_scalling_instance_1c1_scalling_instance_t1_port_0 + - attachment disk.device.iops_1c1_scalling_instance: - 1c1_scalling_instance - disk.device.iops disk.device.capacity_1c1_scalling_instance: - 1c1_scalling_instance - disk.device.capacity + network.incoming.bytes_1c1_scalling_instance_1c1_scalling_instance_t2_port_0: + - 1c1_scalling_instance_1c1_scalling_instance_t2_port_0 + - network.incoming.bytes disk.capacity_1c1_scalling_instance: - 1c1_scalling_instance - disk.capacity @@ -390,21 +387,24 @@ topology_template: cpu_util_1c1_scalling_instance: - 1c1_scalling_instance - cpu_util + network.outgoing.bytes_1c1_scalling_instance_1c1_scalling_instance_t2_port_0: + - 1c1_scalling_instance_1c1_scalling_instance_t2_port_0 + - network.outgoing.bytes disk.device.read.requests_1c1_scalling_instance: - 1c1_scalling_instance - disk.device.read.requests disk.device.write.bytes.rate_1c1_scalling_instance: - 1c1_scalling_instance - disk.device.write.bytes.rate + network.outgoing.bytes_1c1_scalling_instance_1c1_scalling_instance_t1_port_0: + - 1c1_scalling_instance_1c1_scalling_instance_t1_port_0 + - network.outgoing.bytes + network.incoming.packets_1c1_scalling_instance_1c1_scalling_instance_t1_port_0: + - 1c1_scalling_instance_1c1_scalling_instance_t1_port_0 + - network.incoming.packets disk.device.write.requests_1c1_scalling_instance: - 1c1_scalling_instance - disk.device.write.requests - network.outgoing.bytes.rate_1c1_scalling_instance_1c1_t1_port: - - 1c1_scalling_instance_1c1_t1_port - - network.outgoing.bytes.rate - network.outgoing.bytes_1c1_scalling_instance_1c1_t2_port: - - 1c1_scalling_instance_1c1_t2_port - - network.outgoing.bytes disk.latency_1c1_scalling_instance: - 1c1_scalling_instance - disk.latency @@ -414,42 +414,42 @@ topology_template: disk.device.usage_1c1_scalling_instance: - 1c1_scalling_instance - disk.device.usage - network.incoming.packets_1c1_scalling_instance_1c1_t1_port: - - 1c1_scalling_instance_1c1_t1_port - - network.incoming.packets disk.allocation_1c1_scalling_instance: - 1c1_scalling_instance - disk.allocation - feature_1c1_scalling_instance_1c1_t2_port: - - 1c1_scalling_instance_1c1_t2_port - - feature memory.usage_1c1_scalling_instance: - 1c1_scalling_instance - memory.usage - network.incoming.bytes_1c1_scalling_instance_1c1_t2_port: - - 1c1_scalling_instance_1c1_t2_port - - network.incoming.bytes - network.outgoing.bytes.rate_1c1_scalling_instance_1c1_t2_port: - - 1c1_scalling_instance_1c1_t2_port - - network.outgoing.bytes.rate os_1c1_scalling_instance: - 1c1_scalling_instance - os disk.iops_1c1_scalling_instance: - 1c1_scalling_instance - disk.iops - network.outpoing.packets_1c1_scalling_instance_1c1_t1_port: - - 1c1_scalling_instance_1c1_t1_port + network.outgoing.packets.rate_1c1_scalling_instance_1c1_scalling_instance_t2_port_0: + - 1c1_scalling_instance_1c1_scalling_instance_t2_port_0 + - network.outgoing.packets.rate + network.outpoing.packets_1c1_scalling_instance_1c1_scalling_instance_t1_port_0: + - 1c1_scalling_instance_1c1_scalling_instance_t1_port_0 - network.outpoing.packets - attachment_1c1_scalling_instance_1c1_t1_port: - - 1c1_scalling_instance_1c1_t1_port - - attachment cpu.delta_1c1_scalling_instance: - 1c1_scalling_instance - cpu.delta memory_1c1_scalling_instance: - 1c1_scalling_instance - memory + feature_1c1_scalling_instance_1c1_scalling_instance_t2_port_0: + - 1c1_scalling_instance_1c1_scalling_instance_t2_port_0 + - feature + network.incoming.bytes.rate_1c1_scalling_instance_1c1_scalling_instance_t2_port_0: + - 1c1_scalling_instance_1c1_scalling_instance_t2_port_0 + - network.incoming.bytes.rate + network.incoming.bytes_1c1_scalling_instance_1c1_scalling_instance_t1_port_0: + - 1c1_scalling_instance_1c1_scalling_instance_t1_port_0 + - network.incoming.bytes + network.incoming.packets.rate_1c1_scalling_instance_1c1_scalling_instance_t2_port_0: + - 1c1_scalling_instance_1c1_scalling_instance_t2_port_0 + - network.incoming.packets.rate instance_1c1_scalling_instance: - 1c1_scalling_instance - instance @@ -457,17 +457,17 @@ topology_template: dependency_1c1_scalling_instance: - 1c1_scalling_instance - dependency - link_1c1_scalling_instance_1c1_t1_port: - - 1c1_scalling_instance_1c1_t1_port - - link - dependency_1c1_scalling_instance_1c1_t2_port: - - 1c1_scalling_instance_1c1_t2_port + dependency_1c1_scalling_instance_1c1_scalling_instance_t1_port_0: + - 1c1_scalling_instance_1c1_scalling_instance_t1_port_0 - dependency - dependency_1c1_scalling_instance_1c1_t1_port: - - 1c1_scalling_instance_1c1_t1_port + dependency_1c1_scalling_instance_1c1_scalling_instance_t2_port_0: + - 1c1_scalling_instance_1c1_scalling_instance_t2_port_0 - dependency - link_1c1_scalling_instance_1c1_t2_port: - - 1c1_scalling_instance_1c1_t2_port + link_1c1_scalling_instance_1c1_scalling_instance_t2_port_0: + - 1c1_scalling_instance_1c1_scalling_instance_t2_port_0 + - link + link_1c1_scalling_instance_1c1_scalling_instance_t1_port_0: + - 1c1_scalling_instance_1c1_scalling_instance_t1_port_0 - link local_storage_1c1_scalling_instance: - 1c1_scalling_instance 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_1c2_catalog_instanceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c2_catalog_instanceServiceTemplate.yaml index ff4f00e722..07e9605032 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c2_catalog_instanceServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c2_catalog_instanceServiceTemplate.yaml @@ -11,69 +11,63 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_1c2_t2_port_order: - type: integer - required: true - compute_1c2_catalog_instance_availability_zone: + port_1c2_catalog_instance_t1_port_0_network: type: list required: true entry_schema: type: string - port_1c2_t2_port_subnetpoolid: - type: string + port_1c2_catalog_instance_t2_port_0_vlan_requirements: + type: list required: true - port_1c2_t1_port_related_networks: + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + compute_1c2_catalog_instance_availability_zone: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_1c2_t2_port_network_role: - type: string + type: string + port_1c2_catalog_instance_t1_port_0_ip_requirements: + type: list required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements vm_flavor_name: type: string required: true - port_1c2_t2_port_network_role_tag: + port_1c2_catalog_instance_t2_port_0_network_role_tag: type: string required: true - port_1c2_t1_port_vlan_requirements: + port_1c2_catalog_instance_t2_port_0_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: string vm_image_name: type: string required: true - port_1c2_t2_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_1c2_catalog_instance_t1_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_1c2_t1_port_order: - type: integer + port_1c2_catalog_instance_t2_port_0_network_role: + type: string required: true - port_1c2_t1_port_subnetpoolid: + port_1c2_catalog_instance_t1_port_0_subnetpoolid: type: string required: true - port_1c2_t2_port_ip_requirements: - type: list + port_1c2_catalog_instance_t2_port_0_order: + type: integer required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_1c2_t2_port_related_networks: + port_1c2_catalog_instance_t2_port_0_related_networks: type: list required: true entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_1c2_t1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_1c2_t1_port_network_role: - type: string + port_1c2_catalog_instance_t1_port_0_order: + type: integer required: true - port_1c2_t2_port_network: - type: list + port_1c2_catalog_instance_t2_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: string index_value: type: integer description: Index value of this substitution service template runtime instance @@ -86,35 +80,41 @@ topology_template: required: true entry_schema: type: string - port_1c2_t1_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_1c2_t1_port_network: + port_1c2_catalog_instance_t2_port_0_ip_requirements: type: list required: true entry_schema: - type: string - port_1c2_t2_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_1c2_t2_port_vlan_requirements: + type: org.openecomp.datatypes.network.IpRequirements + port_1c2_catalog_instance_t1_port_0_related_networks: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_1c2_catalog_instance_t2_port_0_subnetpoolid: + type: string + required: true + port_1c2_catalog_instance_t1_port_0_network_role: + type: string + required: true + port_1c2_catalog_instance_t1_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true compute_1c2_catalog_instance_user_data_format: type: list required: true entry_schema: type: string - port_1c2_t1_port_network_role_tag: - type: string - required: true - port_1c2_t1_port_ip_requirements: + port_1c2_catalog_instance_t1_port_0_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: org.openecomp.datatypes.network.VlanRequirements + port_1c2_catalog_instance_t2_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_1c2_catalog_instance_t1_port_0_network_role_tag: + type: string + required: true compute_1c2_catalog_instance_scheduler_hints: type: list required: true @@ -144,62 +144,62 @@ topology_template: get_input: - compute_1c2_catalog_instance_user_data_format - index_value - 1c2_catalog_instance_1c2_t2_port: + 1c2_catalog_instance_1c2_catalog_instance_t1_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_1c2_t2_port_exCP_naming + get_input: port_1c2_catalog_instance_t1_port_0_exCP_naming vlan_requirements: - get_input: port_1c2_t2_port_vlan_requirements + get_input: port_1c2_catalog_instance_t1_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_1c2_t2_port_related_networks + get_input: port_1c2_catalog_instance_t1_port_0_related_networks ip_requirements: - get_input: port_1c2_t2_port_ip_requirements + get_input: port_1c2_catalog_instance_t1_port_0_ip_requirements network_role_tag: - get_input: port_1c2_t2_port_network_role_tag + get_input: port_1c2_catalog_instance_t1_port_0_network_role_tag mac_requirements: - get_input: port_1c2_t2_port_mac_requirements + get_input: port_1c2_catalog_instance_t1_port_0_mac_requirements order: - get_input: port_1c2_t2_port_order + get_input: port_1c2_catalog_instance_t1_port_0_order network_role: - get_input: port_1c2_t2_port_network_role + get_input: port_1c2_catalog_instance_t1_port_0_network_role subnetpoolid: - get_input: port_1c2_t2_port_subnetpoolid + get_input: port_1c2_catalog_instance_t1_port_0_subnetpoolid network: get_input: - - port_1c2_t2_port_network + - port_1c2_catalog_instance_t1_port_0_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: 1c2_catalog_instance relationship: tosca.relationships.network.BindsTo - 1c2_catalog_instance_1c2_t1_port: + 1c2_catalog_instance_1c2_catalog_instance_t2_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_1c2_t1_port_exCP_naming + get_input: port_1c2_catalog_instance_t2_port_0_exCP_naming vlan_requirements: - get_input: port_1c2_t1_port_vlan_requirements + get_input: port_1c2_catalog_instance_t2_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_1c2_t1_port_related_networks + get_input: port_1c2_catalog_instance_t2_port_0_related_networks ip_requirements: - get_input: port_1c2_t1_port_ip_requirements + get_input: port_1c2_catalog_instance_t2_port_0_ip_requirements network_role_tag: - get_input: port_1c2_t1_port_network_role_tag + get_input: port_1c2_catalog_instance_t2_port_0_network_role_tag mac_requirements: - get_input: port_1c2_t1_port_mac_requirements + get_input: port_1c2_catalog_instance_t2_port_0_mac_requirements order: - get_input: port_1c2_t1_port_order + get_input: port_1c2_catalog_instance_t2_port_0_order network_role: - get_input: port_1c2_t1_port_network_role + get_input: port_1c2_catalog_instance_t2_port_0_network_role subnetpoolid: - get_input: port_1c2_t1_port_subnetpoolid + get_input: port_1c2_catalog_instance_t2_port_0_subnetpoolid network: get_input: - - port_1c2_t1_port_network + - port_1c2_catalog_instance_t2_port_0_network - index_value requirements: - binding: @@ -213,11 +213,11 @@ topology_template: get_attribute: - 1c2_catalog_instance - instance_name - 1c2_catalog_instance_1c2_t1_port_tenant_id: + 1c2_catalog_instance_1c2_catalog_instance_t1_port_0_tenant_id: type: string value: get_attribute: - - 1c2_catalog_instance_1c2_t1_port + - 1c2_catalog_instance_1c2_catalog_instance_t1_port_0 - tenant_id substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.1c2_catalog_instance @@ -225,57 +225,33 @@ topology_template: disk.device.capacity_1c2_catalog_instance: - 1c2_catalog_instance - disk.device.capacity - network.incoming.packets.rate_1c2_catalog_instance_1c2_t2_port: - - 1c2_catalog_instance_1c2_t2_port - - network.incoming.packets.rate disk.read.bytes.rate_1c2_catalog_instance: - 1c2_catalog_instance - disk.read.bytes.rate memory.usage_1c2_catalog_instance: - 1c2_catalog_instance - memory.usage - network.outpoing.packets_1c2_catalog_instance_1c2_t1_port: - - 1c2_catalog_instance_1c2_t1_port - - network.outpoing.packets + attachment_1c2_catalog_instance_1c2_catalog_instance_t1_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_t1_port_0 + - attachment disk.write.bytes.rate_1c2_catalog_instance: - 1c2_catalog_instance - disk.write.bytes.rate - network.incoming.bytes.rate_1c2_catalog_instance_1c2_t2_port: - - 1c2_catalog_instance_1c2_t2_port - - network.incoming.bytes.rate - binding_1c2_catalog_instance_1c2_t2_port: - - 1c2_catalog_instance_1c2_t2_port - - binding - network.incoming.packets_1c2_catalog_instance_1c2_t1_port: - - 1c2_catalog_instance_1c2_t1_port - - network.incoming.packets cpu_util_1c2_catalog_instance: - 1c2_catalog_instance - cpu_util - network.outpoing.packets_1c2_catalog_instance_1c2_t2_port: - - 1c2_catalog_instance_1c2_t2_port - - network.outpoing.packets - feature_1c2_catalog_instance_1c2_t1_port: - - 1c2_catalog_instance_1c2_t1_port - - feature - attachment_1c2_catalog_instance_1c2_t1_port: - - 1c2_catalog_instance_1c2_t1_port - - attachment - network.incoming.bytes_1c2_catalog_instance_1c2_t2_port: - - 1c2_catalog_instance_1c2_t2_port - - network.incoming.bytes + network.incoming.bytes.rate_1c2_catalog_instance_1c2_catalog_instance_t2_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_t2_port_0 + - network.incoming.bytes.rate cpu_1c2_catalog_instance: - 1c2_catalog_instance - cpu disk.read.requests_1c2_catalog_instance: - 1c2_catalog_instance - disk.read.requests - network.incoming.bytes.rate_1c2_catalog_instance_1c2_t1_port: - - 1c2_catalog_instance_1c2_t1_port - - network.incoming.bytes.rate - binding_1c2_catalog_instance_1c2_t1_port: - - 1c2_catalog_instance_1c2_t1_port - - binding + network.outpoing.packets_1c2_catalog_instance_1c2_catalog_instance_t2_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_t2_port_0 + - network.outpoing.packets disk.ephemeral.size_1c2_catalog_instance: - 1c2_catalog_instance - disk.ephemeral.size @@ -285,63 +261,75 @@ topology_template: memory.resident_1c2_catalog_instance: - 1c2_catalog_instance - memory.resident + network.outpoing.packets_1c2_catalog_instance_1c2_catalog_instance_t1_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_t1_port_0 + - network.outpoing.packets disk.device.write.requests.rate_1c2_catalog_instance: - 1c2_catalog_instance - disk.device.write.requests.rate - network.incoming.bytes_1c2_catalog_instance_1c2_t1_port: - - 1c2_catalog_instance_1c2_t1_port - - network.incoming.bytes os_1c2_catalog_instance: - 1c2_catalog_instance - os disk.device.iops_1c2_catalog_instance: - 1c2_catalog_instance - disk.device.iops + binding_1c2_catalog_instance_1c2_catalog_instance_t1_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_t1_port_0 + - binding + feature_1c2_catalog_instance_1c2_catalog_instance_t1_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_t1_port_0 + - feature + network.outgoing.bytes_1c2_catalog_instance_1c2_catalog_instance_t1_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_t1_port_0 + - network.outgoing.bytes + network.outgoing.bytes.rate_1c2_catalog_instance_1c2_catalog_instance_t1_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_t1_port_0 + - network.outgoing.bytes.rate + network.outgoing.packets.rate_1c2_catalog_instance_1c2_catalog_instance_t1_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_t1_port_0 + - network.outgoing.packets.rate + network.incoming.packets_1c2_catalog_instance_1c2_catalog_instance_t1_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_t1_port_0 + - network.incoming.packets endpoint_1c2_catalog_instance: - 1c2_catalog_instance - endpoint disk.allocation_1c2_catalog_instance: - 1c2_catalog_instance - disk.allocation + network.incoming.bytes.rate_1c2_catalog_instance_1c2_catalog_instance_t1_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_t1_port_0 + - network.incoming.bytes.rate disk.latency_1c2_catalog_instance: - 1c2_catalog_instance - disk.latency - network.outgoing.bytes.rate_1c2_catalog_instance_1c2_t1_port: - - 1c2_catalog_instance_1c2_t1_port - - network.outgoing.bytes.rate - network.outgoing.bytes_1c2_catalog_instance_1c2_t1_port: - - 1c2_catalog_instance_1c2_t1_port - - network.outgoing.bytes + network.incoming.bytes_1c2_catalog_instance_1c2_catalog_instance_t1_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_t1_port_0 + - network.incoming.bytes disk.iops_1c2_catalog_instance: - 1c2_catalog_instance - disk.iops - network.outgoing.packets.rate_1c2_catalog_instance_1c2_t2_port: - - 1c2_catalog_instance_1c2_t2_port - - network.outgoing.packets.rate - network.incoming.packets_1c2_catalog_instance_1c2_t2_port: - - 1c2_catalog_instance_1c2_t2_port - - network.incoming.packets + forwarder_1c2_catalog_instance_1c2_catalog_instance_t1_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_t1_port_0 + - forwarder + attachment_1c2_catalog_instance_1c2_catalog_instance_t2_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_t2_port_0 + - attachment vcpus_1c2_catalog_instance: - 1c2_catalog_instance - vcpus disk.device.latency_1c2_catalog_instance: - 1c2_catalog_instance - disk.device.latency - attachment_1c2_catalog_instance_1c2_t2_port: - - 1c2_catalog_instance_1c2_t2_port - - attachment - forwarder_1c2_catalog_instance_1c2_t1_port: - - 1c2_catalog_instance_1c2_t1_port - - forwarder - network.outgoing.packets.rate_1c2_catalog_instance_1c2_t1_port: - - 1c2_catalog_instance_1c2_t1_port - - network.outgoing.packets.rate disk.read.bytes_1c2_catalog_instance: - 1c2_catalog_instance - disk.read.bytes instance_1c2_catalog_instance: - 1c2_catalog_instance - instance + network.incoming.packets.rate_1c2_catalog_instance_1c2_catalog_instance_t2_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_t2_port_0 + - network.incoming.packets.rate disk.capacity_1c2_catalog_instance: - 1c2_catalog_instance - disk.capacity @@ -351,18 +339,12 @@ topology_template: disk.device.read.bytes.rate_1c2_catalog_instance: - 1c2_catalog_instance - disk.device.read.bytes.rate - forwarder_1c2_catalog_instance_1c2_t2_port: - - 1c2_catalog_instance_1c2_t2_port - - forwarder disk.device.allocation_1c2_catalog_instance: - 1c2_catalog_instance - disk.device.allocation disk.device.read.bytes_1c2_catalog_instance: - 1c2_catalog_instance - disk.device.read.bytes - network.outgoing.bytes.rate_1c2_catalog_instance_1c2_t2_port: - - 1c2_catalog_instance_1c2_t2_port - - network.outgoing.bytes.rate disk.device.read.requests_1c2_catalog_instance: - 1c2_catalog_instance - disk.device.read.requests @@ -384,18 +366,30 @@ topology_template: disk.device.usage_1c2_catalog_instance: - 1c2_catalog_instance - disk.device.usage - network.outgoing.bytes_1c2_catalog_instance_1c2_t2_port: - - 1c2_catalog_instance_1c2_t2_port + binding_1c2_catalog_instance_1c2_catalog_instance_t2_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_t2_port_0 + - binding + network.incoming.packets_1c2_catalog_instance_1c2_catalog_instance_t2_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_t2_port_0 + - network.incoming.packets + feature_1c2_catalog_instance_1c2_catalog_instance_t2_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_t2_port_0 + - feature + network.outgoing.bytes_1c2_catalog_instance_1c2_catalog_instance_t2_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_t2_port_0 - network.outgoing.bytes + network.outgoing.bytes.rate_1c2_catalog_instance_1c2_catalog_instance_t2_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_t2_port_0 + - network.outgoing.bytes.rate disk.usage_1c2_catalog_instance: - 1c2_catalog_instance - disk.usage + network.outgoing.packets.rate_1c2_catalog_instance_1c2_catalog_instance_t2_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_t2_port_0 + - network.outgoing.packets.rate feature_1c2_catalog_instance: - 1c2_catalog_instance - feature - network.incoming.packets.rate_1c2_catalog_instance_1c2_t1_port: - - 1c2_catalog_instance_1c2_t1_port - - network.incoming.packets.rate memory_1c2_catalog_instance: - 1c2_catalog_instance - memory @@ -411,28 +405,34 @@ topology_template: cpu.delta_1c2_catalog_instance: - 1c2_catalog_instance - cpu.delta - feature_1c2_catalog_instance_1c2_t2_port: - - 1c2_catalog_instance_1c2_t2_port - - feature + forwarder_1c2_catalog_instance_1c2_catalog_instance_t2_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_t2_port_0 + - forwarder + network.incoming.packets.rate_1c2_catalog_instance_1c2_catalog_instance_t1_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_t1_port_0 + - network.incoming.packets.rate + network.incoming.bytes_1c2_catalog_instance_1c2_catalog_instance_t2_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_t2_port_0 + - network.incoming.bytes disk.device.read.requests.rate_1c2_catalog_instance: - 1c2_catalog_instance - disk.device.read.requests.rate requirements: - link_1c2_catalog_instance_1c2_t1_port: - - 1c2_catalog_instance_1c2_t1_port - - link dependency_1c2_catalog_instance: - 1c2_catalog_instance - dependency local_storage_1c2_catalog_instance: - 1c2_catalog_instance - local_storage - dependency_1c2_catalog_instance_1c2_t1_port: - - 1c2_catalog_instance_1c2_t1_port + dependency_1c2_catalog_instance_1c2_catalog_instance_t2_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_t2_port_0 - dependency - dependency_1c2_catalog_instance_1c2_t2_port: - - 1c2_catalog_instance_1c2_t2_port + link_1c2_catalog_instance_1c2_catalog_instance_t2_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_t2_port_0 + - link + dependency_1c2_catalog_instance_1c2_catalog_instance_t1_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_t1_port_0 - dependency - link_1c2_catalog_instance_1c2_t2_port: - - 1c2_catalog_instance_1c2_t2_port + link_1c2_catalog_instance_1c2_catalog_instance_t1_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_t1_port_0 - link \ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_b_single_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_b_single_1bServiceTemplate.yaml index 8bf062f993..cd92a68dd2 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_b_single_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_b_single_1bServiceTemplate.yaml @@ -11,35 +11,45 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_1b_t1_port_order: - type: integer + port_b_single_1b_t1_port_0_network_role_tag: + type: string + required: true + port_b_single_1b_t1_port_0_related_networks: + type: list required: true - port_1b_t1_port_network_role: + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_b_single_1b_t2_port_0_subnetpoolid: type: string required: true - port_1b_t1_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_b_single_1b_t1_port_0_network_role: + type: string + required: true + port_b_single_1b_t2_port_0_network: + type: list required: true + entry_schema: + type: string vm_flavor_name: type: string required: true - port_1b_t2_port_related_networks: + port_b_single_1b_t1_port_0_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_1b_t1_port_ip_requirements: + type: org.openecomp.datatypes.network.VlanRequirements + port_b_single_1b_t2_port_0_related_networks: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_image_name: type: string required: true - port_1b_t2_port_network_role: - type: string + port_b_single_1b_t2_port_0_order: + type: integer required: true - port_1b_t2_port_order: + port_b_single_1b_t1_port_0_order: type: integer required: true compute_b_single_1b_user_data_format: @@ -47,28 +57,27 @@ topology_template: required: true entry_schema: type: string - port_1b_t2_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_1b_t2_port_network_role_tag: - type: string + port_b_single_1b_t2_port_0_vlan_requirements: + type: list required: true - port_1b_t2_port_subnetpoolid: + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_b_single_1b_t2_port_0_network_role: type: string required: true - port_1b_t1_port_related_networks: + port_b_single_1b_t1_port_0_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_1b_t2_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true + type: org.openecomp.datatypes.network.IpRequirements compute_b_single_1b_availability_zone: type: list required: true entry_schema: type: string + port_b_single_1b_t1_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -81,35 +90,26 @@ topology_template: required: true entry_schema: type: json - port_1b_t2_port_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_1b_t2_port_ip_requirements: - type: list + port_b_single_1b_t1_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_1b_t1_port_network_role_tag: + port_b_single_1b_t1_port_0_subnetpoolid: type: string required: true - port_1b_t1_port_subnetpoolid: + port_b_single_1b_t2_port_0_network_role_tag: type: string required: true - port_1b_t1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_1b_t2_port_network: + port_b_single_1b_t2_port_0_ip_requirements: type: list required: true entry_schema: - type: string - port_1b_t1_port_vlan_requirements: - type: list + type: org.openecomp.datatypes.network.IpRequirements + port_b_single_1b_t2_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_b_single_1b_t2_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements compute_b_single_1b_name: type: list required: true @@ -139,63 +139,63 @@ topology_template: get_input: - compute_b_single_1b_user_data_format - index_value - b_single_1b_1b_t1_port: + b_single_1b_b_single_1b_t2_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_1b_t1_port_exCP_naming + get_input: port_b_single_1b_t2_port_0_exCP_naming vlan_requirements: - get_input: port_1b_t1_port_vlan_requirements + get_input: port_b_single_1b_t2_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_1b_t1_port_related_networks + get_input: port_b_single_1b_t2_port_0_related_networks ip_requirements: - get_input: port_1b_t1_port_ip_requirements + get_input: port_b_single_1b_t2_port_0_ip_requirements network_role_tag: - get_input: port_1b_t1_port_network_role_tag + get_input: port_b_single_1b_t2_port_0_network_role_tag mac_requirements: - get_input: port_1b_t1_port_mac_requirements + get_input: port_b_single_1b_t2_port_0_mac_requirements order: - get_input: port_1b_t1_port_order + get_input: port_b_single_1b_t2_port_0_order network_role: - get_input: port_1b_t1_port_network_role + get_input: port_b_single_1b_t2_port_0_network_role subnetpoolid: - get_input: port_1b_t1_port_subnetpoolid + get_input: port_b_single_1b_t2_port_0_subnetpoolid network: - get_attribute: - - b_single_1b - - accessIPv6 + get_input: + - port_b_single_1b_t2_port_0_network + - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: b_single_1b relationship: tosca.relationships.network.BindsTo - b_single_1b_1b_t2_port: + b_single_1b_b_single_1b_t1_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_1b_t2_port_exCP_naming + get_input: port_b_single_1b_t1_port_0_exCP_naming vlan_requirements: - get_input: port_1b_t2_port_vlan_requirements + get_input: port_b_single_1b_t1_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_1b_t2_port_related_networks + get_input: port_b_single_1b_t1_port_0_related_networks ip_requirements: - get_input: port_1b_t2_port_ip_requirements + get_input: port_b_single_1b_t1_port_0_ip_requirements network_role_tag: - get_input: port_1b_t2_port_network_role_tag + get_input: port_b_single_1b_t1_port_0_network_role_tag mac_requirements: - get_input: port_1b_t2_port_mac_requirements + get_input: port_b_single_1b_t1_port_0_mac_requirements order: - get_input: port_1b_t2_port_order + get_input: port_b_single_1b_t1_port_0_order network_role: - get_input: port_1b_t2_port_network_role + get_input: port_b_single_1b_t1_port_0_network_role subnetpoolid: - get_input: port_1b_t2_port_subnetpoolid + get_input: port_b_single_1b_t1_port_0_subnetpoolid network: - get_input: - - port_1b_t2_port_network - - index_value + get_attribute: + - b_single_1b + - accessIPv6 requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -208,21 +208,15 @@ topology_template: get_attribute: - b_single_1b - instance_name - b_single_1b_1b_t1_port_tenant_id: + b_single_1b_b_single_1b_t1_port_0_tenant_id: type: string value: get_attribute: - - b_single_1b_1b_t1_port + - b_single_1b_b_single_1b_t1_port_0 - tenant_id substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.b_single_1b capabilities: - attachment_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port - - attachment - forwarder_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port - - forwarder endpoint_b_single_1b: - b_single_1b - endpoint @@ -232,15 +226,30 @@ topology_template: disk.iops_b_single_1b: - b_single_1b - disk.iops - network.incoming.bytes.rate_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port + network.incoming.bytes_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 + - network.incoming.bytes + network.incoming.packets.rate_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - network.incoming.packets.rate + network.incoming.bytes_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - network.incoming.bytes + binding_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 + - binding + feature_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - feature + feature_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 + - feature + network.incoming.bytes.rate_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 - network.incoming.bytes.rate - network.outgoing.bytes.rate_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port - - network.outgoing.bytes.rate - forwarder_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - forwarder + binding_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - binding scalable_b_single_1b: - b_single_1b - scalable @@ -250,24 +259,30 @@ topology_template: os_b_single_1b: - b_single_1b - os + forwarder_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - forwarder + forwarder_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 + - forwarder vcpus_b_single_1b: - b_single_1b - vcpus cpu_b_single_1b: - b_single_1b - cpu + network.incoming.bytes.rate_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - network.incoming.bytes.rate disk.device.read.requests.rate_b_single_1b: - b_single_1b - disk.device.read.requests.rate - network.incoming.packets.rate_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port + network.incoming.packets.rate_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 - network.incoming.packets.rate instance_b_single_1b: - b_single_1b - instance - network.incoming.bytes.rate_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - network.incoming.bytes.rate disk.read.bytes_b_single_1b: - b_single_1b - disk.read.bytes @@ -277,45 +292,36 @@ topology_template: disk.usage_b_single_1b: - b_single_1b - disk.usage - network.incoming.bytes_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - network.incoming.bytes disk.device.allocation_b_single_1b: - b_single_1b - disk.device.allocation - network.outgoing.packets.rate_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port + network.outgoing.packets.rate_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 - network.outgoing.packets.rate + network.outpoing.packets_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 + - network.outpoing.packets + network.outgoing.bytes_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - network.outgoing.bytes disk.device.capacity_b_single_1b: - b_single_1b - disk.device.capacity disk.latency_b_single_1b: - b_single_1b - disk.latency - network.incoming.packets_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port - - network.incoming.packets - network.incoming.packets.rate_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - network.incoming.packets.rate - attachment_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port + attachment_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 - attachment disk.device.write.requests_b_single_1b: - b_single_1b - disk.device.write.requests - binding_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port - - binding disk.ephemeral.size_b_single_1b: - b_single_1b - disk.ephemeral.size disk.write.requests.rate_b_single_1b: - b_single_1b - disk.write.requests.rate - network.outpoing.packets_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port - - network.outpoing.packets disk.device.iops_b_single_1b: - b_single_1b - disk.device.iops @@ -325,15 +331,18 @@ topology_template: memory.resident_b_single_1b: - b_single_1b - memory.resident + network.outgoing.bytes.rate_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - network.outgoing.bytes.rate disk.root.size_b_single_1b: - b_single_1b - disk.root.size - feature_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - feature - network.outgoing.bytes_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port - - network.outgoing.bytes + network.incoming.packets_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 + - network.incoming.packets + network.outgoing.bytes.rate_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 + - network.outgoing.bytes.rate disk.capacity_b_single_1b: - b_single_1b - disk.capacity @@ -352,45 +361,39 @@ topology_template: disk.write.requests_b_single_1b: - b_single_1b - disk.write.requests - network.outgoing.packets.rate_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - network.outgoing.packets.rate + network.incoming.packets_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - network.incoming.packets disk.device.usage_b_single_1b: - b_single_1b - disk.device.usage disk.read.bytes.rate_b_single_1b: - b_single_1b - disk.read.bytes.rate - network.outgoing.bytes_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - network.outgoing.bytes disk.device.read.requests_b_single_1b: - b_single_1b - disk.device.read.requests - network.incoming.packets_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - network.incoming.packets - binding_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - binding - network.outpoing.packets_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - network.outpoing.packets + attachment_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - attachment disk.device.write.requests.rate_b_single_1b: - b_single_1b - disk.device.write.requests.rate + network.outgoing.packets.rate_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 + - network.outgoing.packets.rate + network.outpoing.packets_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - network.outpoing.packets memory.usage_b_single_1b: - b_single_1b - memory.usage + network.outgoing.bytes_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 + - network.outgoing.bytes disk.write.bytes.rate_b_single_1b: - b_single_1b - disk.write.bytes.rate - network.incoming.bytes_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port - - network.incoming.bytes - network.outgoing.bytes.rate_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - network.outgoing.bytes.rate cpu.delta_b_single_1b: - b_single_1b - cpu.delta @@ -409,25 +412,22 @@ topology_template: binding_b_single_1b: - b_single_1b - binding - feature_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port - - feature requirements: local_storage_b_single_1b: - b_single_1b - local_storage - dependency_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - dependency + link_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 + - link dependency_b_single_1b: - b_single_1b - dependency - link_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port - - link - link_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - link - dependency_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port - - dependency \ No newline at end of file + dependency_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - dependency + dependency_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 + - dependency + link_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - link \ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_b_single_1b_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_b_single_1b_1ServiceTemplate.yaml index 1da7eb2953..1eb37ca97d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_b_single_1b_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_b_single_1b_1ServiceTemplate.yaml @@ -11,35 +11,45 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_1b_t1_port_order: - type: integer + port_b_single_1b_t1_port_0_network_role_tag: + type: string + required: true + port_b_single_1b_t1_port_0_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_b_single_1b_t2_port_0_subnetpoolid: + type: string required: true - port_1b_t1_port_network_role: + port_b_single_1b_t1_port_0_network_role: type: string required: true - port_1b_t1_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_b_single_1b_t2_port_0_network: + type: list required: true + entry_schema: + type: string vm_flavor_name: type: string required: true - port_1b_t2_port_related_networks: + port_b_single_1b_t1_port_0_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_1b_t1_port_ip_requirements: + type: org.openecomp.datatypes.network.VlanRequirements + port_b_single_1b_t2_port_0_related_networks: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_image_name: type: string required: true - port_1b_t2_port_network_role: - type: string + port_b_single_1b_t2_port_0_order: + type: integer required: true - port_1b_t2_port_order: + port_b_single_1b_t1_port_0_order: type: integer required: true compute_b_single_1b_user_data_format: @@ -47,28 +57,27 @@ topology_template: required: true entry_schema: type: string - port_1b_t2_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_1b_t2_port_network_role_tag: - type: string + port_b_single_1b_t2_port_0_vlan_requirements: + type: list required: true - port_1b_t2_port_subnetpoolid: + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_b_single_1b_t2_port_0_network_role: type: string required: true - port_1b_t1_port_related_networks: + port_b_single_1b_t1_port_0_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_1b_t2_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true + type: org.openecomp.datatypes.network.IpRequirements compute_b_single_1b_availability_zone: type: list required: true entry_schema: type: string + port_b_single_1b_t1_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -81,40 +90,31 @@ topology_template: required: true entry_schema: type: json - port_1b_t2_port_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_1b_t2_port_ip_requirements: - type: list + port_b_single_1b_t1_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_1b_t1_port_network_role_tag: + port_b_single_1b_t1_port_0_subnetpoolid: type: string required: true - port_1b_t1_port_subnetpoolid: + port_b_single_1b_t2_port_0_network_role_tag: type: string required: true - port_1b_t1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_1b_t2_port_network: + port_b_single_1b_t1_port_0_network: type: list required: true entry_schema: type: string - port_1b_t1_port_vlan_requirements: + port_b_single_1b_t2_port_0_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_1b_t1_port_network: - type: list + type: org.openecomp.datatypes.network.IpRequirements + port_b_single_1b_t2_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_b_single_1b_t2_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: string compute_b_single_1b_name: type: list required: true @@ -144,62 +144,62 @@ topology_template: get_input: - compute_b_single_1b_user_data_format - index_value - b_single_1b_1b_t1_port: + b_single_1b_b_single_1b_t2_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_1b_t1_port_exCP_naming + get_input: port_b_single_1b_t2_port_0_exCP_naming vlan_requirements: - get_input: port_1b_t1_port_vlan_requirements + get_input: port_b_single_1b_t2_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_1b_t1_port_related_networks + get_input: port_b_single_1b_t2_port_0_related_networks ip_requirements: - get_input: port_1b_t1_port_ip_requirements + get_input: port_b_single_1b_t2_port_0_ip_requirements network_role_tag: - get_input: port_1b_t1_port_network_role_tag + get_input: port_b_single_1b_t2_port_0_network_role_tag mac_requirements: - get_input: port_1b_t1_port_mac_requirements + get_input: port_b_single_1b_t2_port_0_mac_requirements order: - get_input: port_1b_t1_port_order + get_input: port_b_single_1b_t2_port_0_order network_role: - get_input: port_1b_t1_port_network_role + get_input: port_b_single_1b_t2_port_0_network_role subnetpoolid: - get_input: port_1b_t1_port_subnetpoolid + get_input: port_b_single_1b_t2_port_0_subnetpoolid network: get_input: - - port_1b_t1_port_network + - port_b_single_1b_t2_port_0_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: b_single_1b relationship: tosca.relationships.network.BindsTo - b_single_1b_1b_t2_port: + b_single_1b_b_single_1b_t1_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_1b_t2_port_exCP_naming + get_input: port_b_single_1b_t1_port_0_exCP_naming vlan_requirements: - get_input: port_1b_t2_port_vlan_requirements + get_input: port_b_single_1b_t1_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_1b_t2_port_related_networks + get_input: port_b_single_1b_t1_port_0_related_networks ip_requirements: - get_input: port_1b_t2_port_ip_requirements + get_input: port_b_single_1b_t1_port_0_ip_requirements network_role_tag: - get_input: port_1b_t2_port_network_role_tag + get_input: port_b_single_1b_t1_port_0_network_role_tag mac_requirements: - get_input: port_1b_t2_port_mac_requirements + get_input: port_b_single_1b_t1_port_0_mac_requirements order: - get_input: port_1b_t2_port_order + get_input: port_b_single_1b_t1_port_0_order network_role: - get_input: port_1b_t2_port_network_role + get_input: port_b_single_1b_t1_port_0_network_role subnetpoolid: - get_input: port_1b_t2_port_subnetpoolid + get_input: port_b_single_1b_t1_port_0_subnetpoolid network: get_input: - - port_1b_t2_port_network + - port_b_single_1b_t1_port_0_network - index_value requirements: - binding: @@ -213,21 +213,15 @@ topology_template: get_attribute: - b_single_1b - instance_name - b_single_1b_1b_t1_port_tenant_id: + b_single_1b_b_single_1b_t1_port_0_tenant_id: type: string value: get_attribute: - - b_single_1b_1b_t1_port + - b_single_1b_b_single_1b_t1_port_0 - tenant_id substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.b_single_1b_1 capabilities: - attachment_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port - - attachment - forwarder_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port - - forwarder endpoint_b_single_1b: - b_single_1b - endpoint @@ -237,15 +231,30 @@ topology_template: disk.iops_b_single_1b: - b_single_1b - disk.iops - network.incoming.bytes.rate_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port + network.incoming.bytes_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 + - network.incoming.bytes + network.incoming.packets.rate_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - network.incoming.packets.rate + network.incoming.bytes_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - network.incoming.bytes + binding_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 + - binding + feature_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - feature + feature_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 + - feature + network.incoming.bytes.rate_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 - network.incoming.bytes.rate - network.outgoing.bytes.rate_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port - - network.outgoing.bytes.rate - forwarder_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - forwarder + binding_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - binding scalable_b_single_1b: - b_single_1b - scalable @@ -255,24 +264,30 @@ topology_template: os_b_single_1b: - b_single_1b - os + forwarder_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - forwarder + forwarder_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 + - forwarder vcpus_b_single_1b: - b_single_1b - vcpus cpu_b_single_1b: - b_single_1b - cpu + network.incoming.bytes.rate_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - network.incoming.bytes.rate disk.device.read.requests.rate_b_single_1b: - b_single_1b - disk.device.read.requests.rate - network.incoming.packets.rate_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port + network.incoming.packets.rate_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 - network.incoming.packets.rate instance_b_single_1b: - b_single_1b - instance - network.incoming.bytes.rate_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - network.incoming.bytes.rate disk.read.bytes_b_single_1b: - b_single_1b - disk.read.bytes @@ -282,45 +297,36 @@ topology_template: disk.usage_b_single_1b: - b_single_1b - disk.usage - network.incoming.bytes_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - network.incoming.bytes disk.device.allocation_b_single_1b: - b_single_1b - disk.device.allocation - network.outgoing.packets.rate_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port + network.outgoing.packets.rate_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 - network.outgoing.packets.rate + network.outpoing.packets_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 + - network.outpoing.packets + network.outgoing.bytes_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - network.outgoing.bytes disk.device.capacity_b_single_1b: - b_single_1b - disk.device.capacity disk.latency_b_single_1b: - b_single_1b - disk.latency - network.incoming.packets_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port - - network.incoming.packets - network.incoming.packets.rate_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - network.incoming.packets.rate - attachment_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port + attachment_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 - attachment disk.device.write.requests_b_single_1b: - b_single_1b - disk.device.write.requests - binding_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port - - binding disk.ephemeral.size_b_single_1b: - b_single_1b - disk.ephemeral.size disk.write.requests.rate_b_single_1b: - b_single_1b - disk.write.requests.rate - network.outpoing.packets_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port - - network.outpoing.packets disk.device.iops_b_single_1b: - b_single_1b - disk.device.iops @@ -330,15 +336,18 @@ topology_template: memory.resident_b_single_1b: - b_single_1b - memory.resident + network.outgoing.bytes.rate_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - network.outgoing.bytes.rate disk.root.size_b_single_1b: - b_single_1b - disk.root.size - feature_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - feature - network.outgoing.bytes_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port - - network.outgoing.bytes + network.incoming.packets_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 + - network.incoming.packets + network.outgoing.bytes.rate_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 + - network.outgoing.bytes.rate disk.capacity_b_single_1b: - b_single_1b - disk.capacity @@ -357,45 +366,39 @@ topology_template: disk.write.requests_b_single_1b: - b_single_1b - disk.write.requests - network.outgoing.packets.rate_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - network.outgoing.packets.rate + network.incoming.packets_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - network.incoming.packets disk.device.usage_b_single_1b: - b_single_1b - disk.device.usage disk.read.bytes.rate_b_single_1b: - b_single_1b - disk.read.bytes.rate - network.outgoing.bytes_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - network.outgoing.bytes disk.device.read.requests_b_single_1b: - b_single_1b - disk.device.read.requests - network.incoming.packets_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - network.incoming.packets - binding_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - binding - network.outpoing.packets_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - network.outpoing.packets + attachment_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - attachment disk.device.write.requests.rate_b_single_1b: - b_single_1b - disk.device.write.requests.rate + network.outgoing.packets.rate_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 + - network.outgoing.packets.rate + network.outpoing.packets_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - network.outpoing.packets memory.usage_b_single_1b: - b_single_1b - memory.usage + network.outgoing.bytes_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 + - network.outgoing.bytes disk.write.bytes.rate_b_single_1b: - b_single_1b - disk.write.bytes.rate - network.incoming.bytes_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port - - network.incoming.bytes - network.outgoing.bytes.rate_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - network.outgoing.bytes.rate cpu.delta_b_single_1b: - b_single_1b - cpu.delta @@ -414,25 +417,22 @@ topology_template: binding_b_single_1b: - b_single_1b - binding - feature_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port - - feature requirements: local_storage_b_single_1b: - b_single_1b - local_storage - dependency_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - dependency + link_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 + - link dependency_b_single_1b: - b_single_1b - dependency - link_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port - - link - link_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - link - dependency_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port - - dependency \ No newline at end of file + dependency_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - dependency + dependency_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 + - dependency + link_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - link \ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_pcma_server_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_pcma_server_1ServiceTemplate.yaml index a149bdc39c..25ffdd165b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_pcma_server_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_pcma_server_1ServiceTemplate.yaml @@ -11,14 +11,14 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_pcm_port_0_network_role: - type: string - required: true port_pcm_port_1_related_networks: type: list required: true entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pcm_port_0_network_role: + type: string + required: true port_pcm_port_1_network_role_tag: type: string required: true @@ -65,10 +65,10 @@ topology_template: port_pcm_port_0_network_role_tag: type: string required: true - port_pcm_port_0_exCP_naming: + port_pcm_port_1_exCP_naming: type: org.openecomp.datatypes.Naming required: true - port_pcm_port_1_exCP_naming: + port_pcm_port_0_exCP_naming: type: org.openecomp.datatypes.Naming required: true port_pcm_port_1_network_role: @@ -79,16 +79,16 @@ topology_template: required: true entry_schema: type: string - port_pcm_port_0_ip_requirements: + port_pcm_port_1_security_groups: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pcm_port_1_security_groups: + type: json + port_pcm_port_0_ip_requirements: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements compute_pcma_server_config_drive: type: list required: true @@ -129,14 +129,14 @@ topology_template: required: true entry_schema: type: string - port_pcm_port_0_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true port_pcm_port_1_ip_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements + port_pcm_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true port_pcm_port_1_order: type: integer required: true 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 3398598b22..9394b15329 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 @@ -123,14 +123,14 @@ topology_template: port_pcm_port_0_network_role_tag: cps port_pcm_port_1_network: - get_input: oam_net_name + port_pcm_port_1_security_groups: + - - get_input: security_group_name port_pcm_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false - port_pcm_port_1_security_groups: - - - get_input: security_group_name compute_pcma_server_config_drive: - true compute_pcma_server_user_data_format: @@ -145,15 +145,15 @@ topology_template: get_input: oam_net_ip compute_pcma_server_name: - get_input: pcma_server_name - port_pcm_port_0_mac_requirements: - mac_count_required: - is_required: false port_pcm_port_1_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false + port_pcm_port_0_mac_requirements: + mac_count_required: + is_required: false service_template_filter: substitute_service_template: Nested_pcma_server_1ServiceTemplate.yaml count: 1 @@ -665,4 +665,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/in/hot-mog-0108-bs1271.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/in/hot-mog-0108-bs1271.yml index c063cfdd26..433dedea7b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/in/hot-mog-0108-bs1271.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/in/hot-mog-0108-bs1271.yml @@ -60,8 +60,8 @@ resources: flavor: {get_param: pd_flavor_name} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: 1a_t1_port_0} - - port: {get_resource: 1a_t2_port_0} + - port: {get_resource: a_single_1a_0_t1_port_0} + - port: {get_resource: a_single_1a_0_t2_port_0} user_data_format: RAW scheduler_hints: { group: { get_resource: BE_Affinity } } metadata: { connectivityTo1A : {get_attr : [2a_single_1A_2, instance_name]}, @@ -89,7 +89,7 @@ resources: flavor: {get_param: pd_flavor_name} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: 1a_t1_port_1} + - port: {get_resource: a_single_2a_0_t1_port_0} user_data_format: RAW scheduler_hints: { group: { get_resource: BE_Affinity } } metadata: { connectivityTo1A : {get_attr : [1a_single_1A_1, instance_name]}, @@ -110,15 +110,15 @@ resources: } - 1a_t1_port_0: + a_single_1a_0_t1_port_0: type: OS::Neutron::Port properties: network: {get_resource: a_single_1a_network} - 1a_t2_port_0: + a_single_1a_0_t2_port_0: type: OS::Neutron::Port properties: network: {get_param: ppds_net_name} - 1a_t1_port_1: + a_single_2a_0_t1_port_0: type: OS::Neutron::Port properties: network: {get_resource: a_single_1a_network} @@ -138,18 +138,18 @@ resources: flavor: {get_param: pd_flavor_name} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: 1b_t1_port_01} - - port: {get_resource: 1b_t2_port_01} + - port: {get_resource: b_single_1b_0_t1_port_0} + - port: {get_resource: b_single_1b_0_t2_port_0} user_data_format: RAW scheduler_hints: { group: { get_resource: BE_Affinity } } metadata: { connectivityTo1A_1 : {get_attr : [1a_single_1A_1, instance_name]}, connectivityTo1A_2 : {get_attr : [2a_single_1A_2, instance_name]}, connectivityTo1B01_2 : {get_attr : [1b01_single_1B_2, instance_name]}, connectivityTo1B02_2 : {get_attr : [1b02_single_1B_2, instance_name]}, - connectivityTo1C1_T1_01 : {get_attr : [1c1_t1_port_01, tenant_id]}, - connectivityTo1C1_T1_02 : {get_attr : [1c1_t1_port_02, tenant_id]}, - connectivityTo1C1_T1_11 : {get_attr : [1c1_t1_port_11, tenant_id]}, - connectivityTo1C1_T1_12 : {get_attr : [1c1_t1_port_12, tenant_id]}, + connectivityTo1C1_T1_01 : {get_attr : [1c11_scalling_instance_0_t1_port_0, tenant_id]}, + connectivityTo1C1_T1_02 : {get_attr : [1c11_scalling_instance_1_t1_port_0, tenant_id]}, + connectivityTo1C1_T1_11 : {get_attr : [1c12_scalling_instance_0_t1_port_0, tenant_id]}, + connectivityTo1C1_T1_12 : {get_attr : [1c12_scalling_instance_1_t1_port_0, tenant_id]}, connectivityTo1C2_1_1 : {get_attr : [1c201_catalog_instance_1C21, instance_name]}, connectivityTo1C2_2_1 : {get_attr : [2c202_catalog_instance_1C21, instance_name]}, connectivityTo1C2_1_2 : {get_attr : [1c201_catalog_instance_1C22, instance_name]}, @@ -160,12 +160,12 @@ resources: connectivityToNoUnifiedNested_2 : {get_attr : [nestedNoUnified_2, portId]} } - 1b_t1_port_01: + b_single_1b_0_t1_port_0: type: OS::Neutron::Port properties: network: {get_attr: [1b01_single_1B_1, accessIPv6]} - 1b_t2_port_01: + b_single_1b_0_t2_port_0: type: OS::Neutron::Port properties: network: {get_resource: b_single_1b_network_1} @@ -184,18 +184,18 @@ resources: flavor: {get_param: pd_flavor_name} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: 1b_t1_port_11} - - port: {get_resource: 1b_t2_port_11} + - port: {get_resource: b_single_1b_1_t1_port_0} + - port: {get_resource: b_single_1b_1_t2_port_0} user_data_format: RAW scheduler_hints: { group: { get_resource: BE_Affinity } } - 1b_t1_port_11: + b_single_1b_1_t1_port_0: type: OS::Neutron::Port properties: network: {get_param: oam_net_name} - value_specs: {get_attr: [1a_t1_port_0, tenant_id]} + value_specs: {get_attr: [a_single_1a_0_t1_port_0, tenant_id]} - 1b_t2_port_11: + b_single_1b_1_t2_port_0: type: OS::Neutron::Port properties: network: {get_resource: b_single_1b_network_1} @@ -208,18 +208,18 @@ resources: flavor: {get_param: pd_flavor_name} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: 1b_t1_port_02} - - port: {get_resource: 1b_t2_port_02} + - port: {get_resource: b_single_2b_0_t1_port_0} + - port: {get_resource: b_single_2b_0_t2_port_0} user_data_format: RAW scheduler_hints: { group: { get_resource: BE_Affinity } } metadata: { connectivityTo1A_1 : {get_attr : [1a_single_1A_1, instance_name]}, connectivityTo1A_2 : {get_attr : [2a_single_1A_2, instance_name]}, connectivityTo1B01_1 : {get_attr : [1b01_single_1B_1, instance_name]}, connectivityTo1B02_1 : {get_attr : [1b02_single_1B_1, instance_name]}, - connectivityTo1C1_T1_01 : {get_attr : [1c1_t1_port_01, tenant_id]}, - connectivityTo1C1_T1_02 : {get_attr : [1c1_t1_port_02, tenant_id]}, - connectivityTo1C1_T1_11 : {get_attr : [1c1_t1_port_11, tenant_id]}, - connectivityTo1C1_T1_12 : {get_attr : [1c1_t1_port_12, tenant_id]}, + connectivityTo1C1_T1_01 : {get_attr : [1c11_scalling_instance_0_t1_port_0, tenant_id]}, + connectivityTo1C1_T1_02 : {get_attr : [1c11_scalling_instance_1_t1_port_0, tenant_id]}, + connectivityTo1C1_T1_11 : {get_attr : [1c12_scalling_instance_0_t1_port_0, tenant_id]}, + connectivityTo1C1_T1_12 : {get_attr : [1c12_scalling_instance_1_t1_port_0, tenant_id]}, connectivityTo1C2_1_1 : {get_attr : [1c201_catalog_instance_1C21, instance_name]}, connectivityTo1C2_2_1 : {get_attr : [2c202_catalog_instance_1C21, instance_name]}, connectivityTo1C2_1_2 : {get_attr : [1c201_catalog_instance_1C22, instance_name]}, @@ -230,12 +230,12 @@ resources: connectivityToNoUnifiedNested_2 : {get_attr : [nestedNoUnified_2, portId]} } - 1b_t1_port_02: + b_single_2b_0_t1_port_0: type: OS::Neutron::Port properties: network: {get_attr: [1b01_single_1B_2, accessIPv6]} - 1b_t2_port_02: + b_single_2b_0_t2_port_0: type: OS::Neutron::Port properties: network: {get_resource: b_single_1b_network_2} @@ -254,18 +254,18 @@ resources: flavor: {get_param: pd_flavor_name} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: 1b_t1_port_12} - - port: {get_resource: 1b_t2_port_12} + - port: {get_resource: b_single_2b_1_t1_port_0} + - port: {get_resource: b_single_2b_1_t2_port_0} user_data_format: RAW scheduler_hints: { group: { get_resource: BE_Affinity } } - 1b_t1_port_12: + b_single_2b_1_t1_port_0: type: OS::Neutron::Port properties: network: {get_param: oam_net_name} - value_specs: {get_attr: [1a_t1_port_0, tenant_id]} + value_specs: {get_attr: [a_single_1a_0_t1_port_0, tenant_id]} - 1b_t2_port_12: + b_single_2b_1_t2_port_0: type: OS::Neutron::Port properties: network: {get_resource: b_single_1b_network_2} @@ -280,7 +280,7 @@ resources: flavor: {get_param: pd_flavor_name} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: 1c1_t1_port_01} + - port: {get_resource: 1c11_scalling_instance_0_t1_port_0} user_data_format: RAW1 scheduler_hints: { group: { get_resource: BE_Affinity } } metadata: { connectivityTo1A_1 : {get_attr : [1a_single_1A_1, instance_name]}, @@ -289,9 +289,9 @@ resources: connectivityTo1B02_1 : {get_attr : [1b02_single_1B_1, instance_name]}, connectivityTo1B01_2 : {get_attr : [1b01_single_1B_2, instance_name]}, connectivityTo1B02_2 : {get_attr : [1b02_single_1B_2, instance_name]}, - connectivityTo1C1_T1_02 : {get_attr : [1c1_t1_port_02, tenant_id]}, - connectivityTo1C1_T1_11 : {get_attr : [1c1_t1_port_11, tenant_id]}, - connectivityTo1C1_T1_12 : {get_attr : [1c1_t1_port_12, tenant_id]}, + connectivityTo1C1_T1_02 : {get_attr : [1c11_scalling_instance_1_t1_port_0, tenant_id]}, + connectivityTo1C1_T1_11 : {get_attr : [1c12_scalling_instance_0_t1_port_0, tenant_id]}, + connectivityTo1C1_T1_12 : {get_attr : [1c12_scalling_instance_1_t1_port_0, tenant_id]}, connectivityTo1C2_1_1 : {get_attr : [1c201_catalog_instance_1C21, instance_name]}, connectivityTo1C2_2_1 : {get_attr : [2c202_catalog_instance_1C21, instance_name]}, connectivityTo1C2_1_2 : {get_attr : [1c201_catalog_instance_1C22, instance_name]}, @@ -302,12 +302,12 @@ resources: connectivityToNoUnifiedNested_2 : {get_attr : [nestedNoUnified_2, portId]} } - 1c1_t1_port_01: + 1c11_scalling_instance_0_t1_port_0: type: OS::Neutron::Port properties: network: {get_resource: 1c1_scalling_instance_network} fixed_ips: [{"ip_address": {get_param: [myIPs, 1]}}] - name: 1c1_t1_port_01 + name: 1c11_scalling_instance_0_t1_port_0 1c1_t2_port_01: type: OS::Neutron::Port properties: @@ -329,7 +329,7 @@ resources: flavor: {get_param: pd_flavor_name} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: 1c1_t1_port_02} + - port: {get_resource: 1c11_scalling_instance_1_t1_port_0} user_data_format: RAW1 scheduler_hints: { group: { get_resource: BE_Affinity } } metadata: { connectivityTo1A_1 : {get_attr : [1a_single_1A_1, instance_name]}, @@ -338,9 +338,9 @@ resources: connectivityTo1B02_1 : {get_attr : [1b02_single_1B_1, instance_name]}, connectivityTo1B01_2 : {get_attr : [1b01_single_1B_2, instance_name]}, connectivityTo1B02_2 : {get_attr : [1b02_single_1B_2, instance_name]}, - connectivityTo1C1_T1_02 : {get_attr : [1c1_t1_port_02, tenant_id]}, - connectivityTo1C1_T1_11 : {get_attr : [1c1_t1_port_11, tenant_id]}, - connectivityTo1C1_T1_12 : {get_attr : [1c1_t1_port_12, tenant_id]}, + connectivityTo1C1_T1_02 : {get_attr : [1c11_scalling_instance_1_t1_port_0, tenant_id]}, + connectivityTo1C1_T1_11 : {get_attr : [1c12_scalling_instance_0_t1_port_0, tenant_id]}, + connectivityTo1C1_T1_12 : {get_attr : [1c12_scalling_instance_1_t1_port_0, tenant_id]}, connectivityTo1C2_1_1 : {get_attr : [1c201_catalog_instance_1C21, instance_name]}, connectivityTo1C2_2_1 : {get_attr : [2c202_catalog_instance_1C21, instance_name]}, connectivityTo1C2_1_2 : {get_attr : [1c201_catalog_instance_1C22, instance_name]}, @@ -351,12 +351,12 @@ resources: connectivityToNoUnifiedNested_2 : {get_attr : [nestedNoUnified_2, portId]} } - 1c1_t1_port_11: + 1c12_scalling_instance_0_t1_port_0: type: OS::Neutron::Port properties: network: {get_resource: 1c1_scalling_instance_network} fixed_ips: [{"ip_address": {get_param: [myIPs, 1]}}] - name: 1c1_t1_port_11 + name: 1c12_scalling_instance_0_t1_port_0 1c1_t2_port_11: type: OS::Neutron::Port @@ -373,7 +373,7 @@ resources: flavor: {get_param: pd_flavor_name} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: 1c1_t1_port_11} + - port: {get_resource: 1c12_scalling_instance_0_t1_port_0} user_data_format: RAW1 scheduler_hints: { group: { get_resource: BE_Affinity } } metadata: { connectivityTo1A_1 : {get_attr : [1a_single_1A_1, instance_name]}, @@ -382,9 +382,9 @@ resources: connectivityTo1B02_1 : {get_attr : [1b02_single_1B_1, instance_name]}, connectivityTo1B01_2 : {get_attr : [1b01_single_1B_2, instance_name]}, connectivityTo1B02_2 : {get_attr : [1b02_single_1B_2, instance_name]}, - connectivityTo1C1_T1_01 : {get_attr : [1c1_t1_port_01, tenant_id]}, - connectivityTo1C1_T1_11 : {get_attr : [1c1_t1_port_11, tenant_id]}, - connectivityTo1C1_T1_12 : {get_attr : [1c1_t1_port_12, tenant_id]}, + connectivityTo1C1_T1_01 : {get_attr : [1c11_scalling_instance_0_t1_port_0, tenant_id]}, + connectivityTo1C1_T1_11 : {get_attr : [1c12_scalling_instance_0_t1_port_0, tenant_id]}, + connectivityTo1C1_T1_12 : {get_attr : [1c12_scalling_instance_1_t1_port_0, tenant_id]}, connectivityTo1C2_1_1 : {get_attr : [1c201_catalog_instance_1C21, instance_name]}, connectivityTo1C2_2_1 : {get_attr : [2c202_catalog_instance_1C21, instance_name]}, connectivityTo1C2_1_2 : {get_attr : [1c201_catalog_instance_1C22, instance_name]}, @@ -395,12 +395,12 @@ resources: connectivityToNoUnifiedNested_2 : {get_attr : [nestedNoUnified_2, portId]} } - 1c1_t1_port_02: + 1c11_scalling_instance_1_t1_port_0: type: OS::Neutron::Port properties: network: {get_resource: 1c1_scalling_instance_network} fixed_ips: [{"ip_address": {get_param: [myIPs, 1]}}] - name: 1c1_t1_port_02 + name: 1c11_scalling_instance_1_t1_port_0 1c1_t2_port_02: type: OS::Neutron::Port properties: @@ -416,7 +416,7 @@ resources: flavor: {get_param: pd_flavor_name} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: 1c1_t1_port_12} + - port: {get_resource: 1c12_scalling_instance_1_t1_port_0} user_data_format: RAW1 scheduler_hints: { group: { get_resource: BE_Affinity } } metadata: { connectivityTo1A_1 : {get_attr : [1a_single_1A_1, instance_name]}, @@ -425,9 +425,9 @@ resources: connectivityTo1B02_1 : {get_attr : [1b02_single_1B_1, instance_name]}, connectivityTo1B01_2 : {get_attr : [1b01_single_1B_2, instance_name]}, connectivityTo1B02_2 : {get_attr : [1b02_single_1B_2, instance_name]}, - connectivityTo1C1_T1_01 : {get_attr : [1c1_t1_port_01, tenant_id]}, - connectivityTo1C1_T1_11 : {get_attr : [1c1_t1_port_11, tenant_id]}, - connectivityTo1C1_T1_12 : {get_attr : [1c1_t1_port_12, tenant_id]}, + connectivityTo1C1_T1_01 : {get_attr : [1c11_scalling_instance_0_t1_port_0, tenant_id]}, + connectivityTo1C1_T1_11 : {get_attr : [1c12_scalling_instance_0_t1_port_0, tenant_id]}, + connectivityTo1C1_T1_12 : {get_attr : [1c12_scalling_instance_1_t1_port_0, tenant_id]}, connectivityTo1C2_1_1 : {get_attr : [1c201_catalog_instance_1C21, instance_name]}, connectivityTo1C2_2_1 : {get_attr : [2c202_catalog_instance_1C21, instance_name]}, connectivityTo1C2_1_2 : {get_attr : [1c201_catalog_instance_1C22, instance_name]}, @@ -438,12 +438,12 @@ resources: connectivityToNoUnifiedNested_2 : {get_attr : [nestedNoUnified_2, portId]} } - 1c1_t1_port_12: + 1c12_scalling_instance_1_t1_port_0: type: OS::Neutron::Port properties: network: {get_resource: 1c1_scalling_instance_network} fixed_ips: [{"ip_address": {get_param: [myIPs, 1]}}] - name: 1c1_t1_port_12 + name: 1c12_scalling_instance_1_t1_port_0 1c1_t2_port_12: type: OS::Neutron::Port @@ -462,8 +462,8 @@ resources: flavor: {get_param: pd_flavor_name} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: 1c201_port_02} - - port: {get_resource: 2c202_port_02} + - port: {get_resource: 1c2_catalog_instance_0_201_port_0} + - port: {get_resource: 1c2_catalog_instance_0_202_port_0} user_data_format: RAW1 scheduler_hints: { group: { get_resource: BE_Affinity } } metadata: { connectivityTo1A_1 : {get_attr : [1a_single_1A_1, instance_name]}, @@ -472,10 +472,10 @@ resources: connectivityTo1B02_1 : {get_attr : [1b02_single_1B_1, instance_name]}, connectivityTo1B01_2 : {get_attr : [1b01_single_1B_2, instance_name]}, connectivityTo1B02_2 : {get_attr : [1b02_single_1B_2, instance_name]}, - connectivityTo1C1_T1_01 : {get_attr : [1c1_t1_port_01, tenant_id]}, - connectivityTo1C1_T1_02 : {get_attr : [1c1_t1_port_02, tenant_id]}, - connectivityTo1C1_T1_11 : {get_attr : [1c1_t1_port_11, tenant_id]}, - connectivityTo1C1_T1_12 : {get_attr : [1c1_t1_port_12, tenant_id]}, + connectivityTo1C1_T1_01 : {get_attr : [1c11_scalling_instance_0_t1_port_0, tenant_id]}, + connectivityTo1C1_T1_02 : {get_attr : [1c11_scalling_instance_1_t1_port_0, tenant_id]}, + connectivityTo1C1_T1_11 : {get_attr : [1c12_scalling_instance_0_t1_port_0, tenant_id]}, + connectivityTo1C1_T1_12 : {get_attr : [1c12_scalling_instance_1_t1_port_0, tenant_id]}, connectivityTo1C2_2_1 : {get_attr : [2c202_catalog_instance_1C21, instance_name]}, connectivityTo1C2_1_2 : {get_attr : [1c201_catalog_instance_1C22, instance_name]}, connectivityTo1C2_2_2 : {get_attr : [2c202_catalog_instance_1C22, instance_name]}, @@ -484,14 +484,14 @@ resources: connectivityToNoUnifiedNested_1 : {get_attr : [nestedNoUnified_1, portId]}, connectivityToNoUnifiedNested_2 : {get_attr : [nestedNoUnified_2, portId]} } - diskConfig: {get_attr: [1c201_port_02, tenant_id]} + diskConfig: {get_attr: [1c2_catalog_instance_0_201_port_0, tenant_id]} personality: {get_attr: [[1a_single_1A_1, instance_name]]} - 1c201_port_02: + 1c2_catalog_instance_0_201_port_0: type: OS::Neutron::Port properties: network: {get_param: oam_net_name} - 2c202_port_02: + 1c2_catalog_instance_0_202_port_0: type: OS::Neutron::Port properties: network: {get_resource: 1c2_catalog_instance_network} @@ -510,17 +510,17 @@ resources: flavor: {get_param: pd_flavor_name} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: 1c201_port_11} - - port: {get_resource: 2c202_port_11} + - port: {get_resource: 1c2_catalog_instance_1_201_port_0} + - port: {get_resource: 1c2_catalog_instance_1_202_port_0} user_data_format: {get_attr: [1c201_catalog_instance_1C21, instance_name]} scheduler_hints: { group: { get_resource: BE_Affinity } } - diskConfig: {get_attr: [1c201_port_02, tenant_id]} + diskConfig: {get_attr: [1c2_catalog_instance_0_201_port_0, tenant_id]} - 1c201_port_11: + 1c2_catalog_instance_1_201_port_0: type: OS::Neutron::Port properties: network: {get_param: oam_net_name} - 2c202_port_11: + 1c2_catalog_instance_1_202_port_0: type: OS::Neutron::Port properties: network: {get_resource: 1c2_catalog_instance_network} @@ -533,8 +533,8 @@ resources: flavor: {get_param: pd_flavor_name} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: 1c201_port_022} - - port: {get_resource: 2c202_port_022} + - port: {get_resource: 2c2_catalog_instance_0_201_port_0} + - port: {get_resource: 2c2_catalog_instance_0_202_port_0} user_data_format: RAW1 scheduler_hints: { group: { get_resource: BE_Affinity } } metadata: { connectivityTo1A_1 : {get_attr : [1a_single_1A_1, instance_name]}, @@ -543,10 +543,10 @@ resources: connectivityTo1B02_1 : {get_attr : [1b02_single_1B_1, instance_name]}, connectivityTo1B01_2 : {get_attr : [1b01_single_1B_2, instance_name]}, connectivityTo1B02_2 : {get_attr : [1b02_single_1B_2, instance_name]}, - connectivityTo1C1_T1_01 : {get_attr : [1c1_t1_port_01, tenant_id]}, - connectivityTo1C1_T1_02 : {get_attr : [1c1_t1_port_02, tenant_id]}, - connectivityTo1C1_T1_11 : {get_attr : [1c1_t1_port_11, tenant_id]}, - connectivityTo1C1_T1_12 : {get_attr : [1c1_t1_port_12, tenant_id]}, + connectivityTo1C1_T1_01 : {get_attr : [1c11_scalling_instance_0_t1_port_0, tenant_id]}, + connectivityTo1C1_T1_02 : {get_attr : [1c11_scalling_instance_1_t1_port_0, tenant_id]}, + connectivityTo1C1_T1_11 : {get_attr : [1c12_scalling_instance_0_t1_port_0, tenant_id]}, + connectivityTo1C1_T1_12 : {get_attr : [1c12_scalling_instance_1_t1_port_0, tenant_id]}, connectivityTo1C2_1_1 : {get_attr : [1c201_catalog_instance_1C21, instance_name]}, connectivityTo1C2_2_1 : {get_attr : [2c202_catalog_instance_1C21, instance_name]}, connectivityTo1C2_1_2 : {get_attr : [1c201_catalog_instance_1C22, instance_name]}, @@ -556,11 +556,11 @@ resources: connectivityToNoUnifiedNested_2 : {get_attr : [nestedNoUnified_2, portId]} } - 1c201_port_022: + 2c2_catalog_instance_0_201_port_0: type: OS::Neutron::Port properties: network: {get_param: oam_net_name} - 2c202_port_022: + 2c2_catalog_instance_0_202_port_0: type: OS::Neutron::Port properties: network: {get_resource: 1c2_catalog_instance_network} @@ -573,16 +573,16 @@ resources: flavor: {get_param: pd_flavor_name} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: 1c201_port_12} - - port: {get_resource: 2c202_port_12} + - port: {get_resource: 2c2_catalog_instance_1_201_port_0} + - port: {get_resource: 2c2_catalog_instance_1_202_port_0} user_data_format: {get_attr: [1c201_catalog_instance_1C22, instance_name]} scheduler_hints: { group: { get_resource: BE_Affinity } } - 1c201_port_12: + 2c2_catalog_instance_1_201_port_0: type: OS::Neutron::Port properties: network: {get_param: oam_net_name} - 2c202_port_12: + 2c2_catalog_instance_1_202_port_0: type: OS::Neutron::Port properties: network: {get_resource: 1c2_catalog_instance_network} @@ -604,10 +604,10 @@ resources: connectivityTo1B02_1 : {get_attr : [1b02_single_1B_1, instance_name]}, connectivityTo1B01_2 : {get_attr : [1b01_single_1B_2, instance_name]}, connectivityTo1B02_2 : {get_attr : [1b02_single_1B_2, instance_name]}, - connectivityTo1C1_T1_01 : {get_attr : [1c1_t1_port_01, tenant_id]}, - connectivityTo1C1_T1_02 : {get_attr : [1c1_t1_port_02, tenant_id]}, - connectivityTo1C1_T1_11 : {get_attr : [1c1_t1_port_11, tenant_id]}, - connectivityTo1C1_T1_12 : {get_attr : [1c1_t1_port_12, tenant_id]}, + connectivityTo1C1_T1_01 : {get_attr : [1c11_scalling_instance_0_t1_port_0, tenant_id]}, + connectivityTo1C1_T1_02 : {get_attr : [1c11_scalling_instance_1_t1_port_0, tenant_id]}, + connectivityTo1C1_T1_11 : {get_attr : [1c12_scalling_instance_0_t1_port_0, tenant_id]}, + connectivityTo1C1_T1_12 : {get_attr : [1c12_scalling_instance_1_t1_port_0, tenant_id]}, connectivityTo1C2_1_1 : {get_attr : [1c201_catalog_instance_1C21, instance_name]}, connectivityTo1C2_2_1 : {get_attr : [2c202_catalog_instance_1C21, instance_name]}, connectivityTo1C2_1_2 : {get_attr : [1c201_catalog_instance_1C22, instance_name]}, @@ -639,10 +639,10 @@ resources: connectivityTo1B02_1 : {get_attr : [1b02_single_1B_1, instance_name]}, connectivityTo1B01_2 : {get_attr : [1b01_single_1B_2, instance_name]}, connectivityTo1B02_2 : {get_attr : [1b02_single_1B_2, instance_name]}, - connectivityTo1C1_T1_01 : {get_attr : [1c1_t1_port_01, tenant_id]}, - connectivityTo1C1_T1_02 : {get_attr : [1c1_t1_port_02, tenant_id]}, - connectivityTo1C1_T1_11 : {get_attr : [1c1_t1_port_11, tenant_id]}, - connectivityTo1C1_T1_12 : {get_attr : [1c1_t1_port_12, tenant_id]}, + connectivityTo1C1_T1_01 : {get_attr : [1c11_scalling_instance_0_t1_port_0, tenant_id]}, + connectivityTo1C1_T1_02 : {get_attr : [1c11_scalling_instance_1_t1_port_0, tenant_id]}, + connectivityTo1C1_T1_11 : {get_attr : [1c12_scalling_instance_0_t1_port_0, tenant_id]}, + connectivityTo1C1_T1_12 : {get_attr : [1c12_scalling_instance_1_t1_port_0, tenant_id]}, connectivityTo1C2_1_1 : {get_attr : [1c201_catalog_instance_1C21, instance_name]}, connectivityTo1C2_2_1 : {get_attr : [2c202_catalog_instance_1C21, instance_name]}, connectivityTo1C2_1_2 : {get_attr : [1c201_catalog_instance_1C22, instance_name]}, @@ -668,10 +668,10 @@ resources: connectivityTo1B02_1 : {get_attr : [1b02_single_1B_1, instance_name]}, connectivityTo1B01_2 : {get_attr : [1b01_single_1B_2, instance_name]}, connectivityTo1B02_2 : {get_attr : [1b02_single_1B_2, instance_name]}, - connectivityTo1C1_T1_01 : {get_attr : [1c1_t1_port_01, tenant_id]}, - connectivityTo1C1_T1_02 : {get_attr : [1c1_t1_port_02, tenant_id]}, - connectivityTo1C1_T1_11 : {get_attr : [1c1_t1_port_11, tenant_id]}, - connectivityTo1C1_T1_12 : {get_attr : [1c1_t1_port_12, tenant_id]}, + connectivityTo1C1_T1_01 : {get_attr : [1c11_scalling_instance_0_t1_port_0, tenant_id]}, + connectivityTo1C1_T1_02 : {get_attr : [1c11_scalling_instance_1_t1_port_0, tenant_id]}, + connectivityTo1C1_T1_11 : {get_attr : [1c12_scalling_instance_0_t1_port_0, tenant_id]}, + connectivityTo1C1_T1_12 : {get_attr : [1c12_scalling_instance_1_t1_port_0, tenant_id]}, connectivityTo1C2_1_1 : {get_attr : [1c201_catalog_instance_1C21, instance_name]}, connectivityTo1C2_2_1 : {get_attr : [2c202_catalog_instance_1C21, instance_name]}, connectivityTo1C2_1_2 : {get_attr : [1c201_catalog_instance_1C22, instance_name]}, @@ -696,10 +696,10 @@ resources: connectivityTo1B02_1 : {get_attr : [1b02_single_1B_1, instance_name]}, connectivityTo1B01_2 : {get_attr : [1b01_single_1B_2, instance_name]}, connectivityTo1B02_2 : {get_attr : [1b02_single_1B_2, instance_name]}, - connectivityTo1C1_T1_01 : {get_attr : [1c1_t1_port_01, tenant_id]}, - connectivityTo1C1_T1_02 : {get_attr : [1c1_t1_port_02, tenant_id]}, - connectivityTo1C1_T1_11 : {get_attr : [1c1_t1_port_11, tenant_id]}, - connectivityTo1C1_T1_12 : {get_attr : [1c1_t1_port_12, tenant_id]}, + connectivityTo1C1_T1_01 : {get_attr : [1c11_scalling_instance_0_t1_port_0, tenant_id]}, + connectivityTo1C1_T1_02 : {get_attr : [1c11_scalling_instance_1_t1_port_0, tenant_id]}, + connectivityTo1C1_T1_11 : {get_attr : [1c12_scalling_instance_0_t1_port_0, tenant_id]}, + connectivityTo1C1_T1_12 : {get_attr : [1c12_scalling_instance_1_t1_port_0, tenant_id]}, connectivityTo1C2_1_1 : {get_attr : [1c201_catalog_instance_1C21, instance_name]}, connectivityTo1C2_2_1 : {get_attr : [2c202_catalog_instance_1C21, instance_name]}, connectivityTo1C2_1_2 : {get_attr : [1c201_catalog_instance_1C22, instance_name]}, @@ -735,8 +735,8 @@ resources: - nestedNoUnified_2 - 4p_nested_1 - 4p_nested_2 - - 1c201_port_11 - - 1c201_port_02 + - 1c2_catalog_instance_1_201_port_0 + - 1c2_catalog_instance_0_201_port_0 - 1c201_catalog_instance_1C21 - 2c202_catalog_instance_1C21 - 1c201_catalog_instance_1C22 @@ -749,11 +749,11 @@ resources: - 1c1_t2_port_12 - 1b01_single_1B_1 - 1b02_single_1B_1 - - 1b_t1_port_01 - - 1b_t1_port_11 + - b_single_1b_0_t1_port_0 + - b_single_1b_1_t1_port_0 - 1a_single_1A_1 - 2a_single_1A_2 - - 1a_t1_port_0 + - a_single_1a_0_t1_port_0 properties: name: get_param: net_name @@ -762,12 +762,12 @@ resources: type: OS::Neutron::Net properties: name: { get_attr: [nestedNoUnified_1, portId, {get_attr: [4p_nested_2, server_pcm_id]}]} - dhcp_agent_ids: { get_attr: [1c201_port_11, tenant_id, {get_attr: [1c201_port_02, tenant_id, {get_attr: [1c201_catalog_instance_1C22, instance_name, {get_attr: [2c202_catalog_instance_1C21,instance_name]}]}]}]} + dhcp_agent_ids: { get_attr: [1c2_catalog_instance_1_201_port_0, tenant_id, {get_attr: [1c2_catalog_instance_0_201_port_0, tenant_id, {get_attr: [1c201_catalog_instance_1C22, instance_name, {get_attr: [2c202_catalog_instance_1C21,instance_name]}]}]}]} tenant_id: { get_attr:[1c101_scalling_instance_1C11, instance_name, {get_attr:[1c102_scalling_instance_1C11, instance_name, {get_attr:[1c1_t2_port_02, tenant_id, {get_attr:[1c1_t2_port_11, tenant_id]}, {get_attr:[1c1_t2_port_12, tenant_id]}, {get_attr:[1c102_scalling_instance_1C12, instance_name]}]}]}]} - value_specs: {get_attr:[1b01_single_1B_1, instance_name, get_attr:[1b02_single_1B_1,instance_name, {get_attr:[1b_t1_port_01, tenant_id, {get_attr:[1b_t1_port_11, tenant_id]}]}]] } + value_specs: {get_attr:[1b01_single_1B_1, instance_name, get_attr:[1b02_single_1B_1,instance_name, {get_attr:[b_single_1b_0_t1_port_0, tenant_id, {get_attr:[b_single_1b_1_t1_port_0, tenant_id]}]}]] } qos_policy: {get_attr:[1a_single_1A_1, instance_name]} - admin_state_up: {get_attr:[1a_t1_port_0, tenant_id]} + admin_state_up: {get_attr:[a_single_1a_0_t1_port_0, tenant_id]} BE_Affinity: type: OS::Nova::ServerGroup @@ -779,14 +779,14 @@ outputs: out1: value: { get_attr: [nestedNoUnified_1, portId, {get_attr: [4p_nested_2, server_pcm_id]}]} out2: - value: { get_attr: [1c201_port_11, tenant_id, {get_attr: [1c201_port_02, tenant_id, {get_attr: [1c201_catalog_instance_1C22, instance_name, {get_attr: [2c202_catalog_instance_1C21,instance_name]}]}]}]} + value: { get_attr: [1c2_catalog_instance_1_201_port_0, tenant_id, {get_attr: [1c2_catalog_instance_0_201_port_0, tenant_id, {get_attr: [1c201_catalog_instance_1C22, instance_name, {get_attr: [2c202_catalog_instance_1C21,instance_name]}]}]}]} out3: value: { get_attr:[1c101_scalling_instance_1C11, instance_name, {get_attr:[1c102_scalling_instance_1C11, instance_name, {get_attr:[1c1_t2_port_02, tenant_id,{get_attr:[1c1_t2_port_11, tenant_id]}, {get_attr:[1c1_t2_port_12, tenant_id]}, {get_attr:[1c102_scalling_instance_1C12, instance_name]}]}]}]} out4: - value: {get_attr:[1b01_single_1B_1, instance_name, get_attr:[1b02_single_1B_1,instance_name, {get_attr:[1b_t1_port_01, tenant_id, {get_attr:[1b_t1_port_11, tenant_id]}]}]] } + value: {get_attr:[1b01_single_1B_1, instance_name, get_attr:[1b02_single_1B_1,instance_name, {get_attr:[b_single_1b_0_t1_port_0, tenant_id, {get_attr:[b_single_1b_1_t1_port_0, tenant_id]}]}]] } out5: value: {get_attr:[1a_single_1A_1, instance_name]} out6: - value: {get_attr:[1a_t1_port_0, tenant_id]} + value: {get_attr:[a_single_1a_0_t1_port_0, tenant_id]} out7: value: {get_attr:[2a_single_1A_2, instance_name]} \ 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/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml index 3821ce10e5..54fa35bba8 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -950,36 +950,20 @@ node_types: org.openecomp.resource.abstract.nodes.1c12_scalling_instance: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_1c1_t1_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED compute_1c12_scalling_instance_scheduler_hints: type: list required: true status: SUPPORTED entry_schema: type: json - port_1c1_t1_port_fixed_ips: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps compute_1c12_scalling_instance_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_1c1_t1_port_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_1c1_t1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_1c12_scalling_instance_t1_port_0_network_role: + type: string required: true status: SUPPORTED index_value: @@ -990,6 +974,10 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 + port_1c12_scalling_instance_t1_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED vm_flavor_name: type: string required: true @@ -1000,77 +988,76 @@ node_types: status: SUPPORTED entry_schema: type: string - port_1c1_t1_port_related_networks: + port_1c12_scalling_instance_t1_port_0_name: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_1c1_t1_port_ip_requirements: + type: string + port_1c12_scalling_instance_t1_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - vm_image_name: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_1c12_scalling_instance_t1_port_0_network_role_tag: + type: string + required: true + status: SUPPORTED + port_1c12_scalling_instance_t1_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_1c1_t1_port_name: + port_1c12_scalling_instance_t1_port_0_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_1c1_t1_port_subnetpoolid: + vm_image_name: type: string required: true status: SUPPORTED - port_1c1_t1_port_network_role_tag: - type: string + port_1c12_scalling_instance_t1_port_0_ip_requirements: + type: list required: true status: SUPPORTED - port_1c1_t1_port_network_role: - type: string + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_1c12_scalling_instance_t1_port_0_vlan_requirements: + type: list required: true status: SUPPORTED - compute_1c12_scalling_instance_availability_zone: + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_1c12_scalling_instance_t1_port_0_order: + type: integer + required: true + status: SUPPORTED + port_1c12_scalling_instance_t1_port_0_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: string - port_1c1_t1_port_network: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + compute_1c12_scalling_instance_availability_zone: type: list required: true status: SUPPORTED entry_schema: type: string - port_1c1_t1_port_order: - type: integer + port_1c12_scalling_instance_t1_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED attributes: - 1c12_scalling_instance_1c1_t1_port_tenant_id: + 1c12_scalling_instance_1c12_scalling_instance_t1_port_0_tenant_id: type: string status: SUPPORTED 1c12_scalling_instance_instance_name: type: string status: SUPPORTED requirements: - - dependency_1c12_scalling_instance_1c1_t1_port: - capability: tosca.capabilities.Node - node: tosca.nodes.Root - relationship: tosca.relationships.DependsOn - occurrences: - - 0 - - UNBOUNDED - - link_1c12_scalling_instance_1c1_t1_port: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - dependency_1c12_scalling_instance: capability: tosca.capabilities.Node node: tosca.nodes.Root @@ -1085,20 +1072,38 @@ node_types: occurrences: - 0 - UNBOUNDED + - dependency_1c12_scalling_instance_1c12_scalling_instance_t1_port_0: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - link_1c12_scalling_instance_1c12_scalling_instance_t1_port_0: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 capabilities: - cpu_1c12_scalling_instance: + network.incoming.packets_1c12_scalling_instance_1c12_scalling_instance_t1_port_0: 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_1c12_scalling_instance: + cpu_1c12_scalling_instance: 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_1c12_scalling_instance_1c1_t1_port: + attachment_1c12_scalling_instance_1c12_scalling_instance_t1_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + disk.device.write.bytes_1c12_scalling_instance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1116,13 +1121,9 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_1c12_scalling_instance_1c1_t1_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - forwarder_1c12_scalling_instance_1c1_t1_port: - type: org.openecomp.capabilities.Forwarder + network.outgoing.bytes.rate_1c12_scalling_instance_1c12_scalling_instance_t1_port_0: + 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 @@ -1132,7 +1133,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_1c12_scalling_instance_1c1_t1_port: + network.incoming.bytes_1c12_scalling_instance_1c12_scalling_instance_t1_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1170,6 +1171,11 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_1c12_scalling_instance_1c12_scalling_instance_t1_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.device.usage_1c12_scalling_instance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1182,7 +1188,7 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_1c12_scalling_instance_1c1_t1_port: + binding_1c12_scalling_instance_1c12_scalling_instance_t1_port_0: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface @@ -1190,24 +1196,19 @@ node_types: occurrences: - 0 - UNBOUNDED - network.incoming.packets_1c12_scalling_instance_1c1_t1_port: + network.incoming.packets.rate_1c12_scalling_instance_1c12_scalling_instance_t1_port_0: 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 - attachment_1c12_scalling_instance_1c1_t1_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - disk.latency_1c12_scalling_instance: + network.outgoing.packets.rate_1c12_scalling_instance_1c12_scalling_instance_t1_port_0: 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_1c12_scalling_instance_1c1_t1_port: + disk.latency_1c12_scalling_instance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1256,13 +1257,13 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.write.requests_1c12_scalling_instance: + network.outpoing.packets_1c12_scalling_instance_1c12_scalling_instance_t1_port_0: 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_1c12_scalling_instance_1c1_t1_port: + disk.write.requests_1c12_scalling_instance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1333,43 +1334,42 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_1c12_scalling_instance_1c1_t1_port: + disk.device.write.requests.rate_1c12_scalling_instance: 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_1c12_scalling_instance: + disk.device.write.requests_1c12_scalling_instance: 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.packets.rate_1c12_scalling_instance_1c1_t1_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_1c12_scalling_instance_1c12_scalling_instance_t1_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - disk.device.write.requests_1c12_scalling_instance: + disk.allocation_1c12_scalling_instance: 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_1c12_scalling_instance_1c1_t1_port: + network.incoming.bytes.rate_1c12_scalling_instance_1c12_scalling_instance_t1_port_0: 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.allocation_1c12_scalling_instance: + disk.root.size_1c12_scalling_instance: 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_1c12_scalling_instance: + network.outgoing.bytes_1c12_scalling_instance_1c12_scalling_instance_t1_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1993,24 +1993,8 @@ node_types: org.openecomp.resource.abstract.nodes.1c11_scalling_instance: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_1c1_t1_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_1c1_t1_port_fixed_ips: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_1c1_t1_port_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_1c1_t1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_1c11_scalling_instance_t1_port_0_network_role: + type: string required: true status: SUPPORTED index_value: @@ -2021,6 +2005,12 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 + port_1c11_scalling_instance_t1_port_0_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true @@ -2043,91 +2033,101 @@ node_types: status: SUPPORTED entry_schema: type: string - port_1c1_t1_port_related_networks: + port_1c11_scalling_instance_t1_port_0_name: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_1c1_t1_port_ip_requirements: + type: string + port_1c11_scalling_instance_t1_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_1c11_scalling_instance_t1_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: org.openecomp.datatypes.network.VlanRequirements + port_1c11_scalling_instance_t1_port_0_order: + type: integer + required: true + status: SUPPORTED vm_image_name: type: string required: true status: SUPPORTED - port_1c1_t1_port_name: - type: list + port_1c11_scalling_instance_t1_port_0_network_role_tag: + type: string required: true status: SUPPORTED - entry_schema: - type: string compute_1c11_scalling_instance_scheduler_hints: type: list required: true status: SUPPORTED entry_schema: type: json - port_1c1_t1_port_subnetpoolid: - type: string - required: true - status: SUPPORTED - port_1c1_t1_port_network_role_tag: - type: string + port_1c11_scalling_instance_t1_port_0_ip_requirements: + type: list required: true status: SUPPORTED - port_1c1_t1_port_network_role: + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_1c11_scalling_instance_t1_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_1c1_t1_port_network: + port_1c11_scalling_instance_t1_port_0_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_1c1_t1_port_order: - type: integer + port_1c11_scalling_instance_t1_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_1c11_scalling_instance_t1_port_0_fixed_ips: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps attributes: 1c11_scalling_instance_instance_name: type: string status: SUPPORTED - 1c11_scalling_instance_1c1_t1_port_tenant_id: + 1c11_scalling_instance_1c11_scalling_instance_t1_port_0_tenant_id: type: string status: SUPPORTED requirements: - - dependency_1c11_scalling_instance: + - dependency_1c11_scalling_instance_1c11_scalling_instance_t1_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - local_storage_1c11_scalling_instance: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo + - link_1c11_scalling_instance_1c11_scalling_instance_t1_port_0: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo occurrences: - - 0 - - UNBOUNDED - - dependency_1c11_scalling_instance_1c1_t1_port: + - 1 + - 1 + - dependency_1c11_scalling_instance: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_1c11_scalling_instance_1c1_t1_port: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo + - local_storage_1c11_scalling_instance: + capability: tosca.capabilities.Attachment + node: tosca.nodes.BlockStorage + relationship: tosca.relationships.AttachesTo occurrences: - - 1 - - 1 + - 0 + - UNBOUNDED capabilities: disk.device.usage_1c11_scalling_instance: type: org.openecomp.capabilities.metric.Ceilometer @@ -2135,18 +2135,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_1c11_scalling_instance_1c1_t1_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.incoming.packets.rate_1c11_scalling_instance_1c1_t1_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.allocation_1c11_scalling_instance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2199,24 +2187,32 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_1c11_scalling_instance_1c1_t1_port: + vcpus_1c11_scalling_instance: 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_1c11_scalling_instance: + memory_1c11_scalling_instance: 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_1c11_scalling_instance: + network.incoming.packets.rate_1c11_scalling_instance_1c11_scalling_instance_t1_port_0: 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_1c11_scalling_instance_1c11_scalling_instance_t1_port_0: + 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 cpu_1c11_scalling_instance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2228,11 +2224,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_1c11_scalling_instance_1c1_t1_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED scalable_1c11_scalling_instance: type: tosca.capabilities.Scalable occurrences: @@ -2243,12 +2234,7 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_1c11_scalling_instance_1c1_t1_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - network.outpoing.packets_1c11_scalling_instance_1c1_t1_port: + network.outgoing.packets.rate_1c11_scalling_instance_1c11_scalling_instance_t1_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2297,25 +2283,29 @@ node_types: occurrences: - 1 - UNBOUNDED - cpu.delta_1c11_scalling_instance: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_1c11_scalling_instance_1c11_scalling_instance_t1_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_1c11_scalling_instance_1c1_t1_port: + network.incoming.packets_1c11_scalling_instance_1c11_scalling_instance_t1_port_0: 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_1c11_scalling_instance: + cpu.delta_1c11_scalling_instance: 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_1c11_scalling_instance_1c1_t1_port: + attachment_1c11_scalling_instance_1c11_scalling_instance_t1_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + disk.device.write.requests_1c11_scalling_instance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2327,38 +2317,35 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_1c11_scalling_instance_1c1_t1_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 - disk.write.bytes_1c11_scalling_instance: + network.outgoing.bytes.rate_1c11_scalling_instance_1c11_scalling_instance_t1_port_0: 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_1c11_scalling_instance: + network.incoming.bytes_1c11_scalling_instance_1c11_scalling_instance_t1_port_0: 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_1c11_scalling_instance_1c1_t1_port: + disk.write.bytes_1c11_scalling_instance: 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_1c11_scalling_instance_1c1_t1_port: + disk.write.requests_1c11_scalling_instance: 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_1c11_scalling_instance_1c11_scalling_instance_t1_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.read.requests_1c11_scalling_instance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2389,26 +2376,27 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.read.requests_1c11_scalling_instance: + network.incoming.bytes.rate_1c11_scalling_instance_1c11_scalling_instance_t1_port_0: 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.iops_1c11_scalling_instance: + disk.read.requests_1c11_scalling_instance: 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_1c11_scalling_instance: + disk.device.iops_1c11_scalling_instance: 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 - attachment_1c11_scalling_instance_1c1_t1_port: - type: tosca.capabilities.Attachment + memory.resident_1c11_scalling_instance: + 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 @@ -2430,12 +2418,24 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes_1c11_scalling_instance_1c11_scalling_instance_t1_port_0: + 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_1c11_scalling_instance: 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_1c11_scalling_instance_1c11_scalling_instance_t1_port_0: + 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.iops_1c11_scalling_instance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3631,53 +3631,67 @@ node_types: org.openecomp.resource.abstract.nodes.2c2_catalog_instance: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_2c2_catalog_instance_201_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED compute_2c2_catalog_instance_user_data_format: type: list required: true status: SUPPORTED entry_schema: type: string - port_1c201_port_vlan_requirements: + port_2c2_catalog_instance_202_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_2c2_catalog_instance_202_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - vm_flavor_name: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_2c2_catalog_instance_201_port_0_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_2c2_catalog_instance_202_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_2c202_port_subnetpoolid: + vm_flavor_name: type: string required: true status: SUPPORTED - port_2c202_port_ip_requirements: + port_2c2_catalog_instance_202_port_0_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_1c201_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_2c202_port_network_role_tag: + type: string + port_2c2_catalog_instance_202_port_0_network_role: type: string required: true status: SUPPORTED - port_2c202_port_network_role: + port_2c2_catalog_instance_202_port_0_subnetpoolid: type: string required: true status: SUPPORTED - vm_image_name: - type: string + port_2c2_catalog_instance_202_port_0_ip_requirements: + type: list required: true status: SUPPORTED - port_2c202_port_order: - type: integer + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_2c2_catalog_instance_201_port_0_ip_requirements: + type: list required: true status: SUPPORTED - port_1c201_port_network_role_tag: + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + vm_image_name: type: string required: true status: SUPPORTED @@ -3693,16 +3707,20 @@ node_types: status: SUPPORTED entry_schema: type: string - port_1c201_port_order: - type: integer + port_2c2_catalog_instance_201_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_2c202_port_vlan_requirements: + port_2c2_catalog_instance_202_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements + port_2c2_catalog_instance_201_port_0_subnetpoolid: + type: string + required: true + status: SUPPORTED index_value: type: integer description: Index value of this substitution service template runtime instance @@ -3711,57 +3729,39 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - compute_2c2_catalog_instance_name: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_2c202_port_mac_requirements: + port_2c2_catalog_instance_202_port_0_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_2c202_port_network: + compute_2c2_catalog_instance_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_1c201_port_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_1c201_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_2c202_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_2c2_catalog_instance_201_port_0_network_role_tag: + type: string required: true status: SUPPORTED - port_1c201_port_subnetpoolid: + port_2c2_catalog_instance_201_port_0_network_role: type: string required: true status: SUPPORTED - port_1c201_port_related_networks: + port_2c2_catalog_instance_201_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_2c202_port_related_networks: - type: list + port_2c2_catalog_instance_202_port_0_order: + type: integer required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_1c201_port_network_role: - type: string + port_2c2_catalog_instance_201_port_0_order: + type: integer required: true status: SUPPORTED - port_1c201_port_network: + port_2c2_catalog_instance_201_port_0_network: type: list required: true status: SUPPORTED @@ -3786,36 +3786,35 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_2c2_catalog_instance_2c202_port: + - dependency_2c2_catalog_instance_2c2_catalog_instance_202_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_2c2_catalog_instance_2c202_port: + - link_2c2_catalog_instance_2c2_catalog_instance_202_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_2c2_catalog_instance_1c201_port: + - dependency_2c2_catalog_instance_2c2_catalog_instance_201_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_2c2_catalog_instance_1c201_port: + - link_2c2_catalog_instance_2c2_catalog_instance_201_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: - network.outgoing.packets.rate_2c2_catalog_instance_1c201_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_2c2_catalog_instance_2c2_catalog_instance_201_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED @@ -3837,6 +3836,23 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes.rate_2c2_catalog_instance_2c2_catalog_instance_201_port_0: + 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_2c2_catalog_instance_2c2_catalog_instance_202_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes.rate_2c2_catalog_instance_2c2_catalog_instance_202_port_0: + 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_2c2_catalog_instance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3872,15 +3888,19 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_2c2_catalog_instance_2c2_catalog_instance_201_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED disk.device.read.requests_2c2_catalog_instance: 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_2c2_catalog_instance_1c201_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_2c2_catalog_instance_2c2_catalog_instance_202_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED @@ -3896,8 +3916,8 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_2c2_catalog_instance_2c202_port: - type: org.openecomp.capabilities.Forwarder + feature_2c2_catalog_instance_2c2_catalog_instance_202_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -3908,34 +3928,31 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_2c2_catalog_instance_2c2_catalog_instance_201_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.allocation_2c2_catalog_instance: 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_2c2_catalog_instance_1c201_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 disk.device.write.requests.rate_2c2_catalog_instance: 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_2c2_catalog_instance: - type: tosca.capabilities.OperatingSystem + network.incoming.bytes.rate_2c2_catalog_instance_2c2_catalog_instance_202_port_0: + 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_2c2_catalog_instance_2c202_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + os_2c2_catalog_instance: + type: tosca.capabilities.OperatingSystem occurrences: - 1 - UNBOUNDED @@ -3945,25 +3962,25 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_2c2_catalog_instance_1c201_port: + disk.latency_2c2_catalog_instance: 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_2c2_catalog_instance_1c201_port: + network.outgoing.packets.rate_2c2_catalog_instance_2c2_catalog_instance_202_port_0: 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_2c2_catalog_instance: + disk.iops_2c2_catalog_instance: 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.iops_2c2_catalog_instance: + network.incoming.packets_2c2_catalog_instance_2c2_catalog_instance_202_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -3980,35 +3997,25 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_2c2_catalog_instance_2c202_port: + network.incoming.bytes_2c2_catalog_instance_2c2_catalog_instance_201_port_0: 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_2c2_catalog_instance_1c201_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - network.incoming.bytes.rate_2c2_catalog_instance_2c202_port: + network.outpoing.packets_2c2_catalog_instance_2c2_catalog_instance_202_port_0: 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.iops_2c2_catalog_instance: + network.incoming.packets.rate_2c2_catalog_instance_2c2_catalog_instance_202_port_0: 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 - attachment_2c2_catalog_instance_1c201_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - network.incoming.packets_2c2_catalog_instance_1c201_port: + disk.device.iops_2c2_catalog_instance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -4020,12 +4027,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_2c2_catalog_instance_2c202_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.bytes.rate_2c2_catalog_instance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4050,13 +4051,21 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_2c2_catalog_instance_2c2_catalog_instance_202_port_0: + 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 disk.read.requests_2c2_catalog_instance: 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_2c2_catalog_instance_2c202_port: + network.outgoing.bytes_2c2_catalog_instance_2c2_catalog_instance_201_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -4068,8 +4077,9 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_2c2_catalog_instance_1c201_port: - type: org.openecomp.capabilities.Forwarder + network.outgoing.bytes_2c2_catalog_instance_2c2_catalog_instance_202_port_0: + 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 @@ -4091,19 +4101,21 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.usage_2c2_catalog_instance: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_2c2_catalog_instance_2c2_catalog_instance_201_port_0: + 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: - - 1 + - 0 - UNBOUNDED - network.outgoing.bytes.rate_2c2_catalog_instance_2c202_port: + disk.device.usage_2c2_catalog_instance: 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_2c2_catalog_instance_1c201_port: + network.incoming.bytes.rate_2c2_catalog_instance_2c2_catalog_instance_201_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -4115,77 +4127,65 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_2c2_catalog_instance_1c201_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.usage_2c2_catalog_instance: 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_2c2_catalog_instance_2c202_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 feature_2c2_catalog_instance: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.write.requests_2c2_catalog_instance: + network.outgoing.packets.rate_2c2_catalog_instance_2c2_catalog_instance_201_port_0: 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_2c2_catalog_instance: + network.outpoing.packets_2c2_catalog_instance_2c2_catalog_instance_201_port_0: 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_2c2_catalog_instance_2c202_port: + disk.write.requests_2c2_catalog_instance: 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_2c2_catalog_instance: - type: tosca.capabilities.network.Bindable + network.incoming.packets_2c2_catalog_instance_2c2_catalog_instance_201_port_0: + 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 - attachment_2c2_catalog_instance_2c202_port: - type: tosca.capabilities.Attachment + network.incoming.bytes_2c2_catalog_instance_2c2_catalog_instance_202_port_0: + 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_2c2_catalog_instance_2c202_port: + cpu.delta_2c2_catalog_instance: 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_2c2_catalog_instance_2c202_port: - type: tosca.capabilities.Node + binding_2c2_catalog_instance: + type: tosca.capabilities.network.Bindable occurrences: - 1 - UNBOUNDED - memory_2c2_catalog_instance: + network.incoming.packets.rate_2c2_catalog_instance_2c2_catalog_instance_201_port_0: 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_2c2_catalog_instance_1c201_port: + memory_2c2_catalog_instance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -4200,72 +4200,80 @@ node_types: org.openecomp.resource.abstract.nodes.1c2_catalog_instance: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - compute_1c2_catalog_instance_availability_zone: - type: list + port_1c2_catalog_instance_201_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: string - port_1c201_port_vlan_requirements: + port_1c2_catalog_instance_202_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + compute_1c2_catalog_instance_availability_zone: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: string vm_flavor_name: type: string required: true status: SUPPORTED + port_1c2_catalog_instance_202_port_0_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements compute_1c2_catalog_instance_personality: type: list required: true status: SUPPORTED entry_schema: type: json - port_2c202_port_subnetpoolid: - type: string + port_1c2_catalog_instance_201_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_2c202_port_ip_requirements: + port_1c2_catalog_instance_202_port_0_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_1c201_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_2c202_port_network_role_tag: + type: string + vm_image_name: type: string required: true status: SUPPORTED - port_2c202_port_network_role: - type: string + port_1c2_catalog_instance_202_port_0_vlan_requirements: + type: list required: true status: SUPPORTED - vm_image_name: - type: string + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_1c2_catalog_instance_202_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_2c202_port_order: - type: integer + port_1c2_catalog_instance_201_port_0_vlan_requirements: + type: list required: true status: SUPPORTED - port_1c201_port_network_role_tag: + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_1c2_catalog_instance_201_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_1c201_port_order: - type: integer + port_1c2_catalog_instance_201_port_0_network_role: + type: string required: true status: SUPPORTED - port_2c202_port_vlan_requirements: + port_1c2_catalog_instance_201_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.RelatedNetworksAssignments index_value: type: integer description: Index value of this substitution service template runtime instance @@ -4280,62 +4288,54 @@ node_types: status: SUPPORTED entry_schema: type: string - port_2c202_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_1c2_catalog_instance_201_port_0_order: + type: integer required: true status: SUPPORTED - port_2c202_port_network: - type: list + port_1c2_catalog_instance_202_port_0_order: + type: integer required: true status: SUPPORTED - entry_schema: - type: string - port_1c201_port_ip_requirements: + port_1c2_catalog_instance_201_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_1c201_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_2c202_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_1c201_port_subnetpoolid: + port_1c2_catalog_instance_201_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_1c201_port_related_networks: - type: list + port_1c2_catalog_instance_202_port_0_network_role_tag: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_2c202_port_related_networks: + port_1c2_catalog_instance_202_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_1c201_port_network_role: + port_1c2_catalog_instance_202_port_0_subnetpoolid: type: string required: true status: SUPPORTED - compute_1c2_catalog_instance_user_data_format: + port_1c2_catalog_instance_201_port_0_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_1c201_port_network: + compute_1c2_catalog_instance_user_data_format: type: list required: true status: SUPPORTED entry_schema: type: string + port_1c2_catalog_instance_202_port_0_network_role: + type: string + required: true + status: SUPPORTED compute_1c2_catalog_instance_scheduler_hints: type: list required: true @@ -4346,7 +4346,7 @@ node_types: 1c2_catalog_instance_instance_name: type: string status: SUPPORTED - 1c2_catalog_instance_1c201_port_tenant_id: + 1c2_catalog_instance_1c2_catalog_instance_201_port_0_tenant_id: type: string status: SUPPORTED requirements: @@ -4364,94 +4364,94 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_1c2_catalog_instance_1c201_port: + - dependency_1c2_catalog_instance_1c2_catalog_instance_202_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_1c2_catalog_instance_1c201_port: + - link_1c2_catalog_instance_1c2_catalog_instance_202_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_1c2_catalog_instance_2c202_port: + - dependency_1c2_catalog_instance_1c2_catalog_instance_201_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_1c2_catalog_instance_2c202_port: + - link_1c2_catalog_instance_1c2_catalog_instance_201_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: - disk.device.capacity_1c2_catalog_instance: + network.outgoing.packets.rate_1c2_catalog_instance_1c2_catalog_instance_202_port_0: 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 - attachment_1c2_catalog_instance_2c202_port: - type: tosca.capabilities.Attachment + disk.device.capacity_1c2_catalog_instance: + 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_1c2_catalog_instance_2c202_port: + disk.read.bytes.rate_1c2_catalog_instance: 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_1c2_catalog_instance_2c202_port: + network.incoming.bytes.rate_1c2_catalog_instance_1c2_catalog_instance_202_port_0: 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_1c2_catalog_instance_1c201_port: + network.incoming.bytes.rate_1c2_catalog_instance_1c2_catalog_instance_201_port_0: 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_1c2_catalog_instance: + memory.usage_1c2_catalog_instance: 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_1c2_catalog_instance_1c201_port: + disk.write.bytes.rate_1c2_catalog_instance: 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_1c2_catalog_instance: + network.outgoing.packets.rate_1c2_catalog_instance_1c2_catalog_instance_201_port_0: 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_1c2_catalog_instance_1c201_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 + network.outpoing.packets_1c2_catalog_instance_1c2_catalog_instance_202_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - - 0 + - 1 - UNBOUNDED - forwarder_1c2_catalog_instance_1c201_port: - type: org.openecomp.capabilities.Forwarder + network.incoming.bytes_1c2_catalog_instance_1c2_catalog_instance_202_port_0: + 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_1c2_catalog_instance: + network.incoming.packets.rate_1c2_catalog_instance_1c2_catalog_instance_201_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -4463,65 +4463,77 @@ node_types: occurrences: - 1 - UNBOUNDED - cpu_1c2_catalog_instance: + network.outpoing.packets_1c2_catalog_instance_1c2_catalog_instance_201_port_0: 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_1c2_catalog_instance: + network.incoming.bytes_1c2_catalog_instance_1c2_catalog_instance_201_port_0: 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_1c2_catalog_instance_1c201_port: + network.incoming.packets.rate_1c2_catalog_instance_1c2_catalog_instance_202_port_0: 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.ephemeral.size_1c2_catalog_instance: + cpu_1c2_catalog_instance: 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_1c2_catalog_instance: + disk.read.requests_1c2_catalog_instance: 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_1c2_catalog_instance: + disk.ephemeral.size_1c2_catalog_instance: 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_1c2_catalog_instance: + disk.device.write.bytes_1c2_catalog_instance: 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_1c2_catalog_instance: - type: tosca.capabilities.OperatingSystem + memory.resident_1c2_catalog_instance: + 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.iops_1c2_catalog_instance: + disk.device.write.requests.rate_1c2_catalog_instance: 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_1c2_catalog_instance_2c202_port: - type: tosca.capabilities.Node + forwarder_1c2_catalog_instance_1c2_catalog_instance_202_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + os_1c2_catalog_instance: + type: tosca.capabilities.OperatingSystem + occurrences: + - 1 + - UNBOUNDED + disk.device.iops_1c2_catalog_instance: + 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.packets.rate_1c2_catalog_instance_2c202_port: + network.outgoing.bytes.rate_1c2_catalog_instance_1c2_catalog_instance_202_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -4544,25 +4556,16 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_1c2_catalog_instance_2c202_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.iops_1c2_catalog_instance: 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_1c2_catalog_instance_2c202_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 + attachment_1c2_catalog_instance_1c2_catalog_instance_201_port_0: + type: tosca.capabilities.Attachment occurrences: - - 0 + - 1 - UNBOUNDED vcpus_1c2_catalog_instance: type: org.openecomp.capabilities.metric.Ceilometer @@ -4576,24 +4579,20 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_1c2_catalog_instance_1c201_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 - attachment_1c2_catalog_instance_1c201_port: - type: tosca.capabilities.Attachment + feature_1c2_catalog_instance_1c2_catalog_instance_202_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_1c2_catalog_instance_1c201_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_1c2_catalog_instance_1c2_catalog_instance_201_port_0: + 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: - - 1 + - 0 - UNBOUNDED - network.incoming.packets_1c2_catalog_instance_1c201_port: + network.outgoing.bytes_1c2_catalog_instance_1c2_catalog_instance_202_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -4629,23 +4628,12 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_1c2_catalog_instance_2c202_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.device.allocation_1c2_catalog_instance: 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_1c2_catalog_instance_2c202_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED disk.device.read.bytes_1c2_catalog_instance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4688,20 +4676,20 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_1c2_catalog_instance_1c201_port: - type: tosca.capabilities.Node + network.incoming.packets_1c2_catalog_instance_1c2_catalog_instance_201_port_0: + 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_1c2_catalog_instance_2c202_port: + network.incoming.packets_1c2_catalog_instance_1c2_catalog_instance_202_port_0: 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_1c2_catalog_instance_2c202_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_1c2_catalog_instance_1c2_catalog_instance_201_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED @@ -4711,7 +4699,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_1c2_catalog_instance_1c201_port: + network.outgoing.bytes.rate_1c2_catalog_instance_1c2_catalog_instance_201_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -4734,21 +4722,28 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_1c2_catalog_instance_1c201_port: + disk.write.requests.rate_1c2_catalog_instance: 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_1c2_catalog_instance: + disk.write.requests_1c2_catalog_instance: 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_1c2_catalog_instance: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_1c2_catalog_instance_1c2_catalog_instance_202_port_0: + 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 + attachment_1c2_catalog_instance_1c2_catalog_instance_202_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED @@ -4763,13 +4758,18 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_1c2_catalog_instance_2c202_port: + disk.device.read.requests.rate_1c2_catalog_instance: 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_1c2_catalog_instance: + feature_1c2_catalog_instance_1c2_catalog_instance_201_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes_1c2_catalog_instance_1c2_catalog_instance_201_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -4778,16 +4778,32 @@ node_types: org.openecomp.resource.abstract.nodes.a_single_2a: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_a_single_2a_t1_port_0_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_a_single_2a_t1_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED compute_a_single_2a_user_data_format: type: list required: true status: SUPPORTED entry_schema: type: string - port_1a_t1_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_a_single_2a_t1_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_a_single_2a_t1_port_0_network: + type: list required: true status: SUPPORTED + entry_schema: + type: string index_value: type: integer description: Index value of this substitution service template runtime instance @@ -4796,76 +4812,60 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_1a_t1_port_ip_requirements: + compute_a_single_2a_scheduler_hints: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_1a_t1_port_related_networks: + type: json + compute_a_single_2a_availability_zone: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_1a_t1_port_network_role_tag: + type: string + vm_flavor_name: type: string required: true status: SUPPORTED - port_1a_t1_port_network_role: + port_a_single_2a_t1_port_0_network_role_tag: type: string required: true status: SUPPORTED - compute_a_single_2a_scheduler_hints: - type: list - required: true - status: SUPPORTED - entry_schema: - type: json - port_1a_t1_port_order: + port_a_single_2a_t1_port_0_order: type: integer required: true status: SUPPORTED - compute_a_single_2a_availability_zone: + compute_a_single_2a_name: type: list required: true status: SUPPORTED entry_schema: type: string - vm_flavor_name: + vm_image_name: type: string required: true status: SUPPORTED - port_1a_t1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_1a_t1_port_network: + port_a_single_2a_t1_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_1a_t1_port_subnetpoolid: + type: org.openecomp.datatypes.network.VlanRequirements + port_a_single_2a_t1_port_0_network_role: type: string required: true status: SUPPORTED - compute_a_single_2a_name: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - vm_image_name: + port_a_single_2a_t1_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_1a_t1_port_vlan_requirements: + port_a_single_2a_t1_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.RelatedNetworksAssignments compute_a_single_2a_metadata: type: list required: true @@ -4891,14 +4891,14 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_a_single_2a_1a_t1_port: + - dependency_a_single_2a_a_single_2a_t1_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_a_single_2a_1a_t1_port: + - link_a_single_2a_a_single_2a_t1_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -4911,6 +4911,17 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes_a_single_2a_a_single_2a_t1_port_0: + 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_a_single_2a_a_single_2a_t1_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.ephemeral.size_a_single_2a: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4953,11 +4964,6 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_a_single_2a_1a_t1_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED disk.read.bytes.rate_a_single_2a: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4970,12 +4976,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_a_single_2a_1a_t1_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.write.requests.rate_a_single_2a: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -5012,9 +5012,8 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_a_single_2a_1a_t1_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_a_single_2a_a_single_2a_t1_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED @@ -5024,22 +5023,11 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_a_single_2a_1a_t1_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_a_single_2a: type: tosca.capabilities.Scalable occurrences: - 1 - UNBOUNDED - feature_a_single_2a_1a_t1_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.device.write.bytes_a_single_2a: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -5063,14 +5051,15 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.write.requests_a_single_2a: + network.outpoing.packets_a_single_2a_a_single_2a_t1_port_0: 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 - attachment_a_single_2a_1a_t1_port: - type: tosca.capabilities.Attachment + disk.device.write.requests_a_single_2a: + 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 @@ -5086,11 +5075,23 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes.rate_a_single_2a_a_single_2a_t1_port_0: + 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_a_single_2a: type: tosca.capabilities.OperatingSystem occurrences: - 1 - UNBOUNDED + network.incoming.packets_a_single_2a_a_single_2a_t1_port_0: + 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_a_single_2a: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -5121,18 +5122,25 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_a_single_2a_1a_t1_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_a_single_2a_a_single_2a_t1_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - network.outpoing.packets_a_single_2a_1a_t1_port: + network.incoming.packets.rate_a_single_2a_a_single_2a_t1_port_0: 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_a_single_2a_a_single_2a_t1_port_0: + 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 binding_a_single_2a: type: tosca.capabilities.network.Bindable occurrences: @@ -5144,7 +5152,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_a_single_2a_1a_t1_port: + network.incoming.bytes.rate_a_single_2a_a_single_2a_t1_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -5156,15 +5164,7 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_a_single_2a_1a_t1_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 - network.incoming.packets_a_single_2a_1a_t1_port: + network.outgoing.packets.rate_a_single_2a_a_single_2a_t1_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -5177,31 +5177,31 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.write.bytes.rate_a_single_2a: + network.outgoing.bytes_a_single_2a_a_single_2a_t1_port_0: 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_a_single_2a: + disk.device.write.bytes.rate_a_single_2a: 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.allocation_a_single_2a: + memory_a_single_2a: 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_a_single_2a: + disk.allocation_a_single_2a: 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_a_single_2a_1a_t1_port: + memory.resident_a_single_2a: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -5221,16 +5221,16 @@ node_types: org.openecomp.resource.abstract.nodes.pcma_server_1: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_pcm_port_0_network_role: - type: string - required: true - status: SUPPORTED port_pcm_port_1_related_networks: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pcm_port_0_network_role: + type: string + required: true + status: SUPPORTED port_pcm_port_1_network_role_tag: type: string required: true @@ -5289,11 +5289,11 @@ node_types: type: string required: true status: SUPPORTED - port_pcm_port_0_exCP_naming: + port_pcm_port_1_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_pcm_port_1_exCP_naming: + port_pcm_port_0_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED @@ -5307,18 +5307,18 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pcm_port_0_ip_requirements: + port_pcm_port_1_security_groups: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pcm_port_1_security_groups: + type: json + port_pcm_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements compute_pcma_server_config_drive: type: list required: true @@ -5367,16 +5367,16 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pcm_port_0_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED port_pcm_port_1_ip_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements + port_pcm_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED port_pcm_port_1_order: type: integer required: true @@ -5810,43 +5810,55 @@ node_types: org.openecomp.resource.abstract.nodes.b_single_1b: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_1b_t1_port_order: - type: integer + port_b_single_1b_t1_port_0_network_role_tag: + type: string + required: true + status: SUPPORTED + port_b_single_1b_t1_port_0_related_networks: + type: list required: true status: SUPPORTED - port_1b_t1_port_network_role: + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_b_single_1b_t2_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_1b_t1_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_b_single_1b_t1_port_0_network_role: + type: string + required: true + status: SUPPORTED + port_b_single_1b_t2_port_0_network: + type: list required: true status: SUPPORTED + entry_schema: + type: string vm_flavor_name: type: string required: true status: SUPPORTED - port_1b_t2_port_related_networks: + port_b_single_1b_t1_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_1b_t1_port_ip_requirements: + type: org.openecomp.datatypes.network.VlanRequirements + port_b_single_1b_t2_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_image_name: type: string required: true status: SUPPORTED - port_1b_t2_port_network_role: - type: string + port_b_single_1b_t2_port_0_order: + type: integer required: true status: SUPPORTED - port_1b_t2_port_order: + port_b_single_1b_t1_port_0_order: type: integer required: true status: SUPPORTED @@ -5856,34 +5868,38 @@ node_types: status: SUPPORTED entry_schema: type: string - port_1b_t2_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_1b_t2_port_network_role_tag: - type: string + port_b_single_1b_t2_port_0_vlan_requirements: + type: list required: true status: SUPPORTED - port_1b_t2_port_subnetpoolid: + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_b_single_1b_t2_port_0_network_role: type: string required: true status: SUPPORTED - port_1b_t1_port_related_networks: + port_b_single_1b_t1_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_1b_t2_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + type: org.openecomp.datatypes.network.IpRequirements + port_b_single_1b_t1_port_0_value_specs: + type: list required: true status: SUPPORTED - compute_b_single_1b_availability_zone: + entry_schema: + type: json + compute_b_single_1b_availability_zone: type: list required: true status: SUPPORTED entry_schema: type: string + port_b_single_1b_t1_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED index_value: type: integer description: Index value of this substitution service template runtime instance @@ -5898,54 +5914,38 @@ node_types: status: SUPPORTED entry_schema: type: json - port_1b_t2_port_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_1b_t2_port_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_1b_t1_port_value_specs: - type: list + port_b_single_1b_t1_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json - port_1b_t1_port_network_role_tag: + port_b_single_1b_t1_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_1b_t1_port_subnetpoolid: + port_b_single_1b_t2_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_1b_t1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_1b_t2_port_network: + port_b_single_1b_t1_port_0_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_1b_t1_port_vlan_requirements: + port_b_single_1b_t2_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_1b_t1_port_network: - type: list + type: org.openecomp.datatypes.network.IpRequirements + port_b_single_1b_t2_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_b_single_1b_t2_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: string compute_b_single_1b_name: type: list required: true @@ -5956,7 +5956,7 @@ node_types: b_single_1b_instance_name: type: string status: SUPPORTED - b_single_1b_1b_t1_port_tenant_id: + b_single_1b_b_single_1b_t1_port_0_tenant_id: type: string status: SUPPORTED requirements: @@ -5974,43 +5974,33 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_b_single_1b_1b_t1_port: + - dependency_b_single_1b_b_single_1b_t2_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_b_single_1b_1b_t1_port: + - link_b_single_1b_b_single_1b_t2_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_b_single_1b_1b_t2_port: + - dependency_b_single_1b_b_single_1b_t1_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_b_single_1b_1b_t2_port: + - link_b_single_1b_b_single_1b_t1_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: - attachment_b_single_1b_1b_t2_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - forwarder_b_single_1b_1b_t2_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED endpoint_b_single_1b: type: tosca.capabilities.Endpoint.Admin occurrences: @@ -6027,23 +6017,56 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_b_single_1b_1b_t2_port: + network.incoming.bytes_b_single_1b_b_single_1b_t1_port_0: 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_b_single_1b_1b_t2_port: + network.incoming.packets.rate_b_single_1b_b_single_1b_t2_port_0: 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_b_single_1b_1b_t1_port: - type: org.openecomp.capabilities.Forwarder + network.incoming.bytes_b_single_1b_b_single_1b_t2_port_0: + 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_b_single_1b_b_single_1b_t1_port_0: + 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 + feature_b_single_1b_b_single_1b_t2_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + feature_b_single_1b_b_single_1b_t1_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes.rate_b_single_1b_b_single_1b_t1_port_0: + 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_b_single_1b_b_single_1b_t2_port_0: + 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 scalable_b_single_1b: type: tosca.capabilities.Scalable occurrences: @@ -6060,6 +6083,16 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_b_single_1b_b_single_1b_t2_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + forwarder_b_single_1b_b_single_1b_t1_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED vcpus_b_single_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -6072,25 +6105,25 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.read.requests.rate_b_single_1b: + network.incoming.bytes.rate_b_single_1b_b_single_1b_t2_port_0: 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_b_single_1b_1b_t2_port: + disk.device.read.requests.rate_b_single_1b: 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 - instance_b_single_1b: + network.incoming.packets.rate_b_single_1b_b_single_1b_t1_port_0: 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_b_single_1b_1b_t1_port: + instance_b_single_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -6114,49 +6147,43 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_b_single_1b_1b_t1_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.device.allocation_b_single_1b: 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.packets.rate_b_single_1b_1b_t2_port: + network.outgoing.packets.rate_b_single_1b_b_single_1b_t2_port_0: 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_b_single_1b: + network.outpoing.packets_b_single_1b_b_single_1b_t1_port_0: 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_b_single_1b: + network.outgoing.bytes_b_single_1b_b_single_1b_t2_port_0: 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_b_single_1b_1b_t2_port: + disk.device.capacity_b_single_1b: 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_b_single_1b_1b_t1_port: + disk.latency_b_single_1b: 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 - attachment_b_single_1b_1b_t1_port: + attachment_b_single_1b_b_single_1b_t1_port_0: type: tosca.capabilities.Attachment occurrences: - 1 @@ -6167,14 +6194,6 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_b_single_1b_1b_t2_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 disk.ephemeral.size_b_single_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -6187,25 +6206,25 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_b_single_1b_1b_t2_port: + disk.device.iops_b_single_1b: 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.iops_b_single_1b: + disk.read.requests_b_single_1b: 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_b_single_1b: + memory.resident_b_single_1b: 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_b_single_1b: + network.outgoing.bytes.rate_b_single_1b_b_single_1b_t2_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -6217,12 +6236,13 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_b_single_1b_1b_t1_port: - type: tosca.capabilities.Node + network.incoming.packets_b_single_1b_b_single_1b_t1_port_0: + 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_b_single_1b_1b_t2_port: + network.outgoing.bytes.rate_b_single_1b_b_single_1b_t1_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -6264,7 +6284,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_b_single_1b_1b_t1_port: + network.incoming.packets_b_single_1b_b_single_1b_t2_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -6282,63 +6302,48 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_b_single_1b_1b_t1_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.device.read.requests_b_single_1b: 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_b_single_1b_1b_t1_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_b_single_1b_b_single_1b_t2_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - binding_b_single_1b_1b_t1_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 - network.outpoing.packets_b_single_1b_1b_t1_port: + disk.device.write.requests.rate_b_single_1b: 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_b_single_1b: + network.outgoing.packets.rate_b_single_1b_b_single_1b_t1_port_0: 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_b_single_1b: + network.outpoing.packets_b_single_1b_b_single_1b_t2_port_0: 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_b_single_1b: + memory.usage_b_single_1b: 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_b_single_1b_1b_t2_port: + network.outgoing.bytes_b_single_1b_b_single_1b_t1_port_0: 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_b_single_1b_1b_t1_port: + disk.write.bytes.rate_b_single_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -6380,11 +6385,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_b_single_1b_1b_t2_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED org.openecomp.resource.abstract.nodes.a_single_1a: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: @@ -6394,41 +6394,39 @@ node_types: status: SUPPORTED entry_schema: type: json - port_1a_t1_port_ip_requirements: + port_a_single_1a_t1_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_1a_t2_port_network_role_tag: - type: string - required: true - status: SUPPORTED - vm_flavor_name: - type: string + type: org.openecomp.datatypes.network.VlanRequirements + port_a_single_1a_t1_port_0_order: + type: integer required: true status: SUPPORTED - port_1a_t2_port_network_role: - type: string + port_a_single_1a_t2_port_0_order: + type: integer required: true status: SUPPORTED - port_1a_t2_port_network: + port_a_single_1a_t2_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_1a_t1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + type: org.openecomp.datatypes.network.VlanRequirements + vm_flavor_name: + type: string required: true status: SUPPORTED - port_1a_t1_port_network: - type: list + port_a_single_1a_t2_port_0_network_role_tag: + type: string required: true status: SUPPORTED - entry_schema: - type: string - port_1a_t1_port_subnetpoolid: + port_a_single_1a_t1_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_a_single_1a_t1_port_0_subnetpoolid: type: string required: true status: SUPPORTED @@ -6436,28 +6434,36 @@ node_types: type: string required: true status: SUPPORTED - port_1a_t2_port_related_networks: + port_a_single_1a_t2_port_0_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_1a_t2_port_ip_requirements: + type: string + port_a_single_1a_t1_port_0_network_role_tag: + type: string + required: true + status: SUPPORTED + port_a_single_1a_t1_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_1a_t1_port_vlan_requirements: - type: list + port_a_single_1a_t2_port_0_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_1a_t1_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_a_single_1a_t2_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_a_single_1a_t1_port_0_network: + type: list required: true status: SUPPORTED + entry_schema: + type: string compute_a_single_1a_availability_zone: type: list required: true @@ -6478,42 +6484,36 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_1a_t1_port_related_networks: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_1a_t1_port_network_role_tag: + port_a_single_1a_t1_port_0_network_role: type: string required: true status: SUPPORTED - port_1a_t1_port_network_role: - type: string + port_a_single_1a_t1_port_0_related_networks: + type: list required: true status: SUPPORTED - port_1a_t1_port_order: - type: integer + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_a_single_1a_t1_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_1a_t2_port_exCP_naming: + port_a_single_1a_t2_port_0_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_1a_t2_port_vlan_requirements: + port_a_single_1a_t2_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_1a_t2_port_subnetpoolid: - type: string - required: true - status: SUPPORTED - port_1a_t2_port_order: - type: integer + type: org.openecomp.datatypes.network.IpRequirements + port_a_single_1a_t2_port_0_related_networks: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments compute_a_single_1a_user_data_format: type: list required: true @@ -6526,26 +6526,26 @@ node_types: status: SUPPORTED entry_schema: type: string - port_1a_t2_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_a_single_1a_t2_port_0_network_role: + type: string required: true status: SUPPORTED attributes: - a_single_1a_instance_name: + a_single_1a_a_single_1a_t1_port_0_tenant_id: type: string status: SUPPORTED - a_single_1a_1a_t1_port_tenant_id: + a_single_1a_instance_name: type: string status: SUPPORTED requirements: - - dependency_a_single_1a_1a_t1_port: + - dependency_a_single_1a_a_single_1a_t2_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_a_single_1a_1a_t1_port: + - link_a_single_1a_a_single_1a_t2_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -6565,14 +6565,14 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_a_single_1a_1a_t2_port: + - dependency_a_single_1a_a_single_1a_t1_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_a_single_1a_1a_t2_port: + - link_a_single_1a_a_single_1a_t1_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -6585,29 +6585,36 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_a_single_1a_1a_t2_port: + disk.usage_a_single_1a: 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_a_single_1a: + network.incoming.bytes.rate_a_single_1a_a_single_1a_t2_port_0: 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 - attachment_a_single_1a_1a_t2_port: - type: tosca.capabilities.Attachment + scalable_a_single_1a: + type: tosca.capabilities.Scalable occurrences: - 1 - UNBOUNDED - scalable_a_single_1a: - type: tosca.capabilities.Scalable + network.incoming.packets.rate_a_single_1a_a_single_1a_t2_port_0: + 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_a_single_1a_a_single_1a_t2_port_0: + 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_a_single_1a_1a_t2_port: + network.incoming.bytes.rate_a_single_1a_a_single_1a_t1_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -6637,44 +6644,38 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_a_single_1a_1a_t2_port: + cpu.delta_a_single_1a: 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_a_single_1a: + network.incoming.bytes_a_single_1a_a_single_1a_t1_port_0: 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_a_single_1a_1a_t1_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED disk.device.write.requests_a_single_1a: 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_a_single_1a_1a_t1_port: + disk.iops_a_single_1a: 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.iops_a_single_1a: + network.outgoing.bytes_a_single_1a_a_single_1a_t2_port_0: 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_a_single_1a_1a_t1_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_a_single_1a_a_single_1a_t1_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED @@ -6695,15 +6696,8 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_a_single_1a_1a_t1_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.packets.rate_a_single_1a_1a_t2_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_a_single_1a_a_single_1a_t1_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED @@ -6719,14 +6713,22 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_a_single_1a_a_single_1a_t2_port_0: + 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 disk.write.bytes.rate_a_single_1a: 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 - attachment_a_single_1a_1a_t1_port: - type: tosca.capabilities.Attachment + feature_a_single_1a_a_single_1a_t2_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -6742,8 +6744,9 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_a_single_1a_1a_t2_port: - type: org.openecomp.capabilities.Forwarder + network.outpoing.packets_a_single_1a_a_single_1a_t1_port_0: + 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 @@ -6753,15 +6756,7 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_a_single_1a_1a_t2_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 - network.incoming.packets_a_single_1a_1a_t2_port: + network.outgoing.packets.rate_a_single_1a_a_single_1a_t2_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -6796,82 +6791,72 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_a_single_1a_1a_t2_port: + disk.device.allocation_a_single_1a: 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_a_single_1a: + disk.write.bytes_a_single_1a: 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_a_single_1a: + disk.device.read.bytes.rate_a_single_1a: 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_a_single_1a_1a_t1_port: - type: tosca.capabilities.Node + disk.device.write.bytes_a_single_1a: + 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_a_single_1a_1a_t2_port: + disk.device.write.bytes.rate_a_single_1a: 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_a_single_1a_1a_t1_port: + network.incoming.packets_a_single_1a_a_single_1a_t2_port_0: 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_a_single_1a: - 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_a_single_1a: + memory_a_single_1a: 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_a_single_1a: + disk.allocation_a_single_1a: 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_a_single_1a: + network.incoming.packets_a_single_1a_a_single_1a_t1_port_0: 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.allocation_a_single_1a: + network.outgoing.bytes.rate_a_single_1a_a_single_1a_t2_port_0: 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.packets.rate_a_single_1a_1a_t1_port: + network.outgoing.bytes.rate_a_single_1a_a_single_1a_t1_port_0: 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_a_single_1a_1a_t2_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.capacity_a_single_1a: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -6884,23 +6869,22 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_a_single_1a_1a_t1_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_a_single_1a: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_a_single_1a_1a_t1_port: + network.outgoing.bytes_a_single_1a_a_single_1a_t1_port_0: 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_a_single_1a_a_single_1a_t2_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.ephemeral.size_a_single_1a: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -6913,13 +6897,16 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_a_single_1a_1a_t1_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 + attachment_a_single_1a_a_single_1a_t2_port_0: + type: tosca.capabilities.Attachment occurrences: - - 0 + - 1 + - UNBOUNDED + network.incoming.packets.rate_a_single_1a_a_single_1a_t1_port_0: + 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.iops_a_single_1a: type: org.openecomp.capabilities.metric.Ceilometer @@ -6933,31 +6920,44 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.read.requests.rate_a_single_1a: + network.outpoing.packets_a_single_1a_a_single_1a_t2_port_0: 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_a_single_1a: + disk.device.read.requests.rate_a_single_1a: 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_a_single_1a: + feature_a_single_1a_a_single_1a_t1_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + disk.device.capacity_a_single_1a: 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_a_single_1a_1a_t2_port: + binding_a_single_1a_a_single_1a_t1_port_0: + 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 + disk.write.requests.rate_a_single_1a: 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_a_single_1a_1a_t1_port: + network.outgoing.packets.rate_a_single_1a_a_single_1a_t1_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -6966,43 +6966,55 @@ node_types: org.openecomp.resource.abstract.nodes.b_single_1b_1: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_1b_t1_port_order: - type: integer + port_b_single_1b_t1_port_0_network_role_tag: + type: string required: true status: SUPPORTED - port_1b_t1_port_network_role: + port_b_single_1b_t1_port_0_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_b_single_1b_t2_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_1b_t1_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_b_single_1b_t1_port_0_network_role: + type: string + required: true + status: SUPPORTED + port_b_single_1b_t2_port_0_network: + type: list required: true status: SUPPORTED + entry_schema: + type: string vm_flavor_name: type: string required: true status: SUPPORTED - port_1b_t2_port_related_networks: + port_b_single_1b_t1_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_1b_t1_port_ip_requirements: + type: org.openecomp.datatypes.network.VlanRequirements + port_b_single_1b_t2_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_image_name: type: string required: true status: SUPPORTED - port_1b_t2_port_network_role: - type: string + port_b_single_1b_t2_port_0_order: + type: integer required: true status: SUPPORTED - port_1b_t2_port_order: + port_b_single_1b_t1_port_0_order: type: integer required: true status: SUPPORTED @@ -7012,34 +7024,32 @@ node_types: status: SUPPORTED entry_schema: type: string - port_1b_t2_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_1b_t2_port_network_role_tag: - type: string + port_b_single_1b_t2_port_0_vlan_requirements: + type: list required: true status: SUPPORTED - port_1b_t2_port_subnetpoolid: + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_b_single_1b_t2_port_0_network_role: type: string required: true status: SUPPORTED - port_1b_t1_port_related_networks: + port_b_single_1b_t1_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_1b_t2_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED + type: org.openecomp.datatypes.network.IpRequirements compute_b_single_1b_availability_zone: type: list required: true status: SUPPORTED entry_schema: type: string + port_b_single_1b_t1_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED index_value: type: integer description: Index value of this substitution service template runtime instance @@ -7054,19 +7064,15 @@ node_types: status: SUPPORTED entry_schema: type: json - port_1b_t2_port_vlan_requirements: - type: list + port_b_single_1b_t1_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_1b_t2_port_ip_requirements: - type: list + port_b_single_1b_t1_port_0_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_1b_t1_port_network_role_tag: + port_b_single_1b_t2_port_0_network_role_tag: type: string required: true status: SUPPORTED @@ -7076,26 +7082,20 @@ node_types: status: SUPPORTED entry_schema: type: json - port_1b_t1_port_subnetpoolid: - type: string + port_b_single_1b_t2_port_0_ip_requirements: + type: list required: true status: SUPPORTED - port_1b_t1_port_mac_requirements: + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_b_single_1b_t2_port_0_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_1b_t2_port_network: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_1b_t1_port_vlan_requirements: - type: list + port_b_single_1b_t2_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements compute_b_single_1b_name: type: list required: true @@ -7106,7 +7106,7 @@ node_types: b_single_1b_instance_name: type: string status: SUPPORTED - b_single_1b_1b_t1_port_tenant_id: + b_single_1b_b_single_1b_t1_port_0_tenant_id: type: string status: SUPPORTED requirements: @@ -7124,43 +7124,33 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_b_single_1b_1b_t1_port: + - dependency_b_single_1b_b_single_1b_t2_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_b_single_1b_1b_t1_port: + - link_b_single_1b_b_single_1b_t2_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_b_single_1b_1b_t2_port: + - dependency_b_single_1b_b_single_1b_t1_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_b_single_1b_1b_t2_port: + - link_b_single_1b_b_single_1b_t1_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: - attachment_b_single_1b_1b_t2_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - forwarder_b_single_1b_1b_t2_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED endpoint_b_single_1b: type: tosca.capabilities.Endpoint.Admin occurrences: @@ -7177,23 +7167,56 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_b_single_1b_1b_t2_port: + network.incoming.bytes_b_single_1b_b_single_1b_t1_port_0: 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_b_single_1b_1b_t2_port: + network.incoming.packets.rate_b_single_1b_b_single_1b_t2_port_0: 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_b_single_1b_1b_t1_port: - type: org.openecomp.capabilities.Forwarder + network.incoming.bytes_b_single_1b_b_single_1b_t2_port_0: + 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_b_single_1b_b_single_1b_t1_port_0: + 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 + feature_b_single_1b_b_single_1b_t2_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + feature_b_single_1b_b_single_1b_t1_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes.rate_b_single_1b_b_single_1b_t1_port_0: + 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_b_single_1b_b_single_1b_t2_port_0: + 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 scalable_b_single_1b: type: tosca.capabilities.Scalable occurrences: @@ -7210,6 +7233,16 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_b_single_1b_b_single_1b_t2_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + forwarder_b_single_1b_b_single_1b_t1_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED vcpus_b_single_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -7222,25 +7255,25 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.read.requests.rate_b_single_1b: + network.incoming.bytes.rate_b_single_1b_b_single_1b_t2_port_0: 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_b_single_1b_1b_t2_port: + disk.device.read.requests.rate_b_single_1b: 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 - instance_b_single_1b: + network.incoming.packets.rate_b_single_1b_b_single_1b_t1_port_0: 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_b_single_1b_1b_t1_port: + instance_b_single_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -7264,49 +7297,43 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_b_single_1b_1b_t1_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.device.allocation_b_single_1b: 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.packets.rate_b_single_1b_1b_t2_port: + network.outgoing.packets.rate_b_single_1b_b_single_1b_t2_port_0: 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_b_single_1b: + network.outpoing.packets_b_single_1b_b_single_1b_t1_port_0: 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_b_single_1b: + network.outgoing.bytes_b_single_1b_b_single_1b_t2_port_0: 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_b_single_1b_1b_t2_port: + disk.device.capacity_b_single_1b: 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_b_single_1b_1b_t1_port: + disk.latency_b_single_1b: 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 - attachment_b_single_1b_1b_t1_port: + attachment_b_single_1b_b_single_1b_t1_port_0: type: tosca.capabilities.Attachment occurrences: - 1 @@ -7317,14 +7344,6 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_b_single_1b_1b_t2_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 disk.ephemeral.size_b_single_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -7337,25 +7356,25 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_b_single_1b_1b_t2_port: + disk.device.iops_b_single_1b: 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.iops_b_single_1b: + disk.read.requests_b_single_1b: 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_b_single_1b: + memory.resident_b_single_1b: 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_b_single_1b: + network.outgoing.bytes.rate_b_single_1b_b_single_1b_t2_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -7367,12 +7386,13 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_b_single_1b_1b_t1_port: - type: tosca.capabilities.Node + network.incoming.packets_b_single_1b_b_single_1b_t1_port_0: + 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_b_single_1b_1b_t2_port: + network.outgoing.bytes.rate_b_single_1b_b_single_1b_t1_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -7414,7 +7434,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_b_single_1b_1b_t1_port: + network.incoming.packets_b_single_1b_b_single_1b_t2_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -7432,63 +7452,48 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_b_single_1b_1b_t1_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.device.read.requests_b_single_1b: 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_b_single_1b_1b_t1_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_b_single_1b_b_single_1b_t2_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - binding_b_single_1b_1b_t1_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 - network.outpoing.packets_b_single_1b_1b_t1_port: + disk.device.write.requests.rate_b_single_1b: 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_b_single_1b: + network.outgoing.packets.rate_b_single_1b_b_single_1b_t1_port_0: 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_b_single_1b: + network.outpoing.packets_b_single_1b_b_single_1b_t2_port_0: 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_b_single_1b: + memory.usage_b_single_1b: 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_b_single_1b_1b_t2_port: + network.outgoing.bytes_b_single_1b_b_single_1b_t1_port_0: 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_b_single_1b_1b_t1_port: + disk.write.bytes.rate_b_single_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -7530,88 +7535,77 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_b_single_1b_1b_t2_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED org.openecomp.resource.abstract.nodes.b_single_2b: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_1b_t1_port_order: - type: integer + port_b_single_2b_t2_port_0_network_role: + type: string required: true status: SUPPORTED - port_1b_t1_port_network_role: + vm_flavor_name: type: string required: true status: SUPPORTED - port_1b_t1_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_b_single_2b_t1_port_0_ip_requirements: + type: list required: true status: SUPPORTED - vm_flavor_name: + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_b_single_2b_t1_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_1b_t2_port_related_networks: + port_b_single_2b_t2_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_1b_t1_port_ip_requirements: - type: list + vm_image_name: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - vm_image_name: + port_b_single_2b_t2_port_0_subnetpoolid: type: string required: true status: SUPPORTED - compute_b_single_2b_scheduler_hints: + port_b_single_2b_t2_port_0_network: type: list required: true status: SUPPORTED entry_schema: - type: json - port_1b_t2_port_network_role: - type: string - required: true - status: SUPPORTED - port_1b_t2_port_order: - type: integer + type: string + compute_b_single_2b_scheduler_hints: + type: list required: true status: SUPPORTED - port_1b_t2_port_exCP_naming: + entry_schema: + type: json + port_b_single_2b_t1_port_0_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_1b_t2_port_network_role_tag: - type: string - required: true - status: SUPPORTED - port_1b_t2_port_subnetpoolid: - type: string + port_b_single_2b_t1_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_1b_t1_port_related_networks: - type: list + port_b_single_2b_t2_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments compute_b_single_2b_availability_zone: type: list required: true status: SUPPORTED entry_schema: type: string - port_1b_t2_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_b_single_2b_t1_port_0_vlan_requirements: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements index_value: type: integer description: Index value of this substitution service template runtime instance @@ -7620,66 +7614,72 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_1b_t2_port_vlan_requirements: + compute_b_single_2b_name: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_1b_t2_port_ip_requirements: + type: string + port_b_single_2b_t1_port_0_order: + type: integer + required: true + status: SUPPORTED + port_b_single_2b_t2_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_b_single_2b_t2_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - compute_b_single_2b_name: + compute_b_single_2b_user_data_format: type: list required: true status: SUPPORTED entry_schema: type: string - port_1b_t1_port_value_specs: + port_b_single_2b_t2_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: json - compute_b_single_2b_user_data_format: + type: org.openecomp.datatypes.network.VlanRequirements + port_b_single_2b_t1_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: string - port_1b_t1_port_network_role_tag: - type: string - required: true - status: SUPPORTED - port_1b_t1_port_subnetpoolid: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_b_single_2b_t1_port_0_network_role: type: string required: true status: SUPPORTED - port_1b_t1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_b_single_2b_t1_port_0_value_specs: + type: list required: true status: SUPPORTED - port_1b_t2_port_network: + entry_schema: + type: json + port_b_single_2b_t1_port_0_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_1b_t1_port_vlan_requirements: - type: list + port_b_single_2b_t2_port_0_order: + type: integer + required: true + status: SUPPORTED + port_b_single_2b_t1_port_0_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_1b_t1_port_network: - type: list + port_b_single_2b_t2_port_0_network_role_tag: + type: string required: true status: SUPPORTED - entry_schema: - type: string attributes: b_single_2b_instance_name: type: string @@ -7699,27 +7699,27 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_b_single_2b_1b_t1_port: + - dependency_b_single_2b_b_single_2b_t1_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_b_single_2b_1b_t1_port: + - link_b_single_2b_b_single_2b_t1_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_b_single_2b_1b_t2_port: + - dependency_b_single_2b_b_single_2b_t2_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_b_single_2b_1b_t2_port: + - link_b_single_2b_b_single_2b_t2_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -7732,25 +7732,13 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_b_single_2b_1b_t2_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - network.incoming.bytes.rate_b_single_2b_1b_t2_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_b_single_2b_1b_t2_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_b_single_2b_b_single_2b_t1_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - attachment_b_single_2b_1b_t2_port: - type: tosca.capabilities.Attachment + feature_b_single_2b_b_single_2b_t2_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -7785,20 +7773,21 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_b_single_2b_1b_t2_port: + disk.read.bytes_b_single_2b: 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_b_single_2b: + network.incoming.bytes_b_single_2b_b_single_2b_t2_port_0: 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_b_single_2b_1b_t1_port: - type: org.openecomp.capabilities.Forwarder + network.incoming.bytes_b_single_2b_b_single_2b_t1_port_0: + 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 @@ -7814,19 +7803,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_b_single_2b_1b_t1_port: + network.outgoing.packets.rate_b_single_2b_b_single_2b_t2_port_0: 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_b_single_2b_1b_t1_port: + disk.write.requests.rate_b_single_2b: 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_b_single_2b: + network.incoming.bytes.rate_b_single_2b_b_single_2b_t2_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -7849,9 +7838,8 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_b_single_2b_1b_t2_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_b_single_2b_b_single_2b_t1_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED @@ -7867,24 +7855,27 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_b_single_2b_1b_t1_port: + network.incoming.packets.rate_b_single_2b_b_single_2b_t2_port_0: 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 - attachment_b_single_2b_1b_t1_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED disk.write.bytes_b_single_2b: 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_b_single_2b_1b_t2_port: + binding_b_single_2b_b_single_2b_t2_port_0: + 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 + network.outpoing.packets_b_single_2b_b_single_2b_t1_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -7896,19 +7887,17 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.read.requests.rate_b_single_2b: + network.outgoing.bytes_b_single_2b_b_single_2b_t2_port_0: 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_b_single_2b_1b_t2_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 + disk.device.read.requests.rate_b_single_2b: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - - 0 + - 1 - UNBOUNDED instance_b_single_2b: type: org.openecomp.capabilities.metric.Ceilometer @@ -7916,7 +7905,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_b_single_2b_1b_t2_port: + network.incoming.packets_b_single_2b_b_single_2b_t2_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -7928,32 +7917,33 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.latency_b_single_2b: + network.incoming.packets_b_single_2b_b_single_2b_t1_port_0: 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_b_single_2b_1b_t2_port: + network.outgoing.bytes.rate_b_single_2b_b_single_2b_t2_port_0: 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_b_single_2b: + disk.device.latency_b_single_2b: 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_b_single_2b: + disk.device.allocation_b_single_2b: 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_b_single_2b_1b_t1_port: - type: tosca.capabilities.Node + disk.latency_b_single_2b: + 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 @@ -7963,9 +7953,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_b_single_2b_1b_t1_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_b_single_2b_b_single_2b_t2_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + attachment_b_single_2b_b_single_2b_t1_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED @@ -7987,7 +7981,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_b_single_2b_1b_t1_port: + network.outgoing.bytes.rate_b_single_2b_b_single_2b_t1_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -7998,19 +7992,12 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_b_single_2b_1b_t1_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_b_single_2b_1b_t1_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + os_b_single_2b: + type: tosca.capabilities.OperatingSystem occurrences: - 1 - UNBOUNDED - binding_b_single_2b_1b_t1_port: + binding_b_single_2b_b_single_2b_t1_port_0: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface @@ -8018,23 +8005,24 @@ node_types: occurrences: - 0 - UNBOUNDED - feature_b_single_2b_1b_t2_port: - type: tosca.capabilities.Node + forwarder_b_single_2b_b_single_2b_t2_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - os_b_single_2b: - type: tosca.capabilities.OperatingSystem + disk.root.size_b_single_2b: + 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_b_single_2b: + disk.read.requests_b_single_2b: 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_b_single_2b: + network.incoming.bytes.rate_b_single_2b_b_single_2b_t1_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -8057,6 +8045,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets.rate_b_single_2b_b_single_2b_t1_port_0: + 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_b_single_2b: type: tosca.capabilities.Scalable occurrences: @@ -8080,6 +8074,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_b_single_2b_b_single_2b_t2_port_0: + 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_b_single_2b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -8092,19 +8092,19 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.read.bytes.rate_b_single_2b: + network.outgoing.packets.rate_b_single_2b_b_single_2b_t1_port_0: 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_b_single_2b_1b_t2_port: + disk.read.bytes.rate_b_single_2b: 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_b_single_2b_1b_t1_port: + network.outgoing.bytes_b_single_2b_b_single_2b_t1_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -8113,23 +8113,25 @@ node_types: org.openecomp.resource.abstract.nodes.b_single_2b_1: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_1b_t1_port_order: - type: integer + port_b_single_2b_t2_port_0_network_role: + type: string required: true status: SUPPORTED - port_1b_t1_port_network_role: + vm_flavor_name: type: string required: true status: SUPPORTED - port_1b_t1_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_b_single_2b_t1_port_0_ip_requirements: + type: list required: true status: SUPPORTED - vm_flavor_name: + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_b_single_2b_t1_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_1b_t2_port_related_networks: + port_b_single_2b_t2_port_0_related_networks: type: list required: true status: SUPPORTED @@ -8141,58 +8143,50 @@ node_types: status: SUPPORTED entry_schema: type: json - port_1b_t1_port_ip_requirements: - type: list + vm_image_name: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - vm_image_name: + port_b_single_2b_t2_port_0_subnetpoolid: type: string required: true status: SUPPORTED - compute_b_single_2b_scheduler_hints: + port_b_single_2b_t2_port_0_network: type: list required: true status: SUPPORTED entry_schema: - type: json - port_1b_t2_port_network_role: - type: string - required: true - status: SUPPORTED - port_1b_t2_port_order: - type: integer + type: string + compute_b_single_2b_scheduler_hints: + type: list required: true status: SUPPORTED - port_1b_t2_port_exCP_naming: + entry_schema: + type: json + port_b_single_2b_t1_port_0_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_1b_t2_port_network_role_tag: - type: string - required: true - status: SUPPORTED - port_1b_t2_port_subnetpoolid: - type: string + port_b_single_2b_t1_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_1b_t1_port_related_networks: - type: list + port_b_single_2b_t2_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments compute_b_single_2b_availability_zone: type: list required: true status: SUPPORTED entry_schema: type: string - port_1b_t2_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_b_single_2b_t1_port_0_vlan_requirements: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements index_value: type: integer description: Index value of this substitution service template runtime instance @@ -8201,54 +8195,60 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_1b_t2_port_vlan_requirements: + compute_b_single_2b_name: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_1b_t2_port_ip_requirements: + type: string + port_b_single_2b_t1_port_0_order: + type: integer + required: true + status: SUPPORTED + port_b_single_2b_t2_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_b_single_2b_t2_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - compute_b_single_2b_name: + compute_b_single_2b_user_data_format: type: list required: true status: SUPPORTED entry_schema: type: string - compute_b_single_2b_user_data_format: + port_b_single_2b_t2_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_1b_t1_port_network_role_tag: - type: string + type: org.openecomp.datatypes.network.VlanRequirements + port_b_single_2b_t1_port_0_related_networks: + type: list required: true status: SUPPORTED - port_1b_t1_port_subnetpoolid: + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_b_single_2b_t1_port_0_network_role: type: string required: true status: SUPPORTED - port_1b_t1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_b_single_2b_t2_port_0_order: + type: integer required: true status: SUPPORTED - port_1b_t2_port_network: - type: list + port_b_single_2b_t1_port_0_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: string - port_1b_t1_port_vlan_requirements: - type: list + port_b_single_2b_t2_port_0_network_role_tag: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements attributes: b_single_2b_instance_name: type: string @@ -8268,27 +8268,27 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_b_single_2b_1b_t1_port: + - dependency_b_single_2b_b_single_2b_t1_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_b_single_2b_1b_t1_port: + - link_b_single_2b_b_single_2b_t1_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_b_single_2b_1b_t2_port: + - dependency_b_single_2b_b_single_2b_t2_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_b_single_2b_1b_t2_port: + - link_b_single_2b_b_single_2b_t2_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -8301,25 +8301,13 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_b_single_2b_1b_t2_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - network.incoming.bytes.rate_b_single_2b_1b_t2_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_b_single_2b_1b_t2_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_b_single_2b_b_single_2b_t1_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - attachment_b_single_2b_1b_t2_port: - type: tosca.capabilities.Attachment + feature_b_single_2b_b_single_2b_t2_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -8354,20 +8342,21 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_b_single_2b_1b_t2_port: + disk.read.bytes_b_single_2b: 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_b_single_2b: + network.incoming.bytes_b_single_2b_b_single_2b_t2_port_0: 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_b_single_2b_1b_t1_port: - type: org.openecomp.capabilities.Forwarder + network.incoming.bytes_b_single_2b_b_single_2b_t1_port_0: + 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 @@ -8383,19 +8372,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_b_single_2b_1b_t1_port: + network.outgoing.packets.rate_b_single_2b_b_single_2b_t2_port_0: 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_b_single_2b_1b_t1_port: + disk.write.requests.rate_b_single_2b: 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_b_single_2b: + network.incoming.bytes.rate_b_single_2b_b_single_2b_t2_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -8418,9 +8407,8 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_b_single_2b_1b_t2_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_b_single_2b_b_single_2b_t1_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED @@ -8436,24 +8424,27 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_b_single_2b_1b_t1_port: + network.incoming.packets.rate_b_single_2b_b_single_2b_t2_port_0: 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 - attachment_b_single_2b_1b_t1_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED disk.write.bytes_b_single_2b: 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_b_single_2b_1b_t2_port: + binding_b_single_2b_b_single_2b_t2_port_0: + 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 + network.outpoing.packets_b_single_2b_b_single_2b_t1_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -8465,19 +8456,17 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.read.requests.rate_b_single_2b: + network.outgoing.bytes_b_single_2b_b_single_2b_t2_port_0: 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_b_single_2b_1b_t2_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 + disk.device.read.requests.rate_b_single_2b: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - - 0 + - 1 - UNBOUNDED instance_b_single_2b: type: org.openecomp.capabilities.metric.Ceilometer @@ -8485,7 +8474,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_b_single_2b_1b_t2_port: + network.incoming.packets_b_single_2b_b_single_2b_t2_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -8497,32 +8486,33 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.latency_b_single_2b: + network.incoming.packets_b_single_2b_b_single_2b_t1_port_0: 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_b_single_2b_1b_t2_port: + network.outgoing.bytes.rate_b_single_2b_b_single_2b_t2_port_0: 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_b_single_2b: + disk.device.latency_b_single_2b: 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_b_single_2b: + disk.device.allocation_b_single_2b: 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_b_single_2b_1b_t1_port: - type: tosca.capabilities.Node + disk.latency_b_single_2b: + 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 @@ -8532,9 +8522,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_b_single_2b_1b_t1_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_b_single_2b_b_single_2b_t2_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + attachment_b_single_2b_b_single_2b_t1_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED @@ -8556,7 +8550,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_b_single_2b_1b_t1_port: + network.outgoing.bytes.rate_b_single_2b_b_single_2b_t1_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -8567,19 +8561,12 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_b_single_2b_1b_t1_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_b_single_2b_1b_t1_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + os_b_single_2b: + type: tosca.capabilities.OperatingSystem occurrences: - 1 - UNBOUNDED - binding_b_single_2b_1b_t1_port: + binding_b_single_2b_b_single_2b_t1_port_0: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface @@ -8587,23 +8574,24 @@ node_types: occurrences: - 0 - UNBOUNDED - feature_b_single_2b_1b_t2_port: - type: tosca.capabilities.Node + forwarder_b_single_2b_b_single_2b_t2_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - os_b_single_2b: - type: tosca.capabilities.OperatingSystem + disk.root.size_b_single_2b: + 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_b_single_2b: + disk.read.requests_b_single_2b: 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_b_single_2b: + network.incoming.bytes.rate_b_single_2b_b_single_2b_t1_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -8626,6 +8614,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets.rate_b_single_2b_b_single_2b_t1_port_0: + 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_b_single_2b: type: tosca.capabilities.Scalable occurrences: @@ -8649,6 +8643,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_b_single_2b_b_single_2b_t2_port_0: + 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_b_single_2b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -8661,19 +8661,19 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.read.bytes.rate_b_single_2b: + network.outgoing.packets.rate_b_single_2b_b_single_2b_t1_port_0: 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_b_single_2b_1b_t2_port: + disk.read.bytes.rate_b_single_2b: 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_b_single_2b_1b_t1_port: + network.outgoing.bytes_b_single_2b_b_single_2b_t1_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/MainServiceTemplate.yaml index 6741c72585..9cabc6d0d0 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/MainServiceTemplate.yaml @@ -264,43 +264,43 @@ topology_template: directives: - substitutable properties: + port_b_single_1b_t1_port_0_network_role_tag: oam + port_b_single_1b_t2_port_0_network: + - b_single_1b_network_1 vm_flavor_name: get_input: pd_flavor_name - port_1b_t1_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false vm_image_name: get_input: pd_image_name compute_b_single_1b_user_data_format: - RAW - port_1b_t2_port_mac_requirements: - mac_count_required: + port_b_single_1b_t1_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: is_required: false + port_b_single_1b_t1_port_0_value_specs: + - get_attribute: + - abstract_a_single_1a + - a_single_1a_a_single_1a_t1_port_0_tenant_id compute_b_single_1b_availability_zone: - get_input: availabilityzone_name compute_b_single_1b_scheduler_hints: - group: BE_Affinity_group - port_1b_t2_port_ip_requirements: + port_b_single_1b_t1_port_0_mac_requirements: + mac_count_required: + is_required: false + port_b_single_1b_t1_port_0_network: + - get_input: oam_net_name + port_b_single_1b_t2_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_1b_t1_port_value_specs: - - get_attribute: - - abstract_a_single_1a - - a_single_1a_1a_t1_port_tenant_id - port_1b_t1_port_network_role_tag: oam - port_1b_t1_port_mac_requirements: + port_b_single_1b_t2_port_0_mac_requirements: mac_count_required: is_required: false - port_1b_t2_port_network: - - b_single_1b_network_1 - port_1b_t1_port_network: - - get_input: oam_net_name compute_b_single_1b_name: - get_input: - b_single_1b_names @@ -314,7 +314,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_b_single_1b_1b_t2_port: + - link_b_single_1b_b_single_1b_t2_port_0: capability: tosca.capabilities.network.Linkable node: b_single_1b_network_1 relationship: tosca.relationships.network.LinksTo @@ -329,7 +329,15 @@ topology_template: - 1c2_catalog_instance_instance_name vm_flavor_name: get_input: pd_flavor_name - port_2c202_port_ip_requirements: + port_2c2_catalog_instance_202_port_0_network: + - 1c2_catalog_instance_network + port_2c2_catalog_instance_202_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_2c2_catalog_instance_201_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false @@ -337,30 +345,22 @@ topology_template: is_required: false vm_image_name: get_input: pd_image_name - port_1c201_port_network_role_tag: oam compute_2c2_catalog_instance_scheduler_hints: - group: BE_Affinity_group compute_2c2_catalog_instance_availability_zone: - get_input: availabilityzone_name - compute_2c2_catalog_instance_name: - - get_input: - - 2c2_catalog_instance_names - - 1 - port_2c202_port_mac_requirements: + port_2c2_catalog_instance_201_port_0_mac_requirements: mac_count_required: is_required: false - port_2c202_port_network: - - 1c2_catalog_instance_network - port_1c201_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false - port_1c201_port_mac_requirements: + port_2c2_catalog_instance_202_port_0_mac_requirements: mac_count_required: is_required: false - port_1c201_port_network: + compute_2c2_catalog_instance_name: + - get_input: + - 2c2_catalog_instance_names + - 1 + port_2c2_catalog_instance_201_port_0_network_role_tag: oam + port_2c2_catalog_instance_201_port_0_network: - get_input: oam_net_name service_template_filter: substitute_service_template: Nested_2c2_catalog_instanceServiceTemplate.yaml @@ -371,7 +371,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_2c2_catalog_instance_2c202_port: + - link_2c2_catalog_instance_2c2_catalog_instance_202_port_0: capability: tosca.capabilities.network.Linkable node: 1c2_catalog_instance_network relationship: tosca.relationships.network.LinksTo @@ -384,7 +384,15 @@ topology_template: - RAW1 vm_flavor_name: get_input: pd_flavor_name - port_2c202_port_ip_requirements: + port_2c2_catalog_instance_202_port_0_network: + - 1c2_catalog_instance_network + port_2c2_catalog_instance_202_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_2c2_catalog_instance_201_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false @@ -392,30 +400,22 @@ topology_template: is_required: false vm_image_name: get_input: pd_image_name - port_1c201_port_network_role_tag: oam compute_2c2_catalog_instance_scheduler_hints: - group: BE_Affinity_group compute_2c2_catalog_instance_availability_zone: - get_input: availabilityzone_name - compute_2c2_catalog_instance_name: - - get_input: - - 2c2_catalog_instance_names - - 0 - port_2c202_port_mac_requirements: + port_2c2_catalog_instance_201_port_0_mac_requirements: mac_count_required: is_required: false - port_2c202_port_network: - - 1c2_catalog_instance_network - port_1c201_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false - port_1c201_port_mac_requirements: + port_2c2_catalog_instance_202_port_0_mac_requirements: mac_count_required: is_required: false - port_1c201_port_network: + compute_2c2_catalog_instance_name: + - get_input: + - 2c2_catalog_instance_names + - 0 + port_2c2_catalog_instance_201_port_0_network_role_tag: oam + port_2c2_catalog_instance_201_port_0_network: - get_input: oam_net_name service_template_filter: substitute_service_template: Nested_2c2_catalog_instanceServiceTemplate.yaml @@ -426,7 +426,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_2c2_catalog_instance_2c202_port: + - link_2c2_catalog_instance_2c2_catalog_instance_202_port_0: capability: tosca.capabilities.network.Linkable node: 1c2_catalog_instance_network relationship: tosca.relationships.network.LinksTo @@ -439,39 +439,39 @@ topology_template: - get_input: availabilityzone_name vm_flavor_name: get_input: pd_flavor_name - compute_1c2_catalog_instance_personality: - - - UNSUPPORTED_RESOURCE_[1a_single_1A_1, instance_name] - port_2c202_port_ip_requirements: + port_1c2_catalog_instance_202_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false + compute_1c2_catalog_instance_personality: + - - UNSUPPORTED_RESOURCE_[1a_single_1A_1, instance_name] + port_1c2_catalog_instance_201_port_0_mac_requirements: + mac_count_required: + is_required: false + port_1c2_catalog_instance_202_port_0_network: + - 1c2_catalog_instance_network vm_image_name: get_input: pd_image_name - port_1c201_port_network_role_tag: oam + port_1c2_catalog_instance_202_port_0_mac_requirements: + mac_count_required: + is_required: false + port_1c2_catalog_instance_201_port_0_network_role_tag: oam compute_1c2_catalog_instance_name: - get_input: - 1c2_catalog_instance_names - 1 - port_2c202_port_mac_requirements: - mac_count_required: - is_required: false - port_2c202_port_network: - - 1c2_catalog_instance_network - port_1c201_port_ip_requirements: + port_1c2_catalog_instance_201_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_1c201_port_mac_requirements: - mac_count_required: - is_required: false + port_1c2_catalog_instance_201_port_0_network: + - get_input: oam_net_name compute_1c2_catalog_instance_user_data_format: - RAW1 - port_1c201_port_network: - - get_input: oam_net_name compute_1c2_catalog_instance_scheduler_hints: - group: BE_Affinity_group service_template_filter: @@ -483,7 +483,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_1c2_catalog_instance_2c202_port: + - link_1c2_catalog_instance_1c2_catalog_instance_202_port_0: capability: tosca.capabilities.network.Linkable node: 1c2_catalog_instance_network relationship: tosca.relationships.network.LinksTo @@ -496,39 +496,39 @@ topology_template: - get_input: availabilityzone_name vm_flavor_name: get_input: pd_flavor_name - port_2c202_port_ip_requirements: + port_1c2_catalog_instance_202_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false + port_1c2_catalog_instance_201_port_0_mac_requirements: + mac_count_required: + is_required: false + port_1c2_catalog_instance_202_port_0_network: + - 1c2_catalog_instance_network vm_image_name: get_input: pd_image_name - port_1c201_port_network_role_tag: oam + port_1c2_catalog_instance_202_port_0_mac_requirements: + mac_count_required: + is_required: false + port_1c2_catalog_instance_201_port_0_network_role_tag: oam compute_1c2_catalog_instance_name: - get_input: - 1c2_catalog_instance_names - 2 - port_2c202_port_mac_requirements: - mac_count_required: - is_required: false - port_2c202_port_network: - - 1c2_catalog_instance_network - port_1c201_port_ip_requirements: + port_1c2_catalog_instance_201_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_1c201_port_mac_requirements: - mac_count_required: - is_required: false + port_1c2_catalog_instance_201_port_0_network: + - get_input: oam_net_name compute_1c2_catalog_instance_user_data_format: - get_attribute: - abstract_1c2_catalog_instance_0 - 1c2_catalog_instance_instance_name - port_1c201_port_network: - - get_input: oam_net_name compute_1c2_catalog_instance_scheduler_hints: - group: BE_Affinity_group service_template_filter: @@ -540,7 +540,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_1c2_catalog_instance_2c202_port: + - link_1c2_catalog_instance_1c2_catalog_instance_202_port_0: capability: tosca.capabilities.network.Linkable node: 1c2_catalog_instance_network relationship: tosca.relationships.network.LinksTo @@ -550,10 +550,10 @@ topology_template: dhcp_agent_ids: get_attribute: - abstract_1c2_catalog_instance_1 - - 1c2_catalog_instance_1c201_port_tenant_id + - 1c2_catalog_instance_1c2_catalog_instance_201_port_0_tenant_id - get_attribute: - abstract_1c2_catalog_instance_0 - - 1c2_catalog_instance_1c201_port_tenant_id + - 1c2_catalog_instance_1c2_catalog_instance_201_port_0_tenant_id - get_attribute: - abstract_1c2_catalog_instance_1 - 1c2_catalog_instance_instance_name @@ -582,7 +582,7 @@ topology_template: admin_state_up: get_attribute: - abstract_a_single_1a - - a_single_1a_1a_t1_port_tenant_id + - a_single_1a_a_single_1a_t1_port_0_tenant_id qos_policy: get_attribute: - abstract_a_single_1a @@ -603,10 +603,10 @@ topology_template: - b_single_1b_instance_name - get_attribute: - abstract_b_single_1b_1 - - b_single_1b_1b_t1_port_tenant_id + - b_single_1b_b_single_1b_t1_port_0_tenant_id - get_attribute: - abstract_b_single_1b - - b_single_1b_1b_t1_port_tenant_id + - b_single_1b_b_single_1b_t1_port_0_tenant_id abstract_a_single_1a: type: org.openecomp.resource.abstract.nodes.a_single_1a directives: @@ -676,43 +676,43 @@ topology_template: get_attribute: - abstract_1c2_catalog_instance_1 - 1c2_catalog_instance_instance_name - port_1a_t1_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false - port_1a_t2_port_network_role_tag: ppds vm_flavor_name: get_input: pd_flavor_name - port_1a_t2_port_network: - - get_input: ppds_net_name - port_1a_t1_port_mac_requirements: + port_a_single_1a_t2_port_0_network_role_tag: ppds + port_a_single_1a_t1_port_0_mac_requirements: mac_count_required: is_required: false - port_1a_t1_port_network: - - a_single_1a_network vm_image_name: get_input: pd_image_name - port_1a_t2_port_ip_requirements: + port_a_single_1a_t2_port_0_network: + - get_input: ppds_net_name + port_a_single_1a_t1_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false + port_a_single_1a_t2_port_0_mac_requirements: + mac_count_required: + is_required: false + port_a_single_1a_t1_port_0_network: + - a_single_1a_network compute_a_single_1a_availability_zone: - get_input: availabilityzone_name compute_a_single_1a_scheduler_hints: - group: BE_Affinity_group + port_a_single_1a_t2_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false compute_a_single_1a_user_data_format: - RAW compute_a_single_1a_name: - get_input: - a_single_1a_names - 0 - port_1a_t2_port_mac_requirements: - mac_count_required: - is_required: false service_template_filter: substitute_service_template: Nested_a_single_1aServiceTemplate.yaml count: 1 @@ -722,7 +722,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_a_single_1a_1a_t1_port: + - link_a_single_1a_a_single_1a_t1_port_0: capability: tosca.capabilities.network.Linkable node: a_single_1a_network relationship: tosca.relationships.network.LinksTo @@ -744,11 +744,11 @@ topology_template: connectivityTo1C1_T1_02: get_attribute: - abstract_1c11_scalling_instance - - 1c11_scalling_instance_1c1_t1_port_tenant_id + - 1c11_scalling_instance_1c11_scalling_instance_t1_port_0_tenant_id connectivityTo1C1_T1_11: get_attribute: - abstract_1c12_scalling_instance - - 1c12_scalling_instance_1c1_t1_port_tenant_id + - 1c12_scalling_instance_1c12_scalling_instance_t1_port_0_tenant_id connectivityTo4PNested_1: get_attribute: - 4p_nested_1 @@ -756,11 +756,11 @@ topology_template: connectivityTo1C1_T1_01: get_attribute: - abstract_1c11_scalling_instance - - 1c11_scalling_instance_1c1_t1_port_tenant_id + - 1c11_scalling_instance_1c11_scalling_instance_t1_port_0_tenant_id connectivityTo1C1_T1_12: get_attribute: - abstract_1c12_scalling_instance - - 1c12_scalling_instance_1c1_t1_port_tenant_id + - 1c12_scalling_instance_1c12_scalling_instance_t1_port_0_tenant_id connectivityTo1B01_1: get_attribute: - abstract_b_single_1b_1 @@ -840,11 +840,11 @@ topology_template: connectivityTo1C1_T1_02: get_attribute: - abstract_1c11_scalling_instance - - 1c11_scalling_instance_1c1_t1_port_tenant_id + - 1c11_scalling_instance_1c11_scalling_instance_t1_port_0_tenant_id connectivityTo1C1_T1_11: get_attribute: - abstract_1c12_scalling_instance - - 1c12_scalling_instance_1c1_t1_port_tenant_id + - 1c12_scalling_instance_1c12_scalling_instance_t1_port_0_tenant_id connectivityTo4PNested_1: get_attribute: - 4p_nested_1 @@ -852,11 +852,11 @@ topology_template: connectivityTo1C1_T1_01: get_attribute: - abstract_1c11_scalling_instance - - 1c11_scalling_instance_1c1_t1_port_tenant_id + - 1c11_scalling_instance_1c11_scalling_instance_t1_port_0_tenant_id connectivityTo1C1_T1_12: get_attribute: - abstract_1c12_scalling_instance - - 1c12_scalling_instance_1c1_t1_port_tenant_id + - 1c12_scalling_instance_1c12_scalling_instance_t1_port_0_tenant_id connectivityTo1B01_1: get_attribute: - abstract_b_single_1b_1 @@ -923,18 +923,6 @@ topology_template: directives: - substitutable properties: - port_1c1_t1_port_fixed_ips: - - - ip_address: - get_input: - - myIPs - - 1 - - - ip_address: - get_input: - - myIPs - - 1 - port_1c1_t1_port_mac_requirements: - mac_count_required: - is_required: false vm_flavor_name: get_input: pd_flavor_name compute_1c11_scalling_instance_name: @@ -950,23 +938,35 @@ topology_template: compute_1c11_scalling_instance_user_data_format: - RAW1 - RAW1 - port_1c1_t1_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: + port_1c11_scalling_instance_t1_port_0_name: + - 1c11_scalling_instance_0_t1_port_0 + - 1c11_scalling_instance_1_t1_port_0 + port_1c11_scalling_instance_t1_port_0_mac_requirements: + mac_count_required: is_required: false vm_image_name: get_input: pd_image_name - port_1c1_t1_port_name: - - 1c1_t1_port_01 - - 1c1_t1_port_02 compute_1c11_scalling_instance_scheduler_hints: - group: BE_Affinity_group - group: BE_Affinity_group - port_1c1_t1_port_network: + port_1c11_scalling_instance_t1_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + port_1c11_scalling_instance_t1_port_0_network: - 1c1_scalling_instance_network - 1c1_scalling_instance_network + port_1c11_scalling_instance_t1_port_0_fixed_ips: + - - ip_address: + get_input: + - myIPs + - 1 + - - ip_address: + get_input: + - myIPs + - 1 service_template_filter: substitute_service_template: Nested_1c11_scalling_instanceServiceTemplate.yaml count: 2 @@ -976,7 +976,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_1c11_scalling_instance_1c1_t1_port: + - link_1c11_scalling_instance_1c11_scalling_instance_t1_port_0: capability: tosca.capabilities.network.Linkable node: 1c1_scalling_instance_network relationship: tosca.relationships.network.LinksTo @@ -987,6 +987,12 @@ topology_template: properties: vm_flavor_name: get_input: pd_flavor_name + port_b_single_2b_t1_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false compute_b_single_2b_metadata: - connectivityTo4PNested_2: get_attribute: @@ -995,11 +1001,11 @@ topology_template: connectivityTo1C1_T1_02: get_attribute: - abstract_1c11_scalling_instance - - 1c11_scalling_instance_1c1_t1_port_tenant_id + - 1c11_scalling_instance_1c11_scalling_instance_t1_port_0_tenant_id connectivityTo1C1_T1_11: get_attribute: - abstract_1c12_scalling_instance - - 1c12_scalling_instance_1c1_t1_port_tenant_id + - 1c12_scalling_instance_1c12_scalling_instance_t1_port_0_tenant_id connectivityTo4PNested_1: get_attribute: - 4p_nested_1 @@ -1007,11 +1013,11 @@ topology_template: connectivityTo1C1_T1_01: get_attribute: - abstract_1c11_scalling_instance - - 1c11_scalling_instance_1c1_t1_port_tenant_id + - 1c11_scalling_instance_1c11_scalling_instance_t1_port_0_tenant_id connectivityTo1C1_T1_12: get_attribute: - abstract_1c12_scalling_instance - - 1c12_scalling_instance_1c1_t1_port_tenant_id + - 1c12_scalling_instance_1c12_scalling_instance_t1_port_0_tenant_id connectivityTo1B01_1: get_attribute: - abstract_b_single_1b_1 @@ -1052,38 +1058,32 @@ topology_template: get_attribute: - abstract_1c2_catalog_instance_1 - 1c2_catalog_instance_instance_name - port_1b_t1_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false vm_image_name: get_input: pd_image_name + port_b_single_2b_t2_port_0_network: + - b_single_1b_network_2 compute_b_single_2b_scheduler_hints: - group: BE_Affinity_group + port_b_single_2b_t1_port_0_mac_requirements: + mac_count_required: + is_required: false compute_b_single_2b_availability_zone: - get_input: availabilityzone_name - port_1b_t2_port_mac_requirements: + compute_b_single_2b_name: + - get_input: + - b_single_2b_names + - 0 + port_b_single_2b_t2_port_0_mac_requirements: mac_count_required: is_required: false - port_1b_t2_port_ip_requirements: + port_b_single_2b_t2_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - compute_b_single_2b_name: - - get_input: - - b_single_2b_names - - 0 compute_b_single_2b_user_data_format: - RAW - port_1b_t1_port_mac_requirements: - mac_count_required: - is_required: false - port_1b_t2_port_network: - - b_single_1b_network_2 service_template_filter: substitute_service_template: Nested_b_single_2b_1ServiceTemplate.yaml count: 1 @@ -1093,7 +1093,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_b_single_2b_1b_t2_port: + - link_b_single_2b_b_single_2b_t2_port_0: capability: tosca.capabilities.network.Linkable node: b_single_1b_network_2 relationship: tosca.relationships.network.LinksTo @@ -1115,15 +1115,6 @@ topology_template: compute_1c12_scalling_instance_scheduler_hints: - group: BE_Affinity_group - group: BE_Affinity_group - port_1c1_t1_port_fixed_ips: - - - ip_address: - get_input: - - myIPs - - 1 - - - ip_address: - get_input: - - myIPs - - 1 compute_1c12_scalling_instance_name: - get_input: - 1c12_scalling_instance_names @@ -1131,7 +1122,7 @@ topology_template: - get_input: - 1c12_scalling_instance_names - 2 - port_1c1_t1_port_mac_requirements: + port_1c12_scalling_instance_t1_port_0_mac_requirements: mac_count_required: is_required: false vm_flavor_name: @@ -1139,23 +1130,32 @@ topology_template: compute_1c12_scalling_instance_user_data_format: - RAW1 - RAW1 - port_1c1_t1_port_ip_requirements: + port_1c12_scalling_instance_t1_port_0_name: + - 1c12_scalling_instance_0_t1_port_0 + - 1c12_scalling_instance_1_t1_port_0 + port_1c12_scalling_instance_t1_port_0_network: + - 1c1_scalling_instance_network + - 1c1_scalling_instance_network + vm_image_name: + get_input: pd_image_name + port_1c12_scalling_instance_t1_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false - vm_image_name: - get_input: pd_image_name - port_1c1_t1_port_name: - - 1c1_t1_port_11 - - 1c1_t1_port_12 + port_1c12_scalling_instance_t1_port_0_fixed_ips: + - - ip_address: + get_input: + - myIPs + - 1 + - - ip_address: + get_input: + - myIPs + - 1 compute_1c12_scalling_instance_availability_zone: - get_input: availabilityzone_name - get_input: availabilityzone_name - port_1c1_t1_port_network: - - 1c1_scalling_instance_network - - 1c1_scalling_instance_network service_template_filter: substitute_service_template: Nested_1c12_scalling_instanceServiceTemplate.yaml count: 2 @@ -1165,7 +1165,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_1c12_scalling_instance_1c1_t1_port: + - link_1c12_scalling_instance_1c12_scalling_instance_t1_port_0: capability: tosca.capabilities.network.Linkable node: 1c1_scalling_instance_network relationship: tosca.relationships.network.LinksTo @@ -1304,25 +1304,25 @@ topology_template: directives: - substitutable properties: - compute_a_single_2a_user_data_format: - - RAW - port_1a_t1_port_ip_requirements: + port_a_single_2a_t1_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false + compute_a_single_2a_user_data_format: + - RAW + port_a_single_2a_t1_port_0_mac_requirements: + mac_count_required: + is_required: false + port_a_single_2a_t1_port_0_network: + - a_single_1a_network compute_a_single_2a_scheduler_hints: - group: BE_Affinity_group compute_a_single_2a_availability_zone: - get_input: availabilityzone_name vm_flavor_name: get_input: pd_flavor_name - port_1a_t1_port_mac_requirements: - mac_count_required: - is_required: false - port_1a_t1_port_network: - - a_single_1a_network compute_a_single_2a_name: - get_input: - a_single_2a_names @@ -1402,7 +1402,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_a_single_2a_1a_t1_port: + - link_a_single_2a_a_single_2a_t1_port_0: capability: tosca.capabilities.network.Linkable node: a_single_1a_network relationship: tosca.relationships.network.LinksTo @@ -1460,44 +1460,44 @@ topology_template: properties: vm_flavor_name: get_input: pd_flavor_name - port_1b_t1_port_ip_requirements: + port_b_single_2b_t1_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false + port_b_single_2b_t1_port_0_network_role_tag: oam vm_image_name: get_input: pd_image_name + port_b_single_2b_t2_port_0_network: + - b_single_1b_network_2 compute_b_single_2b_scheduler_hints: - group: BE_Affinity_group + port_b_single_2b_t1_port_0_mac_requirements: + mac_count_required: + is_required: false compute_b_single_2b_availability_zone: - get_input: availabilityzone_name - port_1b_t2_port_mac_requirements: + compute_b_single_2b_name: + - get_input: + - b_single_2b_names + - 1 + port_b_single_2b_t2_port_0_mac_requirements: mac_count_required: is_required: false - port_1b_t2_port_ip_requirements: + port_b_single_2b_t2_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - compute_b_single_2b_name: - - get_input: - - b_single_2b_names - - 1 - port_1b_t1_port_value_specs: - - get_attribute: - - abstract_a_single_1a - - a_single_1a_1a_t1_port_tenant_id compute_b_single_2b_user_data_format: - RAW - port_1b_t1_port_network_role_tag: oam - port_1b_t1_port_mac_requirements: - mac_count_required: - is_required: false - port_1b_t2_port_network: - - b_single_1b_network_2 - port_1b_t1_port_network: + port_b_single_2b_t1_port_0_value_specs: + - get_attribute: + - abstract_a_single_1a + - a_single_1a_a_single_1a_t1_port_0_tenant_id + port_b_single_2b_t1_port_0_network: - get_input: oam_net_name service_template_filter: substitute_service_template: Nested_b_single_2bServiceTemplate.yaml @@ -1508,7 +1508,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_b_single_2b_1b_t2_port: + - link_b_single_2b_b_single_2b_t2_port_0: capability: tosca.capabilities.network.Linkable node: b_single_1b_network_2 relationship: tosca.relationships.network.LinksTo @@ -1519,11 +1519,11 @@ topology_template: get_input: net_name requirements: - dependency: - capability: feature_1c2_catalog_instance_1c201_port + capability: feature_1c2_catalog_instance_1c2_catalog_instance_201_port_0 node: abstract_1c2_catalog_instance_1 relationship: tosca.relationships.DependsOn - dependency: - capability: feature_1c2_catalog_instance_1c201_port + capability: feature_1c2_catalog_instance_1c2_catalog_instance_201_port_0 node: abstract_1c2_catalog_instance_0 relationship: tosca.relationships.DependsOn - dependency: @@ -1567,11 +1567,11 @@ topology_template: node: abstract_b_single_1b relationship: tosca.relationships.DependsOn - dependency: - capability: feature_b_single_1b_1b_t1_port + capability: feature_b_single_1b_b_single_1b_t1_port_0 node: abstract_b_single_1b_1 relationship: tosca.relationships.DependsOn - dependency: - capability: feature_b_single_1b_1b_t1_port + capability: feature_b_single_1b_b_single_1b_t1_port_0 node: abstract_b_single_1b relationship: tosca.relationships.DependsOn - dependency: @@ -1583,7 +1583,7 @@ topology_template: node: abstract_a_single_2a relationship: tosca.relationships.DependsOn - dependency: - capability: feature_a_single_1a_1a_t1_port + capability: feature_a_single_1a_a_single_1a_t1_port_0 node: abstract_a_single_1a relationship: tosca.relationships.DependsOn 4p_nested_2: @@ -1601,11 +1601,11 @@ topology_template: connectivityChk: connectivityTo1C1_T1_02: get_attribute: - - 1c1_t1_port_02 + - 1c11_scalling_instance_1_t1_port_0 - tenant_id connectivityTo1C1_T1_11: get_attribute: - - 1c1_t1_port_11 + - 1c12_scalling_instance_0_t1_port_0 - tenant_id connectivityTo4PNested_1: get_attribute: @@ -1613,11 +1613,11 @@ topology_template: - server_pcm_id connectivityTo1C1_T1_01: get_attribute: - - 1c1_t1_port_01 + - 1c11_scalling_instance_0_t1_port_0 - tenant_id connectivityTo1C1_T1_12: get_attribute: - - 1c1_t1_port_12 + - 1c12_scalling_instance_1_t1_port_0 - tenant_id connectivityTo1B01_1: get_attribute: @@ -1738,19 +1738,19 @@ topology_template: - server_pcm_id connectivityTo1C1_T1_02: get_attribute: - - 1c1_t1_port_02 + - 1c11_scalling_instance_1_t1_port_0 - tenant_id connectivityTo1C1_T1_11: get_attribute: - - 1c1_t1_port_11 + - 1c12_scalling_instance_0_t1_port_0 - tenant_id connectivityTo1C1_T1_01: get_attribute: - - 1c1_t1_port_01 + - 1c11_scalling_instance_0_t1_port_0 - tenant_id connectivityTo1C1_T1_12: get_attribute: - - 1c1_t1_port_12 + - 1c12_scalling_instance_1_t1_port_0 - tenant_id connectivityTo1B01_1: get_attribute: @@ -1862,30 +1862,26 @@ topology_template: directives: - substitutable properties: + port_b_single_1b_t2_port_0_network: + - b_single_1b_network_1 vm_flavor_name: get_input: pd_flavor_name - port_1b_t1_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false vm_image_name: get_input: pd_image_name compute_b_single_1b_user_data_format: - RAW - port_1b_t2_port_mac_requirements: - mac_count_required: + port_b_single_1b_t1_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: is_required: false compute_b_single_1b_availability_zone: - get_input: availabilityzone_name compute_b_single_1b_scheduler_hints: - group: BE_Affinity_group - port_1b_t2_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: + port_b_single_1b_t1_port_0_mac_requirements: + mac_count_required: is_required: false compute_b_single_1b_metadata: - connectivityTo4PNested_2: @@ -1895,11 +1891,11 @@ topology_template: connectivityTo1C1_T1_02: get_attribute: - abstract_1c11_scalling_instance - - 1c11_scalling_instance_1c1_t1_port_tenant_id + - 1c11_scalling_instance_1c11_scalling_instance_t1_port_0_tenant_id connectivityTo1C1_T1_11: get_attribute: - abstract_1c12_scalling_instance - - 1c12_scalling_instance_1c1_t1_port_tenant_id + - 1c12_scalling_instance_1c12_scalling_instance_t1_port_0_tenant_id connectivityTo4PNested_1: get_attribute: - 4p_nested_1 @@ -1907,11 +1903,11 @@ topology_template: connectivityTo1C1_T1_01: get_attribute: - abstract_1c11_scalling_instance - - 1c11_scalling_instance_1c1_t1_port_tenant_id + - 1c11_scalling_instance_1c11_scalling_instance_t1_port_0_tenant_id connectivityTo1C1_T1_12: get_attribute: - abstract_1c12_scalling_instance - - 1c12_scalling_instance_1c1_t1_port_tenant_id + - 1c12_scalling_instance_1c12_scalling_instance_t1_port_0_tenant_id connectivityTo1B01_2: get_attribute: - abstract_b_single_2b_1 @@ -1952,11 +1948,15 @@ topology_template: get_attribute: - abstract_1c2_catalog_instance_1 - 1c2_catalog_instance_instance_name - port_1b_t1_port_mac_requirements: + port_b_single_1b_t2_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_b_single_1b_t2_port_0_mac_requirements: mac_count_required: is_required: false - port_1b_t2_port_network: - - b_single_1b_network_1 compute_b_single_1b_name: - get_input: - b_single_1b_names @@ -1970,7 +1970,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_b_single_1b_1b_t2_port: + - link_b_single_1b_b_single_1b_t2_port_0: capability: tosca.capabilities.network.Linkable node: b_single_1b_network_1 relationship: tosca.relationships.network.LinksTo @@ -2030,10 +2030,10 @@ topology_template: value: get_attribute: - abstract_1c2_catalog_instance_1 - - 1c2_catalog_instance_1c201_port_tenant_id + - 1c2_catalog_instance_1c2_catalog_instance_201_port_0_tenant_id - get_attribute: - abstract_1c2_catalog_instance_0 - - 1c2_catalog_instance_1c201_port_tenant_id + - 1c2_catalog_instance_1c2_catalog_instance_201_port_0_tenant_id - get_attribute: - abstract_1c2_catalog_instance_1 - 1c2_catalog_instance_instance_name @@ -2070,10 +2070,10 @@ topology_template: - b_single_1b_instance_name - get_attribute: - abstract_b_single_1b_1 - - b_single_1b_1b_t1_port_tenant_id + - b_single_1b_b_single_1b_t1_port_0_tenant_id - get_attribute: - abstract_b_single_1b - - b_single_1b_1b_t1_port_tenant_id + - b_single_1b_b_single_1b_t1_port_0_tenant_id out5: value: get_attribute: @@ -2091,7 +2091,7 @@ topology_template: value: get_attribute: - abstract_a_single_1a - - a_single_1a_1a_t1_port_tenant_id + - a_single_1a_a_single_1a_t1_port_0_tenant_id out7: value: get_attribute: 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_1c11_scalling_instanceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c11_scalling_instanceServiceTemplate.yaml index 8640992fb3..c475f397f6 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c11_scalling_instanceServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c11_scalling_instanceServiceTemplate.yaml @@ -11,21 +11,8 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_1c1_t1_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_1c1_t1_port_fixed_ips: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_1c1_t1_port_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_1c1_t1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_1c11_scalling_instance_t1_port_0_network_role: + type: string required: true index_value: type: integer @@ -34,6 +21,11 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 + port_1c11_scalling_instance_t1_port_0_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true @@ -52,109 +44,117 @@ topology_template: required: true entry_schema: type: string - port_1c1_t1_port_related_networks: + port_1c11_scalling_instance_t1_port_0_name: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_1c1_t1_port_ip_requirements: + type: string + port_1c11_scalling_instance_t1_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_1c11_scalling_instance_t1_port_0_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: org.openecomp.datatypes.network.VlanRequirements + port_1c11_scalling_instance_t1_port_0_order: + type: integer + required: true vm_image_name: type: string required: true - port_1c1_t1_port_name: - type: list + port_1c11_scalling_instance_t1_port_0_network_role_tag: + type: string required: true - entry_schema: - type: string compute_1c11_scalling_instance_scheduler_hints: type: list required: true entry_schema: type: json - port_1c1_t1_port_subnetpoolid: - type: string - required: true - port_1c1_t1_port_network_role_tag: - type: string + port_1c11_scalling_instance_t1_port_0_ip_requirements: + type: list required: true - port_1c1_t1_port_network_role: + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_1c11_scalling_instance_t1_port_0_subnetpoolid: type: string required: true - port_1c1_t1_port_network: + port_1c11_scalling_instance_t1_port_0_network: type: list required: true entry_schema: type: string - port_1c1_t1_port_order: - type: integer + port_1c11_scalling_instance_t1_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_1c11_scalling_instance_t1_port_0_fixed_ips: + type: list required: true + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps node_templates: - 1c11_scalling_instance: - type: org.openecomp.resource.vfc.compute.nodes.heat.1c11_scalling_instance - properties: - availability_zone: - get_input: - - compute_1c11_scalling_instance_availability_zone - - index_value - flavor: - get_input: vm_flavor_name - image: - get_input: vm_image_name - name: - get_input: - - compute_1c11_scalling_instance_name - - index_value - scheduler_hints: - get_input: - - compute_1c11_scalling_instance_scheduler_hints - - index_value - user_data_format: - get_input: - - compute_1c11_scalling_instance_user_data_format - - index_value - 1c11_scalling_instance_1c1_t1_port: + 1c11_scalling_instance_1c11_scalling_instance_t1_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_requirements: - get_input: port_1c1_t1_port_mac_requirements + get_input: port_1c11_scalling_instance_t1_port_0_mac_requirements order: - get_input: port_1c1_t1_port_order + get_input: port_1c11_scalling_instance_t1_port_0_order exCP_naming: - get_input: port_1c1_t1_port_exCP_naming + get_input: port_1c11_scalling_instance_t1_port_0_exCP_naming vlan_requirements: - get_input: port_1c1_t1_port_vlan_requirements + get_input: port_1c11_scalling_instance_t1_port_0_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_1c1_t1_port_ip_requirements + get_input: port_1c11_scalling_instance_t1_port_0_ip_requirements related_networks: - get_input: port_1c1_t1_port_related_networks + get_input: port_1c11_scalling_instance_t1_port_0_related_networks network_role_tag: - get_input: port_1c1_t1_port_network_role_tag + get_input: port_1c11_scalling_instance_t1_port_0_network_role_tag network_role: - get_input: port_1c1_t1_port_network_role + get_input: port_1c11_scalling_instance_t1_port_0_network_role fixed_ips: get_input: - - port_1c1_t1_port_fixed_ips + - port_1c11_scalling_instance_t1_port_0_fixed_ips - index_value subnetpoolid: - get_input: port_1c1_t1_port_subnetpoolid + get_input: port_1c11_scalling_instance_t1_port_0_subnetpoolid name: get_input: - - port_1c1_t1_port_name + - port_1c11_scalling_instance_t1_port_0_name - index_value network: get_input: - - port_1c1_t1_port_network + - port_1c11_scalling_instance_t1_port_0_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: 1c11_scalling_instance relationship: tosca.relationships.network.BindsTo + 1c11_scalling_instance: + type: org.openecomp.resource.vfc.compute.nodes.heat.1c11_scalling_instance + properties: + availability_zone: + get_input: + - compute_1c11_scalling_instance_availability_zone + - index_value + flavor: + get_input: vm_flavor_name + image: + get_input: vm_image_name + name: + get_input: + - compute_1c11_scalling_instance_name + - index_value + scheduler_hints: + get_input: + - compute_1c11_scalling_instance_scheduler_hints + - index_value + user_data_format: + get_input: + - compute_1c11_scalling_instance_user_data_format + - index_value outputs: 1c11_scalling_instance_instance_name: type: string @@ -162,11 +162,11 @@ topology_template: get_attribute: - 1c11_scalling_instance - instance_name - 1c11_scalling_instance_1c1_t1_port_tenant_id: + 1c11_scalling_instance_1c11_scalling_instance_t1_port_0_tenant_id: type: string value: get_attribute: - - 1c11_scalling_instance_1c1_t1_port + - 1c11_scalling_instance_1c11_scalling_instance_t1_port_0 - tenant_id substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.1c11_scalling_instance @@ -174,12 +174,6 @@ topology_template: disk.device.usage_1c11_scalling_instance: - 1c11_scalling_instance - disk.device.usage - network.incoming.packets_1c11_scalling_instance_1c1_t1_port: - - 1c11_scalling_instance_1c1_t1_port - - network.incoming.packets - network.incoming.packets.rate_1c11_scalling_instance_1c1_t1_port: - - 1c11_scalling_instance_1c1_t1_port - - network.incoming.packets.rate disk.allocation_1c11_scalling_instance: - 1c11_scalling_instance - disk.allocation @@ -207,36 +201,33 @@ topology_template: disk.latency_1c11_scalling_instance: - 1c11_scalling_instance - disk.latency - network.outgoing.packets.rate_1c11_scalling_instance_1c1_t1_port: - - 1c11_scalling_instance_1c1_t1_port - - network.outgoing.packets.rate vcpus_1c11_scalling_instance: - 1c11_scalling_instance - vcpus memory_1c11_scalling_instance: - 1c11_scalling_instance - memory + network.incoming.packets.rate_1c11_scalling_instance_1c11_scalling_instance_t1_port_0: + - 1c11_scalling_instance_1c11_scalling_instance_t1_port_0 + - network.incoming.packets.rate + binding_1c11_scalling_instance_1c11_scalling_instance_t1_port_0: + - 1c11_scalling_instance_1c11_scalling_instance_t1_port_0 + - binding cpu_1c11_scalling_instance: - 1c11_scalling_instance - cpu endpoint_1c11_scalling_instance: - 1c11_scalling_instance - endpoint - feature_1c11_scalling_instance_1c1_t1_port: - - 1c11_scalling_instance_1c1_t1_port - - feature scalable_1c11_scalling_instance: - 1c11_scalling_instance - scalable os_1c11_scalling_instance: - 1c11_scalling_instance - os - forwarder_1c11_scalling_instance_1c1_t1_port: - - 1c11_scalling_instance_1c1_t1_port - - forwarder - network.outpoing.packets_1c11_scalling_instance_1c1_t1_port: - - 1c11_scalling_instance_1c1_t1_port - - network.outpoing.packets + network.outgoing.packets.rate_1c11_scalling_instance_1c11_scalling_instance_t1_port_0: + - 1c11_scalling_instance_1c11_scalling_instance_t1_port_0 + - network.outgoing.packets.rate disk.ephemeral.size_1c11_scalling_instance: - 1c11_scalling_instance - disk.ephemeral.size @@ -258,36 +249,39 @@ topology_template: disk.device.write.bytes.rate_1c11_scalling_instance: - 1c11_scalling_instance - disk.device.write.bytes.rate + feature_1c11_scalling_instance_1c11_scalling_instance_t1_port_0: + - 1c11_scalling_instance_1c11_scalling_instance_t1_port_0 + - feature + network.incoming.packets_1c11_scalling_instance_1c11_scalling_instance_t1_port_0: + - 1c11_scalling_instance_1c11_scalling_instance_t1_port_0 + - network.incoming.packets cpu.delta_1c11_scalling_instance: - 1c11_scalling_instance - cpu.delta - network.outgoing.bytes_1c11_scalling_instance_1c1_t1_port: - - 1c11_scalling_instance_1c1_t1_port - - network.outgoing.bytes + attachment_1c11_scalling_instance_1c11_scalling_instance_t1_port_0: + - 1c11_scalling_instance_1c11_scalling_instance_t1_port_0 + - attachment disk.device.write.requests_1c11_scalling_instance: - 1c11_scalling_instance - disk.device.write.requests - network.incoming.bytes.rate_1c11_scalling_instance_1c1_t1_port: - - 1c11_scalling_instance_1c1_t1_port - - network.incoming.bytes.rate disk.device.capacity_1c11_scalling_instance: - 1c11_scalling_instance - disk.device.capacity - binding_1c11_scalling_instance_1c1_t1_port: - - 1c11_scalling_instance_1c1_t1_port - - binding + network.outgoing.bytes.rate_1c11_scalling_instance_1c11_scalling_instance_t1_port_0: + - 1c11_scalling_instance_1c11_scalling_instance_t1_port_0 + - network.outgoing.bytes.rate + network.incoming.bytes_1c11_scalling_instance_1c11_scalling_instance_t1_port_0: + - 1c11_scalling_instance_1c11_scalling_instance_t1_port_0 + - network.incoming.bytes disk.write.bytes_1c11_scalling_instance: - 1c11_scalling_instance - disk.write.bytes disk.write.requests_1c11_scalling_instance: - 1c11_scalling_instance - disk.write.requests - network.incoming.bytes_1c11_scalling_instance_1c1_t1_port: - - 1c11_scalling_instance_1c1_t1_port - - network.incoming.bytes - network.outgoing.bytes.rate_1c11_scalling_instance_1c1_t1_port: - - 1c11_scalling_instance_1c1_t1_port - - network.outgoing.bytes.rate + forwarder_1c11_scalling_instance_1c11_scalling_instance_t1_port_0: + - 1c11_scalling_instance_1c11_scalling_instance_t1_port_0 + - forwarder disk.device.read.requests_1c11_scalling_instance: - 1c11_scalling_instance - disk.device.read.requests @@ -303,6 +297,9 @@ topology_template: instance_1c11_scalling_instance: - 1c11_scalling_instance - instance + network.incoming.bytes.rate_1c11_scalling_instance_1c11_scalling_instance_t1_port_0: + - 1c11_scalling_instance_1c11_scalling_instance_t1_port_0 + - network.incoming.bytes.rate disk.read.requests_1c11_scalling_instance: - 1c11_scalling_instance - disk.read.requests @@ -312,9 +309,6 @@ topology_template: memory.resident_1c11_scalling_instance: - 1c11_scalling_instance - memory.resident - attachment_1c11_scalling_instance_1c1_t1_port: - - 1c11_scalling_instance_1c1_t1_port - - attachment disk.write.requests.rate_1c11_scalling_instance: - 1c11_scalling_instance - disk.write.requests.rate @@ -324,9 +318,15 @@ topology_template: disk.device.write.requests.rate_1c11_scalling_instance: - 1c11_scalling_instance - disk.device.write.requests.rate + network.outgoing.bytes_1c11_scalling_instance_1c11_scalling_instance_t1_port_0: + - 1c11_scalling_instance_1c11_scalling_instance_t1_port_0 + - network.outgoing.bytes disk.device.latency_1c11_scalling_instance: - 1c11_scalling_instance - disk.device.latency + network.outpoing.packets_1c11_scalling_instance_1c11_scalling_instance_t1_port_0: + - 1c11_scalling_instance_1c11_scalling_instance_t1_port_0 + - network.outpoing.packets disk.iops_1c11_scalling_instance: - 1c11_scalling_instance - disk.iops @@ -334,12 +334,12 @@ topology_template: local_storage_1c11_scalling_instance: - 1c11_scalling_instance - local_storage - dependency_1c11_scalling_instance_1c1_t1_port: - - 1c11_scalling_instance_1c1_t1_port - - dependency - link_1c11_scalling_instance_1c1_t1_port: - - 1c11_scalling_instance_1c1_t1_port + link_1c11_scalling_instance_1c11_scalling_instance_t1_port_0: + - 1c11_scalling_instance_1c11_scalling_instance_t1_port_0 - link + dependency_1c11_scalling_instance_1c11_scalling_instance_t1_port_0: + - 1c11_scalling_instance_1c11_scalling_instance_t1_port_0 + - dependency dependency_1c11_scalling_instance: - 1c11_scalling_instance - dependency \ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c12_scalling_instanceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c12_scalling_instanceServiceTemplate.yaml index 31686e862a..83fd91196d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c12_scalling_instanceServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c12_scalling_instanceServiceTemplate.yaml @@ -11,31 +11,18 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_1c1_t1_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true compute_1c12_scalling_instance_scheduler_hints: type: list required: true entry_schema: type: json - port_1c1_t1_port_fixed_ips: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps compute_1c12_scalling_instance_name: type: list required: true entry_schema: type: string - port_1c1_t1_port_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_1c1_t1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_1c12_scalling_instance_t1_port_0_network_role: + type: string required: true index_value: type: integer @@ -44,6 +31,9 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 + port_1c12_scalling_instance_t1_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true vm_flavor_name: type: string required: true @@ -52,115 +42,125 @@ topology_template: required: true entry_schema: type: string - port_1c1_t1_port_related_networks: + port_1c12_scalling_instance_t1_port_0_name: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_1c1_t1_port_ip_requirements: + type: string + port_1c12_scalling_instance_t1_port_0_related_networks: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - vm_image_name: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_1c12_scalling_instance_t1_port_0_network_role_tag: + type: string + required: true + port_1c12_scalling_instance_t1_port_0_subnetpoolid: type: string required: true - port_1c1_t1_port_name: + port_1c12_scalling_instance_t1_port_0_network: type: list required: true entry_schema: type: string - port_1c1_t1_port_subnetpoolid: + vm_image_name: type: string required: true - port_1c1_t1_port_network_role_tag: - type: string + port_1c12_scalling_instance_t1_port_0_ip_requirements: + type: list required: true - port_1c1_t1_port_network_role: - type: string + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_1c12_scalling_instance_t1_port_0_vlan_requirements: + type: list required: true - compute_1c12_scalling_instance_availability_zone: + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_1c12_scalling_instance_t1_port_0_order: + type: integer + required: true + port_1c12_scalling_instance_t1_port_0_fixed_ips: type: list required: true entry_schema: - type: string - port_1c1_t1_port_network: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + compute_1c12_scalling_instance_availability_zone: type: list required: true entry_schema: type: string - port_1c1_t1_port_order: - type: integer + port_1c12_scalling_instance_t1_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true node_templates: - 1c12_scalling_instance_1c1_t1_port: + 1c12_scalling_instance: + type: org.openecomp.resource.vfc.compute.nodes.heat.1c12_scalling_instance + properties: + availability_zone: + get_input: + - compute_1c12_scalling_instance_availability_zone + - index_value + flavor: + get_input: vm_flavor_name + image: + get_input: vm_image_name + name: + get_input: + - compute_1c12_scalling_instance_name + - index_value + scheduler_hints: + get_input: + - compute_1c12_scalling_instance_scheduler_hints + - index_value + user_data_format: + get_input: + - compute_1c12_scalling_instance_user_data_format + - index_value + 1c12_scalling_instance_1c12_scalling_instance_t1_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_requirements: - get_input: port_1c1_t1_port_mac_requirements + get_input: port_1c12_scalling_instance_t1_port_0_mac_requirements order: - get_input: port_1c1_t1_port_order + get_input: port_1c12_scalling_instance_t1_port_0_order exCP_naming: - get_input: port_1c1_t1_port_exCP_naming + get_input: port_1c12_scalling_instance_t1_port_0_exCP_naming vlan_requirements: - get_input: port_1c1_t1_port_vlan_requirements + get_input: port_1c12_scalling_instance_t1_port_0_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_1c1_t1_port_ip_requirements + get_input: port_1c12_scalling_instance_t1_port_0_ip_requirements related_networks: - get_input: port_1c1_t1_port_related_networks + get_input: port_1c12_scalling_instance_t1_port_0_related_networks network_role_tag: - get_input: port_1c1_t1_port_network_role_tag + get_input: port_1c12_scalling_instance_t1_port_0_network_role_tag network_role: - get_input: port_1c1_t1_port_network_role + get_input: port_1c12_scalling_instance_t1_port_0_network_role fixed_ips: get_input: - - port_1c1_t1_port_fixed_ips + - port_1c12_scalling_instance_t1_port_0_fixed_ips - index_value subnetpoolid: - get_input: port_1c1_t1_port_subnetpoolid + get_input: port_1c12_scalling_instance_t1_port_0_subnetpoolid name: get_input: - - port_1c1_t1_port_name + - port_1c12_scalling_instance_t1_port_0_name - index_value network: get_input: - - port_1c1_t1_port_network + - port_1c12_scalling_instance_t1_port_0_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: 1c12_scalling_instance relationship: tosca.relationships.network.BindsTo - 1c12_scalling_instance: - type: org.openecomp.resource.vfc.compute.nodes.heat.1c12_scalling_instance - properties: - availability_zone: - get_input: - - compute_1c12_scalling_instance_availability_zone - - index_value - flavor: - get_input: vm_flavor_name - image: - get_input: vm_image_name - name: - get_input: - - compute_1c12_scalling_instance_name - - index_value - scheduler_hints: - get_input: - - compute_1c12_scalling_instance_scheduler_hints - - index_value - user_data_format: - get_input: - - compute_1c12_scalling_instance_user_data_format - - index_value outputs: - 1c12_scalling_instance_1c1_t1_port_tenant_id: + 1c12_scalling_instance_1c12_scalling_instance_t1_port_0_tenant_id: type: string value: get_attribute: - - 1c12_scalling_instance_1c1_t1_port + - 1c12_scalling_instance_1c12_scalling_instance_t1_port_0 - tenant_id 1c12_scalling_instance_instance_name: type: string @@ -171,33 +171,33 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.1c12_scalling_instance capabilities: + network.incoming.packets_1c12_scalling_instance_1c12_scalling_instance_t1_port_0: + - 1c12_scalling_instance_1c12_scalling_instance_t1_port_0 + - network.incoming.packets cpu_1c12_scalling_instance: - 1c12_scalling_instance - cpu + attachment_1c12_scalling_instance_1c12_scalling_instance_t1_port_0: + - 1c12_scalling_instance_1c12_scalling_instance_t1_port_0 + - attachment disk.device.write.bytes_1c12_scalling_instance: - 1c12_scalling_instance - disk.device.write.bytes - network.incoming.bytes.rate_1c12_scalling_instance_1c1_t1_port: - - 1c12_scalling_instance_1c1_t1_port - - network.incoming.bytes.rate disk.usage_1c12_scalling_instance: - 1c12_scalling_instance - disk.usage disk.device.read.requests_1c12_scalling_instance: - 1c12_scalling_instance - disk.device.read.requests - feature_1c12_scalling_instance_1c1_t1_port: - - 1c12_scalling_instance_1c1_t1_port - - feature - forwarder_1c12_scalling_instance_1c1_t1_port: - - 1c12_scalling_instance_1c1_t1_port - - forwarder + network.outgoing.bytes.rate_1c12_scalling_instance_1c12_scalling_instance_t1_port_0: + - 1c12_scalling_instance_1c12_scalling_instance_t1_port_0 + - network.outgoing.bytes.rate disk.device.latency_1c12_scalling_instance: - 1c12_scalling_instance - disk.device.latency - network.outgoing.bytes_1c12_scalling_instance_1c1_t1_port: - - 1c12_scalling_instance_1c1_t1_port - - network.outgoing.bytes + network.incoming.bytes_1c12_scalling_instance_1c12_scalling_instance_t1_port_0: + - 1c12_scalling_instance_1c12_scalling_instance_t1_port_0 + - network.incoming.bytes cpu_util_1c12_scalling_instance: - 1c12_scalling_instance - cpu_util @@ -216,27 +216,27 @@ topology_template: os_1c12_scalling_instance: - 1c12_scalling_instance - os + feature_1c12_scalling_instance_1c12_scalling_instance_t1_port_0: + - 1c12_scalling_instance_1c12_scalling_instance_t1_port_0 + - feature disk.device.usage_1c12_scalling_instance: - 1c12_scalling_instance - disk.device.usage disk.device.allocation_1c12_scalling_instance: - 1c12_scalling_instance - disk.device.allocation - binding_1c12_scalling_instance_1c1_t1_port: - - 1c12_scalling_instance_1c1_t1_port + binding_1c12_scalling_instance_1c12_scalling_instance_t1_port_0: + - 1c12_scalling_instance_1c12_scalling_instance_t1_port_0 - binding - network.incoming.packets_1c12_scalling_instance_1c1_t1_port: - - 1c12_scalling_instance_1c1_t1_port - - network.incoming.packets - attachment_1c12_scalling_instance_1c1_t1_port: - - 1c12_scalling_instance_1c1_t1_port - - attachment + network.incoming.packets.rate_1c12_scalling_instance_1c12_scalling_instance_t1_port_0: + - 1c12_scalling_instance_1c12_scalling_instance_t1_port_0 + - network.incoming.packets.rate + network.outgoing.packets.rate_1c12_scalling_instance_1c12_scalling_instance_t1_port_0: + - 1c12_scalling_instance_1c12_scalling_instance_t1_port_0 + - network.outgoing.packets.rate disk.latency_1c12_scalling_instance: - 1c12_scalling_instance - disk.latency - network.incoming.bytes_1c12_scalling_instance_1c1_t1_port: - - 1c12_scalling_instance_1c1_t1_port - - network.incoming.bytes memory_1c12_scalling_instance: - 1c12_scalling_instance - memory @@ -258,12 +258,12 @@ topology_template: disk.write.bytes.rate_1c12_scalling_instance: - 1c12_scalling_instance - disk.write.bytes.rate + network.outpoing.packets_1c12_scalling_instance_1c12_scalling_instance_t1_port_0: + - 1c12_scalling_instance_1c12_scalling_instance_t1_port_0 + - network.outpoing.packets disk.write.requests_1c12_scalling_instance: - 1c12_scalling_instance - disk.write.requests - network.outgoing.bytes.rate_1c12_scalling_instance_1c1_t1_port: - - 1c12_scalling_instance_1c1_t1_port - - network.outgoing.bytes.rate disk.ephemeral.size_1c12_scalling_instance: - 1c12_scalling_instance - disk.ephemeral.size @@ -297,27 +297,27 @@ topology_template: vcpus_1c12_scalling_instance: - 1c12_scalling_instance - vcpus - network.incoming.packets.rate_1c12_scalling_instance_1c1_t1_port: - - 1c12_scalling_instance_1c1_t1_port - - network.incoming.packets.rate disk.device.write.requests.rate_1c12_scalling_instance: - 1c12_scalling_instance - disk.device.write.requests.rate - network.outgoing.packets.rate_1c12_scalling_instance_1c1_t1_port: - - 1c12_scalling_instance_1c1_t1_port - - network.outgoing.packets.rate disk.device.write.requests_1c12_scalling_instance: - 1c12_scalling_instance - disk.device.write.requests - network.outpoing.packets_1c12_scalling_instance_1c1_t1_port: - - 1c12_scalling_instance_1c1_t1_port - - network.outpoing.packets + forwarder_1c12_scalling_instance_1c12_scalling_instance_t1_port_0: + - 1c12_scalling_instance_1c12_scalling_instance_t1_port_0 + - forwarder disk.allocation_1c12_scalling_instance: - 1c12_scalling_instance - disk.allocation + network.incoming.bytes.rate_1c12_scalling_instance_1c12_scalling_instance_t1_port_0: + - 1c12_scalling_instance_1c12_scalling_instance_t1_port_0 + - network.incoming.bytes.rate disk.root.size_1c12_scalling_instance: - 1c12_scalling_instance - disk.root.size + network.outgoing.bytes_1c12_scalling_instance_1c12_scalling_instance_t1_port_0: + - 1c12_scalling_instance_1c12_scalling_instance_t1_port_0 + - network.outgoing.bytes disk.capacity_1c12_scalling_instance: - 1c12_scalling_instance - disk.capacity @@ -331,8 +331,8 @@ topology_template: - 1c12_scalling_instance - memory.usage requirements: - dependency_1c12_scalling_instance_1c1_t1_port: - - 1c12_scalling_instance_1c1_t1_port + dependency_1c12_scalling_instance_1c12_scalling_instance_t1_port_0: + - 1c12_scalling_instance_1c12_scalling_instance_t1_port_0 - dependency local_storage_1c12_scalling_instance: - 1c12_scalling_instance @@ -340,6 +340,6 @@ topology_template: dependency_1c12_scalling_instance: - 1c12_scalling_instance - dependency - link_1c12_scalling_instance_1c1_t1_port: - - 1c12_scalling_instance_1c1_t1_port + link_1c12_scalling_instance_1c12_scalling_instance_t1_port_0: + - 1c12_scalling_instance_1c12_scalling_instance_t1_port_0 - link \ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instanceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instanceServiceTemplate.yaml index 6271474b83..57da03d117 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instanceServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instanceServiceTemplate.yaml @@ -11,58 +11,65 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_1c2_catalog_instance_201_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_1c2_catalog_instance_202_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true compute_1c2_catalog_instance_availability_zone: type: list required: true entry_schema: type: string - port_1c201_port_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements vm_flavor_name: type: string required: true + port_1c2_catalog_instance_202_port_0_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements compute_1c2_catalog_instance_personality: type: list required: true entry_schema: type: json - port_2c202_port_subnetpoolid: - type: string + port_1c2_catalog_instance_201_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_2c202_port_ip_requirements: + port_1c2_catalog_instance_202_port_0_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_1c201_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_2c202_port_network_role_tag: + type: string + vm_image_name: type: string required: true - port_2c202_port_network_role: - type: string + port_1c2_catalog_instance_202_port_0_vlan_requirements: + type: list required: true - vm_image_name: - type: string + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_1c2_catalog_instance_202_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_2c202_port_order: - type: integer + port_1c2_catalog_instance_201_port_0_vlan_requirements: + type: list required: true - port_1c201_port_network_role_tag: + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_1c2_catalog_instance_201_port_0_network_role_tag: type: string required: true - port_1c201_port_order: - type: integer + port_1c2_catalog_instance_201_port_0_network_role: + type: string required: true - port_2c202_port_vlan_requirements: + port_1c2_catalog_instance_201_port_0_related_networks: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.RelatedNetworksAssignments index_value: type: integer description: Index value of this substitution service template runtime instance @@ -75,51 +82,44 @@ topology_template: required: true entry_schema: type: string - port_2c202_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_1c2_catalog_instance_201_port_0_order: + type: integer required: true - port_2c202_port_network: - type: list + port_1c2_catalog_instance_202_port_0_order: + type: integer required: true - entry_schema: - type: string - port_1c201_port_ip_requirements: + port_1c2_catalog_instance_201_port_0_ip_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_1c201_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_2c202_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_1c2_catalog_instance_201_port_0_subnetpoolid: + type: string required: true - port_1c201_port_subnetpoolid: + port_1c2_catalog_instance_202_port_0_network_role_tag: type: string required: true - port_1c201_port_related_networks: + port_1c2_catalog_instance_202_port_0_related_networks: type: list required: true entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_2c202_port_related_networks: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_1c201_port_network_role: + port_1c2_catalog_instance_202_port_0_subnetpoolid: type: string required: true - compute_1c2_catalog_instance_user_data_format: + port_1c2_catalog_instance_201_port_0_network: type: list required: true entry_schema: type: string - port_1c201_port_network: + compute_1c2_catalog_instance_user_data_format: type: list required: true entry_schema: type: string + port_1c2_catalog_instance_202_port_0_network_role: + type: string + required: true compute_1c2_catalog_instance_scheduler_hints: type: list required: true @@ -143,7 +143,7 @@ topology_template: get_input: vm_image_name diskConfig: get_attribute: - - 1c2_catalog_instance_1c201_port + - 1c2_catalog_instance_1c2_catalog_instance_201_port_0 - tenant_id name: get_input: @@ -157,62 +157,62 @@ topology_template: get_input: - compute_1c2_catalog_instance_user_data_format - index_value - 1c2_catalog_instance_1c201_port: + 1c2_catalog_instance_1c2_catalog_instance_202_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_1c201_port_exCP_naming + get_input: port_1c2_catalog_instance_202_port_0_exCP_naming vlan_requirements: - get_input: port_1c201_port_vlan_requirements + get_input: port_1c2_catalog_instance_202_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_1c201_port_related_networks + get_input: port_1c2_catalog_instance_202_port_0_related_networks ip_requirements: - get_input: port_1c201_port_ip_requirements + get_input: port_1c2_catalog_instance_202_port_0_ip_requirements network_role_tag: - get_input: port_1c201_port_network_role_tag + get_input: port_1c2_catalog_instance_202_port_0_network_role_tag mac_requirements: - get_input: port_1c201_port_mac_requirements + get_input: port_1c2_catalog_instance_202_port_0_mac_requirements order: - get_input: port_1c201_port_order + get_input: port_1c2_catalog_instance_202_port_0_order network_role: - get_input: port_1c201_port_network_role + get_input: port_1c2_catalog_instance_202_port_0_network_role subnetpoolid: - get_input: port_1c201_port_subnetpoolid + get_input: port_1c2_catalog_instance_202_port_0_subnetpoolid network: get_input: - - port_1c201_port_network + - port_1c2_catalog_instance_202_port_0_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: 1c2_catalog_instance relationship: tosca.relationships.network.BindsTo - 1c2_catalog_instance_2c202_port: + 1c2_catalog_instance_1c2_catalog_instance_201_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_2c202_port_exCP_naming + get_input: port_1c2_catalog_instance_201_port_0_exCP_naming vlan_requirements: - get_input: port_2c202_port_vlan_requirements + get_input: port_1c2_catalog_instance_201_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_2c202_port_related_networks + get_input: port_1c2_catalog_instance_201_port_0_related_networks ip_requirements: - get_input: port_2c202_port_ip_requirements + get_input: port_1c2_catalog_instance_201_port_0_ip_requirements network_role_tag: - get_input: port_2c202_port_network_role_tag + get_input: port_1c2_catalog_instance_201_port_0_network_role_tag mac_requirements: - get_input: port_2c202_port_mac_requirements + get_input: port_1c2_catalog_instance_201_port_0_mac_requirements order: - get_input: port_2c202_port_order + get_input: port_1c2_catalog_instance_201_port_0_order network_role: - get_input: port_2c202_port_network_role + get_input: port_1c2_catalog_instance_201_port_0_network_role subnetpoolid: - get_input: port_2c202_port_subnetpoolid + get_input: port_1c2_catalog_instance_201_port_0_subnetpoolid network: get_input: - - port_2c202_port_network + - port_1c2_catalog_instance_201_port_0_network - index_value requirements: - binding: @@ -226,60 +226,66 @@ topology_template: get_attribute: - 1c2_catalog_instance - instance_name - 1c2_catalog_instance_1c201_port_tenant_id: + 1c2_catalog_instance_1c2_catalog_instance_201_port_0_tenant_id: type: string value: get_attribute: - - 1c2_catalog_instance_1c201_port + - 1c2_catalog_instance_1c2_catalog_instance_201_port_0 - tenant_id substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.1c2_catalog_instance capabilities: + network.outgoing.packets.rate_1c2_catalog_instance_1c2_catalog_instance_202_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_202_port_0 + - network.outgoing.packets.rate disk.device.capacity_1c2_catalog_instance: - 1c2_catalog_instance - disk.device.capacity - attachment_1c2_catalog_instance_2c202_port: - - 1c2_catalog_instance_2c202_port - - attachment - network.incoming.bytes.rate_1c2_catalog_instance_2c202_port: - - 1c2_catalog_instance_2c202_port - - network.incoming.bytes.rate - network.incoming.packets_1c2_catalog_instance_2c202_port: - - 1c2_catalog_instance_2c202_port - - network.incoming.packets - network.incoming.packets.rate_1c2_catalog_instance_1c201_port: - - 1c2_catalog_instance_1c201_port - - network.incoming.packets.rate disk.read.bytes.rate_1c2_catalog_instance: - 1c2_catalog_instance - disk.read.bytes.rate - network.incoming.bytes_1c2_catalog_instance_1c201_port: - - 1c2_catalog_instance_1c201_port - - network.incoming.bytes + network.incoming.bytes.rate_1c2_catalog_instance_1c2_catalog_instance_202_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_202_port_0 + - network.incoming.bytes.rate + network.incoming.bytes.rate_1c2_catalog_instance_1c2_catalog_instance_201_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_201_port_0 + - network.incoming.bytes.rate memory.usage_1c2_catalog_instance: - 1c2_catalog_instance - memory.usage - binding_1c2_catalog_instance_1c201_port: - - 1c2_catalog_instance_1c201_port - - binding - forwarder_1c2_catalog_instance_1c201_port: - - 1c2_catalog_instance_1c201_port - - forwarder disk.write.bytes.rate_1c2_catalog_instance: - 1c2_catalog_instance - disk.write.bytes.rate + network.outgoing.packets.rate_1c2_catalog_instance_1c2_catalog_instance_201_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_201_port_0 + - network.outgoing.packets.rate + network.outpoing.packets_1c2_catalog_instance_1c2_catalog_instance_202_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_202_port_0 + - network.outpoing.packets + network.incoming.bytes_1c2_catalog_instance_1c2_catalog_instance_202_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_202_port_0 + - network.incoming.bytes + network.incoming.packets.rate_1c2_catalog_instance_1c2_catalog_instance_201_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_201_port_0 + - network.incoming.packets.rate cpu_util_1c2_catalog_instance: - 1c2_catalog_instance - cpu_util + network.outpoing.packets_1c2_catalog_instance_1c2_catalog_instance_201_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_201_port_0 + - network.outpoing.packets + network.incoming.bytes_1c2_catalog_instance_1c2_catalog_instance_201_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_201_port_0 + - network.incoming.bytes + network.incoming.packets.rate_1c2_catalog_instance_1c2_catalog_instance_202_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_202_port_0 + - network.incoming.packets.rate cpu_1c2_catalog_instance: - 1c2_catalog_instance - cpu disk.read.requests_1c2_catalog_instance: - 1c2_catalog_instance - disk.read.requests - network.outpoing.packets_1c2_catalog_instance_1c201_port: - - 1c2_catalog_instance_1c201_port - - network.outpoing.packets disk.ephemeral.size_1c2_catalog_instance: - 1c2_catalog_instance - disk.ephemeral.size @@ -292,18 +298,18 @@ topology_template: disk.device.write.requests.rate_1c2_catalog_instance: - 1c2_catalog_instance - disk.device.write.requests.rate + forwarder_1c2_catalog_instance_1c2_catalog_instance_202_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_202_port_0 + - forwarder os_1c2_catalog_instance: - 1c2_catalog_instance - os disk.device.iops_1c2_catalog_instance: - 1c2_catalog_instance - disk.device.iops - feature_1c2_catalog_instance_2c202_port: - - 1c2_catalog_instance_2c202_port - - feature - network.outgoing.packets.rate_1c2_catalog_instance_2c202_port: - - 1c2_catalog_instance_2c202_port - - network.outgoing.packets.rate + network.outgoing.bytes.rate_1c2_catalog_instance_1c2_catalog_instance_202_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_202_port_0 + - network.outgoing.bytes.rate endpoint_1c2_catalog_instance: - 1c2_catalog_instance - endpoint @@ -313,33 +319,27 @@ topology_template: disk.latency_1c2_catalog_instance: - 1c2_catalog_instance - disk.latency - network.outgoing.bytes.rate_1c2_catalog_instance_2c202_port: - - 1c2_catalog_instance_2c202_port - - network.outgoing.bytes.rate disk.iops_1c2_catalog_instance: - 1c2_catalog_instance - disk.iops - binding_1c2_catalog_instance_2c202_port: - - 1c2_catalog_instance_2c202_port - - binding + attachment_1c2_catalog_instance_1c2_catalog_instance_201_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_201_port_0 + - attachment vcpus_1c2_catalog_instance: - 1c2_catalog_instance - vcpus disk.device.latency_1c2_catalog_instance: - 1c2_catalog_instance - disk.device.latency - network.outgoing.bytes_1c2_catalog_instance_1c201_port: - - 1c2_catalog_instance_1c201_port + feature_1c2_catalog_instance_1c2_catalog_instance_202_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_202_port_0 + - feature + binding_1c2_catalog_instance_1c2_catalog_instance_201_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_201_port_0 + - binding + network.outgoing.bytes_1c2_catalog_instance_1c2_catalog_instance_202_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_202_port_0 - network.outgoing.bytes - attachment_1c2_catalog_instance_1c201_port: - - 1c2_catalog_instance_1c201_port - - attachment - network.incoming.bytes.rate_1c2_catalog_instance_1c201_port: - - 1c2_catalog_instance_1c201_port - - network.incoming.bytes.rate - network.incoming.packets_1c2_catalog_instance_1c201_port: - - 1c2_catalog_instance_1c201_port - - network.incoming.packets disk.read.bytes_1c2_catalog_instance: - 1c2_catalog_instance - disk.read.bytes @@ -355,15 +355,9 @@ topology_template: disk.device.read.bytes.rate_1c2_catalog_instance: - 1c2_catalog_instance - disk.device.read.bytes.rate - network.incoming.bytes_1c2_catalog_instance_2c202_port: - - 1c2_catalog_instance_2c202_port - - network.incoming.bytes disk.device.allocation_1c2_catalog_instance: - 1c2_catalog_instance - disk.device.allocation - forwarder_1c2_catalog_instance_2c202_port: - - 1c2_catalog_instance_2c202_port - - forwarder disk.device.read.bytes_1c2_catalog_instance: - 1c2_catalog_instance - disk.device.read.bytes @@ -385,21 +379,21 @@ topology_template: disk.root.size_1c2_catalog_instance: - 1c2_catalog_instance - disk.root.size - feature_1c2_catalog_instance_1c201_port: - - 1c2_catalog_instance_1c201_port - - feature - network.outpoing.packets_1c2_catalog_instance_2c202_port: - - 1c2_catalog_instance_2c202_port - - network.outpoing.packets - network.incoming.packets.rate_1c2_catalog_instance_2c202_port: - - 1c2_catalog_instance_2c202_port - - network.incoming.packets.rate + network.incoming.packets_1c2_catalog_instance_1c2_catalog_instance_201_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_201_port_0 + - network.incoming.packets + network.incoming.packets_1c2_catalog_instance_1c2_catalog_instance_202_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_202_port_0 + - network.incoming.packets + forwarder_1c2_catalog_instance_1c2_catalog_instance_201_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_201_port_0 + - forwarder disk.device.usage_1c2_catalog_instance: - 1c2_catalog_instance - disk.device.usage - network.outgoing.packets.rate_1c2_catalog_instance_1c201_port: - - 1c2_catalog_instance_1c201_port - - network.outgoing.packets.rate + network.outgoing.bytes.rate_1c2_catalog_instance_1c2_catalog_instance_201_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_201_port_0 + - network.outgoing.bytes.rate disk.usage_1c2_catalog_instance: - 1c2_catalog_instance - disk.usage @@ -409,43 +403,49 @@ topology_template: memory_1c2_catalog_instance: - 1c2_catalog_instance - memory - network.outgoing.bytes.rate_1c2_catalog_instance_1c201_port: - - 1c2_catalog_instance_1c201_port - - network.outgoing.bytes.rate disk.write.requests.rate_1c2_catalog_instance: - 1c2_catalog_instance - disk.write.requests.rate disk.write.requests_1c2_catalog_instance: - 1c2_catalog_instance - disk.write.requests + binding_1c2_catalog_instance_1c2_catalog_instance_202_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_202_port_0 + - binding + attachment_1c2_catalog_instance_1c2_catalog_instance_202_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_202_port_0 + - attachment binding_1c2_catalog_instance: - 1c2_catalog_instance - binding cpu.delta_1c2_catalog_instance: - 1c2_catalog_instance - cpu.delta - network.outgoing.bytes_1c2_catalog_instance_2c202_port: - - 1c2_catalog_instance_2c202_port - - network.outgoing.bytes disk.device.read.requests.rate_1c2_catalog_instance: - 1c2_catalog_instance - disk.device.read.requests.rate + feature_1c2_catalog_instance_1c2_catalog_instance_201_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_201_port_0 + - feature + network.outgoing.bytes_1c2_catalog_instance_1c2_catalog_instance_201_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_201_port_0 + - network.outgoing.bytes requirements: - dependency_1c2_catalog_instance_2c202_port: - - 1c2_catalog_instance_2c202_port - - dependency + link_1c2_catalog_instance_1c2_catalog_instance_202_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_202_port_0 + - link dependency_1c2_catalog_instance: - 1c2_catalog_instance - dependency local_storage_1c2_catalog_instance: - 1c2_catalog_instance - local_storage - link_1c2_catalog_instance_1c201_port: - - 1c2_catalog_instance_1c201_port - - link - link_1c2_catalog_instance_2c202_port: - - 1c2_catalog_instance_2c202_port - - link - dependency_1c2_catalog_instance_1c201_port: - - 1c2_catalog_instance_1c201_port - - dependency \ No newline at end of file + dependency_1c2_catalog_instance_1c2_catalog_instance_202_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_202_port_0 + - dependency + dependency_1c2_catalog_instance_1c2_catalog_instance_201_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_201_port_0 + - dependency + link_1c2_catalog_instance_1c2_catalog_instance_201_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_201_port_0 + - link \ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_2c2_catalog_instanceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_2c2_catalog_instanceServiceTemplate.yaml index 5b15894873..b4947b13ba 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_2c2_catalog_instanceServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_2c2_catalog_instanceServiceTemplate.yaml @@ -11,43 +11,55 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_2c2_catalog_instance_201_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true compute_2c2_catalog_instance_user_data_format: type: list required: true entry_schema: type: string - port_1c201_port_vlan_requirements: + port_2c2_catalog_instance_202_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_2c2_catalog_instance_202_port_0_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_2c2_catalog_instance_201_port_0_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - vm_flavor_name: + port_2c2_catalog_instance_202_port_0_network_role_tag: type: string required: true - port_2c202_port_subnetpoolid: + vm_flavor_name: type: string required: true - port_2c202_port_ip_requirements: + port_2c2_catalog_instance_202_port_0_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_1c201_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_2c202_port_network_role_tag: + type: string + port_2c2_catalog_instance_202_port_0_network_role: type: string required: true - port_2c202_port_network_role: + port_2c2_catalog_instance_202_port_0_subnetpoolid: type: string required: true - vm_image_name: - type: string + port_2c2_catalog_instance_202_port_0_ip_requirements: + type: list required: true - port_2c202_port_order: - type: integer + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_2c2_catalog_instance_201_port_0_ip_requirements: + type: list required: true - port_1c201_port_network_role_tag: + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + vm_image_name: type: string required: true compute_2c2_catalog_instance_scheduler_hints: @@ -60,14 +72,17 @@ topology_template: required: true entry_schema: type: string - port_1c201_port_order: - type: integer + port_2c2_catalog_instance_201_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_2c202_port_vlan_requirements: + port_2c2_catalog_instance_202_port_0_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements + port_2c2_catalog_instance_201_port_0_subnetpoolid: + type: string + required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -75,47 +90,32 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - compute_2c2_catalog_instance_name: - type: list - required: true - entry_schema: - type: string - port_2c202_port_mac_requirements: + port_2c2_catalog_instance_202_port_0_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true - port_2c202_port_network: + compute_2c2_catalog_instance_name: type: list required: true entry_schema: type: string - port_1c201_port_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_1c201_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_2c202_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_2c2_catalog_instance_201_port_0_network_role_tag: + type: string required: true - port_1c201_port_subnetpoolid: + port_2c2_catalog_instance_201_port_0_network_role: type: string required: true - port_1c201_port_related_networks: + port_2c2_catalog_instance_201_port_0_related_networks: type: list required: true entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_2c202_port_related_networks: - type: list + port_2c2_catalog_instance_202_port_0_order: + type: integer required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_1c201_port_network_role: - type: string + port_2c2_catalog_instance_201_port_0_order: + type: integer required: true - port_1c201_port_network: + port_2c2_catalog_instance_201_port_0_network: type: list required: true entry_schema: @@ -144,62 +144,62 @@ topology_template: get_input: - compute_2c2_catalog_instance_user_data_format - index_value - 2c2_catalog_instance_2c202_port: + 2c2_catalog_instance_2c2_catalog_instance_202_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_2c202_port_exCP_naming + get_input: port_2c2_catalog_instance_202_port_0_exCP_naming vlan_requirements: - get_input: port_2c202_port_vlan_requirements + get_input: port_2c2_catalog_instance_202_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_2c202_port_related_networks + get_input: port_2c2_catalog_instance_202_port_0_related_networks ip_requirements: - get_input: port_2c202_port_ip_requirements + get_input: port_2c2_catalog_instance_202_port_0_ip_requirements network_role_tag: - get_input: port_2c202_port_network_role_tag + get_input: port_2c2_catalog_instance_202_port_0_network_role_tag mac_requirements: - get_input: port_2c202_port_mac_requirements + get_input: port_2c2_catalog_instance_202_port_0_mac_requirements order: - get_input: port_2c202_port_order + get_input: port_2c2_catalog_instance_202_port_0_order network_role: - get_input: port_2c202_port_network_role + get_input: port_2c2_catalog_instance_202_port_0_network_role subnetpoolid: - get_input: port_2c202_port_subnetpoolid + get_input: port_2c2_catalog_instance_202_port_0_subnetpoolid network: get_input: - - port_2c202_port_network + - port_2c2_catalog_instance_202_port_0_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: 2c2_catalog_instance relationship: tosca.relationships.network.BindsTo - 2c2_catalog_instance_1c201_port: + 2c2_catalog_instance_2c2_catalog_instance_201_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_1c201_port_exCP_naming + get_input: port_2c2_catalog_instance_201_port_0_exCP_naming vlan_requirements: - get_input: port_1c201_port_vlan_requirements + get_input: port_2c2_catalog_instance_201_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_1c201_port_related_networks + get_input: port_2c2_catalog_instance_201_port_0_related_networks ip_requirements: - get_input: port_1c201_port_ip_requirements + get_input: port_2c2_catalog_instance_201_port_0_ip_requirements network_role_tag: - get_input: port_1c201_port_network_role_tag + get_input: port_2c2_catalog_instance_201_port_0_network_role_tag mac_requirements: - get_input: port_1c201_port_mac_requirements + get_input: port_2c2_catalog_instance_201_port_0_mac_requirements order: - get_input: port_1c201_port_order + get_input: port_2c2_catalog_instance_201_port_0_order network_role: - get_input: port_1c201_port_network_role + get_input: port_2c2_catalog_instance_201_port_0_network_role subnetpoolid: - get_input: port_1c201_port_subnetpoolid + get_input: port_2c2_catalog_instance_201_port_0_subnetpoolid network: get_input: - - port_1c201_port_network + - port_2c2_catalog_instance_201_port_0_network - index_value requirements: - binding: @@ -216,9 +216,9 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.2c2_catalog_instance capabilities: - network.outgoing.packets.rate_2c2_catalog_instance_1c201_port: - - 2c2_catalog_instance_1c201_port - - network.outgoing.packets.rate + forwarder_2c2_catalog_instance_2c2_catalog_instance_201_port_0: + - 2c2_catalog_instance_2c2_catalog_instance_201_port_0 + - forwarder instance_2c2_catalog_instance: - 2c2_catalog_instance - instance @@ -228,6 +228,15 @@ topology_template: disk.capacity_2c2_catalog_instance: - 2c2_catalog_instance - disk.capacity + network.outgoing.bytes.rate_2c2_catalog_instance_2c2_catalog_instance_201_port_0: + - 2c2_catalog_instance_2c2_catalog_instance_201_port_0 + - network.outgoing.bytes.rate + forwarder_2c2_catalog_instance_2c2_catalog_instance_202_port_0: + - 2c2_catalog_instance_2c2_catalog_instance_202_port_0 + - forwarder + network.outgoing.bytes.rate_2c2_catalog_instance_2c2_catalog_instance_202_port_0: + - 2c2_catalog_instance_2c2_catalog_instance_202_port_0 + - network.outgoing.bytes.rate disk.device.read.bytes.rate_2c2_catalog_instance: - 2c2_catalog_instance - disk.device.read.bytes.rate @@ -246,84 +255,78 @@ topology_template: scalable_2c2_catalog_instance: - 2c2_catalog_instance - scalable + attachment_2c2_catalog_instance_2c2_catalog_instance_201_port_0: + - 2c2_catalog_instance_2c2_catalog_instance_201_port_0 + - attachment disk.device.read.requests_2c2_catalog_instance: - 2c2_catalog_instance - disk.device.read.requests - network.outgoing.bytes_2c2_catalog_instance_1c201_port: - - 2c2_catalog_instance_1c201_port - - network.outgoing.bytes + attachment_2c2_catalog_instance_2c2_catalog_instance_202_port_0: + - 2c2_catalog_instance_2c2_catalog_instance_202_port_0 + - attachment disk.root.size_2c2_catalog_instance: - 2c2_catalog_instance - disk.root.size disk.device.write.requests_2c2_catalog_instance: - 2c2_catalog_instance - disk.device.write.requests - forwarder_2c2_catalog_instance_2c202_port: - - 2c2_catalog_instance_2c202_port - - forwarder + feature_2c2_catalog_instance_2c2_catalog_instance_202_port_0: + - 2c2_catalog_instance_2c2_catalog_instance_202_port_0 + - feature host_2c2_catalog_instance: - 2c2_catalog_instance - host + feature_2c2_catalog_instance_2c2_catalog_instance_201_port_0: + - 2c2_catalog_instance_2c2_catalog_instance_201_port_0 + - feature disk.allocation_2c2_catalog_instance: - 2c2_catalog_instance - disk.allocation - binding_2c2_catalog_instance_1c201_port: - - 2c2_catalog_instance_1c201_port - - binding disk.device.write.requests.rate_2c2_catalog_instance: - 2c2_catalog_instance - disk.device.write.requests.rate + network.incoming.bytes.rate_2c2_catalog_instance_2c2_catalog_instance_202_port_0: + - 2c2_catalog_instance_2c2_catalog_instance_202_port_0 + - network.incoming.bytes.rate os_2c2_catalog_instance: - 2c2_catalog_instance - os - network.outpoing.packets_2c2_catalog_instance_2c202_port: - - 2c2_catalog_instance_2c202_port - - network.outpoing.packets disk.device.write.bytes.rate_2c2_catalog_instance: - 2c2_catalog_instance - disk.device.write.bytes.rate - network.outgoing.bytes.rate_2c2_catalog_instance_1c201_port: - - 2c2_catalog_instance_1c201_port - - network.outgoing.bytes.rate - network.incoming.packets.rate_2c2_catalog_instance_1c201_port: - - 2c2_catalog_instance_1c201_port - - network.incoming.packets.rate disk.latency_2c2_catalog_instance: - 2c2_catalog_instance - disk.latency + network.outgoing.packets.rate_2c2_catalog_instance_2c2_catalog_instance_202_port_0: + - 2c2_catalog_instance_2c2_catalog_instance_202_port_0 + - network.outgoing.packets.rate disk.iops_2c2_catalog_instance: - 2c2_catalog_instance - disk.iops + network.incoming.packets_2c2_catalog_instance_2c2_catalog_instance_202_port_0: + - 2c2_catalog_instance_2c2_catalog_instance_202_port_0 + - network.incoming.packets endpoint_2c2_catalog_instance: - 2c2_catalog_instance - endpoint vcpus_2c2_catalog_instance: - 2c2_catalog_instance - vcpus - network.incoming.bytes_2c2_catalog_instance_2c202_port: - - 2c2_catalog_instance_2c202_port + network.incoming.bytes_2c2_catalog_instance_2c2_catalog_instance_201_port_0: + - 2c2_catalog_instance_2c2_catalog_instance_201_port_0 - network.incoming.bytes - feature_2c2_catalog_instance_1c201_port: - - 2c2_catalog_instance_1c201_port - - feature - network.incoming.bytes.rate_2c2_catalog_instance_2c202_port: - - 2c2_catalog_instance_2c202_port - - network.incoming.bytes.rate + network.outpoing.packets_2c2_catalog_instance_2c2_catalog_instance_202_port_0: + - 2c2_catalog_instance_2c2_catalog_instance_202_port_0 + - network.outpoing.packets + network.incoming.packets.rate_2c2_catalog_instance_2c2_catalog_instance_202_port_0: + - 2c2_catalog_instance_2c2_catalog_instance_202_port_0 + - network.incoming.packets.rate disk.device.iops_2c2_catalog_instance: - 2c2_catalog_instance - disk.device.iops - attachment_2c2_catalog_instance_1c201_port: - - 2c2_catalog_instance_1c201_port - - attachment - network.incoming.packets_2c2_catalog_instance_1c201_port: - - 2c2_catalog_instance_1c201_port - - network.incoming.packets disk.device.latency_2c2_catalog_instance: - 2c2_catalog_instance - disk.device.latency - network.outgoing.packets.rate_2c2_catalog_instance_2c202_port: - - 2c2_catalog_instance_2c202_port - - network.outgoing.packets.rate disk.read.bytes.rate_2c2_catalog_instance: - 2c2_catalog_instance - disk.read.bytes.rate @@ -336,18 +339,21 @@ topology_template: disk.device.capacity_2c2_catalog_instance: - 2c2_catalog_instance - disk.device.capacity + binding_2c2_catalog_instance_2c2_catalog_instance_202_port_0: + - 2c2_catalog_instance_2c2_catalog_instance_202_port_0 + - binding disk.read.requests_2c2_catalog_instance: - 2c2_catalog_instance - disk.read.requests - network.outgoing.bytes_2c2_catalog_instance_2c202_port: - - 2c2_catalog_instance_2c202_port + network.outgoing.bytes_2c2_catalog_instance_2c2_catalog_instance_201_port_0: + - 2c2_catalog_instance_2c2_catalog_instance_201_port_0 - network.outgoing.bytes cpu_2c2_catalog_instance: - 2c2_catalog_instance - cpu - forwarder_2c2_catalog_instance_1c201_port: - - 2c2_catalog_instance_1c201_port - - forwarder + network.outgoing.bytes_2c2_catalog_instance_2c2_catalog_instance_202_port_0: + - 2c2_catalog_instance_2c2_catalog_instance_202_port_0 + - network.outgoing.bytes disk.ephemeral.size_2c2_catalog_instance: - 2c2_catalog_instance - disk.ephemeral.size @@ -357,57 +363,51 @@ topology_template: memory.resident_2c2_catalog_instance: - 2c2_catalog_instance - memory.resident + binding_2c2_catalog_instance_2c2_catalog_instance_201_port_0: + - 2c2_catalog_instance_2c2_catalog_instance_201_port_0 + - binding disk.device.usage_2c2_catalog_instance: - 2c2_catalog_instance - disk.device.usage - network.outgoing.bytes.rate_2c2_catalog_instance_2c202_port: - - 2c2_catalog_instance_2c202_port - - network.outgoing.bytes.rate - network.outpoing.packets_2c2_catalog_instance_1c201_port: - - 2c2_catalog_instance_1c201_port - - network.outpoing.packets + network.incoming.bytes.rate_2c2_catalog_instance_2c2_catalog_instance_201_port_0: + - 2c2_catalog_instance_2c2_catalog_instance_201_port_0 + - network.incoming.bytes.rate cpu_util_2c2_catalog_instance: - 2c2_catalog_instance - cpu_util - network.incoming.bytes.rate_2c2_catalog_instance_1c201_port: - - 2c2_catalog_instance_1c201_port - - network.incoming.bytes.rate disk.usage_2c2_catalog_instance: - 2c2_catalog_instance - disk.usage - binding_2c2_catalog_instance_2c202_port: - - 2c2_catalog_instance_2c202_port - - binding feature_2c2_catalog_instance: - 2c2_catalog_instance - feature + network.outgoing.packets.rate_2c2_catalog_instance_2c2_catalog_instance_201_port_0: + - 2c2_catalog_instance_2c2_catalog_instance_201_port_0 + - network.outgoing.packets.rate + network.outpoing.packets_2c2_catalog_instance_2c2_catalog_instance_201_port_0: + - 2c2_catalog_instance_2c2_catalog_instance_201_port_0 + - network.outpoing.packets disk.write.requests_2c2_catalog_instance: - 2c2_catalog_instance - disk.write.requests + network.incoming.packets_2c2_catalog_instance_2c2_catalog_instance_201_port_0: + - 2c2_catalog_instance_2c2_catalog_instance_201_port_0 + - network.incoming.packets + network.incoming.bytes_2c2_catalog_instance_2c2_catalog_instance_202_port_0: + - 2c2_catalog_instance_2c2_catalog_instance_202_port_0 + - network.incoming.bytes cpu.delta_2c2_catalog_instance: - 2c2_catalog_instance - cpu.delta - network.incoming.packets.rate_2c2_catalog_instance_2c202_port: - - 2c2_catalog_instance_2c202_port - - network.incoming.packets.rate binding_2c2_catalog_instance: - 2c2_catalog_instance - binding - attachment_2c2_catalog_instance_2c202_port: - - 2c2_catalog_instance_2c202_port - - attachment - network.incoming.packets_2c2_catalog_instance_2c202_port: - - 2c2_catalog_instance_2c202_port - - network.incoming.packets - feature_2c2_catalog_instance_2c202_port: - - 2c2_catalog_instance_2c202_port - - feature + network.incoming.packets.rate_2c2_catalog_instance_2c2_catalog_instance_201_port_0: + - 2c2_catalog_instance_2c2_catalog_instance_201_port_0 + - network.incoming.packets.rate memory_2c2_catalog_instance: - 2c2_catalog_instance - memory - network.incoming.bytes_2c2_catalog_instance_1c201_port: - - 2c2_catalog_instance_1c201_port - - network.incoming.bytes disk.device.read.requests.rate_2c2_catalog_instance: - 2c2_catalog_instance - disk.device.read.requests.rate @@ -415,18 +415,18 @@ topology_template: dependency_2c2_catalog_instance: - 2c2_catalog_instance - dependency - link_2c2_catalog_instance_1c201_port: - - 2c2_catalog_instance_1c201_port + link_2c2_catalog_instance_2c2_catalog_instance_202_port_0: + - 2c2_catalog_instance_2c2_catalog_instance_202_port_0 - link - dependency_2c2_catalog_instance_1c201_port: - - 2c2_catalog_instance_1c201_port + link_2c2_catalog_instance_2c2_catalog_instance_201_port_0: + - 2c2_catalog_instance_2c2_catalog_instance_201_port_0 + - link + dependency_2c2_catalog_instance_2c2_catalog_instance_201_port_0: + - 2c2_catalog_instance_2c2_catalog_instance_201_port_0 - dependency local_storage_2c2_catalog_instance: - 2c2_catalog_instance - local_storage - dependency_2c2_catalog_instance_2c202_port: - - 2c2_catalog_instance_2c202_port - - dependency - link_2c2_catalog_instance_2c202_port: - - 2c2_catalog_instance_2c202_port - - link \ No newline at end of file + dependency_2c2_catalog_instance_2c2_catalog_instance_202_port_0: + - 2c2_catalog_instance_2c2_catalog_instance_202_port_0 + - dependency \ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_a_single_1aServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_a_single_1aServiceTemplate.yaml index 98912ac570..5b5da38df0 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_a_single_1aServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_a_single_1aServiceTemplate.yaml @@ -16,57 +16,61 @@ topology_template: required: true entry_schema: type: json - port_1a_t1_port_ip_requirements: + port_a_single_1a_t1_port_0_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_1a_t2_port_network_role_tag: - type: string + type: org.openecomp.datatypes.network.VlanRequirements + port_a_single_1a_t1_port_0_order: + type: integer required: true + port_a_single_1a_t2_port_0_order: + type: integer + required: true + port_a_single_1a_t2_port_0_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements vm_flavor_name: type: string required: true - port_1a_t2_port_network_role: + port_a_single_1a_t2_port_0_network_role_tag: type: string required: true - port_1a_t2_port_network: - type: list - required: true - entry_schema: - type: string - port_1a_t1_port_mac_requirements: + port_a_single_1a_t1_port_0_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true - port_1a_t1_port_network: - type: list - required: true - entry_schema: - type: string - port_1a_t1_port_subnetpoolid: + port_a_single_1a_t1_port_0_subnetpoolid: type: string required: true vm_image_name: type: string required: true - port_1a_t2_port_related_networks: + port_a_single_1a_t2_port_0_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_1a_t2_port_ip_requirements: + type: string + port_a_single_1a_t1_port_0_network_role_tag: + type: string + required: true + port_a_single_1a_t1_port_0_ip_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_1a_t1_port_vlan_requirements: + port_a_single_1a_t2_port_0_subnetpoolid: + type: string + required: true + port_a_single_1a_t2_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_a_single_1a_t1_port_0_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_1a_t1_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true + type: string compute_a_single_1a_availability_zone: type: list required: true @@ -84,34 +88,30 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_1a_t1_port_related_networks: + port_a_single_1a_t1_port_0_network_role: + type: string + required: true + port_a_single_1a_t1_port_0_related_networks: type: list required: true entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_1a_t1_port_network_role_tag: - type: string - required: true - port_1a_t1_port_network_role: - type: string - required: true - port_1a_t1_port_order: - type: integer + port_a_single_1a_t1_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - port_1a_t2_port_exCP_naming: + port_a_single_1a_t2_port_0_exCP_naming: type: org.openecomp.datatypes.Naming required: true - port_1a_t2_port_vlan_requirements: + port_a_single_1a_t2_port_0_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_1a_t2_port_subnetpoolid: - type: string - required: true - port_1a_t2_port_order: - type: integer + type: org.openecomp.datatypes.network.IpRequirements + port_a_single_1a_t2_port_0_related_networks: + type: list required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments compute_a_single_1a_user_data_format: type: list required: true @@ -122,35 +122,35 @@ topology_template: required: true entry_schema: type: string - port_1a_t2_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_a_single_1a_t2_port_0_network_role: + type: string required: true node_templates: - a_single_1a_1a_t1_port: + a_single_1a_a_single_1a_t2_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_1a_t1_port_exCP_naming + get_input: port_a_single_1a_t2_port_0_exCP_naming vlan_requirements: - get_input: port_1a_t1_port_vlan_requirements + get_input: port_a_single_1a_t2_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_1a_t1_port_related_networks + get_input: port_a_single_1a_t2_port_0_related_networks ip_requirements: - get_input: port_1a_t1_port_ip_requirements + get_input: port_a_single_1a_t2_port_0_ip_requirements network_role_tag: - get_input: port_1a_t1_port_network_role_tag + get_input: port_a_single_1a_t2_port_0_network_role_tag mac_requirements: - get_input: port_1a_t1_port_mac_requirements + get_input: port_a_single_1a_t2_port_0_mac_requirements order: - get_input: port_1a_t1_port_order + get_input: port_a_single_1a_t2_port_0_order network_role: - get_input: port_1a_t1_port_network_role + get_input: port_a_single_1a_t2_port_0_network_role subnetpoolid: - get_input: port_1a_t1_port_subnetpoolid + get_input: port_a_single_1a_t2_port_0_subnetpoolid network: get_input: - - port_1a_t1_port_network + - port_a_single_1a_t2_port_0_network - index_value requirements: - binding: @@ -184,31 +184,31 @@ topology_template: get_input: - compute_a_single_1a_user_data_format - index_value - a_single_1a_1a_t2_port: + a_single_1a_a_single_1a_t1_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_1a_t2_port_exCP_naming + get_input: port_a_single_1a_t1_port_0_exCP_naming vlan_requirements: - get_input: port_1a_t2_port_vlan_requirements + get_input: port_a_single_1a_t1_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_1a_t2_port_related_networks + get_input: port_a_single_1a_t1_port_0_related_networks ip_requirements: - get_input: port_1a_t2_port_ip_requirements + get_input: port_a_single_1a_t1_port_0_ip_requirements network_role_tag: - get_input: port_1a_t2_port_network_role_tag + get_input: port_a_single_1a_t1_port_0_network_role_tag mac_requirements: - get_input: port_1a_t2_port_mac_requirements + get_input: port_a_single_1a_t1_port_0_mac_requirements order: - get_input: port_1a_t2_port_order + get_input: port_a_single_1a_t1_port_0_order network_role: - get_input: port_1a_t2_port_network_role + get_input: port_a_single_1a_t1_port_0_network_role subnetpoolid: - get_input: port_1a_t2_port_subnetpoolid + get_input: port_a_single_1a_t1_port_0_subnetpoolid network: get_input: - - port_1a_t2_port_network + - port_a_single_1a_t1_port_0_network - index_value requirements: - binding: @@ -216,39 +216,42 @@ topology_template: node: a_single_1a relationship: tosca.relationships.network.BindsTo outputs: - a_single_1a_instance_name: + a_single_1a_a_single_1a_t1_port_0_tenant_id: type: string value: get_attribute: - - a_single_1a - - instance_name - a_single_1a_1a_t1_port_tenant_id: + - a_single_1a_a_single_1a_t1_port_0 + - tenant_id + a_single_1a_instance_name: type: string value: get_attribute: - - a_single_1a_1a_t1_port - - tenant_id + - a_single_1a + - instance_name substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.a_single_1a capabilities: disk.read.bytes_a_single_1a: - a_single_1a - disk.read.bytes - network.incoming.bytes.rate_a_single_1a_1a_t2_port: - - a_single_1a_1a_t2_port - - network.incoming.bytes.rate disk.usage_a_single_1a: - a_single_1a - disk.usage - attachment_a_single_1a_1a_t2_port: - - a_single_1a_1a_t2_port - - attachment + network.incoming.bytes.rate_a_single_1a_a_single_1a_t2_port_0: + - a_single_1a_a_single_1a_t2_port_0 + - network.incoming.bytes.rate scalable_a_single_1a: - a_single_1a - scalable - network.outgoing.bytes.rate_a_single_1a_1a_t2_port: - - a_single_1a_1a_t2_port - - network.outgoing.bytes.rate + network.incoming.packets.rate_a_single_1a_a_single_1a_t2_port_0: + - a_single_1a_a_single_1a_t2_port_0 + - network.incoming.packets.rate + network.incoming.bytes_a_single_1a_a_single_1a_t2_port_0: + - a_single_1a_a_single_1a_t2_port_0 + - network.incoming.bytes + network.incoming.bytes.rate_a_single_1a_a_single_1a_t1_port_0: + - a_single_1a_a_single_1a_t1_port_0 + - network.incoming.bytes.rate host_a_single_1a: - a_single_1a - host @@ -261,27 +264,24 @@ topology_template: memory.resident_a_single_1a: - a_single_1a - memory.resident - network.incoming.packets.rate_a_single_1a_1a_t2_port: - - a_single_1a_1a_t2_port - - network.incoming.packets.rate cpu.delta_a_single_1a: - a_single_1a - cpu.delta - forwarder_a_single_1a_1a_t1_port: - - a_single_1a_1a_t1_port - - forwarder + network.incoming.bytes_a_single_1a_a_single_1a_t1_port_0: + - a_single_1a_a_single_1a_t1_port_0 + - network.incoming.bytes disk.device.write.requests_a_single_1a: - a_single_1a - disk.device.write.requests - network.incoming.bytes.rate_a_single_1a_1a_t1_port: - - a_single_1a_1a_t1_port - - network.incoming.bytes.rate disk.iops_a_single_1a: - a_single_1a - disk.iops - network.incoming.bytes_a_single_1a_1a_t1_port: - - a_single_1a_1a_t1_port - - network.incoming.bytes + network.outgoing.bytes_a_single_1a_a_single_1a_t2_port_0: + - a_single_1a_a_single_1a_t2_port_0 + - network.outgoing.bytes + forwarder_a_single_1a_a_single_1a_t1_port_0: + - a_single_1a_a_single_1a_t1_port_0 + - forwarder cpu_util_a_single_1a: - a_single_1a - cpu_util @@ -291,42 +291,39 @@ topology_template: disk.device.usage_a_single_1a: - a_single_1a - disk.device.usage - network.incoming.packets.rate_a_single_1a_1a_t1_port: - - a_single_1a_1a_t1_port - - network.incoming.packets.rate - network.outgoing.packets.rate_a_single_1a_1a_t2_port: - - a_single_1a_1a_t2_port - - network.outgoing.packets.rate + attachment_a_single_1a_a_single_1a_t1_port_0: + - a_single_1a_a_single_1a_t1_port_0 + - attachment disk.read.requests_a_single_1a: - a_single_1a - disk.read.requests disk.read.bytes.rate_a_single_1a: - a_single_1a - disk.read.bytes.rate + binding_a_single_1a_a_single_1a_t2_port_0: + - a_single_1a_a_single_1a_t2_port_0 + - binding disk.write.bytes.rate_a_single_1a: - a_single_1a - disk.write.bytes.rate - attachment_a_single_1a_1a_t1_port: - - a_single_1a_1a_t1_port - - attachment + feature_a_single_1a_a_single_1a_t2_port_0: + - a_single_1a_a_single_1a_t2_port_0 + - feature cpu_a_single_1a: - a_single_1a - cpu memory.usage_a_single_1a: - a_single_1a - memory.usage - forwarder_a_single_1a_1a_t2_port: - - a_single_1a_1a_t2_port - - forwarder + network.outpoing.packets_a_single_1a_a_single_1a_t1_port_0: + - a_single_1a_a_single_1a_t1_port_0 + - network.outpoing.packets disk.device.write.requests.rate_a_single_1a: - a_single_1a - disk.device.write.requests.rate - binding_a_single_1a_1a_t2_port: - - a_single_1a_1a_t2_port - - binding - network.incoming.packets_a_single_1a_1a_t2_port: - - a_single_1a_1a_t2_port - - network.incoming.packets + network.outgoing.packets.rate_a_single_1a_a_single_1a_t2_port_0: + - a_single_1a_a_single_1a_t2_port_0 + - network.outgoing.packets.rate disk.device.read.requests_a_single_1a: - a_single_1a - disk.device.read.requests @@ -342,24 +339,12 @@ topology_template: disk.latency_a_single_1a: - a_single_1a - disk.latency - network.outgoing.bytes_a_single_1a_1a_t2_port: - - a_single_1a_1a_t2_port - - network.outgoing.bytes disk.device.allocation_a_single_1a: - a_single_1a - disk.device.allocation disk.write.bytes_a_single_1a: - a_single_1a - disk.write.bytes - feature_a_single_1a_1a_t1_port: - - a_single_1a_1a_t1_port - - feature - network.outpoing.packets_a_single_1a_1a_t2_port: - - a_single_1a_1a_t2_port - - network.outpoing.packets - network.outpoing.packets_a_single_1a_1a_t1_port: - - a_single_1a_1a_t1_port - - network.outpoing.packets disk.device.read.bytes.rate_a_single_1a: - a_single_1a - disk.device.read.bytes.rate @@ -369,78 +354,93 @@ topology_template: disk.device.write.bytes.rate_a_single_1a: - a_single_1a - disk.device.write.bytes.rate + network.incoming.packets_a_single_1a_a_single_1a_t2_port_0: + - a_single_1a_a_single_1a_t2_port_0 + - network.incoming.packets memory_a_single_1a: - a_single_1a - memory disk.allocation_a_single_1a: - a_single_1a - disk.allocation - network.outgoing.packets.rate_a_single_1a_1a_t1_port: - - a_single_1a_1a_t1_port - - network.outgoing.packets.rate - feature_a_single_1a_1a_t2_port: - - a_single_1a_1a_t2_port - - feature + network.incoming.packets_a_single_1a_a_single_1a_t1_port_0: + - a_single_1a_a_single_1a_t1_port_0 + - network.incoming.packets + network.outgoing.bytes.rate_a_single_1a_a_single_1a_t2_port_0: + - a_single_1a_a_single_1a_t2_port_0 + - network.outgoing.bytes.rate + network.outgoing.bytes.rate_a_single_1a_a_single_1a_t1_port_0: + - a_single_1a_a_single_1a_t1_port_0 + - network.outgoing.bytes.rate disk.capacity_a_single_1a: - a_single_1a - disk.capacity disk.device.read.bytes_a_single_1a: - a_single_1a - disk.device.read.bytes - network.incoming.packets_a_single_1a_1a_t1_port: - - a_single_1a_1a_t1_port - - network.incoming.packets feature_a_single_1a: - a_single_1a - feature - network.outgoing.bytes_a_single_1a_1a_t1_port: - - a_single_1a_1a_t1_port + network.outgoing.bytes_a_single_1a_a_single_1a_t1_port_0: + - a_single_1a_a_single_1a_t1_port_0 - network.outgoing.bytes + forwarder_a_single_1a_a_single_1a_t2_port_0: + - a_single_1a_a_single_1a_t2_port_0 + - forwarder disk.ephemeral.size_a_single_1a: - a_single_1a - disk.ephemeral.size vcpus_a_single_1a: - a_single_1a - vcpus - binding_a_single_1a_1a_t1_port: - - a_single_1a_1a_t1_port - - binding + attachment_a_single_1a_a_single_1a_t2_port_0: + - a_single_1a_a_single_1a_t2_port_0 + - attachment + network.incoming.packets.rate_a_single_1a_a_single_1a_t1_port_0: + - a_single_1a_a_single_1a_t1_port_0 + - network.incoming.packets.rate disk.device.iops_a_single_1a: - a_single_1a - disk.device.iops disk.write.requests_a_single_1a: - a_single_1a - disk.write.requests + network.outpoing.packets_a_single_1a_a_single_1a_t2_port_0: + - a_single_1a_a_single_1a_t2_port_0 + - network.outpoing.packets disk.device.read.requests.rate_a_single_1a: - a_single_1a - disk.device.read.requests.rate + feature_a_single_1a_a_single_1a_t1_port_0: + - a_single_1a_a_single_1a_t1_port_0 + - feature disk.device.capacity_a_single_1a: - a_single_1a - disk.device.capacity + binding_a_single_1a_a_single_1a_t1_port_0: + - a_single_1a_a_single_1a_t1_port_0 + - binding disk.write.requests.rate_a_single_1a: - a_single_1a - disk.write.requests.rate - network.incoming.bytes_a_single_1a_1a_t2_port: - - a_single_1a_1a_t2_port - - network.incoming.bytes - network.outgoing.bytes.rate_a_single_1a_1a_t1_port: - - a_single_1a_1a_t1_port - - network.outgoing.bytes.rate + network.outgoing.packets.rate_a_single_1a_a_single_1a_t1_port_0: + - a_single_1a_a_single_1a_t1_port_0 + - network.outgoing.packets.rate requirements: - link_a_single_1a_1a_t2_port: - - a_single_1a_1a_t2_port + link_a_single_1a_a_single_1a_t2_port_0: + - a_single_1a_a_single_1a_t2_port_0 - link - link_a_single_1a_1a_t1_port: - - a_single_1a_1a_t1_port + link_a_single_1a_a_single_1a_t1_port_0: + - a_single_1a_a_single_1a_t1_port_0 - link dependency_a_single_1a: - a_single_1a - dependency - dependency_a_single_1a_1a_t2_port: - - a_single_1a_1a_t2_port + dependency_a_single_1a_a_single_1a_t2_port_0: + - a_single_1a_a_single_1a_t2_port_0 - dependency - dependency_a_single_1a_1a_t1_port: - - a_single_1a_1a_t1_port + dependency_a_single_1a_a_single_1a_t1_port_0: + - a_single_1a_a_single_1a_t1_port_0 - dependency local_storage_a_single_1a: - 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/twoAppearancePerPatternWithConnectivities/out/Nested_a_single_2aServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_a_single_2aServiceTemplate.yaml index 34c13baf1d..8670430317 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_a_single_2aServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_a_single_2aServiceTemplate.yaml @@ -11,14 +11,27 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_a_single_2a_t1_port_0_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_a_single_2a_t1_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true compute_a_single_2a_user_data_format: type: list required: true entry_schema: type: string - port_1a_t1_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_a_single_2a_t1_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true + port_a_single_2a_t1_port_0_network: + type: list + required: true + entry_schema: + type: string index_value: type: integer description: Index value of this substitution service template runtime instance @@ -26,30 +39,11 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_1a_t1_port_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_1a_t1_port_related_networks: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_1a_t1_port_network_role_tag: - type: string - required: true - port_1a_t1_port_network_role: - type: string - required: true compute_a_single_2a_scheduler_hints: type: list required: true entry_schema: type: json - port_1a_t1_port_order: - type: integer - required: true compute_a_single_2a_availability_zone: type: list required: true @@ -58,30 +52,36 @@ topology_template: vm_flavor_name: type: string required: true - port_1a_t1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_a_single_2a_t1_port_0_network_role_tag: + type: string + required: true + port_a_single_2a_t1_port_0_order: + type: integer required: true - port_1a_t1_port_network: + compute_a_single_2a_name: type: list required: true entry_schema: type: string - port_1a_t1_port_subnetpoolid: + vm_image_name: type: string required: true - compute_a_single_2a_name: + port_a_single_2a_t1_port_0_vlan_requirements: type: list required: true entry_schema: - type: string - vm_image_name: + type: org.openecomp.datatypes.network.VlanRequirements + port_a_single_2a_t1_port_0_network_role: + type: string + required: true + port_a_single_2a_t1_port_0_subnetpoolid: type: string required: true - port_1a_t1_port_vlan_requirements: + port_a_single_2a_t1_port_0_related_networks: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.RelatedNetworksAssignments compute_a_single_2a_metadata: type: list required: true @@ -115,31 +115,31 @@ topology_template: get_input: - compute_a_single_2a_user_data_format - index_value - a_single_2a_1a_t1_port: + a_single_2a_a_single_2a_t1_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_1a_t1_port_exCP_naming + get_input: port_a_single_2a_t1_port_0_exCP_naming vlan_requirements: - get_input: port_1a_t1_port_vlan_requirements + get_input: port_a_single_2a_t1_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_1a_t1_port_related_networks + get_input: port_a_single_2a_t1_port_0_related_networks ip_requirements: - get_input: port_1a_t1_port_ip_requirements + get_input: port_a_single_2a_t1_port_0_ip_requirements network_role_tag: - get_input: port_1a_t1_port_network_role_tag + get_input: port_a_single_2a_t1_port_0_network_role_tag mac_requirements: - get_input: port_1a_t1_port_mac_requirements + get_input: port_a_single_2a_t1_port_0_mac_requirements order: - get_input: port_1a_t1_port_order + get_input: port_a_single_2a_t1_port_0_order network_role: - get_input: port_1a_t1_port_network_role + get_input: port_a_single_2a_t1_port_0_network_role subnetpoolid: - get_input: port_1a_t1_port_subnetpoolid + get_input: port_a_single_2a_t1_port_0_subnetpoolid network: get_input: - - port_1a_t1_port_network + - port_a_single_2a_t1_port_0_network - index_value requirements: - binding: @@ -159,6 +159,12 @@ topology_template: disk.capacity_a_single_2a: - a_single_2a - disk.capacity + network.incoming.bytes_a_single_2a_a_single_2a_t1_port_0: + - a_single_2a_a_single_2a_t1_port_0 + - network.incoming.bytes + feature_a_single_2a_a_single_2a_t1_port_0: + - a_single_2a_a_single_2a_t1_port_0 + - feature disk.ephemeral.size_a_single_2a: - a_single_2a - disk.ephemeral.size @@ -180,18 +186,12 @@ topology_template: disk.device.usage_a_single_2a: - a_single_2a - disk.device.usage - forwarder_a_single_2a_1a_t1_port: - - a_single_2a_1a_t1_port - - forwarder disk.read.bytes.rate_a_single_2a: - a_single_2a - disk.read.bytes.rate disk.device.write.requests.rate_a_single_2a: - a_single_2a - disk.device.write.requests.rate - network.incoming.bytes.rate_a_single_2a_1a_t1_port: - - a_single_2a_1a_t1_port - - network.incoming.bytes.rate disk.write.requests.rate_a_single_2a: - a_single_2a - disk.write.requests.rate @@ -210,21 +210,15 @@ topology_template: disk.latency_a_single_2a: - a_single_2a - disk.latency - network.incoming.packets.rate_a_single_2a_1a_t1_port: - - a_single_2a_1a_t1_port - - network.incoming.packets.rate + forwarder_a_single_2a_a_single_2a_t1_port_0: + - a_single_2a_a_single_2a_t1_port_0 + - forwarder disk.usage_a_single_2a: - a_single_2a - disk.usage - network.incoming.bytes_a_single_2a_1a_t1_port: - - a_single_2a_1a_t1_port - - network.incoming.bytes scalable_a_single_2a: - a_single_2a - scalable - feature_a_single_2a_1a_t1_port: - - a_single_2a_1a_t1_port - - feature disk.device.write.bytes_a_single_2a: - a_single_2a - disk.device.write.bytes @@ -237,21 +231,27 @@ topology_template: disk.root.size_a_single_2a: - a_single_2a - disk.root.size + network.outpoing.packets_a_single_2a_a_single_2a_t1_port_0: + - a_single_2a_a_single_2a_t1_port_0 + - network.outpoing.packets disk.device.write.requests_a_single_2a: - a_single_2a - disk.device.write.requests - attachment_a_single_2a_1a_t1_port: - - a_single_2a_1a_t1_port - - attachment disk.iops_a_single_2a: - a_single_2a - disk.iops vcpus_a_single_2a: - a_single_2a - vcpus + network.outgoing.bytes.rate_a_single_2a_a_single_2a_t1_port_0: + - a_single_2a_a_single_2a_t1_port_0 + - network.outgoing.bytes.rate os_a_single_2a: - a_single_2a - os + network.incoming.packets_a_single_2a_a_single_2a_t1_port_0: + - a_single_2a_a_single_2a_t1_port_0 + - network.incoming.packets disk.write.bytes.rate_a_single_2a: - a_single_2a - disk.write.bytes.rate @@ -267,33 +267,36 @@ topology_template: memory.usage_a_single_2a: - a_single_2a - memory.usage - network.outgoing.packets.rate_a_single_2a_1a_t1_port: - - a_single_2a_1a_t1_port - - network.outgoing.packets.rate - network.outpoing.packets_a_single_2a_1a_t1_port: - - a_single_2a_1a_t1_port - - network.outpoing.packets + attachment_a_single_2a_a_single_2a_t1_port_0: + - a_single_2a_a_single_2a_t1_port_0 + - attachment + network.incoming.packets.rate_a_single_2a_a_single_2a_t1_port_0: + - a_single_2a_a_single_2a_t1_port_0 + - network.incoming.packets.rate + binding_a_single_2a_a_single_2a_t1_port_0: + - a_single_2a_a_single_2a_t1_port_0 + - binding binding_a_single_2a: - a_single_2a - binding instance_a_single_2a: - a_single_2a - instance - network.outgoing.bytes_a_single_2a_1a_t1_port: - - a_single_2a_1a_t1_port - - network.outgoing.bytes + network.incoming.bytes.rate_a_single_2a_a_single_2a_t1_port_0: + - a_single_2a_a_single_2a_t1_port_0 + - network.incoming.bytes.rate disk.write.bytes_a_single_2a: - a_single_2a - disk.write.bytes - binding_a_single_2a_1a_t1_port: - - a_single_2a_1a_t1_port - - binding - network.incoming.packets_a_single_2a_1a_t1_port: - - a_single_2a_1a_t1_port - - network.incoming.packets + network.outgoing.packets.rate_a_single_2a_a_single_2a_t1_port_0: + - a_single_2a_a_single_2a_t1_port_0 + - network.outgoing.packets.rate host_a_single_2a: - a_single_2a - host + network.outgoing.bytes_a_single_2a_a_single_2a_t1_port_0: + - a_single_2a_a_single_2a_t1_port_0 + - network.outgoing.bytes disk.device.write.bytes.rate_a_single_2a: - a_single_2a - disk.device.write.bytes.rate @@ -306,9 +309,6 @@ topology_template: memory.resident_a_single_2a: - a_single_2a - memory.resident - network.outgoing.bytes.rate_a_single_2a_1a_t1_port: - - a_single_2a_1a_t1_port - - network.outgoing.bytes.rate cpu.delta_a_single_2a: - a_single_2a - cpu.delta @@ -316,15 +316,15 @@ topology_template: - a_single_2a - feature requirements: + link_a_single_2a_a_single_2a_t1_port_0: + - a_single_2a_a_single_2a_t1_port_0 + - link dependency_a_single_2a: - a_single_2a - dependency - dependency_a_single_2a_1a_t1_port: - - a_single_2a_1a_t1_port + dependency_a_single_2a_a_single_2a_t1_port_0: + - a_single_2a_a_single_2a_t1_port_0 - dependency - link_a_single_2a_1a_t1_port: - - a_single_2a_1a_t1_port - - link local_storage_a_single_2a: - a_single_2a - local_storage \ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_1bServiceTemplate.yaml index 82eb0a0bf7..795c6564c8 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_1bServiceTemplate.yaml @@ -11,35 +11,45 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_1b_t1_port_order: - type: integer + port_b_single_1b_t1_port_0_network_role_tag: + type: string + required: true + port_b_single_1b_t1_port_0_related_networks: + type: list required: true - port_1b_t1_port_network_role: + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_b_single_1b_t2_port_0_subnetpoolid: type: string required: true - port_1b_t1_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_b_single_1b_t1_port_0_network_role: + type: string required: true + port_b_single_1b_t2_port_0_network: + type: list + required: true + entry_schema: + type: string vm_flavor_name: type: string required: true - port_1b_t2_port_related_networks: + port_b_single_1b_t1_port_0_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_1b_t1_port_ip_requirements: + type: org.openecomp.datatypes.network.VlanRequirements + port_b_single_1b_t2_port_0_related_networks: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_image_name: type: string required: true - port_1b_t2_port_network_role: - type: string + port_b_single_1b_t2_port_0_order: + type: integer required: true - port_1b_t2_port_order: + port_b_single_1b_t1_port_0_order: type: integer required: true compute_b_single_1b_user_data_format: @@ -47,28 +57,32 @@ topology_template: required: true entry_schema: type: string - port_1b_t2_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_1b_t2_port_network_role_tag: - type: string + port_b_single_1b_t2_port_0_vlan_requirements: + type: list required: true - port_1b_t2_port_subnetpoolid: + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_b_single_1b_t2_port_0_network_role: type: string required: true - port_1b_t1_port_related_networks: + port_b_single_1b_t1_port_0_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_1b_t2_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + type: org.openecomp.datatypes.network.IpRequirements + port_b_single_1b_t1_port_0_value_specs: + type: list required: true + entry_schema: + type: json compute_b_single_1b_availability_zone: type: list required: true entry_schema: type: string + port_b_single_1b_t1_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -81,45 +95,31 @@ topology_template: required: true entry_schema: type: json - port_1b_t2_port_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_1b_t2_port_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_1b_t1_port_value_specs: - type: list + port_b_single_1b_t1_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json - port_1b_t1_port_network_role_tag: + port_b_single_1b_t1_port_0_subnetpoolid: type: string required: true - port_1b_t1_port_subnetpoolid: + port_b_single_1b_t2_port_0_network_role_tag: type: string required: true - port_1b_t1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_1b_t2_port_network: + port_b_single_1b_t1_port_0_network: type: list required: true entry_schema: type: string - port_1b_t1_port_vlan_requirements: + port_b_single_1b_t2_port_0_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_1b_t1_port_network: - type: list + type: org.openecomp.datatypes.network.IpRequirements + port_b_single_1b_t2_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_b_single_1b_t2_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: string compute_b_single_1b_name: type: list required: true @@ -149,66 +149,66 @@ topology_template: get_input: - compute_b_single_1b_user_data_format - index_value - b_single_1b_1b_t1_port: + b_single_1b_b_single_1b_t2_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - mac_requirements: - get_input: port_1b_t1_port_mac_requirements - order: - get_input: port_1b_t1_port_order - value_specs: - get_input: - - port_1b_t1_port_value_specs - - index_value exCP_naming: - get_input: port_1b_t1_port_exCP_naming + get_input: port_b_single_1b_t2_port_0_exCP_naming vlan_requirements: - get_input: port_1b_t1_port_vlan_requirements + get_input: port_b_single_1b_t2_port_0_vlan_requirements subinterface_indicator: false - ip_requirements: - get_input: port_1b_t1_port_ip_requirements related_networks: - get_input: port_1b_t1_port_related_networks + get_input: port_b_single_1b_t2_port_0_related_networks + ip_requirements: + get_input: port_b_single_1b_t2_port_0_ip_requirements network_role_tag: - get_input: port_1b_t1_port_network_role_tag + get_input: port_b_single_1b_t2_port_0_network_role_tag + mac_requirements: + get_input: port_b_single_1b_t2_port_0_mac_requirements + order: + get_input: port_b_single_1b_t2_port_0_order network_role: - get_input: port_1b_t1_port_network_role + get_input: port_b_single_1b_t2_port_0_network_role subnetpoolid: - get_input: port_1b_t1_port_subnetpoolid + get_input: port_b_single_1b_t2_port_0_subnetpoolid network: get_input: - - port_1b_t1_port_network + - port_b_single_1b_t2_port_0_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: b_single_1b relationship: tosca.relationships.network.BindsTo - b_single_1b_1b_t2_port: + b_single_1b_b_single_1b_t1_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + mac_requirements: + get_input: port_b_single_1b_t1_port_0_mac_requirements + order: + get_input: port_b_single_1b_t1_port_0_order + value_specs: + get_input: + - port_b_single_1b_t1_port_0_value_specs + - index_value exCP_naming: - get_input: port_1b_t2_port_exCP_naming + get_input: port_b_single_1b_t1_port_0_exCP_naming vlan_requirements: - get_input: port_1b_t2_port_vlan_requirements + get_input: port_b_single_1b_t1_port_0_vlan_requirements subinterface_indicator: false - related_networks: - get_input: port_1b_t2_port_related_networks ip_requirements: - get_input: port_1b_t2_port_ip_requirements + get_input: port_b_single_1b_t1_port_0_ip_requirements + related_networks: + get_input: port_b_single_1b_t1_port_0_related_networks network_role_tag: - get_input: port_1b_t2_port_network_role_tag - mac_requirements: - get_input: port_1b_t2_port_mac_requirements - order: - get_input: port_1b_t2_port_order + get_input: port_b_single_1b_t1_port_0_network_role_tag network_role: - get_input: port_1b_t2_port_network_role + get_input: port_b_single_1b_t1_port_0_network_role subnetpoolid: - get_input: port_1b_t2_port_subnetpoolid + get_input: port_b_single_1b_t1_port_0_subnetpoolid network: get_input: - - port_1b_t2_port_network + - port_b_single_1b_t1_port_0_network - index_value requirements: - binding: @@ -222,21 +222,15 @@ topology_template: get_attribute: - b_single_1b - instance_name - b_single_1b_1b_t1_port_tenant_id: + b_single_1b_b_single_1b_t1_port_0_tenant_id: type: string value: get_attribute: - - b_single_1b_1b_t1_port + - b_single_1b_b_single_1b_t1_port_0 - tenant_id substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.b_single_1b capabilities: - attachment_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port - - attachment - forwarder_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port - - forwarder endpoint_b_single_1b: - b_single_1b - endpoint @@ -246,15 +240,30 @@ topology_template: disk.iops_b_single_1b: - b_single_1b - disk.iops - network.incoming.bytes.rate_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port + network.incoming.bytes_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 + - network.incoming.bytes + network.incoming.packets.rate_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - network.incoming.packets.rate + network.incoming.bytes_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - network.incoming.bytes + binding_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 + - binding + feature_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - feature + feature_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 + - feature + network.incoming.bytes.rate_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 - network.incoming.bytes.rate - network.outgoing.bytes.rate_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port - - network.outgoing.bytes.rate - forwarder_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - forwarder + binding_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - binding scalable_b_single_1b: - b_single_1b - scalable @@ -264,24 +273,30 @@ topology_template: os_b_single_1b: - b_single_1b - os + forwarder_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - forwarder + forwarder_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 + - forwarder vcpus_b_single_1b: - b_single_1b - vcpus cpu_b_single_1b: - b_single_1b - cpu + network.incoming.bytes.rate_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - network.incoming.bytes.rate disk.device.read.requests.rate_b_single_1b: - b_single_1b - disk.device.read.requests.rate - network.incoming.packets.rate_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port + network.incoming.packets.rate_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 - network.incoming.packets.rate instance_b_single_1b: - b_single_1b - instance - network.incoming.bytes.rate_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - network.incoming.bytes.rate disk.read.bytes_b_single_1b: - b_single_1b - disk.read.bytes @@ -291,45 +306,36 @@ topology_template: disk.usage_b_single_1b: - b_single_1b - disk.usage - network.incoming.bytes_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - network.incoming.bytes disk.device.allocation_b_single_1b: - b_single_1b - disk.device.allocation - network.outgoing.packets.rate_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port + network.outgoing.packets.rate_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 - network.outgoing.packets.rate + network.outpoing.packets_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 + - network.outpoing.packets + network.outgoing.bytes_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - network.outgoing.bytes disk.device.capacity_b_single_1b: - b_single_1b - disk.device.capacity disk.latency_b_single_1b: - b_single_1b - disk.latency - network.incoming.packets_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port - - network.incoming.packets - network.incoming.packets.rate_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - network.incoming.packets.rate - attachment_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port + attachment_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 - attachment disk.device.write.requests_b_single_1b: - b_single_1b - disk.device.write.requests - binding_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port - - binding disk.ephemeral.size_b_single_1b: - b_single_1b - disk.ephemeral.size disk.write.requests.rate_b_single_1b: - b_single_1b - disk.write.requests.rate - network.outpoing.packets_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port - - network.outpoing.packets disk.device.iops_b_single_1b: - b_single_1b - disk.device.iops @@ -339,15 +345,18 @@ topology_template: memory.resident_b_single_1b: - b_single_1b - memory.resident + network.outgoing.bytes.rate_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - network.outgoing.bytes.rate disk.root.size_b_single_1b: - b_single_1b - disk.root.size - feature_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - feature - network.outgoing.bytes_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port - - network.outgoing.bytes + network.incoming.packets_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 + - network.incoming.packets + network.outgoing.bytes.rate_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 + - network.outgoing.bytes.rate disk.capacity_b_single_1b: - b_single_1b - disk.capacity @@ -366,45 +375,39 @@ topology_template: disk.write.requests_b_single_1b: - b_single_1b - disk.write.requests - network.outgoing.packets.rate_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - network.outgoing.packets.rate + network.incoming.packets_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - network.incoming.packets disk.device.usage_b_single_1b: - b_single_1b - disk.device.usage disk.read.bytes.rate_b_single_1b: - b_single_1b - disk.read.bytes.rate - network.outgoing.bytes_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - network.outgoing.bytes disk.device.read.requests_b_single_1b: - b_single_1b - disk.device.read.requests - network.incoming.packets_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - network.incoming.packets - binding_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - binding - network.outpoing.packets_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - network.outpoing.packets + attachment_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - attachment disk.device.write.requests.rate_b_single_1b: - b_single_1b - disk.device.write.requests.rate + network.outgoing.packets.rate_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 + - network.outgoing.packets.rate + network.outpoing.packets_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - network.outpoing.packets memory.usage_b_single_1b: - b_single_1b - memory.usage + network.outgoing.bytes_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 + - network.outgoing.bytes disk.write.bytes.rate_b_single_1b: - b_single_1b - disk.write.bytes.rate - network.incoming.bytes_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port - - network.incoming.bytes - network.outgoing.bytes.rate_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - network.outgoing.bytes.rate cpu.delta_b_single_1b: - b_single_1b - cpu.delta @@ -423,25 +426,22 @@ topology_template: binding_b_single_1b: - b_single_1b - binding - feature_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port - - feature requirements: local_storage_b_single_1b: - b_single_1b - local_storage - dependency_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - dependency + link_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 + - link dependency_b_single_1b: - b_single_1b - dependency - link_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port - - link - link_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - link - dependency_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port - - dependency \ No newline at end of file + dependency_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - dependency + dependency_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 + - dependency + link_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - link \ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_1b_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_1b_1ServiceTemplate.yaml index 488f239c43..ec6bd707c2 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_1b_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_1b_1ServiceTemplate.yaml @@ -11,35 +11,45 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_1b_t1_port_order: - type: integer + port_b_single_1b_t1_port_0_network_role_tag: + type: string + required: true + port_b_single_1b_t1_port_0_related_networks: + type: list required: true - port_1b_t1_port_network_role: + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_b_single_1b_t2_port_0_subnetpoolid: type: string required: true - port_1b_t1_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_b_single_1b_t1_port_0_network_role: + type: string + required: true + port_b_single_1b_t2_port_0_network: + type: list required: true + entry_schema: + type: string vm_flavor_name: type: string required: true - port_1b_t2_port_related_networks: + port_b_single_1b_t1_port_0_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_1b_t1_port_ip_requirements: + type: org.openecomp.datatypes.network.VlanRequirements + port_b_single_1b_t2_port_0_related_networks: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_image_name: type: string required: true - port_1b_t2_port_network_role: - type: string + port_b_single_1b_t2_port_0_order: + type: integer required: true - port_1b_t2_port_order: + port_b_single_1b_t1_port_0_order: type: integer required: true compute_b_single_1b_user_data_format: @@ -47,28 +57,27 @@ topology_template: required: true entry_schema: type: string - port_1b_t2_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_1b_t2_port_network_role_tag: - type: string + port_b_single_1b_t2_port_0_vlan_requirements: + type: list required: true - port_1b_t2_port_subnetpoolid: + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_b_single_1b_t2_port_0_network_role: type: string required: true - port_1b_t1_port_related_networks: + port_b_single_1b_t1_port_0_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_1b_t2_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true + type: org.openecomp.datatypes.network.IpRequirements compute_b_single_1b_availability_zone: type: list required: true entry_schema: type: string + port_b_single_1b_t1_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -81,17 +90,13 @@ topology_template: required: true entry_schema: type: json - port_1b_t2_port_vlan_requirements: - type: list + port_b_single_1b_t1_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_1b_t2_port_ip_requirements: - type: list + port_b_single_1b_t1_port_0_subnetpoolid: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_1b_t1_port_network_role_tag: + port_b_single_1b_t2_port_0_network_role_tag: type: string required: true compute_b_single_1b_metadata: @@ -99,22 +104,17 @@ topology_template: required: true entry_schema: type: json - port_1b_t1_port_subnetpoolid: - type: string - required: true - port_1b_t1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_1b_t2_port_network: + port_b_single_1b_t2_port_0_ip_requirements: type: list required: true entry_schema: - type: string - port_1b_t1_port_vlan_requirements: - type: list + type: org.openecomp.datatypes.network.IpRequirements + port_b_single_1b_t2_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_b_single_1b_t2_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements compute_b_single_1b_name: type: list required: true @@ -148,63 +148,63 @@ topology_template: get_input: - compute_b_single_1b_user_data_format - index_value - b_single_1b_1b_t1_port: + b_single_1b_b_single_1b_t2_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_1b_t1_port_exCP_naming + get_input: port_b_single_1b_t2_port_0_exCP_naming vlan_requirements: - get_input: port_1b_t1_port_vlan_requirements + get_input: port_b_single_1b_t2_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_1b_t1_port_related_networks + get_input: port_b_single_1b_t2_port_0_related_networks ip_requirements: - get_input: port_1b_t1_port_ip_requirements + get_input: port_b_single_1b_t2_port_0_ip_requirements network_role_tag: - get_input: port_1b_t1_port_network_role_tag + get_input: port_b_single_1b_t2_port_0_network_role_tag mac_requirements: - get_input: port_1b_t1_port_mac_requirements + get_input: port_b_single_1b_t2_port_0_mac_requirements order: - get_input: port_1b_t1_port_order + get_input: port_b_single_1b_t2_port_0_order network_role: - get_input: port_1b_t1_port_network_role + get_input: port_b_single_1b_t2_port_0_network_role subnetpoolid: - get_input: port_1b_t1_port_subnetpoolid + get_input: port_b_single_1b_t2_port_0_subnetpoolid network: - get_attribute: - - b_single_1b - - accessIPv6 + get_input: + - port_b_single_1b_t2_port_0_network + - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: b_single_1b relationship: tosca.relationships.network.BindsTo - b_single_1b_1b_t2_port: + b_single_1b_b_single_1b_t1_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_1b_t2_port_exCP_naming + get_input: port_b_single_1b_t1_port_0_exCP_naming vlan_requirements: - get_input: port_1b_t2_port_vlan_requirements + get_input: port_b_single_1b_t1_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_1b_t2_port_related_networks + get_input: port_b_single_1b_t1_port_0_related_networks ip_requirements: - get_input: port_1b_t2_port_ip_requirements + get_input: port_b_single_1b_t1_port_0_ip_requirements network_role_tag: - get_input: port_1b_t2_port_network_role_tag + get_input: port_b_single_1b_t1_port_0_network_role_tag mac_requirements: - get_input: port_1b_t2_port_mac_requirements + get_input: port_b_single_1b_t1_port_0_mac_requirements order: - get_input: port_1b_t2_port_order + get_input: port_b_single_1b_t1_port_0_order network_role: - get_input: port_1b_t2_port_network_role + get_input: port_b_single_1b_t1_port_0_network_role subnetpoolid: - get_input: port_1b_t2_port_subnetpoolid + get_input: port_b_single_1b_t1_port_0_subnetpoolid network: - get_input: - - port_1b_t2_port_network - - index_value + get_attribute: + - b_single_1b + - accessIPv6 requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -217,21 +217,15 @@ topology_template: get_attribute: - b_single_1b - instance_name - b_single_1b_1b_t1_port_tenant_id: + b_single_1b_b_single_1b_t1_port_0_tenant_id: type: string value: get_attribute: - - b_single_1b_1b_t1_port + - b_single_1b_b_single_1b_t1_port_0 - tenant_id substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.b_single_1b_1 capabilities: - attachment_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port - - attachment - forwarder_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port - - forwarder endpoint_b_single_1b: - b_single_1b - endpoint @@ -241,15 +235,30 @@ topology_template: disk.iops_b_single_1b: - b_single_1b - disk.iops - network.incoming.bytes.rate_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port + network.incoming.bytes_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 + - network.incoming.bytes + network.incoming.packets.rate_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - network.incoming.packets.rate + network.incoming.bytes_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - network.incoming.bytes + binding_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 + - binding + feature_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - feature + feature_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 + - feature + network.incoming.bytes.rate_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 - network.incoming.bytes.rate - network.outgoing.bytes.rate_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port - - network.outgoing.bytes.rate - forwarder_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - forwarder + binding_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - binding scalable_b_single_1b: - b_single_1b - scalable @@ -259,24 +268,30 @@ topology_template: os_b_single_1b: - b_single_1b - os + forwarder_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - forwarder + forwarder_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 + - forwarder vcpus_b_single_1b: - b_single_1b - vcpus cpu_b_single_1b: - b_single_1b - cpu + network.incoming.bytes.rate_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - network.incoming.bytes.rate disk.device.read.requests.rate_b_single_1b: - b_single_1b - disk.device.read.requests.rate - network.incoming.packets.rate_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port + network.incoming.packets.rate_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 - network.incoming.packets.rate instance_b_single_1b: - b_single_1b - instance - network.incoming.bytes.rate_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - network.incoming.bytes.rate disk.read.bytes_b_single_1b: - b_single_1b - disk.read.bytes @@ -286,45 +301,36 @@ topology_template: disk.usage_b_single_1b: - b_single_1b - disk.usage - network.incoming.bytes_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - network.incoming.bytes disk.device.allocation_b_single_1b: - b_single_1b - disk.device.allocation - network.outgoing.packets.rate_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port + network.outgoing.packets.rate_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 - network.outgoing.packets.rate + network.outpoing.packets_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 + - network.outpoing.packets + network.outgoing.bytes_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - network.outgoing.bytes disk.device.capacity_b_single_1b: - b_single_1b - disk.device.capacity disk.latency_b_single_1b: - b_single_1b - disk.latency - network.incoming.packets_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port - - network.incoming.packets - network.incoming.packets.rate_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - network.incoming.packets.rate - attachment_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port + attachment_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 - attachment disk.device.write.requests_b_single_1b: - b_single_1b - disk.device.write.requests - binding_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port - - binding disk.ephemeral.size_b_single_1b: - b_single_1b - disk.ephemeral.size disk.write.requests.rate_b_single_1b: - b_single_1b - disk.write.requests.rate - network.outpoing.packets_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port - - network.outpoing.packets disk.device.iops_b_single_1b: - b_single_1b - disk.device.iops @@ -334,15 +340,18 @@ topology_template: memory.resident_b_single_1b: - b_single_1b - memory.resident + network.outgoing.bytes.rate_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - network.outgoing.bytes.rate disk.root.size_b_single_1b: - b_single_1b - disk.root.size - feature_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - feature - network.outgoing.bytes_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port - - network.outgoing.bytes + network.incoming.packets_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 + - network.incoming.packets + network.outgoing.bytes.rate_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 + - network.outgoing.bytes.rate disk.capacity_b_single_1b: - b_single_1b - disk.capacity @@ -361,45 +370,39 @@ topology_template: disk.write.requests_b_single_1b: - b_single_1b - disk.write.requests - network.outgoing.packets.rate_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - network.outgoing.packets.rate + network.incoming.packets_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - network.incoming.packets disk.device.usage_b_single_1b: - b_single_1b - disk.device.usage disk.read.bytes.rate_b_single_1b: - b_single_1b - disk.read.bytes.rate - network.outgoing.bytes_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - network.outgoing.bytes disk.device.read.requests_b_single_1b: - b_single_1b - disk.device.read.requests - network.incoming.packets_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - network.incoming.packets - binding_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - binding - network.outpoing.packets_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - network.outpoing.packets + attachment_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - attachment disk.device.write.requests.rate_b_single_1b: - b_single_1b - disk.device.write.requests.rate + network.outgoing.packets.rate_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 + - network.outgoing.packets.rate + network.outpoing.packets_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - network.outpoing.packets memory.usage_b_single_1b: - b_single_1b - memory.usage + network.outgoing.bytes_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 + - network.outgoing.bytes disk.write.bytes.rate_b_single_1b: - b_single_1b - disk.write.bytes.rate - network.incoming.bytes_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port - - network.incoming.bytes - network.outgoing.bytes.rate_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - network.outgoing.bytes.rate cpu.delta_b_single_1b: - b_single_1b - cpu.delta @@ -418,25 +421,22 @@ topology_template: binding_b_single_1b: - b_single_1b - binding - feature_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port - - feature requirements: local_storage_b_single_1b: - b_single_1b - local_storage - dependency_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - dependency + link_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 + - link dependency_b_single_1b: - b_single_1b - dependency - link_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port - - link - link_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - link - dependency_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port - - dependency \ No newline at end of file + dependency_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - dependency + dependency_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 + - dependency + link_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - link \ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_2bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_2bServiceTemplate.yaml index 58e103ec0e..a6faf92d01 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_2bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_2bServiceTemplate.yaml @@ -11,64 +11,60 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_1b_t1_port_order: - type: integer - required: true - port_1b_t1_port_network_role: + port_b_single_2b_t2_port_0_network_role: type: string required: true - port_1b_t1_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true vm_flavor_name: type: string required: true - port_1b_t2_port_related_networks: + port_b_single_2b_t1_port_0_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_1b_t1_port_ip_requirements: + type: org.openecomp.datatypes.network.IpRequirements + port_b_single_2b_t1_port_0_network_role_tag: + type: string + required: true + port_b_single_2b_t2_port_0_related_networks: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_image_name: type: string required: true + port_b_single_2b_t2_port_0_subnetpoolid: + type: string + required: true + port_b_single_2b_t2_port_0_network: + type: list + required: true + entry_schema: + type: string compute_b_single_2b_scheduler_hints: type: list required: true entry_schema: type: json - port_1b_t2_port_network_role: - type: string - required: true - port_1b_t2_port_order: - type: integer - required: true - port_1b_t2_port_exCP_naming: + port_b_single_2b_t1_port_0_exCP_naming: type: org.openecomp.datatypes.Naming required: true - port_1b_t2_port_network_role_tag: - type: string - required: true - port_1b_t2_port_subnetpoolid: - type: string + port_b_single_2b_t1_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_1b_t1_port_related_networks: - type: list + port_b_single_2b_t2_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments compute_b_single_2b_availability_zone: type: list required: true entry_schema: type: string - port_1b_t2_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_b_single_2b_t1_port_0_vlan_requirements: + type: list required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements index_value: type: integer description: Index value of this substitution service template runtime instance @@ -76,55 +72,59 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_1b_t2_port_vlan_requirements: + compute_b_single_2b_name: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_1b_t2_port_ip_requirements: + type: string + port_b_single_2b_t1_port_0_order: + type: integer + required: true + port_b_single_2b_t2_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_b_single_2b_t2_port_0_ip_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - compute_b_single_2b_name: + compute_b_single_2b_user_data_format: type: list required: true entry_schema: type: string - port_1b_t1_port_value_specs: + port_b_single_2b_t2_port_0_vlan_requirements: type: list required: true entry_schema: - type: json - compute_b_single_2b_user_data_format: + type: org.openecomp.datatypes.network.VlanRequirements + port_b_single_2b_t1_port_0_related_networks: type: list required: true entry_schema: - type: string - port_1b_t1_port_network_role_tag: - type: string - required: true - port_1b_t1_port_subnetpoolid: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_b_single_2b_t1_port_0_network_role: type: string required: true - port_1b_t1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_1b_t2_port_network: + port_b_single_2b_t1_port_0_value_specs: type: list required: true entry_schema: - type: string - port_1b_t1_port_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_1b_t1_port_network: + type: json + port_b_single_2b_t1_port_0_network: type: list required: true entry_schema: type: string + port_b_single_2b_t2_port_0_order: + type: integer + required: true + port_b_single_2b_t1_port_0_subnetpoolid: + type: string + required: true + port_b_single_2b_t2_port_0_network_role_tag: + type: string + required: true node_templates: b_single_2b: type: org.openecomp.resource.vfc.compute.nodes.heat.b_single_2b @@ -149,66 +149,66 @@ topology_template: get_input: - compute_b_single_2b_user_data_format - index_value - b_single_2b_1b_t1_port: + b_single_2b_b_single_2b_t1_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_requirements: - get_input: port_1b_t1_port_mac_requirements + get_input: port_b_single_2b_t1_port_0_mac_requirements order: - get_input: port_1b_t1_port_order + get_input: port_b_single_2b_t1_port_0_order value_specs: get_input: - - port_1b_t1_port_value_specs + - port_b_single_2b_t1_port_0_value_specs - index_value exCP_naming: - get_input: port_1b_t1_port_exCP_naming + get_input: port_b_single_2b_t1_port_0_exCP_naming vlan_requirements: - get_input: port_1b_t1_port_vlan_requirements + get_input: port_b_single_2b_t1_port_0_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_1b_t1_port_ip_requirements + get_input: port_b_single_2b_t1_port_0_ip_requirements related_networks: - get_input: port_1b_t1_port_related_networks + get_input: port_b_single_2b_t1_port_0_related_networks network_role_tag: - get_input: port_1b_t1_port_network_role_tag + get_input: port_b_single_2b_t1_port_0_network_role_tag network_role: - get_input: port_1b_t1_port_network_role + get_input: port_b_single_2b_t1_port_0_network_role subnetpoolid: - get_input: port_1b_t1_port_subnetpoolid + get_input: port_b_single_2b_t1_port_0_subnetpoolid network: get_input: - - port_1b_t1_port_network + - port_b_single_2b_t1_port_0_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: b_single_2b relationship: tosca.relationships.network.BindsTo - b_single_2b_1b_t2_port: + b_single_2b_b_single_2b_t2_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_1b_t2_port_exCP_naming + get_input: port_b_single_2b_t2_port_0_exCP_naming vlan_requirements: - get_input: port_1b_t2_port_vlan_requirements + get_input: port_b_single_2b_t2_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_1b_t2_port_related_networks + get_input: port_b_single_2b_t2_port_0_related_networks ip_requirements: - get_input: port_1b_t2_port_ip_requirements + get_input: port_b_single_2b_t2_port_0_ip_requirements network_role_tag: - get_input: port_1b_t2_port_network_role_tag + get_input: port_b_single_2b_t2_port_0_network_role_tag mac_requirements: - get_input: port_1b_t2_port_mac_requirements + get_input: port_b_single_2b_t2_port_0_mac_requirements order: - get_input: port_1b_t2_port_order + get_input: port_b_single_2b_t2_port_0_order network_role: - get_input: port_1b_t2_port_network_role + get_input: port_b_single_2b_t2_port_0_network_role subnetpoolid: - get_input: port_1b_t2_port_subnetpoolid + get_input: port_b_single_2b_t2_port_0_subnetpoolid network: get_input: - - port_1b_t2_port_network + - port_b_single_2b_t2_port_0_network - index_value requirements: - binding: @@ -228,18 +228,12 @@ topology_template: disk.usage_b_single_2b: - b_single_2b - disk.usage - forwarder_b_single_2b_1b_t2_port: - - b_single_2b_1b_t2_port - - forwarder - network.incoming.bytes.rate_b_single_2b_1b_t2_port: - - b_single_2b_1b_t2_port - - network.incoming.bytes.rate - network.outgoing.bytes.rate_b_single_2b_1b_t2_port: - - b_single_2b_1b_t2_port - - network.outgoing.bytes.rate - attachment_b_single_2b_1b_t2_port: - - b_single_2b_1b_t2_port - - attachment + feature_b_single_2b_b_single_2b_t1_port_0: + - b_single_2b_b_single_2b_t1_port_0 + - feature + feature_b_single_2b_b_single_2b_t2_port_0: + - b_single_2b_b_single_2b_t2_port_0 + - feature disk.write.bytes.rate_b_single_2b: - b_single_2b - disk.write.bytes.rate @@ -255,30 +249,30 @@ topology_template: disk.device.write.requests_b_single_2b: - b_single_2b - disk.device.write.requests - network.incoming.packets.rate_b_single_2b_1b_t2_port: - - b_single_2b_1b_t2_port - - network.incoming.packets.rate disk.read.bytes_b_single_2b: - b_single_2b - disk.read.bytes - forwarder_b_single_2b_1b_t1_port: - - b_single_2b_1b_t1_port - - forwarder + network.incoming.bytes_b_single_2b_b_single_2b_t2_port_0: + - b_single_2b_b_single_2b_t2_port_0 + - network.incoming.bytes + network.incoming.bytes_b_single_2b_b_single_2b_t1_port_0: + - b_single_2b_b_single_2b_t1_port_0 + - network.incoming.bytes disk.device.iops_b_single_2b: - b_single_2b - disk.device.iops disk.ephemeral.size_b_single_2b: - b_single_2b - disk.ephemeral.size - network.incoming.bytes.rate_b_single_2b_1b_t1_port: - - b_single_2b_1b_t1_port - - network.incoming.bytes.rate - network.incoming.bytes_b_single_2b_1b_t1_port: - - b_single_2b_1b_t1_port - - network.incoming.bytes + network.outgoing.packets.rate_b_single_2b_b_single_2b_t2_port_0: + - b_single_2b_b_single_2b_t2_port_0 + - network.outgoing.packets.rate disk.write.requests.rate_b_single_2b: - b_single_2b - disk.write.requests.rate + network.incoming.bytes.rate_b_single_2b_b_single_2b_t2_port_0: + - b_single_2b_b_single_2b_t2_port_0 + - network.incoming.bytes.rate feature_b_single_2b: - b_single_2b - feature @@ -288,66 +282,69 @@ topology_template: disk.write.requests_b_single_2b: - b_single_2b - disk.write.requests - network.outgoing.packets.rate_b_single_2b_1b_t2_port: - - b_single_2b_1b_t2_port - - network.outgoing.packets.rate + forwarder_b_single_2b_b_single_2b_t1_port_0: + - b_single_2b_b_single_2b_t1_port_0 + - forwarder disk.capacity_b_single_2b: - b_single_2b - disk.capacity disk.device.read.bytes_b_single_2b: - b_single_2b - disk.device.read.bytes - network.incoming.packets.rate_b_single_2b_1b_t1_port: - - b_single_2b_1b_t1_port + network.incoming.packets.rate_b_single_2b_b_single_2b_t2_port_0: + - b_single_2b_b_single_2b_t2_port_0 - network.incoming.packets.rate - attachment_b_single_2b_1b_t1_port: - - b_single_2b_1b_t1_port - - attachment disk.write.bytes_b_single_2b: - b_single_2b - disk.write.bytes - network.incoming.packets_b_single_2b_1b_t2_port: - - b_single_2b_1b_t2_port - - network.incoming.packets + binding_b_single_2b_b_single_2b_t2_port_0: + - b_single_2b_b_single_2b_t2_port_0 + - binding + network.outpoing.packets_b_single_2b_b_single_2b_t1_port_0: + - b_single_2b_b_single_2b_t1_port_0 + - network.outpoing.packets vcpus_b_single_2b: - b_single_2b - vcpus + network.outgoing.bytes_b_single_2b_b_single_2b_t2_port_0: + - b_single_2b_b_single_2b_t2_port_0 + - network.outgoing.bytes disk.device.read.requests.rate_b_single_2b: - b_single_2b - disk.device.read.requests.rate - binding_b_single_2b_1b_t2_port: - - b_single_2b_1b_t2_port - - binding instance_b_single_2b: - b_single_2b - instance - network.outpoing.packets_b_single_2b_1b_t2_port: - - b_single_2b_1b_t2_port - - network.outpoing.packets + network.incoming.packets_b_single_2b_b_single_2b_t2_port_0: + - b_single_2b_b_single_2b_t2_port_0 + - network.incoming.packets disk.device.read.requests_b_single_2b: - b_single_2b - disk.device.read.requests + network.incoming.packets_b_single_2b_b_single_2b_t1_port_0: + - b_single_2b_b_single_2b_t1_port_0 + - network.incoming.packets + network.outgoing.bytes.rate_b_single_2b_b_single_2b_t2_port_0: + - b_single_2b_b_single_2b_t2_port_0 + - network.outgoing.bytes.rate disk.device.latency_b_single_2b: - b_single_2b - disk.device.latency - network.outgoing.bytes_b_single_2b_1b_t2_port: - - b_single_2b_1b_t2_port - - network.outgoing.bytes disk.device.allocation_b_single_2b: - b_single_2b - disk.device.allocation disk.latency_b_single_2b: - b_single_2b - disk.latency - feature_b_single_2b_1b_t1_port: - - b_single_2b_1b_t1_port - - feature disk.device.read.bytes.rate_b_single_2b: - b_single_2b - disk.device.read.bytes.rate - network.outpoing.packets_b_single_2b_1b_t1_port: - - b_single_2b_1b_t1_port - - network.outpoing.packets + attachment_b_single_2b_b_single_2b_t2_port_0: + - b_single_2b_b_single_2b_t2_port_0 + - attachment + attachment_b_single_2b_b_single_2b_t1_port_0: + - b_single_2b_b_single_2b_t1_port_0 + - attachment disk.device.write.bytes.rate_b_single_2b: - b_single_2b - disk.device.write.bytes.rate @@ -357,33 +354,30 @@ topology_template: memory_b_single_2b: - b_single_2b - memory - network.outgoing.packets.rate_b_single_2b_1b_t1_port: - - b_single_2b_1b_t1_port - - network.outgoing.packets.rate + network.outgoing.bytes.rate_b_single_2b_b_single_2b_t1_port_0: + - b_single_2b_b_single_2b_t1_port_0 + - network.outgoing.bytes.rate binding_b_single_2b: - b_single_2b - binding - network.incoming.packets_b_single_2b_1b_t1_port: - - b_single_2b_1b_t1_port - - network.incoming.packets - network.outgoing.bytes_b_single_2b_1b_t1_port: - - b_single_2b_1b_t1_port - - network.outgoing.bytes - binding_b_single_2b_1b_t1_port: - - b_single_2b_1b_t1_port - - binding - feature_b_single_2b_1b_t2_port: - - b_single_2b_1b_t2_port - - feature os_b_single_2b: - b_single_2b - os + binding_b_single_2b_b_single_2b_t1_port_0: + - b_single_2b_b_single_2b_t1_port_0 + - binding + forwarder_b_single_2b_b_single_2b_t2_port_0: + - b_single_2b_b_single_2b_t2_port_0 + - forwarder disk.root.size_b_single_2b: - b_single_2b - disk.root.size disk.read.requests_b_single_2b: - b_single_2b - disk.read.requests + network.incoming.bytes.rate_b_single_2b_b_single_2b_t1_port_0: + - b_single_2b_b_single_2b_t1_port_0 + - network.incoming.bytes.rate endpoint_b_single_2b: - b_single_2b - endpoint @@ -393,6 +387,9 @@ topology_template: disk.device.write.bytes_b_single_2b: - b_single_2b - disk.device.write.bytes + network.incoming.packets.rate_b_single_2b_b_single_2b_t1_port_0: + - b_single_2b_b_single_2b_t1_port_0 + - network.incoming.packets.rate scalable_b_single_2b: - b_single_2b - scalable @@ -405,37 +402,40 @@ topology_template: disk.device.usage_b_single_2b: - b_single_2b - disk.device.usage + network.outpoing.packets_b_single_2b_b_single_2b_t2_port_0: + - b_single_2b_b_single_2b_t2_port_0 + - network.outpoing.packets disk.device.write.requests.rate_b_single_2b: - b_single_2b - disk.device.write.requests.rate cpu_b_single_2b: - b_single_2b - cpu + network.outgoing.packets.rate_b_single_2b_b_single_2b_t1_port_0: + - b_single_2b_b_single_2b_t1_port_0 + - network.outgoing.packets.rate disk.read.bytes.rate_b_single_2b: - b_single_2b - disk.read.bytes.rate - network.incoming.bytes_b_single_2b_1b_t2_port: - - b_single_2b_1b_t2_port - - network.incoming.bytes - network.outgoing.bytes.rate_b_single_2b_1b_t1_port: - - b_single_2b_1b_t1_port - - network.outgoing.bytes.rate + network.outgoing.bytes_b_single_2b_b_single_2b_t1_port_0: + - b_single_2b_b_single_2b_t1_port_0 + - network.outgoing.bytes requirements: local_storage_b_single_2b: - b_single_2b - local_storage + dependency_b_single_2b_b_single_2b_t2_port_0: + - b_single_2b_b_single_2b_t2_port_0 + - dependency dependency_b_single_2b: - b_single_2b - dependency - link_b_single_2b_1b_t2_port: - - b_single_2b_1b_t2_port - - link - link_b_single_2b_1b_t1_port: - - b_single_2b_1b_t1_port - - link - dependency_b_single_2b_1b_t2_port: - - b_single_2b_1b_t2_port + dependency_b_single_2b_b_single_2b_t1_port_0: + - b_single_2b_b_single_2b_t1_port_0 - dependency - dependency_b_single_2b_1b_t1_port: - - b_single_2b_1b_t1_port - - dependency \ No newline at end of file + link_b_single_2b_b_single_2b_t2_port_0: + - b_single_2b_b_single_2b_t2_port_0 + - link + link_b_single_2b_b_single_2b_t1_port_0: + - b_single_2b_b_single_2b_t1_port_0 + - link \ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_2b_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_b_single_2b_1ServiceTemplate.yaml index 25a923862c..cf13bf47d0 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_2b_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_b_single_2b_1ServiceTemplate.yaml @@ -11,19 +11,21 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_1b_t1_port_order: - type: integer + port_b_single_2b_t2_port_0_network_role: + type: string required: true - port_1b_t1_port_network_role: + vm_flavor_name: type: string required: true - port_1b_t1_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_b_single_2b_t1_port_0_ip_requirements: + type: list required: true - vm_flavor_name: + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_b_single_2b_t1_port_0_network_role_tag: type: string required: true - port_1b_t2_port_related_networks: + port_b_single_2b_t2_port_0_related_networks: type: list required: true entry_schema: @@ -33,47 +35,41 @@ topology_template: required: true entry_schema: type: json - port_1b_t1_port_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements vm_image_name: type: string required: true + port_b_single_2b_t2_port_0_subnetpoolid: + type: string + required: true + port_b_single_2b_t2_port_0_network: + type: list + required: true + entry_schema: + type: string compute_b_single_2b_scheduler_hints: type: list required: true entry_schema: type: json - port_1b_t2_port_network_role: - type: string - required: true - port_1b_t2_port_order: - type: integer - required: true - port_1b_t2_port_exCP_naming: + port_b_single_2b_t1_port_0_exCP_naming: type: org.openecomp.datatypes.Naming required: true - port_1b_t2_port_network_role_tag: - type: string - required: true - port_1b_t2_port_subnetpoolid: - type: string + port_b_single_2b_t1_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_1b_t1_port_related_networks: - type: list + port_b_single_2b_t2_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments compute_b_single_2b_availability_zone: type: list required: true entry_schema: type: string - port_1b_t2_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_b_single_2b_t1_port_0_vlan_requirements: + type: list required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements index_value: type: integer description: Index value of this substitution service template runtime instance @@ -81,45 +77,49 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_1b_t2_port_vlan_requirements: + compute_b_single_2b_name: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_1b_t2_port_ip_requirements: + type: string + port_b_single_2b_t1_port_0_order: + type: integer + required: true + port_b_single_2b_t2_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_b_single_2b_t2_port_0_ip_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - compute_b_single_2b_name: + compute_b_single_2b_user_data_format: type: list required: true entry_schema: type: string - compute_b_single_2b_user_data_format: + port_b_single_2b_t2_port_0_vlan_requirements: type: list required: true entry_schema: - type: string - port_1b_t1_port_network_role_tag: - type: string + type: org.openecomp.datatypes.network.VlanRequirements + port_b_single_2b_t1_port_0_related_networks: + type: list required: true - port_1b_t1_port_subnetpoolid: + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_b_single_2b_t1_port_0_network_role: type: string required: true - port_1b_t1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_b_single_2b_t2_port_0_order: + type: integer required: true - port_1b_t2_port_network: - type: list + port_b_single_2b_t1_port_0_subnetpoolid: + type: string required: true - entry_schema: - type: string - port_1b_t1_port_vlan_requirements: - type: list + port_b_single_2b_t2_port_0_network_role_tag: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements node_templates: b_single_2b: type: org.openecomp.resource.vfc.compute.nodes.heat.b_single_2b @@ -148,28 +148,28 @@ topology_template: get_input: - compute_b_single_2b_user_data_format - index_value - b_single_2b_1b_t1_port: + b_single_2b_b_single_2b_t1_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_1b_t1_port_exCP_naming + get_input: port_b_single_2b_t1_port_0_exCP_naming vlan_requirements: - get_input: port_1b_t1_port_vlan_requirements + get_input: port_b_single_2b_t1_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_1b_t1_port_related_networks + get_input: port_b_single_2b_t1_port_0_related_networks ip_requirements: - get_input: port_1b_t1_port_ip_requirements + get_input: port_b_single_2b_t1_port_0_ip_requirements network_role_tag: - get_input: port_1b_t1_port_network_role_tag + get_input: port_b_single_2b_t1_port_0_network_role_tag mac_requirements: - get_input: port_1b_t1_port_mac_requirements + get_input: port_b_single_2b_t1_port_0_mac_requirements order: - get_input: port_1b_t1_port_order + get_input: port_b_single_2b_t1_port_0_order network_role: - get_input: port_1b_t1_port_network_role + get_input: port_b_single_2b_t1_port_0_network_role subnetpoolid: - get_input: port_1b_t1_port_subnetpoolid + get_input: port_b_single_2b_t1_port_0_subnetpoolid network: get_attribute: - b_single_2b @@ -179,31 +179,31 @@ topology_template: capability: tosca.capabilities.network.Bindable node: b_single_2b relationship: tosca.relationships.network.BindsTo - b_single_2b_1b_t2_port: + b_single_2b_b_single_2b_t2_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_1b_t2_port_exCP_naming + get_input: port_b_single_2b_t2_port_0_exCP_naming vlan_requirements: - get_input: port_1b_t2_port_vlan_requirements + get_input: port_b_single_2b_t2_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_1b_t2_port_related_networks + get_input: port_b_single_2b_t2_port_0_related_networks ip_requirements: - get_input: port_1b_t2_port_ip_requirements + get_input: port_b_single_2b_t2_port_0_ip_requirements network_role_tag: - get_input: port_1b_t2_port_network_role_tag + get_input: port_b_single_2b_t2_port_0_network_role_tag mac_requirements: - get_input: port_1b_t2_port_mac_requirements + get_input: port_b_single_2b_t2_port_0_mac_requirements order: - get_input: port_1b_t2_port_order + get_input: port_b_single_2b_t2_port_0_order network_role: - get_input: port_1b_t2_port_network_role + get_input: port_b_single_2b_t2_port_0_network_role subnetpoolid: - get_input: port_1b_t2_port_subnetpoolid + get_input: port_b_single_2b_t2_port_0_subnetpoolid network: get_input: - - port_1b_t2_port_network + - port_b_single_2b_t2_port_0_network - index_value requirements: - binding: @@ -223,18 +223,12 @@ topology_template: disk.usage_b_single_2b: - b_single_2b - disk.usage - forwarder_b_single_2b_1b_t2_port: - - b_single_2b_1b_t2_port - - forwarder - network.incoming.bytes.rate_b_single_2b_1b_t2_port: - - b_single_2b_1b_t2_port - - network.incoming.bytes.rate - network.outgoing.bytes.rate_b_single_2b_1b_t2_port: - - b_single_2b_1b_t2_port - - network.outgoing.bytes.rate - attachment_b_single_2b_1b_t2_port: - - b_single_2b_1b_t2_port - - attachment + feature_b_single_2b_b_single_2b_t1_port_0: + - b_single_2b_b_single_2b_t1_port_0 + - feature + feature_b_single_2b_b_single_2b_t2_port_0: + - b_single_2b_b_single_2b_t2_port_0 + - feature disk.write.bytes.rate_b_single_2b: - b_single_2b - disk.write.bytes.rate @@ -250,30 +244,30 @@ topology_template: disk.device.write.requests_b_single_2b: - b_single_2b - disk.device.write.requests - network.incoming.packets.rate_b_single_2b_1b_t2_port: - - b_single_2b_1b_t2_port - - network.incoming.packets.rate disk.read.bytes_b_single_2b: - b_single_2b - disk.read.bytes - forwarder_b_single_2b_1b_t1_port: - - b_single_2b_1b_t1_port - - forwarder + network.incoming.bytes_b_single_2b_b_single_2b_t2_port_0: + - b_single_2b_b_single_2b_t2_port_0 + - network.incoming.bytes + network.incoming.bytes_b_single_2b_b_single_2b_t1_port_0: + - b_single_2b_b_single_2b_t1_port_0 + - network.incoming.bytes disk.device.iops_b_single_2b: - b_single_2b - disk.device.iops disk.ephemeral.size_b_single_2b: - b_single_2b - disk.ephemeral.size - network.incoming.bytes.rate_b_single_2b_1b_t1_port: - - b_single_2b_1b_t1_port - - network.incoming.bytes.rate - network.incoming.bytes_b_single_2b_1b_t1_port: - - b_single_2b_1b_t1_port - - network.incoming.bytes + network.outgoing.packets.rate_b_single_2b_b_single_2b_t2_port_0: + - b_single_2b_b_single_2b_t2_port_0 + - network.outgoing.packets.rate disk.write.requests.rate_b_single_2b: - b_single_2b - disk.write.requests.rate + network.incoming.bytes.rate_b_single_2b_b_single_2b_t2_port_0: + - b_single_2b_b_single_2b_t2_port_0 + - network.incoming.bytes.rate feature_b_single_2b: - b_single_2b - feature @@ -283,66 +277,69 @@ topology_template: disk.write.requests_b_single_2b: - b_single_2b - disk.write.requests - network.outgoing.packets.rate_b_single_2b_1b_t2_port: - - b_single_2b_1b_t2_port - - network.outgoing.packets.rate + forwarder_b_single_2b_b_single_2b_t1_port_0: + - b_single_2b_b_single_2b_t1_port_0 + - forwarder disk.capacity_b_single_2b: - b_single_2b - disk.capacity disk.device.read.bytes_b_single_2b: - b_single_2b - disk.device.read.bytes - network.incoming.packets.rate_b_single_2b_1b_t1_port: - - b_single_2b_1b_t1_port + network.incoming.packets.rate_b_single_2b_b_single_2b_t2_port_0: + - b_single_2b_b_single_2b_t2_port_0 - network.incoming.packets.rate - attachment_b_single_2b_1b_t1_port: - - b_single_2b_1b_t1_port - - attachment disk.write.bytes_b_single_2b: - b_single_2b - disk.write.bytes - network.incoming.packets_b_single_2b_1b_t2_port: - - b_single_2b_1b_t2_port - - network.incoming.packets + binding_b_single_2b_b_single_2b_t2_port_0: + - b_single_2b_b_single_2b_t2_port_0 + - binding + network.outpoing.packets_b_single_2b_b_single_2b_t1_port_0: + - b_single_2b_b_single_2b_t1_port_0 + - network.outpoing.packets vcpus_b_single_2b: - b_single_2b - vcpus + network.outgoing.bytes_b_single_2b_b_single_2b_t2_port_0: + - b_single_2b_b_single_2b_t2_port_0 + - network.outgoing.bytes disk.device.read.requests.rate_b_single_2b: - b_single_2b - disk.device.read.requests.rate - binding_b_single_2b_1b_t2_port: - - b_single_2b_1b_t2_port - - binding instance_b_single_2b: - b_single_2b - instance - network.outpoing.packets_b_single_2b_1b_t2_port: - - b_single_2b_1b_t2_port - - network.outpoing.packets + network.incoming.packets_b_single_2b_b_single_2b_t2_port_0: + - b_single_2b_b_single_2b_t2_port_0 + - network.incoming.packets disk.device.read.requests_b_single_2b: - b_single_2b - disk.device.read.requests + network.incoming.packets_b_single_2b_b_single_2b_t1_port_0: + - b_single_2b_b_single_2b_t1_port_0 + - network.incoming.packets + network.outgoing.bytes.rate_b_single_2b_b_single_2b_t2_port_0: + - b_single_2b_b_single_2b_t2_port_0 + - network.outgoing.bytes.rate disk.device.latency_b_single_2b: - b_single_2b - disk.device.latency - network.outgoing.bytes_b_single_2b_1b_t2_port: - - b_single_2b_1b_t2_port - - network.outgoing.bytes disk.device.allocation_b_single_2b: - b_single_2b - disk.device.allocation disk.latency_b_single_2b: - b_single_2b - disk.latency - feature_b_single_2b_1b_t1_port: - - b_single_2b_1b_t1_port - - feature disk.device.read.bytes.rate_b_single_2b: - b_single_2b - disk.device.read.bytes.rate - network.outpoing.packets_b_single_2b_1b_t1_port: - - b_single_2b_1b_t1_port - - network.outpoing.packets + attachment_b_single_2b_b_single_2b_t2_port_0: + - b_single_2b_b_single_2b_t2_port_0 + - attachment + attachment_b_single_2b_b_single_2b_t1_port_0: + - b_single_2b_b_single_2b_t1_port_0 + - attachment disk.device.write.bytes.rate_b_single_2b: - b_single_2b - disk.device.write.bytes.rate @@ -352,33 +349,30 @@ topology_template: memory_b_single_2b: - b_single_2b - memory - network.outgoing.packets.rate_b_single_2b_1b_t1_port: - - b_single_2b_1b_t1_port - - network.outgoing.packets.rate + network.outgoing.bytes.rate_b_single_2b_b_single_2b_t1_port_0: + - b_single_2b_b_single_2b_t1_port_0 + - network.outgoing.bytes.rate binding_b_single_2b: - b_single_2b - binding - network.incoming.packets_b_single_2b_1b_t1_port: - - b_single_2b_1b_t1_port - - network.incoming.packets - network.outgoing.bytes_b_single_2b_1b_t1_port: - - b_single_2b_1b_t1_port - - network.outgoing.bytes - binding_b_single_2b_1b_t1_port: - - b_single_2b_1b_t1_port - - binding - feature_b_single_2b_1b_t2_port: - - b_single_2b_1b_t2_port - - feature os_b_single_2b: - b_single_2b - os + binding_b_single_2b_b_single_2b_t1_port_0: + - b_single_2b_b_single_2b_t1_port_0 + - binding + forwarder_b_single_2b_b_single_2b_t2_port_0: + - b_single_2b_b_single_2b_t2_port_0 + - forwarder disk.root.size_b_single_2b: - b_single_2b - disk.root.size disk.read.requests_b_single_2b: - b_single_2b - disk.read.requests + network.incoming.bytes.rate_b_single_2b_b_single_2b_t1_port_0: + - b_single_2b_b_single_2b_t1_port_0 + - network.incoming.bytes.rate endpoint_b_single_2b: - b_single_2b - endpoint @@ -388,6 +382,9 @@ topology_template: disk.device.write.bytes_b_single_2b: - b_single_2b - disk.device.write.bytes + network.incoming.packets.rate_b_single_2b_b_single_2b_t1_port_0: + - b_single_2b_b_single_2b_t1_port_0 + - network.incoming.packets.rate scalable_b_single_2b: - b_single_2b - scalable @@ -400,37 +397,40 @@ topology_template: disk.device.usage_b_single_2b: - b_single_2b - disk.device.usage + network.outpoing.packets_b_single_2b_b_single_2b_t2_port_0: + - b_single_2b_b_single_2b_t2_port_0 + - network.outpoing.packets disk.device.write.requests.rate_b_single_2b: - b_single_2b - disk.device.write.requests.rate cpu_b_single_2b: - b_single_2b - cpu + network.outgoing.packets.rate_b_single_2b_b_single_2b_t1_port_0: + - b_single_2b_b_single_2b_t1_port_0 + - network.outgoing.packets.rate disk.read.bytes.rate_b_single_2b: - b_single_2b - disk.read.bytes.rate - network.incoming.bytes_b_single_2b_1b_t2_port: - - b_single_2b_1b_t2_port - - network.incoming.bytes - network.outgoing.bytes.rate_b_single_2b_1b_t1_port: - - b_single_2b_1b_t1_port - - network.outgoing.bytes.rate + network.outgoing.bytes_b_single_2b_b_single_2b_t1_port_0: + - b_single_2b_b_single_2b_t1_port_0 + - network.outgoing.bytes requirements: local_storage_b_single_2b: - b_single_2b - local_storage + dependency_b_single_2b_b_single_2b_t2_port_0: + - b_single_2b_b_single_2b_t2_port_0 + - dependency dependency_b_single_2b: - b_single_2b - dependency - link_b_single_2b_1b_t2_port: - - b_single_2b_1b_t2_port - - link - link_b_single_2b_1b_t1_port: - - b_single_2b_1b_t1_port - - link - dependency_b_single_2b_1b_t2_port: - - b_single_2b_1b_t2_port + dependency_b_single_2b_b_single_2b_t1_port_0: + - b_single_2b_b_single_2b_t1_port_0 - dependency - dependency_b_single_2b_1b_t1_port: - - b_single_2b_1b_t1_port - - dependency \ No newline at end of file + link_b_single_2b_b_single_2b_t2_port_0: + - b_single_2b_b_single_2b_t2_port_0 + - link + link_b_single_2b_b_single_2b_t1_port_0: + - b_single_2b_b_single_2b_t1_port_0 + - link \ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_pcma_server_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_pcma_server_1ServiceTemplate.yaml index a149bdc39c..25ffdd165b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_pcma_server_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_pcma_server_1ServiceTemplate.yaml @@ -11,14 +11,14 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_pcm_port_0_network_role: - type: string - required: true port_pcm_port_1_related_networks: type: list required: true entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pcm_port_0_network_role: + type: string + required: true port_pcm_port_1_network_role_tag: type: string required: true @@ -65,10 +65,10 @@ topology_template: port_pcm_port_0_network_role_tag: type: string required: true - port_pcm_port_0_exCP_naming: + port_pcm_port_1_exCP_naming: type: org.openecomp.datatypes.Naming required: true - port_pcm_port_1_exCP_naming: + port_pcm_port_0_exCP_naming: type: org.openecomp.datatypes.Naming required: true port_pcm_port_1_network_role: @@ -79,16 +79,16 @@ topology_template: required: true entry_schema: type: string - port_pcm_port_0_ip_requirements: + port_pcm_port_1_security_groups: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pcm_port_1_security_groups: + type: json + port_pcm_port_0_ip_requirements: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements compute_pcma_server_config_drive: type: list required: true @@ -129,14 +129,14 @@ topology_template: required: true entry_schema: type: string - port_pcm_port_0_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true port_pcm_port_1_ip_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements + port_pcm_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true port_pcm_port_1_order: type: integer required: true 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 394046886b..06c80bf68b 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 @@ -127,14 +127,14 @@ topology_template: port_pcm_port_0_network_role_tag: cps port_pcm_port_1_network: - get_input: oam_net_name + port_pcm_port_1_security_groups: + - - get_input: security_group_name port_pcm_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false - port_pcm_port_1_security_groups: - - - get_input: security_group_name compute_pcma_server_config_drive: - true compute_pcma_server_user_data_format: @@ -149,15 +149,15 @@ topology_template: get_input: oam_net_ip compute_pcma_server_name: - get_input: pcma_server_name - port_pcm_port_0_mac_requirements: - mac_count_required: - is_required: false port_pcm_port_1_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false + port_pcm_port_0_mac_requirements: + mac_count_required: + is_required: false service_template_filter: substitute_service_template: Nested_pcma_server_1ServiceTemplate.yaml count: 1 @@ -669,4 +669,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/in/main.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/in/main.yml index 8dc7b43734..eedaf27870 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/in/main.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/in/main.yml @@ -119,14 +119,14 @@ resources: ########### PATTERN 1C1 ################# - cmaui_port_01: + cmaui_1c1_main_1_mgmt_port_0: type: OS::Neutron::Port properties: network: { get_param: contrail_net_name} fixed_ips: [{"ip_address": {get_param: [cmaui_oam_ips, 0]}}] replacement_policy: AUTO - cmaui_port_02: + cmaui_1c1_main_2_mgmt_port_0: type: OS::Neutron::Port properties: network: { get_param: contrail_net_name} @@ -145,7 +145,7 @@ resources: availability_zone: { get_param: availability_zone_0 } flavor: { get_param: cmaui_1c1_main_flavor } networks: - - port: { get_resource: cmaui_port_01 } + - port: { get_resource: cmaui_1c1_main_1_mgmt_port_0 } server_main_1c1_cmaui_2: type: OS::Nova::Server @@ -159,7 +159,7 @@ resources: availability_zone: { get_param: availability_zone_0 } flavor: { get_param: cmaui_1c1_main_flavor } networks: - - port: { get_resource: cmaui_port_02 } + - port: { get_resource: cmaui_1c1_main_2_mgmt_port_0 } ########### PATTERN 4 ################# diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/in/nested-pattern-4-same-type.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/in/nested-pattern-4-same-type.yml index d957b399c8..b205ee8189 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/in/nested-pattern-4-same-type.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/in/nested-pattern-4-same-type.yml @@ -34,14 +34,14 @@ parameters: type: string resources: - pd_server_pattern4_port_1: + pd_server_pattern4_0_mgmt_port_0: type: OS::Neutron::Port properties: network: { get_param: net } fixed_ips: [{"ip_address": {get_param: [pd_server_pattern4_ips, 0]}}] replacement_policy: AUTO - pd_server_pattern4_port_2: + pd_server_pattern4_1_mgmt_port_0: type: OS::Neutron::Port properties: network: { get_param: net } @@ -56,8 +56,8 @@ resources: availability_zone: { get_param: availability_zone_0 } flavor: { get_param: pd_server_pattern4_flavor } networks: - - port: { get_resource: pd_server_pattern4_port_1 } - - port: { get_resource: pd_server_pattern4_port_2 } + - port: { get_resource: pd_server_pattern4_0_mgmt_port_0 } + - port: { get_resource: pd_server_pattern4_1_mgmt_port_0 } outputs: pattern4_attr_1: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/in/nested-pattern-4.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/in/nested-pattern-4.yml index 68c93f53d3..373a967506 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/in/nested-pattern-4.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/in/nested-pattern-4.yml @@ -34,14 +34,14 @@ parameters: type: string resources: - pd_server_pattern4_port_01: + pd_server_pattern4_1_oam_port_0: type: OS::Neutron::Port properties: network: { get_param: net } fixed_ips: [{"ip_address": {get_param: [pd_server_pattern4_ips, 0]}}] replacement_policy: AUTO - pd_server_pattern4_port_02: + pd_server_pattern4_0_oam_port_0: type: OS::Neutron::Port properties: network: { get_param: net } @@ -56,8 +56,8 @@ resources: availability_zone: { get_param: availability_zone_0 } flavor: { get_param: pd_server_pattern4_flavor } networks: - - port: { get_resource: pd_server_pattern4_port_01 } - - port: { get_resource: pd_server_pattern4_port_02 } + - port: { get_resource: pd_server_pattern4_1_oam_port_0 } + - port: { get_resource: pd_server_pattern4_0_oam_port_0 } outputs: pattern4_attr_1: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/in/nested1.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/in/nested1.yml index 59312c6bba..af3eab7940 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/in/nested1.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/in/nested1.yml @@ -107,14 +107,14 @@ resources: ########### PATTERN 1C1 (same type as main) ################# - cmaui_port_11: + cmaui_1c1_main_11_mgmt_port_0: type: OS::Neutron::Port properties: network: { get_param: contrail_net_name} fixed_ips: [{"ip_address": {get_param: [cmaui_oam_ips, 0]}}] replacement_policy: AUTO - cmaui_port_12: + cmaui_1c1_main_21_mgmt_port_0: type: OS::Neutron::Port properties: network: { get_param: contrail_net_name} @@ -133,7 +133,7 @@ resources: availability_zone: { get_param: availability_zone_0 } flavor: { get_param: cmaui_1c1_main_flavor } networks: - - port: { get_resource: cmaui_port_11 } + - port: { get_resource: cmaui_1c1_main_11_mgmt_port_0 } server_main_1c1_cmaui_21: type: OS::Nova::Server @@ -147,7 +147,7 @@ resources: availability_zone: { get_param: availability_zone_0 } flavor: { get_param: cmaui_1c1_main_flavor } networks: - - port: { get_resource: cmaui_port_12 } + - port: { get_resource: cmaui_1c1_main_21_mgmt_port_0 } ########### PATTERN 4 (same type as main) ################# diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/in/nested2.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/in/nested2.yml index 930b165ed3..16634bcea2 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/in/nested2.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/in/nested2.yml @@ -121,14 +121,14 @@ resources: ########### PATTERN 1C1 ################# - cmaui_port_1: + cmaui_1c1_nested2_1_mgmt_port_0: type: OS::Neutron::Port properties: network: { get_param: contrail_net_name} fixed_ips: [{"ip_address": {get_param: [cmaui_oam_ips, 0]}}] replacement_policy: AUTO - cmaui_port_2: + cmaui_1c1_nested2_2_mgmt_port_0: type: OS::Neutron::Port properties: network: { get_param: contrail_net_name} @@ -148,7 +148,7 @@ resources: availability_zone: { get_param: availability_zone_0 } flavor: { get_param: cmaui_1c1_nested2_flavor } networks: - - port: { get_resource: cmaui_port_1 } + - port: { get_resource: cmaui_1c1_nested2_1_mgmt_port_0 } server_nested2_1c1_cmaui_2: type: OS::Nova::Server @@ -163,7 +163,7 @@ resources: availability_zone: { get_param: availability_zone_0 } flavor: { get_param: cmaui_1c1_nested2_flavor } networks: - - port: { get_resource: cmaui_port_2 } + - port: { get_resource: cmaui_1c1_nested2_2_mgmt_port_0 } ########### PATTERN 4 ################# 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/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml index 75e2b7f6b6..1a92fb8152 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -652,27 +652,35 @@ node_types: description: UID of OAM network required: true status: SUPPORTED + port_pd_server_pattern4_0_mgmt_port_0_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements p2: type: string description: UID of OAM network required: true status: SUPPORTED - port_pd_server_pattern4_port_2_order: - type: integer + port_pd_server_pattern4_0_mgmt_port_0_network_role: + type: string required: true status: SUPPORTED - port_pd_server_pattern4_port_2_vlan_requirements: - type: list + port_pd_server_pattern4_1_mgmt_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd_server_pattern4_port_2_network_role_tag: + port_pd_server_pattern4_1_mgmt_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_pd_server_pattern4_0_mgmt_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_pd_server_pattern4_port_2_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pd_server_pattern4_1_mgmt_port_0_subnetpoolid: + type: string required: true status: SUPPORTED availability_zone_0: @@ -680,23 +688,17 @@ node_types: description: availabilityzone name required: true status: SUPPORTED - port_pd_server_pattern4_port_2_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd_server_pattern4_port_1_vlan_requirements: + port_pd_server_pattern4_0_mgmt_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.RelatedNetworksAssignments net: type: string required: true status: SUPPORTED - port_pd_server_pattern4_port_1_network_role_tag: + port_pd_server_pattern4_1_mgmt_port_0_network_role: type: string required: true status: SUPPORTED @@ -705,20 +707,26 @@ node_types: description: Flavor for PD server required: true status: SUPPORTED - port_pd_server_pattern4_port_2_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_pattern4_1_mgmt_port_0_order: + type: integer + required: true + status: SUPPORTED + port_pd_server_pattern4_1_mgmt_port_0_network_role_tag: + type: string required: true status: SUPPORTED - port_pd_server_pattern4_port_1_ip_requirements: + port_pd_server_pattern4_1_mgmt_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_pd_server_pattern4_port_1_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_pattern4_1_mgmt_port_0_related_networks: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments security_group_name: type: list description: CMAUI1, CMAUI2 server names @@ -731,8 +739,8 @@ node_types: description: Flavor for PS server required: true status: SUPPORTED - port_pd_server_pattern4_port_1_order: - type: integer + port_pd_server_pattern4_0_mgmt_port_0_network_role_tag: + type: string required: true status: SUPPORTED pd_server_pattern4_image: @@ -740,36 +748,28 @@ node_types: description: Flavor for PD server required: true status: SUPPORTED - port_pd_server_pattern4_port_1_related_networks: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd_server_pattern4_port_2_related_networks: + port_pd_server_pattern4_1_mgmt_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd_server_pattern4_port_1_network_role: - type: string - required: true - status: SUPPORTED - port_pd_server_pattern4_port_2_network_role: - type: string + type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_pattern4_0_mgmt_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_pd_server_pattern4_port_1_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pd_server_pattern4_0_mgmt_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_pd_server_pattern4_port_1_subnetpoolid: - type: string + port_pd_server_pattern4_0_mgmt_port_0_ip_requirements: + type: list required: true status: SUPPORTED - port_pd_server_pattern4_port_2_subnetpoolid: - type: string + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd_server_pattern4_0_mgmt_port_0_order: + type: integer required: true status: SUPPORTED pd_server_pattern4_names: @@ -785,19 +785,6 @@ node_types: description: pattern4_attr_1_value status: SUPPORTED requirements: - - dependency_pd_server_pattern4_port_1: - capability: tosca.capabilities.Node - node: tosca.nodes.Root - relationship: tosca.relationships.DependsOn - occurrences: - - 0 - - UNBOUNDED - - link_pd_server_pattern4_port_1: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - dependency_server_pd_pattern4_1: capability: tosca.capabilities.Node node: tosca.nodes.Root @@ -812,14 +799,27 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pattern4_port_2: + - dependency_pd_server_pattern4_1_mgmt_port_0: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - link_pd_server_pattern4_1_mgmt_port_0: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 + - dependency_pd_server_pattern4_0_mgmt_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pattern4_port_2: + - link_pd_server_pattern4_0_mgmt_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -832,9 +832,8 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pattern4_port_1: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_pd_server_pattern4_1_mgmt_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED @@ -849,12 +848,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pattern4_port_2: - 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_server_pd_pattern4_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -873,13 +866,15 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_pattern4_port_2: - type: tosca.capabilities.Node + network.outgoing.bytes.rate_pd_server_pattern4_0_mgmt_port_0: + 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_pd_server_pattern4_port_1: - type: tosca.capabilities.Node + network.outgoing.bytes.rate_pd_server_pattern4_1_mgmt_port_0: + 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 @@ -901,16 +896,6 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pattern4_port_2: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - attachment_pd_server_pattern4_port_1: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED cpu_util_server_pd_pattern4_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -928,6 +913,16 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_pd_server_pattern4_0_mgmt_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + feature_pd_server_pattern4_1_mgmt_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.latency_server_pd_pattern4_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -964,6 +959,17 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pd_server_pattern4_0_mgmt_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes_pd_server_pattern4_1_mgmt_port_0: + 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_server_pd_pattern4_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -983,147 +989,144 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.write.bytes_server_pd_pattern4_1: + network.outgoing.bytes_pd_server_pattern4_0_mgmt_port_0: 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_pd_server_pattern4_port_1: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_pd_server_pattern4_1_mgmt_port_0: + 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: - - 1 + - 0 - UNBOUNDED - network.outpoing.packets_pd_server_pattern4_port_2: + network.incoming.packets_pd_server_pattern4_0_mgmt_port_0: 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_server_pd_pattern4_1: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - disk.device.write.requests_server_pd_pattern4_1: + disk.write.bytes_server_pd_pattern4_1: 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_server_pd_pattern4_1: + network.incoming.packets.rate_pd_server_pattern4_1_mgmt_port_0: 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_pd_server_pattern4_port_1: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_pd_server_pattern4_0_mgmt_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pattern4_port_1: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_server_pd_pattern4_1: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.device.read.bytes_server_pd_pattern4_1: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_pd_server_pattern4_1_mgmt_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pattern4_port_2: + disk.device.write.requests_server_pd_pattern4_1: 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_pd_server_pattern4_port_2: + disk.write.requests.rate_server_pd_pattern4_1: 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_server_pd_pattern4_1: + network.incoming.packets.rate_pd_server_pattern4_0_mgmt_port_0: 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_pd_server_pattern4_port_1: - type: org.openecomp.capabilities.Forwarder + disk.device.read.bytes_server_pd_pattern4_1: + 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_pd_server_pattern4_port_2: - type: org.openecomp.capabilities.Forwarder + network.incoming.packets_pd_server_pattern4_1_mgmt_port_0: + 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_pd_server_pattern4_port_1: + disk.read.bytes_server_pd_pattern4_1: 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_pd_server_pattern4_port_2: + network.incoming.bytes_pd_server_pattern4_1_mgmt_port_0: 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 - instance_server_pd_pattern4_1: + network.outpoing.packets_pd_server_pattern4_0_mgmt_port_0: 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_server_pd_pattern4_1: + network.outpoing.packets_pd_server_pattern4_1_mgmt_port_0: 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_server_pd_pattern4_1: + instance_server_pd_pattern4_1: 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_server_pd_pattern4_1: - type: tosca.capabilities.network.Bindable + network.incoming.bytes_pd_server_pattern4_0_mgmt_port_0: + 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_server_pd_pattern4_1: + vcpus_server_pd_pattern4_1: 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_server_pd_pattern4_1: + cpu.delta_server_pd_pattern4_1: 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_server_pd_pattern4_1: + network.incoming.bytes.rate_pd_server_pattern4_1_mgmt_port_0: 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_server_pd_pattern4_1: + network.incoming.bytes.rate_pd_server_pattern4_0_mgmt_port_0: 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_pd_server_pattern4_port_2: + binding_pd_server_pattern4_0_mgmt_port_0: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface @@ -1131,68 +1134,65 @@ node_types: occurrences: - 0 - UNBOUNDED - os_server_pd_pattern4_1: - type: tosca.capabilities.OperatingSystem + binding_server_pd_pattern4_1: + type: tosca.capabilities.network.Bindable occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pd_server_pattern4_port_2: + disk.device.read.requests_server_pd_pattern4_1: 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.iops_server_pd_pattern4_1: + disk.device.write.bytes.rate_server_pd_pattern4_1: 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_pd_server_pattern4_port_1: + disk.usage_server_pd_pattern4_1: 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_pd_server_pattern4_port_1: - 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 - network.outgoing.packets.rate_pd_server_pattern4_port_1: + disk.device.allocation_server_pd_pattern4_1: 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_pd_server_pattern4_port_1: + os_server_pd_pattern4_1: + type: tosca.capabilities.OperatingSystem + occurrences: + - 1 + - UNBOUNDED + disk.iops_server_pd_pattern4_1: 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_server_pd_pattern4_1: + network.outgoing.packets.rate_pd_server_pattern4_1_mgmt_port_0: 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_server_pd_pattern4_1: + network.outgoing.packets.rate_pd_server_pattern4_0_mgmt_port_0: 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.packets.rate_pd_server_pattern4_port_2: + disk.read.requests_server_pd_pattern4_1: 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_pd_server_pattern4_port_2: + disk.root.size_server_pd_pattern4_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1227,66 +1227,68 @@ node_types: description: UID of OAM network required: true status: SUPPORTED - port_pd_server_pattern4_port_02_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pd_server_pattern4_1_oam_port_0_network_role: + type: string required: true status: SUPPORTED - port_pd_server_pattern4_port_01_network_role_tag: - type: string + port_pd_server_pattern4_0_oam_port_0_vlan_requirements: + type: list required: true status: SUPPORTED - port_pd_server_pattern4_port_01_subnetpoolid: + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_pattern4_0_oam_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_pd_server_pattern4_port_01_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pd_server_pattern4_0_oam_port_0_related_networks: + type: list required: true status: SUPPORTED - port_pd_server_pattern4_port_02_order: + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd_server_pattern4_0_oam_port_0_order: type: integer required: true status: SUPPORTED - port_pd_server_pattern4_port_01_ip_requirements: + port_pd_server_pattern4_0_oam_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - availability_zone_0: - type: string - description: availabilityzone name + port_pd_server_pattern4_1_oam_port_0_related_networks: + type: list required: true status: SUPPORTED - net: - type: string + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd_server_pattern4_0_oam_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_pd_server_pattern4_port_02_exCP_naming: - type: org.openecomp.datatypes.Naming + availability_zone_0: + type: string + description: availabilityzone name required: true status: SUPPORTED - port_pd_server_pattern4_port_02_vlan_requirements: + port_pd_server_pattern4_1_oam_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - pd_server_pattern4_flavor: - type: string - description: Flavor for PD server - required: true - status: SUPPORTED - port_pd_server_pattern4_port_01_network_role: + type: org.openecomp.datatypes.network.IpRequirements + net: type: string required: true status: SUPPORTED - port_pd_server_pattern4_port_02_network_role: + pd_server_pattern4_flavor: type: string + description: Flavor for PD server required: true status: SUPPORTED - port_pd_server_pattern4_port_01_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_pattern4_0_oam_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED security_group_name: @@ -1301,44 +1303,42 @@ node_types: description: Flavor for PS server required: true status: SUPPORTED - port_pd_server_pattern4_port_01_order: - type: integer + port_pd_server_pattern4_1_oam_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_pd_server_pattern4_port_02_related_networks: - type: list + port_pd_server_pattern4_1_oam_port_0_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments pd_server_pattern4_image: type: string description: Flavor for PD server required: true status: SUPPORTED - port_pd_server_pattern4_port_02_ip_requirements: - type: list + port_pd_server_pattern4_0_oam_port_0_network_role: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd_server_pattern4_port_02_subnetpoolid: + port_pd_server_pattern4_1_oam_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_pd_server_pattern4_1_oam_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_pd_server_pattern4_port_01_vlan_requirements: + port_pd_server_pattern4_1_oam_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_pd_server_pattern4_port_01_related_networks: - type: list + port_pd_server_pattern4_1_oam_port_0_order: + type: integer required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd_server_pattern4_port_02_network_role_tag: + port_pd_server_pattern4_0_oam_port_0_subnetpoolid: type: string required: true status: SUPPORTED @@ -1355,14 +1355,14 @@ node_types: description: pattern4_attr_1_value status: SUPPORTED requirements: - - dependency_pd_server_pattern4_port_01: + - dependency_pd_server_pattern4_0_oam_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pattern4_port_01: + - link_pd_server_pattern4_0_oam_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -1382,14 +1382,14 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pattern4_port_02: + - dependency_pd_server_pattern4_1_oam_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pattern4_port_02: + - link_pd_server_pattern4_1_oam_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -1408,55 +1408,29 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_pd_server_pattern4_port_02: - 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_pd_server_pattern4_port_01: - 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 - network.incoming.bytes_pd_server_pattern4_port_02: - 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_pd_server_pattern4_port_01: - 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_pd_server_pattern4_port_02: + feature_pd_server_pattern4_1_oam_port_0: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - feature_pd_server_pattern4_port_01: - type: tosca.capabilities.Node + forwarder_pd_server_pattern4_0_oam_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - network.incoming.packets_pd_server_pattern4_port_01: + disk.allocation_server_pd_pattern4: 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.allocation_server_pd_pattern4: + disk.device.usage_server_pd_pattern4: 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_server_pd_pattern4: + network.incoming.bytes_pd_server_pattern4_0_oam_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1486,7 +1460,7 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_pattern4_port_02: + binding_pd_server_pattern4_0_oam_port_0: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface @@ -1494,17 +1468,35 @@ node_types: occurrences: - 0 - UNBOUNDED + network.outgoing.bytes_pd_server_pattern4_0_oam_port_0: + 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_server_pd_pattern4: 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_pd_server_pattern4_0_oam_port_0: + 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_server_pd_pattern4: type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED + network.outgoing.packets.rate_pd_server_pattern4_0_oam_port_0: + 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_server_pd_pattern4: type: tosca.capabilities.Node occurrences: @@ -1516,25 +1508,25 @@ node_types: occurrences: - 1 - UNBOUNDED - instance_server_pd_pattern4: + network.incoming.bytes.rate_pd_server_pattern4_1_oam_port_0: 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_server_pd_pattern4: + instance_server_pd_pattern4: 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_server_pd_pattern4: + cpu_server_pd_pattern4: 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_pd_server_pattern4_port_01: + disk.device.read.requests_server_pd_pattern4: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1553,25 +1545,25 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pattern4_port_02: + memory.resident_server_pd_pattern4: 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_server_pd_pattern4: + disk.read.requests_server_pd_pattern4: 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_server_pd_pattern4: + network.outpoing.packets_pd_server_pattern4_0_oam_port_0: 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_pd_server_pattern4_port_02: + network.incoming.bytes.rate_pd_server_pattern4_0_oam_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1601,7 +1593,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pattern4_port_01: + network.incoming.bytes_pd_server_pattern4_1_oam_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1631,42 +1623,43 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pattern4_port_02: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_server_pd_pattern4: + type: tosca.capabilities.network.Bindable occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pattern4_port_01: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_pd_server_pattern4_0_oam_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pattern4_port_02: + network.incoming.packets_pd_server_pattern4_0_oam_port_0: 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_server_pd_pattern4: - type: tosca.capabilities.network.Bindable + network.outpoing.packets_pd_server_pattern4_1_oam_port_0: + 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.iops_server_pd_pattern4: + network.outgoing.bytes_pd_server_pattern4_1_oam_port_0: 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_pd_server_pattern4_port_01: - type: org.openecomp.capabilities.Forwarder + disk.device.iops_server_pd_pattern4: + 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_pd_server_pattern4_port_02: - type: org.openecomp.capabilities.Forwarder + network.outgoing.bytes.rate_pd_server_pattern4_1_oam_port_0: + 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 @@ -1682,19 +1675,19 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.usage_server_pd_pattern4: + network.outgoing.packets.rate_pd_server_pattern4_1_oam_port_0: 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_server_pd_pattern4: + disk.usage_server_pd_pattern4: 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.packets.rate_pd_server_pattern4_port_01: + disk.read.bytes_server_pd_pattern4: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1705,6 +1698,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pd_server_pattern4_1_oam_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED memory_server_pd_pattern4: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1722,7 +1720,12 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pattern4_port_01: + feature_pd_server_pattern4_0_oam_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets.rate_pd_server_pattern4_1_oam_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1746,35 +1749,32 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pattern4_port_02: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_pd_server_pattern4_1_oam_port_0: + 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: - - 1 + - 0 - UNBOUNDED - attachment_pd_server_pattern4_port_02: + attachment_pd_server_pattern4_1_oam_port_0: type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pd_server_pattern4_port_02: + network.incoming.packets.rate_pd_server_pattern4_0_oam_port_0: 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 - attachment_pd_server_pattern4_port_01: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - network.incoming.bytes.rate_pd_server_pattern4_port_01: + disk.device.capacity_server_pd_pattern4: 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_server_pd_pattern4: + network.incoming.packets_pd_server_pattern4_1_oam_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1797,66 +1797,68 @@ node_types: description: UID of OAM network required: true status: SUPPORTED - port_pd_server_pattern4_port_02_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pd_server_pattern4_1_oam_port_0_network_role: + type: string required: true status: SUPPORTED - port_pd_server_pattern4_port_01_network_role_tag: - type: string + port_pd_server_pattern4_0_oam_port_0_vlan_requirements: + type: list required: true status: SUPPORTED - port_pd_server_pattern4_port_01_subnetpoolid: + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_pattern4_0_oam_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_pd_server_pattern4_port_01_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pd_server_pattern4_0_oam_port_0_related_networks: + type: list required: true status: SUPPORTED - port_pd_server_pattern4_port_02_order: + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd_server_pattern4_0_oam_port_0_order: type: integer required: true status: SUPPORTED - port_pd_server_pattern4_port_01_ip_requirements: + port_pd_server_pattern4_0_oam_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - availability_zone_0: - type: string - description: availabilityzone name + port_pd_server_pattern4_1_oam_port_0_related_networks: + type: list required: true status: SUPPORTED - net: - type: string + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd_server_pattern4_0_oam_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_pd_server_pattern4_port_02_exCP_naming: - type: org.openecomp.datatypes.Naming + availability_zone_0: + type: string + description: availabilityzone name required: true status: SUPPORTED - port_pd_server_pattern4_port_02_vlan_requirements: + port_pd_server_pattern4_1_oam_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - pd_server_pattern4_flavor: - type: string - description: Flavor for PD server - required: true - status: SUPPORTED - port_pd_server_pattern4_port_01_network_role: + type: org.openecomp.datatypes.network.IpRequirements + net: type: string required: true status: SUPPORTED - port_pd_server_pattern4_port_02_network_role: + pd_server_pattern4_flavor: type: string + description: Flavor for PD server required: true status: SUPPORTED - port_pd_server_pattern4_port_01_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_pattern4_0_oam_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED security_group_name: @@ -1870,44 +1872,42 @@ node_types: description: Flavor for PS server required: true status: SUPPORTED - port_pd_server_pattern4_port_01_order: - type: integer + port_pd_server_pattern4_1_oam_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_pd_server_pattern4_port_02_related_networks: - type: list + port_pd_server_pattern4_1_oam_port_0_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments pd_server_pattern4_image: type: string description: Flavor for PD server required: true status: SUPPORTED - port_pd_server_pattern4_port_02_ip_requirements: - type: list + port_pd_server_pattern4_0_oam_port_0_network_role: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd_server_pattern4_port_02_subnetpoolid: + port_pd_server_pattern4_1_oam_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_pd_server_pattern4_1_oam_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_pd_server_pattern4_port_01_vlan_requirements: + port_pd_server_pattern4_1_oam_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_pd_server_pattern4_port_01_related_networks: - type: list + port_pd_server_pattern4_1_oam_port_0_order: + type: integer required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd_server_pattern4_port_02_network_role_tag: + port_pd_server_pattern4_0_oam_port_0_subnetpoolid: type: string required: true status: SUPPORTED @@ -1923,14 +1923,14 @@ node_types: description: pattern4_attr_1_value status: SUPPORTED requirements: - - dependency_pd_server_pattern4_port_01: + - dependency_pd_server_pattern4_0_oam_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pattern4_port_01: + - link_pd_server_pattern4_0_oam_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -1950,14 +1950,14 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pattern4_port_02: + - dependency_pd_server_pattern4_1_oam_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pattern4_port_02: + - link_pd_server_pattern4_1_oam_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -1976,55 +1976,29 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_pd_server_pattern4_port_02: - 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_pd_server_pattern4_port_01: - 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 - network.incoming.bytes_pd_server_pattern4_port_02: - 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_pd_server_pattern4_port_01: - 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_pd_server_pattern4_port_02: + feature_pd_server_pattern4_1_oam_port_0: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - feature_pd_server_pattern4_port_01: - type: tosca.capabilities.Node + forwarder_pd_server_pattern4_0_oam_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - network.incoming.packets_pd_server_pattern4_port_01: + disk.allocation_server_pd_pattern4: 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.allocation_server_pd_pattern4: + disk.device.usage_server_pd_pattern4: 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_server_pd_pattern4: + network.incoming.bytes_pd_server_pattern4_0_oam_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2054,7 +2028,7 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_pattern4_port_02: + binding_pd_server_pattern4_0_oam_port_0: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface @@ -2062,17 +2036,35 @@ node_types: occurrences: - 0 - UNBOUNDED + network.outgoing.bytes_pd_server_pattern4_0_oam_port_0: + 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_server_pd_pattern4: 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_pd_server_pattern4_0_oam_port_0: + 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_server_pd_pattern4: type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED + network.outgoing.packets.rate_pd_server_pattern4_0_oam_port_0: + 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_server_pd_pattern4: type: tosca.capabilities.Node occurrences: @@ -2084,25 +2076,25 @@ node_types: occurrences: - 1 - UNBOUNDED - instance_server_pd_pattern4: + network.incoming.bytes.rate_pd_server_pattern4_1_oam_port_0: 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_server_pd_pattern4: + instance_server_pd_pattern4: 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_server_pd_pattern4: + cpu_server_pd_pattern4: 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_pd_server_pattern4_port_01: + disk.device.read.requests_server_pd_pattern4: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2121,25 +2113,25 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pattern4_port_02: + memory.resident_server_pd_pattern4: 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_server_pd_pattern4: + disk.read.requests_server_pd_pattern4: 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_server_pd_pattern4: + network.outpoing.packets_pd_server_pattern4_0_oam_port_0: 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_pd_server_pattern4_port_02: + network.incoming.bytes.rate_pd_server_pattern4_0_oam_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2169,7 +2161,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pattern4_port_01: + network.incoming.bytes_pd_server_pattern4_1_oam_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2199,42 +2191,43 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pattern4_port_02: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_server_pd_pattern4: + type: tosca.capabilities.network.Bindable occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pattern4_port_01: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_pd_server_pattern4_0_oam_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pattern4_port_02: + network.incoming.packets_pd_server_pattern4_0_oam_port_0: 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_server_pd_pattern4: - type: tosca.capabilities.network.Bindable + network.outpoing.packets_pd_server_pattern4_1_oam_port_0: + 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.iops_server_pd_pattern4: + network.outgoing.bytes_pd_server_pattern4_1_oam_port_0: 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_pd_server_pattern4_port_01: - type: org.openecomp.capabilities.Forwarder + disk.device.iops_server_pd_pattern4: + 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_pd_server_pattern4_port_02: - type: org.openecomp.capabilities.Forwarder + network.outgoing.bytes.rate_pd_server_pattern4_1_oam_port_0: + 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 @@ -2250,19 +2243,19 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.usage_server_pd_pattern4: + network.outgoing.packets.rate_pd_server_pattern4_1_oam_port_0: 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_server_pd_pattern4: + disk.usage_server_pd_pattern4: 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.packets.rate_pd_server_pattern4_port_01: + disk.read.bytes_server_pd_pattern4: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2273,6 +2266,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pd_server_pattern4_1_oam_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED memory_server_pd_pattern4: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2290,7 +2288,12 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pattern4_port_01: + feature_pd_server_pattern4_0_oam_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets.rate_pd_server_pattern4_1_oam_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2314,35 +2317,32 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pattern4_port_02: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_pd_server_pattern4_1_oam_port_0: + 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: - - 1 + - 0 - UNBOUNDED - attachment_pd_server_pattern4_port_02: + attachment_pd_server_pattern4_1_oam_port_0: type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pd_server_pattern4_port_02: + network.incoming.packets.rate_pd_server_pattern4_0_oam_port_0: 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 - attachment_pd_server_pattern4_port_01: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - network.incoming.bytes.rate_pd_server_pattern4_port_01: + disk.device.capacity_server_pd_pattern4: 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_server_pd_pattern4: + network.incoming.packets_pd_server_pattern4_1_oam_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2351,29 +2351,21 @@ node_types: org.openecomp.resource.abstract.nodes.cmaui_1c1_main_1: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_cmaui_port_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_cmaui_port_fixed_ips: + port_cmaui_1c1_main_mgmt_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_cmaui_port_exCP_naming: - type: org.openecomp.datatypes.Naming + type: org.openecomp.datatypes.network.IpRequirements + port_cmaui_1c1_main_mgmt_port_0_network_role_tag: + type: string required: true status: SUPPORTED - port_cmaui_port_network: - type: list + port_cmaui_1c1_main_mgmt_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: string - port_cmaui_port_related_networks: + port_cmaui_1c1_main_mgmt_port_0_related_networks: type: list required: true status: SUPPORTED @@ -2387,72 +2379,67 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_cmaui_port_network_role_tag: - type: string - required: true - status: SUPPORTED - port_cmaui_port_order: - type: integer + port_cmaui_1c1_main_mgmt_port_0_fixed_ips: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps vm_flavor_name: type: string required: true status: SUPPORTED - port_cmaui_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_cmaui_port_replacement_policy: + port_cmaui_1c1_main_mgmt_port_0_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_cmaui_port_network_role: - type: string + port_cmaui_1c1_main_mgmt_port_0_order: + type: integer required: true status: SUPPORTED + port_cmaui_1c1_main_mgmt_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_cmaui_1c1_main_mgmt_port_0_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements vm_image_name: type: string required: true status: SUPPORTED - port_cmaui_port_ip_requirements: + port_cmaui_1c1_main_mgmt_port_0_replacement_policy: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: string compute_cmaui_1c1_main_availability_zone: type: list required: true status: SUPPORTED entry_schema: type: string + port_cmaui_1c1_main_mgmt_port_0_network_role: + type: string + required: true + status: SUPPORTED compute_cmaui_1c1_main_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_cmaui_port_subnetpoolid: + port_cmaui_1c1_main_mgmt_port_0_subnetpoolid: type: string required: true status: SUPPORTED requirements: - - dependency_cmaui_1c1_main_cmaui_port: - capability: tosca.capabilities.Node - node: tosca.nodes.Root - relationship: tosca.relationships.DependsOn - occurrences: - - 0 - - UNBOUNDED - - link_cmaui_1c1_main_cmaui_port: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - dependency_cmaui_1c1_main: capability: tosca.capabilities.Node node: tosca.nodes.Root @@ -2467,6 +2454,19 @@ node_types: occurrences: - 0 - UNBOUNDED + - dependency_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - link_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 capabilities: disk.device.iops_cmaui_1c1_main: type: org.openecomp.capabilities.metric.Ceilometer @@ -2474,6 +2474,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes.rate_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0: + 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_cmaui_1c1_main: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2503,12 +2509,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_cmaui_1c1_main_cmaui_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_cmaui_1c1_main: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2550,8 +2550,8 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_cmaui_1c1_main_cmaui_port: - type: tosca.capabilities.Attachment + forwarder_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED @@ -2573,42 +2573,48 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_cmaui_1c1_main_cmaui_port: - type: org.openecomp.capabilities.Forwarder + network.outpoing.packets_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0: + 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_cmaui_1c1_main: + network.incoming.packets.rate_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0: 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_cmaui_1c1_main: + vcpus_cmaui_1c1_main: 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_cmaui_1c1_main: + disk.read.bytes.rate_cmaui_1c1_main: 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_cmaui_1c1_main: + feature_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + disk.device.capacity_cmaui_1c1_main: 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_cmaui_1c1_main: + disk.device.write.requests_cmaui_1c1_main: 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_cmaui_1c1_main_cmaui_port: + disk.usage_cmaui_1c1_main: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2620,19 +2626,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_cmaui_1c1_main_cmaui_port: + memory.usage_cmaui_1c1_main: 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_cmaui_1c1_main: + network.outgoing.bytes.rate_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0: 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_cmaui_1c1_main_cmaui_port: + network.incoming.packets_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2662,7 +2668,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_cmaui_1c1_main_cmaui_port: + network.outgoing.bytes_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2674,12 +2680,7 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_cmaui_1c1_main_cmaui_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - network.outgoing.packets.rate_cmaui_1c1_main_cmaui_port: + network.incoming.bytes_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2698,23 +2699,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_cmaui_1c1_main_cmaui_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.write.bytes.rate_cmaui_1c1_main: 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_cmaui_1c1_main_cmaui_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0: + 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: - - 1 + - 0 - UNBOUNDED memory_cmaui_1c1_main: type: org.openecomp.capabilities.metric.Ceilometer @@ -2733,21 +2730,24 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED disk.device.allocation_cmaui_1c1_main: 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_cmaui_1c1_main_cmaui_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 + disk.device.usage_cmaui_1c1_main: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - - 0 + - 1 - UNBOUNDED - disk.device.usage_cmaui_1c1_main: + network.outgoing.packets.rate_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2878,6 +2878,19 @@ node_types: required: true status: SUPPORTED requirements: + - dependency_cmaui_1c1_main_11_mgmt_port_0: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - link_cmaui_1c1_main_11_mgmt_port_0: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 - dependency_test_nested_pattern_4_main_1: capability: tosca.capabilities.Node node: tosca.nodes.Root @@ -2885,14 +2898,14 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pattern4_port_01_test_nested_pattern_4_main_1: + - dependency_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_main_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pattern4_port_01_test_nested_pattern_4_main_1: + - link_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_main_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -2912,40 +2925,27 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pattern4_port_02_test_nested_pattern_4_main_1: - capability: tosca.capabilities.Node - node: tosca.nodes.Root - relationship: tosca.relationships.DependsOn - occurrences: - - 0 - - UNBOUNDED - - link_pd_server_pattern4_port_02_test_nested_pattern_4_main_1: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - - dependency_cmaui_port_12: + - dependency_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_main_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_cmaui_port_12: + - link_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_main_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_cmaui_port_11: + - dependency_cmaui_1c1_main_21_mgmt_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_cmaui_port_11: + - link_cmaui_1c1_main_21_mgmt_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -3026,19 +3026,6 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_cmaui_port_2_test_nested2Level: - capability: tosca.capabilities.Node - node: tosca.nodes.Root - relationship: tosca.relationships.DependsOn - occurrences: - - 0 - - UNBOUNDED - - link_cmaui_port_2_test_nested2Level: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - dependency_server_nested2_ps_1b_test_nested2Level: capability: tosca.capabilities.Node node: tosca.nodes.Root @@ -3088,6 +3075,19 @@ node_types: occurrences: - 0 - UNBOUNDED + - dependency_cmaui_1c1_nested2_1_mgmt_port_0_test_nested2Level: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - link_cmaui_1c1_nested2_1_mgmt_port_0_test_nested2Level: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 - dependency_server_nested2_1c1_cmaui_2_test_nested2Level: capability: tosca.capabilities.Node node: tosca.nodes.Root @@ -3109,14 +3109,14 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pattern4_port_01_test_nested_pattern_4_nested2_test_nested2Level: + - dependency_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2_test_nested2Level: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pattern4_port_01_test_nested_pattern_4_nested2_test_nested2Level: + - link_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2_test_nested2Level: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -3136,14 +3136,14 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pattern4_port_02_test_nested_pattern_4_nested2_test_nested2Level: + - dependency_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2_test_nested2Level: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pattern4_port_02_test_nested_pattern_4_nested2_test_nested2Level: + - link_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2_test_nested2Level: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -3211,26 +3211,26 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - dependency_cmaui_1c1_nested2_2_mgmt_port_0_test_nested2Level: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - link_cmaui_1c1_nested2_2_mgmt_port_0_test_nested2Level: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 + - dependency_test_nested_pattern_4_same_type_diff_file_test_nested2Level: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - dependency_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: capability: tosca.capabilities.Node node: tosca.nodes.Root @@ -3245,14 +3245,27 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - dependency_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - link_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 + - dependency_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file_test_nested2Level: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - link_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file_test_nested2Level: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -3279,20 +3292,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_pd_server_nested2_1b_port_test_nested2Level: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - - dependency_cmaui_port_1_test_nested2Level: - capability: tosca.capabilities.Node - node: tosca.nodes.Root - relationship: tosca.relationships.DependsOn - occurrences: - - 0 - - UNBOUNDED - - link_cmaui_port_1_test_nested2Level: + - link_pd_server_nested2_1b_port_test_nested2Level: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -3330,12 +3330,26 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes_cmaui_1c1_main_21_mgmt_port_0: + 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_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: 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_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + 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 feature_test_nested_pattern_4_same_type_diff_file_test_nested2Level: type: tosca.capabilities.Node occurrences: @@ -3347,27 +3361,26 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_cmaui_port_2_test_nested2Level: + cpu_util_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: 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_pd_server_pattern4_port_01_test_nested_pattern_4_main_1: + disk.device.read.requests_server_main_1c1_cmaui_11: 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_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + network.outpoing.packets_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2_test_nested2Level: 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_server_main_1c1_cmaui_11: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2_test_nested2Level: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED @@ -3377,6 +3390,11 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_main_1: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED disk.latency_server_nested2_1c1_cmaui_2_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3394,6 +3412,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.packets.rate_cmaui_1c1_main_11_mgmt_port_0: + 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_server_pd_pattern4_test_nested_pattern_4_main_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3448,6 +3472,14 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + 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 disk.device.write.requests_server_nested2_ps_1b_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3465,48 +3497,48 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.allocation_server_pd_pattern4_test_nested_pattern_4_main_1: + network.outgoing.packets.rate_cmaui_1c1_nested2_2_mgmt_port_0_test_nested2Level: 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_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: + disk.device.allocation_server_pd_pattern4_test_nested_pattern_4_main_1: 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_pd_server_pattern4_port_02_test_nested_pattern_4_main_1: + disk.device.write.requests_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: 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 - attachment_pd_server_pattern4_port_02_test_nested_pattern_4_nested2_test_nested2Level: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED disk.device.write.bytes.rate_server_nested2_pd_1b_test_nested2Level: 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_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED network.incoming.bytes_pd_server_main_1b_port_1: 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_pd_server_pattern4_port_02_test_nested_pattern_4_main_1: + disk.allocation_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: 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.allocation_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + network.incoming.packets.rate_cmaui_1c1_main_21_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -3524,22 +3556,12 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_cmaui_port_11: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED disk.read.requests_server_nested2_1c1_cmaui_2_test_nested2Level: 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_cmaui_port_12: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED feature_ps_server_main_1b_port_1: type: tosca.capabilities.Node occurrences: @@ -3563,11 +3585,6 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_cmaui_port_2_test_nested2Level: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED os_server_pd_pattern4_test_nested_pattern_4_main_1: type: tosca.capabilities.OperatingSystem occurrences: @@ -3591,7 +3608,12 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pd_server_pattern4_port_02_test_nested_pattern_4_main_1: + forwarder_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2_test_nested2Level: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes_cmaui_1c1_main_11_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -3609,6 +3631,11 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_main_1: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED instance_server_main_pd_1b_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3680,29 +3707,11 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - 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_pd_server_pattern4_port_01_test_nested_pattern_4_nested2_test_nested2Level: - 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_server_main_1c1_cmaui_21: type: tosca.capabilities.network.Bindable occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pattern4_port_02_test_nested_pattern_4_main_1: - 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_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3715,30 +3724,30 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - type: tosca.capabilities.Attachment + forwarder_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - cpu_util_server_nested2_ps_1b_test_nested2Level: + network.incoming.packets_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2_test_nested2Level: 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 - instance_server_main_ps_1b_1: + cpu_util_server_nested2_ps_1b_test_nested2Level: 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.packets.rate_ps_server_nested2_1b_port_test_nested2Level: + instance_server_main_ps_1b_1: 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_pd_server_pattern4_port_02_test_nested_pattern_4_nested2_test_nested2Level: + network.outgoing.packets.rate_ps_server_nested2_1b_port_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -3780,6 +3789,11 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_cmaui_1c1_nested2_2_mgmt_port_0_test_nested2Level: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED disk.device.allocation_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3792,6 +3806,16 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2_test_nested2Level: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + feature_cmaui_1c1_main_21_mgmt_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED endpoint_server_main_1c1_cmaui_21: type: tosca.capabilities.Endpoint.Admin occurrences: @@ -3816,7 +3840,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + network.incoming.bytes_cmaui_1c1_nested2_2_mgmt_port_0_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -3834,8 +3858,9 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - type: tosca.capabilities.Node + network.incoming.bytes.rate_cmaui_1c1_nested2_2_mgmt_port_0_test_nested2Level: + 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 @@ -3863,12 +3888,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_cmaui_port_1_test_nested2Level: - 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_server_main_ps_1b_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3898,13 +3917,13 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.usage_server_main_1c1_cmaui_11: + network.incoming.bytes_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2_test_nested2Level: 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_cmaui_port_2_test_nested2Level: + disk.usage_server_main_1c1_cmaui_11: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -3922,19 +3941,6 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_pattern4_port_02_test_nested_pattern_4_main_1: - 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 - forwarder_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED disk.device.write.requests.rate_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3960,40 +3966,30 @@ node_types: occurrences: - 0 - UNBOUNDED - feature_pd_server_pattern4_port_01_test_nested_pattern_4_main_1: + feature_cmaui_1c1_main_11_mgmt_port_0: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_cmaui_port_11: - 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_server_nested2_pd_1b_test_nested2Level: 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_cmaui_port_12: - 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_pd_server_pattern4_port_01_test_nested_pattern_4_nested2_test_nested2Level: - 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_server_main_ps_1b_1: type: tosca.capabilities.OperatingSystem occurrences: - 1 - UNBOUNDED + binding_cmaui_1c1_main_11_mgmt_port_0: + 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 disk.device.read.bytes_server_main_pd_1b_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4034,6 +4030,11 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_cmaui_1c1_nested2_1_mgmt_port_0_test_nested2Level: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.device.read.bytes.rate_server_main_pd_1b_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4046,25 +4047,27 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pattern4_port_01_test_nested_pattern_4_nested2_test_nested2Level: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_main_1: + 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: - - 1 + - 0 - UNBOUNDED feature_server_nested2_1c1_cmaui_2_test_nested2Level: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - endpoint_server_main_1c1_cmaui_11: - type: tosca.capabilities.Endpoint.Admin + network.incoming.packets.rate_cmaui_1c1_nested2_2_mgmt_port_0_test_nested2Level: + 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_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + endpoint_server_main_1c1_cmaui_11: + type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED @@ -4126,11 +4129,6 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_pd_server_pattern4_port_02_test_nested_pattern_4_nested2_test_nested2Level: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED disk.root.size_server_pd_pattern4_test_nested_pattern_4_main_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4142,51 +4140,43 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_cmaui_port_1_test_nested2Level: + disk.device.write.bytes_server_main_pd_1b_1: 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_server_main_pd_1b_1: + network.outpoing.packets_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_main_1: 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_pd_server_pattern4_port_02_test_nested_pattern_4_nested2_test_nested2Level: - 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 disk.device.write.bytes.rate_server_nested2_1c1_cmaui_1_test_nested2Level: 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.ephemeral.size_server_main_ps_1b_1: + network.incoming.bytes_cmaui_1c1_main_21_mgmt_port_0: 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.allocation_server_nested2_1c1_cmaui_1_test_nested2Level: + disk.ephemeral.size_server_main_ps_1b_1: 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.ephemeral.size_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + disk.allocation_server_nested2_1c1_cmaui_1_test_nested2Level: 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_pd_server_pattern4_port_02_test_nested_pattern_4_nested2_test_nested2Level: + disk.ephemeral.size_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -4198,23 +4188,11 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_cmaui_port_2_test_nested2Level: - 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_pd_server_nested2_1b_port_test_nested2Level: type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - network.incoming.packets_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - 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_server_main_ps_1b_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4245,9 +4223,8 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_cmaui_port_2_test_nested2Level: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_cmaui_1c1_nested2_1_mgmt_port_0_test_nested2Level: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED @@ -4257,12 +4234,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - 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.iops_server_pd_pattern4_test_nested_pattern_4_main_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4275,26 +4246,12 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_cmaui_port_1_test_nested2Level: - 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 disk.device.iops_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: 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_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - 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_server_main_pd_1b_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4313,19 +4270,24 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pattern4_port_02_test_nested_pattern_4_main_1: + disk.device.write.bytes.rate_server_nested2_1c1_cmaui_2_test_nested2Level: 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_server_nested2_1c1_cmaui_2_test_nested2Level: + disk.device.usage_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: 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_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: + forwarder_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_main_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes.rate_cmaui_1c1_nested2_1_mgmt_port_0_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -4365,7 +4327,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pattern4_port_02_test_nested_pattern_4_main_1: + network.incoming.packets_cmaui_1c1_main_11_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -4383,102 +4345,133 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2_test_nested2Level: + 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 disk.read.requests_server_main_pd_1b_1: 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.allocation_server_nested2_1c1_cmaui_2_test_nested2Level: + disk.allocation_server_nested2_1c1_cmaui_2_test_nested2Level: + 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_server_nested2_1c1_cmaui_1_test_nested2Level: + 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.iops_server_nested2_1c1_cmaui_1_test_nested2Level: + 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_pd_server_nested2_1b_port_test_nested2Level: + 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_server_nested2_ps_1b_test_nested2Level: 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_server_nested2_1c1_cmaui_1_test_nested2Level: + disk.write.requests_server_main_pd_1b_1: 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_pd_server_pattern4_port_01_test_nested_pattern_4_main_1: + disk.device.write.requests.rate_server_nested2_ps_1b_test_nested2Level: 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_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + network.outgoing.bytes_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2_test_nested2Level: 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.iops_server_nested2_1c1_cmaui_1_test_nested2Level: + instance_server_nested2_1c1_cmaui_2_test_nested2Level: 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_pd_server_nested2_1b_port_test_nested2Level: + network.outpoing.packets_pd_server_nested2_1b_port_test_nested2Level: 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_server_nested2_ps_1b_test_nested2Level: + network.incoming.packets_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_main_1: 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_server_main_pd_1b_1: + disk.latency_server_main_ps_1b_1: 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_server_nested2_ps_1b_test_nested2Level: + network.incoming.bytes.rate_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file_test_nested2Level: 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 - instance_server_nested2_1c1_cmaui_2_test_nested2Level: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + os_server_nested2_pd_1b_test_nested2Level: + type: tosca.capabilities.OperatingSystem occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_nested2_1b_port_test_nested2Level: + disk.iops_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: 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_server_main_ps_1b_1: + disk.read.bytes_server_main_pd_1b_1: 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_server_nested2_pd_1b_test_nested2Level: - type: tosca.capabilities.OperatingSystem + forwarder_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_main_1: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - disk.iops_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: + network.outgoing.packets.rate_cmaui_1c1_nested2_1_mgmt_port_0_test_nested2Level: 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_server_main_pd_1b_1: + disk.write.requests_server_pd_pattern4_test_nested_pattern_4_main_1: 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_server_pd_pattern4_test_nested_pattern_4_main_1: + network.outgoing.bytes_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_main_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -4520,47 +4513,42 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_pattern4_port_02_test_nested_pattern_4_main_1: - type: tosca.capabilities.Node + endpoint_server_main_pd_1b_1: + type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_cmaui_port_2_test_nested2Level: + disk.allocation_server_main_1c1_cmaui_21: 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_cmaui_port_11: + disk.device.read.bytes_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: 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_server_main_pd_1b_1: - type: tosca.capabilities.Endpoint.Admin - occurrences: - - 1 - - UNBOUNDED - disk.allocation_server_main_1c1_cmaui_21: + vcpus_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: 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_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + network.incoming.packets.rate_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_main_1: 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_cmaui_port_12: + network.incoming.bytes.rate_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_main_1: 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_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: + network.outpoing.packets_cmaui_1c1_nested2_2_mgmt_port_0_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -4601,20 +4589,26 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.write.bytes_server_nested2_1c1_cmaui_1_test_nested2Level: + network.incoming.packets_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file_test_nested2Level: 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_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + attachment_cmaui_1c1_nested2_1_mgmt_port_0_test_nested2Level: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + disk.write.bytes_server_nested2_1c1_cmaui_1_test_nested2Level: 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_pd_server_pattern4_port_01_test_nested_pattern_4_nested2_test_nested2Level: - type: tosca.capabilities.Node + network.incoming.bytes.rate_cmaui_1c1_main_11_mgmt_port_0: + 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 @@ -4629,14 +4623,6 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_pattern4_port_01_test_nested_pattern_4_nested2_test_nested2Level: - 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 network.incoming.packets.rate_pd_server_main_1b_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4648,13 +4634,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pattern4_port_02_test_nested_pattern_4_nested2_test_nested2Level: + disk.device.usage_server_main_1c1_cmaui_11: 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_server_main_1c1_cmaui_11: + network.outgoing.bytes.rate_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -4666,6 +4652,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes.rate_cmaui_1c1_nested2_1_mgmt_port_0_test_nested2Level: + 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_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: type: tosca.capabilities.network.Bindable occurrences: @@ -4696,6 +4688,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets_cmaui_1c1_nested2_2_mgmt_port_0_test_nested2Level: + 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_ps_server_nested2_1b_port_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4777,12 +4775,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pattern4_port_01_test_nested_pattern_4_main_1: - 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_server_nested2_1c1_cmaui_1_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4801,20 +4793,14 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - 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_server_main_ps_1b_1: 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_pd_server_pattern4_port_02_test_nested_pattern_4_main_1: - type: org.openecomp.capabilities.Forwarder + attachment_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED @@ -4841,7 +4827,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + network.incoming.packets_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_main_1: + 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.packets.rate_cmaui_1c1_main_21_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -4871,18 +4863,36 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes.rate_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + 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_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: 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_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + 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.allocation_server_main_1c1_cmaui_11: 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_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + 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_server_nested2_pd_1b_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4901,14 +4911,6 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - 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 disk.read.requests_server_nested2_ps_1b_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4921,13 +4923,21 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.read.bytes_server_nested2_ps_1b_test_nested2Level: + network.incoming.bytes.rate_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_main_1: 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_pd_server_pattern4_port_01_test_nested_pattern_4_nested2_test_nested2Level: + binding_cmaui_1c1_nested2_1_mgmt_port_0_test_nested2Level: + 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 + disk.read.bytes_server_nested2_ps_1b_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -4961,12 +4971,24 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes_cmaui_1c1_main_11_mgmt_port_0: + 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_server_main_1c1_cmaui_21: 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_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2_test_nested2Level: + 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_server_nested2_1c1_cmaui_1_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4990,12 +5012,13 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_pd_server_pattern4_port_01_test_nested_pattern_4_main_1: - type: org.openecomp.capabilities.Forwarder + disk.device.read.bytes_server_nested2_1c1_cmaui_2_test_nested2Level: + 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_server_nested2_1c1_cmaui_2_test_nested2Level: + network.incoming.packets.rate_cmaui_1c1_nested2_1_mgmt_port_0_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -5018,59 +5041,76 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED feature_test_nested3Level_test_nested2Level: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.device.allocation_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: + network.incoming.bytes.rate_cmaui_1c1_main_21_mgmt_port_0: 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.iops_server_main_pd_1b_1: + network.outgoing.bytes_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_main_1: 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_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + feature_cmaui_1c1_nested2_2_mgmt_port_0_test_nested2Level: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + disk.device.allocation_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: 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.ephemeral.size_server_nested2_1c1_cmaui_2_test_nested2Level: + network.outpoing.packets_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file_test_nested2Level: 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_server_main_pd_1b_1: - type: tosca.capabilities.Node + disk.iops_server_main_pd_1b_1: + 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_cmaui_port_12: + disk.read.bytes.rate_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: 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_cmaui_port_11: + disk.ephemeral.size_server_nested2_1c1_cmaui_2_test_nested2Level: 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_server_main_pd_1b_1: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED scalable_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: type: tosca.capabilities.Scalable occurrences: - 1 - UNBOUNDED - forwarder_cmaui_port_1_test_nested2Level: - type: org.openecomp.capabilities.Forwarder + network.outgoing.bytes.rate_cmaui_1c1_main_21_mgmt_port_0: + 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 @@ -5122,7 +5162,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pattern4_port_01_test_nested_pattern_4_main_1: + network.incoming.bytes.rate_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -5134,12 +5174,24 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes_cmaui_1c1_nested2_2_mgmt_port_0_test_nested2Level: + 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_server_main_pd_1b_1: 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_cmaui_1c1_nested2_1_mgmt_port_0_test_nested2Level: + 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_server_pd_pattern4_test_nested_pattern_4_main_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -5158,13 +5210,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_cmaui_port_1_test_nested2Level: + disk.device.latency_server_main_1c1_cmaui_21: 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_server_main_1c1_cmaui_21: + network.incoming.bytes_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2_test_nested2Level: + 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_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -5228,25 +5286,33 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pattern4_port_01_test_nested_pattern_4_main_1: + disk.device.write.bytes_server_main_1c1_cmaui_11: 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_server_main_1c1_cmaui_11: + binding_pd_server_main_1b_port_1: + 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 + disk.device.write.bytes_server_pd_pattern4_test_nested_pattern_4_main_1: 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_cmaui_port_2_test_nested2Level: + disk.device.latency_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: 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_pd_server_main_1b_port_1: + binding_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2_test_nested2Level: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface @@ -5254,37 +5320,37 @@ node_types: occurrences: - 0 - UNBOUNDED - disk.device.write.bytes_server_pd_pattern4_test_nested_pattern_4_main_1: + memory.resident_server_main_pd_1b_1: 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_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: + network.incoming.bytes_ps_server_main_1b_port_1: 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_server_main_pd_1b_1: + vcpus_server_nested2_1c1_cmaui_1_test_nested2Level: 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_ps_server_main_1b_port_1: + network.outgoing.bytes.rate_cmaui_1c1_main_11_mgmt_port_0: 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_server_nested2_1c1_cmaui_1_test_nested2Level: + disk.device.write.bytes.rate_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: 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_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: + network.outgoing.bytes_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -5296,29 +5362,30 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.read.bytes.rate_server_nested2_ps_1b_test_nested2Level: + network.outpoing.packets_cmaui_1c1_main_11_mgmt_port_0: 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_server_nested2_1c1_cmaui_1_test_nested2Level: - type: tosca.capabilities.Endpoint.Admin + disk.read.bytes.rate_server_nested2_ps_1b_test_nested2Level: + 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 - attachment_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - type: tosca.capabilities.Attachment + endpoint_server_nested2_1c1_cmaui_1_test_nested2Level: + type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED - disk.device.iops_server_pd_pattern4_test_nested_pattern_4_main_1: + network.incoming.packets_cmaui_1c1_nested2_1_mgmt_port_0_test_nested2Level: 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_pd_server_pattern4_port_02_test_nested_pattern_4_nested2_test_nested2Level: + disk.device.iops_server_pd_pattern4_test_nested_pattern_4_main_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -5330,11 +5397,6 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pattern4_port_02_test_nested_pattern_4_main_1: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED memory.resident_server_pd_pattern4_test_nested_pattern_4_main_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -5346,6 +5408,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes.rate_cmaui_1c1_nested2_2_mgmt_port_0_test_nested2Level: + 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_server_main_1c1_cmaui_21: type: tosca.capabilities.Container valid_source_types: @@ -5353,12 +5421,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pd_server_pattern4_port_02_test_nested_pattern_4_nested2_test_nested2Level: - 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.ephemeral.size_server_nested2_ps_1b_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -5377,12 +5439,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pattern4_port_02_test_nested_pattern_4_nested2_test_nested2Level: - 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_server_nested2_ps_1b_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -5395,7 +5451,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + network.incoming.packets.rate_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -5413,11 +5469,6 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_pd_server_pattern4_port_01_test_nested_pattern_4_nested2_test_nested2Level: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED disk.device.usage_server_nested2_1c1_cmaui_2_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -5430,12 +5481,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_cmaui_port_2_test_nested2Level: - 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_server_main_1c1_cmaui_11: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -5448,21 +5493,20 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_cmaui_port_12: + network.incoming.packets.rate_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file_test_nested2Level: 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_cmaui_port_11: + disk.device.read.requests.rate_server_nested2_pd_1b_test_nested2Level: 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_server_nested2_pd_1b_test_nested2Level: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_main_1: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED @@ -5489,9 +5533,8 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_cmaui_port_1_test_nested2Level: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2_test_nested2Level: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED @@ -5512,39 +5555,25 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_pd_server_nested2_1b_port_test_nested2Level: - 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_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + network.incoming.packets_pd_server_nested2_1b_port_test_nested2Level: 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_cmaui_port_11: + disk.read.bytes_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: 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_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - 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 - network.outpoing.packets_cmaui_port_12: + disk.usage_server_pd_pattern4_test_nested_pattern_4_main_1: 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_server_pd_pattern4_test_nested_pattern_4_main_1: + network.outpoing.packets_cmaui_1c1_main_21_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -5574,6 +5603,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.packets.rate_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + 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_server_main_pd_1b_1: type: tosca.capabilities.network.Bindable occurrences: @@ -5634,31 +5669,31 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + disk.device.usage_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: 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_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + disk.root.size_server_main_1c1_cmaui_21: 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_server_main_1c1_cmaui_21: + disk.usage_server_main_ps_1b_1: 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_server_main_ps_1b_1: + cpu_server_main_pd_1b_1: 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_server_main_pd_1b_1: + network.outgoing.packets.rate_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -5700,6 +5735,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets.rate_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2_test_nested2Level: + 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_server_main_1c1_cmaui_11: type: tosca.capabilities.Container valid_source_types: @@ -5707,6 +5748,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes.rate_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_main_1: + 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.iops_server_main_1c1_cmaui_11: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -5743,6 +5790,11 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2_test_nested2Level: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED disk.device.read.requests.rate_server_main_ps_1b_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -5755,6 +5807,30 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_main_1: + 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 + forwarder_cmaui_1c1_nested2_2_mgmt_port_0_test_nested2Level: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets.rate_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_main_1: + 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_cmaui_1c1_main_11_mgmt_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.read.bytes_server_main_1c1_cmaui_11: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -5784,17 +5860,6 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pattern4_port_01_test_nested_pattern_4_nested2_test_nested2Level: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - network.incoming.packets_pd_server_pattern4_port_01_test_nested_pattern_4_main_1: - 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_server_nested2_1c1_cmaui_2_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -5901,13 +5966,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pd_server_pattern4_port_01_test_nested_pattern_4_main_1: - 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_pd_server_pattern4_port_01_test_nested_pattern_4_nested2_test_nested2Level: + network.outgoing.bytes_cmaui_1c1_nested2_1_mgmt_port_0_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -5918,12 +5977,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_pd_server_pattern4_port_02_test_nested_pattern_4_main_1: - 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_server_main_ps_1b_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -5936,12 +5989,7 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_pattern4_port_02_test_nested_pattern_4_nested2_test_nested2Level: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - network.outpoing.packets_cmaui_port_2_test_nested2Level: + network.outgoing.packets.rate_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -5953,28 +6001,18 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_cmaui_port_1_test_nested2Level: - 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_server_nested2_ps_1b_test_nested2Level: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pattern4_port_01_test_nested_pattern_4_main_1: - 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_pd_server_pattern4_port_01_test_nested_pattern_4_nested2_test_nested2Level: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_cmaui_1c1_nested2_2_mgmt_port_0_test_nested2Level: + 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: - - 1 + - 0 - UNBOUNDED vcpus_server_nested2_1c1_cmaui_2_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer @@ -6035,29 +6073,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_ps_server_nested2_1b_port_test_nested2Level: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_cmaui_1c1_main_21_mgmt_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - binding_pd_server_pattern4_port_01_test_nested_pattern_4_main_1: - 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 - network.incoming.packets_cmaui_port_11: + network.outgoing.bytes.rate_ps_server_nested2_1b_port_test_nested2Level: 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_cmaui_port_12: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_main_1: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -6085,12 +6113,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pattern4_port_02_test_nested_pattern_4_main_1: - 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_server_pd_pattern4_test_nested_pattern_4_main_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -6127,12 +6149,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_cmaui_port_1_test_nested2Level: - 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_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: type: tosca.capabilities.Node occurrences: @@ -6150,6 +6166,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes.rate_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_main_1: + 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_server_main_1c1_cmaui_21: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -6174,13 +6196,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pattern4_port_01_test_nested_pattern_4_nested2_test_nested2Level: + disk.write.requests_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: 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_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + network.outpoing.packets_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_main_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -6245,20 +6267,27 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes.rate_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + 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_server_main_pd_1b_1: 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_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: + network.incoming.packets_cmaui_1c1_main_21_mgmt_port_0: 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 - attachment_cmaui_port_1_test_nested2Level: - type: tosca.capabilities.Attachment + cpu.delta_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: + 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 @@ -6309,12 +6338,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_cmaui_port_1_test_nested2Level: - 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.iops_server_main_ps_1b_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -6344,11 +6367,6 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pattern4_port_01_test_nested_pattern_4_main_1: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED disk.write.bytes.rate_server_nested2_ps_1b_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -6372,14 +6390,14 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.read.bytes.rate_server_main_1c1_cmaui_11: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_cmaui_1c1_main_11_mgmt_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - attachment_cmaui_port_2_test_nested2Level: - type: tosca.capabilities.Attachment + disk.read.bytes.rate_server_main_1c1_cmaui_11: + 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 @@ -6424,28 +6442,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_cmaui_port_12: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - feature_cmaui_port_11: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - network.incoming.bytes.rate_cmaui_port_11: - 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_cmaui_port_12: - 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.iops_server_main_pd_1b_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -6480,14 +6476,15 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.write.requests_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + network.incoming.bytes_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_main_1: 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_cmaui_port_2_test_nested2Level: - type: tosca.capabilities.Node + disk.device.write.requests_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + 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 @@ -6526,12 +6523,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - 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_server_main_1c1_cmaui_21: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -6568,24 +6559,28 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes.rate_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2_test_nested2Level: + 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_pd_server_nested2_1b_port_test_nested2Level: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pattern4_port_02_test_nested_pattern_4_nested2_test_nested2Level: + network.outgoing.packets.rate_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_main_1: 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_cmaui_port_2_test_nested2Level: - 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 + network.incoming.packets_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - - 0 + - 1 - UNBOUNDED memory_server_main_ps_1b_1: type: org.openecomp.capabilities.metric.Ceilometer @@ -6629,18 +6624,26 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_pd_server_pattern4_port_01_test_nested_pattern_4_nested2_test_nested2Level: + cpu_util_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: 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_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: + network.outgoing.bytes_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2_test_nested2Level: 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_cmaui_1c1_main_21_mgmt_port_0: + 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 feature_server_pd_pattern4_test_nested_pattern_4_main_1: type: tosca.capabilities.Node occurrences: @@ -6671,12 +6674,7 @@ node_types: occurrences: - 0 - UNBOUNDED - feature_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + network.incoming.packets.rate_cmaui_1c1_main_11_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -6730,12 +6728,23 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes.rate_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + 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_server_main_pd_1b_1: 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 + attachment_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED disk.write.bytes.rate_server_main_1c1_cmaui_11: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -6773,15 +6782,14 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + disk.device.write.requests.rate_server_nested2_1c1_cmaui_2_test_nested2Level: 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_server_nested2_1c1_cmaui_2_test_nested2Level: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_cmaui_1c1_main_21_mgmt_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED @@ -6808,6 +6816,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + 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_server_nested2_ps_1b_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -6826,8 +6840,15 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - type: org.openecomp.capabilities.Forwarder + network.outpoing.packets_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2_test_nested2Level: + 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.packets.rate_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2_test_nested2Level: + 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 @@ -6837,26 +6858,43 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_ps_server_nested2_1b_port_test_nested2Level: - type: tosca.capabilities.Attachment + attachment_ps_server_nested2_1b_port_test_nested2Level: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + disk.read.requests_server_nested2_1c1_cmaui_1_test_nested2Level: + 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_server_main_ps_1b_1: + 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.packets.rate_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_main_1: + 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_server_nested2_1c1_cmaui_1_test_nested2Level: + disk.allocation_server_main_ps_1b_1: 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_server_main_ps_1b_1: + network.incoming.packets_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2_test_nested2Level: 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.allocation_server_main_ps_1b_1: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -6913,40 +6951,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_cmaui_port_12: - 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_cmaui_port_12: - 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 - network.outgoing.packets.rate_cmaui_port_11: - 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_cmaui_port_11: - 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 - network.incoming.packets.rate_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - 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_server_nested2_1c1_cmaui_1_test_nested2Level: type: tosca.capabilities.OperatingSystem occurrences: @@ -6963,13 +6967,14 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_cmaui_port_12: - type: tosca.capabilities.Attachment + feature_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2_test_nested2Level: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - attachment_cmaui_port_11: - type: tosca.capabilities.Attachment + network.incoming.bytes_cmaui_1c1_nested2_1_mgmt_port_0_test_nested2Level: + 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 @@ -6984,11 +6989,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_cmaui_port_1_test_nested2Level: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.device.read.requests_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -7001,19 +7001,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pattern4_port_02_test_nested_pattern_4_nested2_test_nested2Level: + network.outpoing.packets_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file_test_nested2Level: 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_cmaui_port_1_test_nested2Level: + disk.capacity_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: 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_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: + network.incoming.bytes_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_main_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -7549,19 +7549,6 @@ node_types: required: true status: SUPPORTED requirements: - - dependency_cmaui_port_2: - capability: tosca.capabilities.Node - node: tosca.nodes.Root - relationship: tosca.relationships.DependsOn - occurrences: - - 0 - - UNBOUNDED - - link_cmaui_port_2: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - dependency_server_nested2_ps_1b: capability: tosca.capabilities.Node node: tosca.nodes.Root @@ -7611,6 +7598,19 @@ node_types: occurrences: - 0 - UNBOUNDED + - dependency_cmaui_1c1_nested2_1_mgmt_port_0: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - link_cmaui_1c1_nested2_1_mgmt_port_0: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 - dependency_server_nested2_1c1_cmaui_2: capability: tosca.capabilities.Node node: tosca.nodes.Root @@ -7632,14 +7632,14 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pattern4_port_01_test_nested_pattern_4_nested2: + - dependency_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pattern4_port_01_test_nested_pattern_4_nested2: + - link_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -7659,14 +7659,14 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pattern4_port_02_test_nested_pattern_4_nested2: + - dependency_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pattern4_port_02_test_nested_pattern_4_nested2: + - link_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -7734,26 +7734,26 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_test_nested_pattern_4_same_type_diff_file: + - dependency_cmaui_1c1_nested2_2_mgmt_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file: + - link_cmaui_1c1_nested2_2_mgmt_port_0: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 + - dependency_test_nested_pattern_4_same_type_diff_file: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - dependency_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file: capability: tosca.capabilities.Node node: tosca.nodes.Root @@ -7768,14 +7768,27 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file: + - dependency_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - link_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 + - dependency_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file: + - link_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -7808,19 +7821,6 @@ node_types: occurrences: - 1 - 1 - - dependency_cmaui_port_1: - capability: tosca.capabilities.Node - node: tosca.nodes.Root - relationship: tosca.relationships.DependsOn - occurrences: - - 0 - - UNBOUNDED - - link_cmaui_port_1: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 capabilities: instance_server_nested2_1c1_cmaui_1: type: org.openecomp.capabilities.metric.Ceilometer @@ -7845,6 +7845,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2: + 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_server_nested2_pd_1b: type: tosca.capabilities.OperatingSystem occurrences: @@ -7862,6 +7868,11 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED vcpus_server_nested2_pd_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -7898,11 +7909,6 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED disk.iops_server_nested2_ps_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -7956,19 +7962,18 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_cmaui_port_2: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.device.allocation_server_nested2_pd_1b: + network.outgoing.packets.rate_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file: 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_cmaui_port_1: + disk.device.allocation_server_nested2_pd_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -7980,7 +7985,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file: + network.outgoing.bytes.rate_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -7992,12 +7997,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file: - 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_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -8049,24 +8048,6 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file: - 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 - forwarder_pd_server_pattern4_port_01_test_nested_pattern_4_nested2: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - attachment_pd_server_pattern4_port_02_test_nested_pattern_4_nested2: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED disk.device.iops_server_nested2_ps_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -8096,7 +8077,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_pd_server_pattern4_port_01_test_nested_pattern_4_nested2: + network.incoming.packets.rate_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -8114,12 +8095,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pattern4_port_02_test_nested_pattern_4_nested2: - 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_server_nested2_1c1_cmaui_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -8132,21 +8107,13 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_pattern4_port_02_test_nested_pattern_4_nested2: - 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 - network.outpoing.packets_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file: + disk.device.write.requests.rate_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file: 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_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file: + network.incoming.bytes.rate_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -8164,27 +8131,30 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file: + feature_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file: 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_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file: + disk.device.capacity_server_nested2_ps_1b: 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_cmaui_port_1: - 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 + network.outgoing.packets.rate_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - - 0 + - 1 - UNBOUNDED - binding_cmaui_port_2: + binding_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface @@ -8192,27 +8162,14 @@ node_types: occurrences: - 0 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file: - 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_server_nested2_ps_1b: - 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_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file: + network.incoming.packets_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2: 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_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED @@ -8222,13 +8179,15 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_ps_server_nested2_1b_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file: + 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: - - 1 + - 0 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pattern4_port_02_test_nested_pattern_4_nested2: + network.incoming.bytes_ps_server_nested2_1b_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: @@ -8245,12 +8204,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_cmaui_port_2: - 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_server_pd_pattern4_test_nested_pattern_4_nested2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -8263,12 +8216,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_cmaui_port_1: - 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_server_nested2_pd_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -8292,37 +8239,35 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.usage_server_nested2_ps_1b: + network.incoming.packets.rate_cmaui_1c1_nested2_2_mgmt_port_0: 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.allocation_server_nested2_1c1_cmaui_1: + disk.usage_server_nested2_ps_1b: 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_pd_server_pattern4_port_01_test_nested_pattern_4_nested2: + disk.allocation_server_nested2_1c1_cmaui_1: 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_server_nested2_1c1_cmaui_2: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_cmaui_port_1: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_cmaui_1c1_nested2_1_mgmt_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_cmaui_port_2: + disk.device.write.bytes.rate_server_nested2_1c1_cmaui_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -8334,28 +8279,18 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_cmaui_port_1: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - feature_cmaui_port_2: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED os_server_nested2_ps_1b: type: tosca.capabilities.OperatingSystem occurrences: - 1 - UNBOUNDED - disk.device.read.requests_server_nested2_ps_1b: + network.incoming.bytes.rate_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2: 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.packets.rate_pd_server_pattern4_port_01_test_nested_pattern_4_nested2: + disk.device.read.requests_server_nested2_ps_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -8373,14 +8308,14 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_jsa_security_group1_test_resourceGroup: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - feature_jsa_security_group1_test_resourceGroup: - type: tosca.capabilities.Node + network.incoming.packets_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file: + 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 @@ -8396,7 +8331,7 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file: + feature_cmaui_1c1_nested2_1_mgmt_port_0: type: tosca.capabilities.Node occurrences: - 1 @@ -8413,6 +8348,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes_cmaui_1c1_nested2_2_mgmt_port_0: + 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_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -8431,6 +8372,18 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets.rate_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2: + 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_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file: + 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_server_nested2_1c1_cmaui_2: type: tosca.capabilities.network.Bindable occurrences: @@ -8475,7 +8428,13 @@ node_types: occurrences: - 1 - UNBOUNDED - memory.usage_server_nested2_ps_1b: + memory.usage_server_nested2_ps_1b: + 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_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -8493,25 +8452,20 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.read.bytes.rate_server_nested2_1c1_cmaui_1: + network.outgoing.packets.rate_cmaui_1c1_nested2_1_mgmt_port_0: 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_server_nested2_ps_1b: - type: tosca.capabilities.Endpoint.Admin - occurrences: - - 1 - - UNBOUNDED - network.incoming.bytes_pd_server_pattern4_port_02_test_nested_pattern_4_nested2: + disk.read.bytes.rate_server_nested2_1c1_cmaui_1: 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_cmaui_port_2: - type: org.openecomp.capabilities.Forwarder + endpoint_server_nested2_ps_1b: + type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED @@ -8521,11 +8475,6 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_cmaui_port_1: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED vcpus_server_nested2_1c1_cmaui_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -8574,19 +8523,29 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.write.requests_server_nested2_pd_1b: + network.incoming.bytes.rate_cmaui_1c1_nested2_2_mgmt_port_0: 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_server_nested2_ps_1b: + disk.write.requests_server_nested2_pd_1b: 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_pd_server_pattern4_port_02_test_nested_pattern_4_nested2: + attachment_cmaui_1c1_nested2_1_mgmt_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + forwarder_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + disk.device.write.bytes_server_nested2_ps_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -8604,12 +8563,29 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pd_server_pattern4_port_02_test_nested_pattern_4_nested2: + network.incoming.bytes.rate_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file: + 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_cmaui_1c1_nested2_1_mgmt_port_0: + 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_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2: 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_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.device.allocation_server_pd_pattern4_test_nested_pattern_4_nested2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -8627,6 +8603,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2: + 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_server_nested2_ps_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -8645,6 +8627,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.packets.rate_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2: + 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_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -8708,16 +8696,6 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pattern4_port_01_test_nested_pattern_4_nested2: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - feature_pd_server_pattern4_port_02_test_nested_pattern_4_nested2: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED feature_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file: type: tosca.capabilities.Node occurrences: @@ -8729,18 +8707,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_cmaui_port_1: - 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_cmaui_port_2: - 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.iops_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -8777,6 +8743,14 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2: + 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 feature_server_pd_pattern4_test_nested_pattern_4_nested2: type: tosca.capabilities.Node occurrences: @@ -8799,6 +8773,14 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file: + 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 memory.resident_server_nested2_1c1_cmaui_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -8830,6 +8812,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.iops_server_nested2_1c1_cmaui_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -8848,6 +8835,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.write.bytes.rate_server_nested2_pd_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -8859,11 +8851,6 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED network.outgoing.bytes.rate_pd_server_nested2_1b_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -8876,14 +8863,6 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_pattern4_port_01_test_nested_pattern_4_nested2: - 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 disk.device.read.requests_server_nested2_1c1_cmaui_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -8898,67 +8877,70 @@ node_types: occurrences: - 0 - UNBOUNDED - host_server_pd_pattern4_test_nested_pattern_4_nested2: - type: tosca.capabilities.Container + binding_cmaui_1c1_nested2_2_mgmt_port_0: + type: tosca.capabilities.network.Bindable valid_source_types: - - tosca.nodes.SoftwareComponent + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - - 1 + - 0 - UNBOUNDED - disk.device.read.requests_server_pd_pattern4_test_nested_pattern_4_nested2: + network.outgoing.packets.rate_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2: 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_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file: + network.outpoing.packets_cmaui_1c1_nested2_1_mgmt_port_0: 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_server_nested2_pd_1b: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + host_server_pd_pattern4_test_nested_pattern_4_nested2: + type: tosca.capabilities.Container + valid_source_types: + - tosca.nodes.SoftwareComponent occurrences: - 1 - UNBOUNDED - disk.device.read.bytes.rate_server_nested2_ps_1b: + network.outpoing.packets_cmaui_1c1_nested2_2_mgmt_port_0: 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_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file: + disk.device.read.requests_server_pd_pattern4_test_nested_pattern_4_nested2: 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_pd_server_pattern4_port_01_test_nested_pattern_4_nested2: + cpu.delta_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file: 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_server_pd_pattern4_test_nested_pattern_4_nested2: + disk.usage_server_nested2_pd_1b: 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_server_nested2_1c1_cmaui_1: + disk.device.read.bytes.rate_server_nested2_ps_1b: 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_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file: - type: tosca.capabilities.Node + disk.write.bytes_server_pd_pattern4_test_nested_pattern_4_nested2: + 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_pd_server_pattern4_port_01_test_nested_pattern_4_nested2: + disk.device.read.requests_server_nested2_1c1_cmaui_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -8987,19 +8969,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pattern4_port_01_test_nested_pattern_4_nested2: + disk.device.latency_server_nested2_ps_1b: 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_server_nested2_ps_1b: + disk.capacity_server_nested2_pd_1b: 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_server_nested2_pd_1b: + network.outgoing.bytes.rate_cmaui_1c1_nested2_1_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -9011,6 +8993,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes.rate_cmaui_1c1_nested2_2_mgmt_port_0: + 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_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -9046,6 +9034,14 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_cmaui_1c1_nested2_1_mgmt_port_0: + 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 host_server_nested2_1c1_cmaui_2: type: tosca.capabilities.Container valid_source_types: @@ -9064,12 +9060,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file: - 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_server_nested2_1c1_cmaui_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -9106,22 +9096,11 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_pattern4_port_01_test_nested_pattern_4_nested2: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED endpoint_server_nested2_1c1_cmaui_2: type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED - network.incoming.packets_cmaui_port_2: - 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_server_nested2_ps_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -9139,14 +9118,14 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_cmaui_port_1: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_jsa_security_group2_test_nested3Level: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - feature_jsa_security_group2_test_nested3Level: - type: tosca.capabilities.Node + network.outpoing.packets_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file: + 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 @@ -9190,13 +9169,12 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.write.requests_server_nested2_pd_1b: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file: + disk.device.write.requests_server_nested2_pd_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -9220,12 +9198,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file: - 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_server_nested2_ps_1b: type: tosca.capabilities.Container valid_source_types: @@ -9261,13 +9233,18 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.read.requests.rate_server_nested2_1c1_cmaui_2: + network.outgoing.bytes_cmaui_1c1_nested2_2_mgmt_port_0: 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_pd_server_pattern4_port_02_test_nested_pattern_4_nested2: + feature_cmaui_1c1_nested2_2_mgmt_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + disk.device.read.requests.rate_server_nested2_1c1_cmaui_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -9285,13 +9262,19 @@ node_types: occurrences: - 1 - UNBOUNDED - cpu_server_nested2_1c1_cmaui_1: + network.outgoing.bytes_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file: + 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_cmaui_1c1_nested2_1_mgmt_port_0: 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.packets.rate_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file: + cpu_server_nested2_1c1_cmaui_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -9303,6 +9286,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2: + 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 instance_server_nested2_pd_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -9339,7 +9328,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_cmaui_port_2: + network.outgoing.bytes_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -9357,12 +9346,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_cmaui_port_1: - 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_server_nested2_1c1_cmaui_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -9420,7 +9403,13 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file: + network.incoming.bytes_cmaui_1c1_nested2_1_mgmt_port_0: + 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_cmaui_1c1_nested2_2_mgmt_port_0: type: org.openecomp.capabilities.Forwarder occurrences: - 1 @@ -9431,8 +9420,9 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file: - type: tosca.capabilities.Attachment + network.incoming.packets.rate_cmaui_1c1_nested2_1_mgmt_port_0: + 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 @@ -9477,12 +9467,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pattern4_port_02_test_nested_pattern_4_nested2: - 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_server_pd_pattern4_test_nested_pattern_4_nested2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -9501,22 +9485,12 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_pd_server_pattern4_port_02_test_nested_pattern_4_nested2: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED disk.capacity_server_pd_pattern4_test_nested_pattern_4_nested2: 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 - attachment_cmaui_port_2: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED disk.allocation_server_nested2_pd_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -9553,133 +9527,136 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file: + disk.device.iops_server_pd_pattern4_test_nested_pattern_4_nested2: 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.packets.rate_cmaui_port_1: + disk.device.read.bytes_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file: 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.packets.rate_cmaui_port_2: + network.incoming.packets.rate_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2: 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 - attachment_cmaui_port_1: - type: tosca.capabilities.Attachment + disk.root.size_server_nested2_1c1_cmaui_2: + 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.iops_server_pd_pattern4_test_nested_pattern_4_nested2: + disk.root.size_server_nested2_1c1_cmaui_1: 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_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file: + network.incoming.packets_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file: 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_server_nested2_1c1_cmaui_2: + disk.device.latency_server_nested2_pd_1b: 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_server_nested2_1c1_cmaui_1: + disk.write.bytes_server_nested2_1c1_cmaui_2: 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_server_nested2_pd_1b: + disk.usage_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file: 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_server_nested2_1c1_cmaui_2: + disk.write.bytes_server_nested2_1c1_cmaui_1: 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_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file: + disk.iops_server_nested2_1c1_cmaui_2: 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_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file: + feature_ps_server_nested2_1b_port: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + disk.iops_server_nested2_1c1_cmaui_1: 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_server_nested2_1c1_cmaui_1: + network.outgoing.packets.rate_cmaui_1c1_nested2_2_mgmt_port_0: 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.iops_server_nested2_1c1_cmaui_2: + disk.iops_server_nested2_pd_1b: 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_ps_server_nested2_1b_port: - type: tosca.capabilities.Node + disk.device.read.bytes.rate_server_nested2_1c1_cmaui_1: + 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.iops_server_nested2_1c1_cmaui_1: + disk.device.read.bytes.rate_server_nested2_1c1_cmaui_2: 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_pd_server_pattern4_port_01_test_nested_pattern_4_nested2: + disk.latency_server_nested2_1c1_cmaui_2: 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.iops_server_nested2_pd_1b: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_cmaui_1c1_nested2_2_mgmt_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - disk.device.read.bytes.rate_server_nested2_1c1_cmaui_1: + network.incoming.packets_cmaui_1c1_nested2_2_mgmt_port_0: 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_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file: - 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 - disk.device.read.bytes.rate_server_nested2_1c1_cmaui_2: + network.incoming.bytes.rate_cmaui_1c1_nested2_1_mgmt_port_0: 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_server_nested2_1c1_cmaui_2: + attachment_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes.rate_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -9702,6 +9679,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file: + 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_server_pd_pattern4_test_nested_pattern_4_nested2: type: tosca.capabilities.Endpoint.Admin occurrences: @@ -9719,55 +9702,61 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.write.requests.rate_server_nested2_ps_1b: + network.outgoing.bytes.rate_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file: 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_server_nested2_1c1_cmaui_2: + network.incoming.bytes_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file: 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_server_nested2_pd_1b: + disk.write.requests.rate_server_nested2_ps_1b: 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_server_nested2_1c1_cmaui_1: + network.incoming.bytes_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2: 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_server_nested2_1c1_cmaui_1: + cpu_util_server_nested2_1c1_cmaui_2: 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 - instance_server_nested2_ps_1b: + disk.device.read.bytes_server_nested2_pd_1b: + 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_server_nested2_1c1_cmaui_1: 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_pd_server_pattern4_port_01_test_nested_pattern_4_nested2: + cpu_util_server_nested2_1c1_cmaui_1: 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_cmaui_port_1: + network.incoming.packets_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2: 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_cmaui_port_2: + instance_server_nested2_ps_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -9800,6 +9789,12 @@ node_types: occurrences: - 0 - UNBOUNDED + network.incoming.packets.rate_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file: + 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_server_pd_pattern4_test_nested_pattern_4_nested2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -9858,18 +9853,23 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pattern4_port_02_test_nested_pattern_4_nested2: + disk.device.allocation_server_nested2_1c1_cmaui_1: 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_server_nested2_1c1_cmaui_1: + network.outpoing.packets_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file: 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 + attachment_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED cpu.delta_server_nested2_ps_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -9885,6 +9885,20 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server_main_1b: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_pd_server_main_1b_port_1_order: + type: integer + required: true + status: SUPPORTED + port_pd_server_main_1b_port_1_network_role: + type: string + required: true + status: SUPPORTED + port_pd_server_main_1b_port_1_network: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string index_value: type: integer description: Index value of this substitution service template runtime instance @@ -9893,87 +9907,86 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_pd_server_main_1b_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_main_1b_port_1_network_role_tag: + type: string required: true status: SUPPORTED - compute_pd_server_main_1b_availability_zone: + port_pd_server_main_1b_port_1_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd_server_main_1b_port_replacement_policy: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + compute_pd_server_main_1b_availability_zone: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd_server_main_1b_port_subnetpoolid: - type: string - required: true - status: SUPPORTED - port_pd_server_main_1b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pd_server_main_1b_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED vm_flavor_name: type: string required: true status: SUPPORTED - port_pd_server_main_1b_port_related_networks: + port_pd_server_main_1b_port_1_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - vm_image_name: - type: string - required: true - status: SUPPORTED - port_pd_server_main_1b_port_network_role: - type: string - required: true - status: SUPPORTED - compute_pd_server_main_1b_name: + type: org.openecomp.datatypes.network.IpRequirements + port_pd_server_main_1b_port_1_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd_server_main_1b_port_network: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_pd_server_main_1b_port_1_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd_server_main_1b_port_ip_requirements: + type: org.openecomp.datatypes.network.VlanRequirements + vm_image_name: + type: string + required: true + status: SUPPORTED + compute_pd_server_main_1b_name: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd_server_main_1b_port_network_role_tag: + type: string + port_pd_server_main_1b_port_1_subnetpoolid: type: string required: true status: SUPPORTED - port_pd_server_main_1b_port_vlan_requirements: - type: list + port_pd_server_main_1b_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd_server_main_1b_port_fixed_ips: + port_pd_server_main_1b_port_1_replacement_policy: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_pd_server_main_1b_port_order: - type: integer - required: true - status: SUPPORTED + type: string requirements: + - dependency_pd_server_main_1b_pd_server_main_1b_port_1: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - link_pd_server_main_1b_pd_server_main_1b_port_1: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 - dependency_pd_server_main_1b: capability: tosca.capabilities.Node node: tosca.nodes.Root @@ -9988,20 +10001,18 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_main_1b_pd_server_main_1b_port: - capability: tosca.capabilities.Node - node: tosca.nodes.Root - relationship: tosca.relationships.DependsOn + capabilities: + forwarder_pd_server_main_1b_pd_server_main_1b_port_1: + type: org.openecomp.capabilities.Forwarder occurrences: - - 0 + - 1 - UNBOUNDED - - link_pd_server_main_1b_pd_server_main_1b_port: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo + network.incoming.packets_pd_server_main_1b_pd_server_main_1b_port_1: + 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 - - 1 - capabilities: + - UNBOUNDED disk.write.bytes_pd_server_main_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -10014,6 +10025,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes.rate_pd_server_main_1b_pd_server_main_1b_port_1: + 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_pd_server_main_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -10043,6 +10060,17 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_pd_server_main_1b_pd_server_main_1b_port_1: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes_pd_server_main_1b_pd_server_main_1b_port_1: + 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_pd_server_main_1b: type: tosca.capabilities.Scalable occurrences: @@ -10053,11 +10081,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_main_1b_pd_server_main_1b_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_pd_server_main_1b_pd_server_main_1b_port_1: + 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: - - 1 + - 0 - UNBOUNDED instance_pd_server_main_1b: type: org.openecomp.capabilities.metric.Ceilometer @@ -10065,13 +10095,11 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_main_1b_pd_server_main_1b_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 + network.incoming.packets.rate_pd_server_main_1b_pd_server_main_1b_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - - 0 + - 1 - UNBOUNDED host_pd_server_main_1b: type: tosca.capabilities.Container @@ -10080,31 +10108,31 @@ node_types: occurrences: - 1 - UNBOUNDED - cpu.delta_pd_server_main_1b: + network.outpoing.packets_pd_server_main_1b_pd_server_main_1b_port_1: 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_pd_server_main_1b_pd_server_main_1b_port: + cpu.delta_pd_server_main_1b: 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_pd_server_main_1b: + network.outgoing.packets.rate_pd_server_main_1b_pd_server_main_1b_port_1: 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_pd_server_main_1b: + disk.device.read.bytes_pd_server_main_1b: 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.packets.rate_pd_server_main_1b_pd_server_main_1b_port: + disk.device.read.bytes.rate_pd_server_main_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -10134,8 +10162,9 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_main_1b_pd_server_main_1b_port: - type: tosca.capabilities.Node + network.incoming.bytes_pd_server_main_1b_pd_server_main_1b_port_1: + 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 @@ -10156,12 +10185,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_main_1b_pd_server_main_1b_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_pd_server_main_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -10174,12 +10197,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pd_server_main_1b_pd_server_main_1b_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.device.usage_pd_server_main_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -10227,12 +10244,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_main_1b_pd_server_main_1b_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.bytes.rate_pd_server_main_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -10245,28 +10256,18 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_main_1b_pd_server_main_1b_port: + disk.device.allocation_pd_server_main_1b: 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_pd_server_main_1b: + network.outgoing.bytes.rate_pd_server_main_1b_pd_server_main_1b_port_1: 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_pd_server_main_1b_pd_server_main_1b_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - attachment_pd_server_main_1b_pd_server_main_1b_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED disk.iops_pd_server_main_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -10285,9 +10286,8 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_main_1b_pd_server_main_1b_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_pd_server_main_1b_pd_server_main_1b_port_1: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED @@ -10814,19 +10814,17 @@ node_types: org.openecomp.resource.abstract.nodes.ps_server_main_1b: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_ps_server_main_1b_port_fixed_ips: - type: list + port_ps_server_main_1b_port_1_order: + type: integer required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_ps_server_main_1b_port_ip_requirements: + port_ps_server_main_1b_port_1_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_ps_server_main_1b_port_subnetpoolid: + type: org.openecomp.datatypes.network.VlanRequirements + port_ps_server_main_1b_port_1_network_role: type: string required: true status: SUPPORTED @@ -10836,10 +10834,6 @@ node_types: status: SUPPORTED entry_schema: type: string - port_ps_server_main_1b_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED index_value: type: integer description: Index value of this substitution service template runtime instance @@ -10848,69 +10842,75 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - vm_flavor_name: - type: string + port_ps_server_main_1b_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_ps_server_main_1b_port_network_role: + vm_flavor_name: type: string required: true status: SUPPORTED - port_ps_server_main_1b_port_order: - type: integer - required: true - status: SUPPORTED - port_ps_server_main_1b_port_network_role_tag: - type: string + port_ps_server_main_1b_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_ps_server_main_1b_port_related_networks: + port_ps_server_main_1b_port_1_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments + type: org.openecomp.datatypes.network.IpRequirements vm_image_name: type: string required: true status: SUPPORTED - port_ps_server_main_1b_port_vlan_requirements: + port_ps_server_main_1b_port_1_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.RelatedNetworksAssignments compute_ps_server_main_1b_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_ps_server_main_1b_port_replacement_policy: + port_ps_server_main_1b_port_1_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_ps_server_main_1b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_ps_server_main_1b_port_1_network_role_tag: + type: string required: true status: SUPPORTED - port_ps_server_main_1b_port_network: + port_ps_server_main_1b_port_1_replacement_policy: type: list required: true status: SUPPORTED entry_schema: type: string + port_ps_server_main_1b_port_1_fixed_ips: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_ps_server_main_1b_port_1_subnetpoolid: + type: string + required: true + status: SUPPORTED requirements: - - dependency_ps_server_main_1b_ps_server_main_1b_port: + - dependency_ps_server_main_1b_ps_server_main_1b_port_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_ps_server_main_1b_ps_server_main_1b_port: + - link_ps_server_main_1b_ps_server_main_1b_port_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -10931,32 +10931,38 @@ node_types: - 0 - UNBOUNDED capabilities: - network.incoming.bytes_ps_server_main_1b_ps_server_main_1b_port: + disk.device.write.requests_ps_server_main_1b: 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_ps_server_main_1b: + disk.device.capacity_ps_server_main_1b: 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_ps_server_main_1b: + disk.capacity_ps_server_main_1b: 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_ps_server_main_1b: + feature_ps_server_main_1b_ps_server_main_1b_port_1: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + network.outgoing.packets.rate_ps_server_main_1b_ps_server_main_1b_port_1: 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 - attachment_ps_server_main_1b_ps_server_main_1b_port: - type: tosca.capabilities.Attachment + network.outpoing.packets_ps_server_main_1b_ps_server_main_1b_port_1: + 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 @@ -10966,31 +10972,29 @@ node_types: occurrences: - 1 - UNBOUNDED - vcpus_ps_server_main_1b: + network.incoming.bytes.rate_ps_server_main_1b_ps_server_main_1b_port_1: 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.packets.rate_ps_server_main_1b_ps_server_main_1b_port: + network.incoming.packets_ps_server_main_1b_ps_server_main_1b_port_1: 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_ps_server_main_1b: + vcpus_ps_server_main_1b: 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_ps_server_main_1b_ps_server_main_1b_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 + cpu_util_ps_server_main_1b: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - - 0 + - 1 - UNBOUNDED disk.device.write.bytes.rate_ps_server_main_1b: type: org.openecomp.capabilities.metric.Ceilometer @@ -11004,25 +11008,24 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.write.requests.rate_ps_server_main_1b: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_ps_server_main_1b_ps_server_main_1b_port_1: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - cpu_ps_server_main_1b: + disk.device.write.requests.rate_ps_server_main_1b: 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 - instance_ps_server_main_1b: + cpu_ps_server_main_1b: 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_ps_server_main_1b_ps_server_main_1b_port: + instance_ps_server_main_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -11040,25 +11043,20 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_ps_server_main_1b_ps_server_main_1b_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.device.read.requests_ps_server_main_1b: 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_ps_server_main_1b: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_ps_server_main_1b_ps_server_main_1b_port_1: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - forwarder_ps_server_main_1b_ps_server_main_1b_port: - type: org.openecomp.capabilities.Forwarder + memory.usage_ps_server_main_1b: + 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 @@ -11068,30 +11066,32 @@ node_types: occurrences: - 1 - UNBOUNDED - scalable_ps_server_main_1b: - type: tosca.capabilities.Scalable + binding_ps_server_main_1b_ps_server_main_1b_port_1: + 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: - - 1 + - 0 - UNBOUNDED - network.outgoing.bytes_ps_server_main_1b_ps_server_main_1b_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + scalable_ps_server_main_1b: + type: tosca.capabilities.Scalable occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_ps_server_main_1b_ps_server_main_1b_port: + disk.usage_ps_server_main_1b: 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_ps_server_main_1b: + disk.read.bytes_ps_server_main_1b: 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_ps_server_main_1b: + network.outgoing.bytes.rate_ps_server_main_1b_ps_server_main_1b_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -11137,24 +11137,18 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_ps_server_main_1b: - type: tosca.capabilities.network.Bindable - occurrences: - - 1 - - UNBOUNDED - network.incoming.packets_ps_server_main_1b_ps_server_main_1b_port: + network.incoming.bytes_ps_server_main_1b_ps_server_main_1b_port_1: 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_ps_server_main_1b: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_ps_server_main_1b: + type: tosca.capabilities.network.Bindable occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_ps_server_main_1b_ps_server_main_1b_port: + disk.device.read.bytes.rate_ps_server_main_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -11173,6 +11167,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes_ps_server_main_1b_ps_server_main_1b_port_1: + 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_ps_server_main_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -11220,19 +11220,19 @@ node_types: occurrences: - 1 - UNBOUNDED - memory_ps_server_main_1b: + network.incoming.packets.rate_ps_server_main_1b_ps_server_main_1b_port_1: 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_ps_server_main_1b: + memory_ps_server_main_1b: 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_ps_server_main_1b_ps_server_main_1b_port: + disk.root.size_ps_server_main_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -11247,34 +11247,16 @@ node_types: org.openecomp.resource.abstract.nodes.cmaui_1c1_nested2: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_cmaui_port_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_cmaui_port_fixed_ips: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_cmaui_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_cmaui_port_network: - type: list + port_cmaui_1c1_nested2_mgmt_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: string - port_cmaui_port_related_networks: + port_cmaui_1c1_nested2_mgmt_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments + type: org.openecomp.datatypes.network.VlanRequirements index_value: type: integer description: Index value of this substitution service template runtime instance @@ -11283,72 +11265,77 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_cmaui_port_network_role_tag: - type: string + port_cmaui_1c1_nested2_mgmt_port_0_replacement_policy: + type: list required: true status: SUPPORTED - port_cmaui_port_order: - type: integer + entry_schema: + type: string + port_cmaui_1c1_nested2_mgmt_port_0_subnetpoolid: + type: string required: true status: SUPPORTED vm_flavor_name: type: string required: true status: SUPPORTED - port_cmaui_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_cmaui_1c1_nested2_mgmt_port_0_network_role_tag: + type: string required: true status: SUPPORTED - port_cmaui_port_replacement_policy: + port_cmaui_1c1_nested2_mgmt_port_0_network_role: + type: string + required: true + status: SUPPORTED + port_cmaui_1c1_nested2_mgmt_port_0_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: string - port_cmaui_port_network_role: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + vm_image_name: type: string required: true status: SUPPORTED - vm_image_name: - type: string + port_cmaui_1c1_nested2_mgmt_port_0_network: + type: list required: true status: SUPPORTED - port_cmaui_port_ip_requirements: + entry_schema: + type: string + port_cmaui_1c1_nested2_mgmt_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements + port_cmaui_1c1_nested2_mgmt_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED compute_cmaui_1c1_nested2_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_cmaui_port_subnetpoolid: - type: string + port_cmaui_1c1_nested2_mgmt_port_0_related_networks: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments compute_cmaui_1c1_nested2_availability_zone: type: list required: true status: SUPPORTED entry_schema: type: string + port_cmaui_1c1_nested2_mgmt_port_0_order: + type: integer + required: true + status: SUPPORTED requirements: - - dependency_cmaui_1c1_nested2_cmaui_port: - capability: tosca.capabilities.Node - node: tosca.nodes.Root - relationship: tosca.relationships.DependsOn - occurrences: - - 0 - - UNBOUNDED - - link_cmaui_1c1_nested2_cmaui_port: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - dependency_cmaui_1c1_nested2: capability: tosca.capabilities.Node node: tosca.nodes.Root @@ -11363,11 +11350,27 @@ node_types: occurrences: - 0 - UNBOUNDED - capabilities: - feature_cmaui_1c1_nested2_cmaui_port: - type: tosca.capabilities.Node + - dependency_cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - link_cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo occurrences: - 1 + - 1 + capabilities: + binding_cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0: + 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 disk.device.write.bytes.rate_cmaui_1c1_nested2: type: org.openecomp.capabilities.metric.Ceilometer @@ -11393,13 +11396,12 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.capacity_cmaui_1c1_nested2: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_cmaui_1c1_nested2_cmaui_port: + disk.device.capacity_cmaui_1c1_nested2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -11434,7 +11436,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_cmaui_1c1_nested2_cmaui_port: + network.incoming.packets_cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -11445,24 +11447,12 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_cmaui_1c1_nested2_cmaui_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 instance_cmaui_1c1_nested2: 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_cmaui_1c1_nested2_cmaui_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 endpoint_cmaui_1c1_nested2: type: tosca.capabilities.Endpoint.Admin occurrences: @@ -11504,7 +11494,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_cmaui_1c1_nested2_cmaui_port: + network.incoming.bytes_cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -11517,13 +11507,13 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.latency_cmaui_1c1_nested2: + network.outgoing.packets.rate_cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0: 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_cmaui_1c1_nested2_cmaui_port: + disk.device.latency_cmaui_1c1_nested2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -11535,6 +11525,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes.rate_cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0: + 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_cmaui_1c1_nested2: type: tosca.capabilities.network.Bindable occurrences: @@ -11546,11 +11542,6 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_cmaui_1c1_nested2_cmaui_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED disk.allocation_cmaui_1c1_nested2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -11575,7 +11566,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_cmaui_1c1_nested2_cmaui_port: + network.outgoing.bytes_cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -11586,9 +11577,8 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_cmaui_1c1_nested2_cmaui_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED @@ -11622,6 +11612,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes.rate_cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0: + 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_cmaui_1c1_nested2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -11634,6 +11630,11 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.device.allocation_cmaui_1c1_nested2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -11646,13 +11647,11 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_cmaui_1c1_nested2_cmaui_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 + network.incoming.packets.rate_cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - - 0 + - 1 - UNBOUNDED disk.iops_cmaui_1c1_nested2: type: org.openecomp.capabilities.metric.Ceilometer @@ -11660,18 +11659,19 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_cmaui_1c1_nested2_cmaui_port: - type: tosca.capabilities.Attachment + disk.write.requests_cmaui_1c1_nested2: + 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_cmaui_1c1_nested2: + cpu_util_cmaui_1c1_nested2: 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_cmaui_1c1_nested2: + network.outpoing.packets_cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -12113,29 +12113,21 @@ node_types: org.openecomp.resource.abstract.nodes.cmaui_1c1_main: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_cmaui_port_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_cmaui_port_fixed_ips: + port_cmaui_1c1_main_mgmt_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_cmaui_port_exCP_naming: - type: org.openecomp.datatypes.Naming + type: org.openecomp.datatypes.network.IpRequirements + port_cmaui_1c1_main_mgmt_port_0_network_role_tag: + type: string required: true status: SUPPORTED - port_cmaui_port_network: - type: list + port_cmaui_1c1_main_mgmt_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: string - port_cmaui_port_related_networks: + port_cmaui_1c1_main_mgmt_port_0_related_networks: type: list required: true status: SUPPORTED @@ -12149,72 +12141,67 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_cmaui_port_network_role_tag: - type: string - required: true - status: SUPPORTED - port_cmaui_port_order: - type: integer + port_cmaui_1c1_main_mgmt_port_0_fixed_ips: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps vm_flavor_name: type: string required: true status: SUPPORTED - port_cmaui_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_cmaui_port_replacement_policy: + port_cmaui_1c1_main_mgmt_port_0_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_cmaui_port_network_role: - type: string + port_cmaui_1c1_main_mgmt_port_0_order: + type: integer required: true status: SUPPORTED + port_cmaui_1c1_main_mgmt_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_cmaui_1c1_main_mgmt_port_0_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements vm_image_name: type: string required: true status: SUPPORTED - port_cmaui_port_ip_requirements: + port_cmaui_1c1_main_mgmt_port_0_replacement_policy: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: string compute_cmaui_1c1_main_availability_zone: type: list required: true status: SUPPORTED entry_schema: type: string + port_cmaui_1c1_main_mgmt_port_0_network_role: + type: string + required: true + status: SUPPORTED compute_cmaui_1c1_main_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_cmaui_port_subnetpoolid: + port_cmaui_1c1_main_mgmt_port_0_subnetpoolid: type: string required: true status: SUPPORTED requirements: - - dependency_cmaui_1c1_main_cmaui_port: - capability: tosca.capabilities.Node - node: tosca.nodes.Root - relationship: tosca.relationships.DependsOn - occurrences: - - 0 - - UNBOUNDED - - link_cmaui_1c1_main_cmaui_port: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - dependency_cmaui_1c1_main: capability: tosca.capabilities.Node node: tosca.nodes.Root @@ -12229,6 +12216,19 @@ node_types: occurrences: - 0 - UNBOUNDED + - dependency_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - link_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 capabilities: disk.device.iops_cmaui_1c1_main: type: org.openecomp.capabilities.metric.Ceilometer @@ -12236,6 +12236,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes.rate_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0: + 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_cmaui_1c1_main: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -12265,12 +12271,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_cmaui_1c1_main_cmaui_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_cmaui_1c1_main: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -12312,8 +12312,8 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_cmaui_1c1_main_cmaui_port: - type: tosca.capabilities.Attachment + forwarder_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED @@ -12335,42 +12335,48 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_cmaui_1c1_main_cmaui_port: - type: org.openecomp.capabilities.Forwarder + network.outpoing.packets_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0: + 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_cmaui_1c1_main: + network.incoming.packets.rate_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0: 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_cmaui_1c1_main: + vcpus_cmaui_1c1_main: 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_cmaui_1c1_main: + disk.read.bytes.rate_cmaui_1c1_main: 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_cmaui_1c1_main: + feature_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + disk.device.capacity_cmaui_1c1_main: 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_cmaui_1c1_main: + disk.device.write.requests_cmaui_1c1_main: 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_cmaui_1c1_main_cmaui_port: + disk.usage_cmaui_1c1_main: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -12382,19 +12388,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_cmaui_1c1_main_cmaui_port: + memory.usage_cmaui_1c1_main: 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_cmaui_1c1_main: + network.outgoing.bytes.rate_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0: 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_cmaui_1c1_main_cmaui_port: + network.incoming.packets_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -12424,7 +12430,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_cmaui_1c1_main_cmaui_port: + network.outgoing.bytes_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -12436,12 +12442,7 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_cmaui_1c1_main_cmaui_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - network.outgoing.packets.rate_cmaui_1c1_main_cmaui_port: + network.incoming.bytes_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -12460,23 +12461,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_cmaui_1c1_main_cmaui_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.write.bytes.rate_cmaui_1c1_main: 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_cmaui_1c1_main_cmaui_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0: + 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: - - 1 + - 0 - UNBOUNDED memory_cmaui_1c1_main: type: org.openecomp.capabilities.metric.Ceilometer @@ -12495,21 +12492,24 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED disk.device.allocation_cmaui_1c1_main: 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_cmaui_1c1_main_cmaui_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 + disk.device.usage_cmaui_1c1_main: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - - 0 + - 1 - UNBOUNDED - disk.device.usage_cmaui_1c1_main: + network.outgoing.packets.rate_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -12560,66 +12560,68 @@ node_types: description: UID of OAM network required: true status: SUPPORTED - port_pd_server_pattern4_port_02_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pd_server_pattern4_1_oam_port_0_network_role: + type: string required: true status: SUPPORTED - port_pd_server_pattern4_port_01_network_role_tag: - type: string + port_pd_server_pattern4_0_oam_port_0_vlan_requirements: + type: list required: true status: SUPPORTED - port_pd_server_pattern4_port_01_subnetpoolid: + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_pattern4_0_oam_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_pd_server_pattern4_port_01_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pd_server_pattern4_0_oam_port_0_related_networks: + type: list required: true status: SUPPORTED - port_pd_server_pattern4_port_02_order: + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd_server_pattern4_0_oam_port_0_order: type: integer required: true status: SUPPORTED - port_pd_server_pattern4_port_01_ip_requirements: + port_pd_server_pattern4_0_oam_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - availability_zone_0: - type: string - description: availabilityzone name + port_pd_server_pattern4_1_oam_port_0_related_networks: + type: list required: true status: SUPPORTED - net: - type: string + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd_server_pattern4_0_oam_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_pd_server_pattern4_port_02_exCP_naming: - type: org.openecomp.datatypes.Naming + availability_zone_0: + type: string + description: availabilityzone name required: true status: SUPPORTED - port_pd_server_pattern4_port_02_vlan_requirements: + port_pd_server_pattern4_1_oam_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - pd_server_pattern4_flavor: - type: string - description: Flavor for PD server - required: true - status: SUPPORTED - port_pd_server_pattern4_port_01_network_role: + type: org.openecomp.datatypes.network.IpRequirements + net: type: string required: true status: SUPPORTED - port_pd_server_pattern4_port_02_network_role: + pd_server_pattern4_flavor: type: string + description: Flavor for PD server required: true status: SUPPORTED - port_pd_server_pattern4_port_01_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_pattern4_0_oam_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED security_group_name: @@ -12633,44 +12635,42 @@ node_types: description: Flavor for PS server required: true status: SUPPORTED - port_pd_server_pattern4_port_01_order: - type: integer + port_pd_server_pattern4_1_oam_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_pd_server_pattern4_port_02_related_networks: - type: list + port_pd_server_pattern4_1_oam_port_0_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments pd_server_pattern4_image: type: string description: Flavor for PD server required: true status: SUPPORTED - port_pd_server_pattern4_port_02_ip_requirements: - type: list + port_pd_server_pattern4_0_oam_port_0_network_role: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd_server_pattern4_port_02_subnetpoolid: + port_pd_server_pattern4_1_oam_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_pd_server_pattern4_1_oam_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_pd_server_pattern4_port_01_vlan_requirements: + port_pd_server_pattern4_1_oam_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_pd_server_pattern4_port_01_related_networks: - type: list + port_pd_server_pattern4_1_oam_port_0_order: + type: integer required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd_server_pattern4_port_02_network_role_tag: + port_pd_server_pattern4_0_oam_port_0_subnetpoolid: type: string required: true status: SUPPORTED @@ -12686,14 +12686,14 @@ node_types: description: pattern4_attr_1_value status: SUPPORTED requirements: - - dependency_pd_server_pattern4_port_01: + - dependency_pd_server_pattern4_0_oam_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pattern4_port_01: + - link_pd_server_pattern4_0_oam_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -12713,14 +12713,14 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pattern4_port_02: + - dependency_pd_server_pattern4_1_oam_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pattern4_port_02: + - link_pd_server_pattern4_1_oam_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -12739,55 +12739,29 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_pd_server_pattern4_port_02: - 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_pd_server_pattern4_port_01: - 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 - network.incoming.bytes_pd_server_pattern4_port_02: - 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_pd_server_pattern4_port_01: - 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_pd_server_pattern4_port_02: + feature_pd_server_pattern4_1_oam_port_0: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - feature_pd_server_pattern4_port_01: - type: tosca.capabilities.Node + forwarder_pd_server_pattern4_0_oam_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - network.incoming.packets_pd_server_pattern4_port_01: + disk.allocation_server_pd_pattern4: 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.allocation_server_pd_pattern4: + disk.device.usage_server_pd_pattern4: 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_server_pd_pattern4: + network.incoming.bytes_pd_server_pattern4_0_oam_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -12817,7 +12791,7 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_pattern4_port_02: + binding_pd_server_pattern4_0_oam_port_0: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface @@ -12825,17 +12799,35 @@ node_types: occurrences: - 0 - UNBOUNDED + network.outgoing.bytes_pd_server_pattern4_0_oam_port_0: + 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_server_pd_pattern4: 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_pd_server_pattern4_0_oam_port_0: + 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_server_pd_pattern4: type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED + network.outgoing.packets.rate_pd_server_pattern4_0_oam_port_0: + 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_server_pd_pattern4: type: tosca.capabilities.Node occurrences: @@ -12847,25 +12839,25 @@ node_types: occurrences: - 1 - UNBOUNDED - instance_server_pd_pattern4: + network.incoming.bytes.rate_pd_server_pattern4_1_oam_port_0: 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_server_pd_pattern4: + instance_server_pd_pattern4: 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_server_pd_pattern4: + cpu_server_pd_pattern4: 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_pd_server_pattern4_port_01: + disk.device.read.requests_server_pd_pattern4: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -12884,25 +12876,25 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pattern4_port_02: + memory.resident_server_pd_pattern4: 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_server_pd_pattern4: + disk.read.requests_server_pd_pattern4: 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_server_pd_pattern4: + network.outpoing.packets_pd_server_pattern4_0_oam_port_0: 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_pd_server_pattern4_port_02: + network.incoming.bytes.rate_pd_server_pattern4_0_oam_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -12932,7 +12924,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pattern4_port_01: + network.incoming.bytes_pd_server_pattern4_1_oam_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -12962,42 +12954,43 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pattern4_port_02: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_server_pd_pattern4: + type: tosca.capabilities.network.Bindable occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pattern4_port_01: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_pd_server_pattern4_0_oam_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pattern4_port_02: + network.incoming.packets_pd_server_pattern4_0_oam_port_0: 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_server_pd_pattern4: - type: tosca.capabilities.network.Bindable + network.outpoing.packets_pd_server_pattern4_1_oam_port_0: + 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.iops_server_pd_pattern4: + network.outgoing.bytes_pd_server_pattern4_1_oam_port_0: 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_pd_server_pattern4_port_01: - type: org.openecomp.capabilities.Forwarder + disk.device.iops_server_pd_pattern4: + 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_pd_server_pattern4_port_02: - type: org.openecomp.capabilities.Forwarder + network.outgoing.bytes.rate_pd_server_pattern4_1_oam_port_0: + 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 @@ -13013,19 +13006,19 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.usage_server_pd_pattern4: + network.outgoing.packets.rate_pd_server_pattern4_1_oam_port_0: 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_server_pd_pattern4: + disk.usage_server_pd_pattern4: 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.packets.rate_pd_server_pattern4_port_01: + disk.read.bytes_server_pd_pattern4: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -13036,6 +13029,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pd_server_pattern4_1_oam_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED memory_server_pd_pattern4: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -13053,7 +13051,12 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pattern4_port_01: + feature_pd_server_pattern4_0_oam_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets.rate_pd_server_pattern4_1_oam_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -13077,37 +13080,34 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pattern4_port_02: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_pd_server_pattern4_1_oam_port_0: + 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: - - 1 + - 0 - UNBOUNDED - attachment_pd_server_pattern4_port_02: + attachment_pd_server_pattern4_1_oam_port_0: type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pd_server_pattern4_port_02: + network.incoming.packets.rate_pd_server_pattern4_0_oam_port_0: 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 - attachment_pd_server_pattern4_port_01: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - network.incoming.bytes.rate_pd_server_pattern4_port_01: + disk.device.capacity_server_pd_pattern4: 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_server_pd_pattern4: + network.incoming.packets_pd_server_pattern4_1_oam_port_0: 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 + - UNBOUNDED 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 c9b64ed6f0..504b4ca395 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 @@ -339,7 +339,17 @@ topology_template: directives: - substitutable properties: - port_cmaui_port_fixed_ips: + port_cmaui_1c1_main_mgmt_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + port_cmaui_1c1_main_mgmt_port_0_network_role_tag: contrail + port_cmaui_1c1_main_mgmt_port_0_mac_requirements: + mac_count_required: + is_required: false + port_cmaui_1c1_main_mgmt_port_0_fixed_ips: - - ip_address: get_input: - cmaui_oam_ips @@ -348,26 +358,16 @@ topology_template: get_input: - cmaui_oam_ips - 0 - port_cmaui_port_network: - - get_input: contrail_net_name - - get_input: contrail_net_name - port_cmaui_port_network_role_tag: contrail vm_flavor_name: get_input: cmaui_1c1_main_flavor - port_cmaui_port_mac_requirements: - mac_count_required: - is_required: false - port_cmaui_port_replacement_policy: - - AUTO - - AUTO + port_cmaui_1c1_main_mgmt_port_0_network: + - get_input: contrail_net_name + - get_input: contrail_net_name vm_image_name: get_input: cmaui_1c1_main_image - port_cmaui_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false + port_cmaui_1c1_main_mgmt_port_0_replacement_policy: + - AUTO + - AUTO compute_cmaui_1c1_main_availability_zone: - get_input: availability_zone_0 - get_input: availability_zone_0 @@ -391,23 +391,23 @@ topology_template: directives: - substitutable properties: + port_pd_server_pattern4_0_oam_port_0_mac_requirements: + mac_count_required: + is_required: false p1: get_input: jsa_name service_template_filter: substitute_service_template: nested-pattern-4ServiceTemplate.yaml - port_pd_server_pattern4_port_01_mac_requirements: + port_pd_server_pattern4_1_oam_port_0_mac_requirements: mac_count_required: is_required: false - port_pd_server_pattern4_port_02_ip_requirements: + port_pd_server_pattern4_0_oam_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false - port_pd_server_pattern4_port_02_mac_requirements: - mac_count_required: - is_required: false - port_pd_server_pattern4_port_01_ip_requirements: + port_pd_server_pattern4_1_oam_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: true 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/Nested_cmaui_1c1_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/Nested_cmaui_1c1_mainServiceTemplate.yaml index 55c18354ce..4954b2a32b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_cmaui_1c1_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/Nested_cmaui_1c1_mainServiceTemplate.yaml @@ -11,25 +11,18 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_cmaui_port_vlan_requirements: + port_cmaui_1c1_main_mgmt_port_0_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_cmaui_port_fixed_ips: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_cmaui_port_exCP_naming: - type: org.openecomp.datatypes.Naming + type: org.openecomp.datatypes.network.IpRequirements + port_cmaui_1c1_main_mgmt_port_0_network_role_tag: + type: string required: true - port_cmaui_port_network: - type: list + port_cmaui_1c1_main_mgmt_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: string - port_cmaui_port_related_networks: + port_cmaui_1c1_main_mgmt_port_0_related_networks: type: list required: true entry_schema: @@ -41,108 +34,118 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_cmaui_port_network_role_tag: - type: string - required: true - port_cmaui_port_order: - type: integer + port_cmaui_1c1_main_mgmt_port_0_fixed_ips: + type: list required: true + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps vm_flavor_name: type: string required: true - port_cmaui_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_cmaui_port_replacement_policy: + port_cmaui_1c1_main_mgmt_port_0_network: type: list required: true entry_schema: type: string - port_cmaui_port_network_role: - type: string + port_cmaui_1c1_main_mgmt_port_0_order: + type: integer required: true + port_cmaui_1c1_main_mgmt_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_cmaui_1c1_main_mgmt_port_0_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements vm_image_name: type: string required: true - port_cmaui_port_ip_requirements: + port_cmaui_1c1_main_mgmt_port_0_replacement_policy: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: string compute_cmaui_1c1_main_availability_zone: type: list required: true entry_schema: type: string + port_cmaui_1c1_main_mgmt_port_0_network_role: + type: string + required: true compute_cmaui_1c1_main_name: type: list required: true entry_schema: type: string - port_cmaui_port_subnetpoolid: + port_cmaui_1c1_main_mgmt_port_0_subnetpoolid: type: string required: true node_templates: - cmaui_1c1_main_cmaui_port: + cmaui_1c1_main: + type: org.openecomp.resource.vfc.compute.nodes.heat.cmaui_1c1_main + properties: + availability_zone: + get_input: + - compute_cmaui_1c1_main_availability_zone + - index_value + flavor: + get_input: vm_flavor_name + image: + get_input: vm_image_name + name: + get_input: + - compute_cmaui_1c1_main_name + - index_value + cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_cmaui_port_replacement_policy + - port_cmaui_1c1_main_mgmt_port_0_replacement_policy - index_value mac_requirements: - get_input: port_cmaui_port_mac_requirements + get_input: port_cmaui_1c1_main_mgmt_port_0_mac_requirements order: - get_input: port_cmaui_port_order + get_input: port_cmaui_1c1_main_mgmt_port_0_order exCP_naming: - get_input: port_cmaui_port_exCP_naming + get_input: port_cmaui_1c1_main_mgmt_port_0_exCP_naming vlan_requirements: - get_input: port_cmaui_port_vlan_requirements + get_input: port_cmaui_1c1_main_mgmt_port_0_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_cmaui_port_ip_requirements + get_input: port_cmaui_1c1_main_mgmt_port_0_ip_requirements related_networks: - get_input: port_cmaui_port_related_networks + get_input: port_cmaui_1c1_main_mgmt_port_0_related_networks network_role_tag: - get_input: port_cmaui_port_network_role_tag + get_input: port_cmaui_1c1_main_mgmt_port_0_network_role_tag network_role: - get_input: port_cmaui_port_network_role + get_input: port_cmaui_1c1_main_mgmt_port_0_network_role fixed_ips: get_input: - - port_cmaui_port_fixed_ips + - port_cmaui_1c1_main_mgmt_port_0_fixed_ips - index_value subnetpoolid: - get_input: port_cmaui_port_subnetpoolid + get_input: port_cmaui_1c1_main_mgmt_port_0_subnetpoolid network: get_input: - - port_cmaui_port_network + - port_cmaui_1c1_main_mgmt_port_0_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: cmaui_1c1_main relationship: tosca.relationships.network.BindsTo - cmaui_1c1_main: - type: org.openecomp.resource.vfc.compute.nodes.heat.cmaui_1c1_main - properties: - availability_zone: - get_input: - - compute_cmaui_1c1_main_availability_zone - - index_value - flavor: - get_input: vm_flavor_name - image: - get_input: vm_image_name - name: - get_input: - - compute_cmaui_1c1_main_name - - index_value substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.cmaui_1c1_main capabilities: disk.device.iops_cmaui_1c1_main: - cmaui_1c1_main - disk.device.iops + network.incoming.bytes.rate_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0: + - cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0 + - network.incoming.bytes.rate disk.device.write.bytes.rate_cmaui_1c1_main: - cmaui_1c1_main - disk.device.write.bytes.rate @@ -158,9 +161,6 @@ topology_template: disk.latency_cmaui_1c1_main: - cmaui_1c1_main - disk.latency - network.incoming.bytes.rate_cmaui_1c1_main_cmaui_port: - - cmaui_1c1_main_cmaui_port - - network.incoming.bytes.rate disk.read.requests_cmaui_1c1_main: - cmaui_1c1_main - disk.read.requests @@ -182,9 +182,9 @@ topology_template: disk.device.read.requests_cmaui_1c1_main: - cmaui_1c1_main - disk.device.read.requests - attachment_cmaui_1c1_main_cmaui_port: - - cmaui_1c1_main_cmaui_port - - attachment + forwarder_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0: + - cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0 + - forwarder instance_cmaui_1c1_main: - cmaui_1c1_main - instance @@ -194,15 +194,21 @@ topology_template: disk.device.write.bytes_cmaui_1c1_main: - cmaui_1c1_main - disk.device.write.bytes - forwarder_cmaui_1c1_main_cmaui_port: - - cmaui_1c1_main_cmaui_port - - forwarder + network.outpoing.packets_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0: + - cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0 + - network.outpoing.packets + network.incoming.packets.rate_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0: + - cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0 + - network.incoming.packets.rate vcpus_cmaui_1c1_main: - cmaui_1c1_main - vcpus disk.read.bytes.rate_cmaui_1c1_main: - cmaui_1c1_main - disk.read.bytes.rate + feature_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0: + - cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0 + - feature disk.device.capacity_cmaui_1c1_main: - cmaui_1c1_main - disk.device.capacity @@ -212,21 +218,18 @@ topology_template: disk.usage_cmaui_1c1_main: - cmaui_1c1_main - disk.usage - network.incoming.bytes_cmaui_1c1_main_cmaui_port: - - cmaui_1c1_main_cmaui_port - - network.incoming.bytes disk.device.read.bytes_cmaui_1c1_main: - cmaui_1c1_main - disk.device.read.bytes - network.outgoing.bytes.rate_cmaui_1c1_main_cmaui_port: - - cmaui_1c1_main_cmaui_port - - network.outgoing.bytes.rate memory.usage_cmaui_1c1_main: - cmaui_1c1_main - memory.usage - network.outpoing.packets_cmaui_1c1_main_cmaui_port: - - cmaui_1c1_main_cmaui_port - - network.outpoing.packets + network.outgoing.bytes.rate_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0: + - cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0 + - network.outgoing.bytes.rate + network.incoming.packets_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0: + - cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0 + - network.incoming.packets memory.resident_cmaui_1c1_main: - cmaui_1c1_main - memory.resident @@ -239,33 +242,27 @@ topology_template: disk.ephemeral.size_cmaui_1c1_main: - cmaui_1c1_main - disk.ephemeral.size - network.incoming.packets_cmaui_1c1_main_cmaui_port: - - cmaui_1c1_main_cmaui_port - - network.incoming.packets + network.outgoing.bytes_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0: + - cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0 + - network.outgoing.bytes disk.write.requests.rate_cmaui_1c1_main: - cmaui_1c1_main - disk.write.requests.rate - feature_cmaui_1c1_main_cmaui_port: - - cmaui_1c1_main_cmaui_port - - feature - network.outgoing.packets.rate_cmaui_1c1_main_cmaui_port: - - cmaui_1c1_main_cmaui_port - - network.outgoing.packets.rate + network.incoming.bytes_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0: + - cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0 + - network.incoming.bytes disk.root.size_cmaui_1c1_main: - cmaui_1c1_main - disk.root.size host_cmaui_1c1_main: - cmaui_1c1_main - host - network.incoming.packets.rate_cmaui_1c1_main_cmaui_port: - - cmaui_1c1_main_cmaui_port - - network.incoming.packets.rate disk.write.bytes.rate_cmaui_1c1_main: - cmaui_1c1_main - disk.write.bytes.rate - network.outgoing.bytes_cmaui_1c1_main_cmaui_port: - - cmaui_1c1_main_cmaui_port - - network.outgoing.bytes + binding_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0: + - cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0 + - binding memory_cmaui_1c1_main: - cmaui_1c1_main - memory @@ -275,15 +272,18 @@ topology_template: cpu_cmaui_1c1_main: - cmaui_1c1_main - cpu + attachment_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0: + - cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0 + - attachment disk.device.allocation_cmaui_1c1_main: - cmaui_1c1_main - disk.device.allocation - binding_cmaui_1c1_main_cmaui_port: - - cmaui_1c1_main_cmaui_port - - binding disk.device.usage_cmaui_1c1_main: - cmaui_1c1_main - disk.device.usage + network.outgoing.packets.rate_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0: + - cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0 + - network.outgoing.packets.rate os_cmaui_1c1_main: - cmaui_1c1_main - os @@ -300,15 +300,15 @@ topology_template: - cmaui_1c1_main - disk.allocation requirements: - dependency_cmaui_1c1_main_cmaui_port: - - cmaui_1c1_main_cmaui_port - - dependency - link_cmaui_1c1_main_cmaui_port: - - cmaui_1c1_main_cmaui_port + link_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0: + - cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0 - link local_storage_cmaui_1c1_main: - cmaui_1c1_main - local_storage + dependency_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0: + - cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0 + - dependency dependency_cmaui_1c1_main: - cmaui_1c1_main - - dependency \ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_cmaui_1c1_main_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_cmaui_1c1_main_1ServiceTemplate.yaml index c68dba003a..c4dca48e61 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_cmaui_1c1_main_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_cmaui_1c1_main_1ServiceTemplate.yaml @@ -11,25 +11,18 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_cmaui_port_vlan_requirements: + port_cmaui_1c1_main_mgmt_port_0_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_cmaui_port_fixed_ips: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_cmaui_port_exCP_naming: - type: org.openecomp.datatypes.Naming + type: org.openecomp.datatypes.network.IpRequirements + port_cmaui_1c1_main_mgmt_port_0_network_role_tag: + type: string required: true - port_cmaui_port_network: - type: list + port_cmaui_1c1_main_mgmt_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: string - port_cmaui_port_related_networks: + port_cmaui_1c1_main_mgmt_port_0_related_networks: type: list required: true entry_schema: @@ -41,108 +34,118 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_cmaui_port_network_role_tag: - type: string - required: true - port_cmaui_port_order: - type: integer + port_cmaui_1c1_main_mgmt_port_0_fixed_ips: + type: list required: true + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps vm_flavor_name: type: string required: true - port_cmaui_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_cmaui_port_replacement_policy: + port_cmaui_1c1_main_mgmt_port_0_network: type: list required: true entry_schema: type: string - port_cmaui_port_network_role: - type: string + port_cmaui_1c1_main_mgmt_port_0_order: + type: integer required: true + port_cmaui_1c1_main_mgmt_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_cmaui_1c1_main_mgmt_port_0_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements vm_image_name: type: string required: true - port_cmaui_port_ip_requirements: + port_cmaui_1c1_main_mgmt_port_0_replacement_policy: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: string compute_cmaui_1c1_main_availability_zone: type: list required: true entry_schema: type: string + port_cmaui_1c1_main_mgmt_port_0_network_role: + type: string + required: true compute_cmaui_1c1_main_name: type: list required: true entry_schema: type: string - port_cmaui_port_subnetpoolid: + port_cmaui_1c1_main_mgmt_port_0_subnetpoolid: type: string required: true node_templates: - cmaui_1c1_main_cmaui_port: + cmaui_1c1_main: + type: org.openecomp.resource.vfc.compute.nodes.heat.cmaui_1c1_main + properties: + availability_zone: + get_input: + - compute_cmaui_1c1_main_availability_zone + - index_value + flavor: + get_input: vm_flavor_name + image: + get_input: vm_image_name + name: + get_input: + - compute_cmaui_1c1_main_name + - index_value + cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_cmaui_port_replacement_policy + - port_cmaui_1c1_main_mgmt_port_0_replacement_policy - index_value mac_requirements: - get_input: port_cmaui_port_mac_requirements + get_input: port_cmaui_1c1_main_mgmt_port_0_mac_requirements order: - get_input: port_cmaui_port_order + get_input: port_cmaui_1c1_main_mgmt_port_0_order exCP_naming: - get_input: port_cmaui_port_exCP_naming + get_input: port_cmaui_1c1_main_mgmt_port_0_exCP_naming vlan_requirements: - get_input: port_cmaui_port_vlan_requirements + get_input: port_cmaui_1c1_main_mgmt_port_0_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_cmaui_port_ip_requirements + get_input: port_cmaui_1c1_main_mgmt_port_0_ip_requirements related_networks: - get_input: port_cmaui_port_related_networks + get_input: port_cmaui_1c1_main_mgmt_port_0_related_networks network_role_tag: - get_input: port_cmaui_port_network_role_tag + get_input: port_cmaui_1c1_main_mgmt_port_0_network_role_tag network_role: - get_input: port_cmaui_port_network_role + get_input: port_cmaui_1c1_main_mgmt_port_0_network_role fixed_ips: get_input: - - port_cmaui_port_fixed_ips + - port_cmaui_1c1_main_mgmt_port_0_fixed_ips - index_value subnetpoolid: - get_input: port_cmaui_port_subnetpoolid + get_input: port_cmaui_1c1_main_mgmt_port_0_subnetpoolid network: get_input: - - port_cmaui_port_network + - port_cmaui_1c1_main_mgmt_port_0_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: cmaui_1c1_main relationship: tosca.relationships.network.BindsTo - cmaui_1c1_main: - type: org.openecomp.resource.vfc.compute.nodes.heat.cmaui_1c1_main - properties: - availability_zone: - get_input: - - compute_cmaui_1c1_main_availability_zone - - index_value - flavor: - get_input: vm_flavor_name - image: - get_input: vm_image_name - name: - get_input: - - compute_cmaui_1c1_main_name - - index_value substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.cmaui_1c1_main_1 capabilities: disk.device.iops_cmaui_1c1_main: - cmaui_1c1_main - disk.device.iops + network.incoming.bytes.rate_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0: + - cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0 + - network.incoming.bytes.rate disk.device.write.bytes.rate_cmaui_1c1_main: - cmaui_1c1_main - disk.device.write.bytes.rate @@ -158,9 +161,6 @@ topology_template: disk.latency_cmaui_1c1_main: - cmaui_1c1_main - disk.latency - network.incoming.bytes.rate_cmaui_1c1_main_cmaui_port: - - cmaui_1c1_main_cmaui_port - - network.incoming.bytes.rate disk.read.requests_cmaui_1c1_main: - cmaui_1c1_main - disk.read.requests @@ -182,9 +182,9 @@ topology_template: disk.device.read.requests_cmaui_1c1_main: - cmaui_1c1_main - disk.device.read.requests - attachment_cmaui_1c1_main_cmaui_port: - - cmaui_1c1_main_cmaui_port - - attachment + forwarder_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0: + - cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0 + - forwarder instance_cmaui_1c1_main: - cmaui_1c1_main - instance @@ -194,15 +194,21 @@ topology_template: disk.device.write.bytes_cmaui_1c1_main: - cmaui_1c1_main - disk.device.write.bytes - forwarder_cmaui_1c1_main_cmaui_port: - - cmaui_1c1_main_cmaui_port - - forwarder + network.outpoing.packets_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0: + - cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0 + - network.outpoing.packets + network.incoming.packets.rate_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0: + - cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0 + - network.incoming.packets.rate vcpus_cmaui_1c1_main: - cmaui_1c1_main - vcpus disk.read.bytes.rate_cmaui_1c1_main: - cmaui_1c1_main - disk.read.bytes.rate + feature_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0: + - cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0 + - feature disk.device.capacity_cmaui_1c1_main: - cmaui_1c1_main - disk.device.capacity @@ -212,21 +218,18 @@ topology_template: disk.usage_cmaui_1c1_main: - cmaui_1c1_main - disk.usage - network.incoming.bytes_cmaui_1c1_main_cmaui_port: - - cmaui_1c1_main_cmaui_port - - network.incoming.bytes disk.device.read.bytes_cmaui_1c1_main: - cmaui_1c1_main - disk.device.read.bytes - network.outgoing.bytes.rate_cmaui_1c1_main_cmaui_port: - - cmaui_1c1_main_cmaui_port - - network.outgoing.bytes.rate memory.usage_cmaui_1c1_main: - cmaui_1c1_main - memory.usage - network.outpoing.packets_cmaui_1c1_main_cmaui_port: - - cmaui_1c1_main_cmaui_port - - network.outpoing.packets + network.outgoing.bytes.rate_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0: + - cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0 + - network.outgoing.bytes.rate + network.incoming.packets_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0: + - cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0 + - network.incoming.packets memory.resident_cmaui_1c1_main: - cmaui_1c1_main - memory.resident @@ -239,33 +242,27 @@ topology_template: disk.ephemeral.size_cmaui_1c1_main: - cmaui_1c1_main - disk.ephemeral.size - network.incoming.packets_cmaui_1c1_main_cmaui_port: - - cmaui_1c1_main_cmaui_port - - network.incoming.packets + network.outgoing.bytes_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0: + - cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0 + - network.outgoing.bytes disk.write.requests.rate_cmaui_1c1_main: - cmaui_1c1_main - disk.write.requests.rate - feature_cmaui_1c1_main_cmaui_port: - - cmaui_1c1_main_cmaui_port - - feature - network.outgoing.packets.rate_cmaui_1c1_main_cmaui_port: - - cmaui_1c1_main_cmaui_port - - network.outgoing.packets.rate + network.incoming.bytes_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0: + - cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0 + - network.incoming.bytes disk.root.size_cmaui_1c1_main: - cmaui_1c1_main - disk.root.size host_cmaui_1c1_main: - cmaui_1c1_main - host - network.incoming.packets.rate_cmaui_1c1_main_cmaui_port: - - cmaui_1c1_main_cmaui_port - - network.incoming.packets.rate disk.write.bytes.rate_cmaui_1c1_main: - cmaui_1c1_main - disk.write.bytes.rate - network.outgoing.bytes_cmaui_1c1_main_cmaui_port: - - cmaui_1c1_main_cmaui_port - - network.outgoing.bytes + binding_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0: + - cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0 + - binding memory_cmaui_1c1_main: - cmaui_1c1_main - memory @@ -275,15 +272,18 @@ topology_template: cpu_cmaui_1c1_main: - cmaui_1c1_main - cpu + attachment_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0: + - cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0 + - attachment disk.device.allocation_cmaui_1c1_main: - cmaui_1c1_main - disk.device.allocation - binding_cmaui_1c1_main_cmaui_port: - - cmaui_1c1_main_cmaui_port - - binding disk.device.usage_cmaui_1c1_main: - cmaui_1c1_main - disk.device.usage + network.outgoing.packets.rate_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0: + - cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0 + - network.outgoing.packets.rate os_cmaui_1c1_main: - cmaui_1c1_main - os @@ -300,15 +300,15 @@ topology_template: - cmaui_1c1_main - disk.allocation requirements: - dependency_cmaui_1c1_main_cmaui_port: - - cmaui_1c1_main_cmaui_port - - dependency - link_cmaui_1c1_main_cmaui_port: - - cmaui_1c1_main_cmaui_port + link_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0: + - cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0 - link local_storage_cmaui_1c1_main: - cmaui_1c1_main - local_storage + dependency_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0: + - cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0 + - dependency dependency_cmaui_1c1_main: - cmaui_1c1_main - - dependency \ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_cmaui_1c1_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/Nested_cmaui_1c1_nested2ServiceTemplate.yaml index 5541d71406..adecbf0f02 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_cmaui_1c1_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/Nested_cmaui_1c1_nested2ServiceTemplate.yaml @@ -11,29 +11,14 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_cmaui_port_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_cmaui_port_fixed_ips: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_cmaui_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_cmaui_1c1_nested2_mgmt_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_cmaui_port_network: + port_cmaui_1c1_nested2_mgmt_port_0_vlan_requirements: type: list required: true entry_schema: - type: string - port_cmaui_port_related_networks: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments + type: org.openecomp.datatypes.network.VlanRequirements index_value: type: integer description: Index value of this substitution service template runtime instance @@ -41,108 +26,123 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_cmaui_port_network_role_tag: - type: string + port_cmaui_1c1_nested2_mgmt_port_0_replacement_policy: + type: list required: true - port_cmaui_port_order: - type: integer + entry_schema: + type: string + port_cmaui_1c1_nested2_mgmt_port_0_subnetpoolid: + type: string required: true vm_flavor_name: type: string required: true - port_cmaui_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_cmaui_1c1_nested2_mgmt_port_0_network_role_tag: + type: string required: true - port_cmaui_port_replacement_policy: + port_cmaui_1c1_nested2_mgmt_port_0_network_role: + type: string + required: true + port_cmaui_1c1_nested2_mgmt_port_0_fixed_ips: type: list required: true entry_schema: - type: string - port_cmaui_port_network_role: - type: string - required: true + type: org.openecomp.datatypes.heat.neutron.port.FixedIps vm_image_name: type: string required: true - port_cmaui_port_ip_requirements: + port_cmaui_1c1_nested2_mgmt_port_0_network: + type: list + required: true + entry_schema: + type: string + port_cmaui_1c1_nested2_mgmt_port_0_ip_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements + port_cmaui_1c1_nested2_mgmt_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true compute_cmaui_1c1_nested2_name: type: list required: true entry_schema: type: string - port_cmaui_port_subnetpoolid: - type: string + port_cmaui_1c1_nested2_mgmt_port_0_related_networks: + type: list required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments compute_cmaui_1c1_nested2_availability_zone: type: list required: true entry_schema: type: string + port_cmaui_1c1_nested2_mgmt_port_0_order: + type: integer + required: true node_templates: - cmaui_1c1_nested2_cmaui_port: + cmaui_1c1_nested2: + type: org.openecomp.resource.vfc.compute.nodes.heat.cmaui_1c1_nested2 + properties: + availability_zone: + get_input: + - compute_cmaui_1c1_nested2_availability_zone + - index_value + flavor: + get_input: vm_flavor_name + image: + get_input: vm_image_name + name: + get_input: + - compute_cmaui_1c1_nested2_name + - index_value + cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_cmaui_port_replacement_policy + - port_cmaui_1c1_nested2_mgmt_port_0_replacement_policy - index_value mac_requirements: - get_input: port_cmaui_port_mac_requirements + get_input: port_cmaui_1c1_nested2_mgmt_port_0_mac_requirements order: - get_input: port_cmaui_port_order + get_input: port_cmaui_1c1_nested2_mgmt_port_0_order exCP_naming: - get_input: port_cmaui_port_exCP_naming + get_input: port_cmaui_1c1_nested2_mgmt_port_0_exCP_naming vlan_requirements: - get_input: port_cmaui_port_vlan_requirements + get_input: port_cmaui_1c1_nested2_mgmt_port_0_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_cmaui_port_ip_requirements + get_input: port_cmaui_1c1_nested2_mgmt_port_0_ip_requirements related_networks: - get_input: port_cmaui_port_related_networks + get_input: port_cmaui_1c1_nested2_mgmt_port_0_related_networks network_role_tag: - get_input: port_cmaui_port_network_role_tag + get_input: port_cmaui_1c1_nested2_mgmt_port_0_network_role_tag network_role: - get_input: port_cmaui_port_network_role + get_input: port_cmaui_1c1_nested2_mgmt_port_0_network_role fixed_ips: get_input: - - port_cmaui_port_fixed_ips + - port_cmaui_1c1_nested2_mgmt_port_0_fixed_ips - index_value subnetpoolid: - get_input: port_cmaui_port_subnetpoolid + get_input: port_cmaui_1c1_nested2_mgmt_port_0_subnetpoolid network: get_input: - - port_cmaui_port_network + - port_cmaui_1c1_nested2_mgmt_port_0_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: cmaui_1c1_nested2 relationship: tosca.relationships.network.BindsTo - cmaui_1c1_nested2: - type: org.openecomp.resource.vfc.compute.nodes.heat.cmaui_1c1_nested2 - properties: - availability_zone: - get_input: - - compute_cmaui_1c1_nested2_availability_zone - - index_value - flavor: - get_input: vm_flavor_name - image: - get_input: vm_image_name - name: - get_input: - - compute_cmaui_1c1_nested2_name - - index_value substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.cmaui_1c1_nested2 capabilities: - feature_cmaui_1c1_nested2_cmaui_port: - - cmaui_1c1_nested2_cmaui_port - - feature + binding_cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0: + - cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0 + - binding disk.device.write.bytes.rate_cmaui_1c1_nested2: - cmaui_1c1_nested2 - disk.device.write.bytes.rate @@ -155,12 +155,12 @@ topology_template: disk.capacity_cmaui_1c1_nested2: - cmaui_1c1_nested2 - disk.capacity + attachment_cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0: + - cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0 + - attachment disk.device.capacity_cmaui_1c1_nested2: - cmaui_1c1_nested2 - disk.device.capacity - network.outgoing.packets.rate_cmaui_1c1_nested2_cmaui_port: - - cmaui_1c1_nested2_cmaui_port - - network.outgoing.packets.rate vcpus_cmaui_1c1_nested2: - cmaui_1c1_nested2 - vcpus @@ -176,21 +176,15 @@ topology_template: disk.read.bytes_cmaui_1c1_nested2: - cmaui_1c1_nested2 - disk.read.bytes - network.outpoing.packets_cmaui_1c1_nested2_cmaui_port: - - cmaui_1c1_nested2_cmaui_port - - network.outpoing.packets + network.incoming.packets_cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0: + - cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0 + - network.incoming.packets scalable_cmaui_1c1_nested2: - cmaui_1c1_nested2 - scalable - network.outgoing.bytes_cmaui_1c1_nested2_cmaui_port: - - cmaui_1c1_nested2_cmaui_port - - network.outgoing.bytes instance_cmaui_1c1_nested2: - cmaui_1c1_nested2 - instance - network.incoming.bytes_cmaui_1c1_nested2_cmaui_port: - - cmaui_1c1_nested2_cmaui_port - - network.incoming.bytes endpoint_cmaui_1c1_nested2: - cmaui_1c1_nested2 - endpoint @@ -212,30 +206,30 @@ topology_template: disk.device.write.bytes_cmaui_1c1_nested2: - cmaui_1c1_nested2 - disk.device.write.bytes - network.incoming.packets.rate_cmaui_1c1_nested2_cmaui_port: - - cmaui_1c1_nested2_cmaui_port - - network.incoming.packets.rate + network.incoming.bytes_cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0: + - cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0 + - network.incoming.bytes host_cmaui_1c1_nested2: - cmaui_1c1_nested2 - host + network.outgoing.packets.rate_cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0: + - cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0 + - network.outgoing.packets.rate disk.device.latency_cmaui_1c1_nested2: - cmaui_1c1_nested2 - disk.device.latency - network.incoming.bytes.rate_cmaui_1c1_nested2_cmaui_port: - - cmaui_1c1_nested2_cmaui_port - - network.incoming.bytes.rate disk.write.bytes.rate_cmaui_1c1_nested2: - cmaui_1c1_nested2 - disk.write.bytes.rate + network.incoming.bytes.rate_cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0: + - cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0 + - network.incoming.bytes.rate binding_cmaui_1c1_nested2: - cmaui_1c1_nested2 - binding memory_cmaui_1c1_nested2: - cmaui_1c1_nested2 - memory - forwarder_cmaui_1c1_nested2_cmaui_port: - - cmaui_1c1_nested2_cmaui_port - - forwarder disk.allocation_cmaui_1c1_nested2: - cmaui_1c1_nested2 - disk.allocation @@ -248,15 +242,15 @@ topology_template: disk.read.requests_cmaui_1c1_nested2: - cmaui_1c1_nested2 - disk.read.requests - network.outgoing.bytes.rate_cmaui_1c1_nested2_cmaui_port: - - cmaui_1c1_nested2_cmaui_port - - network.outgoing.bytes.rate + network.outgoing.bytes_cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0: + - cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0 + - network.outgoing.bytes os_cmaui_1c1_nested2: - cmaui_1c1_nested2 - os - network.incoming.packets_cmaui_1c1_nested2_cmaui_port: - - cmaui_1c1_nested2_cmaui_port - - network.incoming.packets + forwarder_cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0: + - cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0 + - forwarder disk.write.requests.rate_cmaui_1c1_nested2: - cmaui_1c1_nested2 - disk.write.requests.rate @@ -272,43 +266,49 @@ topology_template: memory.resident_cmaui_1c1_nested2: - cmaui_1c1_nested2 - memory.resident + network.outgoing.bytes.rate_cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0: + - cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0 + - network.outgoing.bytes.rate cpu_cmaui_1c1_nested2: - cmaui_1c1_nested2 - cpu disk.read.bytes.rate_cmaui_1c1_nested2: - cmaui_1c1_nested2 - disk.read.bytes.rate + feature_cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0: + - cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0 + - feature disk.device.allocation_cmaui_1c1_nested2: - cmaui_1c1_nested2 - disk.device.allocation disk.latency_cmaui_1c1_nested2: - cmaui_1c1_nested2 - disk.latency - binding_cmaui_1c1_nested2_cmaui_port: - - cmaui_1c1_nested2_cmaui_port - - binding + network.incoming.packets.rate_cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0: + - cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0 + - network.incoming.packets.rate disk.iops_cmaui_1c1_nested2: - cmaui_1c1_nested2 - disk.iops - attachment_cmaui_1c1_nested2_cmaui_port: - - cmaui_1c1_nested2_cmaui_port - - attachment disk.write.requests_cmaui_1c1_nested2: - cmaui_1c1_nested2 - disk.write.requests cpu_util_cmaui_1c1_nested2: - cmaui_1c1_nested2 - cpu_util + network.outpoing.packets_cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0: + - cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0 + - network.outpoing.packets requirements: - link_cmaui_1c1_nested2_cmaui_port: - - cmaui_1c1_nested2_cmaui_port + link_cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0: + - cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0 - link + dependency_cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0: + - cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0 + - dependency dependency_cmaui_1c1_nested2: - cmaui_1c1_nested2 - dependency local_storage_cmaui_1c1_nested2: - cmaui_1c1_nested2 - local_storage - dependency_cmaui_1c1_nested2_cmaui_port: - - cmaui_1c1_nested2_cmaui_port - - 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/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_main_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_main_1bServiceTemplate.yaml index f8f07113b8..9156d22fb9 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_main_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_main_1bServiceTemplate.yaml @@ -11,6 +11,17 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pd_server_main_1b_port_1_order: + type: integer + required: true + port_pd_server_main_1b_port_1_network_role: + type: string + required: true + port_pd_server_main_1b_port_1_network: + type: list + required: true + entry_schema: + type: string index_value: type: integer description: Index value of this substitution service template runtime instance @@ -18,134 +29,132 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_pd_server_main_1b_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_main_1b_port_1_network_role_tag: + type: string required: true - compute_pd_server_main_1b_availability_zone: + port_pd_server_main_1b_port_1_related_networks: type: list required: true entry_schema: - type: string - port_pd_server_main_1b_port_replacement_policy: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + compute_pd_server_main_1b_availability_zone: type: list required: true entry_schema: type: string - port_pd_server_main_1b_port_subnetpoolid: - type: string - required: true - port_pd_server_main_1b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pd_server_main_1b_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming required: true vm_flavor_name: type: string required: true - port_pd_server_main_1b_port_related_networks: + port_pd_server_main_1b_port_1_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - vm_image_name: - type: string - required: true - port_pd_server_main_1b_port_network_role: - type: string - required: true - compute_pd_server_main_1b_name: + type: org.openecomp.datatypes.network.IpRequirements + port_pd_server_main_1b_port_1_fixed_ips: type: list required: true entry_schema: - type: string - port_pd_server_main_1b_port_network: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_pd_server_main_1b_port_1_vlan_requirements: type: list required: true entry_schema: - type: string - port_pd_server_main_1b_port_ip_requirements: + type: org.openecomp.datatypes.network.VlanRequirements + vm_image_name: + type: string + required: true + compute_pd_server_main_1b_name: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd_server_main_1b_port_network_role_tag: + type: string + port_pd_server_main_1b_port_1_subnetpoolid: type: string required: true - port_pd_server_main_1b_port_vlan_requirements: - type: list + port_pd_server_main_1b_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd_server_main_1b_port_fixed_ips: + port_pd_server_main_1b_port_1_replacement_policy: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_pd_server_main_1b_port_order: - type: integer - required: true + type: string node_templates: - pd_server_main_1b: - type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server_main_1b - properties: - availability_zone: - get_input: - - compute_pd_server_main_1b_availability_zone - - index_value - flavor: - get_input: vm_flavor_name - image: - get_input: vm_image_name - name: - get_input: - - compute_pd_server_main_1b_name - - index_value - pd_server_main_1b_pd_server_main_1b_port: + pd_server_main_1b_pd_server_main_1b_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_pd_server_main_1b_port_replacement_policy + - port_pd_server_main_1b_port_1_replacement_policy - index_value mac_requirements: - get_input: port_pd_server_main_1b_port_mac_requirements + get_input: port_pd_server_main_1b_port_1_mac_requirements order: - get_input: port_pd_server_main_1b_port_order + get_input: port_pd_server_main_1b_port_1_order exCP_naming: - get_input: port_pd_server_main_1b_port_exCP_naming + get_input: port_pd_server_main_1b_port_1_exCP_naming vlan_requirements: - get_input: port_pd_server_main_1b_port_vlan_requirements + get_input: port_pd_server_main_1b_port_1_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_pd_server_main_1b_port_ip_requirements + get_input: port_pd_server_main_1b_port_1_ip_requirements related_networks: - get_input: port_pd_server_main_1b_port_related_networks + get_input: port_pd_server_main_1b_port_1_related_networks network_role_tag: - get_input: port_pd_server_main_1b_port_network_role_tag + get_input: port_pd_server_main_1b_port_1_network_role_tag network_role: - get_input: port_pd_server_main_1b_port_network_role + get_input: port_pd_server_main_1b_port_1_network_role fixed_ips: get_input: - - port_pd_server_main_1b_port_fixed_ips + - port_pd_server_main_1b_port_1_fixed_ips - index_value subnetpoolid: - get_input: port_pd_server_main_1b_port_subnetpoolid + get_input: port_pd_server_main_1b_port_1_subnetpoolid network: get_input: - - port_pd_server_main_1b_port_network + - port_pd_server_main_1b_port_1_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: pd_server_main_1b relationship: tosca.relationships.network.BindsTo + pd_server_main_1b: + type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server_main_1b + properties: + availability_zone: + get_input: + - compute_pd_server_main_1b_availability_zone + - index_value + flavor: + get_input: vm_flavor_name + image: + get_input: vm_image_name + name: + get_input: + - compute_pd_server_main_1b_name + - index_value substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server_main_1b capabilities: + forwarder_pd_server_main_1b_pd_server_main_1b_port_1: + - pd_server_main_1b_pd_server_main_1b_port_1 + - forwarder + network.incoming.packets_pd_server_main_1b_pd_server_main_1b_port_1: + - pd_server_main_1b_pd_server_main_1b_port_1 + - network.incoming.packets disk.write.bytes_pd_server_main_1b: - pd_server_main_1b - disk.write.bytes disk.device.capacity_pd_server_main_1b: - pd_server_main_1b - disk.device.capacity + network.incoming.bytes.rate_pd_server_main_1b_pd_server_main_1b_port_1: + - pd_server_main_1b_pd_server_main_1b_port_1 + - network.incoming.bytes.rate disk.device.write.requests_pd_server_main_1b: - pd_server_main_1b - disk.device.write.requests @@ -161,39 +170,45 @@ topology_template: disk.read.bytes_pd_server_main_1b: - pd_server_main_1b - disk.read.bytes + feature_pd_server_main_1b_pd_server_main_1b_port_1: + - pd_server_main_1b_pd_server_main_1b_port_1 + - feature + network.outgoing.bytes_pd_server_main_1b_pd_server_main_1b_port_1: + - pd_server_main_1b_pd_server_main_1b_port_1 + - network.outgoing.bytes scalable_pd_server_main_1b: - pd_server_main_1b - scalable endpoint_pd_server_main_1b: - pd_server_main_1b - endpoint - network.incoming.packets.rate_pd_server_main_1b_pd_server_main_1b_port: - - pd_server_main_1b_pd_server_main_1b_port - - network.incoming.packets.rate + binding_pd_server_main_1b_pd_server_main_1b_port_1: + - pd_server_main_1b_pd_server_main_1b_port_1 + - binding instance_pd_server_main_1b: - pd_server_main_1b - instance - binding_pd_server_main_1b_pd_server_main_1b_port: - - pd_server_main_1b_pd_server_main_1b_port - - binding + network.incoming.packets.rate_pd_server_main_1b_pd_server_main_1b_port_1: + - pd_server_main_1b_pd_server_main_1b_port_1 + - network.incoming.packets.rate host_pd_server_main_1b: - pd_server_main_1b - host + network.outpoing.packets_pd_server_main_1b_pd_server_main_1b_port_1: + - pd_server_main_1b_pd_server_main_1b_port_1 + - network.outpoing.packets cpu.delta_pd_server_main_1b: - pd_server_main_1b - cpu.delta - network.incoming.packets_pd_server_main_1b_pd_server_main_1b_port: - - pd_server_main_1b_pd_server_main_1b_port - - network.incoming.packets + network.outgoing.packets.rate_pd_server_main_1b_pd_server_main_1b_port_1: + - pd_server_main_1b_pd_server_main_1b_port_1 + - network.outgoing.packets.rate disk.device.read.bytes_pd_server_main_1b: - pd_server_main_1b - disk.device.read.bytes disk.device.read.bytes.rate_pd_server_main_1b: - pd_server_main_1b - disk.device.read.bytes.rate - network.outgoing.packets.rate_pd_server_main_1b_pd_server_main_1b_port: - - pd_server_main_1b_pd_server_main_1b_port - - network.outgoing.packets.rate disk.device.iops_pd_server_main_1b: - pd_server_main_1b - disk.device.iops @@ -206,9 +221,9 @@ topology_template: disk.device.latency_pd_server_main_1b: - pd_server_main_1b - disk.device.latency - feature_pd_server_main_1b_pd_server_main_1b_port: - - pd_server_main_1b_pd_server_main_1b_port - - feature + network.incoming.bytes_pd_server_main_1b_pd_server_main_1b_port_1: + - pd_server_main_1b_pd_server_main_1b_port_1 + - network.incoming.bytes binding_pd_server_main_1b: - pd_server_main_1b - binding @@ -218,18 +233,12 @@ topology_template: disk.ephemeral.size_pd_server_main_1b: - pd_server_main_1b - disk.ephemeral.size - network.outgoing.bytes_pd_server_main_1b_pd_server_main_1b_port: - - pd_server_main_1b_pd_server_main_1b_port - - network.outgoing.bytes disk.read.requests_pd_server_main_1b: - pd_server_main_1b - disk.read.requests disk.allocation_pd_server_main_1b: - pd_server_main_1b - disk.allocation - network.incoming.bytes.rate_pd_server_main_1b_pd_server_main_1b_port: - - pd_server_main_1b_pd_server_main_1b_port - - network.incoming.bytes.rate disk.device.usage_pd_server_main_1b: - pd_server_main_1b - disk.device.usage @@ -254,27 +263,18 @@ topology_template: disk.latency_pd_server_main_1b: - pd_server_main_1b - disk.latency - network.outgoing.bytes.rate_pd_server_main_1b_pd_server_main_1b_port: - - pd_server_main_1b_pd_server_main_1b_port - - network.outgoing.bytes.rate disk.read.bytes.rate_pd_server_main_1b: - pd_server_main_1b - disk.read.bytes.rate disk.device.read.requests_pd_server_main_1b: - pd_server_main_1b - disk.device.read.requests - network.incoming.bytes_pd_server_main_1b_pd_server_main_1b_port: - - pd_server_main_1b_pd_server_main_1b_port - - network.incoming.bytes disk.device.allocation_pd_server_main_1b: - pd_server_main_1b - disk.device.allocation - forwarder_pd_server_main_1b_pd_server_main_1b_port: - - pd_server_main_1b_pd_server_main_1b_port - - forwarder - attachment_pd_server_main_1b_pd_server_main_1b_port: - - pd_server_main_1b_pd_server_main_1b_port - - attachment + network.outgoing.bytes.rate_pd_server_main_1b_pd_server_main_1b_port_1: + - pd_server_main_1b_pd_server_main_1b_port_1 + - network.outgoing.bytes.rate disk.iops_pd_server_main_1b: - pd_server_main_1b - disk.iops @@ -284,9 +284,9 @@ topology_template: disk.write.requests_pd_server_main_1b: - pd_server_main_1b - disk.write.requests - network.outpoing.packets_pd_server_main_1b_pd_server_main_1b_port: - - pd_server_main_1b_pd_server_main_1b_port - - network.outpoing.packets + attachment_pd_server_main_1b_pd_server_main_1b_port_1: + - pd_server_main_1b_pd_server_main_1b_port_1 + - attachment cpu_util_pd_server_main_1b: - pd_server_main_1b - cpu_util @@ -300,15 +300,15 @@ topology_template: - pd_server_main_1b - disk.device.read.requests.rate requirements: - link_pd_server_main_1b_pd_server_main_1b_port: - - pd_server_main_1b_pd_server_main_1b_port - - link + dependency_pd_server_main_1b_pd_server_main_1b_port_1: + - pd_server_main_1b_pd_server_main_1b_port_1 + - dependency dependency_pd_server_main_1b: - pd_server_main_1b - dependency + link_pd_server_main_1b_pd_server_main_1b_port_1: + - pd_server_main_1b_pd_server_main_1b_port_1 + - link local_storage_pd_server_main_1b: - pd_server_main_1b - local_storage - dependency_pd_server_main_1b_pd_server_main_1b_port: - - pd_server_main_1b_pd_server_main_1b_port - - 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/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_main_1b_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_main_1b_1ServiceTemplate.yaml index 2c92263120..2e4f43992c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_main_1b_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_main_1b_1ServiceTemplate.yaml @@ -311,4 +311,4 @@ topology_template: - local_storage dependency_pd_server_main_1b_pd_server_main_1b_port: - pd_server_main_1b_pd_server_main_1b_port - - dependency \ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_nested2_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_nested2_1bServiceTemplate.yaml index 5a29af80ad..7d557a9075 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_nested2_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_nested2_1bServiceTemplate.yaml @@ -311,4 +311,4 @@ topology_template: - dependency link_pd_server_nested2_1b_pd_server_nested2_1b_port: - pd_server_nested2_1b_pd_server_nested2_1b_port - - link \ No newline at end of file + - link 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/Nested_ps_server_main_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_main_1bServiceTemplate.yaml index 3f68b28f1f..0917b89370 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_main_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_main_1bServiceTemplate.yaml @@ -11,17 +11,15 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_ps_server_main_1b_port_fixed_ips: - type: list + port_ps_server_main_1b_port_1_order: + type: integer required: true - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_ps_server_main_1b_port_ip_requirements: + port_ps_server_main_1b_port_1_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_ps_server_main_1b_port_subnetpoolid: + type: org.openecomp.datatypes.network.VlanRequirements + port_ps_server_main_1b_port_1_network_role: type: string required: true compute_ps_server_main_1b_availability_zone: @@ -29,9 +27,6 @@ topology_template: required: true entry_schema: type: string - port_ps_server_main_1b_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -39,83 +34,88 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - vm_flavor_name: - type: string + port_ps_server_main_1b_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - port_ps_server_main_1b_port_network_role: + vm_flavor_name: type: string required: true - port_ps_server_main_1b_port_order: - type: integer - required: true - port_ps_server_main_1b_port_network_role_tag: - type: string + port_ps_server_main_1b_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_ps_server_main_1b_port_related_networks: + port_ps_server_main_1b_port_1_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments + type: org.openecomp.datatypes.network.IpRequirements vm_image_name: type: string required: true - port_ps_server_main_1b_port_vlan_requirements: + port_ps_server_main_1b_port_1_related_networks: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.RelatedNetworksAssignments compute_ps_server_main_1b_name: type: list required: true entry_schema: type: string - port_ps_server_main_1b_port_replacement_policy: + port_ps_server_main_1b_port_1_network: type: list required: true entry_schema: type: string - port_ps_server_main_1b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_ps_server_main_1b_port_1_network_role_tag: + type: string required: true - port_ps_server_main_1b_port_network: + port_ps_server_main_1b_port_1_replacement_policy: type: list required: true entry_schema: type: string + port_ps_server_main_1b_port_1_fixed_ips: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_ps_server_main_1b_port_1_subnetpoolid: + type: string + required: true node_templates: - ps_server_main_1b_ps_server_main_1b_port: + ps_server_main_1b_ps_server_main_1b_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_ps_server_main_1b_port_replacement_policy + - port_ps_server_main_1b_port_1_replacement_policy - index_value mac_requirements: - get_input: port_ps_server_main_1b_port_mac_requirements + get_input: port_ps_server_main_1b_port_1_mac_requirements order: - get_input: port_ps_server_main_1b_port_order + get_input: port_ps_server_main_1b_port_1_order exCP_naming: - get_input: port_ps_server_main_1b_port_exCP_naming + get_input: port_ps_server_main_1b_port_1_exCP_naming vlan_requirements: - get_input: port_ps_server_main_1b_port_vlan_requirements + get_input: port_ps_server_main_1b_port_1_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_ps_server_main_1b_port_ip_requirements + get_input: port_ps_server_main_1b_port_1_ip_requirements related_networks: - get_input: port_ps_server_main_1b_port_related_networks + get_input: port_ps_server_main_1b_port_1_related_networks network_role_tag: - get_input: port_ps_server_main_1b_port_network_role_tag + get_input: port_ps_server_main_1b_port_1_network_role_tag network_role: - get_input: port_ps_server_main_1b_port_network_role + get_input: port_ps_server_main_1b_port_1_network_role fixed_ips: get_input: - - port_ps_server_main_1b_port_fixed_ips + - port_ps_server_main_1b_port_1_fixed_ips - index_value subnetpoolid: - get_input: port_ps_server_main_1b_port_subnetpoolid + get_input: port_ps_server_main_1b_port_1_subnetpoolid network: get_input: - - port_ps_server_main_1b_port_network + - port_ps_server_main_1b_port_1_network - index_value requirements: - binding: @@ -140,9 +140,6 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.ps_server_main_1b capabilities: - network.incoming.bytes_ps_server_main_1b_ps_server_main_1b_port: - - ps_server_main_1b_ps_server_main_1b_port - - network.incoming.bytes disk.device.write.requests_ps_server_main_1b: - ps_server_main_1b - disk.device.write.requests @@ -152,30 +149,39 @@ topology_template: disk.capacity_ps_server_main_1b: - ps_server_main_1b - disk.capacity - attachment_ps_server_main_1b_ps_server_main_1b_port: - - ps_server_main_1b_ps_server_main_1b_port - - attachment + feature_ps_server_main_1b_ps_server_main_1b_port_1: + - ps_server_main_1b_ps_server_main_1b_port_1 + - feature + network.outgoing.packets.rate_ps_server_main_1b_ps_server_main_1b_port_1: + - ps_server_main_1b_ps_server_main_1b_port_1 + - network.outgoing.packets.rate + network.outpoing.packets_ps_server_main_1b_ps_server_main_1b_port_1: + - ps_server_main_1b_ps_server_main_1b_port_1 + - network.outpoing.packets disk.device.read.bytes_ps_server_main_1b: - ps_server_main_1b - disk.device.read.bytes + network.incoming.bytes.rate_ps_server_main_1b_ps_server_main_1b_port_1: + - ps_server_main_1b_ps_server_main_1b_port_1 + - network.incoming.bytes.rate + network.incoming.packets_ps_server_main_1b_ps_server_main_1b_port_1: + - ps_server_main_1b_ps_server_main_1b_port_1 + - network.incoming.packets vcpus_ps_server_main_1b: - ps_server_main_1b - vcpus - network.outgoing.packets.rate_ps_server_main_1b_ps_server_main_1b_port: - - ps_server_main_1b_ps_server_main_1b_port - - network.outgoing.packets.rate cpu_util_ps_server_main_1b: - ps_server_main_1b - cpu_util - binding_ps_server_main_1b_ps_server_main_1b_port: - - ps_server_main_1b_ps_server_main_1b_port - - binding disk.device.write.bytes.rate_ps_server_main_1b: - ps_server_main_1b - disk.device.write.bytes.rate disk.device.read.requests.rate_ps_server_main_1b: - ps_server_main_1b - disk.device.read.requests.rate + attachment_ps_server_main_1b_ps_server_main_1b_port_1: + - ps_server_main_1b_ps_server_main_1b_port_1 + - attachment disk.device.write.requests.rate_ps_server_main_1b: - ps_server_main_1b - disk.device.write.requests.rate @@ -185,45 +191,39 @@ topology_template: instance_ps_server_main_1b: - ps_server_main_1b - instance - network.outpoing.packets_ps_server_main_1b_ps_server_main_1b_port: - - ps_server_main_1b_ps_server_main_1b_port - - network.outpoing.packets disk.read.bytes.rate_ps_server_main_1b: - ps_server_main_1b - disk.read.bytes.rate disk.latency_ps_server_main_1b: - ps_server_main_1b - disk.latency - feature_ps_server_main_1b_ps_server_main_1b_port: - - ps_server_main_1b_ps_server_main_1b_port - - feature disk.device.read.requests_ps_server_main_1b: - ps_server_main_1b - disk.device.read.requests + forwarder_ps_server_main_1b_ps_server_main_1b_port_1: + - ps_server_main_1b_ps_server_main_1b_port_1 + - forwarder memory.usage_ps_server_main_1b: - ps_server_main_1b - memory.usage - forwarder_ps_server_main_1b_ps_server_main_1b_port: - - ps_server_main_1b_ps_server_main_1b_port - - forwarder disk.write.requests.rate_ps_server_main_1b: - ps_server_main_1b - disk.write.requests.rate + binding_ps_server_main_1b_ps_server_main_1b_port_1: + - ps_server_main_1b_ps_server_main_1b_port_1 + - binding scalable_ps_server_main_1b: - ps_server_main_1b - scalable - network.outgoing.bytes_ps_server_main_1b_ps_server_main_1b_port: - - ps_server_main_1b_ps_server_main_1b_port - - network.outgoing.bytes - network.incoming.packets.rate_ps_server_main_1b_ps_server_main_1b_port: - - ps_server_main_1b_ps_server_main_1b_port - - network.incoming.packets.rate disk.usage_ps_server_main_1b: - ps_server_main_1b - disk.usage disk.read.bytes_ps_server_main_1b: - ps_server_main_1b - disk.read.bytes + network.outgoing.bytes.rate_ps_server_main_1b_ps_server_main_1b_port_1: + - ps_server_main_1b_ps_server_main_1b_port_1 + - network.outgoing.bytes.rate disk.ephemeral.size_ps_server_main_1b: - ps_server_main_1b - disk.ephemeral.size @@ -245,24 +245,24 @@ topology_template: disk.write.bytes.rate_ps_server_main_1b: - ps_server_main_1b - disk.write.bytes.rate + network.incoming.bytes_ps_server_main_1b_ps_server_main_1b_port_1: + - ps_server_main_1b_ps_server_main_1b_port_1 + - network.incoming.bytes binding_ps_server_main_1b: - ps_server_main_1b - binding - network.incoming.packets_ps_server_main_1b_ps_server_main_1b_port: - - ps_server_main_1b_ps_server_main_1b_port - - network.incoming.packets disk.device.read.bytes.rate_ps_server_main_1b: - ps_server_main_1b - disk.device.read.bytes.rate - network.outgoing.bytes.rate_ps_server_main_1b_ps_server_main_1b_port: - - ps_server_main_1b_ps_server_main_1b_port - - network.outgoing.bytes.rate host_ps_server_main_1b: - ps_server_main_1b - host disk.device.iops_ps_server_main_1b: - ps_server_main_1b - disk.device.iops + network.outgoing.bytes_ps_server_main_1b_ps_server_main_1b_port_1: + - ps_server_main_1b_ps_server_main_1b_port_1 + - network.outgoing.bytes disk.write.requests_ps_server_main_1b: - ps_server_main_1b - disk.write.requests @@ -287,28 +287,28 @@ topology_template: disk.device.usage_ps_server_main_1b: - ps_server_main_1b - disk.device.usage + network.incoming.packets.rate_ps_server_main_1b_ps_server_main_1b_port_1: + - ps_server_main_1b_ps_server_main_1b_port_1 + - network.incoming.packets.rate memory_ps_server_main_1b: - ps_server_main_1b - memory disk.root.size_ps_server_main_1b: - ps_server_main_1b - disk.root.size - network.incoming.bytes.rate_ps_server_main_1b_ps_server_main_1b_port: - - ps_server_main_1b_ps_server_main_1b_port - - network.incoming.bytes.rate disk.allocation_ps_server_main_1b: - ps_server_main_1b - disk.allocation requirements: + link_ps_server_main_1b_ps_server_main_1b_port_1: + - ps_server_main_1b_ps_server_main_1b_port_1 + - link + dependency_ps_server_main_1b_ps_server_main_1b_port_1: + - ps_server_main_1b_ps_server_main_1b_port_1 + - dependency dependency_ps_server_main_1b: - ps_server_main_1b - dependency - link_ps_server_main_1b_ps_server_main_1b_port: - - ps_server_main_1b_ps_server_main_1b_port - - link - dependency_ps_server_main_1b_ps_server_main_1b_port: - - ps_server_main_1b_ps_server_main_1b_port - - dependency local_storage_ps_server_main_1b: - ps_server_main_1b - - local_storage \ No newline at end of file + - local_storage 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/Nested_ps_server_main_1b_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_main_1b_1ServiceTemplate.yaml index edb49ea4f2..05ce241d6e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_main_1b_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_main_1b_1ServiceTemplate.yaml @@ -311,4 +311,4 @@ topology_template: - dependency local_storage_ps_server_main_1b: - ps_server_main_1b - - local_storage \ No newline at end of file + - local_storage 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/Nested_ps_server_nested2_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_nested2_1bServiceTemplate.yaml index c788016757..9e50a2709e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_nested2_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_nested2_1bServiceTemplate.yaml @@ -311,4 +311,4 @@ topology_template: - dependency link_ps_server_nested2_1b_ps_server_nested2_1b_port: - ps_server_nested2_1b_ps_server_nested2_1b_port - - link \ No newline at end of file + - link 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/nested-pattern-4-same-typeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested-pattern-4-same-typeServiceTemplate.yaml index ba3537795a..42561eb642 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested-pattern-4-same-typeServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested-pattern-4-same-typeServiceTemplate.yaml @@ -20,24 +20,30 @@ topology_template: immutable: false type: string description: UID of OAM network + port_pd_server_pattern4_0_mgmt_port_0_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements p2: hidden: false immutable: false type: string description: UID of OAM network - port_pd_server_pattern4_port_2_order: - type: integer + port_pd_server_pattern4_0_mgmt_port_0_network_role: + type: string required: true - port_pd_server_pattern4_port_2_vlan_requirements: - type: list + port_pd_server_pattern4_1_mgmt_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd_server_pattern4_port_2_network_role_tag: + port_pd_server_pattern4_1_mgmt_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_pd_server_pattern4_0_mgmt_port_0_subnetpoolid: type: string required: true - port_pd_server_pattern4_port_2_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pd_server_pattern4_1_mgmt_port_0_subnetpoolid: + type: string required: true availability_zone_0: label: availabilityzone name @@ -45,21 +51,16 @@ topology_template: immutable: false type: string description: availabilityzone name - port_pd_server_pattern4_port_2_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd_server_pattern4_port_1_vlan_requirements: + port_pd_server_pattern4_0_mgmt_port_0_related_networks: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.RelatedNetworksAssignments net: hidden: false immutable: false type: string - port_pd_server_pattern4_port_1_network_role_tag: + port_pd_server_pattern4_1_mgmt_port_0_network_role: type: string required: true pd_server_pattern4_flavor: @@ -67,17 +68,22 @@ topology_template: immutable: false type: string description: Flavor for PD server - port_pd_server_pattern4_port_2_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_pattern4_1_mgmt_port_0_order: + type: integer + required: true + port_pd_server_pattern4_1_mgmt_port_0_network_role_tag: + type: string required: true - port_pd_server_pattern4_port_1_ip_requirements: + port_pd_server_pattern4_1_mgmt_port_0_ip_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_pd_server_pattern4_port_1_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_pattern4_1_mgmt_port_0_related_networks: + type: list required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments security_group_name: hidden: false immutable: false @@ -90,38 +96,32 @@ topology_template: immutable: false type: string description: Flavor for PS server - port_pd_server_pattern4_port_1_order: - type: integer + port_pd_server_pattern4_0_mgmt_port_0_network_role_tag: + type: string required: true pd_server_pattern4_image: hidden: false immutable: false type: string description: Flavor for PD server - port_pd_server_pattern4_port_1_related_networks: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd_server_pattern4_port_2_related_networks: + port_pd_server_pattern4_1_mgmt_port_0_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd_server_pattern4_port_1_network_role: - type: string - required: true - port_pd_server_pattern4_port_2_network_role: - type: string - required: true - port_pd_server_pattern4_port_1_mac_requirements: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_pattern4_0_mgmt_port_0_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true - port_pd_server_pattern4_port_1_subnetpoolid: - type: string + port_pd_server_pattern4_0_mgmt_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - port_pd_server_pattern4_port_2_subnetpoolid: - type: string + port_pd_server_pattern4_0_mgmt_port_0_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd_server_pattern4_0_mgmt_port_0_order: + type: integer required: true pd_server_pattern4_names: hidden: false @@ -131,84 +131,84 @@ topology_template: entry_schema: type: string node_templates: - pd_server_pattern4_port_1: + server_pd_pattern4_1: + type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server_pattern4 + properties: + flavor: + get_input: pd_server_pattern4_flavor + availability_zone: + get_input: availability_zone_0 + image: + get_input: pd_server_pattern4_image + name: + get_input: + - pd_server_pattern4_names + - 0 + pd_server_pattern4_1_mgmt_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: subnetpoolid: - get_input: port_pd_server_pattern4_port_1_subnetpoolid + get_input: port_pd_server_pattern4_1_mgmt_port_0_subnetpoolid related_networks: - get_input: port_pd_server_pattern4_port_1_related_networks + get_input: port_pd_server_pattern4_1_mgmt_port_0_related_networks network: get_input: net replacement_policy: AUTO ip_requirements: - get_input: port_pd_server_pattern4_port_1_ip_requirements + get_input: port_pd_server_pattern4_1_mgmt_port_0_ip_requirements network_role: - get_input: port_pd_server_pattern4_port_1_network_role + get_input: port_pd_server_pattern4_1_mgmt_port_0_network_role fixed_ips: - ip_address: get_input: - pd_server_pattern4_ips - - 0 + - 1 mac_requirements: - get_input: port_pd_server_pattern4_port_1_mac_requirements + get_input: port_pd_server_pattern4_1_mgmt_port_0_mac_requirements subinterface_indicator: false exCP_naming: - get_input: port_pd_server_pattern4_port_1_exCP_naming + get_input: port_pd_server_pattern4_1_mgmt_port_0_exCP_naming vlan_requirements: - get_input: port_pd_server_pattern4_port_1_vlan_requirements + get_input: port_pd_server_pattern4_1_mgmt_port_0_vlan_requirements network_role_tag: - get_input: port_pd_server_pattern4_port_1_network_role_tag + get_input: port_pd_server_pattern4_1_mgmt_port_0_network_role_tag order: - get_input: port_pd_server_pattern4_port_1_order + get_input: port_pd_server_pattern4_1_mgmt_port_0_order requirements: - binding: capability: tosca.capabilities.network.Bindable node: server_pd_pattern4_1 relationship: tosca.relationships.network.BindsTo - server_pd_pattern4_1: - type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server_pattern4 - properties: - flavor: - get_input: pd_server_pattern4_flavor - availability_zone: - get_input: availability_zone_0 - image: - get_input: pd_server_pattern4_image - name: - get_input: - - pd_server_pattern4_names - - 0 - pd_server_pattern4_port_2: + pd_server_pattern4_0_mgmt_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: subnetpoolid: - get_input: port_pd_server_pattern4_port_2_subnetpoolid + get_input: port_pd_server_pattern4_0_mgmt_port_0_subnetpoolid related_networks: - get_input: port_pd_server_pattern4_port_2_related_networks + get_input: port_pd_server_pattern4_0_mgmt_port_0_related_networks network: get_input: net replacement_policy: AUTO ip_requirements: - get_input: port_pd_server_pattern4_port_2_ip_requirements + get_input: port_pd_server_pattern4_0_mgmt_port_0_ip_requirements network_role: - get_input: port_pd_server_pattern4_port_2_network_role + get_input: port_pd_server_pattern4_0_mgmt_port_0_network_role fixed_ips: - ip_address: get_input: - pd_server_pattern4_ips - - 1 + - 0 mac_requirements: - get_input: port_pd_server_pattern4_port_2_mac_requirements + get_input: port_pd_server_pattern4_0_mgmt_port_0_mac_requirements subinterface_indicator: false exCP_naming: - get_input: port_pd_server_pattern4_port_2_exCP_naming + get_input: port_pd_server_pattern4_0_mgmt_port_0_exCP_naming vlan_requirements: - get_input: port_pd_server_pattern4_port_2_vlan_requirements + get_input: port_pd_server_pattern4_0_mgmt_port_0_vlan_requirements network_role_tag: - get_input: port_pd_server_pattern4_port_2_network_role_tag + get_input: port_pd_server_pattern4_0_mgmt_port_0_network_role_tag order: - get_input: port_pd_server_pattern4_port_2_order + get_input: port_pd_server_pattern4_0_mgmt_port_0_order requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -221,9 +221,9 @@ topology_template: heat_file: ../Artifacts/nested-pattern-4-same-type.yml description: nested1 members: - - pd_server_pattern4_port_1 - server_pd_pattern4_1 - - pd_server_pattern4_port_2 + - pd_server_pattern4_1_mgmt_port_0 + - pd_server_pattern4_0_mgmt_port_0 outputs: pattern4_attr_1: description: pattern4_attr_1_value @@ -234,18 +234,15 @@ topology_template: disk.ephemeral.size_server_pd_pattern4_1: - server_pd_pattern4_1 - disk.ephemeral.size - network.outgoing.bytes_pd_server_pattern4_port_1: - - pd_server_pattern4_port_1 - - network.outgoing.bytes + forwarder_pd_server_pattern4_1_mgmt_port_0: + - pd_server_pattern4_1_mgmt_port_0 + - forwarder endpoint_server_pd_pattern4_1: - server_pd_pattern4_1 - endpoint memory.usage_server_pd_pattern4_1: - server_pd_pattern4_1 - memory.usage - network.outgoing.bytes_pd_server_pattern4_port_2: - - pd_server_pattern4_port_2 - - network.outgoing.bytes disk.device.capacity_server_pd_pattern4_1: - server_pd_pattern4_1 - disk.device.capacity @@ -255,12 +252,12 @@ topology_template: disk.device.iops_server_pd_pattern4_1: - server_pd_pattern4_1 - disk.device.iops - feature_pd_server_pattern4_port_2: - - pd_server_pattern4_port_2 - - feature - feature_pd_server_pattern4_port_1: - - pd_server_pattern4_port_1 - - feature + network.outgoing.bytes.rate_pd_server_pattern4_0_mgmt_port_0: + - pd_server_pattern4_0_mgmt_port_0 + - network.outgoing.bytes.rate + network.outgoing.bytes.rate_pd_server_pattern4_1_mgmt_port_0: + - pd_server_pattern4_1_mgmt_port_0 + - network.outgoing.bytes.rate disk.device.latency_server_pd_pattern4_1: - server_pd_pattern4_1 - disk.device.latency @@ -270,12 +267,6 @@ topology_template: disk.device.read.requests.rate_server_pd_pattern4_1: - server_pd_pattern4_1 - disk.device.read.requests.rate - attachment_pd_server_pattern4_port_2: - - pd_server_pattern4_port_2 - - attachment - attachment_pd_server_pattern4_port_1: - - pd_server_pattern4_port_1 - - attachment cpu_util_server_pd_pattern4_1: - server_pd_pattern4_1 - cpu_util @@ -285,6 +276,12 @@ topology_template: scalable_server_pd_pattern4_1: - server_pd_pattern4_1 - scalable + feature_pd_server_pattern4_0_mgmt_port_0: + - pd_server_pattern4_0_mgmt_port_0 + - feature + feature_pd_server_pattern4_1_mgmt_port_0: + - pd_server_pattern4_1_mgmt_port_0 + - feature disk.latency_server_pd_pattern4_1: - server_pd_pattern4_1 - disk.latency @@ -303,6 +300,12 @@ topology_template: disk.read.bytes.rate_server_pd_pattern4_1: - server_pd_pattern4_1 - disk.read.bytes.rate + forwarder_pd_server_pattern4_0_mgmt_port_0: + - pd_server_pattern4_0_mgmt_port_0 + - forwarder + network.outgoing.bytes_pd_server_pattern4_1_mgmt_port_0: + - pd_server_pattern4_1_mgmt_port_0 + - network.outgoing.bytes disk.device.write.bytes_server_pd_pattern4_1: - server_pd_pattern4_1 - disk.device.write.bytes @@ -312,63 +315,78 @@ topology_template: host_server_pd_pattern4_1: - server_pd_pattern4_1 - host + network.outgoing.bytes_pd_server_pattern4_0_mgmt_port_0: + - pd_server_pattern4_0_mgmt_port_0 + - network.outgoing.bytes + binding_pd_server_pattern4_1_mgmt_port_0: + - pd_server_pattern4_1_mgmt_port_0 + - binding + network.incoming.packets_pd_server_pattern4_0_mgmt_port_0: + - pd_server_pattern4_0_mgmt_port_0 + - network.incoming.packets disk.write.bytes_server_pd_pattern4_1: - server_pd_pattern4_1 - disk.write.bytes - network.outpoing.packets_pd_server_pattern4_port_1: - - pd_server_pattern4_port_1 - - network.outpoing.packets - network.outpoing.packets_pd_server_pattern4_port_2: - - pd_server_pattern4_port_2 - - network.outpoing.packets + network.incoming.packets.rate_pd_server_pattern4_1_mgmt_port_0: + - pd_server_pattern4_1_mgmt_port_0 + - network.incoming.packets.rate + attachment_pd_server_pattern4_0_mgmt_port_0: + - pd_server_pattern4_0_mgmt_port_0 + - attachment feature_server_pd_pattern4_1: - server_pd_pattern4_1 - feature + attachment_pd_server_pattern4_1_mgmt_port_0: + - pd_server_pattern4_1_mgmt_port_0 + - attachment disk.device.write.requests_server_pd_pattern4_1: - server_pd_pattern4_1 - disk.device.write.requests disk.write.requests.rate_server_pd_pattern4_1: - server_pd_pattern4_1 - disk.write.requests.rate - network.incoming.packets.rate_pd_server_pattern4_port_1: - - pd_server_pattern4_port_1 + network.incoming.packets.rate_pd_server_pattern4_0_mgmt_port_0: + - pd_server_pattern4_0_mgmt_port_0 - network.incoming.packets.rate - network.incoming.bytes_pd_server_pattern4_port_1: - - pd_server_pattern4_port_1 - - network.incoming.bytes disk.device.read.bytes_server_pd_pattern4_1: - server_pd_pattern4_1 - disk.device.read.bytes - network.incoming.packets.rate_pd_server_pattern4_port_2: - - pd_server_pattern4_port_2 - - network.incoming.packets.rate - network.incoming.bytes_pd_server_pattern4_port_2: - - pd_server_pattern4_port_2 - - network.incoming.bytes + network.incoming.packets_pd_server_pattern4_1_mgmt_port_0: + - pd_server_pattern4_1_mgmt_port_0 + - network.incoming.packets disk.read.bytes_server_pd_pattern4_1: - server_pd_pattern4_1 - disk.read.bytes - forwarder_pd_server_pattern4_port_1: - - pd_server_pattern4_port_1 - - forwarder - forwarder_pd_server_pattern4_port_2: - - pd_server_pattern4_port_2 - - forwarder - network.outgoing.bytes.rate_pd_server_pattern4_port_1: - - pd_server_pattern4_port_1 - - network.outgoing.bytes.rate - network.outgoing.bytes.rate_pd_server_pattern4_port_2: - - pd_server_pattern4_port_2 - - network.outgoing.bytes.rate + network.incoming.bytes_pd_server_pattern4_1_mgmt_port_0: + - pd_server_pattern4_1_mgmt_port_0 + - network.incoming.bytes + network.outpoing.packets_pd_server_pattern4_0_mgmt_port_0: + - pd_server_pattern4_0_mgmt_port_0 + - network.outpoing.packets + network.outpoing.packets_pd_server_pattern4_1_mgmt_port_0: + - pd_server_pattern4_1_mgmt_port_0 + - network.outpoing.packets instance_server_pd_pattern4_1: - server_pd_pattern4_1 - instance + network.incoming.bytes_pd_server_pattern4_0_mgmt_port_0: + - pd_server_pattern4_0_mgmt_port_0 + - network.incoming.bytes vcpus_server_pd_pattern4_1: - server_pd_pattern4_1 - vcpus cpu.delta_server_pd_pattern4_1: - server_pd_pattern4_1 - cpu.delta + network.incoming.bytes.rate_pd_server_pattern4_1_mgmt_port_0: + - pd_server_pattern4_1_mgmt_port_0 + - network.incoming.bytes.rate + network.incoming.bytes.rate_pd_server_pattern4_0_mgmt_port_0: + - pd_server_pattern4_0_mgmt_port_0 + - network.incoming.bytes.rate + binding_pd_server_pattern4_0_mgmt_port_0: + - pd_server_pattern4_0_mgmt_port_0 + - binding binding_server_pd_pattern4_1: - server_pd_pattern4_1 - binding @@ -384,42 +402,24 @@ topology_template: disk.device.allocation_server_pd_pattern4_1: - server_pd_pattern4_1 - disk.device.allocation - binding_pd_server_pattern4_port_2: - - pd_server_pattern4_port_2 - - binding os_server_pd_pattern4_1: - server_pd_pattern4_1 - os - network.incoming.bytes.rate_pd_server_pattern4_port_2: - - pd_server_pattern4_port_2 - - network.incoming.bytes.rate disk.iops_server_pd_pattern4_1: - server_pd_pattern4_1 - disk.iops - network.incoming.bytes.rate_pd_server_pattern4_port_1: - - pd_server_pattern4_port_1 - - network.incoming.bytes.rate - binding_pd_server_pattern4_port_1: - - pd_server_pattern4_port_1 - - binding - network.outgoing.packets.rate_pd_server_pattern4_port_1: - - pd_server_pattern4_port_1 + network.outgoing.packets.rate_pd_server_pattern4_1_mgmt_port_0: + - pd_server_pattern4_1_mgmt_port_0 + - network.outgoing.packets.rate + network.outgoing.packets.rate_pd_server_pattern4_0_mgmt_port_0: + - pd_server_pattern4_0_mgmt_port_0 - network.outgoing.packets.rate - network.incoming.packets_pd_server_pattern4_port_1: - - pd_server_pattern4_port_1 - - network.incoming.packets disk.read.requests_server_pd_pattern4_1: - server_pd_pattern4_1 - disk.read.requests disk.root.size_server_pd_pattern4_1: - server_pd_pattern4_1 - disk.root.size - network.outgoing.packets.rate_pd_server_pattern4_port_2: - - pd_server_pattern4_port_2 - - network.outgoing.packets.rate - network.incoming.packets_pd_server_pattern4_port_2: - - pd_server_pattern4_port_2 - - network.incoming.packets disk.capacity_server_pd_pattern4_1: - server_pd_pattern4_1 - disk.capacity @@ -430,18 +430,18 @@ topology_template: local_storage_server_pd_pattern4_1: - server_pd_pattern4_1 - local_storage - dependency_pd_server_pattern4_port_1: - - pd_server_pattern4_port_1 + dependency_pd_server_pattern4_1_mgmt_port_0: + - pd_server_pattern4_1_mgmt_port_0 - dependency - dependency_pd_server_pattern4_port_2: - - pd_server_pattern4_port_2 + dependency_pd_server_pattern4_0_mgmt_port_0: + - pd_server_pattern4_0_mgmt_port_0 - dependency - link_pd_server_pattern4_port_1: - - pd_server_pattern4_port_1 - - link - link_pd_server_pattern4_port_2: - - pd_server_pattern4_port_2 - - link dependency_server_pd_pattern4_1: - server_pd_pattern4_1 - - dependency \ No newline at end of file + - dependency + link_pd_server_pattern4_0_mgmt_port_0: + - pd_server_pattern4_0_mgmt_port_0 + - link + link_pd_server_pattern4_1_mgmt_port_0: + - pd_server_pattern4_1_mgmt_port_0 + - link 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/nested-pattern-4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested-pattern-4ServiceTemplate.yaml index 640a075c1e..979fb5bead 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested-pattern-4ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested-pattern-4ServiceTemplate.yaml @@ -25,57 +25,60 @@ topology_template: immutable: false type: string description: UID of OAM network - port_pd_server_pattern4_port_02_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_pd_server_pattern4_port_01_network_role_tag: + port_pd_server_pattern4_1_oam_port_0_network_role: type: string required: true - port_pd_server_pattern4_port_01_subnetpoolid: + port_pd_server_pattern4_0_oam_port_0_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_pattern4_0_oam_port_0_network_role_tag: type: string required: true - port_pd_server_pattern4_port_01_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pd_server_pattern4_0_oam_port_0_related_networks: + type: list required: true - port_pd_server_pattern4_port_02_order: + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd_server_pattern4_0_oam_port_0_order: type: integer required: true - port_pd_server_pattern4_port_01_ip_requirements: + port_pd_server_pattern4_0_oam_port_0_ip_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements + port_pd_server_pattern4_1_oam_port_0_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd_server_pattern4_0_oam_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true availability_zone_0: label: availabilityzone name hidden: false immutable: false type: string description: availabilityzone name + port_pd_server_pattern4_1_oam_port_0_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements net: hidden: false immutable: false type: string - port_pd_server_pattern4_port_02_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_pd_server_pattern4_port_02_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements pd_server_pattern4_flavor: hidden: false immutable: false type: string description: Flavor for PD server - port_pd_server_pattern4_port_01_network_role: - type: string - required: true - port_pd_server_pattern4_port_02_network_role: - type: string - required: true - port_pd_server_pattern4_port_01_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_pattern4_0_oam_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true security_group_name: hidden: false @@ -89,38 +92,35 @@ topology_template: immutable: false type: string description: Flavor for PS server - port_pd_server_pattern4_port_01_order: - type: integer + port_pd_server_pattern4_1_oam_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - port_pd_server_pattern4_port_02_related_networks: - type: list + port_pd_server_pattern4_1_oam_port_0_subnetpoolid: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments pd_server_pattern4_image: hidden: false immutable: false type: string description: Flavor for PD server - port_pd_server_pattern4_port_02_ip_requirements: - type: list + port_pd_server_pattern4_0_oam_port_0_network_role: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd_server_pattern4_port_02_subnetpoolid: + port_pd_server_pattern4_1_oam_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_pd_server_pattern4_1_oam_port_0_network_role_tag: type: string required: true - port_pd_server_pattern4_port_01_vlan_requirements: + port_pd_server_pattern4_1_oam_port_0_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_pd_server_pattern4_port_01_related_networks: - type: list + port_pd_server_pattern4_1_oam_port_0_order: + type: integer required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd_server_pattern4_port_02_network_role_tag: + port_pd_server_pattern4_0_oam_port_0_subnetpoolid: type: string required: true pd_server_pattern4_names: @@ -131,36 +131,36 @@ topology_template: entry_schema: type: string node_templates: - pd_server_pattern4_port_01: + pd_server_pattern4_0_oam_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: subnetpoolid: - get_input: port_pd_server_pattern4_port_01_subnetpoolid + get_input: port_pd_server_pattern4_0_oam_port_0_subnetpoolid related_networks: - get_input: port_pd_server_pattern4_port_01_related_networks + get_input: port_pd_server_pattern4_0_oam_port_0_related_networks network: get_input: net replacement_policy: AUTO ip_requirements: - get_input: port_pd_server_pattern4_port_01_ip_requirements + get_input: port_pd_server_pattern4_0_oam_port_0_ip_requirements network_role: - get_input: port_pd_server_pattern4_port_01_network_role + get_input: port_pd_server_pattern4_0_oam_port_0_network_role fixed_ips: - ip_address: get_input: - pd_server_pattern4_ips - - 0 + - 1 mac_requirements: - get_input: port_pd_server_pattern4_port_01_mac_requirements + get_input: port_pd_server_pattern4_0_oam_port_0_mac_requirements subinterface_indicator: false exCP_naming: - get_input: port_pd_server_pattern4_port_01_exCP_naming + get_input: port_pd_server_pattern4_0_oam_port_0_exCP_naming vlan_requirements: - get_input: port_pd_server_pattern4_port_01_vlan_requirements + get_input: port_pd_server_pattern4_0_oam_port_0_vlan_requirements network_role_tag: - get_input: port_pd_server_pattern4_port_01_network_role_tag + get_input: port_pd_server_pattern4_0_oam_port_0_network_role_tag order: - get_input: port_pd_server_pattern4_port_01_order + get_input: port_pd_server_pattern4_0_oam_port_0_order requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -179,36 +179,36 @@ topology_template: get_input: - pd_server_pattern4_names - 0 - pd_server_pattern4_port_02: + pd_server_pattern4_1_oam_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: subnetpoolid: - get_input: port_pd_server_pattern4_port_02_subnetpoolid + get_input: port_pd_server_pattern4_1_oam_port_0_subnetpoolid related_networks: - get_input: port_pd_server_pattern4_port_02_related_networks + get_input: port_pd_server_pattern4_1_oam_port_0_related_networks network: get_input: net replacement_policy: AUTO ip_requirements: - get_input: port_pd_server_pattern4_port_02_ip_requirements + get_input: port_pd_server_pattern4_1_oam_port_0_ip_requirements network_role: - get_input: port_pd_server_pattern4_port_02_network_role + get_input: port_pd_server_pattern4_1_oam_port_0_network_role fixed_ips: - ip_address: get_input: - pd_server_pattern4_ips - - 1 + - 0 mac_requirements: - get_input: port_pd_server_pattern4_port_02_mac_requirements + get_input: port_pd_server_pattern4_1_oam_port_0_mac_requirements subinterface_indicator: false exCP_naming: - get_input: port_pd_server_pattern4_port_02_exCP_naming + get_input: port_pd_server_pattern4_1_oam_port_0_exCP_naming vlan_requirements: - get_input: port_pd_server_pattern4_port_02_vlan_requirements + get_input: port_pd_server_pattern4_1_oam_port_0_vlan_requirements network_role_tag: - get_input: port_pd_server_pattern4_port_02_network_role_tag + get_input: port_pd_server_pattern4_1_oam_port_0_network_role_tag order: - get_input: port_pd_server_pattern4_port_02_order + get_input: port_pd_server_pattern4_1_oam_port_0_order requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -221,9 +221,9 @@ topology_template: heat_file: ../Artifacts/nested-pattern-4.yml description: nested1 members: - - pd_server_pattern4_port_01 + - pd_server_pattern4_0_oam_port_0 - server_pd_pattern4 - - pd_server_pattern4_port_02 + - pd_server_pattern4_1_oam_port_0 outputs: pattern4_attr_1: description: pattern4_attr_1_value @@ -237,33 +237,21 @@ topology_template: disk.device.write.bytes_server_pd_pattern4: - server_pd_pattern4 - disk.device.write.bytes - network.incoming.packets_pd_server_pattern4_port_02: - - pd_server_pattern4_port_02 - - network.incoming.packets - binding_pd_server_pattern4_port_01: - - pd_server_pattern4_port_01 - - binding - network.incoming.bytes_pd_server_pattern4_port_02: - - pd_server_pattern4_port_02 - - network.incoming.bytes - network.incoming.bytes_pd_server_pattern4_port_01: - - pd_server_pattern4_port_01 - - network.incoming.bytes - feature_pd_server_pattern4_port_02: - - pd_server_pattern4_port_02 - - feature - feature_pd_server_pattern4_port_01: - - pd_server_pattern4_port_01 + feature_pd_server_pattern4_1_oam_port_0: + - pd_server_pattern4_1_oam_port_0 - feature - network.incoming.packets_pd_server_pattern4_port_01: - - pd_server_pattern4_port_01 - - network.incoming.packets + forwarder_pd_server_pattern4_0_oam_port_0: + - pd_server_pattern4_0_oam_port_0 + - forwarder disk.allocation_server_pd_pattern4: - server_pd_pattern4 - disk.allocation disk.device.usage_server_pd_pattern4: - server_pd_pattern4 - disk.device.usage + network.incoming.bytes_pd_server_pattern4_0_oam_port_0: + - pd_server_pattern4_0_oam_port_0 + - network.incoming.bytes disk.write.bytes.rate_server_pd_pattern4: - server_pd_pattern4 - disk.write.bytes.rate @@ -276,21 +264,33 @@ topology_template: disk.write.bytes_server_pd_pattern4: - server_pd_pattern4 - disk.write.bytes - binding_pd_server_pattern4_port_02: - - pd_server_pattern4_port_02 + binding_pd_server_pattern4_0_oam_port_0: + - pd_server_pattern4_0_oam_port_0 - binding + network.outgoing.bytes_pd_server_pattern4_0_oam_port_0: + - pd_server_pattern4_0_oam_port_0 + - network.outgoing.bytes disk.latency_server_pd_pattern4: - server_pd_pattern4 - disk.latency + network.outgoing.bytes.rate_pd_server_pattern4_0_oam_port_0: + - pd_server_pattern4_0_oam_port_0 + - network.outgoing.bytes.rate endpoint_server_pd_pattern4: - server_pd_pattern4 - endpoint + network.outgoing.packets.rate_pd_server_pattern4_0_oam_port_0: + - pd_server_pattern4_0_oam_port_0 + - network.outgoing.packets.rate feature_server_pd_pattern4: - server_pd_pattern4 - feature disk.device.read.requests.rate_server_pd_pattern4: - server_pd_pattern4 - disk.device.read.requests.rate + network.incoming.bytes.rate_pd_server_pattern4_1_oam_port_0: + - pd_server_pattern4_1_oam_port_0 + - network.incoming.bytes.rate instance_server_pd_pattern4: - server_pd_pattern4 - instance @@ -300,27 +300,24 @@ topology_template: disk.device.read.requests_server_pd_pattern4: - server_pd_pattern4 - disk.device.read.requests - network.incoming.packets.rate_pd_server_pattern4_port_01: - - pd_server_pattern4_port_01 - - network.incoming.packets.rate host_server_pd_pattern4: - server_pd_pattern4 - host cpu_util_server_pd_pattern4: - server_pd_pattern4 - cpu_util - network.incoming.packets.rate_pd_server_pattern4_port_02: - - pd_server_pattern4_port_02 - - network.incoming.packets.rate memory.resident_server_pd_pattern4: - server_pd_pattern4 - memory.resident disk.read.requests_server_pd_pattern4: - server_pd_pattern4 - disk.read.requests - network.outgoing.bytes_pd_server_pattern4_port_02: - - pd_server_pattern4_port_02 - - network.outgoing.bytes + network.outpoing.packets_pd_server_pattern4_0_oam_port_0: + - pd_server_pattern4_0_oam_port_0 + - network.outpoing.packets + network.incoming.bytes.rate_pd_server_pattern4_0_oam_port_0: + - pd_server_pattern4_0_oam_port_0 + - network.incoming.bytes.rate disk.read.bytes.rate_server_pd_pattern4: - server_pd_pattern4 - disk.read.bytes.rate @@ -333,9 +330,9 @@ topology_template: disk.write.requests_server_pd_pattern4: - server_pd_pattern4 - disk.write.requests - network.outgoing.bytes_pd_server_pattern4_port_01: - - pd_server_pattern4_port_01 - - network.outgoing.bytes + network.incoming.bytes_pd_server_pattern4_1_oam_port_0: + - pd_server_pattern4_1_oam_port_0 + - network.incoming.bytes disk.device.write.requests.rate_server_pd_pattern4: - server_pd_pattern4 - disk.device.write.requests.rate @@ -348,45 +345,48 @@ topology_template: disk.capacity_server_pd_pattern4: - server_pd_pattern4 - disk.capacity - network.outgoing.packets.rate_pd_server_pattern4_port_02: - - pd_server_pattern4_port_02 - - network.outgoing.packets.rate - network.outpoing.packets_pd_server_pattern4_port_01: - - pd_server_pattern4_port_01 - - network.outpoing.packets - network.outpoing.packets_pd_server_pattern4_port_02: - - pd_server_pattern4_port_02 - - network.outpoing.packets binding_server_pd_pattern4: - server_pd_pattern4 - binding + attachment_pd_server_pattern4_0_oam_port_0: + - pd_server_pattern4_0_oam_port_0 + - attachment + network.incoming.packets_pd_server_pattern4_0_oam_port_0: + - pd_server_pattern4_0_oam_port_0 + - network.incoming.packets + network.outpoing.packets_pd_server_pattern4_1_oam_port_0: + - pd_server_pattern4_1_oam_port_0 + - network.outpoing.packets + network.outgoing.bytes_pd_server_pattern4_1_oam_port_0: + - pd_server_pattern4_1_oam_port_0 + - network.outgoing.bytes disk.device.iops_server_pd_pattern4: - server_pd_pattern4 - disk.device.iops - forwarder_pd_server_pattern4_port_01: - - pd_server_pattern4_port_01 - - forwarder - forwarder_pd_server_pattern4_port_02: - - pd_server_pattern4_port_02 - - forwarder + network.outgoing.bytes.rate_pd_server_pattern4_1_oam_port_0: + - pd_server_pattern4_1_oam_port_0 + - network.outgoing.bytes.rate disk.device.read.bytes.rate_server_pd_pattern4: - server_pd_pattern4 - disk.device.read.bytes.rate disk.device.allocation_server_pd_pattern4: - server_pd_pattern4 - disk.device.allocation + network.outgoing.packets.rate_pd_server_pattern4_1_oam_port_0: + - pd_server_pattern4_1_oam_port_0 + - network.outgoing.packets.rate disk.usage_server_pd_pattern4: - server_pd_pattern4 - disk.usage disk.read.bytes_server_pd_pattern4: - server_pd_pattern4 - disk.read.bytes - network.outgoing.packets.rate_pd_server_pattern4_port_01: - - pd_server_pattern4_port_01 - - network.outgoing.packets.rate os_server_pd_pattern4: - server_pd_pattern4 - os + forwarder_pd_server_pattern4_1_oam_port_0: + - pd_server_pattern4_1_oam_port_0 + - forwarder memory_server_pd_pattern4: - server_pd_pattern4 - memory @@ -396,9 +396,12 @@ topology_template: scalable_server_pd_pattern4: - server_pd_pattern4 - scalable - network.outgoing.bytes.rate_pd_server_pattern4_port_01: - - pd_server_pattern4_port_01 - - network.outgoing.bytes.rate + feature_pd_server_pattern4_0_oam_port_0: + - pd_server_pattern4_0_oam_port_0 + - feature + network.incoming.packets.rate_pd_server_pattern4_1_oam_port_0: + - pd_server_pattern4_1_oam_port_0 + - network.incoming.packets.rate disk.write.requests.rate_server_pd_pattern4: - server_pd_pattern4 - disk.write.requests.rate @@ -408,40 +411,37 @@ topology_template: disk.device.write.requests_server_pd_pattern4: - server_pd_pattern4 - disk.device.write.requests - network.outgoing.bytes.rate_pd_server_pattern4_port_02: - - pd_server_pattern4_port_02 - - network.outgoing.bytes.rate - attachment_pd_server_pattern4_port_02: - - pd_server_pattern4_port_02 - - attachment - network.incoming.bytes.rate_pd_server_pattern4_port_02: - - pd_server_pattern4_port_02 - - network.incoming.bytes.rate - attachment_pd_server_pattern4_port_01: - - pd_server_pattern4_port_01 + binding_pd_server_pattern4_1_oam_port_0: + - pd_server_pattern4_1_oam_port_0 + - binding + attachment_pd_server_pattern4_1_oam_port_0: + - pd_server_pattern4_1_oam_port_0 - attachment - network.incoming.bytes.rate_pd_server_pattern4_port_01: - - pd_server_pattern4_port_01 - - network.incoming.bytes.rate + network.incoming.packets.rate_pd_server_pattern4_0_oam_port_0: + - pd_server_pattern4_0_oam_port_0 + - network.incoming.packets.rate disk.device.capacity_server_pd_pattern4: - server_pd_pattern4 - disk.device.capacity + network.incoming.packets_pd_server_pattern4_1_oam_port_0: + - pd_server_pattern4_1_oam_port_0 + - network.incoming.packets requirements: - dependency_pd_server_pattern4_port_01: - - pd_server_pattern4_port_01 + link_pd_server_pattern4_0_oam_port_0: + - pd_server_pattern4_0_oam_port_0 + - link + dependency_pd_server_pattern4_1_oam_port_0: + - pd_server_pattern4_1_oam_port_0 + - dependency + link_pd_server_pattern4_1_oam_port_0: + - pd_server_pattern4_1_oam_port_0 + - link + dependency_pd_server_pattern4_0_oam_port_0: + - pd_server_pattern4_0_oam_port_0 - dependency local_storage_server_pd_pattern4: - server_pd_pattern4 - local_storage - dependency_pd_server_pattern4_port_02: - - pd_server_pattern4_port_02 - - dependency - link_pd_server_pattern4_port_02: - - pd_server_pattern4_port_02 - - link - link_pd_server_pattern4_port_01: - - pd_server_pattern4_port_01 - - link dependency_server_pd_pattern4: - server_pd_pattern4 - - dependency \ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/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 7d4ac036a6..128453b89e 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 @@ -108,23 +108,23 @@ topology_template: directives: - substitutable properties: + port_pd_server_pattern4_0_oam_port_0_mac_requirements: + mac_count_required: + is_required: false p1: get_input: jsa_name service_template_filter: substitute_service_template: nested-pattern-4ServiceTemplate.yaml - port_pd_server_pattern4_port_01_mac_requirements: + port_pd_server_pattern4_1_oam_port_0_mac_requirements: mac_count_required: is_required: false - port_pd_server_pattern4_port_02_ip_requirements: + port_pd_server_pattern4_0_oam_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false - port_pd_server_pattern4_port_02_mac_requirements: - mac_count_required: - is_required: false - port_pd_server_pattern4_port_01_ip_requirements: + port_pd_server_pattern4_1_oam_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: true @@ -135,34 +135,34 @@ topology_template: directives: - substitutable properties: - port_ps_server_main_1b_port_fixed_ips: - - ip_address: - get_input: - - ps_server_main_1b_ips - - 0 - port_ps_server_main_1b_port_ip_requirements: + compute_ps_server_main_1b_availability_zone: + - get_input: availability_zone_0 + vm_flavor_name: + get_input: ps_server_main_1b_flavor + port_ps_server_main_1b_port_1_mac_requirements: + mac_count_required: + is_required: false + port_ps_server_main_1b_port_1_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false - compute_ps_server_main_1b_availability_zone: - - get_input: availability_zone_0 - vm_flavor_name: - get_input: ps_server_main_1b_flavor vm_image_name: get_input: ps_server_main_1b_image compute_ps_server_main_1b_name: - get_input: - ps_server_main_1b_names - 1 - port_ps_server_main_1b_port_replacement_policy: - - AUTO - port_ps_server_main_1b_port_mac_requirements: - mac_count_required: - is_required: false - port_ps_server_main_1b_port_network: + port_ps_server_main_1b_port_1_network: - get_input: jsa_name + port_ps_server_main_1b_port_1_replacement_policy: + - AUTO + port_ps_server_main_1b_port_1_fixed_ips: + - ip_address: + get_input: + - ps_server_main_1b_ips + - 0 service_template_filter: substitute_service_template: Nested_ps_server_main_1bServiceTemplate.yaml count: 1 @@ -176,7 +176,17 @@ topology_template: directives: - substitutable properties: - port_cmaui_port_fixed_ips: + port_cmaui_1c1_main_mgmt_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + port_cmaui_1c1_main_mgmt_port_0_network_role_tag: contrail + port_cmaui_1c1_main_mgmt_port_0_mac_requirements: + mac_count_required: + is_required: false + port_cmaui_1c1_main_mgmt_port_0_fixed_ips: - - ip_address: get_input: - cmaui_oam_ips @@ -185,26 +195,16 @@ topology_template: get_input: - cmaui_oam_ips - 0 - port_cmaui_port_network: - - get_input: contrail_net_name - - get_input: contrail_net_name - port_cmaui_port_network_role_tag: contrail vm_flavor_name: get_input: cmaui_1c1_main_flavor - port_cmaui_port_mac_requirements: - mac_count_required: - is_required: false - port_cmaui_port_replacement_policy: - - AUTO - - AUTO + port_cmaui_1c1_main_mgmt_port_0_network: + - get_input: contrail_net_name + - get_input: contrail_net_name vm_image_name: get_input: cmaui_1c1_main_image - port_cmaui_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false + port_cmaui_1c1_main_mgmt_port_0_replacement_policy: + - AUTO + - AUTO compute_cmaui_1c1_main_availability_zone: - get_input: availability_zone_0 - get_input: availability_zone_0 @@ -228,34 +228,34 @@ topology_template: directives: - substitutable properties: + port_pd_server_main_1b_port_1_network: + - get_input: jsa_name compute_pd_server_main_1b_availability_zone: - get_input: availability_zone_0 - port_pd_server_main_1b_port_replacement_policy: - - AUTO - port_pd_server_main_1b_port_mac_requirements: - mac_count_required: - is_required: false vm_flavor_name: get_input: pd_server_main_1b_flavor - vm_image_name: - get_input: pd_server_main_1b_image - compute_pd_server_main_1b_name: - - get_input: - - pd_server_main_1b_names - - 0 - port_pd_server_main_1b_port_network: - - get_input: jsa_name - port_pd_server_main_1b_port_ip_requirements: + port_pd_server_main_1b_port_1_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false - port_pd_server_main_1b_port_fixed_ips: + port_pd_server_main_1b_port_1_fixed_ips: - ip_address: get_input: - pd_server_main_1b_ips - 0 + vm_image_name: + get_input: pd_server_main_1b_image + compute_pd_server_main_1b_name: + - get_input: + - pd_server_main_1b_names + - 0 + port_pd_server_main_1b_port_1_mac_requirements: + mac_count_required: + is_required: false + port_pd_server_main_1b_port_1_replacement_policy: + - AUTO service_template_filter: substitute_service_template: Nested_pd_server_main_1bServiceTemplate.yaml count: 1 @@ -298,30 +298,39 @@ topology_template: disk.ephemeral.size_server_pd_pattern4_test_nested_pattern_4_main_1: - test_nested_pattern_4_main_1 - disk.ephemeral.size_server_pd_pattern4 + network.outgoing.bytes_cmaui_1c1_main_21_mgmt_port_0: + - abstract_cmaui_1c1_main + - network.outgoing.bytes_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0 disk.root.size_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: - test_nested2Level - disk.root.size_server_pd_pattern4_test_nested_pattern_4_nested2 + binding_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - binding_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file feature_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - test_nested2Level - feature_test_nested_pattern_4_same_type_diff_file disk.usage_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: - test_nested2Level - disk.usage_server_pd_pattern4_test_nested_pattern_4_nested2 - network.incoming.packets_cmaui_port_2_test_nested2Level: - - test_nested2Level - - network.incoming.packets_cmaui_port_2 - network.outpoing.packets_pd_server_pattern4_port_01_test_nested_pattern_4_main_1: - - test_nested_pattern_4_main_1 - - network.outpoing.packets_pd_server_pattern4_port_01 cpu_util_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - test_nested2Level - cpu_util_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file disk.device.read.requests_server_main_1c1_cmaui_11: - abstract_cmaui_1c1_main - disk.device.read.requests_cmaui_1c1_main + network.outpoing.packets_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - network.outpoing.packets_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2 + attachment_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - attachment_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2 disk.device.read.bytes_server_pd_pattern4_test_nested_pattern_4_main_1: - test_nested_pattern_4_main_1 - disk.device.read.bytes_server_pd_pattern4 + attachment_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - attachment_pd_server_pattern4_0_oam_port_0 disk.latency_server_nested2_1c1_cmaui_2_test_nested2Level: - test_nested2Level - disk.latency_server_nested2_1c1_cmaui_2 @@ -331,6 +340,9 @@ topology_template: binding_server_main_1c1_cmaui_11: - abstract_cmaui_1c1_main - binding_cmaui_1c1_main + network.outgoing.packets.rate_cmaui_1c1_main_11_mgmt_port_0: + - abstract_cmaui_1c1_main + - network.outgoing.packets.rate_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0 cpu_util_server_pd_pattern4_test_nested_pattern_4_main_1: - test_nested_pattern_4_main_1 - cpu_util_server_pd_pattern4 @@ -358,6 +370,9 @@ topology_template: disk.device.latency_server_main_pd_1b_1: - abstract_pd_server_main_1b - disk.device.latency_pd_server_main_1b + binding_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - binding_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file disk.device.write.requests_server_nested2_ps_1b_test_nested2Level: - test_nested2Level - disk.device.write.requests_server_nested2_ps_1b @@ -367,48 +382,42 @@ topology_template: feature_server_main_1c1_cmaui_11: - abstract_cmaui_1c1_main - feature_cmaui_1c1_main + network.outgoing.packets.rate_cmaui_1c1_nested2_2_mgmt_port_0_test_nested2Level: + - test_nested2Level + - network.outgoing.packets.rate_cmaui_1c1_nested2_2_mgmt_port_0 disk.device.allocation_server_pd_pattern4_test_nested_pattern_4_main_1: - test_nested_pattern_4_main_1 - disk.device.allocation_server_pd_pattern4 disk.device.write.requests_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: - test_nested2Level - disk.device.write.requests_server_pd_pattern4_test_nested_pattern_4_nested2 - network.incoming.bytes_pd_server_pattern4_port_02_test_nested_pattern_4_main_1: - - test_nested_pattern_4_main_1 - - network.incoming.bytes_pd_server_pattern4_port_02 - attachment_pd_server_pattern4_port_02_test_nested_pattern_4_nested2_test_nested2Level: - - test_nested2Level - - attachment_pd_server_pattern4_port_02_test_nested_pattern_4_nested2 disk.device.write.bytes.rate_server_nested2_pd_1b_test_nested2Level: - test_nested2Level - disk.device.write.bytes.rate_server_nested2_pd_1b + forwarder_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - forwarder_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file network.incoming.bytes_pd_server_main_1b_port_1: - abstract_pd_server_main_1b - - network.incoming.bytes_pd_server_main_1b_pd_server_main_1b_port - network.outgoing.bytes.rate_pd_server_pattern4_port_02_test_nested_pattern_4_main_1: - - test_nested_pattern_4_main_1 - - network.outgoing.bytes.rate_pd_server_pattern4_port_02 + - network.incoming.bytes_pd_server_main_1b_pd_server_main_1b_port_1 disk.allocation_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - test_nested2Level - disk.allocation_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file + network.incoming.packets.rate_cmaui_1c1_main_21_mgmt_port_0: + - abstract_cmaui_1c1_main + - network.incoming.packets.rate_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0 disk.device.read.requests_server_nested2_ps_1b_test_nested2Level: - test_nested2Level - disk.device.read.requests_server_nested2_ps_1b disk.root.size_server_nested2_ps_1b_test_nested2Level: - test_nested2Level - disk.root.size_server_nested2_ps_1b - forwarder_cmaui_port_11: - - abstract_cmaui_1c1_main - - forwarder_cmaui_1c1_main_cmaui_port disk.read.requests_server_nested2_1c1_cmaui_2_test_nested2Level: - test_nested2Level - disk.read.requests_server_nested2_1c1_cmaui_2 - forwarder_cmaui_port_12: - - abstract_cmaui_1c1_main - - forwarder_cmaui_1c1_main_cmaui_port feature_ps_server_main_1b_port_1: - abstract_ps_server_main_1b - - feature_ps_server_main_1b_ps_server_main_1b_port + - feature_ps_server_main_1b_ps_server_main_1b_port_1 vcpus_server_main_pd_1b_1: - abstract_pd_server_main_1b - vcpus_pd_server_main_1b @@ -418,9 +427,6 @@ topology_template: disk.usage_server_nested2_ps_1b_test_nested2Level: - test_nested2Level - disk.usage_server_nested2_ps_1b - forwarder_cmaui_port_2_test_nested2Level: - - test_nested2Level - - forwarder_cmaui_port_2 os_server_pd_pattern4_test_nested_pattern_4_main_1: - test_nested_pattern_4_main_1 - os_server_pd_pattern4 @@ -433,15 +439,21 @@ topology_template: memory.resident_server_nested2_pd_1b_test_nested2Level: - test_nested2Level - memory.resident_server_nested2_pd_1b - network.incoming.bytes.rate_pd_server_pattern4_port_02_test_nested_pattern_4_main_1: - - test_nested_pattern_4_main_1 - - network.incoming.bytes.rate_pd_server_pattern4_port_02 + forwarder_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - forwarder_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2 + network.outgoing.bytes_cmaui_1c1_main_11_mgmt_port_0: + - abstract_cmaui_1c1_main + - network.outgoing.bytes_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0 disk.device.capacity_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: - test_nested2Level - disk.device.capacity_server_pd_pattern4_test_nested_pattern_4_nested2 disk.device.write.bytes.rate_server_main_pd_1b_1: - abstract_pd_server_main_1b - disk.device.write.bytes.rate_pd_server_main_1b + feature_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - feature_pd_server_pattern4_1_oam_port_0 instance_server_main_pd_1b_1: - abstract_pd_server_main_1b - instance_pd_server_main_1b @@ -465,7 +477,7 @@ topology_template: - disk.write.bytes_server_nested2_ps_1b network.outgoing.bytes.rate_ps_server_main_1b_port_1: - abstract_ps_server_main_1b - - network.outgoing.bytes.rate_ps_server_main_1b_ps_server_main_1b_port + - network.outgoing.bytes.rate_ps_server_main_1b_ps_server_main_1b_port_1 disk.ephemeral.size_server_nested2_1c1_cmaui_1_test_nested2Level: - test_nested2Level - disk.ephemeral.size_server_nested2_1c1_cmaui_1 @@ -477,28 +489,22 @@ topology_template: - disk.read.bytes_server_pd_pattern4_test_nested_pattern_4_nested2 network.outgoing.packets.rate_ps_server_main_1b_port_1: - abstract_ps_server_main_1b - - network.outgoing.packets.rate_ps_server_main_1b_ps_server_main_1b_port - network.outgoing.bytes_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - - test_nested2Level - - network.outgoing.bytes_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file - network.outpoing.packets_pd_server_pattern4_port_01_test_nested_pattern_4_nested2_test_nested2Level: - - test_nested2Level - - network.outpoing.packets_pd_server_pattern4_port_01_test_nested_pattern_4_nested2 + - network.outgoing.packets.rate_ps_server_main_1b_ps_server_main_1b_port_1 binding_server_main_1c1_cmaui_21: - abstract_cmaui_1c1_main - binding_cmaui_1c1_main - network.outgoing.bytes_pd_server_pattern4_port_02_test_nested_pattern_4_main_1: - - test_nested_pattern_4_main_1 - - network.outgoing.bytes_pd_server_pattern4_port_02 disk.device.read.requests.rate_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: - test_nested2Level - disk.device.read.requests.rate_server_pd_pattern4_test_nested_pattern_4_nested2 disk.read.bytes.rate_server_nested2_pd_1b_test_nested2Level: - test_nested2Level - disk.read.bytes.rate_server_nested2_pd_1b - attachment_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + forwarder_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - forwarder_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file + network.incoming.packets_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2_test_nested2Level: - test_nested2Level - - attachment_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file + - network.incoming.packets_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2 cpu_util_server_nested2_ps_1b_test_nested2Level: - test_nested2Level - cpu_util_server_nested2_ps_1b @@ -508,9 +514,6 @@ topology_template: network.outgoing.packets.rate_ps_server_nested2_1b_port_test_nested2Level: - test_nested2Level - network.outgoing.packets.rate_ps_server_nested2_1b_port - network.incoming.packets.rate_pd_server_pattern4_port_02_test_nested_pattern_4_nested2_test_nested2Level: - - test_nested2Level - - network.incoming.packets.rate_pd_server_pattern4_port_02_test_nested_pattern_4_nested2 disk.write.requests_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: - test_nested2Level - disk.write.requests_server_pd_pattern4_test_nested_pattern_4_nested2 @@ -529,12 +532,21 @@ topology_template: disk.device.capacity_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - test_nested2Level - disk.device.capacity_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file + attachment_cmaui_1c1_nested2_2_mgmt_port_0_test_nested2Level: + - test_nested2Level + - attachment_cmaui_1c1_nested2_2_mgmt_port_0 disk.device.allocation_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - test_nested2Level - disk.device.allocation_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file disk.allocation_server_main_pd_1b_1: - abstract_pd_server_main_1b - disk.allocation_pd_server_main_1b + feature_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - feature_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2 + feature_cmaui_1c1_main_21_mgmt_port_0: + - abstract_cmaui_1c1_main + - feature_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0 endpoint_server_main_1c1_cmaui_21: - abstract_cmaui_1c1_main - endpoint_cmaui_1c1_main @@ -547,18 +559,18 @@ topology_template: disk.usage_server_main_1c1_cmaui_21: - abstract_cmaui_1c1_main - disk.usage_cmaui_1c1_main - network.outgoing.packets.rate_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + network.incoming.bytes_cmaui_1c1_nested2_2_mgmt_port_0_test_nested2Level: - test_nested2Level - - network.outgoing.packets.rate_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file + - network.incoming.bytes_cmaui_1c1_nested2_2_mgmt_port_0 disk.device.write.requests_server_main_pd_1b_1: - abstract_pd_server_main_1b - disk.device.write.requests_pd_server_main_1b cpu_server_pd_pattern4_test_nested_pattern_4_main_1: - test_nested_pattern_4_main_1 - cpu_server_pd_pattern4 - feature_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + network.incoming.bytes.rate_cmaui_1c1_nested2_2_mgmt_port_0_test_nested2Level: - test_nested2Level - - feature_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file + - network.incoming.bytes.rate_cmaui_1c1_nested2_2_mgmt_port_0 disk.device.iops_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: - test_nested2Level - disk.device.iops_server_pd_pattern4_test_nested_pattern_4_nested2 @@ -571,9 +583,6 @@ topology_template: memory.resident_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - test_nested2Level - memory.resident_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file - network.incoming.packets.rate_cmaui_port_1_test_nested2Level: - - test_nested2Level - - network.incoming.packets.rate_cmaui_port_1 cpu.delta_server_main_ps_1b_1: - abstract_ps_server_main_1b - cpu.delta_ps_server_main_1b @@ -589,24 +598,18 @@ topology_template: network.incoming.bytes_pd_server_nested2_1b_port_test_nested2Level: - test_nested2Level - network.incoming.bytes_pd_server_nested2_1b_port + network.incoming.bytes_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - network.incoming.bytes_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2 disk.usage_server_main_1c1_cmaui_11: - abstract_cmaui_1c1_main - disk.usage_cmaui_1c1_main - network.incoming.packets.rate_cmaui_port_2_test_nested2Level: - - test_nested2Level - - network.incoming.packets.rate_cmaui_port_2 disk.device.write.bytes.rate_server_main_ps_1b_1: - abstract_ps_server_main_1b - disk.device.write.bytes.rate_ps_server_main_1b cpu_server_nested2_ps_1b_test_nested2Level: - test_nested2Level - cpu_server_nested2_ps_1b - binding_pd_server_pattern4_port_02_test_nested_pattern_4_main_1: - - test_nested_pattern_4_main_1 - - binding_pd_server_pattern4_port_02 - forwarder_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - - test_nested2Level - - forwarder_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file disk.device.write.requests.rate_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - test_nested2Level - disk.device.write.requests.rate_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file @@ -615,34 +618,28 @@ topology_template: - disk.root.size_server_nested2_1c1_cmaui_1 forwarder_ps_server_main_1b_port_1: - abstract_ps_server_main_1b - - forwarder_ps_server_main_1b_ps_server_main_1b_port + - forwarder_ps_server_main_1b_ps_server_main_1b_port_1 binding_ps_server_main_1b_port_1: - abstract_ps_server_main_1b - - binding_ps_server_main_1b_ps_server_main_1b_port - feature_pd_server_pattern4_port_01_test_nested_pattern_4_main_1: - - test_nested_pattern_4_main_1 - - feature_pd_server_pattern4_port_01 - network.outgoing.bytes.rate_cmaui_port_11: + - binding_ps_server_main_1b_ps_server_main_1b_port_1 + feature_cmaui_1c1_main_11_mgmt_port_0: - abstract_cmaui_1c1_main - - network.outgoing.bytes.rate_cmaui_1c1_main_cmaui_port + - feature_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0 disk.read.bytes_server_nested2_pd_1b_test_nested2Level: - test_nested2Level - disk.read.bytes_server_nested2_pd_1b - network.outgoing.bytes.rate_cmaui_port_12: - - abstract_cmaui_1c1_main - - network.outgoing.bytes.rate_cmaui_1c1_main_cmaui_port - network.outgoing.bytes_pd_server_pattern4_port_01_test_nested_pattern_4_nested2_test_nested2Level: - - test_nested2Level - - network.outgoing.bytes_pd_server_pattern4_port_01_test_nested_pattern_4_nested2 os_server_main_ps_1b_1: - abstract_ps_server_main_1b - os_ps_server_main_1b + binding_cmaui_1c1_main_11_mgmt_port_0: + - abstract_cmaui_1c1_main + - binding_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0 disk.device.read.bytes_server_main_pd_1b_1: - abstract_pd_server_main_1b - disk.device.read.bytes_pd_server_main_1b attachment_ps_server_main_1b_port_1: - abstract_ps_server_main_1b - - attachment_ps_server_main_1b_ps_server_main_1b_port + - attachment_ps_server_main_1b_ps_server_main_1b_port_1 cpu.delta_server_nested2_ps_1b_test_nested2Level: - test_nested2Level - cpu.delta_server_nested2_ps_1b @@ -658,24 +655,27 @@ topology_template: disk.write.requests.rate_server_nested2_pd_1b_test_nested2Level: - test_nested2Level - disk.write.requests.rate_server_nested2_pd_1b + feature_cmaui_1c1_nested2_1_mgmt_port_0_test_nested2Level: + - test_nested2Level + - feature_cmaui_1c1_nested2_1_mgmt_port_0 disk.device.read.bytes.rate_server_main_pd_1b_1: - abstract_pd_server_main_1b - disk.device.read.bytes.rate_pd_server_main_1b network.outgoing.bytes_ps_server_nested2_1b_port_test_nested2Level: - test_nested2Level - network.outgoing.bytes_ps_server_nested2_1b_port - network.outgoing.bytes.rate_pd_server_pattern4_port_01_test_nested_pattern_4_nested2_test_nested2Level: - - test_nested2Level - - network.outgoing.bytes.rate_pd_server_pattern4_port_01_test_nested_pattern_4_nested2 + binding_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - binding_pd_server_pattern4_1_oam_port_0 feature_server_nested2_1c1_cmaui_2_test_nested2Level: - test_nested2Level - feature_server_nested2_1c1_cmaui_2 + network.incoming.packets.rate_cmaui_1c1_nested2_2_mgmt_port_0_test_nested2Level: + - test_nested2Level + - network.incoming.packets.rate_cmaui_1c1_nested2_2_mgmt_port_0 endpoint_server_main_1c1_cmaui_11: - abstract_cmaui_1c1_main - endpoint_cmaui_1c1_main - network.incoming.packets.rate_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - - test_nested2Level - - network.incoming.packets.rate_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file disk.device.latency_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - test_nested2Level - disk.device.latency_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file @@ -690,7 +690,7 @@ topology_template: - feature_ps_server_main_1b network.outpoing.packets_ps_server_main_1b_port_1: - abstract_ps_server_main_1b - - network.outpoing.packets_ps_server_main_1b_ps_server_main_1b_port + - network.outpoing.packets_ps_server_main_1b_ps_server_main_1b_port_1 disk.device.read.requests.rate_server_nested2_1c1_cmaui_1_test_nested2Level: - test_nested2Level - disk.device.read.requests.rate_server_nested2_1c1_cmaui_1 @@ -706,27 +706,24 @@ topology_template: disk.latency_server_main_1c1_cmaui_11: - abstract_cmaui_1c1_main - disk.latency_cmaui_1c1_main - forwarder_pd_server_pattern4_port_02_test_nested_pattern_4_nested2_test_nested2Level: - - test_nested2Level - - forwarder_pd_server_pattern4_port_02_test_nested_pattern_4_nested2 disk.root.size_server_pd_pattern4_test_nested_pattern_4_main_1: - test_nested_pattern_4_main_1 - disk.root.size_server_pd_pattern4 binding_server_nested2_1c1_cmaui_2_test_nested2Level: - test_nested2Level - binding_server_nested2_1c1_cmaui_2 - network.outgoing.packets.rate_cmaui_port_1_test_nested2Level: - - test_nested2Level - - network.outgoing.packets.rate_cmaui_port_1 disk.device.write.bytes_server_main_pd_1b_1: - abstract_pd_server_main_1b - disk.device.write.bytes_pd_server_main_1b - binding_pd_server_pattern4_port_02_test_nested_pattern_4_nested2_test_nested2Level: - - test_nested2Level - - binding_pd_server_pattern4_port_02_test_nested_pattern_4_nested2 + network.outpoing.packets_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - network.outpoing.packets_pd_server_pattern4_1_oam_port_0 disk.device.write.bytes.rate_server_nested2_1c1_cmaui_1_test_nested2Level: - test_nested2Level - disk.device.write.bytes.rate_server_nested2_1c1_cmaui_1 + network.incoming.bytes_cmaui_1c1_main_21_mgmt_port_0: + - abstract_cmaui_1c1_main + - network.incoming.bytes_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0 disk.ephemeral.size_server_main_ps_1b_1: - abstract_ps_server_main_1b - disk.ephemeral.size_ps_server_main_1b @@ -736,21 +733,12 @@ topology_template: disk.ephemeral.size_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - test_nested2Level - disk.ephemeral.size_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file - network.incoming.packets_pd_server_pattern4_port_02_test_nested_pattern_4_nested2_test_nested2Level: - - test_nested2Level - - network.incoming.packets_pd_server_pattern4_port_02_test_nested_pattern_4_nested2 disk.iops_server_main_1c1_cmaui_21: - abstract_cmaui_1c1_main - disk.iops_cmaui_1c1_main - network.outgoing.bytes_cmaui_port_2_test_nested2Level: - - test_nested2Level - - network.outgoing.bytes_cmaui_port_2 forwarder_pd_server_nested2_1b_port_test_nested2Level: - test_nested2Level - forwarder_pd_server_nested2_1b_port - network.incoming.packets_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - - test_nested2Level - - network.incoming.packets_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file disk.device.read.bytes.rate_server_main_ps_1b_1: - abstract_ps_server_main_1b - disk.device.read.bytes.rate_ps_server_main_1b @@ -766,30 +754,21 @@ topology_template: disk.device.read.bytes.rate_server_main_1c1_cmaui_21: - abstract_cmaui_1c1_main - disk.device.read.bytes.rate_cmaui_1c1_main - network.outgoing.bytes.rate_cmaui_port_2_test_nested2Level: + forwarder_cmaui_1c1_nested2_1_mgmt_port_0_test_nested2Level: - test_nested2Level - - network.outgoing.bytes.rate_cmaui_port_2 + - forwarder_cmaui_1c1_nested2_1_mgmt_port_0 disk.device.write.requests.rate_server_main_pd_1b_1: - abstract_pd_server_main_1b - disk.device.write.requests.rate_pd_server_main_1b - network.incoming.bytes.rate_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - - test_nested2Level - - network.incoming.bytes.rate_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file disk.iops_server_pd_pattern4_test_nested_pattern_4_main_1: - test_nested_pattern_4_main_1 - disk.iops_server_pd_pattern4 network.incoming.packets.rate_ps_server_main_1b_port_1: - abstract_ps_server_main_1b - - network.incoming.packets.rate_ps_server_main_1b_ps_server_main_1b_port - binding_cmaui_port_1_test_nested2Level: - - test_nested2Level - - binding_cmaui_port_1 + - network.incoming.packets.rate_ps_server_main_1b_ps_server_main_1b_port_1 disk.device.iops_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - test_nested2Level - disk.device.iops_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file - network.incoming.bytes.rate_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - - test_nested2Level - - network.incoming.bytes.rate_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file memory.usage_server_main_pd_1b_1: - abstract_pd_server_main_1b - memory.usage_pd_server_main_1b @@ -798,16 +777,19 @@ topology_template: - disk.root.size_ps_server_main_1b network.incoming.packets_pd_server_main_1b_port_1: - abstract_pd_server_main_1b - - network.incoming.packets_pd_server_main_1b_pd_server_main_1b_port - network.incoming.packets.rate_pd_server_pattern4_port_02_test_nested_pattern_4_main_1: - - test_nested_pattern_4_main_1 - - network.incoming.packets.rate_pd_server_pattern4_port_02 + - network.incoming.packets_pd_server_main_1b_pd_server_main_1b_port_1 disk.device.write.bytes.rate_server_nested2_1c1_cmaui_2_test_nested2Level: - test_nested2Level - disk.device.write.bytes.rate_server_nested2_1c1_cmaui_2 disk.device.usage_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: - test_nested2Level - disk.device.usage_server_pd_pattern4_test_nested_pattern_4_nested2 + forwarder_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - forwarder_pd_server_pattern4_1_oam_port_0 + network.incoming.bytes.rate_cmaui_1c1_nested2_1_mgmt_port_0_test_nested2Level: + - test_nested2Level + - network.incoming.bytes.rate_cmaui_1c1_nested2_1_mgmt_port_0 scalable_server_main_1c1_cmaui_21: - abstract_cmaui_1c1_main - scalable_cmaui_1c1_main @@ -826,15 +808,18 @@ topology_template: disk.usage_server_nested2_1c1_cmaui_1_test_nested2Level: - test_nested2Level - disk.usage_server_nested2_1c1_cmaui_1 - network.outgoing.packets.rate_pd_server_pattern4_port_02_test_nested_pattern_4_main_1: - - test_nested_pattern_4_main_1 - - network.outgoing.packets.rate_pd_server_pattern4_port_02 + network.incoming.packets_cmaui_1c1_main_11_mgmt_port_0: + - abstract_cmaui_1c1_main + - network.incoming.packets_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0 disk.capacity_server_main_pd_1b_1: - abstract_pd_server_main_1b - disk.capacity_pd_server_main_1b disk.device.write.requests_server_main_1c1_cmaui_11: - abstract_cmaui_1c1_main - disk.device.write.requests_cmaui_1c1_main + binding_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - binding_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2 disk.read.requests_server_main_pd_1b_1: - abstract_pd_server_main_1b - disk.read.requests_pd_server_main_1b @@ -844,12 +829,6 @@ topology_template: disk.read.bytes_server_nested2_1c1_cmaui_1_test_nested2Level: - test_nested2Level - disk.read.bytes_server_nested2_1c1_cmaui_1 - network.incoming.bytes_pd_server_pattern4_port_01_test_nested_pattern_4_main_1: - - test_nested_pattern_4_main_1 - - network.incoming.bytes_pd_server_pattern4_port_01 - network.incoming.packets_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - - test_nested2Level - - network.incoming.packets_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file disk.iops_server_nested2_1c1_cmaui_1_test_nested2Level: - test_nested2Level - disk.iops_server_nested2_1c1_cmaui_1 @@ -865,15 +844,24 @@ topology_template: disk.device.write.requests.rate_server_nested2_ps_1b_test_nested2Level: - test_nested2Level - disk.device.write.requests.rate_server_nested2_ps_1b + network.outgoing.bytes_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - network.outgoing.bytes_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2 instance_server_nested2_1c1_cmaui_2_test_nested2Level: - test_nested2Level - instance_server_nested2_1c1_cmaui_2 network.outpoing.packets_pd_server_nested2_1b_port_test_nested2Level: - test_nested2Level - network.outpoing.packets_pd_server_nested2_1b_port + network.incoming.packets_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - network.incoming.packets_pd_server_pattern4_0_oam_port_0 disk.latency_server_main_ps_1b_1: - abstract_ps_server_main_1b - disk.latency_ps_server_main_1b + network.incoming.bytes.rate_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - network.incoming.bytes.rate_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file os_server_nested2_pd_1b_test_nested2Level: - test_nested2Level - os_server_nested2_pd_1b @@ -883,9 +871,18 @@ topology_template: disk.read.bytes_server_main_pd_1b_1: - abstract_pd_server_main_1b - disk.read.bytes_pd_server_main_1b + forwarder_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - forwarder_pd_server_pattern4_0_oam_port_0 + network.outgoing.packets.rate_cmaui_1c1_nested2_1_mgmt_port_0_test_nested2Level: + - test_nested2Level + - network.outgoing.packets.rate_cmaui_1c1_nested2_1_mgmt_port_0 disk.write.requests_server_pd_pattern4_test_nested_pattern_4_main_1: - test_nested_pattern_4_main_1 - disk.write.requests_server_pd_pattern4 + network.outgoing.bytes_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - network.outgoing.bytes_pd_server_pattern4_1_oam_port_0 disk.device.read.bytes.rate_server_nested2_pd_1b_test_nested2Level: - test_nested2Level - disk.device.read.bytes.rate_server_nested2_pd_1b @@ -904,15 +901,6 @@ topology_template: network.incoming.bytes_ps_server_nested2_1b_port_test_nested2Level: - test_nested2Level - network.incoming.bytes_ps_server_nested2_1b_port - feature_pd_server_pattern4_port_02_test_nested_pattern_4_main_1: - - test_nested_pattern_4_main_1 - - feature_pd_server_pattern4_port_02 - network.outgoing.packets.rate_cmaui_port_2_test_nested2Level: - - test_nested2Level - - network.outgoing.packets.rate_cmaui_port_2 - network.outgoing.bytes_cmaui_port_11: - - abstract_cmaui_1c1_main - - network.outgoing.bytes_cmaui_1c1_main_cmaui_port endpoint_server_main_pd_1b_1: - abstract_pd_server_main_1b - endpoint_pd_server_main_1b @@ -922,12 +910,18 @@ topology_template: disk.device.read.bytes_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - test_nested2Level - disk.device.read.bytes_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file - network.outgoing.bytes_cmaui_port_12: - - abstract_cmaui_1c1_main - - network.outgoing.bytes_cmaui_1c1_main_cmaui_port vcpus_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: - test_nested2Level - vcpus_server_pd_pattern4_test_nested_pattern_4_nested2 + network.incoming.packets.rate_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - network.incoming.packets.rate_pd_server_pattern4_1_oam_port_0 + network.incoming.bytes.rate_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - network.incoming.bytes.rate_pd_server_pattern4_1_oam_port_0 + network.outpoing.packets_cmaui_1c1_nested2_2_mgmt_port_0_test_nested2Level: + - test_nested2Level + - network.outpoing.packets_cmaui_1c1_nested2_2_mgmt_port_0 disk.write.bytes_server_nested2_pd_1b_test_nested2Level: - test_nested2Level - disk.write.bytes_server_nested2_pd_1b @@ -946,39 +940,42 @@ topology_template: cpu.delta_server_pd_pattern4_test_nested_pattern_4_main_1: - test_nested_pattern_4_main_1 - cpu.delta_server_pd_pattern4 - disk.write.bytes_server_nested2_1c1_cmaui_1_test_nested2Level: + network.incoming.packets_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - test_nested2Level - - disk.write.bytes_server_nested2_1c1_cmaui_1 - network.outgoing.bytes.rate_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - network.incoming.packets_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file + attachment_cmaui_1c1_nested2_1_mgmt_port_0_test_nested2Level: - test_nested2Level - - network.outgoing.bytes.rate_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file - feature_pd_server_pattern4_port_01_test_nested_pattern_4_nested2_test_nested2Level: + - attachment_cmaui_1c1_nested2_1_mgmt_port_0 + disk.write.bytes_server_nested2_1c1_cmaui_1_test_nested2Level: - test_nested2Level - - feature_pd_server_pattern4_port_01_test_nested_pattern_4_nested2 + - disk.write.bytes_server_nested2_1c1_cmaui_1 + network.incoming.bytes.rate_cmaui_1c1_main_11_mgmt_port_0: + - abstract_cmaui_1c1_main + - network.incoming.bytes.rate_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0 scalable_server_nested2_pd_1b_test_nested2Level: - test_nested2Level - scalable_server_nested2_pd_1b network.incoming.packets_ps_server_main_1b_port_1: - abstract_ps_server_main_1b - - network.incoming.packets_ps_server_main_1b_ps_server_main_1b_port - binding_pd_server_pattern4_port_01_test_nested_pattern_4_nested2_test_nested2Level: - - test_nested2Level - - binding_pd_server_pattern4_port_01_test_nested_pattern_4_nested2 + - network.incoming.packets_ps_server_main_1b_ps_server_main_1b_port_1 network.incoming.packets.rate_pd_server_main_1b_port_1: - abstract_pd_server_main_1b - - network.incoming.packets.rate_pd_server_main_1b_pd_server_main_1b_port + - network.incoming.packets.rate_pd_server_main_1b_pd_server_main_1b_port_1 forwarder_ps_server_nested2_1b_port_test_nested2Level: - test_nested2Level - forwarder_ps_server_nested2_1b_port - network.outgoing.packets.rate_pd_server_pattern4_port_02_test_nested_pattern_4_nested2_test_nested2Level: - - test_nested2Level - - network.outgoing.packets.rate_pd_server_pattern4_port_02_test_nested_pattern_4_nested2 disk.device.usage_server_main_1c1_cmaui_11: - abstract_cmaui_1c1_main - disk.device.usage_cmaui_1c1_main + network.outgoing.bytes.rate_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - network.outgoing.bytes.rate_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2 disk.capacity_server_nested2_ps_1b_test_nested2Level: - test_nested2Level - disk.capacity_server_nested2_ps_1b + network.outgoing.bytes.rate_cmaui_1c1_nested2_1_mgmt_port_0_test_nested2Level: + - test_nested2Level + - network.outgoing.bytes.rate_cmaui_1c1_nested2_1_mgmt_port_0 binding_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - test_nested2Level - binding_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file @@ -994,6 +991,9 @@ topology_template: memory.usage_server_main_ps_1b_1: - abstract_ps_server_main_1b - memory.usage_ps_server_main_1b + network.incoming.packets_cmaui_1c1_nested2_2_mgmt_port_0_test_nested2Level: + - test_nested2Level + - network.incoming.packets_cmaui_1c1_nested2_2_mgmt_port_0 network.outpoing.packets_ps_server_nested2_1b_port_test_nested2Level: - test_nested2Level - network.outpoing.packets_ps_server_nested2_1b_port @@ -1036,9 +1036,6 @@ topology_template: binding_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: - test_nested2Level - binding_server_pd_pattern4_test_nested_pattern_4_nested2 - network.outgoing.bytes_pd_server_pattern4_port_01_test_nested_pattern_4_main_1: - - test_nested_pattern_4_main_1 - - network.outgoing.bytes_pd_server_pattern4_port_01 memory.resident_server_nested2_1c1_cmaui_1_test_nested2Level: - test_nested2Level - memory.resident_server_nested2_1c1_cmaui_1 @@ -1048,15 +1045,12 @@ topology_template: disk.device.iops_server_nested2_1c1_cmaui_2_test_nested2Level: - test_nested2Level - disk.device.iops_server_nested2_1c1_cmaui_2 - network.incoming.bytes_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - - test_nested2Level - - network.incoming.bytes_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file disk.write.requests_server_main_ps_1b_1: - abstract_ps_server_main_1b - disk.write.requests_ps_server_main_1b - forwarder_pd_server_pattern4_port_02_test_nested_pattern_4_main_1: - - test_nested_pattern_4_main_1 - - forwarder_pd_server_pattern4_port_02 + attachment_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - attachment_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file memory_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - test_nested2Level - memory_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file @@ -1069,9 +1063,12 @@ topology_template: disk.device.read.requests_server_main_ps_1b_1: - abstract_ps_server_main_1b - disk.device.read.requests_ps_server_main_1b - network.outgoing.packets.rate_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - - test_nested2Level - - network.outgoing.packets.rate_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file + network.incoming.packets_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - network.incoming.packets_pd_server_pattern4_1_oam_port_0 + network.outgoing.packets.rate_cmaui_1c1_main_21_mgmt_port_0: + - abstract_cmaui_1c1_main + - network.outgoing.packets.rate_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0 disk.device.write.bytes_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: - test_nested2Level - disk.device.write.bytes_server_pd_pattern4_test_nested_pattern_4_nested2 @@ -1084,12 +1081,21 @@ topology_template: disk.write.requests.rate_server_main_1c1_cmaui_11: - abstract_cmaui_1c1_main - disk.write.requests.rate_cmaui_1c1_main + network.outgoing.bytes.rate_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - network.outgoing.bytes.rate_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file disk.device.read.requests.rate_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - test_nested2Level - disk.device.read.requests.rate_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file + network.incoming.bytes_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - network.incoming.bytes_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file disk.allocation_server_main_1c1_cmaui_11: - abstract_cmaui_1c1_main - disk.allocation_cmaui_1c1_main + network.outgoing.bytes_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - network.outgoing.bytes_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file disk.device.read.bytes_server_nested2_pd_1b_test_nested2Level: - test_nested2Level - disk.device.read.bytes_server_nested2_pd_1b @@ -1099,21 +1105,21 @@ topology_template: disk.capacity_server_main_ps_1b_1: - abstract_ps_server_main_1b - disk.capacity_ps_server_main_1b - binding_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - - test_nested2Level - - binding_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file disk.read.requests_server_nested2_ps_1b_test_nested2Level: - test_nested2Level - disk.read.requests_server_nested2_ps_1b cpu.delta_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - test_nested2Level - cpu.delta_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file + network.incoming.bytes.rate_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - network.incoming.bytes.rate_pd_server_pattern4_0_oam_port_0 + binding_cmaui_1c1_nested2_1_mgmt_port_0_test_nested2Level: + - test_nested2Level + - binding_cmaui_1c1_nested2_1_mgmt_port_0 disk.read.bytes_server_nested2_ps_1b_test_nested2Level: - test_nested2Level - disk.read.bytes_server_nested2_ps_1b - network.incoming.bytes.rate_pd_server_pattern4_port_01_test_nested_pattern_4_nested2_test_nested2Level: - - test_nested2Level - - network.incoming.bytes.rate_pd_server_pattern4_port_01_test_nested_pattern_4_nested2 scalable_server_pd_pattern4_test_nested_pattern_4_main_1: - test_nested_pattern_4_main_1 - scalable_server_pd_pattern4 @@ -1129,9 +1135,15 @@ topology_template: disk.read.bytes.rate_server_nested2_1c1_cmaui_2_test_nested2Level: - test_nested2Level - disk.read.bytes.rate_server_nested2_1c1_cmaui_2 + network.incoming.bytes_cmaui_1c1_main_11_mgmt_port_0: + - abstract_cmaui_1c1_main + - network.incoming.bytes_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0 disk.device.write.requests_server_main_1c1_cmaui_21: - abstract_cmaui_1c1_main - disk.device.write.requests_cmaui_1c1_main + network.incoming.packets.rate_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - network.incoming.packets.rate_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2 disk.device.write.requests_server_nested2_1c1_cmaui_1_test_nested2Level: - test_nested2Level - disk.device.write.requests_server_nested2_1c1_cmaui_1 @@ -1144,12 +1156,12 @@ topology_template: feature_server_main_1c1_cmaui_21: - abstract_cmaui_1c1_main - feature_cmaui_1c1_main - forwarder_pd_server_pattern4_port_01_test_nested_pattern_4_main_1: - - test_nested_pattern_4_main_1 - - forwarder_pd_server_pattern4_port_01 disk.device.read.bytes_server_nested2_1c1_cmaui_2_test_nested2Level: - test_nested2Level - disk.device.read.bytes_server_nested2_1c1_cmaui_2 + network.incoming.packets.rate_cmaui_1c1_nested2_1_mgmt_port_0_test_nested2Level: + - test_nested2Level + - network.incoming.packets.rate_cmaui_1c1_nested2_1_mgmt_port_0 disk.device.capacity_server_main_1c1_cmaui_21: - abstract_cmaui_1c1_main - disk.device.capacity_cmaui_1c1_main @@ -1159,12 +1171,27 @@ topology_template: disk.write.bytes.rate_server_main_pd_1b_1: - abstract_pd_server_main_1b - disk.write.bytes.rate_pd_server_main_1b + feature_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - feature_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file feature_test_nested3Level_test_nested2Level: - test_nested2Level - feature_test_nested3Level + network.incoming.bytes.rate_cmaui_1c1_main_21_mgmt_port_0: + - abstract_cmaui_1c1_main + - network.incoming.bytes.rate_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0 + network.outgoing.bytes_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - network.outgoing.bytes_pd_server_pattern4_0_oam_port_0 + feature_cmaui_1c1_nested2_2_mgmt_port_0_test_nested2Level: + - test_nested2Level + - feature_cmaui_1c1_nested2_2_mgmt_port_0 disk.device.allocation_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: - test_nested2Level - disk.device.allocation_server_pd_pattern4_test_nested_pattern_4_nested2 + network.outpoing.packets_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - network.outpoing.packets_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file disk.iops_server_main_pd_1b_1: - abstract_pd_server_main_1b - disk.iops_pd_server_main_1b @@ -1177,18 +1204,12 @@ topology_template: feature_server_main_pd_1b_1: - abstract_pd_server_main_1b - feature_pd_server_main_1b - network.incoming.bytes_cmaui_port_12: - - abstract_cmaui_1c1_main - - network.incoming.bytes_cmaui_1c1_main_cmaui_port - network.incoming.bytes_cmaui_port_11: - - abstract_cmaui_1c1_main - - network.incoming.bytes_cmaui_1c1_main_cmaui_port scalable_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - test_nested2Level - scalable_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file - forwarder_cmaui_port_1_test_nested2Level: - - test_nested2Level - - forwarder_cmaui_port_1 + network.outgoing.bytes.rate_cmaui_1c1_main_21_mgmt_port_0: + - abstract_cmaui_1c1_main + - network.outgoing.bytes.rate_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0 disk.latency_server_nested2_pd_1b_test_nested2Level: - test_nested2Level - disk.latency_server_nested2_pd_1b @@ -1213,15 +1234,21 @@ topology_template: cpu_server_nested2_pd_1b_test_nested2Level: - test_nested2Level - cpu_server_nested2_pd_1b - network.outgoing.packets.rate_pd_server_pattern4_port_01_test_nested_pattern_4_main_1: - - test_nested_pattern_4_main_1 - - network.outgoing.packets.rate_pd_server_pattern4_port_01 + network.incoming.bytes.rate_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - network.incoming.bytes.rate_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2 disk.device.allocation_server_nested2_1c1_cmaui_2_test_nested2Level: - test_nested2Level - disk.device.allocation_server_nested2_1c1_cmaui_2 + network.outgoing.bytes_cmaui_1c1_nested2_2_mgmt_port_0_test_nested2Level: + - test_nested2Level + - network.outgoing.bytes_cmaui_1c1_nested2_2_mgmt_port_0 disk.device.allocation_server_main_pd_1b_1: - abstract_pd_server_main_1b - disk.device.allocation_pd_server_main_1b + network.outpoing.packets_cmaui_1c1_nested2_1_mgmt_port_0_test_nested2Level: + - test_nested2Level + - network.outpoing.packets_cmaui_1c1_nested2_1_mgmt_port_0 disk.read.bytes_server_pd_pattern4_test_nested_pattern_4_main_1: - test_nested_pattern_4_main_1 - disk.read.bytes_server_pd_pattern4 @@ -1231,12 +1258,15 @@ topology_template: disk.device.usage_server_nested2_1c1_cmaui_1_test_nested2Level: - test_nested2Level - disk.device.usage_server_nested2_1c1_cmaui_1 - network.incoming.bytes_cmaui_port_1_test_nested2Level: - - test_nested2Level - - network.incoming.bytes_cmaui_port_1 disk.device.latency_server_main_1c1_cmaui_21: - abstract_cmaui_1c1_main - disk.device.latency_cmaui_1c1_main + network.incoming.bytes_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - network.incoming.bytes_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2 + network.outgoing.bytes.rate_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - network.outgoing.bytes.rate_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2 disk.device.allocation_server_nested2_1c1_cmaui_1_test_nested2Level: - test_nested2Level - disk.device.allocation_server_nested2_1c1_cmaui_1 @@ -1267,72 +1297,72 @@ topology_template: disk.device.capacity_server_main_ps_1b_1: - abstract_ps_server_main_1b - disk.device.capacity_ps_server_main_1b - network.incoming.packets.rate_pd_server_pattern4_port_01_test_nested_pattern_4_main_1: - - test_nested_pattern_4_main_1 - - network.incoming.packets.rate_pd_server_pattern4_port_01 disk.device.write.bytes_server_main_1c1_cmaui_11: - abstract_cmaui_1c1_main - disk.device.write.bytes_cmaui_1c1_main - network.incoming.bytes_cmaui_port_2_test_nested2Level: - - test_nested2Level - - network.incoming.bytes_cmaui_port_2 binding_pd_server_main_1b_port_1: - abstract_pd_server_main_1b - - binding_pd_server_main_1b_pd_server_main_1b_port + - binding_pd_server_main_1b_pd_server_main_1b_port_1 disk.device.write.bytes_server_pd_pattern4_test_nested_pattern_4_main_1: - test_nested_pattern_4_main_1 - disk.device.write.bytes_server_pd_pattern4 disk.device.latency_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: - test_nested2Level - disk.device.latency_server_pd_pattern4_test_nested_pattern_4_nested2 + binding_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - binding_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2 memory.resident_server_main_pd_1b_1: - abstract_pd_server_main_1b - memory.resident_pd_server_main_1b network.incoming.bytes_ps_server_main_1b_port_1: - abstract_ps_server_main_1b - - network.incoming.bytes_ps_server_main_1b_ps_server_main_1b_port + - network.incoming.bytes_ps_server_main_1b_ps_server_main_1b_port_1 vcpus_server_nested2_1c1_cmaui_1_test_nested2Level: - test_nested2Level - vcpus_server_nested2_1c1_cmaui_1 + network.outgoing.bytes.rate_cmaui_1c1_main_11_mgmt_port_0: + - abstract_cmaui_1c1_main + - network.outgoing.bytes.rate_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0 disk.device.write.bytes.rate_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: - test_nested2Level - disk.device.write.bytes.rate_server_pd_pattern4_test_nested_pattern_4_nested2 + network.outgoing.bytes_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - network.outgoing.bytes_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file disk.device.read.bytes_server_nested2_1c1_cmaui_1_test_nested2Level: - test_nested2Level - disk.device.read.bytes_server_nested2_1c1_cmaui_1 + network.outpoing.packets_cmaui_1c1_main_11_mgmt_port_0: + - abstract_cmaui_1c1_main + - network.outpoing.packets_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0 disk.read.bytes.rate_server_nested2_ps_1b_test_nested2Level: - test_nested2Level - disk.read.bytes.rate_server_nested2_ps_1b endpoint_server_nested2_1c1_cmaui_1_test_nested2Level: - test_nested2Level - endpoint_server_nested2_1c1_cmaui_1 - attachment_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + network.incoming.packets_cmaui_1c1_nested2_1_mgmt_port_0_test_nested2Level: - test_nested2Level - - attachment_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file + - network.incoming.packets_cmaui_1c1_nested2_1_mgmt_port_0 disk.device.iops_server_pd_pattern4_test_nested_pattern_4_main_1: - test_nested_pattern_4_main_1 - disk.device.iops_server_pd_pattern4 - network.outgoing.bytes.rate_pd_server_pattern4_port_02_test_nested_pattern_4_nested2_test_nested2Level: - - test_nested2Level - - network.outgoing.bytes.rate_pd_server_pattern4_port_02_test_nested_pattern_4_nested2 disk.device.read.requests_server_nested2_pd_1b_test_nested2Level: - test_nested2Level - disk.device.read.requests_server_nested2_pd_1b - attachment_pd_server_pattern4_port_02_test_nested_pattern_4_main_1: - - test_nested_pattern_4_main_1 - - attachment_pd_server_pattern4_port_02 memory.resident_server_pd_pattern4_test_nested_pattern_4_main_1: - test_nested_pattern_4_main_1 - memory.resident_server_pd_pattern4 feature_pd_server_main_1b_port_1: - abstract_pd_server_main_1b - - feature_pd_server_main_1b_pd_server_main_1b_port + - feature_pd_server_main_1b_pd_server_main_1b_port_1 + network.outgoing.bytes.rate_cmaui_1c1_nested2_2_mgmt_port_0_test_nested2Level: + - test_nested2Level + - network.outgoing.bytes.rate_cmaui_1c1_nested2_2_mgmt_port_0 host_server_main_1c1_cmaui_21: - abstract_cmaui_1c1_main - host_cmaui_1c1_main - network.incoming.bytes.rate_pd_server_pattern4_port_02_test_nested_pattern_4_nested2_test_nested2Level: - - test_nested2Level - - network.incoming.bytes.rate_pd_server_pattern4_port_02_test_nested_pattern_4_nested2 disk.ephemeral.size_server_nested2_ps_1b_test_nested2Level: - test_nested2Level - disk.ephemeral.size_server_nested2_ps_1b @@ -1342,51 +1372,42 @@ topology_template: network.outgoing.bytes_pd_server_nested2_1b_port_test_nested2Level: - test_nested2Level - network.outgoing.bytes_pd_server_nested2_1b_port - network.outgoing.bytes_pd_server_pattern4_port_02_test_nested_pattern_4_nested2_test_nested2Level: - - test_nested2Level - - network.outgoing.bytes_pd_server_pattern4_port_02_test_nested_pattern_4_nested2 disk.device.write.bytes.rate_server_nested2_ps_1b_test_nested2Level: - test_nested2Level - disk.device.write.bytes.rate_server_nested2_ps_1b disk.device.usage_server_main_ps_1b_1: - abstract_ps_server_main_1b - disk.device.usage_ps_server_main_1b - network.outgoing.bytes_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + network.incoming.packets.rate_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - test_nested2Level - - network.outgoing.bytes_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file + - network.incoming.packets.rate_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file disk.device.capacity_server_nested2_1c1_cmaui_2_test_nested2Level: - test_nested2Level - disk.device.capacity_server_nested2_1c1_cmaui_2 disk.device.write.requests_server_nested2_pd_1b_test_nested2Level: - test_nested2Level - disk.device.write.requests_server_nested2_pd_1b - forwarder_pd_server_pattern4_port_01_test_nested_pattern_4_nested2_test_nested2Level: - - test_nested2Level - - forwarder_pd_server_pattern4_port_01_test_nested_pattern_4_nested2 disk.device.usage_server_nested2_1c1_cmaui_2_test_nested2Level: - test_nested2Level - disk.device.usage_server_nested2_1c1_cmaui_2 disk.write.requests.rate_server_nested2_1c1_cmaui_1_test_nested2Level: - test_nested2Level - disk.write.requests.rate_server_nested2_1c1_cmaui_1 - network.incoming.bytes.rate_cmaui_port_2_test_nested2Level: - - test_nested2Level - - network.incoming.bytes.rate_cmaui_port_2 disk.device.latency_server_main_1c1_cmaui_11: - abstract_cmaui_1c1_main - disk.device.latency_cmaui_1c1_main disk.write.bytes.rate_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: - test_nested2Level - disk.write.bytes.rate_server_pd_pattern4_test_nested_pattern_4_nested2 - network.incoming.packets.rate_cmaui_port_12: - - abstract_cmaui_1c1_main - - network.incoming.packets.rate_cmaui_1c1_main_cmaui_port - network.incoming.packets.rate_cmaui_port_11: - - abstract_cmaui_1c1_main - - network.incoming.packets.rate_cmaui_1c1_main_cmaui_port + network.incoming.packets.rate_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - network.incoming.packets.rate_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file disk.device.read.requests.rate_server_nested2_pd_1b_test_nested2Level: - test_nested2Level - disk.device.read.requests.rate_server_nested2_pd_1b + attachment_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - attachment_pd_server_pattern4_1_oam_port_0 disk.device.allocation_server_main_ps_1b_1: - abstract_ps_server_main_1b - disk.device.allocation_ps_server_main_1b @@ -1395,13 +1416,13 @@ topology_template: - vcpus_cmaui_1c1_main attachment_pd_server_main_1b_port_1: - abstract_pd_server_main_1b - - attachment_pd_server_main_1b_pd_server_main_1b_port + - attachment_pd_server_main_1b_pd_server_main_1b_port_1 disk.latency_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - test_nested2Level - disk.latency_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file - network.incoming.bytes.rate_cmaui_port_1_test_nested2Level: + forwarder_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2_test_nested2Level: - test_nested2Level - - network.incoming.bytes.rate_cmaui_port_1 + - forwarder_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2 os_server_nested2_1c1_cmaui_2_test_nested2Level: - test_nested2Level - os_server_nested2_1c1_cmaui_2 @@ -1417,18 +1438,12 @@ topology_template: disk.read.bytes_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - test_nested2Level - disk.read.bytes_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file - network.outpoing.packets_cmaui_port_11: - - abstract_cmaui_1c1_main - - network.outpoing.packets_cmaui_1c1_main_cmaui_port - binding_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - - test_nested2Level - - binding_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file - network.outpoing.packets_cmaui_port_12: - - abstract_cmaui_1c1_main - - network.outpoing.packets_cmaui_1c1_main_cmaui_port disk.usage_server_pd_pattern4_test_nested_pattern_4_main_1: - test_nested_pattern_4_main_1 - disk.usage_server_pd_pattern4 + network.outpoing.packets_cmaui_1c1_main_21_mgmt_port_0: + - abstract_cmaui_1c1_main + - network.outpoing.packets_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0 memory.resident_server_nested2_1c1_cmaui_2_test_nested2Level: - test_nested2Level - memory.resident_server_nested2_1c1_cmaui_2 @@ -1441,6 +1456,9 @@ topology_template: cpu_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: - test_nested2Level - cpu_server_pd_pattern4_test_nested_pattern_4_nested2 + network.outgoing.packets.rate_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - network.outgoing.packets.rate_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file binding_server_main_pd_1b_1: - abstract_pd_server_main_1b - binding_pd_server_main_1b @@ -1471,9 +1489,6 @@ topology_template: cpu_util_server_nested2_1c1_cmaui_1_test_nested2Level: - test_nested2Level - cpu_util_server_nested2_1c1_cmaui_1 - network.outpoing.packets_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - - test_nested2Level - - network.outpoing.packets_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file disk.device.usage_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - test_nested2Level - disk.device.usage_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file @@ -1486,6 +1501,9 @@ topology_template: cpu_server_main_pd_1b_1: - abstract_pd_server_main_1b - cpu_pd_server_main_1b + network.outgoing.packets.rate_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - network.outgoing.packets.rate_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2 disk.read.requests_server_main_1c1_cmaui_11: - abstract_cmaui_1c1_main - disk.read.requests_cmaui_1c1_main @@ -1504,9 +1522,15 @@ topology_template: disk.ephemeral.size_server_main_1c1_cmaui_21: - abstract_cmaui_1c1_main - disk.ephemeral.size_cmaui_1c1_main + network.incoming.packets.rate_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - network.incoming.packets.rate_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2 host_server_main_1c1_cmaui_11: - abstract_cmaui_1c1_main - host_cmaui_1c1_main + network.outgoing.bytes.rate_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - network.outgoing.bytes.rate_pd_server_pattern4_1_oam_port_0 disk.device.iops_server_main_1c1_cmaui_11: - abstract_cmaui_1c1_main - disk.device.iops_cmaui_1c1_main @@ -1525,18 +1549,33 @@ topology_template: memory_server_nested2_1c1_cmaui_2_test_nested2Level: - test_nested2Level - memory_server_nested2_1c1_cmaui_2 + attachment_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - attachment_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2 disk.device.read.requests.rate_server_main_ps_1b_1: - abstract_ps_server_main_1b - disk.device.read.requests.rate_ps_server_main_1b disk.device.read.requests.rate_server_main_1c1_cmaui_21: - abstract_cmaui_1c1_main - disk.device.read.requests.rate_cmaui_1c1_main + binding_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - binding_pd_server_pattern4_0_oam_port_0 + forwarder_cmaui_1c1_nested2_2_mgmt_port_0_test_nested2Level: + - test_nested2Level + - forwarder_cmaui_1c1_nested2_2_mgmt_port_0 + network.incoming.packets.rate_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - network.incoming.packets.rate_pd_server_pattern4_0_oam_port_0 + forwarder_cmaui_1c1_main_11_mgmt_port_0: + - abstract_cmaui_1c1_main + - forwarder_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0 disk.read.bytes_server_main_1c1_cmaui_11: - abstract_cmaui_1c1_main - disk.read.bytes_cmaui_1c1_main network.outpoing.packets_pd_server_main_1b_port_1: - abstract_pd_server_main_1b - - network.outpoing.packets_pd_server_main_1b_pd_server_main_1b_port + - network.outpoing.packets_pd_server_main_1b_pd_server_main_1b_port_1 disk.write.bytes.rate_server_nested2_pd_1b_test_nested2Level: - test_nested2Level - disk.write.bytes.rate_server_nested2_pd_1b @@ -1546,12 +1585,6 @@ topology_template: endpoint_server_nested2_ps_1b_test_nested2Level: - test_nested2Level - endpoint_server_nested2_ps_1b - attachment_pd_server_pattern4_port_01_test_nested_pattern_4_nested2_test_nested2Level: - - test_nested2Level - - attachment_pd_server_pattern4_port_01_test_nested_pattern_4_nested2 - network.incoming.packets_pd_server_pattern4_port_01_test_nested_pattern_4_main_1: - - test_nested_pattern_4_main_1 - - network.incoming.packets_pd_server_pattern4_port_01 disk.device.read.bytes.rate_server_nested2_1c1_cmaui_2_test_nested2Level: - test_nested2Level - disk.device.read.bytes.rate_server_nested2_1c1_cmaui_2 @@ -1596,55 +1629,40 @@ topology_template: - disk.device.write.requests.rate_cmaui_1c1_main network.outgoing.bytes.rate_pd_server_main_1b_port_1: - abstract_pd_server_main_1b - - network.outgoing.bytes.rate_pd_server_main_1b_pd_server_main_1b_port + - network.outgoing.bytes.rate_pd_server_main_1b_pd_server_main_1b_port_1 instance_server_main_1c1_cmaui_11: - abstract_cmaui_1c1_main - instance_cmaui_1c1_main network.outgoing.packets.rate_pd_server_main_1b_port_1: - abstract_pd_server_main_1b - - network.outgoing.packets.rate_pd_server_main_1b_pd_server_main_1b_port + - network.outgoing.packets.rate_pd_server_main_1b_pd_server_main_1b_port_1 disk.device.iops_server_main_1c1_cmaui_21: - abstract_cmaui_1c1_main - disk.device.iops_cmaui_1c1_main - network.incoming.bytes.rate_pd_server_pattern4_port_01_test_nested_pattern_4_main_1: - - test_nested_pattern_4_main_1 - - network.incoming.bytes.rate_pd_server_pattern4_port_01 - network.incoming.bytes_pd_server_pattern4_port_01_test_nested_pattern_4_nested2_test_nested2Level: + network.outgoing.bytes_cmaui_1c1_nested2_1_mgmt_port_0_test_nested2Level: - test_nested2Level - - network.incoming.bytes_pd_server_pattern4_port_01_test_nested_pattern_4_nested2 + - network.outgoing.bytes_cmaui_1c1_nested2_1_mgmt_port_0 forwarder_pd_server_main_1b_port_1: - abstract_pd_server_main_1b - - forwarder_pd_server_main_1b_pd_server_main_1b_port - network.incoming.packets_pd_server_pattern4_port_02_test_nested_pattern_4_main_1: - - test_nested_pattern_4_main_1 - - network.incoming.packets_pd_server_pattern4_port_02 + - forwarder_pd_server_main_1b_pd_server_main_1b_port_1 disk.write.requests.rate_server_main_ps_1b_1: - abstract_ps_server_main_1b - disk.write.requests.rate_ps_server_main_1b disk.allocation_server_nested2_ps_1b_test_nested2Level: - test_nested2Level - disk.allocation_server_nested2_ps_1b - feature_pd_server_pattern4_port_02_test_nested_pattern_4_nested2_test_nested2Level: - - test_nested2Level - - feature_pd_server_pattern4_port_02_test_nested_pattern_4_nested2 - network.outpoing.packets_cmaui_port_2_test_nested2Level: + network.outgoing.packets.rate_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - test_nested2Level - - network.outpoing.packets_cmaui_port_2 + - network.outgoing.packets.rate_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file cpu.delta_server_main_1c1_cmaui_11: - abstract_cmaui_1c1_main - cpu.delta_cmaui_1c1_main - network.outgoing.bytes_cmaui_port_1_test_nested2Level: - - test_nested2Level - - network.outgoing.bytes_cmaui_port_1 feature_server_nested2_ps_1b_test_nested2Level: - test_nested2Level - feature_server_nested2_ps_1b - network.outgoing.bytes.rate_pd_server_pattern4_port_01_test_nested_pattern_4_main_1: - - test_nested_pattern_4_main_1 - - network.outgoing.bytes.rate_pd_server_pattern4_port_01 - network.incoming.packets.rate_pd_server_pattern4_port_01_test_nested_pattern_4_nested2_test_nested2Level: + binding_cmaui_1c1_nested2_2_mgmt_port_0_test_nested2Level: - test_nested2Level - - network.incoming.packets.rate_pd_server_pattern4_port_01_test_nested_pattern_4_nested2 + - binding_cmaui_1c1_nested2_2_mgmt_port_0 vcpus_server_nested2_1c1_cmaui_2_test_nested2Level: - test_nested2Level - vcpus_server_nested2_1c1_cmaui_2 @@ -1675,21 +1693,18 @@ topology_template: disk.device.read.bytes_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: - test_nested2Level - disk.device.read.bytes_server_pd_pattern4_test_nested_pattern_4_nested2 + attachment_cmaui_1c1_main_21_mgmt_port_0: + - abstract_cmaui_1c1_main + - attachment_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0 network.outgoing.bytes.rate_ps_server_nested2_1b_port_test_nested2Level: - test_nested2Level - network.outgoing.bytes.rate_ps_server_nested2_1b_port - binding_pd_server_pattern4_port_01_test_nested_pattern_4_main_1: + feature_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_main_1: - test_nested_pattern_4_main_1 - - binding_pd_server_pattern4_port_01 - network.incoming.packets_cmaui_port_11: - - abstract_cmaui_1c1_main - - network.incoming.packets_cmaui_1c1_main_cmaui_port - network.incoming.packets_cmaui_port_12: - - abstract_cmaui_1c1_main - - network.incoming.packets_cmaui_1c1_main_cmaui_port + - feature_pd_server_pattern4_0_oam_port_0 network.incoming.bytes.rate_ps_server_main_1b_port_1: - abstract_ps_server_main_1b - - network.incoming.bytes.rate_ps_server_main_1b_ps_server_main_1b_port + - network.incoming.bytes.rate_ps_server_main_1b_ps_server_main_1b_port_1 disk.device.latency_server_nested2_1c1_cmaui_1_test_nested2Level: - test_nested2Level - disk.device.latency_server_nested2_1c1_cmaui_1 @@ -1699,9 +1714,6 @@ topology_template: disk.write.bytes.rate_server_nested2_1c1_cmaui_2_test_nested2Level: - test_nested2Level - disk.write.bytes.rate_server_nested2_1c1_cmaui_2 - network.outpoing.packets_pd_server_pattern4_port_02_test_nested_pattern_4_main_1: - - test_nested_pattern_4_main_1 - - network.outpoing.packets_pd_server_pattern4_port_02 vcpus_server_pd_pattern4_test_nested_pattern_4_main_1: - test_nested_pattern_4_main_1 - vcpus_server_pd_pattern4 @@ -1720,9 +1732,6 @@ topology_template: endpoint_server_main_ps_1b_1: - abstract_ps_server_main_1b - endpoint_ps_server_main_1b - network.outpoing.packets_cmaui_port_1_test_nested2Level: - - test_nested2Level - - network.outpoing.packets_cmaui_port_1 feature_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - test_nested2Level - feature_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file @@ -1732,6 +1741,9 @@ topology_template: disk.read.bytes.rate_server_pd_pattern4_test_nested_pattern_4_main_1: - test_nested_pattern_4_main_1 - disk.read.bytes.rate_server_pd_pattern4 + network.outgoing.bytes.rate_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - network.outgoing.bytes.rate_pd_server_pattern4_0_oam_port_0 disk.capacity_server_main_1c1_cmaui_21: - abstract_cmaui_1c1_main - disk.capacity_cmaui_1c1_main @@ -1744,15 +1756,15 @@ topology_template: disk.read.requests_server_main_ps_1b_1: - abstract_ps_server_main_1b - disk.read.requests_ps_server_main_1b - network.outgoing.packets.rate_pd_server_pattern4_port_01_test_nested_pattern_4_nested2_test_nested2Level: - - test_nested2Level - - network.outgoing.packets.rate_pd_server_pattern4_port_01_test_nested_pattern_4_nested2 disk.write.requests_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - test_nested2Level - disk.write.requests_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file + network.outpoing.packets_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - network.outpoing.packets_pd_server_pattern4_0_oam_port_0 network.outgoing.bytes_ps_server_main_1b_port_1: - abstract_ps_server_main_1b - - network.outgoing.bytes_ps_server_main_1b_ps_server_main_1b_port + - network.outgoing.bytes_ps_server_main_1b_ps_server_main_1b_port_1 disk.device.iops_server_nested2_ps_1b_test_nested2Level: - test_nested2Level - disk.device.iops_server_nested2_ps_1b @@ -1767,7 +1779,7 @@ topology_template: - disk.capacity_server_pd_pattern4 network.outgoing.bytes_pd_server_main_1b_port_1: - abstract_pd_server_main_1b - - network.outgoing.bytes_pd_server_main_1b_pd_server_main_1b_port + - network.outgoing.bytes_pd_server_main_1b_pd_server_main_1b_port_1 instance_server_nested2_1c1_cmaui_1_test_nested2Level: - test_nested2Level - instance_server_nested2_1c1_cmaui_1 @@ -1780,15 +1792,18 @@ topology_template: disk.write.bytes_server_main_ps_1b_1: - abstract_ps_server_main_1b - disk.write.bytes_ps_server_main_1b + network.incoming.bytes.rate_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - network.incoming.bytes.rate_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file disk.write.requests.rate_server_main_pd_1b_1: - abstract_pd_server_main_1b - disk.write.requests.rate_pd_server_main_1b + network.incoming.packets_cmaui_1c1_main_21_mgmt_port_0: + - abstract_cmaui_1c1_main + - network.incoming.packets_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0 cpu.delta_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: - test_nested2Level - cpu.delta_server_pd_pattern4_test_nested_pattern_4_nested2 - attachment_cmaui_port_1_test_nested2Level: - - test_nested2Level - - attachment_cmaui_port_1 binding_server_main_ps_1b_1: - abstract_ps_server_main_1b - binding_ps_server_main_1b @@ -1813,9 +1828,6 @@ topology_template: disk.device.write.requests.rate_server_nested2_1c1_cmaui_1_test_nested2Level: - test_nested2Level - disk.device.write.requests.rate_server_nested2_1c1_cmaui_1 - network.outgoing.bytes.rate_cmaui_port_1_test_nested2Level: - - test_nested2Level - - network.outgoing.bytes.rate_cmaui_port_1 disk.device.iops_server_main_ps_1b_1: - abstract_ps_server_main_1b - disk.device.iops_ps_server_main_1b @@ -1831,9 +1843,6 @@ topology_template: memory_server_main_1c1_cmaui_11: - abstract_cmaui_1c1_main - memory_cmaui_1c1_main - attachment_pd_server_pattern4_port_01_test_nested_pattern_4_main_1: - - test_nested_pattern_4_main_1 - - attachment_pd_server_pattern4_port_01 disk.write.bytes.rate_server_nested2_ps_1b_test_nested2Level: - test_nested2Level - disk.write.bytes.rate_server_nested2_ps_1b @@ -1846,12 +1855,12 @@ topology_template: disk.allocation_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: - test_nested2Level - disk.allocation_server_pd_pattern4_test_nested_pattern_4_nested2 + attachment_cmaui_1c1_main_11_mgmt_port_0: + - abstract_cmaui_1c1_main + - attachment_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0 disk.read.bytes.rate_server_main_1c1_cmaui_11: - abstract_cmaui_1c1_main - disk.read.bytes.rate_cmaui_1c1_main - attachment_cmaui_port_2_test_nested2Level: - - test_nested2Level - - attachment_cmaui_port_2 disk.device.write.bytes.rate_server_main_1c1_cmaui_11: - abstract_cmaui_1c1_main - disk.device.write.bytes.rate_cmaui_1c1_main @@ -1863,7 +1872,7 @@ topology_template: - memory_pd_server_main_1b network.incoming.bytes.rate_pd_server_main_1b_port_1: - abstract_pd_server_main_1b - - network.incoming.bytes.rate_pd_server_main_1b_pd_server_main_1b_port + - network.incoming.bytes.rate_pd_server_main_1b_pd_server_main_1b_port_1 disk.device.read.requests_server_main_pd_1b_1: - abstract_pd_server_main_1b - disk.device.read.requests_pd_server_main_1b @@ -1873,18 +1882,6 @@ topology_template: disk.device.capacity_server_nested2_pd_1b_test_nested2Level: - test_nested2Level - disk.device.capacity_server_nested2_pd_1b - feature_cmaui_port_12: - - abstract_cmaui_1c1_main - - feature_cmaui_1c1_main_cmaui_port - feature_cmaui_port_11: - - abstract_cmaui_1c1_main - - feature_cmaui_1c1_main_cmaui_port - network.incoming.bytes.rate_cmaui_port_11: - - abstract_cmaui_1c1_main - - network.incoming.bytes.rate_cmaui_1c1_main_cmaui_port - network.incoming.bytes.rate_cmaui_port_12: - - abstract_cmaui_1c1_main - - network.incoming.bytes.rate_cmaui_1c1_main_cmaui_port disk.device.iops_server_main_pd_1b_1: - abstract_pd_server_main_1b - disk.device.iops_pd_server_main_1b @@ -1903,12 +1900,12 @@ topology_template: attachment_pd_server_nested2_1b_port_test_nested2Level: - test_nested2Level - attachment_pd_server_nested2_1b_port + network.incoming.bytes_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - network.incoming.bytes_pd_server_pattern4_1_oam_port_0 disk.device.write.requests_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - test_nested2Level - disk.device.write.requests_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file - feature_cmaui_port_2_test_nested2Level: - - test_nested2Level - - feature_cmaui_port_2 disk.device.write.bytes_server_nested2_ps_1b_test_nested2Level: - test_nested2Level - disk.device.write.bytes_server_nested2_ps_1b @@ -1927,9 +1924,6 @@ topology_template: disk.read.bytes.rate_server_main_1c1_cmaui_21: - abstract_cmaui_1c1_main - disk.read.bytes.rate_cmaui_1c1_main - network.incoming.bytes_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - - test_nested2Level - - network.incoming.bytes_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file disk.write.requests_server_main_1c1_cmaui_21: - abstract_cmaui_1c1_main - disk.write.requests_cmaui_1c1_main @@ -1948,15 +1942,18 @@ topology_template: disk.device.write.bytes.rate_server_main_1c1_cmaui_21: - abstract_cmaui_1c1_main - disk.device.write.bytes.rate_cmaui_1c1_main + network.incoming.bytes.rate_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - network.incoming.bytes.rate_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2 feature_pd_server_nested2_1b_port_test_nested2Level: - test_nested2Level - feature_pd_server_nested2_1b_port - network.incoming.bytes_pd_server_pattern4_port_02_test_nested_pattern_4_nested2_test_nested2Level: - - test_nested2Level - - network.incoming.bytes_pd_server_pattern4_port_02_test_nested_pattern_4_nested2 - binding_cmaui_port_2_test_nested2Level: + network.outgoing.packets.rate_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - network.outgoing.packets.rate_pd_server_pattern4_1_oam_port_0 + network.incoming.packets_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - test_nested2Level - - binding_cmaui_port_2 + - network.incoming.packets_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file memory_server_main_ps_1b_1: - abstract_ps_server_main_1b - memory_ps_server_main_1b @@ -1978,12 +1975,15 @@ topology_template: disk.write.bytes.rate_server_main_1c1_cmaui_21: - abstract_cmaui_1c1_main - disk.write.bytes.rate_cmaui_1c1_main - network.incoming.packets_pd_server_pattern4_port_01_test_nested_pattern_4_nested2_test_nested2Level: - - test_nested2Level - - network.incoming.packets_pd_server_pattern4_port_01_test_nested_pattern_4_nested2 cpu_util_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: - test_nested2Level - cpu_util_server_pd_pattern4_test_nested_pattern_4_nested2 + network.outgoing.bytes_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - network.outgoing.bytes_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2 + binding_cmaui_1c1_main_21_mgmt_port_0: + - abstract_cmaui_1c1_main + - binding_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0 feature_server_pd_pattern4_test_nested_pattern_4_main_1: - test_nested_pattern_4_main_1 - feature_server_pd_pattern4 @@ -1999,12 +1999,9 @@ topology_template: binding_pd_server_nested2_1b_port_test_nested2Level: - test_nested2Level - binding_pd_server_nested2_1b_port - feature_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - - test_nested2Level - - feature_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file - network.outgoing.bytes.rate_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - - test_nested2Level - - network.outgoing.bytes.rate_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file + network.incoming.packets.rate_cmaui_1c1_main_11_mgmt_port_0: + - abstract_cmaui_1c1_main + - network.incoming.packets.rate_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0 disk.device.write.bytes_server_main_ps_1b_1: - abstract_ps_server_main_1b - disk.device.write.bytes_ps_server_main_1b @@ -2029,9 +2026,15 @@ topology_template: disk.device.write.requests.rate_server_nested2_pd_1b_test_nested2Level: - test_nested2Level - disk.device.write.requests.rate_server_nested2_pd_1b + network.outgoing.bytes.rate_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - network.outgoing.bytes.rate_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file disk.usage_server_main_pd_1b_1: - abstract_pd_server_main_1b - disk.usage_pd_server_main_1b + attachment_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - attachment_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file disk.write.bytes.rate_server_main_1c1_cmaui_11: - abstract_cmaui_1c1_main - disk.write.bytes.rate_cmaui_1c1_main @@ -2050,12 +2053,12 @@ topology_template: memory_server_nested2_1c1_cmaui_1_test_nested2Level: - test_nested2Level - memory_server_nested2_1c1_cmaui_1 - network.outpoing.packets_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - - test_nested2Level - - network.outpoing.packets_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file disk.device.write.requests.rate_server_nested2_1c1_cmaui_2_test_nested2Level: - test_nested2Level - disk.device.write.requests.rate_server_nested2_1c1_cmaui_2 + forwarder_cmaui_1c1_main_21_mgmt_port_0: + - abstract_cmaui_1c1_main + - forwarder_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0 scalable_server_nested2_1c1_cmaui_1_test_nested2Level: - test_nested2Level - scalable_server_nested2_1c1_cmaui_1 @@ -2068,6 +2071,9 @@ topology_template: disk.iops_server_nested2_ps_1b_test_nested2Level: - test_nested2Level - disk.iops_server_nested2_ps_1b + network.incoming.bytes_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - network.incoming.bytes_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file memory.resident_server_nested2_ps_1b_test_nested2Level: - test_nested2Level - memory.resident_server_nested2_ps_1b @@ -2077,9 +2083,12 @@ topology_template: memory.usage_server_nested2_1c1_cmaui_1_test_nested2Level: - test_nested2Level - memory.usage_server_nested2_1c1_cmaui_1 - forwarder_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + network.outpoing.packets_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - network.outpoing.packets_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2 + network.outgoing.packets.rate_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2_test_nested2Level: - test_nested2Level - - forwarder_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file + - network.outgoing.packets.rate_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2 disk.device.allocation_server_nested2_ps_1b_test_nested2Level: - test_nested2Level - disk.device.allocation_server_nested2_ps_1b @@ -2092,9 +2101,18 @@ topology_template: disk.device.write.requests_server_main_ps_1b_1: - abstract_ps_server_main_1b - disk.device.write.requests_ps_server_main_1b + network.outgoing.packets.rate_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - network.outgoing.packets.rate_pd_server_pattern4_0_oam_port_0 disk.allocation_server_main_ps_1b_1: - abstract_ps_server_main_1b - disk.allocation_ps_server_main_1b + network.incoming.packets_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - network.incoming.packets_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2 + feature_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - feature_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file disk.latency_server_main_pd_1b_1: - abstract_pd_server_main_1b - disk.latency_pd_server_main_1b @@ -2122,21 +2140,6 @@ topology_template: disk.device.read.bytes.rate_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: - test_nested2Level - disk.device.read.bytes.rate_server_pd_pattern4_test_nested_pattern_4_nested2 - network.outgoing.packets.rate_cmaui_port_12: - - abstract_cmaui_1c1_main - - network.outgoing.packets.rate_cmaui_1c1_main_cmaui_port - binding_cmaui_port_12: - - abstract_cmaui_1c1_main - - binding_cmaui_1c1_main_cmaui_port - network.outgoing.packets.rate_cmaui_port_11: - - abstract_cmaui_1c1_main - - network.outgoing.packets.rate_cmaui_1c1_main_cmaui_port - binding_cmaui_port_11: - - abstract_cmaui_1c1_main - - binding_cmaui_1c1_main_cmaui_port - network.incoming.packets.rate_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - - test_nested2Level - - network.incoming.packets.rate_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file os_server_nested2_1c1_cmaui_1_test_nested2Level: - test_nested2Level - os_server_nested2_1c1_cmaui_1 @@ -2146,79 +2149,64 @@ topology_template: disk.write.requests.rate_server_nested2_ps_1b_test_nested2Level: - test_nested2Level - disk.write.requests.rate_server_nested2_ps_1b - attachment_cmaui_port_12: - - abstract_cmaui_1c1_main - - attachment_cmaui_1c1_main_cmaui_port - attachment_cmaui_port_11: - - abstract_cmaui_1c1_main - - attachment_cmaui_1c1_main_cmaui_port + feature_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - feature_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2 + network.incoming.bytes_cmaui_1c1_nested2_1_mgmt_port_0_test_nested2Level: + - test_nested2Level + - network.incoming.bytes_cmaui_1c1_nested2_1_mgmt_port_0 feature_test_resourceGroup_test_nested2Level: - test_nested2Level - feature_test_resourceGroup disk.latency_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: - test_nested2Level - disk.latency_server_pd_pattern4_test_nested_pattern_4_nested2 - feature_cmaui_port_1_test_nested2Level: - - test_nested2Level - - feature_cmaui_port_1 disk.device.read.requests_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - test_nested2Level - disk.device.read.requests_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file cpu.delta_server_nested2_1c1_cmaui_1_test_nested2Level: - test_nested2Level - cpu.delta_server_nested2_1c1_cmaui_1 - network.outpoing.packets_pd_server_pattern4_port_02_test_nested_pattern_4_nested2_test_nested2Level: - - test_nested2Level - - network.outpoing.packets_pd_server_pattern4_port_02_test_nested_pattern_4_nested2 - network.incoming.packets_cmaui_port_1_test_nested2Level: + network.outpoing.packets_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - test_nested2Level - - network.incoming.packets_cmaui_port_1 + - network.outpoing.packets_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file disk.capacity_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: - test_nested2Level - disk.capacity_server_pd_pattern4_test_nested_pattern_4_nested2 + network.incoming.bytes_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - network.incoming.bytes_pd_server_pattern4_0_oam_port_0 requirements: dependency_jsa_security_group2_test_resourceGroup_test_nested2Level: - test_nested2Level - dependency_jsa_security_group2_test_resourceGroup - link_pd_server_pattern4_port_01_test_nested_pattern_4_main_1: - - test_nested_pattern_4_main_1 - - link_pd_server_pattern4_port_01 - dependency_cmaui_port_2_test_nested2Level: + dependency_cmaui_1c1_nested2_2_mgmt_port_0_test_nested2Level: - test_nested2Level - - dependency_cmaui_port_2 + - dependency_cmaui_1c1_nested2_2_mgmt_port_0 dependency_server_nested2_1c1_cmaui_1_test_nested2Level: - test_nested2Level - dependency_server_nested2_1c1_cmaui_1 port_jsa_security_group1_test_nested3Level_test_nested2Level: - test_nested2Level - port_jsa_security_group1_test_nested3Level - link_pd_server_pattern4_port_02_test_nested_pattern_4_main_1: - - test_nested_pattern_4_main_1 - - link_pd_server_pattern4_port_02 dependency_test_nested2Level: - test_nested2Level - dependency - dependency_pd_server_pattern4_port_02_test_nested_pattern_4_main_1: + link_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - link_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file + dependency_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_main_1: - test_nested_pattern_4_main_1 - - dependency_pd_server_pattern4_port_02 + - dependency_pd_server_pattern4_0_oam_port_0 local_storage_server_main_ps_1b_1: - abstract_ps_server_main_1b - local_storage_ps_server_main_1b - dependency_cmaui_port_11: - - abstract_cmaui_1c1_main - - dependency_cmaui_1c1_main_cmaui_port dependency_server_main_pd_1b_1: - abstract_pd_server_main_1b - dependency_pd_server_main_1b dependency_server_main_1c1_cmaui_21: - abstract_cmaui_1c1_main - dependency_cmaui_1c1_main - dependency_cmaui_port_12: - - abstract_cmaui_1c1_main - - dependency_cmaui_1c1_main_cmaui_port - dependency_pd_server_pattern4_port_01_test_nested_pattern_4_main_1: - - test_nested_pattern_4_main_1 - - dependency_pd_server_pattern4_port_01 local_storage_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: - test_nested2Level - local_storage_server_pd_pattern4_test_nested_pattern_4_nested2 @@ -2228,45 +2216,57 @@ topology_template: local_storage_server_nested2_pd_1b_test_nested2Level: - test_nested2Level - local_storage_server_nested2_pd_1b + link_cmaui_1c1_main_11_mgmt_port_0: + - abstract_cmaui_1c1_main + - link_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0 local_storage_server_nested2_1c1_cmaui_1_test_nested2Level: - test_nested2Level - local_storage_server_nested2_1c1_cmaui_1 + link_cmaui_1c1_main_21_mgmt_port_0: + - abstract_cmaui_1c1_main + - link_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0 local_storage_server_main_pd_1b_1: - abstract_pd_server_main_1b - local_storage_pd_server_main_1b dependency_test_resourceGroup_test_nested2Level: - test_nested2Level - dependency_test_resourceGroup - link_pd_server_pattern4_port_02_test_nested_pattern_4_nested2_test_nested2Level: + link_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - link_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2 + dependency_cmaui_1c1_nested2_1_mgmt_port_0_test_nested2Level: + - test_nested2Level + - dependency_cmaui_1c1_nested2_1_mgmt_port_0 + dependency_cmaui_1c1_main_11_mgmt_port_0: + - abstract_cmaui_1c1_main + - dependency_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0 + dependency_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2_test_nested2Level: - test_nested2Level - - link_pd_server_pattern4_port_02_test_nested_pattern_4_nested2 + - dependency_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2 + dependency_cmaui_1c1_main_21_mgmt_port_0: + - abstract_cmaui_1c1_main + - dependency_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0 dependency_pd_server_nested2_1b_port_test_nested2Level: - test_nested2Level - dependency_pd_server_nested2_1b_port + link_cmaui_1c1_nested2_1_mgmt_port_0_test_nested2Level: + - test_nested2Level + - link_cmaui_1c1_nested2_1_mgmt_port_0 dependency_server_nested2_1c1_cmaui_2_test_nested2Level: - test_nested2Level - dependency_server_nested2_1c1_cmaui_2 link_pd_server_nested2_1b_port_test_nested2Level: - test_nested2Level - link_pd_server_nested2_1b_port - dependency_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - - test_nested2Level - - dependency_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file + dependency_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - dependency_pd_server_pattern4_1_oam_port_0 dependency_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: - test_nested2Level - dependency_server_pd_pattern4_test_nested_pattern_4_nested2 - dependency_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - - test_nested2Level - - dependency_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file local_storage_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - test_nested2Level - local_storage_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file - link_pd_server_pattern4_port_01_test_nested_pattern_4_nested2_test_nested2Level: - - test_nested2Level - - link_pd_server_pattern4_port_01_test_nested_pattern_4_nested2 - dependency_cmaui_port_1_test_nested2Level: - - test_nested2Level - - dependency_cmaui_port_1 local_storage_server_pd_pattern4_test_nested_pattern_4_main_1: - test_nested_pattern_4_main_1 - local_storage_server_pd_pattern4 @@ -2276,54 +2276,48 @@ topology_template: dependency_server_nested2_pd_1b_test_nested2Level: - test_nested2Level - dependency_server_nested2_pd_1b + link_cmaui_1c1_nested2_2_mgmt_port_0_test_nested2Level: + - test_nested2Level + - link_cmaui_1c1_nested2_2_mgmt_port_0 dependency_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - test_nested2Level - dependency_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file dependency_server_nested2_ps_1b_test_nested2Level: - test_nested2Level - dependency_server_nested2_ps_1b + dependency_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - dependency_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file dependency_jsa_security_group1_test_nested3Level_test_nested2Level: - test_nested2Level - dependency_jsa_security_group1_test_nested3Level - link_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - - test_nested2Level - - link_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file local_storage_server_main_1c1_cmaui_11: - abstract_cmaui_1c1_main - local_storage_cmaui_1c1_main dependency_pd_server_main_1b_port_1: - abstract_pd_server_main_1b - - dependency_pd_server_main_1b_pd_server_main_1b_port - link_cmaui_port_11: - - abstract_cmaui_1c1_main - - link_cmaui_1c1_main_cmaui_port - dependency_pd_server_pattern4_port_01_test_nested_pattern_4_nested2_test_nested2Level: - - test_nested2Level - - dependency_pd_server_pattern4_port_01_test_nested_pattern_4_nested2 + - dependency_pd_server_main_1b_pd_server_main_1b_port_1 link_ps_server_main_1b_port_1: - abstract_ps_server_main_1b - - link_ps_server_main_1b_ps_server_main_1b_port + - link_ps_server_main_1b_ps_server_main_1b_port_1 dependency_jsa_security_group1_test_resourceGroup_test_nested2Level: - test_nested2Level - dependency_jsa_security_group1_test_resourceGroup - dependency_pd_server_pattern4_port_02_test_nested_pattern_4_nested2_test_nested2Level: + dependency_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2_test_nested2Level: - test_nested2Level - - dependency_pd_server_pattern4_port_02_test_nested_pattern_4_nested2 - link_cmaui_port_2_test_nested2Level: + - dependency_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2 + link_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2_test_nested2Level: - test_nested2Level - - link_cmaui_port_2 - link_cmaui_port_12: - - abstract_cmaui_1c1_main - - link_cmaui_1c1_main_cmaui_port + - link_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2 dependency_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - test_nested2Level - dependency_test_nested_pattern_4_same_type_diff_file link_pd_server_main_1b_port_1: - abstract_pd_server_main_1b - - link_pd_server_main_1b_pd_server_main_1b_port - link_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - - test_nested2Level - - link_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file + - link_pd_server_main_1b_pd_server_main_1b_port_1 + link_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - link_pd_server_pattern4_1_oam_port_0 port_jsa_security_group2_test_resourceGroup_test_nested2Level: - test_nested2Level - port_jsa_security_group2_test_resourceGroup @@ -2339,9 +2333,6 @@ topology_template: dependency_server_pd_pattern4_test_nested_pattern_4_main_1: - test_nested_pattern_4_main_1 - dependency_server_pd_pattern4 - link_cmaui_port_1_test_nested2Level: - - test_nested2Level - - link_cmaui_port_1 local_storage_server_main_1c1_cmaui_21: - abstract_cmaui_1c1_main - local_storage_cmaui_1c1_main @@ -2354,18 +2345,27 @@ topology_template: link_ps_server_nested2_1b_port_test_nested2Level: - test_nested2Level - link_ps_server_nested2_1b_port + link_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - link_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file + dependency_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - dependency_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file dependency_server_main_1c1_cmaui_11: - abstract_cmaui_1c1_main - dependency_cmaui_1c1_main dependency_ps_server_main_1b_port_1: - abstract_ps_server_main_1b - - dependency_ps_server_main_1b_ps_server_main_1b_port + - dependency_ps_server_main_1b_ps_server_main_1b_port_1 port_jsa_security_group1_test_resourceGroup_test_nested2Level: - test_nested2Level - port_jsa_security_group1_test_resourceGroup dependency_test_nested_pattern_4_nested2_test_nested2Level: - test_nested2Level - dependency_test_nested_pattern_4_nested2 + link_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - link_pd_server_pattern4_0_oam_port_0 dependency_test_nested3Level_test_nested2Level: - test_nested2Level - - dependency_test_nested3Level \ No newline at end of file + - dependency_test_nested3Level 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 8e569f47cd..e4f5c1efed 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 @@ -149,23 +149,23 @@ topology_template: directives: - substitutable properties: + port_pd_server_pattern4_0_oam_port_0_mac_requirements: + mac_count_required: + is_required: false p1: get_input: jsa_name service_template_filter: substitute_service_template: nested-pattern-4ServiceTemplate.yaml - port_pd_server_pattern4_port_01_mac_requirements: + port_pd_server_pattern4_1_oam_port_0_mac_requirements: mac_count_required: is_required: false - port_pd_server_pattern4_port_02_ip_requirements: + port_pd_server_pattern4_0_oam_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false - port_pd_server_pattern4_port_02_mac_requirements: - mac_count_required: - is_required: false - port_pd_server_pattern4_port_01_ip_requirements: + port_pd_server_pattern4_1_oam_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: true @@ -189,24 +189,24 @@ topology_template: get_input: jsa_name service_template_filter: substitute_service_template: nested-pattern-4-same-typeServiceTemplate.yaml - port_pd_server_pattern4_port_1_ip_requirements: + port_pd_server_pattern4_0_mgmt_port_0_mac_requirements: + mac_count_required: + is_required: false + port_pd_server_pattern4_0_mgmt_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false - port_pd_server_pattern4_port_2_mac_requirements: - mac_count_required: - is_required: false - port_pd_server_pattern4_port_1_mac_requirements: - mac_count_required: - is_required: false - port_pd_server_pattern4_port_2_ip_requirements: + port_pd_server_pattern4_1_mgmt_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false + port_pd_server_pattern4_1_mgmt_port_0_mac_requirements: + mac_count_required: + is_required: false abstract_ps_server_nested2_1b: type: org.openecomp.resource.abstract.nodes.ps_server_nested2_1b directives: @@ -269,7 +269,16 @@ topology_template: directives: - substitutable properties: - port_cmaui_port_fixed_ips: + port_cmaui_1c1_nested2_mgmt_port_0_mac_requirements: + mac_count_required: + is_required: false + port_cmaui_1c1_nested2_mgmt_port_0_replacement_policy: + - AUTO + - AUTO + vm_flavor_name: + get_input: cmaui_1c1_nested2_flavor + port_cmaui_1c1_nested2_mgmt_port_0_network_role_tag: contrail + port_cmaui_1c1_nested2_mgmt_port_0_fixed_ips: - - ip_address: get_input: - cmaui_oam_ips @@ -278,21 +287,12 @@ topology_template: get_input: - cmaui_oam_ips - 0 - port_cmaui_port_network: - - get_input: contrail_net_name - - get_input: contrail_net_name - port_cmaui_port_network_role_tag: contrail - vm_flavor_name: - get_input: cmaui_1c1_nested2_flavor - port_cmaui_port_mac_requirements: - mac_count_required: - is_required: false - port_cmaui_port_replacement_policy: - - AUTO - - AUTO vm_image_name: get_input: cmaui_1c1_nested2_image - port_cmaui_port_ip_requirements: + port_cmaui_1c1_nested2_mgmt_port_0_network: + - get_input: contrail_net_name + - get_input: contrail_net_name + port_cmaui_1c1_nested2_mgmt_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: true @@ -346,6 +346,9 @@ topology_template: network.incoming.packets.rate_pd_server_nested2_1b_port: - abstract_pd_server_nested2_1b - network.incoming.packets.rate_pd_server_nested2_1b_pd_server_nested2_1b_port + network.incoming.bytes_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - network.incoming.bytes_pd_server_pattern4_1_oam_port_0 os_server_nested2_pd_1b: - abstract_pd_server_nested2_1b - os_pd_server_nested2_1b @@ -355,6 +358,9 @@ topology_template: disk.device.write.bytes_server_pd_pattern4_test_nested_pattern_4_nested2: - test_nested_pattern_4_nested2 - disk.device.write.bytes_server_pd_pattern4 + feature_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - feature_pd_server_pattern4_1_oam_port_0 vcpus_server_nested2_pd_1b: - abstract_pd_server_nested2_1b - vcpus_pd_server_nested2_1b @@ -373,9 +379,6 @@ topology_template: disk.device.latency_server_nested2_1c1_cmaui_1: - abstract_cmaui_1c1_nested2 - disk.device.latency_cmaui_1c1_nested2 - forwarder_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file: - - test_nested_pattern_4_same_type_diff_file - - forwarder_pd_server_pattern4_port_2 disk.iops_server_nested2_ps_1b: - abstract_ps_server_nested2_1b - disk.iops_ps_server_nested2_1b @@ -403,27 +406,24 @@ topology_template: cpu_server_pd_pattern4_test_nested_pattern_4_nested2: - test_nested_pattern_4_nested2 - cpu_server_pd_pattern4 - network.outgoing.bytes_cmaui_port_2: - - abstract_cmaui_1c1_nested2 - - network.outgoing.bytes_cmaui_1c1_nested2_cmaui_port + feature_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - feature_pd_server_pattern4_1_mgmt_port_0 + network.outgoing.packets.rate_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - network.outgoing.packets.rate_pd_server_pattern4_0_mgmt_port_0 disk.device.allocation_server_nested2_pd_1b: - abstract_pd_server_nested2_1b - disk.device.allocation_pd_server_nested2_1b - network.outgoing.bytes_cmaui_port_1: - - abstract_cmaui_1c1_nested2 - - network.outgoing.bytes_cmaui_1c1_nested2_cmaui_port disk.read.requests_server_pd_pattern4_test_nested_pattern_4_nested2: - test_nested_pattern_4_nested2 - disk.read.requests_server_pd_pattern4 - network.incoming.bytes.rate_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file: - - test_nested_pattern_4_same_type_diff_file - - network.incoming.bytes.rate_pd_server_pattern4_port_1 + network.outgoing.bytes.rate_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - network.outgoing.bytes.rate_pd_server_pattern4_1_oam_port_0 disk.write.bytes.rate_server_nested2_ps_1b: - abstract_ps_server_nested2_1b - disk.write.bytes.rate_ps_server_nested2_1b - network.incoming.packets.rate_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file: - - test_nested_pattern_4_same_type_diff_file - - network.incoming.packets.rate_pd_server_pattern4_port_2 disk.device.write.requests_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file: - test_nested_pattern_4_same_type_diff_file - disk.device.write.requests_server_pd_pattern4_1 @@ -451,15 +451,6 @@ topology_template: attachment_ps_server_nested2_1b_port: - abstract_ps_server_nested2_1b - attachment_ps_server_nested2_1b_ps_server_nested2_1b_port - binding_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file: - - test_nested_pattern_4_same_type_diff_file - - binding_pd_server_pattern4_port_1 - forwarder_pd_server_pattern4_port_01_test_nested_pattern_4_nested2: - - test_nested_pattern_4_nested2 - - forwarder_pd_server_pattern4_port_01 - attachment_pd_server_pattern4_port_02_test_nested_pattern_4_nested2: - - test_nested_pattern_4_nested2 - - attachment_pd_server_pattern4_port_02 disk.device.iops_server_nested2_ps_1b: - abstract_ps_server_nested2_1b - disk.device.iops_ps_server_nested2_1b @@ -475,90 +466,75 @@ topology_template: cpu_util_server_nested2_pd_1b: - abstract_pd_server_nested2_1b - cpu_util_pd_server_nested2_1b - network.incoming.packets_pd_server_pattern4_port_01_test_nested_pattern_4_nested2: - - test_nested_pattern_4_nested2 - - network.incoming.packets_pd_server_pattern4_port_01 + network.incoming.packets.rate_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - network.incoming.packets.rate_pd_server_pattern4_1_mgmt_port_0 network.incoming.packets_pd_server_nested2_1b_port: - abstract_pd_server_nested2_1b - network.incoming.packets_pd_server_nested2_1b_pd_server_nested2_1b_port disk.write.bytes.rate_server_nested2_pd_1b: - abstract_pd_server_nested2_1b - disk.write.bytes.rate_pd_server_nested2_1b - network.incoming.packets.rate_pd_server_pattern4_port_02_test_nested_pattern_4_nested2: - - test_nested_pattern_4_nested2 - - network.incoming.packets.rate_pd_server_pattern4_port_02 disk.device.capacity_server_nested2_1c1_cmaui_1: - abstract_cmaui_1c1_nested2 - disk.device.capacity_cmaui_1c1_nested2 disk.device.capacity_server_nested2_1c1_cmaui_2: - abstract_cmaui_1c1_nested2 - disk.device.capacity_cmaui_1c1_nested2 - binding_pd_server_pattern4_port_02_test_nested_pattern_4_nested2: - - test_nested_pattern_4_nested2 - - binding_pd_server_pattern4_port_02 - network.outpoing.packets_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file: - - test_nested_pattern_4_same_type_diff_file - - network.outpoing.packets_pd_server_pattern4_port_1 disk.device.write.requests.rate_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file: - test_nested_pattern_4_same_type_diff_file - disk.device.write.requests.rate_server_pd_pattern4_1 + network.incoming.bytes.rate_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - network.incoming.bytes.rate_pd_server_pattern4_1_mgmt_port_0 disk.write.bytes_server_nested2_ps_1b: - abstract_ps_server_nested2_1b - disk.write.bytes_ps_server_nested2_1b disk.latency_server_nested2_pd_1b: - abstract_pd_server_nested2_1b - disk.latency_pd_server_nested2_1b - network.incoming.packets_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file: + feature_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file: - test_nested_pattern_4_same_type_diff_file - - network.incoming.packets_pd_server_pattern4_port_1 - network.incoming.packets_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file: - - test_nested_pattern_4_same_type_diff_file - - network.incoming.packets_pd_server_pattern4_port_2 - binding_cmaui_port_1: - - abstract_cmaui_1c1_nested2 - - binding_cmaui_1c1_nested2_cmaui_port - binding_cmaui_port_2: - - abstract_cmaui_1c1_nested2 - - binding_cmaui_1c1_nested2_cmaui_port - network.outgoing.packets.rate_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file: + - feature_pd_server_pattern4_0_mgmt_port_0 + network.incoming.bytes_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file: - test_nested_pattern_4_same_type_diff_file - - network.outgoing.packets.rate_pd_server_pattern4_port_1 + - network.incoming.bytes_pd_server_pattern4_1_mgmt_port_0 disk.device.capacity_server_nested2_ps_1b: - abstract_ps_server_nested2_1b - disk.device.capacity_ps_server_nested2_1b - network.outgoing.bytes.rate_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file: + network.outgoing.packets.rate_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file: - test_nested_pattern_4_same_type_diff_file - - network.outgoing.bytes.rate_pd_server_pattern4_port_1 - network.outpoing.packets_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file: + - network.outgoing.packets.rate_pd_server_pattern4_1_mgmt_port_0 + binding_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - binding_pd_server_pattern4_1_oam_port_0 + network.incoming.packets_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - network.incoming.packets_pd_server_pattern4_0_oam_port_0 + attachment_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file: - test_nested_pattern_4_same_type_diff_file - - network.outpoing.packets_pd_server_pattern4_port_2 + - attachment_pd_server_pattern4_1_mgmt_port_0 disk.read.requests_server_nested2_ps_1b: - abstract_ps_server_nested2_1b - disk.read.requests_ps_server_nested2_1b + binding_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - binding_pd_server_pattern4_0_mgmt_port_0 network.incoming.bytes_ps_server_nested2_1b_port: - abstract_ps_server_nested2_1b - network.incoming.bytes_ps_server_nested2_1b_ps_server_nested2_1b_port - network.outgoing.bytes.rate_pd_server_pattern4_port_02_test_nested_pattern_4_nested2: - - test_nested_pattern_4_nested2 - - network.outgoing.bytes.rate_pd_server_pattern4_port_02 feature_test_resourceGroup: - test_resourceGroup - feature disk.read.bytes_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file: - test_nested_pattern_4_same_type_diff_file - disk.read.bytes_server_pd_pattern4_1 - network.incoming.bytes_cmaui_port_2: - - abstract_cmaui_1c1_nested2 - - network.incoming.bytes_cmaui_1c1_nested2_cmaui_port disk.device.write.requests.rate_server_pd_pattern4_test_nested_pattern_4_nested2: - test_nested_pattern_4_nested2 - disk.device.write.requests.rate_server_pd_pattern4 disk.device.read.bytes.rate_server_nested2_pd_1b: - abstract_pd_server_nested2_1b - disk.device.read.bytes.rate_pd_server_nested2_1b - network.incoming.bytes_cmaui_port_1: - - abstract_cmaui_1c1_nested2 - - network.incoming.bytes_cmaui_1c1_nested2_cmaui_port disk.write.requests.rate_server_nested2_pd_1b: - abstract_pd_server_nested2_1b - disk.write.requests.rate_pd_server_nested2_1b @@ -571,69 +547,66 @@ topology_template: disk.allocation_server_nested2_1c1_cmaui_2: - abstract_cmaui_1c1_nested2 - disk.allocation_cmaui_1c1_nested2 + network.incoming.packets.rate_cmaui_1c1_nested2_2_mgmt_port_0: + - abstract_cmaui_1c1_nested2 + - network.incoming.packets.rate_cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0 disk.usage_server_nested2_ps_1b: - abstract_ps_server_nested2_1b - disk.usage_ps_server_nested2_1b disk.allocation_server_nested2_1c1_cmaui_1: - abstract_cmaui_1c1_nested2 - disk.allocation_cmaui_1c1_nested2 - network.incoming.packets.rate_pd_server_pattern4_port_01_test_nested_pattern_4_nested2: + attachment_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2: - test_nested_pattern_4_nested2 - - network.incoming.packets.rate_pd_server_pattern4_port_01 + - attachment_pd_server_pattern4_0_oam_port_0 + forwarder_cmaui_1c1_nested2_1_mgmt_port_0: + - abstract_cmaui_1c1_nested2 + - forwarder_cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0 disk.device.write.bytes.rate_server_nested2_1c1_cmaui_2: - abstract_cmaui_1c1_nested2 - disk.device.write.bytes.rate_cmaui_1c1_nested2 - network.incoming.packets.rate_cmaui_port_1: - - abstract_cmaui_1c1_nested2 - - network.incoming.packets.rate_cmaui_1c1_nested2_cmaui_port - network.incoming.packets.rate_cmaui_port_2: - - abstract_cmaui_1c1_nested2 - - network.incoming.packets.rate_cmaui_1c1_nested2_cmaui_port disk.device.write.bytes.rate_server_nested2_1c1_cmaui_1: - abstract_cmaui_1c1_nested2 - disk.device.write.bytes.rate_cmaui_1c1_nested2 - feature_cmaui_port_1: - - abstract_cmaui_1c1_nested2 - - feature_cmaui_1c1_nested2_cmaui_port - feature_cmaui_port_2: - - abstract_cmaui_1c1_nested2 - - feature_cmaui_1c1_nested2_cmaui_port os_server_nested2_ps_1b: - abstract_ps_server_nested2_1b - os_ps_server_nested2_1b + network.incoming.bytes.rate_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - network.incoming.bytes.rate_pd_server_pattern4_1_oam_port_0 disk.device.read.requests_server_nested2_ps_1b: - abstract_ps_server_nested2_1b - disk.device.read.requests_ps_server_nested2_1b - network.outgoing.packets.rate_pd_server_pattern4_port_01_test_nested_pattern_4_nested2: - - test_nested_pattern_4_nested2 - - network.outgoing.packets.rate_pd_server_pattern4_port_01 disk.ephemeral.size_server_nested2_ps_1b: - abstract_ps_server_nested2_1b - disk.ephemeral.size_ps_server_nested2_1b disk.device.iops_server_nested2_pd_1b: - abstract_pd_server_nested2_1b - disk.device.iops_pd_server_nested2_1b - network.incoming.packets.rate_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file: - - test_nested_pattern_4_same_type_diff_file - - network.incoming.packets.rate_pd_server_pattern4_port_1 feature_jsa_security_group1_test_resourceGroup: - test_resourceGroup - feature_jsa_security_group1 + network.incoming.packets_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - network.incoming.packets_pd_server_pattern4_0_mgmt_port_0 disk.write.requests.rate_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file: - test_nested_pattern_4_same_type_diff_file - disk.write.requests.rate_server_pd_pattern4_1 disk.device.usage_server_nested2_ps_1b: - abstract_ps_server_nested2_1b - disk.device.usage_ps_server_nested2_1b - feature_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file: - - test_nested_pattern_4_same_type_diff_file - - feature_pd_server_pattern4_port_2 + feature_cmaui_1c1_nested2_1_mgmt_port_0: + - abstract_cmaui_1c1_nested2 + - feature_cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0 disk.device.write.requests.rate_server_nested2_1c1_cmaui_2: - abstract_cmaui_1c1_nested2 - disk.device.write.requests.rate_cmaui_1c1_nested2 disk.device.write.requests.rate_server_nested2_1c1_cmaui_1: - abstract_cmaui_1c1_nested2 - disk.device.write.requests.rate_cmaui_1c1_nested2 + network.incoming.bytes_cmaui_1c1_nested2_2_mgmt_port_0: + - abstract_cmaui_1c1_nested2 + - network.incoming.bytes_cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0 memory.usage_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file: - test_nested_pattern_4_same_type_diff_file - memory.usage_server_pd_pattern4_1 @@ -643,6 +616,12 @@ topology_template: cpu_util_server_pd_pattern4_test_nested_pattern_4_nested2: - test_nested_pattern_4_nested2 - cpu_util_server_pd_pattern4 + network.incoming.packets.rate_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - network.incoming.packets.rate_pd_server_pattern4_0_oam_port_0 + network.outgoing.bytes.rate_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - network.outgoing.bytes.rate_pd_server_pattern4_1_mgmt_port_0 binding_server_nested2_1c1_cmaui_2: - abstract_cmaui_1c1_nested2 - binding_cmaui_1c1_nested2 @@ -670,30 +649,27 @@ topology_template: memory.usage_server_nested2_ps_1b: - abstract_ps_server_nested2_1b - memory.usage_ps_server_nested2_1b + network.outgoing.bytes.rate_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - network.outgoing.bytes.rate_pd_server_pattern4_0_oam_port_0 disk.read.bytes.rate_server_nested2_1c1_cmaui_2: - abstract_cmaui_1c1_nested2 - disk.read.bytes.rate_cmaui_1c1_nested2 cpu_util_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file: - test_nested_pattern_4_same_type_diff_file - cpu_util_server_pd_pattern4_1 + network.outgoing.packets.rate_cmaui_1c1_nested2_1_mgmt_port_0: + - abstract_cmaui_1c1_nested2 + - network.outgoing.packets.rate_cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0 disk.read.bytes.rate_server_nested2_1c1_cmaui_1: - abstract_cmaui_1c1_nested2 - disk.read.bytes.rate_cmaui_1c1_nested2 endpoint_server_nested2_ps_1b: - abstract_ps_server_nested2_1b - endpoint_ps_server_nested2_1b - network.incoming.bytes_pd_server_pattern4_port_02_test_nested_pattern_4_nested2: - - test_nested_pattern_4_nested2 - - network.incoming.bytes_pd_server_pattern4_port_02 - forwarder_cmaui_port_2: - - abstract_cmaui_1c1_nested2 - - forwarder_cmaui_1c1_nested2_cmaui_port network.incoming.bytes_pd_server_nested2_1b_port: - abstract_pd_server_nested2_1b - network.incoming.bytes_pd_server_nested2_1b_pd_server_nested2_1b_port - forwarder_cmaui_port_1: - - abstract_cmaui_1c1_nested2 - - forwarder_cmaui_1c1_nested2_cmaui_port vcpus_server_nested2_1c1_cmaui_2: - abstract_cmaui_1c1_nested2 - vcpus_cmaui_1c1_nested2 @@ -718,24 +694,39 @@ topology_template: network.outgoing.bytes_ps_server_nested2_1b_port: - abstract_ps_server_nested2_1b - network.outgoing.bytes_ps_server_nested2_1b_ps_server_nested2_1b_port + network.incoming.bytes.rate_cmaui_1c1_nested2_2_mgmt_port_0: + - abstract_cmaui_1c1_nested2 + - network.incoming.bytes.rate_cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0 disk.write.requests_server_nested2_pd_1b: - abstract_pd_server_nested2_1b - disk.write.requests_pd_server_nested2_1b + attachment_cmaui_1c1_nested2_1_mgmt_port_0: + - abstract_cmaui_1c1_nested2 + - attachment_cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0 + forwarder_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - forwarder_pd_server_pattern4_1_oam_port_0 disk.device.write.bytes_server_nested2_ps_1b: - abstract_ps_server_nested2_1b - disk.device.write.bytes_ps_server_nested2_1b - network.outgoing.bytes_pd_server_pattern4_port_02_test_nested_pattern_4_nested2: - - test_nested_pattern_4_nested2 - - network.outgoing.bytes_pd_server_pattern4_port_02 disk.latency_server_nested2_ps_1b: - abstract_ps_server_nested2_1b - disk.latency_ps_server_nested2_1b memory.resident_server_nested2_1c1_cmaui_1: - abstract_cmaui_1c1_nested2 - memory.resident_cmaui_1c1_nested2 - network.incoming.bytes.rate_pd_server_pattern4_port_02_test_nested_pattern_4_nested2: + network.incoming.bytes.rate_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - network.incoming.bytes.rate_pd_server_pattern4_0_mgmt_port_0 + network.incoming.packets_cmaui_1c1_nested2_1_mgmt_port_0: + - abstract_cmaui_1c1_nested2 + - network.incoming.packets_cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0 + network.outgoing.bytes_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - network.outgoing.bytes_pd_server_pattern4_1_oam_port_0 + feature_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2: - test_nested_pattern_4_nested2 - - network.incoming.bytes.rate_pd_server_pattern4_port_02 + - feature_pd_server_pattern4_0_oam_port_0 disk.device.allocation_server_pd_pattern4_test_nested_pattern_4_nested2: - test_nested_pattern_4_nested2 - disk.device.allocation_server_pd_pattern4 @@ -745,6 +736,9 @@ topology_template: feature_pd_server_nested2_1b_port: - abstract_pd_server_nested2_1b - feature_pd_server_nested2_1b_pd_server_nested2_1b_port + network.outpoing.packets_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - network.outpoing.packets_pd_server_pattern4_0_oam_port_0 cpu_util_server_nested2_ps_1b: - abstract_ps_server_nested2_1b - cpu_util_ps_server_nested2_1b @@ -754,6 +748,9 @@ topology_template: disk.read.requests_server_nested2_pd_1b: - abstract_pd_server_nested2_1b - disk.read.requests_pd_server_nested2_1b + network.outgoing.packets.rate_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - network.outgoing.packets.rate_pd_server_pattern4_1_oam_port_0 disk.device.read.requests.rate_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file: - test_nested_pattern_4_same_type_diff_file - disk.device.read.requests.rate_server_pd_pattern4_1 @@ -787,24 +784,12 @@ topology_template: attachment_pd_server_nested2_1b_port: - abstract_pd_server_nested2_1b - attachment_pd_server_nested2_1b_pd_server_nested2_1b_port - attachment_pd_server_pattern4_port_01_test_nested_pattern_4_nested2: - - test_nested_pattern_4_nested2 - - attachment_pd_server_pattern4_port_01 - feature_pd_server_pattern4_port_02_test_nested_pattern_4_nested2: - - test_nested_pattern_4_nested2 - - feature_pd_server_pattern4_port_02 feature_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file: - test_nested_pattern_4_same_type_diff_file - feature_server_pd_pattern4_1 disk.allocation_server_pd_pattern4_test_nested_pattern_4_nested2: - test_nested_pattern_4_nested2 - disk.allocation_server_pd_pattern4 - network.outpoing.packets_cmaui_port_1: - - abstract_cmaui_1c1_nested2 - - network.outpoing.packets_cmaui_1c1_nested2_cmaui_port - network.outpoing.packets_cmaui_port_2: - - abstract_cmaui_1c1_nested2 - - network.outpoing.packets_cmaui_1c1_nested2_cmaui_port disk.iops_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file: - test_nested_pattern_4_same_type_diff_file - disk.iops_server_pd_pattern4_1 @@ -823,6 +808,9 @@ topology_template: disk.device.usage_server_nested2_1c1_cmaui_1: - abstract_cmaui_1c1_nested2 - disk.device.usage_cmaui_1c1_nested2 + binding_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - binding_pd_server_pattern4_0_oam_port_0 feature_server_pd_pattern4_test_nested_pattern_4_nested2: - test_nested_pattern_4_nested2 - feature_server_pd_pattern4 @@ -835,6 +823,9 @@ topology_template: feature_server_nested2_ps_1b: - abstract_ps_server_nested2_1b - feature_ps_server_nested2_1b + binding_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - binding_pd_server_pattern4_1_mgmt_port_0 memory.resident_server_nested2_1c1_cmaui_2: - abstract_cmaui_1c1_nested2 - memory.resident_cmaui_1c1_nested2 @@ -850,6 +841,9 @@ topology_template: disk.latency_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file: - test_nested_pattern_4_same_type_diff_file - disk.latency_server_pd_pattern4_1 + forwarder_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - forwarder_pd_server_pattern4_1_mgmt_port_0 disk.device.iops_server_nested2_1c1_cmaui_1: - abstract_cmaui_1c1_nested2 - disk.device.iops_cmaui_1c1_nested2 @@ -859,33 +853,42 @@ topology_template: disk.device.usage_server_pd_pattern4_test_nested_pattern_4_nested2: - test_nested_pattern_4_nested2 - disk.device.usage_server_pd_pattern4 + forwarder_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - forwarder_pd_server_pattern4_0_oam_port_0 disk.device.write.bytes.rate_server_nested2_pd_1b: - abstract_pd_server_nested2_1b - disk.device.write.bytes.rate_pd_server_nested2_1b forwarder_ps_server_nested2_1b_port: - abstract_ps_server_nested2_1b - forwarder_ps_server_nested2_1b_ps_server_nested2_1b_port - attachment_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file: - - test_nested_pattern_4_same_type_diff_file - - attachment_pd_server_pattern4_port_2 network.outgoing.bytes.rate_pd_server_nested2_1b_port: - abstract_pd_server_nested2_1b - network.outgoing.bytes.rate_pd_server_nested2_1b_pd_server_nested2_1b_port network.incoming.packets.rate_ps_server_nested2_1b_port: - abstract_ps_server_nested2_1b - network.incoming.packets.rate_ps_server_nested2_1b_ps_server_nested2_1b_port - binding_pd_server_pattern4_port_01_test_nested_pattern_4_nested2: - - test_nested_pattern_4_nested2 - - binding_pd_server_pattern4_port_01 disk.device.read.requests_server_nested2_1c1_cmaui_2: - abstract_cmaui_1c1_nested2 - disk.device.read.requests_cmaui_1c1_nested2 binding_ps_server_nested2_1b_port: - abstract_ps_server_nested2_1b - binding_ps_server_nested2_1b_ps_server_nested2_1b_port + binding_cmaui_1c1_nested2_2_mgmt_port_0: + - abstract_cmaui_1c1_nested2 + - binding_cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0 + network.outgoing.packets.rate_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - network.outgoing.packets.rate_pd_server_pattern4_0_oam_port_0 + network.outpoing.packets_cmaui_1c1_nested2_1_mgmt_port_0: + - abstract_cmaui_1c1_nested2 + - network.outpoing.packets_cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0 host_server_pd_pattern4_test_nested_pattern_4_nested2: - test_nested_pattern_4_nested2 - host_server_pd_pattern4 + network.outpoing.packets_cmaui_1c1_nested2_2_mgmt_port_0: + - abstract_cmaui_1c1_nested2 + - network.outpoing.packets_cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0 disk.device.read.requests_server_pd_pattern4_test_nested_pattern_4_nested2: - test_nested_pattern_4_nested2 - disk.device.read.requests_server_pd_pattern4 @@ -898,24 +901,12 @@ topology_template: disk.device.read.bytes.rate_server_nested2_ps_1b: - abstract_ps_server_nested2_1b - disk.device.read.bytes.rate_ps_server_nested2_1b - network.outgoing.bytes.rate_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file: - - test_nested_pattern_4_same_type_diff_file - - network.outgoing.bytes.rate_pd_server_pattern4_port_2 - network.incoming.bytes_pd_server_pattern4_port_01_test_nested_pattern_4_nested2: - - test_nested_pattern_4_nested2 - - network.incoming.bytes_pd_server_pattern4_port_01 disk.write.bytes_server_pd_pattern4_test_nested_pattern_4_nested2: - test_nested_pattern_4_nested2 - disk.write.bytes_server_pd_pattern4 disk.device.read.requests_server_nested2_1c1_cmaui_1: - abstract_cmaui_1c1_nested2 - disk.device.read.requests_cmaui_1c1_nested2 - feature_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file: - - test_nested_pattern_4_same_type_diff_file - - feature_pd_server_pattern4_port_1 - network.outgoing.bytes.rate_pd_server_pattern4_port_01_test_nested_pattern_4_nested2: - - test_nested_pattern_4_nested2 - - network.outgoing.bytes.rate_pd_server_pattern4_port_01 scalable_server_nested2_1c1_cmaui_2: - abstract_cmaui_1c1_nested2 - scalable_cmaui_1c1_nested2 @@ -928,18 +919,21 @@ topology_template: cpu_server_nested2_pd_1b: - abstract_pd_server_nested2_1b - cpu_pd_server_nested2_1b - network.outpoing.packets_pd_server_pattern4_port_01_test_nested_pattern_4_nested2: - - test_nested_pattern_4_nested2 - - network.outpoing.packets_pd_server_pattern4_port_01 disk.device.latency_server_nested2_ps_1b: - abstract_ps_server_nested2_1b - disk.device.latency_ps_server_nested2_1b disk.capacity_server_nested2_pd_1b: - abstract_pd_server_nested2_1b - disk.capacity_pd_server_nested2_1b + network.outgoing.bytes.rate_cmaui_1c1_nested2_1_mgmt_port_0: + - abstract_cmaui_1c1_nested2 + - network.outgoing.bytes.rate_cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0 memory.usage_server_nested2_pd_1b: - abstract_pd_server_nested2_1b - memory.usage_pd_server_nested2_1b + network.outgoing.bytes.rate_cmaui_1c1_nested2_2_mgmt_port_0: + - abstract_cmaui_1c1_nested2 + - network.outgoing.bytes.rate_cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0 disk.write.bytes_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file: - test_nested_pattern_4_same_type_diff_file - disk.write.bytes_server_pd_pattern4_1 @@ -958,6 +952,9 @@ topology_template: host_server_nested2_1c1_cmaui_1: - abstract_cmaui_1c1_nested2 - host_cmaui_1c1_nested2 + binding_cmaui_1c1_nested2_1_mgmt_port_0: + - abstract_cmaui_1c1_nested2 + - binding_cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0 host_server_nested2_1c1_cmaui_2: - abstract_cmaui_1c1_nested2 - host_cmaui_1c1_nested2 @@ -967,9 +964,6 @@ topology_template: feature_jsa_security_group1_test_nested3Level: - test_nested3Level - feature_jsa_security_group1 - network.outgoing.bytes_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file: - - test_nested_pattern_4_same_type_diff_file - - network.outgoing.bytes_pd_server_pattern4_port_2 disk.capacity_server_nested2_1c1_cmaui_1: - abstract_cmaui_1c1_nested2 - disk.capacity_cmaui_1c1_nested2 @@ -988,15 +982,9 @@ topology_template: disk.write.requests_server_pd_pattern4_test_nested_pattern_4_nested2: - test_nested_pattern_4_nested2 - disk.write.requests_server_pd_pattern4 - feature_pd_server_pattern4_port_01_test_nested_pattern_4_nested2: - - test_nested_pattern_4_nested2 - - feature_pd_server_pattern4_port_01 endpoint_server_nested2_1c1_cmaui_2: - abstract_cmaui_1c1_nested2 - endpoint_cmaui_1c1_nested2 - network.incoming.packets_cmaui_port_2: - - abstract_cmaui_1c1_nested2 - - network.incoming.packets_cmaui_1c1_nested2_cmaui_port disk.device.write.requests.rate_server_nested2_ps_1b: - abstract_ps_server_nested2_1b - disk.device.write.requests.rate_ps_server_nested2_1b @@ -1006,12 +994,12 @@ topology_template: binding_server_nested2_pd_1b: - abstract_pd_server_nested2_1b - binding_pd_server_nested2_1b - network.incoming.packets_cmaui_port_1: - - abstract_cmaui_1c1_nested2 - - network.incoming.packets_cmaui_1c1_nested2_cmaui_port feature_jsa_security_group2_test_nested3Level: - test_nested3Level - feature_jsa_security_group2 + network.outpoing.packets_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - network.outpoing.packets_pd_server_pattern4_0_mgmt_port_0 feature_test_nested_pattern_4_nested2: - test_nested_pattern_4_nested2 - feature @@ -1033,12 +1021,12 @@ topology_template: disk.usage_server_nested2_1c1_cmaui_2: - abstract_cmaui_1c1_nested2 - disk.usage_cmaui_1c1_nested2 + forwarder_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - forwarder_pd_server_pattern4_0_mgmt_port_0 disk.device.write.requests_server_nested2_pd_1b: - abstract_pd_server_nested2_1b - disk.device.write.requests_pd_server_nested2_1b - network.incoming.bytes_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file: - - test_nested_pattern_4_same_type_diff_file - - network.incoming.bytes_pd_server_pattern4_port_2 disk.root.size_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file: - test_nested_pattern_4_same_type_diff_file - disk.root.size_server_pd_pattern4_1 @@ -1048,9 +1036,6 @@ topology_template: disk.write.requests_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file: - test_nested_pattern_4_same_type_diff_file - disk.write.requests_server_pd_pattern4_1 - network.incoming.bytes_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file: - - test_nested_pattern_4_same_type_diff_file - - network.incoming.bytes_pd_server_pattern4_port_1 host_server_nested2_ps_1b: - abstract_ps_server_nested2_1b - host_ps_server_nested2_1b @@ -1069,27 +1054,36 @@ topology_template: disk.read.requests_server_nested2_1c1_cmaui_2: - abstract_cmaui_1c1_nested2 - disk.read.requests_cmaui_1c1_nested2 + network.outgoing.bytes_cmaui_1c1_nested2_2_mgmt_port_0: + - abstract_cmaui_1c1_nested2 + - network.outgoing.bytes_cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0 + feature_cmaui_1c1_nested2_2_mgmt_port_0: + - abstract_cmaui_1c1_nested2 + - feature_cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0 disk.device.read.requests.rate_server_nested2_1c1_cmaui_2: - abstract_cmaui_1c1_nested2 - disk.device.read.requests.rate_cmaui_1c1_nested2 - network.incoming.packets_pd_server_pattern4_port_02_test_nested_pattern_4_nested2: - - test_nested_pattern_4_nested2 - - network.incoming.packets_pd_server_pattern4_port_02 disk.read.requests_server_nested2_1c1_cmaui_1: - abstract_cmaui_1c1_nested2 - disk.read.requests_cmaui_1c1_nested2 disk.device.read.requests.rate_server_nested2_1c1_cmaui_1: - abstract_cmaui_1c1_nested2 - disk.device.read.requests.rate_cmaui_1c1_nested2 + network.outgoing.bytes_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - network.outgoing.bytes_pd_server_pattern4_1_mgmt_port_0 + network.outgoing.bytes_cmaui_1c1_nested2_1_mgmt_port_0: + - abstract_cmaui_1c1_nested2 + - network.outgoing.bytes_cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0 cpu_server_nested2_1c1_cmaui_1: - abstract_cmaui_1c1_nested2 - cpu_cmaui_1c1_nested2 - network.outgoing.packets.rate_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file: - - test_nested_pattern_4_same_type_diff_file - - network.outgoing.packets.rate_pd_server_pattern4_port_2 cpu_server_nested2_1c1_cmaui_2: - abstract_cmaui_1c1_nested2 - cpu_cmaui_1c1_nested2 + network.outpoing.packets_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - network.outpoing.packets_pd_server_pattern4_1_oam_port_0 instance_server_nested2_pd_1b: - abstract_pd_server_nested2_1b - instance_pd_server_nested2_1b @@ -1108,18 +1102,15 @@ topology_template: disk.device.write.requests_server_nested2_1c1_cmaui_2: - abstract_cmaui_1c1_nested2 - disk.device.write.requests_cmaui_1c1_nested2 - network.outgoing.bytes.rate_cmaui_port_2: - - abstract_cmaui_1c1_nested2 - - network.outgoing.bytes.rate_cmaui_1c1_nested2_cmaui_port + network.outgoing.bytes_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - network.outgoing.bytes_pd_server_pattern4_0_oam_port_0 disk.write.requests_server_nested2_ps_1b: - abstract_ps_server_nested2_1b - disk.write.requests_ps_server_nested2_1b disk.device.read.requests.rate_server_pd_pattern4_test_nested_pattern_4_nested2: - test_nested_pattern_4_nested2 - disk.device.read.requests.rate_server_pd_pattern4 - network.outgoing.bytes.rate_cmaui_port_1: - - abstract_cmaui_1c1_nested2 - - network.outgoing.bytes.rate_cmaui_1c1_nested2_cmaui_port disk.device.write.bytes_server_nested2_1c1_cmaui_2: - abstract_cmaui_1c1_nested2 - disk.device.write.bytes_cmaui_1c1_nested2 @@ -1150,15 +1141,18 @@ topology_template: os_server_pd_pattern4_test_nested_pattern_4_nested2: - test_nested_pattern_4_nested2 - os_server_pd_pattern4 - forwarder_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file: - - test_nested_pattern_4_same_type_diff_file - - forwarder_pd_server_pattern4_port_1 + network.incoming.bytes_cmaui_1c1_nested2_1_mgmt_port_0: + - abstract_cmaui_1c1_nested2 + - network.incoming.bytes_cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0 + forwarder_cmaui_1c1_nested2_2_mgmt_port_0: + - abstract_cmaui_1c1_nested2 + - forwarder_cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0 disk.device.read.requests_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file: - test_nested_pattern_4_same_type_diff_file - disk.device.read.requests_server_pd_pattern4_1 - attachment_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file: - - test_nested_pattern_4_same_type_diff_file - - attachment_pd_server_pattern4_port_1 + network.incoming.packets.rate_cmaui_1c1_nested2_1_mgmt_port_0: + - abstract_cmaui_1c1_nested2 + - network.incoming.packets.rate_cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0 disk.write.requests_server_nested2_1c1_cmaui_1: - abstract_cmaui_1c1_nested2 - disk.write.requests_cmaui_1c1_nested2 @@ -1180,9 +1174,6 @@ topology_template: disk.ephemeral.size_server_nested2_1c1_cmaui_2: - abstract_cmaui_1c1_nested2 - disk.ephemeral.size_cmaui_1c1_nested2 - network.outpoing.packets_pd_server_pattern4_port_02_test_nested_pattern_4_nested2: - - test_nested_pattern_4_nested2 - - network.outpoing.packets_pd_server_pattern4_port_02 disk.device.capacity_server_pd_pattern4_test_nested_pattern_4_nested2: - test_nested_pattern_4_nested2 - disk.device.capacity_server_pd_pattern4 @@ -1192,15 +1183,9 @@ topology_template: disk.device.read.bytes.rate_server_pd_pattern4_test_nested_pattern_4_nested2: - test_nested_pattern_4_nested2 - disk.device.read.bytes.rate_server_pd_pattern4 - forwarder_pd_server_pattern4_port_02_test_nested_pattern_4_nested2: - - test_nested_pattern_4_nested2 - - forwarder_pd_server_pattern4_port_02 disk.capacity_server_pd_pattern4_test_nested_pattern_4_nested2: - test_nested_pattern_4_nested2 - disk.capacity_server_pd_pattern4 - attachment_cmaui_port_2: - - abstract_cmaui_1c1_nested2 - - attachment_cmaui_1c1_nested2_cmaui_port disk.allocation_server_nested2_pd_1b: - abstract_pd_server_nested2_1b - disk.allocation_pd_server_nested2_1b @@ -1219,39 +1204,30 @@ topology_template: disk.device.read.bytes_server_pd_pattern4_test_nested_pattern_4_nested2: - test_nested_pattern_4_nested2 - disk.device.read.bytes_server_pd_pattern4 - network.incoming.bytes.rate_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file: - - test_nested_pattern_4_same_type_diff_file - - network.incoming.bytes.rate_pd_server_pattern4_port_2 - network.outgoing.packets.rate_cmaui_port_1: - - abstract_cmaui_1c1_nested2 - - network.outgoing.packets.rate_cmaui_1c1_nested2_cmaui_port - network.outgoing.packets.rate_cmaui_port_2: - - abstract_cmaui_1c1_nested2 - - network.outgoing.packets.rate_cmaui_1c1_nested2_cmaui_port - attachment_cmaui_port_1: - - abstract_cmaui_1c1_nested2 - - attachment_cmaui_1c1_nested2_cmaui_port disk.device.iops_server_pd_pattern4_test_nested_pattern_4_nested2: - test_nested_pattern_4_nested2 - disk.device.iops_server_pd_pattern4 disk.device.read.bytes_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file: - test_nested_pattern_4_same_type_diff_file - disk.device.read.bytes_server_pd_pattern4_1 + network.incoming.packets.rate_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - network.incoming.packets.rate_pd_server_pattern4_1_oam_port_0 disk.root.size_server_nested2_1c1_cmaui_2: - abstract_cmaui_1c1_nested2 - disk.root.size_cmaui_1c1_nested2 disk.root.size_server_nested2_1c1_cmaui_1: - abstract_cmaui_1c1_nested2 - disk.root.size_cmaui_1c1_nested2 + network.incoming.packets_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - network.incoming.packets_pd_server_pattern4_1_mgmt_port_0 disk.device.latency_server_nested2_pd_1b: - abstract_pd_server_nested2_1b - disk.device.latency_pd_server_nested2_1b disk.write.bytes_server_nested2_1c1_cmaui_2: - abstract_cmaui_1c1_nested2 - disk.write.bytes_cmaui_1c1_nested2 - network.outgoing.bytes_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file: - - test_nested_pattern_4_same_type_diff_file - - network.outgoing.bytes_pd_server_pattern4_port_1 disk.usage_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file: - test_nested_pattern_4_same_type_diff_file - disk.usage_server_pd_pattern4_1 @@ -1267,24 +1243,36 @@ topology_template: disk.iops_server_nested2_1c1_cmaui_1: - abstract_cmaui_1c1_nested2 - disk.iops_cmaui_1c1_nested2 - network.outgoing.bytes_pd_server_pattern4_port_01_test_nested_pattern_4_nested2: - - test_nested_pattern_4_nested2 - - network.outgoing.bytes_pd_server_pattern4_port_01 + network.outgoing.packets.rate_cmaui_1c1_nested2_2_mgmt_port_0: + - abstract_cmaui_1c1_nested2 + - network.outgoing.packets.rate_cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0 disk.iops_server_nested2_pd_1b: - abstract_pd_server_nested2_1b - disk.iops_pd_server_nested2_1b disk.device.read.bytes.rate_server_nested2_1c1_cmaui_1: - abstract_cmaui_1c1_nested2 - disk.device.read.bytes.rate_cmaui_1c1_nested2 - binding_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file: - - test_nested_pattern_4_same_type_diff_file - - binding_pd_server_pattern4_port_2 disk.device.read.bytes.rate_server_nested2_1c1_cmaui_2: - abstract_cmaui_1c1_nested2 - disk.device.read.bytes.rate_cmaui_1c1_nested2 disk.latency_server_nested2_1c1_cmaui_2: - abstract_cmaui_1c1_nested2 - disk.latency_cmaui_1c1_nested2 + attachment_cmaui_1c1_nested2_2_mgmt_port_0: + - abstract_cmaui_1c1_nested2 + - attachment_cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0 + network.incoming.packets_cmaui_1c1_nested2_2_mgmt_port_0: + - abstract_cmaui_1c1_nested2 + - network.incoming.packets_cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0 + network.incoming.bytes.rate_cmaui_1c1_nested2_1_mgmt_port_0: + - abstract_cmaui_1c1_nested2 + - network.incoming.bytes.rate_cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0 + attachment_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - attachment_pd_server_pattern4_0_mgmt_port_0 + network.incoming.bytes.rate_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - network.incoming.bytes.rate_pd_server_pattern4_0_oam_port_0 vcpus_server_pd_pattern4_test_nested_pattern_4_nested2: - test_nested_pattern_4_nested2 - vcpus_server_pd_pattern4 @@ -1294,6 +1282,9 @@ topology_template: disk.device.write.requests_server_nested2_ps_1b: - abstract_ps_server_nested2_1b - disk.device.write.requests_ps_server_nested2_1b + network.outgoing.bytes_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - network.outgoing.bytes_pd_server_pattern4_0_mgmt_port_0 endpoint_server_pd_pattern4_test_nested_pattern_4_nested2: - test_nested_pattern_4_nested2 - endpoint_server_pd_pattern4 @@ -1303,9 +1294,18 @@ topology_template: memory_server_nested2_pd_1b: - abstract_pd_server_nested2_1b - memory_pd_server_nested2_1b + network.outgoing.bytes.rate_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - network.outgoing.bytes.rate_pd_server_pattern4_0_mgmt_port_0 + network.incoming.bytes_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - network.incoming.bytes_pd_server_pattern4_0_mgmt_port_0 disk.write.requests.rate_server_nested2_ps_1b: - abstract_ps_server_nested2_1b - disk.write.requests.rate_ps_server_nested2_1b + network.incoming.bytes_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - network.incoming.bytes_pd_server_pattern4_0_oam_port_0 cpu_util_server_nested2_1c1_cmaui_2: - abstract_cmaui_1c1_nested2 - cpu_util_cmaui_1c1_nested2 @@ -1318,18 +1318,12 @@ topology_template: cpu_util_server_nested2_1c1_cmaui_1: - abstract_cmaui_1c1_nested2 - cpu_util_cmaui_1c1_nested2 + network.incoming.packets_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - network.incoming.packets_pd_server_pattern4_1_oam_port_0 instance_server_nested2_ps_1b: - abstract_ps_server_nested2_1b - instance_ps_server_nested2_1b - network.incoming.bytes.rate_pd_server_pattern4_port_01_test_nested_pattern_4_nested2: - - test_nested_pattern_4_nested2 - - network.incoming.bytes.rate_pd_server_pattern4_port_01 - network.incoming.bytes.rate_cmaui_port_1: - - abstract_cmaui_1c1_nested2 - - network.incoming.bytes.rate_cmaui_1c1_nested2_cmaui_port - network.incoming.bytes.rate_cmaui_port_2: - - abstract_cmaui_1c1_nested2 - - network.incoming.bytes.rate_cmaui_1c1_nested2_cmaui_port host_server_nested2_pd_1b: - abstract_pd_server_nested2_1b - host_pd_server_nested2_1b @@ -1342,6 +1336,9 @@ topology_template: binding_pd_server_nested2_1b_port: - abstract_pd_server_nested2_1b - binding_pd_server_nested2_1b_pd_server_nested2_1b_port + network.incoming.packets.rate_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - network.incoming.packets.rate_pd_server_pattern4_0_mgmt_port_0 disk.root.size_server_pd_pattern4_test_nested_pattern_4_nested2: - test_nested_pattern_4_nested2 - disk.root.size_server_pd_pattern4 @@ -1372,12 +1369,15 @@ topology_template: network.outgoing.bytes_pd_server_nested2_1b_port: - abstract_pd_server_nested2_1b - network.outgoing.bytes_pd_server_nested2_1b_pd_server_nested2_1b_port - network.outgoing.packets.rate_pd_server_pattern4_port_02_test_nested_pattern_4_nested2: - - test_nested_pattern_4_nested2 - - network.outgoing.packets.rate_pd_server_pattern4_port_02 disk.device.allocation_server_nested2_1c1_cmaui_1: - abstract_cmaui_1c1_nested2 - disk.device.allocation_cmaui_1c1_nested2 + network.outpoing.packets_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - network.outpoing.packets_pd_server_pattern4_1_mgmt_port_0 + attachment_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - attachment_pd_server_pattern4_1_oam_port_0 cpu.delta_server_nested2_ps_1b: - abstract_ps_server_nested2_1b - cpu.delta_ps_server_nested2_1b @@ -1415,42 +1415,30 @@ topology_template: dependency_server_nested2_1c1_cmaui_1: - abstract_cmaui_1c1_nested2 - dependency_cmaui_1c1_nested2 - dependency_pd_server_pattern4_port_01_test_nested_pattern_4_nested2: + dependency_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2: - test_nested_pattern_4_nested2 - - dependency_pd_server_pattern4_port_01 + - dependency_pd_server_pattern4_0_oam_port_0 port_jsa_security_group2_test_nested3Level: - test_nested3Level - port_jsa_security_group2 dependency_server_nested2_pd_1b: - abstract_pd_server_nested2_1b - dependency_pd_server_nested2_1b - link_cmaui_port_2: - - abstract_cmaui_1c1_nested2 - - link_cmaui_1c1_nested2_cmaui_port - link_pd_server_pattern4_port_02_test_nested_pattern_4_nested2: - - test_nested_pattern_4_nested2 - - link_pd_server_pattern4_port_02 - link_cmaui_port_1: - - abstract_cmaui_1c1_nested2 - - link_cmaui_1c1_nested2_cmaui_port local_storage_server_nested2_ps_1b: - abstract_ps_server_nested2_1b - local_storage_ps_server_nested2_1b dependency_test_resourceGroup: - test_resourceGroup - dependency + dependency_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - dependency_pd_server_pattern4_1_oam_port_0 local_storage_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file: - test_nested_pattern_4_same_type_diff_file - local_storage_server_pd_pattern4_1 - dependency_pd_server_pattern4_port_02_test_nested_pattern_4_nested2: - - test_nested_pattern_4_nested2 - - dependency_pd_server_pattern4_port_02 - dependency_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file: + dependency_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file: - test_nested_pattern_4_same_type_diff_file - - dependency_pd_server_pattern4_port_1 - dependency_cmaui_port_1: - - abstract_cmaui_1c1_nested2 - - dependency_cmaui_1c1_nested2_cmaui_port + - dependency_pd_server_pattern4_0_mgmt_port_0 link_pd_server_nested2_1b_port: - abstract_pd_server_nested2_1b - link_pd_server_nested2_1b_pd_server_nested2_1b_port @@ -1460,36 +1448,36 @@ topology_template: dependency_test_nested3Level: - test_nested3Level - dependency - dependency_cmaui_port_2: - - abstract_cmaui_1c1_nested2 - - dependency_cmaui_1c1_nested2_cmaui_port dependency_pd_server_nested2_1b_port: - abstract_pd_server_nested2_1b - dependency_pd_server_nested2_1b_pd_server_nested2_1b_port + link_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - link_pd_server_pattern4_0_oam_port_0 port_jsa_security_group1_test_nested3Level: - test_nested3Level - port_jsa_security_group1 dependency_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file: - test_nested_pattern_4_same_type_diff_file - dependency_server_pd_pattern4_1 - link_pd_server_pattern4_port_01_test_nested_pattern_4_nested2: + link_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2: - test_nested_pattern_4_nested2 - - link_pd_server_pattern4_port_01 + - link_pd_server_pattern4_1_oam_port_0 dependency_ps_server_nested2_1b_port: - abstract_ps_server_nested2_1b - dependency_ps_server_nested2_1b_ps_server_nested2_1b_port - dependency_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file: - - test_nested_pattern_4_same_type_diff_file - - dependency_pd_server_pattern4_port_2 - link_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file: + dependency_cmaui_1c1_nested2_2_mgmt_port_0: + - abstract_cmaui_1c1_nested2 + - dependency_cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0 + dependency_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file: - test_nested_pattern_4_same_type_diff_file - - link_pd_server_pattern4_port_2 + - dependency_pd_server_pattern4_1_mgmt_port_0 dependency_jsa_security_group1_test_nested3Level: - test_nested3Level - dependency_jsa_security_group1 - link_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file: + link_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file: - test_nested_pattern_4_same_type_diff_file - - link_pd_server_pattern4_port_1 + - link_pd_server_pattern4_1_mgmt_port_0 local_storage_server_nested2_1c1_cmaui_2: - abstract_cmaui_1c1_nested2 - local_storage_cmaui_1c1_nested2 @@ -1504,4 +1492,16 @@ topology_template: - local_storage_cmaui_1c1_nested2 dependency_test_nested_pattern_4_nested2: - test_nested_pattern_4_nested2 - - dependency \ No newline at end of file + - dependency + dependency_cmaui_1c1_nested2_1_mgmt_port_0: + - abstract_cmaui_1c1_nested2 + - dependency_cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0 + link_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - link_pd_server_pattern4_0_mgmt_port_0 + link_cmaui_1c1_nested2_2_mgmt_port_0: + - abstract_cmaui_1c1_nested2 + - link_cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0 + link_cmaui_1c1_nested2_1_mgmt_port_0: + - abstract_cmaui_1c1_nested2 + - link_cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0 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/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/GlobalSubstitutionTypesServiceTemplate.yaml index e00b9d0529..e7bcdefd3c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,6 +8,12 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_pd02_port_0_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements index_value: type: integer description: Index value of this substitution service template runtime instance @@ -28,68 +34,62 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd02_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pd02_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED vm_flavor_name: type: string required: true status: SUPPORTED - port_pd02_port_order: - type: integer + port_pd02_port_0_network: + type: list required: true status: SUPPORTED - port_pd02_port_subnetpoolid: + entry_schema: + type: string + port_pd02_port_0_network_role: type: string required: true status: SUPPORTED - port_pd02_port_network_role_tag: - type: string + port_pd02_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_pd02_port_vlan_requirements: - type: list + port_pd02_port_0_order: + type: integer required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements vm_image_name: type: string required: true status: SUPPORTED - port_pd02_port_network_role: + port_pd02_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_pd02_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_pd02_port_ip_requirements: + port_pd02_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd02_port_network: - type: list + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd02_port_0_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: string - compute_pd_server_user_data_format: + port_pd02_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd02_port_related_networks: + type: org.openecomp.datatypes.network.VlanRequirements + compute_pd_server_user_data_format: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments + type: string requirements: - dependency_pd_server: capability: tosca.capabilities.Node @@ -105,20 +105,28 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pd02_port: + - dependency_pd_server_pd02_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd02_port: + - link_pd_server_pd02_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: + binding_pd_server_pd02_port_0: + 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 scalable_pd_server: type: tosca.capabilities.Scalable occurrences: @@ -159,6 +167,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.packets.rate_pd_server_pd02_port_0: + 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_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -189,15 +203,7 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_pd02_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 - network.outgoing.packets.rate_pd_server_pd02_port: + network.outpoing.packets_pd_server_pd02_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -221,29 +227,11 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd02_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_pd_server_pd02_port: + feature_pd_server_pd02_port_0: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pd_server_pd02_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_pd_server_pd02_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 vcpus_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -267,11 +255,6 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_pd_server_pd02_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED disk.capacity_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -290,12 +273,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_pd_server_pd02_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 binding_pd_server: type: tosca.capabilities.network.Bindable occurrences: @@ -318,7 +295,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pd02_port: + network.outgoing.bytes.rate_pd_server_pd02_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -330,6 +307,18 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes_pd_server_pd02_port_0: + 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_pd_server_pd02_port_0: + 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_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -354,6 +343,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets_pd_server_pd02_port_0: + 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_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -373,36 +368,42 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pd02_port: - type: tosca.capabilities.Attachment + network.incoming.packets.rate_pd_server_pd02_port_0: + 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_pd_server: + network.incoming.bytes.rate_pd_server_pd02_port_0: 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.ephemeral.size_pd_server: + disk.write.requests.rate_pd_server: 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_pd_server: + disk.ephemeral.size_pd_server: 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_pd_server: + attachment_pd_server_pd02_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + disk.write.requests_pd_server: 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_pd_server_pd02_port: + disk.device.latency_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -426,15 +427,26 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd02_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_pd_server_pd02_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED org.openecomp.resource.abstract.nodes.ps_1: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_pd01_port_1_security_groups: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_pd01_port_1_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements index_value: type: integer description: Index value of this substitution service template runtime instance @@ -443,17 +455,11 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_pd01_port_replacement_policy: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd01_port_1_order: + type: integer required: true status: SUPPORTED - port_pd01_port_related_networks: + port_pd01_port_1_related_networks: type: list required: true status: SUPPORTED @@ -463,16 +469,24 @@ node_types: type: string required: true status: SUPPORTED - port_pd01_port_security_groups: + port_pd01_port_1_network_role: + type: string + required: true + status: SUPPORTED + port_pd01_port_1_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: json - port_pd01_port_mac_requirements: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_1_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED + port_pd01_port_1_subnetpoolid: + type: string + required: true + status: SUPPORTED vm_image_name: type: string required: true @@ -483,52 +497,38 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_fixed_ips: + port_pd01_port_1_replacement_policy: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_pd01_port_ip_requirements: - type: list + type: string + port_pd01_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + compute_ps_name: type: list required: true status: SUPPORTED entry_schema: type: string - compute_ps_name: + port_pd01_port_1_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd01_port_order: - type: integer - required: true - status: SUPPORTED - port_pd01_port_subnetpoolid: - type: string - required: true - status: SUPPORTED - port_pd01_port_network_role: - type: string - required: true - status: SUPPORTED - port_pd01_port_network_role_tag: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_pd01_port_1_network_role_tag: type: string required: true status: SUPPORTED - port_pd01_port_vlan_requirements: + port_pd01_port_1_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: string requirements: - dependency_ps: capability: tosca.capabilities.Node @@ -544,14 +544,14 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_ps_pd01_port: + - dependency_ps_pd01_port_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_ps_pd01_port: + - link_ps_pd01_port_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -570,12 +570,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_ps_pd01_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_ps: type: tosca.capabilities.Scalable occurrences: @@ -618,14 +612,14 @@ node_types: occurrences: - 1 - UNBOUNDED - endpoint_ps: - type: tosca.capabilities.Endpoint.Admin + network.incoming.bytes.rate_ps_pd01_port_1: + 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_ps_pd01_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + endpoint_ps: + type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED @@ -641,23 +635,19 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_ps_pd01_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED disk.device.write.bytes_ps: 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_ps_pd01_port: - type: org.openecomp.capabilities.Forwarder + cpu.delta_ps: + 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_ps: + network.incoming.packets_ps_pd01_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -680,54 +670,65 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_ps_pd01_port: + disk.device.write.requests.rate_ps: 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_ps: + network.outgoing.bytes_ps_pd01_port_1: 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_ps_pd01_port: - type: tosca.capabilities.Node + cpu_util_ps: + 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_ps_pd01_port: + disk.read.bytes.rate_ps: 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_ps: + disk.device.read.bytes.rate_ps: 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_ps: + forwarder_ps_pd01_port_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + disk.read.requests_ps: 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_ps: + vcpus_ps: 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_ps: + network.incoming.packets.rate_ps_pd01_port_1: 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_ps: + attachment_ps_pd01_port_1: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes_ps_pd01_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -745,31 +746,28 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_ps_pd01_port: + disk.device.read.bytes_ps: 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_ps: + memory.usage_ps: 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_ps: + network.outgoing.bytes.rate_ps_pd01_port_1: 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_ps_pd01_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 + feature_ps_pd01_port_1: + type: tosca.capabilities.Node occurrences: - - 0 + - 1 - UNBOUNDED feature_ps: type: tosca.capabilities.Node @@ -782,12 +780,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_ps_pd01_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.ephemeral.size_ps: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -817,12 +809,20 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_ps_pd01_port: + network.outgoing.packets.rate_ps_pd01_port_1: 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_ps_pd01_port_1: + 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 disk.iops_ps: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -853,7 +853,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_ps_pd01_port: + network.outpoing.packets_ps_pd01_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -874,82 +874,82 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server_1: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - status: SUPPORTED - constraints: - - greater_or_equal: 0 - compute_pd_server_availability_zone: - type: list + port_pd01_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: string - compute_pd_server_name: + port_pd01_port_0_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_pd01_port_related_networks: + port_pd01_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - vm_flavor_name: + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - vm_image_name: + port_pd01_port_0_network_role: type: string required: true status: SUPPORTED - port_pd01_port_ip_requirements: + port_pd01_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + status: SUPPORTED + constraints: + - greater_or_equal: 0 + compute_pd_server_availability_zone: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd01_port_order: - type: integer + compute_pd_server_name: + type: list required: true status: SUPPORTED - port_pd01_port_subnetpoolid: + entry_schema: + type: string + vm_flavor_name: type: string required: true status: SUPPORTED - port_pd01_port_network_role: - type: string + port_pd01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_pd01_port_0_order: + type: integer required: true status: SUPPORTED - port_pd01_port_network_role_tag: + vm_image_name: type: string required: true status: SUPPORTED - port_pd01_port_vlan_requirements: + port_pd01_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_0_subnetpoolid: + type: string + required: true + status: SUPPORTED compute_pd_server_user_data_format: type: list required: true @@ -971,20 +971,28 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pd01_port: + - dependency_pd_server_pd01_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd01_port: + - link_pd_server_pd01_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: + binding_pd_server_pd01_port_0: + 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 scalable_pd_server: type: tosca.capabilities.Scalable occurrences: @@ -1014,12 +1022,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pd01_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 os_pd_server: type: tosca.capabilities.OperatingSystem occurrences: @@ -1031,12 +1033,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd01_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_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1067,7 +1063,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd01_port: + network.incoming.packets_pd_server_pd01_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1091,7 +1087,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pd01_port: + network.incoming.packets.rate_pd_server_pd01_port_0: + 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_pd_server_pd01_port_0: + 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.packets.rate_pd_server_pd01_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1109,6 +1117,11 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_pd_server_pd01_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED disk.device.write.requests_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1120,17 +1133,17 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pd01_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED disk.capacity_pd_server: 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_pd_server_pd01_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.allocation_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1154,6 +1167,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes.rate_pd_server_pd01_port_0: + 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_pd_server: type: tosca.capabilities.Node occurrences: @@ -1165,27 +1184,19 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_pd01_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 disk.write.bytes_pd_server: 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_pd_server_pd01_port: + network.outgoing.bytes_pd_server_pd01_port_0: 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_pd_server_pd01_port: + network.incoming.bytes_pd_server_pd01_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1215,6 +1226,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_pd_server_pd01_port_0: + 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_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1234,14 +1251,8 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pd01_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 - forwarder_pd_server_pd01_port: - type: org.openecomp.capabilities.Forwarder + feature_pd_server_pd01_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -1263,11 +1274,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_pd01_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.device.latency_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1286,12 +1292,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pd01_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.device.iops_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1301,22 +1301,12 @@ node_types: org.openecomp.resource.abstract.nodes.oam: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_oam02_port_network: + port_oam02_port_2_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_oam02_port_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_oam02_port_network_role: - type: string - required: true - status: SUPPORTED index_value: type: integer description: Index value of this substitution service template runtime instance @@ -1325,90 +1315,87 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_oam02_port_fixed_ips: + port_oam02_port_2_security_groups: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps + type: json vm_flavor_name: type: string required: true status: SUPPORTED - port_oam02_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_oam02_port_security_groups: + port_oam02_port_2_replacement_policy: type: list required: true status: SUPPORTED entry_schema: - type: json - port_oam02_port_subnetpoolid: - type: string - required: true - status: SUPPORTED - port_oam02_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + type: string + port_oam02_port_2_fixed_ips: + type: list required: true status: SUPPORTED - port_oam02_port_order: - type: integer + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_oam02_port_2_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED vm_image_name: type: string required: true status: SUPPORTED - port_oam02_port_network_role_tag: + port_oam02_port_2_network_role_tag: type: string required: true status: SUPPORTED - port_oam02_port_replacement_policy: + port_oam02_port_2_order: + type: integer + required: true + status: SUPPORTED + port_oam02_port_2_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: string - port_oam02_port_related_networks: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_oam02_port_2_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments + type: org.openecomp.datatypes.network.IpRequirements + port_oam02_port_2_network_role: + type: string + required: true + status: SUPPORTED + port_oam02_port_2_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED compute_oam_availability_zone: type: list required: true status: SUPPORTED entry_schema: type: string - port_oam02_port_vlan_requirements: - type: list + port_oam02_port_2_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements compute_oam_name: type: list required: true status: SUPPORTED entry_schema: type: string + port_oam02_port_2_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements requirements: - - dependency_oam_oam02_port: - capability: tosca.capabilities.Node - node: tosca.nodes.Root - relationship: tosca.relationships.DependsOn - occurrences: - - 0 - - UNBOUNDED - - link_oam_oam02_port: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - dependency_oam: capability: tosca.capabilities.Node node: tosca.nodes.Root @@ -1423,74 +1410,67 @@ node_types: occurrences: - 0 - UNBOUNDED - capabilities: - cpu_oam: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + - dependency_oam_oam02_port_2: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn occurrences: - - 1 + - 0 - UNBOUNDED - network.incoming.bytes.rate_oam_oam02_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + - link_oam_oam02_port_2: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo occurrences: - 1 - - UNBOUNDED - disk.usage_oam: - 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_oam: + capabilities: + cpu_oam: 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_oam: + disk.usage_oam: 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_oam_oam02_port: + memory.resident_oam: 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_oam: + network.incoming.bytes.rate_oam_oam02_port_2: 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.packets.rate_oam_oam02_port: + disk.device.write.bytes_oam: 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_oam_oam02_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 - scalable_oam: - type: tosca.capabilities.Scalable + network.outgoing.bytes.rate_oam_oam02_port_2: + 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_oam_oam02_port: + disk.read.bytes_oam: 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_oam: + type: tosca.capabilities.Scalable + occurrences: + - 1 + - UNBOUNDED feature_oam: type: tosca.capabilities.Node occurrences: @@ -1502,6 +1482,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets.rate_oam_oam02_port_2: + 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_oam: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1519,6 +1505,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes_oam_oam02_port_2: + 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_oam: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1549,7 +1541,7 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_oam_oam02_port: + forwarder_oam_oam02_port_2: type: org.openecomp.capabilities.Forwarder occurrences: - 1 @@ -1560,13 +1552,21 @@ node_types: occurrences: - 1 - UNBOUNDED - instance_oam: + network.outgoing.packets.rate_oam_oam02_port_2: 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_oam_oam02_port: + binding_oam_oam02_port_2: + 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_oam: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1578,7 +1578,18 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_oam_oam02_port: + attachment_oam_oam02_port_2: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets_oam_oam02_port_2: + 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_oam_oam02_port_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1602,6 +1613,17 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_oam_oam02_port_2: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + network.outpoing.packets_oam_oam02_port_2: + 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_oam: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1674,23 +1696,12 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_oam_oam02_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED cpu_util_oam: 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_oam_oam02_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 os_oam: type: tosca.capabilities.OperatingSystem occurrences: @@ -1708,17 +1719,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_oam_oam02_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 - attachment_oam_oam02_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED disk.write.bytes_oam: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1740,36 +1740,16 @@ node_types: org.openecomp.resource.abstract.nodes.oam_1: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_oam01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_oam01_port_subnetpoolid: + port_oam01_port_1_network_role: type: string required: true status: SUPPORTED - port_oam01_port_order: - type: integer - required: true - status: SUPPORTED - port_oam01_port_ip_requirements: + port_oam01_port_1_ip_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_oam01_port_security_groups: - type: list - required: true - status: SUPPORTED - entry_schema: - type: json - port_oam01_port_network: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string index_value: type: integer description: Index value of this substitution service template runtime instance @@ -1778,7 +1758,7 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_oam01_port_replacement_policy: + port_oam01_port_1_network: type: list required: true status: SUPPORTED @@ -1788,61 +1768,81 @@ node_types: type: string required: true status: SUPPORTED - port_oam01_port_related_networks: + port_oam01_port_1_security_groups: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_oam01_port_1_related_networks: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - vm_image_name: + port_oam01_port_1_order: + type: integer + required: true + status: SUPPORTED + port_oam01_port_1_subnetpoolid: type: string required: true status: SUPPORTED - port_oam01_port_network_role: + vm_image_name: type: string required: true status: SUPPORTED - port_oam01_port_fixed_ips: + port_oam01_port_1_replacement_policy: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_oam01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + type: string + port_oam01_port_1_fixed_ips: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps compute_oam_availability_zone: type: list required: true status: SUPPORTED entry_schema: type: string - port_oam01_port_network_role_tag: + port_oam01_port_1_network_role_tag: type: string required: true status: SUPPORTED - compute_oam_name: + port_oam01_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_oam01_port_1_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_oam01_port_vlan_requirements: + type: org.openecomp.datatypes.network.VlanRequirements + port_oam01_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + compute_oam_name: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: string requirements: - - dependency_oam_oam01_port: + - dependency_oam_oam01_port_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_oam_oam01_port: + - link_oam_oam01_port_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -1869,39 +1869,31 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_oam_oam01_port: + disk.usage_oam: 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_oam_oam01_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 - network.outgoing.bytes.rate_oam_oam01_port: + memory.resident_oam: 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_oam: + network.outgoing.bytes.rate_oam_oam01_port_1: 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_oam: + disk.device.write.bytes_oam: 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_oam: + network.incoming.bytes.rate_oam_oam01_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1918,17 +1910,6 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_oam_oam01_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - network.incoming.bytes_oam_oam01_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_oam: type: tosca.capabilities.Node occurrences: @@ -1946,12 +1927,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_oam_oam01_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 binding_oam: type: tosca.capabilities.network.Bindable occurrences: @@ -1987,11 +1962,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_oam_oam01_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.write.requests_oam: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2010,7 +1980,12 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_oam_oam01_port: + attachment_oam_oam01_port_1: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets_oam_oam01_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2022,6 +1997,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes_oam_oam01_port_1: + 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_oam: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2040,13 +2021,18 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.read.requests.rate_oam: + feature_oam_oam01_port_1: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + network.outpoing.packets_oam_oam01_port_1: 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_oam_oam01_port: + disk.device.read.requests.rate_oam: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2082,11 +2068,6 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_oam_oam01_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED disk.device.read.bytes_oam: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2105,13 +2086,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_oam_oam01_port: + disk.device.read.requests_oam: 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_oam: + network.incoming.packets.rate_oam_oam01_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2129,6 +2110,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes_oam_oam01_port_1: + 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_oam: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2152,25 +2139,38 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.write.bytes_oam: + forwarder_oam_oam01_port_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + network.outgoing.packets.rate_oam_oam01_port_1: 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_oam: + disk.write.bytes_oam: 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_oam: + binding_oam_oam01_port_1: + 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 + disk.read.requests_oam: 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_oam_oam01_port: + disk.device.capacity_oam: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2179,34 +2179,36 @@ node_types: org.openecomp.resource.abstract.nodes.cmaui: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_cmaui02_port_related_networks: + port_cmaui02_port_2_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - status: SUPPORTED - constraints: - - greater_or_equal: 0 - port_cmaui02_port_exCP_naming: - type: org.openecomp.datatypes.Naming + type: org.openecomp.datatypes.network.VlanRequirements + port_cmaui02_port_2_network: + type: list required: true status: SUPPORTED - port_cmaui02_port_fixed_ips: + entry_schema: + type: string + port_cmaui02_port_2_replacement_policy: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_cmaui02_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + type: string + port_cmaui02_port_2_subnetpoolid: + type: string 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 vm_flavor_name: type: string required: true @@ -2217,71 +2219,69 @@ node_types: status: SUPPORTED entry_schema: type: string - port_cmaui02_port_vlan_requirements: + port_cmaui02_port_2_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.IpRequirements + port_cmaui02_port_2_network_role: + type: string + required: true + status: SUPPORTED + port_cmaui02_port_2_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED compute_cmaui_availability_zone: type: list required: true status: SUPPORTED entry_schema: type: string - vm_image_name: + port_cmaui02_port_2_network_role_tag: type: string required: true status: SUPPORTED - port_cmaui02_port_ip_requirements: + port_cmaui02_port_2_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_cmaui02_port_order: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_cmaui02_port_2_order: type: integer required: true status: SUPPORTED - port_cmaui02_port_replacement_policy: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_cmaui02_port_network_role: + vm_image_name: type: string required: true status: SUPPORTED - port_cmaui02_port_security_groups: + port_cmaui02_port_2_security_groups: type: list required: true status: SUPPORTED entry_schema: type: json - port_cmaui02_port_subnetpoolid: - type: string - required: true - status: SUPPORTED - port_cmaui02_port_network: + port_cmaui02_port_2_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: string - port_cmaui02_port_network_role_tag: - type: string + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_cmaui02_port_2_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED requirements: - - dependency_cmaui_cmaui02_port: + - dependency_cmaui_cmaui02_port_2: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_cmaui_cmaui02_port: + - link_cmaui_cmaui02_port_2: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -2302,7 +2302,7 @@ node_types: - 0 - UNBOUNDED capabilities: - network.incoming.bytes_cmaui_cmaui02_port: + network.incoming.bytes_cmaui_cmaui02_port_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2326,11 +2326,6 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_cmaui_cmaui02_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED disk.device.iops_cmaui: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2362,11 +2357,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_cmaui_cmaui02_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.read.bytes_cmaui: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2402,6 +2392,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_cmaui_cmaui02_port_2: + 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_cmaui: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2413,25 +2409,16 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.read.bytes.rate_cmaui: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_cmaui_cmaui02_port_2: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_cmaui_cmaui02_port: + disk.device.read.bytes.rate_cmaui: 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_cmaui_cmaui02_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 + - 1 - UNBOUNDED disk.device.usage_cmaui: type: org.openecomp.capabilities.metric.Ceilometer @@ -2451,25 +2438,25 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.read.requests_cmaui: + network.incoming.bytes.rate_cmaui_cmaui02_port_2: 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_cmaui: + disk.device.read.requests_cmaui: 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_cmaui: + disk.capacity_cmaui: 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.packets.rate_cmaui_cmaui02_port: + cpu_cmaui: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2487,12 +2474,42 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_cmaui_cmaui02_port_2: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.write.requests_cmaui: 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_cmaui_cmaui02_port_2: + 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_cmaui_cmaui02_port_2: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + binding_cmaui_cmaui02_port_2: + 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 + network.incoming.packets.rate_cmaui_cmaui02_port_2: + 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_cmaui: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2504,7 +2521,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_cmaui_cmaui02_port: + network.outgoing.packets.rate_cmaui_cmaui02_port_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2515,11 +2532,6 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_cmaui_cmaui02_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED endpoint_cmaui: type: tosca.capabilities.Endpoint.Admin occurrences: @@ -2549,25 +2561,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_cmaui_cmaui02_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.usage_cmaui: 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_cmaui: + network.outgoing.bytes.rate_cmaui_cmaui02_port_2: 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_cmaui_cmaui02_port: + disk.latency_cmaui: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2585,7 +2591,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_cmaui_cmaui02_port: + network.outgoing.bytes_cmaui_cmaui02_port_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2603,12 +2609,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_cmaui_cmaui02_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.device.write.requests.rate_cmaui: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2618,20 +2618,6 @@ node_types: org.openecomp.resource.abstract.nodes.cmaui_1: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_cmaui01_port_network_role: - type: string - required: true - status: SUPPORTED - port_cmaui01_port_order: - type: integer - required: true - status: SUPPORTED - port_cmaui01_port_replacement_policy: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string index_value: type: integer description: Index value of this substitution service template runtime instance @@ -2640,12 +2626,6 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_cmaui01_port_security_groups: - type: list - required: true - status: SUPPORTED - entry_schema: - type: json vm_flavor_name: type: string required: true @@ -2656,71 +2636,91 @@ node_types: status: SUPPORTED entry_schema: type: string - port_cmaui01_port_vlan_requirements: + port_cmaui01_port_1_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_cmaui01_port_1_order: + type: integer + required: true + status: SUPPORTED compute_cmaui_availability_zone: type: list required: true status: SUPPORTED entry_schema: type: string - port_cmaui01_port_subnetpoolid: - type: string + port_cmaui01_port_1_network: + type: list required: true status: SUPPORTED + entry_schema: + type: string vm_image_name: type: string required: true status: SUPPORTED - port_cmaui01_port_network_role_tag: + port_cmaui01_port_1_replacement_policy: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_cmaui01_port_1_network_role_tag: type: string required: true status: SUPPORTED - port_cmaui01_port_related_networks: + port_cmaui01_port_1_related_networks: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_cmaui01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_cmaui01_port_1_security_groups: + type: list required: true status: SUPPORTED - port_cmaui01_port_mac_requirements: + entry_schema: + type: json + port_cmaui01_port_1_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_cmaui01_port_fixed_ips: - type: list + port_cmaui01_port_1_network_role: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_cmaui01_port_network: + port_cmaui01_port_1_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_cmaui01_port_ip_requirements: + type: org.openecomp.datatypes.network.IpRequirements + port_cmaui01_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_cmaui01_port_1_subnetpoolid: + type: string + required: true + status: SUPPORTED + port_cmaui01_port_1_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: org.openecomp.datatypes.network.VlanRequirements requirements: - - dependency_cmaui_cmaui01_port: + - dependency_cmaui_cmaui01_port_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_cmaui_cmaui01_port: + - link_cmaui_cmaui01_port_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -2759,13 +2759,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_cmaui_cmaui01_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.incoming.packets.rate_cmaui_cmaui01_port: + network.incoming.bytes_cmaui_cmaui01_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2808,19 +2802,20 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.write.requests_cmaui: + network.outpoing.packets_cmaui_cmaui01_port_1: 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_cmaui: - type: tosca.capabilities.Scalable + disk.write.requests_cmaui: + 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_cmaui_cmaui01_port: - type: tosca.capabilities.Node + scalable_cmaui: + type: tosca.capabilities.Scalable occurrences: - 1 - UNBOUNDED @@ -2853,7 +2848,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_cmaui_cmaui01_port: + network.outgoing.packets.rate_cmaui_cmaui01_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2865,36 +2860,31 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_cmaui_cmaui01_port: + network.outgoing.bytes.rate_cmaui_cmaui01_port_1: 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_cmaui_cmaui01_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - network.outgoing.packets.rate_cmaui_cmaui01_port: + disk.device.usage_cmaui: 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_cmaui: + disk.iops_cmaui: 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.iops_cmaui: + disk.device.latency_cmaui: 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_cmaui: + network.outgoing.bytes_cmaui_cmaui01_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2918,42 +2908,49 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_cmaui_cmaui01_port: + disk.read.requests_cmaui: 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_cmaui: + disk.device.read.bytes_cmaui: 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 - attachment_cmaui_cmaui01_port: - type: tosca.capabilities.Attachment + feature_cmaui_cmaui01_port_1: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.device.read.bytes_cmaui: + network.incoming.packets_cmaui_cmaui01_port_1: 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_cmaui_cmaui01_port: + disk.device.write.requests_cmaui: 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_cmaui: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_cmaui_cmaui01_port_1: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_cmaui_cmaui01_port: + binding_cmaui_cmaui01_port_1: + 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 + network.incoming.packets.rate_cmaui_cmaui01_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2965,14 +2962,6 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_cmaui_cmaui01_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 feature_cmaui: type: tosca.capabilities.Node occurrences: @@ -2983,6 +2972,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes.rate_cmaui_cmaui01_port_1: + 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_cmaui: type: tosca.capabilities.Endpoint.Admin occurrences: @@ -3006,6 +3001,11 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_cmaui_cmaui01_port_1: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED disk.write.requests.rate_cmaui: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -6597,12 +6597,20 @@ node_types: org.openecomp.resource.abstract.nodes.ps: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_pd02_port_fixed_ips: + port_pd02_port_2_replacement_policy: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps + type: string + port_pd02_port_2_order: + type: integer + required: true + status: SUPPORTED + port_pd02_port_2_network_role: + type: string + required: true + status: SUPPORTED index_value: type: integer description: Index value of this substitution service template runtime instance @@ -6611,86 +6619,78 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_pd02_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - vm_flavor_name: - type: string - required: true - status: SUPPORTED - port_pd02_port_order: - type: integer + port_pd02_port_2_network: + type: list required: true status: SUPPORTED - port_pd02_port_subnetpoolid: - type: string + entry_schema: + type: string + port_pd02_port_2_vlan_requirements: + type: list required: true status: SUPPORTED - port_pd02_port_network_role_tag: + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd02_port_2_subnetpoolid: type: string required: true status: SUPPORTED - port_pd02_port_vlan_requirements: + port_pd02_port_2_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - vm_image_name: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + vm_flavor_name: type: string required: true status: SUPPORTED - port_pd02_port_security_groups: + port_pd02_port_2_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: json - compute_ps_availability_zone: + type: org.openecomp.datatypes.network.IpRequirements + port_pd02_port_2_security_groups: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd02_port_replacement_policy: + type: json + port_pd02_port_2_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd02_port_network_role: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_pd02_port_2_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + vm_image_name: type: string required: true status: SUPPORTED - compute_ps_name: + compute_ps_availability_zone: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd02_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_pd02_port_ip_requirements: - type: list + port_pd02_port_2_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd02_port_network: + compute_ps_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd02_port_related_networks: - type: list + port_pd02_port_2_network_role_tag: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments requirements: - dependency_ps: capability: tosca.capabilities.Node @@ -6706,14 +6706,14 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_ps_pd02_port: + - dependency_ps_pd02_port_2: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_ps_pd02_port: + - link_ps_pd02_port_2: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -6774,12 +6774,7 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_ps_pd02_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - network.outgoing.bytes.rate_ps_pd02_port: + network.incoming.bytes.rate_ps_pd02_port_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -6790,31 +6785,39 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.capacity_ps: + network.outgoing.bytes.rate_ps_pd02_port_2: 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_ps: + disk.device.capacity_ps: 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_ps_pd02_port: + cpu_ps: 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_ps: + network.outgoing.packets.rate_ps_pd02_port_2: 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.packets.rate_ps_pd02_port: + binding_ps_pd02_port_2: + 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 + disk.device.write.bytes_ps: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -6843,13 +6846,16 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_ps_pd02_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 + network.outpoing.packets_ps_pd02_port_2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - - 0 + - 1 + - UNBOUNDED + feature_ps_pd02_port_2: + type: tosca.capabilities.Node + occurrences: + - 1 - UNBOUNDED disk.device.write.requests.rate_ps: type: org.openecomp.capabilities.metric.Ceilometer @@ -6857,7 +6863,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_ps_pd02_port: + network.outgoing.bytes_ps_pd02_port_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -6869,19 +6875,17 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_ps_pd02_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_ps_pd02_port_2: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_ps_pd02_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_ps_pd02_port_2: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - network.incoming.bytes_ps_pd02_port: + network.incoming.bytes_ps_pd02_port_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -6917,6 +6921,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets.rate_ps_pd02_port_2: + 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_ps: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -6958,11 +6968,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_ps_pd02_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.usage_ps: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -6992,11 +6997,6 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_ps_pd02_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED disk.device.read.requests_ps: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -7015,7 +7015,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_ps_pd02_port: + network.incoming.packets_ps_pd02_port_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -7764,4 +7764,4 @@ node_types: type: tosca.capabilities.Node occurrences: - 1 - - UNBOUNDED \ No newline at end of file + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/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 8fdf0c1e04..d5a5f4c9b5 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 @@ -133,28 +133,28 @@ topology_template: directives: - substitutable properties: + port_pd02_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: - get_input: - pd_server_names - 1 - port_pd02_port_mac_requirements: - mac_count_required: - is_required: false vm_flavor_name: get_input: pd_flavor_name - port_pd02_port_network_role_tag: oam + port_pd02_port_0_network: + - get_input: oam_net_name + port_pd02_port_0_mac_requirements: + mac_count_required: + is_required: false vm_image_name: get_input: pd_image_name - port_pd02_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false - port_pd02_port_network: - - get_input: oam_net_name + port_pd02_port_0_network_role_tag: oam compute_pd_server_user_data_format: - RAW service_template_filter: @@ -170,6 +170,18 @@ topology_template: directives: - substitutable properties: + port_pd01_port_0_mac_requirements: + mac_count_required: + is_required: false + port_pd01_port_0_network: + - get_input: oam_net_name + port_pd01_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_pd01_port_0_network_role_tag: oam compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: @@ -178,20 +190,8 @@ topology_template: - 0 vm_flavor_name: get_input: pd_flavor_name - port_pd01_port_mac_requirements: - mac_count_required: - is_required: false vm_image_name: get_input: pd_image_name - port_pd01_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false - port_pd01_port_network: - - get_input: oam_net_name - port_pd01_port_network_role_tag: oam 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/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_cmauiServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_cmauiServiceTemplate.yaml index b7f6826e85..fe904e5a1e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_cmauiServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_cmauiServiceTemplate.yaml @@ -11,11 +11,24 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_cmaui02_port_related_networks: + port_cmaui02_port_2_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments + type: org.openecomp.datatypes.network.VlanRequirements + port_cmaui02_port_2_network: + type: list + required: true + entry_schema: + type: string + port_cmaui02_port_2_replacement_policy: + type: list + required: true + entry_schema: + type: string + port_cmaui02_port_2_subnetpoolid: + type: string + required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -23,17 +36,6 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_cmaui02_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_cmaui02_port_fixed_ips: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_cmaui02_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true vm_flavor_name: type: string required: true @@ -42,89 +44,87 @@ topology_template: required: true entry_schema: type: string - port_cmaui02_port_vlan_requirements: + port_cmaui02_port_2_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.IpRequirements + port_cmaui02_port_2_network_role: + type: string + required: true + port_cmaui02_port_2_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true compute_cmaui_availability_zone: type: list required: true entry_schema: type: string - vm_image_name: + port_cmaui02_port_2_network_role_tag: type: string required: true - port_cmaui02_port_ip_requirements: + port_cmaui02_port_2_related_networks: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_cmaui02_port_order: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_cmaui02_port_2_order: type: integer required: true - port_cmaui02_port_replacement_policy: - type: list - required: true - entry_schema: - type: string - port_cmaui02_port_network_role: + vm_image_name: type: string required: true - port_cmaui02_port_security_groups: + port_cmaui02_port_2_security_groups: type: list required: true entry_schema: type: json - port_cmaui02_port_subnetpoolid: - type: string - required: true - port_cmaui02_port_network: + port_cmaui02_port_2_fixed_ips: type: list required: true entry_schema: - type: string - port_cmaui02_port_network_role_tag: - type: string + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_cmaui02_port_2_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true node_templates: - cmaui_cmaui02_port: + cmaui_cmaui02_port_2: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_cmaui02_port_replacement_policy + - port_cmaui02_port_2_replacement_policy - index_value mac_requirements: - get_input: port_cmaui02_port_mac_requirements + get_input: port_cmaui02_port_2_mac_requirements order: - get_input: port_cmaui02_port_order + get_input: port_cmaui02_port_2_order security_groups: get_input: - - port_cmaui02_port_security_groups + - port_cmaui02_port_2_security_groups - index_value exCP_naming: - get_input: port_cmaui02_port_exCP_naming + get_input: port_cmaui02_port_2_exCP_naming vlan_requirements: - get_input: port_cmaui02_port_vlan_requirements + get_input: port_cmaui02_port_2_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_cmaui02_port_related_networks + get_input: port_cmaui02_port_2_related_networks ip_requirements: - get_input: port_cmaui02_port_ip_requirements + get_input: port_cmaui02_port_2_ip_requirements network_role_tag: - get_input: port_cmaui02_port_network_role_tag + get_input: port_cmaui02_port_2_network_role_tag network_role: - get_input: port_cmaui02_port_network_role + get_input: port_cmaui02_port_2_network_role fixed_ips: get_input: - - port_cmaui02_port_fixed_ips + - port_cmaui02_port_2_fixed_ips - index_value subnetpoolid: - get_input: port_cmaui02_port_subnetpoolid + get_input: port_cmaui02_port_2_subnetpoolid network: get_input: - - port_cmaui02_port_network + - port_cmaui02_port_2_network - index_value requirements: - binding: @@ -149,8 +149,8 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.cmaui capabilities: - network.incoming.bytes_cmaui_cmaui02_port: - - cmaui_cmaui02_port + network.incoming.bytes_cmaui_cmaui02_port_2: + - cmaui_cmaui02_port_2 - network.incoming.bytes disk.read.bytes.rate_cmaui: - cmaui @@ -161,9 +161,6 @@ topology_template: disk.device.write.bytes_cmaui: - cmaui - disk.device.write.bytes - forwarder_cmaui_cmaui02_port: - - cmaui_cmaui02_port - - forwarder disk.device.iops_cmaui: - cmaui - disk.device.iops @@ -179,9 +176,6 @@ topology_template: disk.device.allocation_cmaui: - cmaui - disk.device.allocation - feature_cmaui_cmaui02_port: - - cmaui_cmaui02_port - - feature disk.read.bytes_cmaui: - cmaui - disk.read.bytes @@ -200,21 +194,21 @@ topology_template: disk.root.size_cmaui: - cmaui - disk.root.size + network.outpoing.packets_cmaui_cmaui02_port_2: + - cmaui_cmaui02_port_2 + - network.outpoing.packets memory.usage_cmaui: - cmaui - memory.usage os_cmaui: - cmaui - os + attachment_cmaui_cmaui02_port_2: + - cmaui_cmaui02_port_2 + - attachment disk.device.read.bytes.rate_cmaui: - cmaui - disk.device.read.bytes.rate - network.incoming.packets.rate_cmaui_cmaui02_port: - - cmaui_cmaui02_port - - network.incoming.packets.rate - binding_cmaui_cmaui02_port: - - cmaui_cmaui02_port - - binding disk.device.usage_cmaui: - cmaui - disk.device.usage @@ -224,6 +218,9 @@ topology_template: disk.device.latency_cmaui: - cmaui - disk.device.latency + network.incoming.bytes.rate_cmaui_cmaui02_port_2: + - cmaui_cmaui02_port_2 + - network.incoming.bytes.rate disk.device.read.requests_cmaui: - cmaui - disk.device.read.requests @@ -233,33 +230,42 @@ topology_template: cpu_cmaui: - cmaui - cpu - network.outgoing.packets.rate_cmaui_cmaui02_port: - - cmaui_cmaui02_port - - network.outgoing.packets.rate disk.read.requests_cmaui: - cmaui - disk.read.requests disk.device.read.bytes_cmaui: - cmaui - disk.device.read.bytes + forwarder_cmaui_cmaui02_port_2: + - cmaui_cmaui02_port_2 + - forwarder disk.device.write.requests_cmaui: - cmaui - disk.device.write.requests + network.incoming.packets_cmaui_cmaui02_port_2: + - cmaui_cmaui02_port_2 + - network.incoming.packets + feature_cmaui_cmaui02_port_2: + - cmaui_cmaui02_port_2 + - feature + binding_cmaui_cmaui02_port_2: + - cmaui_cmaui02_port_2 + - binding + network.incoming.packets.rate_cmaui_cmaui02_port_2: + - cmaui_cmaui02_port_2 + - network.incoming.packets.rate vcpus_cmaui: - cmaui - vcpus feature_cmaui: - cmaui - feature - network.incoming.packets_cmaui_cmaui02_port: - - cmaui_cmaui02_port - - network.incoming.packets + network.outgoing.packets.rate_cmaui_cmaui02_port_2: + - cmaui_cmaui02_port_2 + - network.outgoing.packets.rate binding_cmaui: - cmaui - binding - attachment_cmaui_cmaui02_port: - - cmaui_cmaui02_port - - attachment endpoint_cmaui: - cmaui - endpoint @@ -275,49 +281,43 @@ topology_template: disk.write.requests.rate_cmaui: - cmaui - disk.write.requests.rate - network.outgoing.bytes_cmaui_cmaui02_port: - - cmaui_cmaui02_port - - network.outgoing.bytes disk.usage_cmaui: - cmaui - disk.usage + network.outgoing.bytes.rate_cmaui_cmaui02_port_2: + - cmaui_cmaui02_port_2 + - network.outgoing.bytes.rate disk.latency_cmaui: - cmaui - disk.latency - network.outgoing.bytes.rate_cmaui_cmaui02_port: - - cmaui_cmaui02_port - - network.outgoing.bytes.rate instance_cmaui: - cmaui - instance disk.allocation_cmaui: - cmaui - disk.allocation - network.incoming.bytes.rate_cmaui_cmaui02_port: - - cmaui_cmaui02_port - - network.incoming.bytes.rate + network.outgoing.bytes_cmaui_cmaui02_port_2: + - cmaui_cmaui02_port_2 + - network.outgoing.bytes disk.write.bytes_cmaui: - cmaui - disk.write.bytes cpu_util_cmaui: - cmaui - cpu_util - network.outpoing.packets_cmaui_cmaui02_port: - - cmaui_cmaui02_port - - network.outpoing.packets disk.device.write.requests.rate_cmaui: - cmaui - disk.device.write.requests.rate requirements: - dependency_cmaui_cmaui02_port: - - cmaui_cmaui02_port - - dependency - link_cmaui_cmaui02_port: - - cmaui_cmaui02_port + link_cmaui_cmaui02_port_2: + - cmaui_cmaui02_port_2 - link + dependency_cmaui_cmaui02_port_2: + - cmaui_cmaui02_port_2 + - dependency dependency_cmaui: - cmaui - dependency local_storage_cmaui: - cmaui - - local_storage \ No newline at end of file + - local_storage 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/Nested_cmaui_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_cmaui_1ServiceTemplate.yaml index 72ebfec0cd..4ca46a5ce1 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_cmaui_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_cmaui_1ServiceTemplate.yaml @@ -11,17 +11,6 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_cmaui01_port_network_role: - type: string - required: true - port_cmaui01_port_order: - type: integer - required: true - port_cmaui01_port_replacement_policy: - type: list - required: true - entry_schema: - type: string index_value: type: integer description: Index value of this substitution service template runtime instance @@ -29,11 +18,6 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_cmaui01_port_security_groups: - type: list - required: true - entry_schema: - type: json vm_flavor_name: type: string required: true @@ -42,89 +26,105 @@ topology_template: required: true entry_schema: type: string - port_cmaui01_port_vlan_requirements: + port_cmaui01_port_1_fixed_ips: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_cmaui01_port_1_order: + type: integer + required: true compute_cmaui_availability_zone: type: list required: true entry_schema: type: string - port_cmaui01_port_subnetpoolid: - type: string + port_cmaui01_port_1_network: + type: list required: true + entry_schema: + type: string vm_image_name: type: string required: true - port_cmaui01_port_network_role_tag: + port_cmaui01_port_1_replacement_policy: + type: list + required: true + entry_schema: + type: string + port_cmaui01_port_1_network_role_tag: type: string required: true - port_cmaui01_port_related_networks: + port_cmaui01_port_1_related_networks: type: list required: true entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_cmaui01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_cmaui01_port_1_security_groups: + type: list required: true - port_cmaui01_port_mac_requirements: + entry_schema: + type: json + port_cmaui01_port_1_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true - port_cmaui01_port_fixed_ips: - type: list + port_cmaui01_port_1_network_role: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_cmaui01_port_network: + port_cmaui01_port_1_ip_requirements: type: list required: true entry_schema: - type: string - port_cmaui01_port_ip_requirements: + type: org.openecomp.datatypes.network.IpRequirements + port_cmaui01_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_cmaui01_port_1_subnetpoolid: + type: string + required: true + port_cmaui01_port_1_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: org.openecomp.datatypes.network.VlanRequirements node_templates: - cmaui_cmaui01_port: + cmaui_cmaui01_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_cmaui01_port_replacement_policy + - port_cmaui01_port_1_replacement_policy - index_value mac_requirements: - get_input: port_cmaui01_port_mac_requirements + get_input: port_cmaui01_port_1_mac_requirements order: - get_input: port_cmaui01_port_order + get_input: port_cmaui01_port_1_order security_groups: get_input: - - port_cmaui01_port_security_groups + - port_cmaui01_port_1_security_groups - index_value exCP_naming: - get_input: port_cmaui01_port_exCP_naming + get_input: port_cmaui01_port_1_exCP_naming vlan_requirements: - get_input: port_cmaui01_port_vlan_requirements + get_input: port_cmaui01_port_1_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_cmaui01_port_related_networks + get_input: port_cmaui01_port_1_related_networks ip_requirements: - get_input: port_cmaui01_port_ip_requirements + get_input: port_cmaui01_port_1_ip_requirements network_role_tag: - get_input: port_cmaui01_port_network_role_tag + get_input: port_cmaui01_port_1_network_role_tag network_role: - get_input: port_cmaui01_port_network_role + get_input: port_cmaui01_port_1_network_role fixed_ips: get_input: - - port_cmaui01_port_fixed_ips + - port_cmaui01_port_1_fixed_ips - index_value subnetpoolid: - get_input: port_cmaui01_port_subnetpoolid + get_input: port_cmaui01_port_1_subnetpoolid network: get_input: - - port_cmaui01_port_network + - port_cmaui01_port_1_network - index_value requirements: - binding: @@ -158,12 +158,9 @@ topology_template: disk.device.write.bytes_cmaui: - cmaui - disk.device.write.bytes - network.outgoing.bytes_cmaui_cmaui01_port: - - cmaui_cmaui01_port - - network.outgoing.bytes - network.incoming.packets.rate_cmaui_cmaui01_port: - - cmaui_cmaui01_port - - network.incoming.packets.rate + network.incoming.bytes_cmaui_cmaui01_port_1: + - cmaui_cmaui01_port_1 + - network.incoming.bytes disk.device.iops_cmaui: - cmaui - disk.device.iops @@ -182,15 +179,15 @@ topology_template: disk.read.bytes_cmaui: - cmaui - disk.read.bytes + network.outpoing.packets_cmaui_cmaui01_port_1: + - cmaui_cmaui01_port_1 + - network.outpoing.packets disk.write.requests_cmaui: - cmaui - disk.write.requests scalable_cmaui: - cmaui - scalable - feature_cmaui_cmaui01_port: - - cmaui_cmaui01_port - - feature disk.device.write.bytes.rate_cmaui: - cmaui - disk.device.write.bytes.rate @@ -206,21 +203,15 @@ topology_template: os_cmaui: - cmaui - os - network.outgoing.bytes.rate_cmaui_cmaui01_port: - - cmaui_cmaui01_port - - network.outgoing.bytes.rate + network.outgoing.packets.rate_cmaui_cmaui01_port_1: + - cmaui_cmaui01_port_1 + - network.outgoing.packets.rate disk.device.read.bytes.rate_cmaui: - cmaui - disk.device.read.bytes.rate - network.incoming.bytes_cmaui_cmaui01_port: - - cmaui_cmaui01_port - - network.incoming.bytes - forwarder_cmaui_cmaui01_port: - - cmaui_cmaui01_port - - forwarder - network.outgoing.packets.rate_cmaui_cmaui01_port: - - cmaui_cmaui01_port - - network.outgoing.packets.rate + network.outgoing.bytes.rate_cmaui_cmaui01_port_1: + - cmaui_cmaui01_port_1 + - network.outgoing.bytes.rate disk.device.usage_cmaui: - cmaui - disk.device.usage @@ -230,6 +221,9 @@ topology_template: disk.device.latency_cmaui: - cmaui - disk.device.latency + network.outgoing.bytes_cmaui_cmaui01_port_1: + - cmaui_cmaui01_port_1 + - network.outgoing.bytes disk.device.read.requests_cmaui: - cmaui - disk.device.read.requests @@ -239,39 +233,42 @@ topology_template: cpu_cmaui: - cmaui - cpu - network.outpoing.packets_cmaui_cmaui01_port: - - cmaui_cmaui01_port - - network.outpoing.packets disk.read.requests_cmaui: - cmaui - disk.read.requests - attachment_cmaui_cmaui01_port: - - cmaui_cmaui01_port - - attachment disk.device.read.bytes_cmaui: - cmaui - disk.device.read.bytes - network.incoming.packets_cmaui_cmaui01_port: - - cmaui_cmaui01_port + feature_cmaui_cmaui01_port_1: + - cmaui_cmaui01_port_1 + - feature + network.incoming.packets_cmaui_cmaui01_port_1: + - cmaui_cmaui01_port_1 - network.incoming.packets disk.device.write.requests_cmaui: - cmaui - disk.device.write.requests - network.incoming.bytes.rate_cmaui_cmaui01_port: - - cmaui_cmaui01_port - - network.incoming.bytes.rate + forwarder_cmaui_cmaui01_port_1: + - cmaui_cmaui01_port_1 + - forwarder + binding_cmaui_cmaui01_port_1: + - cmaui_cmaui01_port_1 + - binding + network.incoming.packets.rate_cmaui_cmaui01_port_1: + - cmaui_cmaui01_port_1 + - network.incoming.packets.rate vcpus_cmaui: - cmaui - vcpus - binding_cmaui_cmaui01_port: - - cmaui_cmaui01_port - - binding feature_cmaui: - cmaui - feature binding_cmaui: - cmaui - binding + network.incoming.bytes.rate_cmaui_cmaui01_port_1: + - cmaui_cmaui01_port_1 + - network.incoming.bytes.rate endpoint_cmaui: - cmaui - endpoint @@ -284,6 +281,9 @@ topology_template: memory_cmaui: - cmaui - memory + attachment_cmaui_cmaui01_port_1: + - cmaui_cmaui01_port_1 + - attachment disk.write.requests.rate_cmaui: - cmaui - disk.write.requests.rate @@ -309,15 +309,15 @@ topology_template: - cmaui - disk.device.write.requests.rate requirements: - dependency_cmaui_cmaui01_port: - - cmaui_cmaui01_port - - dependency - link_cmaui_cmaui01_port: - - cmaui_cmaui01_port + link_cmaui_cmaui01_port_1: + - cmaui_cmaui01_port_1 - link dependency_cmaui: - cmaui - dependency local_storage_cmaui: - cmaui - - local_storage \ No newline at end of file + - local_storage + dependency_cmaui_cmaui01_port_1: + - cmaui_cmaui01_port_1 + - dependency 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/Nested_oamServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_oamServiceTemplate.yaml index 87232dd290..545037b77b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_oamServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_oamServiceTemplate.yaml @@ -11,19 +11,11 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_oam02_port_network: + port_oam02_port_2_network: type: list required: true entry_schema: type: string - port_oam02_port_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_oam02_port_network_role: - type: string - required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -31,163 +23,165 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_oam02_port_fixed_ips: + port_oam02_port_2_security_groups: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps + type: json vm_flavor_name: type: string required: true - port_oam02_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_oam02_port_security_groups: + port_oam02_port_2_replacement_policy: type: list required: true entry_schema: - type: json - port_oam02_port_subnetpoolid: - type: string - required: true - port_oam02_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + type: string + port_oam02_port_2_fixed_ips: + type: list required: true - port_oam02_port_order: - type: integer + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_oam02_port_2_exCP_naming: + type: org.openecomp.datatypes.Naming required: true vm_image_name: type: string required: true - port_oam02_port_network_role_tag: + port_oam02_port_2_network_role_tag: type: string required: true - port_oam02_port_replacement_policy: + port_oam02_port_2_order: + type: integer + required: true + port_oam02_port_2_related_networks: type: list required: true entry_schema: - type: string - port_oam02_port_related_networks: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_oam02_port_2_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments + type: org.openecomp.datatypes.network.IpRequirements + port_oam02_port_2_network_role: + type: string + required: true + port_oam02_port_2_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true compute_oam_availability_zone: type: list required: true entry_schema: type: string - port_oam02_port_vlan_requirements: - type: list + port_oam02_port_2_subnetpoolid: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements compute_oam_name: type: list required: true entry_schema: type: string + port_oam02_port_2_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements node_templates: - oam_oam02_port: + oam: + type: org.openecomp.resource.vfc.compute.nodes.heat.oam + properties: + availability_zone: + get_input: + - compute_oam_availability_zone + - index_value + flavor: + get_input: vm_flavor_name + image: + get_input: vm_image_name + name: + get_input: + - compute_oam_name + - index_value + oam_oam02_port_2: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_oam02_port_replacement_policy + - port_oam02_port_2_replacement_policy - index_value mac_requirements: - get_input: port_oam02_port_mac_requirements + get_input: port_oam02_port_2_mac_requirements order: - get_input: port_oam02_port_order + get_input: port_oam02_port_2_order security_groups: get_input: - - port_oam02_port_security_groups + - port_oam02_port_2_security_groups - index_value exCP_naming: - get_input: port_oam02_port_exCP_naming + get_input: port_oam02_port_2_exCP_naming vlan_requirements: - get_input: port_oam02_port_vlan_requirements + get_input: port_oam02_port_2_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_oam02_port_related_networks + get_input: port_oam02_port_2_related_networks ip_requirements: - get_input: port_oam02_port_ip_requirements + get_input: port_oam02_port_2_ip_requirements network_role_tag: - get_input: port_oam02_port_network_role_tag + get_input: port_oam02_port_2_network_role_tag network_role: - get_input: port_oam02_port_network_role + get_input: port_oam02_port_2_network_role fixed_ips: get_input: - - port_oam02_port_fixed_ips + - port_oam02_port_2_fixed_ips - index_value subnetpoolid: - get_input: port_oam02_port_subnetpoolid + get_input: port_oam02_port_2_subnetpoolid network: get_input: - - port_oam02_port_network + - port_oam02_port_2_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: oam relationship: tosca.relationships.network.BindsTo - oam: - type: org.openecomp.resource.vfc.compute.nodes.heat.oam - properties: - availability_zone: - get_input: - - compute_oam_availability_zone - - index_value - flavor: - get_input: vm_flavor_name - image: - get_input: vm_image_name - name: - get_input: - - compute_oam_name - - index_value substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.oam capabilities: cpu_oam: - oam - cpu - network.incoming.bytes.rate_oam_oam02_port: - - oam_oam02_port - - network.incoming.bytes.rate disk.usage_oam: - oam - disk.usage memory.resident_oam: - oam - memory.resident + network.incoming.bytes.rate_oam_oam02_port_2: + - oam_oam02_port_2 + - network.incoming.bytes.rate disk.device.write.bytes_oam: - oam - disk.device.write.bytes - network.incoming.packets_oam_oam02_port: - - oam_oam02_port - - network.incoming.packets + network.outgoing.bytes.rate_oam_oam02_port_2: + - oam_oam02_port_2 + - network.outgoing.bytes.rate disk.read.bytes_oam: - oam - disk.read.bytes - network.outgoing.packets.rate_oam_oam02_port: - - oam_oam02_port - - network.outgoing.packets.rate - binding_oam_oam02_port: - - oam_oam02_port - - binding scalable_oam: - oam - scalable - network.outgoing.bytes.rate_oam_oam02_port: - - oam_oam02_port - - network.outgoing.bytes.rate feature_oam: - oam - feature disk.allocation_oam: - oam - disk.allocation + network.incoming.packets.rate_oam_oam02_port_2: + - oam_oam02_port_2 + - network.incoming.packets.rate disk.device.usage_oam: - oam - disk.device.usage @@ -197,6 +191,9 @@ topology_template: disk.device.read.bytes.rate_oam: - oam - disk.device.read.bytes.rate + network.incoming.bytes_oam_oam02_port_2: + - oam_oam02_port_2 + - network.incoming.bytes disk.write.bytes.rate_oam: - oam - disk.write.bytes.rate @@ -212,24 +209,33 @@ topology_template: disk.write.requests_oam: - oam - disk.write.requests - forwarder_oam_oam02_port: - - oam_oam02_port + forwarder_oam_oam02_port_2: + - oam_oam02_port_2 - forwarder disk.capacity_oam: - oam - disk.capacity + network.outgoing.packets.rate_oam_oam02_port_2: + - oam_oam02_port_2 + - network.outgoing.packets.rate + binding_oam_oam02_port_2: + - oam_oam02_port_2 + - binding instance_oam: - oam - instance - network.outgoing.bytes_oam_oam02_port: - - oam_oam02_port - - network.outgoing.bytes disk.root.size_oam: - oam - disk.root.size - network.incoming.packets.rate_oam_oam02_port: - - oam_oam02_port - - network.incoming.packets.rate + attachment_oam_oam02_port_2: + - oam_oam02_port_2 + - attachment + network.incoming.packets_oam_oam02_port_2: + - oam_oam02_port_2 + - network.incoming.packets + network.outgoing.bytes_oam_oam02_port_2: + - oam_oam02_port_2 + - network.outgoing.bytes memory_oam: - oam - memory @@ -239,6 +245,12 @@ topology_template: disk.device.write.requests_oam: - oam - disk.device.write.requests + feature_oam_oam02_port_2: + - oam_oam02_port_2 + - feature + network.outpoing.packets_oam_oam02_port_2: + - oam_oam02_port_2 + - network.outpoing.packets disk.device.read.requests.rate_oam: - oam - disk.device.read.requests.rate @@ -275,15 +287,9 @@ topology_template: disk.read.bytes.rate_oam: - oam - disk.read.bytes.rate - feature_oam_oam02_port: - - oam_oam02_port - - feature cpu_util_oam: - oam - cpu_util - network.outpoing.packets_oam_oam02_port: - - oam_oam02_port - - network.outpoing.packets os_oam: - oam - os @@ -293,12 +299,6 @@ topology_template: disk.latency_oam: - oam - disk.latency - network.incoming.bytes_oam_oam02_port: - - oam_oam02_port - - network.incoming.bytes - attachment_oam_oam02_port: - - oam_oam02_port - - attachment disk.write.bytes_oam: - oam - disk.write.bytes @@ -309,15 +309,15 @@ topology_template: - oam - disk.device.capacity requirements: - link_oam_oam02_port: - - oam_oam02_port - - link + dependency_oam_oam02_port_2: + - oam_oam02_port_2 + - dependency local_storage_oam: - oam - local_storage - dependency_oam_oam02_port: - - oam_oam02_port - - dependency + link_oam_oam02_port_2: + - oam_oam02_port_2 + - link dependency_oam: - oam - - dependency \ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_oam_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_oam_1ServiceTemplate.yaml index f6f3d190cd..07bc854756 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_oam_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_oam_1ServiceTemplate.yaml @@ -11,30 +11,14 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_oam01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_oam01_port_subnetpoolid: + port_oam01_port_1_network_role: type: string required: true - port_oam01_port_order: - type: integer - required: true - port_oam01_port_ip_requirements: + port_oam01_port_1_ip_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_oam01_port_security_groups: - type: list - required: true - entry_schema: - type: json - port_oam01_port_network: - type: list - required: true - entry_schema: - type: string index_value: type: integer description: Index value of this substitution service template runtime instance @@ -42,7 +26,7 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_oam01_port_replacement_policy: + port_oam01_port_1_network: type: list required: true entry_schema: @@ -50,81 +34,97 @@ topology_template: vm_flavor_name: type: string required: true - port_oam01_port_related_networks: + port_oam01_port_1_security_groups: + type: list + required: true + entry_schema: + type: json + port_oam01_port_1_related_networks: type: list required: true entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - vm_image_name: + port_oam01_port_1_order: + type: integer + required: true + port_oam01_port_1_subnetpoolid: type: string required: true - port_oam01_port_network_role: + vm_image_name: type: string required: true - port_oam01_port_fixed_ips: + port_oam01_port_1_replacement_policy: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_oam01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + type: string + port_oam01_port_1_fixed_ips: + type: list required: true + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps compute_oam_availability_zone: type: list required: true entry_schema: type: string - port_oam01_port_network_role_tag: + port_oam01_port_1_network_role_tag: type: string required: true - compute_oam_name: + port_oam01_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_oam01_port_1_vlan_requirements: type: list required: true entry_schema: - type: string - port_oam01_port_vlan_requirements: + type: org.openecomp.datatypes.network.VlanRequirements + port_oam01_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + compute_oam_name: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: string node_templates: - oam_oam01_port: + oam_oam01_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_oam01_port_replacement_policy + - port_oam01_port_1_replacement_policy - index_value mac_requirements: - get_input: port_oam01_port_mac_requirements + get_input: port_oam01_port_1_mac_requirements order: - get_input: port_oam01_port_order + get_input: port_oam01_port_1_order security_groups: get_input: - - port_oam01_port_security_groups + - port_oam01_port_1_security_groups - index_value exCP_naming: - get_input: port_oam01_port_exCP_naming + get_input: port_oam01_port_1_exCP_naming vlan_requirements: - get_input: port_oam01_port_vlan_requirements + get_input: port_oam01_port_1_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_oam01_port_related_networks + get_input: port_oam01_port_1_related_networks ip_requirements: - get_input: port_oam01_port_ip_requirements + get_input: port_oam01_port_1_ip_requirements network_role_tag: - get_input: port_oam01_port_network_role_tag + get_input: port_oam01_port_1_network_role_tag network_role: - get_input: port_oam01_port_network_role + get_input: port_oam01_port_1_network_role fixed_ips: get_input: - - port_oam01_port_fixed_ips + - port_oam01_port_1_fixed_ips - index_value subnetpoolid: - get_input: port_oam01_port_subnetpoolid + get_input: port_oam01_port_1_subnetpoolid network: get_input: - - port_oam01_port_network + - port_oam01_port_1_network - index_value requirements: - binding: @@ -152,36 +152,27 @@ topology_template: cpu_oam: - oam - cpu - network.outgoing.packets.rate_oam_oam01_port: - - oam_oam01_port - - network.outgoing.packets.rate - binding_oam_oam01_port: - - oam_oam01_port - - binding - network.outgoing.bytes.rate_oam_oam01_port: - - oam_oam01_port - - network.outgoing.bytes.rate disk.usage_oam: - oam - disk.usage memory.resident_oam: - oam - memory.resident + network.outgoing.bytes.rate_oam_oam01_port_1: + - oam_oam01_port_1 + - network.outgoing.bytes.rate disk.device.write.bytes_oam: - oam - disk.device.write.bytes + network.incoming.bytes.rate_oam_oam01_port_1: + - oam_oam01_port_1 + - network.incoming.bytes.rate disk.read.bytes_oam: - oam - disk.read.bytes scalable_oam: - oam - scalable - attachment_oam_oam01_port: - - oam_oam01_port - - attachment - network.incoming.bytes_oam_oam01_port: - - oam_oam01_port - - network.incoming.bytes feature_oam: - oam - feature @@ -191,9 +182,6 @@ topology_template: disk.device.usage_oam: - oam - disk.device.usage - network.incoming.packets.rate_oam_oam01_port: - - oam_oam01_port - - network.incoming.packets.rate binding_oam: - oam - binding @@ -212,9 +200,6 @@ topology_template: disk.ephemeral.size_oam: - oam - disk.ephemeral.size - feature_oam_oam01_port: - - oam_oam01_port - - feature disk.write.requests_oam: - oam - disk.write.requests @@ -224,12 +209,18 @@ topology_template: instance_oam: - oam - instance - network.outpoing.packets_oam_oam01_port: - - oam_oam01_port - - network.outpoing.packets + attachment_oam_oam01_port_1: + - oam_oam01_port_1 + - attachment + network.incoming.packets_oam_oam01_port_1: + - oam_oam01_port_1 + - network.incoming.packets disk.root.size_oam: - oam - disk.root.size + network.outgoing.bytes_oam_oam01_port_1: + - oam_oam01_port_1 + - network.outgoing.bytes memory_oam: - oam - memory @@ -239,12 +230,15 @@ topology_template: disk.device.write.requests_oam: - oam - disk.device.write.requests + feature_oam_oam01_port_1: + - oam_oam01_port_1 + - feature + network.outpoing.packets_oam_oam01_port_1: + - oam_oam01_port_1 + - network.outpoing.packets disk.device.read.requests.rate_oam: - oam - disk.device.read.requests.rate - network.outgoing.bytes_oam_oam01_port: - - oam_oam01_port - - network.outgoing.bytes disk.write.requests.rate_oam: - oam - disk.write.requests.rate @@ -260,9 +254,6 @@ topology_template: disk.device.write.requests.rate_oam: - oam - disk.device.write.requests.rate - forwarder_oam_oam01_port: - - oam_oam01_port - - forwarder disk.device.read.bytes_oam: - oam - disk.device.read.bytes @@ -272,18 +263,21 @@ topology_template: endpoint_oam: - oam - endpoint - network.incoming.bytes.rate_oam_oam01_port: - - oam_oam01_port - - network.incoming.bytes.rate disk.device.read.requests_oam: - oam - disk.device.read.requests + network.incoming.packets.rate_oam_oam01_port_1: + - oam_oam01_port_1 + - network.incoming.packets.rate disk.iops_oam: - oam - disk.iops disk.read.bytes.rate_oam: - oam - disk.read.bytes.rate + network.incoming.bytes_oam_oam01_port_1: + - oam_oam01_port_1 + - network.incoming.bytes cpu_util_oam: - oam - cpu_util @@ -296,28 +290,34 @@ topology_template: disk.latency_oam: - oam - disk.latency + forwarder_oam_oam01_port_1: + - oam_oam01_port_1 + - forwarder + network.outgoing.packets.rate_oam_oam01_port_1: + - oam_oam01_port_1 + - network.outgoing.packets.rate disk.write.bytes_oam: - oam - disk.write.bytes + binding_oam_oam01_port_1: + - oam_oam01_port_1 + - binding disk.read.requests_oam: - oam - disk.read.requests disk.device.capacity_oam: - oam - disk.device.capacity - network.incoming.packets_oam_oam01_port: - - oam_oam01_port - - network.incoming.packets requirements: local_storage_oam: - oam - local_storage - dependency_oam_oam01_port: - - oam_oam01_port + dependency_oam_oam01_port_1: + - oam_oam01_port_1 - dependency - link_oam_oam01_port: - - oam_oam01_port + link_oam_oam01_port_1: + - oam_oam01_port_1 - link dependency_oam: - oam - - dependency \ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_pd_serverServiceTemplate.yaml index 9d8385b905..d2a3d40128 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_pd_serverServiceTemplate.yaml @@ -11,6 +11,11 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pd02_port_0_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements index_value: type: integer description: Index value of this substitution service template runtime instance @@ -28,55 +33,50 @@ topology_template: required: true entry_schema: type: string - port_pd02_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pd02_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true vm_flavor_name: type: string required: true - port_pd02_port_order: - type: integer + port_pd02_port_0_network: + type: list required: true - port_pd02_port_subnetpoolid: + entry_schema: + type: string + port_pd02_port_0_network_role: type: string required: true - port_pd02_port_network_role_tag: - type: string + port_pd02_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_pd02_port_vlan_requirements: - type: list + port_pd02_port_0_order: + type: integer required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements vm_image_name: type: string required: true - port_pd02_port_network_role: + port_pd02_port_0_network_role_tag: type: string required: true - port_pd02_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_pd02_port_ip_requirements: + port_pd02_port_0_related_networks: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd02_port_network: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd02_port_0_subnetpoolid: + type: string + required: true + port_pd02_port_0_vlan_requirements: type: list required: true entry_schema: - type: string + type: org.openecomp.datatypes.network.VlanRequirements compute_pd_server_user_data_format: type: list required: true entry_schema: type: string - port_pd02_port_related_networks: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments node_templates: pd_server: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server @@ -97,31 +97,31 @@ topology_template: get_input: - compute_pd_server_user_data_format - index_value - pd_server_pd02_port: + pd_server_pd02_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd02_port_exCP_naming + get_input: port_pd02_port_0_exCP_naming vlan_requirements: - get_input: port_pd02_port_vlan_requirements + get_input: port_pd02_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_pd02_port_related_networks + get_input: port_pd02_port_0_related_networks ip_requirements: - get_input: port_pd02_port_ip_requirements + get_input: port_pd02_port_0_ip_requirements network_role_tag: - get_input: port_pd02_port_network_role_tag + get_input: port_pd02_port_0_network_role_tag mac_requirements: - get_input: port_pd02_port_mac_requirements + get_input: port_pd02_port_0_mac_requirements order: - get_input: port_pd02_port_order + get_input: port_pd02_port_0_order network_role: - get_input: port_pd02_port_network_role + get_input: port_pd02_port_0_network_role subnetpoolid: - get_input: port_pd02_port_subnetpoolid + get_input: port_pd02_port_0_subnetpoolid network: get_input: - - port_pd02_port_network + - port_pd02_port_0_network - index_value requirements: - binding: @@ -131,6 +131,9 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server capabilities: + binding_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - binding scalable_pd_server: - pd_server - scalable @@ -152,6 +155,9 @@ topology_template: disk.write.bytes.rate_pd_server: - pd_server - disk.write.bytes.rate + network.outgoing.packets.rate_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.outgoing.packets.rate cpu_pd_server: - pd_server - cpu @@ -167,12 +173,9 @@ topology_template: disk.device.read.bytes.rate_pd_server: - pd_server - disk.device.read.bytes.rate - binding_pd_server_pd02_port: - - pd_server_pd02_port - - binding - network.outgoing.packets.rate_pd_server_pd02_port: - - pd_server_pd02_port - - network.outgoing.packets.rate + network.outpoing.packets_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.outpoing.packets disk.iops_pd_server: - pd_server - disk.iops @@ -182,18 +185,9 @@ topology_template: cpu.delta_pd_server: - pd_server - cpu.delta - network.outgoing.bytes_pd_server_pd02_port: - - pd_server_pd02_port - - network.outgoing.bytes - feature_pd_server_pd02_port: - - pd_server_pd02_port + feature_pd_server_pd02_port_0: + - pd_server_pd02_port_0 - feature - network.incoming.bytes.rate_pd_server_pd02_port: - - pd_server_pd02_port - - network.incoming.bytes.rate - network.outgoing.bytes.rate_pd_server_pd02_port: - - pd_server_pd02_port - - network.outgoing.bytes.rate vcpus_pd_server: - pd_server - vcpus @@ -206,9 +200,6 @@ topology_template: endpoint_pd_server: - pd_server - endpoint - forwarder_pd_server_pd02_port: - - pd_server_pd02_port - - forwarder disk.capacity_pd_server: - pd_server - disk.capacity @@ -218,9 +209,6 @@ topology_template: disk.allocation_pd_server: - pd_server - disk.allocation - network.incoming.packets_pd_server_pd02_port: - - pd_server_pd02_port - - network.incoming.packets binding_pd_server: - pd_server - binding @@ -233,12 +221,18 @@ topology_template: disk.usage_pd_server: - pd_server - disk.usage - network.outpoing.packets_pd_server_pd02_port: - - pd_server_pd02_port - - network.outpoing.packets + network.outgoing.bytes.rate_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.outgoing.bytes.rate disk.write.bytes_pd_server: - pd_server - disk.write.bytes + network.outgoing.bytes_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.outgoing.bytes + network.incoming.bytes_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.incoming.bytes disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -251,6 +245,9 @@ topology_template: disk.device.write.bytes_pd_server: - pd_server - disk.device.write.bytes + network.incoming.packets_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.incoming.packets disk.device.read.requests_pd_server: - pd_server - disk.device.read.requests @@ -260,24 +257,27 @@ topology_template: host_pd_server: - pd_server - host - attachment_pd_server_pd02_port: - - pd_server_pd02_port - - attachment + network.incoming.packets.rate_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.incoming.packets.rate + network.incoming.bytes.rate_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.incoming.bytes.rate disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate disk.ephemeral.size_pd_server: - pd_server - disk.ephemeral.size + attachment_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - attachment disk.write.requests_pd_server: - pd_server - disk.write.requests disk.device.latency_pd_server: - pd_server - disk.device.latency - network.incoming.packets.rate_pd_server_pd02_port: - - pd_server_pd02_port - - network.incoming.packets.rate disk.latency_pd_server: - pd_server - disk.latency @@ -287,19 +287,19 @@ topology_template: disk.device.iops_pd_server: - pd_server - disk.device.iops - network.incoming.bytes_pd_server_pd02_port: - - pd_server_pd02_port - - network.incoming.bytes + forwarder_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - forwarder requirements: local_storage_pd_server: - pd_server - local_storage - link_pd_server_pd02_port: - - pd_server_pd02_port - - link dependency_pd_server: - pd_server - dependency - dependency_pd_server_pd02_port: - - pd_server_pd02_port - - dependency \ No newline at end of file + link_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - link + dependency_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - dependency 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/Nested_pd_server_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_pd_server_1ServiceTemplate.yaml index 34e182d166..0b507de50e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_pd_server_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_pd_server_1ServiceTemplate.yaml @@ -11,67 +11,67 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - constraints: - - greater_or_equal: 0 - compute_pd_server_availability_zone: - type: list + port_pd01_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: string - compute_pd_server_name: + port_pd01_port_0_network: type: list required: true entry_schema: type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_pd01_port_related_networks: + port_pd01_port_0_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - vm_flavor_name: + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role_tag: type: string required: true - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - vm_image_name: + port_pd01_port_0_network_role: type: string required: true - port_pd01_port_ip_requirements: + port_pd01_port_0_related_networks: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + constraints: + - greater_or_equal: 0 + compute_pd_server_availability_zone: type: list required: true entry_schema: type: string - port_pd01_port_order: - type: integer + compute_pd_server_name: + type: list required: true - port_pd01_port_subnetpoolid: + entry_schema: + type: string + vm_flavor_name: type: string required: true - port_pd01_port_network_role: - type: string + port_pd01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_pd01_port_0_order: + type: integer required: true - port_pd01_port_network_role_tag: + vm_image_name: type: string required: true - port_pd01_port_vlan_requirements: + port_pd01_port_0_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_0_subnetpoolid: + type: string + required: true compute_pd_server_user_data_format: type: list required: true @@ -97,31 +97,31 @@ topology_template: get_input: - compute_pd_server_user_data_format - index_value - pd_server_pd01_port: + pd_server_pd01_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd01_port_exCP_naming + get_input: port_pd01_port_0_exCP_naming vlan_requirements: - get_input: port_pd01_port_vlan_requirements + get_input: port_pd01_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_pd01_port_related_networks + get_input: port_pd01_port_0_related_networks ip_requirements: - get_input: port_pd01_port_ip_requirements + get_input: port_pd01_port_0_ip_requirements network_role_tag: - get_input: port_pd01_port_network_role_tag + get_input: port_pd01_port_0_network_role_tag mac_requirements: - get_input: port_pd01_port_mac_requirements + get_input: port_pd01_port_0_mac_requirements order: - get_input: port_pd01_port_order + get_input: port_pd01_port_0_order network_role: - get_input: port_pd01_port_network_role + get_input: port_pd01_port_0_network_role subnetpoolid: - get_input: port_pd01_port_subnetpoolid + get_input: port_pd01_port_0_subnetpoolid network: get_input: - - port_pd01_port_network + - port_pd01_port_0_network - index_value requirements: - binding: @@ -131,6 +131,9 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server_1 capabilities: + binding_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - binding scalable_pd_server: - pd_server - scalable @@ -146,18 +149,12 @@ topology_template: disk.device.usage_pd_server: - pd_server - disk.device.usage - network.outgoing.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.packets.rate os_pd_server: - pd_server - os disk.write.bytes.rate_pd_server: - pd_server - disk.write.bytes.rate - network.incoming.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes cpu_pd_server: - pd_server - cpu @@ -173,9 +170,9 @@ topology_template: disk.device.read.bytes.rate_pd_server: - pd_server - disk.device.read.bytes.rate - network.outgoing.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes + network.incoming.packets_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.packets disk.iops_pd_server: - pd_server - disk.iops @@ -185,27 +182,36 @@ topology_template: cpu.delta_pd_server: - pd_server - cpu.delta - network.incoming.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port + network.incoming.packets.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 - network.incoming.packets.rate + network.incoming.bytes.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.bytes.rate + network.outgoing.packets.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.packets.rate vcpus_pd_server: - pd_server - vcpus disk.device.write.bytes.rate_pd_server: - pd_server - disk.device.write.bytes.rate + attachment_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - attachment disk.device.write.requests_pd_server: - pd_server - disk.device.write.requests endpoint_pd_server: - pd_server - endpoint - attachment_pd_server_pd01_port: - - pd_server_pd01_port - - attachment disk.capacity_pd_server: - pd_server - disk.capacity + forwarder_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - forwarder disk.device.allocation_pd_server: - pd_server - disk.device.allocation @@ -218,24 +224,24 @@ topology_template: disk.read.requests_pd_server: - pd_server - disk.read.requests + network.outgoing.bytes.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.bytes.rate feature_pd_server: - pd_server - feature disk.usage_pd_server: - pd_server - disk.usage - binding_pd_server_pd01_port: - - pd_server_pd01_port - - binding disk.write.bytes_pd_server: - pd_server - disk.write.bytes - network.incoming.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes.rate - network.incoming.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets + network.outgoing.bytes_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.bytes + network.incoming.bytes_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.bytes disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -248,6 +254,9 @@ topology_template: disk.device.write.bytes_pd_server: - pd_server - disk.device.write.bytes + network.outpoing.packets_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outpoing.packets disk.device.read.requests_pd_server: - pd_server - disk.device.read.requests @@ -257,12 +266,9 @@ topology_template: host_pd_server: - pd_server - host - network.outpoing.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.outpoing.packets - forwarder_pd_server_pd01_port: - - pd_server_pd01_port - - forwarder + feature_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - feature disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate @@ -272,9 +278,6 @@ topology_template: disk.write.requests_pd_server: - pd_server - disk.write.requests - feature_pd_server_pd01_port: - - pd_server_pd01_port - - feature disk.device.latency_pd_server: - pd_server - disk.device.latency @@ -284,9 +287,6 @@ topology_template: disk.device.capacity_pd_server: - pd_server - disk.device.capacity - network.outgoing.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes.rate disk.device.iops_pd_server: - pd_server - disk.device.iops @@ -294,12 +294,12 @@ topology_template: local_storage_pd_server: - pd_server - local_storage - link_pd_server_pd01_port: - - pd_server_pd01_port - - link - dependency_pd_server_pd01_port: - - pd_server_pd01_port - - dependency dependency_pd_server: - pd_server - - dependency \ No newline at end of file + - dependency + dependency_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - dependency + link_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - link 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/Nested_psServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_psServiceTemplate.yaml index 1ef6099449..83f47e734a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_psServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_psServiceTemplate.yaml @@ -11,11 +11,17 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_pd02_port_fixed_ips: + port_pd02_port_2_replacement_policy: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps + type: string + port_pd02_port_2_order: + type: integer + required: true + port_pd02_port_2_network_role: + type: string + required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -23,70 +29,64 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_pd02_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - vm_flavor_name: - type: string - required: true - port_pd02_port_order: - type: integer + port_pd02_port_2_network: + type: list required: true - port_pd02_port_subnetpoolid: - type: string + entry_schema: + type: string + port_pd02_port_2_vlan_requirements: + type: list required: true - port_pd02_port_network_role_tag: + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd02_port_2_subnetpoolid: type: string required: true - port_pd02_port_vlan_requirements: + port_pd02_port_2_related_networks: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - vm_image_name: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + vm_flavor_name: type: string required: true - port_pd02_port_security_groups: + port_pd02_port_2_ip_requirements: type: list required: true entry_schema: - type: json - compute_ps_availability_zone: + type: org.openecomp.datatypes.network.IpRequirements + port_pd02_port_2_security_groups: type: list required: true entry_schema: - type: string - port_pd02_port_replacement_policy: + type: json + port_pd02_port_2_fixed_ips: type: list required: true entry_schema: - type: string - port_pd02_port_network_role: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_pd02_port_2_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + vm_image_name: type: string required: true - compute_ps_name: + compute_ps_availability_zone: type: list required: true entry_schema: type: string - port_pd02_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_pd02_port_ip_requirements: - type: list + port_pd02_port_2_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd02_port_network: + compute_ps_name: type: list required: true entry_schema: type: string - port_pd02_port_related_networks: - type: list + port_pd02_port_2_network_role_tag: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments node_templates: ps: type: org.openecomp.resource.vfc.compute.nodes.heat.ps @@ -103,43 +103,43 @@ topology_template: get_input: - compute_ps_name - index_value - ps_pd02_port: + ps_pd02_port_2: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_pd02_port_replacement_policy + - port_pd02_port_2_replacement_policy - index_value mac_requirements: - get_input: port_pd02_port_mac_requirements + get_input: port_pd02_port_2_mac_requirements order: - get_input: port_pd02_port_order + get_input: port_pd02_port_2_order security_groups: get_input: - - port_pd02_port_security_groups + - port_pd02_port_2_security_groups - index_value exCP_naming: - get_input: port_pd02_port_exCP_naming + get_input: port_pd02_port_2_exCP_naming vlan_requirements: - get_input: port_pd02_port_vlan_requirements + get_input: port_pd02_port_2_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_pd02_port_related_networks + get_input: port_pd02_port_2_related_networks ip_requirements: - get_input: port_pd02_port_ip_requirements + get_input: port_pd02_port_2_ip_requirements network_role_tag: - get_input: port_pd02_port_network_role_tag + get_input: port_pd02_port_2_network_role_tag network_role: - get_input: port_pd02_port_network_role + get_input: port_pd02_port_2_network_role fixed_ips: get_input: - - port_pd02_port_fixed_ips + - port_pd02_port_2_fixed_ips - index_value subnetpoolid: - get_input: port_pd02_port_subnetpoolid + get_input: port_pd02_port_2_subnetpoolid network: get_input: - - port_pd02_port_network + - port_pd02_port_2_network - index_value requirements: - binding: @@ -176,30 +176,30 @@ topology_template: disk.device.usage_ps: - ps - disk.device.usage - forwarder_ps_pd02_port: - - ps_pd02_port - - forwarder - network.outgoing.bytes.rate_ps_pd02_port: - - ps_pd02_port - - network.outgoing.bytes.rate + network.incoming.bytes.rate_ps_pd02_port_2: + - ps_pd02_port_2 + - network.incoming.bytes.rate endpoint_ps: - ps - endpoint + network.outgoing.bytes.rate_ps_pd02_port_2: + - ps_pd02_port_2 + - network.outgoing.bytes.rate disk.device.capacity_ps: - ps - disk.device.capacity cpu_ps: - ps - cpu - network.incoming.packets_ps_pd02_port: - - ps_pd02_port - - network.incoming.packets + network.outgoing.packets.rate_ps_pd02_port_2: + - ps_pd02_port_2 + - network.outgoing.packets.rate + binding_ps_pd02_port_2: + - ps_pd02_port_2 + - binding disk.device.write.bytes_ps: - ps - disk.device.write.bytes - network.outgoing.packets.rate_ps_pd02_port: - - ps_pd02_port - - network.outgoing.packets.rate cpu.delta_ps: - ps - cpu.delta @@ -212,26 +212,29 @@ topology_template: binding_ps: - ps - binding - binding_ps_pd02_port: - - ps_pd02_port - - binding + network.outpoing.packets_ps_pd02_port_2: + - ps_pd02_port_2 + - network.outpoing.packets + feature_ps_pd02_port_2: + - ps_pd02_port_2 + - feature disk.device.write.requests.rate_ps: - ps - disk.device.write.requests.rate - network.outgoing.bytes_ps_pd02_port: - - ps_pd02_port + network.outgoing.bytes_ps_pd02_port_2: + - ps_pd02_port_2 - network.outgoing.bytes cpu_util_ps: - ps - cpu_util - network.outpoing.packets_ps_pd02_port: - - ps_pd02_port - - network.outpoing.packets - network.incoming.packets.rate_ps_pd02_port: - - ps_pd02_port - - network.incoming.packets.rate - network.incoming.bytes_ps_pd02_port: - - ps_pd02_port + forwarder_ps_pd02_port_2: + - ps_pd02_port_2 + - forwarder + attachment_ps_pd02_port_2: + - ps_pd02_port_2 + - attachment + network.incoming.bytes_ps_pd02_port_2: + - ps_pd02_port_2 - network.incoming.bytes disk.read.bytes.rate_ps: - ps @@ -248,6 +251,9 @@ topology_template: instance_ps: - ps - instance + network.incoming.packets.rate_ps_pd02_port_2: + - ps_pd02_port_2 + - network.incoming.packets.rate disk.latency_ps: - ps - disk.latency @@ -269,9 +275,6 @@ topology_template: memory_ps: - ps - memory - feature_ps_pd02_port: - - ps_pd02_port - - feature disk.usage_ps: - ps - disk.usage @@ -287,9 +290,6 @@ topology_template: disk.allocation_ps: - ps - disk.allocation - attachment_ps_pd02_port: - - ps_pd02_port - - attachment disk.device.read.requests_ps: - ps - disk.device.read.requests @@ -299,9 +299,9 @@ topology_template: disk.device.latency_ps: - ps - disk.device.latency - network.incoming.bytes.rate_ps_pd02_port: - - ps_pd02_port - - network.incoming.bytes.rate + network.incoming.packets_ps_pd02_port_2: + - ps_pd02_port_2 + - network.incoming.packets disk.device.write.requests_ps: - ps - disk.device.write.requests @@ -309,15 +309,15 @@ topology_template: - ps - disk.write.bytes requirements: - dependency_ps_pd02_port: - - ps_pd02_port - - dependency - link_ps_pd02_port: - - ps_pd02_port + link_ps_pd02_port_2: + - ps_pd02_port_2 - link dependency_ps: - ps - dependency local_storage_ps: - ps - - local_storage \ No newline at end of file + - local_storage + dependency_ps_pd02_port_2: + - ps_pd02_port_2 + - dependency 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/Nested_ps_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_ps_1ServiceTemplate.yaml index 7c142e6996..b8458d6726 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_ps_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_ps_1ServiceTemplate.yaml @@ -11,6 +11,16 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pd01_port_1_security_groups: + type: list + required: true + entry_schema: + type: json + port_pd01_port_1_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements index_value: type: integer description: Index value of this substitution service template runtime instance @@ -18,15 +28,10 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_pd01_port_replacement_policy: - type: list - required: true - entry_schema: - type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd01_port_1_order: + type: integer required: true - port_pd01_port_related_networks: + port_pd01_port_1_related_networks: type: list required: true entry_schema: @@ -34,14 +39,20 @@ topology_template: vm_flavor_name: type: string required: true - port_pd01_port_security_groups: + port_pd01_port_1_network_role: + type: string + required: true + port_pd01_port_1_vlan_requirements: type: list required: true entry_schema: - type: json - port_pd01_port_mac_requirements: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_1_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true + port_pd01_port_1_subnetpoolid: + type: string + required: true vm_image_name: type: string required: true @@ -50,43 +61,32 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_fixed_ips: + port_pd01_port_1_replacement_policy: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_pd01_port_ip_requirements: - type: list + type: string + port_pd01_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + compute_ps_name: type: list required: true entry_schema: type: string - compute_ps_name: + port_pd01_port_1_fixed_ips: type: list required: true entry_schema: - type: string - port_pd01_port_order: - type: integer - required: true - port_pd01_port_subnetpoolid: - type: string - required: true - port_pd01_port_network_role: - type: string - required: true - port_pd01_port_network_role_tag: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_pd01_port_1_network_role_tag: type: string required: true - port_pd01_port_vlan_requirements: + port_pd01_port_1_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: string node_templates: ps: type: org.openecomp.resource.vfc.compute.nodes.heat.ps @@ -103,43 +103,43 @@ topology_template: get_input: - compute_ps_name - index_value - ps_pd01_port: + ps_pd01_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_pd01_port_replacement_policy + - port_pd01_port_1_replacement_policy - index_value mac_requirements: - get_input: port_pd01_port_mac_requirements + get_input: port_pd01_port_1_mac_requirements order: - get_input: port_pd01_port_order + get_input: port_pd01_port_1_order security_groups: get_input: - - port_pd01_port_security_groups + - port_pd01_port_1_security_groups - index_value exCP_naming: - get_input: port_pd01_port_exCP_naming + get_input: port_pd01_port_1_exCP_naming vlan_requirements: - get_input: port_pd01_port_vlan_requirements + get_input: port_pd01_port_1_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_pd01_port_related_networks + get_input: port_pd01_port_1_related_networks ip_requirements: - get_input: port_pd01_port_ip_requirements + get_input: port_pd01_port_1_ip_requirements network_role_tag: - get_input: port_pd01_port_network_role_tag + get_input: port_pd01_port_1_network_role_tag network_role: - get_input: port_pd01_port_network_role + get_input: port_pd01_port_1_network_role fixed_ips: get_input: - - port_pd01_port_fixed_ips + - port_pd01_port_1_fixed_ips - index_value subnetpoolid: - get_input: port_pd01_port_subnetpoolid + get_input: port_pd01_port_1_subnetpoolid network: get_input: - - port_pd01_port_network + - port_pd01_port_1_network - index_value requirements: - binding: @@ -155,9 +155,6 @@ topology_template: disk.device.iops_ps: - ps - disk.device.iops - network.incoming.packets_ps_pd01_port: - - ps_pd01_port - - network.incoming.packets scalable_ps: - ps - scalable @@ -179,30 +176,27 @@ topology_template: disk.device.usage_ps: - ps - disk.device.usage + network.incoming.bytes.rate_ps_pd01_port_1: + - ps_pd01_port_1 + - network.incoming.bytes.rate endpoint_ps: - ps - endpoint - network.incoming.bytes.rate_ps_pd01_port: - - ps_pd01_port - - network.incoming.bytes.rate disk.device.capacity_ps: - ps - disk.device.capacity cpu_ps: - ps - cpu - attachment_ps_pd01_port: - - ps_pd01_port - - attachment disk.device.write.bytes_ps: - ps - disk.device.write.bytes - forwarder_ps_pd01_port: - - ps_pd01_port - - forwarder cpu.delta_ps: - ps - cpu.delta + network.incoming.packets_ps_pd01_port_1: + - ps_pd01_port_1 + - network.incoming.packets disk.root.size_ps: - ps - disk.root.size @@ -212,18 +206,12 @@ topology_template: binding_ps: - ps - binding - network.incoming.packets.rate_ps_pd01_port: - - ps_pd01_port - - network.incoming.packets.rate disk.device.write.requests.rate_ps: - ps - disk.device.write.requests.rate - feature_ps_pd01_port: - - ps_pd01_port - - feature - network.incoming.bytes_ps_pd01_port: - - ps_pd01_port - - network.incoming.bytes + network.outgoing.bytes_ps_pd01_port_1: + - ps_pd01_port_1 + - network.outgoing.bytes cpu_util_ps: - ps - cpu_util @@ -233,39 +221,48 @@ topology_template: disk.device.read.bytes.rate_ps: - ps - disk.device.read.bytes.rate + forwarder_ps_pd01_port_1: + - ps_pd01_port_1 + - forwarder disk.read.requests_ps: - ps - disk.read.requests vcpus_ps: - ps - vcpus + network.incoming.packets.rate_ps_pd01_port_1: + - ps_pd01_port_1 + - network.incoming.packets.rate + attachment_ps_pd01_port_1: + - ps_pd01_port_1 + - attachment + network.incoming.bytes_ps_pd01_port_1: + - ps_pd01_port_1 + - network.incoming.bytes instance_ps: - ps - instance disk.latency_ps: - ps - disk.latency - network.outpoing.packets_ps_pd01_port: - - ps_pd01_port - - network.outpoing.packets disk.device.read.bytes_ps: - ps - disk.device.read.bytes memory.usage_ps: - ps - memory.usage - binding_ps_pd01_port: - - ps_pd01_port - - binding + network.outgoing.bytes.rate_ps_pd01_port_1: + - ps_pd01_port_1 + - network.outgoing.bytes.rate + feature_ps_pd01_port_1: + - ps_pd01_port_1 + - feature feature_ps: - ps - feature disk.device.write.bytes.rate_ps: - ps - disk.device.write.bytes.rate - network.outgoing.bytes_ps_pd01_port: - - ps_pd01_port - - network.outgoing.bytes disk.ephemeral.size_ps: - ps - disk.ephemeral.size @@ -281,9 +278,12 @@ topology_template: os_ps: - ps - os - network.outgoing.packets.rate_ps_pd01_port: - - ps_pd01_port + network.outgoing.packets.rate_ps_pd01_port_1: + - ps_pd01_port_1 - network.outgoing.packets.rate + binding_ps_pd01_port_1: + - ps_pd01_port_1 + - binding disk.iops_ps: - ps - disk.iops @@ -299,9 +299,9 @@ topology_template: disk.device.latency_ps: - ps - disk.device.latency - network.outgoing.bytes.rate_ps_pd01_port: - - ps_pd01_port - - network.outgoing.bytes.rate + network.outpoing.packets_ps_pd01_port_1: + - ps_pd01_port_1 + - network.outpoing.packets disk.device.write.requests_ps: - ps - disk.device.write.requests @@ -309,15 +309,15 @@ topology_template: - ps - disk.write.bytes requirements: + link_ps_pd01_port_1: + - ps_pd01_port_1 + - link + dependency_ps_pd01_port_1: + - ps_pd01_port_1 + - dependency dependency_ps: - ps - dependency local_storage_ps: - ps - local_storage - dependency_ps_pd01_port: - - ps_pd01_port - - dependency - link_ps_pd01_port: - - ps_pd01_port - - link \ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/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 aa2ed981f2..118eee3b23 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 @@ -62,36 +62,36 @@ topology_template: directives: - substitutable properties: - port_cmaui02_port_fixed_ips: - - ip_address: - get_input: - - cmaui_oam_ips - - 0 - port_cmaui02_port_mac_requirements: - mac_count_required: - is_required: false + port_cmaui02_port_2_network: + - get_input: net + port_cmaui02_port_2_replacement_policy: + - AUTO vm_flavor_name: get_input: cmaui_flavor compute_cmaui_name: - get_input: - cmaui_names - 1 - compute_cmaui_availability_zone: - - get_input: availability_zone_0 - vm_image_name: - get_input: cmaui_image - port_cmaui02_port_ip_requirements: + port_cmaui02_port_2_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false - port_cmaui02_port_replacement_policy: - - AUTO - port_cmaui02_port_security_groups: + compute_cmaui_availability_zone: + - get_input: availability_zone_0 + vm_image_name: + get_input: cmaui_image + port_cmaui02_port_2_security_groups: - - get_input: p2 - port_cmaui02_port_network: - - get_input: net + port_cmaui02_port_2_fixed_ips: + - ip_address: + get_input: + - cmaui_oam_ips + - 0 + port_cmaui02_port_2_mac_requirements: + mac_count_required: + is_required: false service_template_filter: substitute_service_template: Nested_cmauiServiceTemplate.yaml count: 1 @@ -105,32 +105,32 @@ topology_template: directives: - substitutable properties: - port_cmaui01_port_replacement_policy: - - AUTO - port_cmaui01_port_security_groups: - - - get_input: p1 - - get_input: p2 vm_flavor_name: get_input: cmaui_flavor compute_cmaui_name: - get_input: - cmaui_names - 0 + port_cmaui01_port_1_fixed_ips: + - ip_address: + get_input: + - cmaui_oam_ips + - 0 compute_cmaui_availability_zone: - get_input: availability_zone_0 + port_cmaui01_port_1_network: + - get_input: net vm_image_name: get_input: cmaui_image - port_cmaui01_port_mac_requirements: + port_cmaui01_port_1_replacement_policy: + - AUTO + port_cmaui01_port_1_security_groups: + - - get_input: p1 + - get_input: p2 + port_cmaui01_port_1_mac_requirements: mac_count_required: is_required: false - port_cmaui01_port_fixed_ips: - - ip_address: - get_input: - - cmaui_oam_ips - - 0 - port_cmaui01_port_network: - - get_input: net - port_cmaui01_port_ip_requirements: + port_cmaui01_port_1_ip_requirements: - ip_version: 4 ip_count_required: is_required: true @@ -179,16 +179,16 @@ topology_template: - feature_pd01_port_1_test_nested3Level network.outgoing.packets.rate_cmaui02_port_2: - abstract_cmaui - - network.outgoing.packets.rate_cmaui_cmaui02_port + - network.outgoing.packets.rate_cmaui_cmaui02_port_2 binding_cmaui02_port_2: - abstract_cmaui - - binding_cmaui_cmaui02_port + - binding_cmaui_cmaui02_port_2 disk.device.latency_server_cmaui_1: - abstract_cmaui_1 - disk.device.latency_cmaui network.outgoing.bytes.rate_cmaui02_port_2: - abstract_cmaui - - network.outgoing.bytes.rate_cmaui_cmaui02_port + - network.outgoing.bytes.rate_cmaui_cmaui02_port_2 disk.device.latency_server_cmaui_2: - abstract_cmaui - disk.device.latency_cmaui @@ -209,13 +209,13 @@ topology_template: - disk.device.latency_server_ps_1_test_nested3Level attachment_cmaui01_port_1: - abstract_cmaui_1 - - attachment_cmaui_cmaui01_port + - attachment_cmaui_cmaui01_port_1 disk.write.bytes_server_ps_1_test_nested3Level_test_nested2Level: - test_nested2Level - disk.write.bytes_server_ps_1_test_nested3Level network.incoming.bytes.rate_cmaui01_port_1: - abstract_cmaui_1 - - network.incoming.bytes.rate_cmaui_cmaui01_port + - network.incoming.bytes.rate_cmaui_cmaui01_port_1 disk.capacity_server_oam_1_test_nested2Level: - test_nested2Level - disk.capacity_server_oam_1 @@ -248,7 +248,7 @@ topology_template: - disk.device.read.bytes.rate_cmaui feature_cmaui02_port_2: - abstract_cmaui - - feature_cmaui_cmaui02_port + - feature_cmaui_cmaui02_port_2 disk.device.read.bytes.rate_server_cmaui_1: - abstract_cmaui_1 - disk.device.read.bytes.rate_cmaui @@ -287,7 +287,7 @@ topology_template: - disk.iops_server_oam_2 network.outpoing.packets_cmaui02_port_2: - abstract_cmaui - - network.outpoing.packets_cmaui_cmaui02_port + - network.outpoing.packets_cmaui_cmaui02_port_2 attachment_pd01_port_1_test_nested3Level_test_nested2Level: - test_nested2Level - attachment_pd01_port_1_test_nested3Level @@ -314,7 +314,7 @@ topology_template: - cpu_util_server_ps_2_test_nested3Level network.outgoing.bytes_cmaui02_port_2: - abstract_cmaui - - network.outgoing.bytes_cmaui_cmaui02_port + - network.outgoing.bytes_cmaui_cmaui02_port_2 feature_server_ps_1_test_nested3Level_test_nested2Level: - test_nested2Level - feature_server_ps_1_test_nested3Level @@ -344,7 +344,7 @@ topology_template: - disk.device.write.bytes.rate_server_ps_2_test_nested3Level forwarder_cmaui01_port_1: - abstract_cmaui_1 - - forwarder_cmaui_cmaui01_port + - forwarder_cmaui_cmaui01_port_1 network.outgoing.bytes.rate_oam02_port_2_test_nested2Level: - test_nested2Level - network.outgoing.bytes.rate_oam02_port_2 @@ -419,7 +419,7 @@ topology_template: - cpu_util_cmaui network.incoming.packets_cmaui02_port_2: - abstract_cmaui - - network.incoming.packets_cmaui_cmaui02_port + - network.incoming.packets_cmaui_cmaui02_port_2 disk.device.write.bytes.rate_server_cmaui_2: - abstract_cmaui - disk.device.write.bytes.rate_cmaui @@ -482,7 +482,7 @@ topology_template: - disk.device.usage_server_ps_2_test_nested3Level network.incoming.bytes_cmaui01_port_1: - abstract_cmaui_1 - - network.incoming.bytes_cmaui_cmaui01_port + - network.incoming.bytes_cmaui_cmaui01_port_1 instance_server_oam_2_test_nested2Level: - test_nested2Level - instance_server_oam_2 @@ -590,7 +590,7 @@ topology_template: - feature_oam01_port_1 network.outgoing.bytes_cmaui01_port_1: - abstract_cmaui_1 - - network.outgoing.bytes_cmaui_cmaui01_port + - network.outgoing.bytes_cmaui_cmaui01_port_1 instance_server_cmaui_2: - abstract_cmaui - instance_cmaui @@ -602,7 +602,7 @@ topology_template: - memory.resident_server_ps_2_test_nested3Level network.incoming.packets.rate_cmaui01_port_1: - abstract_cmaui_1 - - network.incoming.packets.rate_cmaui_cmaui01_port + - network.incoming.packets.rate_cmaui_cmaui01_port_1 disk.read.requests_server_ps_1_test_nested3Level_test_nested2Level: - test_nested2Level - disk.read.requests_server_ps_1_test_nested3Level @@ -677,10 +677,10 @@ topology_template: - disk.device.usage_cmaui network.outgoing.packets.rate_cmaui01_port_1: - abstract_cmaui_1 - - network.outgoing.packets.rate_cmaui_cmaui01_port + - network.outgoing.packets.rate_cmaui_cmaui01_port_1 binding_cmaui01_port_1: - abstract_cmaui_1 - - binding_cmaui_cmaui01_port + - binding_cmaui_cmaui01_port_1 scalable_server_oam_2_test_nested2Level: - test_nested2Level - scalable_server_oam_2 @@ -695,7 +695,7 @@ topology_template: - disk.device.write.requests.rate_server_ps_2_test_nested3Level network.outgoing.bytes.rate_cmaui01_port_1: - abstract_cmaui_1 - - network.outgoing.bytes.rate_cmaui_cmaui01_port + - network.outgoing.bytes.rate_cmaui_cmaui01_port_1 memory_server_ps_2_test_nested3Level_test_nested2Level: - test_nested2Level - memory_server_ps_2_test_nested3Level @@ -719,7 +719,7 @@ topology_template: - disk.device.allocation_server_oam_1 network.incoming.bytes.rate_cmaui02_port_2: - abstract_cmaui - - network.incoming.bytes.rate_cmaui_cmaui02_port + - network.incoming.bytes.rate_cmaui_cmaui02_port_2 endpoint_server_oam_2_test_nested2Level: - test_nested2Level - endpoint_server_oam_2 @@ -734,7 +734,7 @@ topology_template: - disk.iops_server_ps_2_test_nested3Level attachment_cmaui02_port_2: - abstract_cmaui - - attachment_cmaui_cmaui02_port + - attachment_cmaui_cmaui02_port_2 disk.write.bytes.rate_server_oam_2_test_nested2Level: - test_nested2Level - disk.write.bytes.rate_server_oam_2 @@ -809,7 +809,7 @@ topology_template: - host_server_oam_2 forwarder_cmaui02_port_2: - abstract_cmaui - - forwarder_cmaui_cmaui02_port + - forwarder_cmaui_cmaui02_port_2 feature_server_oam_2_test_nested2Level: - test_nested2Level - feature_server_oam_2 @@ -839,7 +839,7 @@ topology_template: - disk.device.capacity_server_ps_1_test_nested3Level feature_cmaui01_port_1: - abstract_cmaui_1 - - feature_cmaui_cmaui01_port + - feature_cmaui_cmaui01_port_1 disk.device.read.requests.rate_server_ps_1_test_nested3Level_test_nested2Level: - test_nested2Level - disk.device.read.requests.rate_server_ps_1_test_nested3Level @@ -911,7 +911,7 @@ topology_template: - memory.usage_server_ps_2_test_nested3Level network.incoming.bytes_cmaui02_port_2: - abstract_cmaui - - network.incoming.bytes_cmaui_cmaui02_port + - network.incoming.bytes_cmaui_cmaui02_port_2 disk.write.requests_server_cmaui_2: - abstract_cmaui - disk.write.requests_cmaui @@ -989,7 +989,7 @@ topology_template: - network.outgoing.packets.rate_pd02_port_2_test_nested3Level network.incoming.packets_cmaui01_port_1: - abstract_cmaui_1 - - network.incoming.packets_cmaui_cmaui01_port + - network.incoming.packets_cmaui_cmaui01_port_1 disk.read.bytes_server_ps_1_test_nested3Level_test_nested2Level: - test_nested2Level - disk.read.bytes_server_ps_1_test_nested3Level @@ -1040,7 +1040,7 @@ topology_template: - network.outgoing.bytes_oam01_port_1 network.incoming.packets.rate_cmaui02_port_2: - abstract_cmaui - - network.incoming.packets.rate_cmaui_cmaui02_port + - network.incoming.packets.rate_cmaui_cmaui02_port_2 disk.device.write.requests_server_ps_1_test_nested3Level_test_nested2Level: - test_nested2Level - disk.device.write.requests_server_ps_1_test_nested3Level @@ -1127,17 +1127,17 @@ topology_template: - memory.usage_cmaui network.outpoing.packets_cmaui01_port_1: - abstract_cmaui_1 - - network.outpoing.packets_cmaui_cmaui01_port + - network.outpoing.packets_cmaui_cmaui01_port_1 requirements: link_cmaui01_port_1: - abstract_cmaui_1 - - link_cmaui_cmaui01_port + - link_cmaui_cmaui01_port_1 local_storage_server_oam_2_test_nested2Level: - test_nested2Level - local_storage_server_oam_2 link_cmaui02_port_2: - abstract_cmaui - - link_cmaui_cmaui02_port + - link_cmaui_cmaui02_port_2 dependency_test_nested2Level: - test_nested2Level - dependency @@ -1155,10 +1155,10 @@ topology_template: - dependency_oam01_port_1 dependency_cmaui01_port_1: - abstract_cmaui_1 - - dependency_cmaui_cmaui01_port + - dependency_cmaui_cmaui01_port_1 dependency_cmaui02_port_2: - abstract_cmaui - - dependency_cmaui_cmaui02_port + - dependency_cmaui_cmaui02_port_2 dependency_server_ps_1_test_nested3Level_test_nested2Level: - test_nested2Level - dependency_server_ps_1_test_nested3Level 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 07c709079f..7e6940549d 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 @@ -62,33 +62,33 @@ topology_template: directives: - substitutable properties: - port_oam01_port_mac_requirements: - mac_count_required: - is_required: false - port_oam01_port_ip_requirements: + port_oam01_port_1_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false - port_oam01_port_security_groups: - - - get_input: p2 - - get_input: p1 - port_oam01_port_network: + port_oam01_port_1_network: - get_input: net - port_oam01_port_replacement_policy: - - AUTO vm_flavor_name: get_input: cmaui_flavor + port_oam01_port_1_security_groups: + - - get_input: p2 + - get_input: p1 vm_image_name: get_input: cmaui_image - port_oam01_port_fixed_ips: + port_oam01_port_1_replacement_policy: + - AUTO + port_oam01_port_1_fixed_ips: - ip_address: get_input: - cmaui_oam_ips - 0 compute_oam_availability_zone: - get_input: availability_zone_0 + port_oam01_port_1_mac_requirements: + mac_count_required: + is_required: false compute_oam_name: - get_input: - oam_names @@ -106,30 +106,30 @@ topology_template: directives: - substitutable properties: - port_oam02_port_network: + port_oam02_port_2_network: - get_input: net - port_oam02_port_ip_requirements: + port_oam02_port_2_security_groups: + - - get_input: p1 + vm_flavor_name: + get_input: cmaui_flavor + port_oam02_port_2_replacement_policy: + - AUTO + port_oam02_port_2_fixed_ips: + - ip_address: + get_input: + - cmaui_oam_ips + - 0 + vm_image_name: + get_input: cmaui_image + port_oam02_port_2_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false - port_oam02_port_fixed_ips: - - ip_address: - get_input: - - cmaui_oam_ips - - 0 - vm_flavor_name: - get_input: cmaui_flavor - port_oam02_port_security_groups: - - - get_input: p1 - port_oam02_port_mac_requirements: + port_oam02_port_2_mac_requirements: mac_count_required: is_required: false - vm_image_name: - get_input: cmaui_image - port_oam02_port_replacement_policy: - - AUTO compute_oam_availability_zone: - get_input: availability_zone_0 compute_oam_name: @@ -168,7 +168,7 @@ topology_template: capabilities: network.incoming.packets.rate_oam02_port_2: - abstract_oam - - network.incoming.packets.rate_oam_oam02_port + - network.incoming.packets.rate_oam_oam02_port_2 disk.latency_server_oam_2: - abstract_oam - disk.latency_oam @@ -186,7 +186,7 @@ topology_template: - disk.latency_oam network.incoming.bytes_oam02_port_2: - abstract_oam - - network.incoming.bytes_oam_oam02_port + - network.incoming.bytes_oam_oam02_port_2 endpoint_server_oam_1: - abstract_oam_1 - endpoint_oam @@ -210,7 +210,7 @@ topology_template: - disk.device.read.bytes_oam forwarder_oam01_port_1: - abstract_oam_1 - - forwarder_oam_oam01_port + - forwarder_oam_oam01_port_1 disk.device.read.bytes_server_oam_2: - abstract_oam - disk.device.read.bytes_oam @@ -219,7 +219,7 @@ topology_template: - cpu.delta_oam attachment_oam01_port_1: - abstract_oam_1 - - attachment_oam_oam01_port + - attachment_oam_oam01_port_1 disk.write.bytes_server_ps_1_test_nested3Level: - test_nested3Level - disk.write.bytes_server_ps_1 @@ -285,7 +285,7 @@ topology_template: - disk.capacity_oam network.incoming.packets_oam01_port_1: - abstract_oam_1 - - network.incoming.packets_oam_oam01_port + - network.incoming.packets_oam_oam01_port_1 disk.device.read.requests.rate_server_ps_1_test_nested3Level: - test_nested3Level - disk.device.read.requests.rate_server_ps_1 @@ -300,7 +300,7 @@ topology_template: - disk.capacity_server_ps_2 network.outgoing.bytes.rate_oam01_port_1: - abstract_oam_1 - - network.outgoing.bytes.rate_oam_oam01_port + - network.outgoing.bytes.rate_oam_oam01_port_1 disk.iops_server_ps_2_test_nested3Level: - test_nested3Level - disk.iops_server_ps_2 @@ -396,7 +396,7 @@ topology_template: - disk.allocation_server_ps_2 binding_oam02_port_2: - abstract_oam - - binding_oam_oam02_port + - binding_oam_oam02_port_2 binding_server_oam_1: - abstract_oam_1 - binding_oam @@ -408,10 +408,10 @@ topology_template: - endpoint_server_ps_2 network.outgoing.bytes_oam02_port_2: - abstract_oam - - network.outgoing.bytes_oam_oam02_port + - network.outgoing.bytes_oam_oam02_port_2 network.outpoing.packets_oam01_port_1: - abstract_oam_1 - - network.outpoing.packets_oam_oam01_port + - network.outpoing.packets_oam_oam01_port_1 disk.device.read.bytes.rate_server_oam_1: - abstract_oam_1 - disk.device.read.bytes.rate_oam @@ -438,7 +438,7 @@ topology_template: - instance_oam network.incoming.packets_oam02_port_2: - abstract_oam - - network.incoming.packets_oam_oam02_port + - network.incoming.packets_oam_oam02_port_2 disk.read.bytes_server_ps_2_test_nested3Level: - test_nested3Level - disk.read.bytes_server_ps_2 @@ -465,7 +465,7 @@ topology_template: - host_server_ps_1 attachment_oam02_port_2: - abstract_oam - - attachment_oam_oam02_port + - attachment_oam_oam02_port_2 disk.device.iops_server_oam_2: - abstract_oam - disk.device.iops_oam @@ -489,7 +489,7 @@ topology_template: - disk.device.capacity_server_ps_1 network.incoming.bytes.rate_oam02_port_2: - abstract_oam - - network.incoming.bytes.rate_oam_oam02_port + - network.incoming.bytes.rate_oam_oam02_port_2 disk.write.requests.rate_server_ps_2_test_nested3Level: - test_nested3Level - disk.write.requests.rate_server_ps_2 @@ -498,7 +498,7 @@ topology_template: - disk.latency_server_ps_2 network.incoming.packets.rate_oam01_port_1: - abstract_oam_1 - - network.incoming.packets.rate_oam_oam01_port + - network.incoming.packets.rate_oam_oam01_port_1 disk.device.latency_server_ps_1_test_nested3Level: - test_nested3Level - disk.device.latency_server_ps_1 @@ -519,13 +519,13 @@ topology_template: - attachment_pd02_port_2 network.incoming.bytes_oam01_port_1: - abstract_oam_1 - - network.incoming.bytes_oam_oam01_port + - network.incoming.bytes_oam_oam01_port_1 cpu_server_ps_2_test_nested3Level: - test_nested3Level - cpu_server_ps_2 forwarder_oam02_port_2: - abstract_oam - - forwarder_oam_oam02_port + - forwarder_oam_oam02_port_2 network.incoming.packets.rate_pd01_port_1_test_nested3Level: - test_nested3Level - network.incoming.packets.rate_pd01_port_1 @@ -537,13 +537,13 @@ topology_template: - os_oam network.outgoing.packets.rate_oam02_port_2: - abstract_oam - - network.outgoing.packets.rate_oam_oam02_port + - network.outgoing.packets.rate_oam_oam02_port_2 disk.device.latency_server_ps_2_test_nested3Level: - test_nested3Level - disk.device.latency_server_ps_2 feature_oam01_port_1: - abstract_oam_1 - - feature_oam_oam01_port + - feature_oam_oam01_port_1 disk.device.allocation_server_oam_2: - abstract_oam - disk.device.allocation_oam @@ -558,7 +558,7 @@ topology_template: - cpu_util_server_ps_2 network.incoming.bytes.rate_oam01_port_1: - abstract_oam_1 - - network.incoming.bytes.rate_oam_oam01_port + - network.incoming.bytes.rate_oam_oam01_port_1 vcpus_server_oam_2: - abstract_oam - vcpus_oam @@ -588,7 +588,7 @@ topology_template: - network.incoming.bytes.rate_pd02_port_2 network.outgoing.bytes.rate_oam02_port_2: - abstract_oam - - network.outgoing.bytes.rate_oam_oam02_port + - network.outgoing.bytes.rate_oam_oam02_port_2 vcpus_server_oam_1: - abstract_oam_1 - vcpus_oam @@ -612,7 +612,7 @@ topology_template: - cpu_oam binding_oam01_port_1: - abstract_oam_1 - - binding_oam_oam01_port + - binding_oam_oam01_port_1 disk.device.write.requests_server_ps_2_test_nested3Level: - test_nested3Level - disk.device.write.requests_server_ps_2 @@ -756,7 +756,7 @@ topology_template: - disk.device.capacity_oam network.outgoing.packets.rate_oam01_port_1: - abstract_oam_1 - - network.outgoing.packets.rate_oam_oam01_port + - network.outgoing.packets.rate_oam_oam01_port_1 disk.device.read.requests_server_ps_1_test_nested3Level: - test_nested3Level - disk.device.read.requests_server_ps_1 @@ -765,13 +765,13 @@ topology_template: - disk.read.bytes.rate_server_ps_2 feature_oam02_port_2: - abstract_oam - - feature_oam_oam02_port + - feature_oam_oam02_port_2 network.outgoing.bytes_oam01_port_1: - abstract_oam_1 - - network.outgoing.bytes_oam_oam01_port + - network.outgoing.bytes_oam_oam01_port_1 network.outpoing.packets_oam02_port_2: - abstract_oam - - network.outpoing.packets_oam_oam02_port + - network.outpoing.packets_oam_oam02_port_2 network.incoming.packets_pd01_port_1_test_nested3Level: - test_nested3Level - network.incoming.packets_pd01_port_1 @@ -808,13 +808,13 @@ topology_template: requirements: link_oam02_port_2: - abstract_oam - - link_oam_oam02_port + - link_oam_oam02_port_2 dependency_pd01_port_1_test_nested3Level: - test_nested3Level - dependency_pd01_port_1 link_oam01_port_1: - abstract_oam_1 - - link_oam_oam01_port + - link_oam_oam01_port_1 dependency_server_oam_1: - abstract_oam_1 - dependency_oam @@ -841,10 +841,10 @@ topology_template: - link_pd01_port_1 dependency_oam01_port_1: - abstract_oam_1 - - dependency_oam_oam01_port + - dependency_oam_oam01_port_1 dependency_oam02_port_2: - abstract_oam - - dependency_oam_oam02_port + - dependency_oam_oam02_port_2 dependency_test_nested3Level: - test_nested3Level - dependency 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 1a19d76b8c..82b9147bb8 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 @@ -62,36 +62,36 @@ topology_template: directives: - substitutable properties: - port_pd02_port_fixed_ips: + port_pd02_port_2_replacement_policy: + - AUTO + port_pd02_port_2_network: + - get_input: net + vm_flavor_name: + get_input: cmaui_flavor + port_pd02_port_2_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + port_pd02_port_2_security_groups: + - - get_input: p1 + port_pd02_port_2_fixed_ips: - ip_address: get_input: - cmaui_oam_ips - 0 - port_pd02_port_mac_requirements: - mac_count_required: - is_required: false - vm_flavor_name: - get_input: cmaui_flavor vm_image_name: get_input: cmaui_image - port_pd02_port_security_groups: - - - get_input: p1 compute_ps_availability_zone: - get_input: availability_zone_0 - port_pd02_port_replacement_policy: - - AUTO + port_pd02_port_2_mac_requirements: + mac_count_required: + is_required: false compute_ps_name: - get_input: - ps_names - 0 - port_pd02_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false - port_pd02_port_network: - - get_input: net service_template_filter: substitute_service_template: Nested_psServiceTemplate.yaml count: 1 @@ -105,37 +105,37 @@ topology_template: directives: - substitutable properties: - port_pd01_port_replacement_policy: - - AUTO - vm_flavor_name: - get_input: cmaui_flavor - port_pd01_port_security_groups: + port_pd01_port_1_security_groups: - - get_input: p2 - get_input: p1 - port_pd01_port_mac_requirements: + port_pd01_port_1_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + vm_flavor_name: + get_input: cmaui_flavor + port_pd01_port_1_mac_requirements: mac_count_required: is_required: false vm_image_name: get_input: cmaui_image compute_ps_availability_zone: - get_input: availability_zone_0 - port_pd01_port_fixed_ips: + port_pd01_port_1_replacement_policy: + - AUTO + compute_ps_name: + - get_input: + - ps_names + - 0 + port_pd01_port_1_fixed_ips: - ip_address: get_input: - cmaui_oam_ips - 0 - port_pd01_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false - port_pd01_port_network: + port_pd01_port_1_network: - get_input: net - compute_ps_name: - - get_input: - - ps_names - - 0 service_template_filter: substitute_service_template: Nested_ps_1ServiceTemplate.yaml count: 1 @@ -179,13 +179,13 @@ topology_template: - disk.capacity_ps network.outgoing.bytes_pd02_port_2: - abstract_ps - - network.outgoing.bytes_ps_pd02_port + - network.outgoing.bytes_ps_pd02_port_2 disk.capacity_server_ps_2: - abstract_ps - disk.capacity_ps network.outgoing.bytes_pd01_port_1: - abstract_ps_1 - - network.outgoing.bytes_ps_pd01_port + - network.outgoing.bytes_ps_pd01_port_1 memory.usage_server_ps_1: - abstract_ps_1 - memory.usage_ps @@ -248,13 +248,13 @@ topology_template: - endpoint_ps binding_pd01_port_1: - abstract_ps_1 - - binding_ps_pd01_port + - binding_ps_pd01_port_1 disk.device.read.requests.rate_server_ps_1: - abstract_ps_1 - disk.device.read.requests.rate_ps network.outgoing.bytes.rate_pd02_port_2: - abstract_ps - - network.outgoing.bytes.rate_ps_pd02_port + - network.outgoing.bytes.rate_ps_pd02_port_2 host_server_ps_2: - abstract_ps - host_ps @@ -275,13 +275,13 @@ topology_template: - scalable_ps network.incoming.packets.rate_pd02_port_2: - abstract_ps - - network.incoming.packets.rate_ps_pd02_port + - network.incoming.packets.rate_ps_pd02_port_2 scalable_server_ps_2: - abstract_ps - scalable_ps network.outgoing.packets.rate_pd01_port_1: - abstract_ps_1 - - network.outgoing.packets.rate_ps_pd01_port + - network.outgoing.packets.rate_ps_pd01_port_1 disk.write.bytes.rate_server_ps_2: - abstract_ps - disk.write.bytes.rate_ps @@ -302,7 +302,7 @@ topology_template: - disk.ephemeral.size_ps feature_pd02_port_2: - abstract_ps - - feature_ps_pd02_port + - feature_ps_pd02_port_2 disk.ephemeral.size_server_ps_2: - abstract_ps - disk.ephemeral.size_ps @@ -320,7 +320,7 @@ topology_template: - disk.allocation_ps attachment_pd01_port_1: - abstract_ps_1 - - attachment_ps_pd01_port + - attachment_ps_pd01_port_1 memory.resident_server_ps_1: - abstract_ps_1 - memory.resident_ps @@ -341,7 +341,7 @@ topology_template: - disk.device.read.requests_ps network.incoming.bytes.rate_pd01_port_1: - abstract_ps_1 - - network.incoming.bytes.rate_ps_pd01_port + - network.incoming.bytes.rate_ps_pd01_port_1 disk.read.bytes.rate_server_ps_1: - abstract_ps_1 - disk.read.bytes.rate_ps @@ -353,7 +353,7 @@ topology_template: - disk.device.iops_ps feature_pd01_port_1: - abstract_ps_1 - - feature_ps_pd01_port + - feature_ps_pd01_port_1 disk.device.iops_server_ps_2: - abstract_ps - disk.device.iops_ps @@ -383,40 +383,40 @@ topology_template: - disk.root.size_ps attachment_pd02_port_2: - abstract_ps - - attachment_ps_pd02_port + - attachment_ps_pd02_port_2 disk.root.size_server_ps_2: - abstract_ps - disk.root.size_ps network.outgoing.bytes.rate_pd01_port_1: - abstract_ps_1 - - network.outgoing.bytes.rate_ps_pd01_port + - network.outgoing.bytes.rate_ps_pd01_port_1 binding_pd02_port_2: - abstract_ps - - binding_ps_pd02_port + - binding_ps_pd02_port_2 network.incoming.packets.rate_pd01_port_1: - abstract_ps_1 - - network.incoming.packets.rate_ps_pd01_port + - network.incoming.packets.rate_ps_pd01_port_1 disk.usage_server_ps_1: - abstract_ps_1 - disk.usage_ps network.outpoing.packets_pd01_port_1: - abstract_ps_1 - - network.outpoing.packets_ps_pd01_port + - network.outpoing.packets_ps_pd01_port_1 disk.usage_server_ps_2: - abstract_ps - disk.usage_ps network.outpoing.packets_pd02_port_2: - abstract_ps - - network.outpoing.packets_ps_pd02_port + - network.outpoing.packets_ps_pd02_port_2 network.incoming.bytes_pd01_port_1: - abstract_ps_1 - - network.incoming.bytes_ps_pd01_port + - network.incoming.bytes_ps_pd01_port_1 network.incoming.bytes_pd02_port_2: - abstract_ps - - network.incoming.bytes_ps_pd02_port + - network.incoming.bytes_ps_pd02_port_2 network.outgoing.packets.rate_pd02_port_2: - abstract_ps - - network.outgoing.packets.rate_ps_pd02_port + - network.outgoing.packets.rate_ps_pd02_port_2 vcpus_server_ps_1: - abstract_ps_1 - vcpus_ps @@ -425,22 +425,22 @@ topology_template: - vcpus_ps forwarder_pd01_port_1: - abstract_ps_1 - - forwarder_ps_pd01_port + - forwarder_ps_pd01_port_1 forwarder_pd02_port_2: - abstract_ps - - forwarder_ps_pd02_port + - forwarder_ps_pd02_port_2 network.incoming.packets_pd01_port_1: - abstract_ps_1 - - network.incoming.packets_ps_pd01_port + - network.incoming.packets_ps_pd01_port_1 network.incoming.packets_pd02_port_2: - abstract_ps - - network.incoming.packets_ps_pd02_port + - network.incoming.packets_ps_pd02_port_2 disk.device.write.bytes.rate_server_ps_1: - abstract_ps_1 - disk.device.write.bytes.rate_ps network.incoming.bytes.rate_pd02_port_2: - abstract_ps - - network.incoming.bytes.rate_ps_pd02_port + - network.incoming.bytes.rate_ps_pd02_port_2 disk.write.requests_server_ps_1: - abstract_ps_1 - disk.write.requests_ps @@ -477,16 +477,16 @@ topology_template: requirements: dependency_pd02_port_2: - abstract_ps - - dependency_ps_pd02_port + - dependency_ps_pd02_port_2 local_storage_server_ps_2: - abstract_ps - local_storage_ps link_pd01_port_1: - abstract_ps_1 - - link_ps_pd01_port + - link_ps_pd01_port_1 link_pd02_port_2: - abstract_ps - - link_ps_pd02_port + - link_ps_pd02_port_2 local_storage_server_ps_1: - abstract_ps_1 - local_storage_ps @@ -498,4 +498,4 @@ topology_template: - dependency_ps dependency_pd01_port_1: - abstract_ps_1 - - dependency_ps_pd01_port + - dependency_ps_pd01_port_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/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/GlobalSubstitutionTypesServiceTemplate.yaml index 1481bf653e..e776376302 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,6 +8,26 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server_4: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_pd01_port_01_network_role_tag: + type: string + required: true + status: SUPPORTED + port_pd01_port_01_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_01_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd01_port_01_network_role: + type: string + required: true + status: SUPPORTED index_value: type: integer description: Index value of this substitution service template runtime instance @@ -28,57 +48,37 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd01_port_01_order: + type: integer required: true status: SUPPORTED - port_pd01_port_related_networks: + port_pd01_port_01_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments + type: string vm_flavor_name: type: string required: true status: SUPPORTED - port_pd01_port_mac_requirements: + port_pd01_port_01_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - vm_image_name: - type: string - required: true - status: SUPPORTED - port_pd01_port_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_pd01_port_order: - type: integer - required: true - status: SUPPORTED - port_pd01_port_subnetpoolid: - type: string + port_pd01_port_01_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_pd01_port_network_role: + port_pd01_port_01_subnetpoolid: type: string required: true status: SUPPORTED - port_pd01_port_network_role_tag: + vm_image_name: type: string required: true status: SUPPORTED - port_pd01_port_vlan_requirements: + port_pd01_port_01_vlan_requirements: type: list required: true status: SUPPORTED @@ -105,20 +105,26 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pd01_port: + - dependency_pd_server_pd01_port_01: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd01_port: + - link_pd_server_pd01_port_01: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: + network.outgoing.bytes_pd_server_pd01_port_01: + 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_pd_server: type: tosca.capabilities.Scalable occurrences: @@ -148,7 +154,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pd01_port: + network.outpoing.packets_pd_server_pd01_port_01: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -165,12 +171,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd01_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_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -201,12 +201,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd01_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.iops_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -225,12 +219,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pd01_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 vcpus_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -254,8 +242,8 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pd01_port: - type: tosca.capabilities.Attachment + feature_pd_server_pd01_port_01: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -277,6 +265,20 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes_pd_server_pd01_port_01: + 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_pd_server_pd01_port_01: + 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 binding_pd_server: type: tosca.capabilities.network.Bindable occurrences: @@ -288,6 +290,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes.rate_pd_server_pd01_port_01: + 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_pd_server: type: tosca.capabilities.Node occurrences: @@ -299,13 +307,10 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_pd01_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 + attachment_pd_server_pd01_port_01: + type: tosca.capabilities.Attachment occurrences: - - 0 + - 1 - UNBOUNDED disk.write.bytes_pd_server: type: org.openecomp.capabilities.metric.Ceilometer @@ -313,13 +318,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pd_server_pd01_port: + network.incoming.packets.rate_pd_server_pd01_port_01: 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_pd_server_pd01_port: + network.outgoing.bytes.rate_pd_server_pd01_port_01: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -368,24 +373,24 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pd01_port: + disk.write.requests.rate_pd_server: 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_pd_server_pd01_port: + forwarder_pd_server_pd01_port_01: type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - disk.write.requests.rate_pd_server: + disk.ephemeral.size_pd_server: 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.ephemeral.size_pd_server: + network.outgoing.packets.rate_pd_server_pd01_port_01: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -397,11 +402,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_pd01_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.device.latency_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -420,13 +420,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pd01_port: + disk.device.iops_pd_server: 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.iops_pd_server: + network.incoming.packets_pd_server_pd01_port_01: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -435,6 +435,12 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server_5: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_ps02_port_01_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements index_value: type: integer description: Index value of this substitution service template runtime instance @@ -443,12 +449,16 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_ps02_port_ip_requirements: + port_ps02_port_01_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: org.openecomp.datatypes.network.VlanRequirements + port_ps02_port_01_order: + type: integer + required: true + status: SUPPORTED compute_pd_server_availability_zone: type: list required: true @@ -461,90 +471,80 @@ node_types: status: SUPPORTED entry_schema: type: string - port_ps02_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_ps02_port_01_related_networks: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true status: SUPPORTED - port_ps02_port_network_role_tag: + vm_image_name: type: string required: true status: SUPPORTED - port_ps02_port_network_role: + port_ps02_port_01_network_role: type: string required: true status: SUPPORTED - port_ps02_port_vlan_requirements: - type: list + port_ps02_port_01_network_role_tag: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_ps02_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_ps02_port_01_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - vm_image_name: - type: string + port_ps02_port_01_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_ps02_port_related_networks: + port_ps02_port_01_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_ps02_port_subnetpoolid: - type: string - required: true - status: SUPPORTED - port_ps02_port_order: - type: integer - required: true - status: SUPPORTED + type: string compute_pd_server_user_data_format: type: list required: true status: SUPPORTED entry_schema: type: string - port_ps02_port_network: - type: list + port_ps02_port_01_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: string requirements: - - dependency_pd_server: + - dependency_pd_server_ps02_port_01: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - local_storage_pd_server: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo + - link_pd_server_ps02_port_01: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo occurrences: - - 0 - - UNBOUNDED - - dependency_pd_server_ps02_port: + - 1 + - 1 + - dependency_pd_server: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_ps02_port: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo + - local_storage_pd_server: + capability: tosca.capabilities.Attachment + node: tosca.nodes.BlockStorage + relationship: tosca.relationships.AttachesTo occurrences: - - 1 - - 1 + - 0 + - UNBOUNDED capabilities: scalable_pd_server: type: tosca.capabilities.Scalable @@ -557,14 +557,6 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_ps02_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 memory.usage_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -583,7 +575,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pd_server_ps02_port: + network.outgoing.packets.rate_pd_server_ps02_port_01: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -630,13 +622,19 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.iops_pd_server: + network.incoming.packets.rate_pd_server_ps02_port_01: 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_pd_server_ps02_port: + network.outpoing.packets_pd_server_ps02_port_01: + 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.iops_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -648,6 +646,11 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_pd_server_ps02_port_01: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED cpu.delta_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -672,6 +675,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes_pd_server_ps02_port_01: + 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_pd_server: type: tosca.capabilities.Endpoint.Admin occurrences: @@ -683,21 +692,20 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_ps02_port: + disk.device.allocation_pd_server: 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_pd_server: + disk.allocation_pd_server: 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.allocation_pd_server: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_pd_server_ps02_port_01: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -712,11 +720,6 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_ps02_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED feature_pd_server: type: tosca.capabilities.Node occurrences: @@ -734,17 +737,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_ps02_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - network.outgoing.bytes.rate_pd_server_ps02_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.device.read.requests.rate_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -769,12 +761,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_ps02_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.device.read.requests_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -794,60 +780,74 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_ps02_port: + network.incoming.bytes.rate_pd_server_ps02_port_01: 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_pd_server: + network.outgoing.bytes_pd_server_ps02_port_01: 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.ephemeral.size_pd_server: + forwarder_pd_server_ps02_port_01: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes.rate_pd_server_ps02_port_01: 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_pd_server_ps02_port: + disk.write.requests.rate_pd_server: 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_pd_server: + disk.ephemeral.size_pd_server: 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_pd_server: + disk.write.requests_pd_server: 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_pd_server_ps02_port: - type: org.openecomp.capabilities.Forwarder + disk.device.latency_pd_server: + 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_pd_server: + network.incoming.packets_pd_server_ps02_port_01: 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_pd_server: + binding_pd_server_ps02_port_01: + 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 + disk.latency_pd_server: 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_pd_server_ps02_port: + disk.device.capacity_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -862,6 +862,12 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server_6: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_pd02_port_0_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements index_value: type: integer description: Index value of this substitution service template runtime instance @@ -882,68 +888,62 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd02_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pd02_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED vm_flavor_name: type: string required: true status: SUPPORTED - port_pd02_port_order: - type: integer + port_pd02_port_0_network: + type: list required: true status: SUPPORTED - port_pd02_port_subnetpoolid: + entry_schema: + type: string + port_pd02_port_0_network_role: type: string required: true status: SUPPORTED - port_pd02_port_network_role_tag: - type: string + port_pd02_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_pd02_port_vlan_requirements: - type: list + port_pd02_port_0_order: + type: integer required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements vm_image_name: type: string required: true status: SUPPORTED - port_pd02_port_network_role: + port_pd02_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_pd02_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_pd02_port_ip_requirements: + port_pd02_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd02_port_network: - type: list + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd02_port_0_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: string - compute_pd_server_user_data_format: + port_pd02_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd02_port_related_networks: + type: org.openecomp.datatypes.network.VlanRequirements + compute_pd_server_user_data_format: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments + type: string requirements: - dependency_pd_server: capability: tosca.capabilities.Node @@ -959,20 +959,28 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pd02_port: + - dependency_pd_server_pd02_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd02_port: + - link_pd_server_pd02_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: + binding_pd_server_pd02_port_0: + 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 scalable_pd_server: type: tosca.capabilities.Scalable occurrences: @@ -1013,6 +1021,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.packets.rate_pd_server_pd02_port_0: + 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_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1043,15 +1057,7 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_pd02_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 - network.outgoing.packets.rate_pd_server_pd02_port: + network.outpoing.packets_pd_server_pd02_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1075,29 +1081,11 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd02_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_pd_server_pd02_port: + feature_pd_server_pd02_port_0: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pd_server_pd02_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_pd_server_pd02_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 vcpus_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1121,11 +1109,6 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_pd_server_pd02_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED disk.capacity_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1144,12 +1127,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_pd_server_pd02_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 binding_pd_server: type: tosca.capabilities.network.Bindable occurrences: @@ -1172,7 +1149,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pd02_port: + network.outgoing.bytes.rate_pd_server_pd02_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1184,6 +1161,18 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes_pd_server_pd02_port_0: + 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_pd_server_pd02_port_0: + 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_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1208,6 +1197,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets_pd_server_pd02_port_0: + 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_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1227,36 +1222,42 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pd02_port: - type: tosca.capabilities.Attachment + network.incoming.packets.rate_pd_server_pd02_port_0: + 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_pd_server: + network.incoming.bytes.rate_pd_server_pd02_port_0: 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.ephemeral.size_pd_server: + disk.write.requests.rate_pd_server: 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_pd_server: + disk.ephemeral.size_pd_server: 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_pd_server: + attachment_pd_server_pd02_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + disk.write.requests_pd_server: 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_pd_server_pd02_port: + disk.device.latency_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1280,15 +1281,26 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd02_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_pd_server_pd02_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED org.openecomp.resource.abstract.nodes.pd_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_pd01_port_03_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_pd01_port_03_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_pd01_port_03_network_role: + type: string + required: true + status: SUPPORTED index_value: type: integer description: Index value of this substitution service template runtime instance @@ -1309,11 +1321,13 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd01_port_03_vlan_requirements: + type: list required: true status: SUPPORTED - port_pd01_port_related_networks: + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_03_related_networks: type: list required: true status: SUPPORTED @@ -1323,48 +1337,34 @@ node_types: type: string required: true status: SUPPORTED - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - vm_image_name: - type: string - required: true - status: SUPPORTED - port_pd01_port_ip_requirements: + port_pd01_port_03_ip_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_pd01_port_order: - type: integer - required: true - status: SUPPORTED - port_pd01_port_subnetpoolid: + vm_image_name: type: string required: true status: SUPPORTED - port_pd01_port_network_role: + port_pd01_port_03_subnetpoolid: type: string required: true status: SUPPORTED - port_pd01_port_network_role_tag: - type: string + port_pd01_port_03_order: + type: integer required: true status: SUPPORTED - port_pd01_port_vlan_requirements: + port_pd01_port_03_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: string + port_pd01_port_03_network_role_tag: + type: string + required: true + status: SUPPORTED compute_pd_server_user_data_format: type: list required: true @@ -1372,6 +1372,19 @@ node_types: entry_schema: type: string requirements: + - dependency_pd_server_pd01_port_03: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - link_pd_server_pd01_port_03: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 - dependency_pd_server: capability: tosca.capabilities.Node node: tosca.nodes.Root @@ -1386,20 +1399,13 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pd01_port: - capability: tosca.capabilities.Node - node: tosca.nodes.Root - relationship: tosca.relationships.DependsOn - occurrences: - - 0 - - UNBOUNDED - - link_pd_server_pd01_port: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo + capabilities: + network.outgoing.bytes_pd_server_pd01_port_03: + 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 - - 1 - capabilities: + - UNBOUNDED scalable_pd_server: type: tosca.capabilities.Scalable occurrences: @@ -1429,7 +1435,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pd01_port: + network.outpoing.packets_pd_server_pd01_port_03: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1446,12 +1452,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd01_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_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1482,9 +1482,8 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd01_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_pd_server_pd01_port_03: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -1506,12 +1505,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pd01_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 vcpus_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1535,8 +1528,9 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pd01_port: - type: tosca.capabilities.Attachment + network.incoming.bytes_pd_server_pd01_port_03: + 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 @@ -1563,12 +1557,31 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_pd_server_pd01_port_03: + 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 disk.read.requests_pd_server: 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_pd_server_pd01_port_03: + 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 + attachment_pd_server_pd01_port_03: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED feature_pd_server: type: tosca.capabilities.Node occurrences: @@ -1580,27 +1593,19 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_pd01_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 disk.write.bytes_pd_server: 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_pd_server_pd01_port: + network.outgoing.bytes.rate_pd_server_pd01_port_03: 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_pd_server_pd01_port: + network.incoming.packets.rate_pd_server_pd01_port_03: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1649,17 +1654,12 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pd01_port: + network.outgoing.packets.rate_pd_server_pd01_port_03: 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_pd_server_pd01_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED disk.write.requests.rate_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1672,14 +1672,20 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pd_server_pd01_port_03: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.write.requests_pd_server: 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_pd_server_pd01_port: - type: tosca.capabilities.Node + network.incoming.packets_pd_server_pd01_port_03: + 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 @@ -1701,12 +1707,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pd01_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.device.iops_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1716,82 +1716,82 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server_7: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - status: SUPPORTED - constraints: - - greater_or_equal: 0 - compute_pd_server_availability_zone: - type: list + port_pd01_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: string - compute_pd_server_name: + port_pd01_port_0_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_pd01_port_related_networks: + port_pd01_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - vm_flavor_name: + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - vm_image_name: + port_pd01_port_0_network_role: type: string required: true status: SUPPORTED - port_pd01_port_ip_requirements: + port_pd01_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + status: SUPPORTED + constraints: + - greater_or_equal: 0 + compute_pd_server_availability_zone: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd01_port_order: - type: integer + compute_pd_server_name: + type: list required: true status: SUPPORTED - port_pd01_port_subnetpoolid: + entry_schema: + type: string + vm_flavor_name: type: string required: true status: SUPPORTED - port_pd01_port_network_role: - type: string + port_pd01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_pd01_port_0_order: + type: integer required: true status: SUPPORTED - port_pd01_port_network_role_tag: + vm_image_name: type: string required: true status: SUPPORTED - port_pd01_port_vlan_requirements: + port_pd01_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_0_subnetpoolid: + type: string + required: true + status: SUPPORTED compute_pd_server_user_data_format: type: list required: true @@ -1813,20 +1813,28 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pd01_port: + - dependency_pd_server_pd01_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd01_port: + - link_pd_server_pd01_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: + binding_pd_server_pd01_port_0: + 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 scalable_pd_server: type: tosca.capabilities.Scalable occurrences: @@ -1856,12 +1864,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pd01_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 os_pd_server: type: tosca.capabilities.OperatingSystem occurrences: @@ -1873,12 +1875,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd01_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_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1909,7 +1905,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd01_port: + network.incoming.packets_pd_server_pd01_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1933,7 +1929,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pd01_port: + network.incoming.packets.rate_pd_server_pd01_port_0: + 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_pd_server_pd01_port_0: + 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.packets.rate_pd_server_pd01_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1951,6 +1959,11 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_pd_server_pd01_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED disk.device.write.requests_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1962,17 +1975,17 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pd01_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED disk.capacity_pd_server: 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_pd_server_pd01_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.allocation_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1996,6 +2009,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes.rate_pd_server_pd01_port_0: + 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_pd_server: type: tosca.capabilities.Node occurrences: @@ -2007,27 +2026,19 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_pd01_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 disk.write.bytes_pd_server: 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_pd_server_pd01_port: + network.outgoing.bytes_pd_server_pd01_port_0: 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_pd_server_pd01_port: + network.incoming.bytes_pd_server_pd01_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2057,6 +2068,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_pd_server_pd01_port_0: + 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_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2076,14 +2093,8 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pd01_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 - forwarder_pd_server_pd01_port: - type: org.openecomp.capabilities.Forwarder + feature_pd_server_pd01_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -2105,11 +2116,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_pd01_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.device.latency_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2128,12 +2134,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pd01_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.device.iops_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2143,6 +2143,16 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server_1: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_pd02_port_03_network_role_tag: + type: string + required: true + status: SUPPORTED + port_pd02_port_03_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments index_value: type: integer description: Index value of this substitution service template runtime instance @@ -2163,68 +2173,58 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd02_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - vm_flavor_name: - type: string - required: true - status: SUPPORTED - port_pd02_port_order: + port_pd02_port_03_order: type: integer required: true status: SUPPORTED - port_pd02_port_subnetpoolid: + port_pd02_port_03_network_role: type: string required: true status: SUPPORTED - port_pd02_port_network_role_tag: + vm_flavor_name: type: string required: true status: SUPPORTED - port_pd02_port_vlan_requirements: - type: list + port_pd02_port_03_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - vm_image_name: - type: string + port_pd02_port_03_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_pd02_port_network_role: + port_pd02_port_03_subnetpoolid: type: string required: true status: SUPPORTED - port_pd02_port_exCP_naming: - type: org.openecomp.datatypes.Naming + vm_image_name: + type: string required: true status: SUPPORTED - port_pd02_port_ip_requirements: + port_pd02_port_03_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd02_port_network: + type: string + port_pd02_port_03_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string + type: org.openecomp.datatypes.network.IpRequirements compute_pd_server_user_data_format: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd02_port_related_networks: + port_pd02_port_03_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments + type: org.openecomp.datatypes.network.VlanRequirements requirements: - dependency_pd_server: capability: tosca.capabilities.Node @@ -2240,20 +2240,26 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pd02_port: + - dependency_pd_server_pd02_port_03: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd02_port: + - link_pd_server_pd02_port_03: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: + network.incoming.bytes.rate_pd_server_pd02_port_03: + 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_pd_server: type: tosca.capabilities.Scalable occurrences: @@ -2265,6 +2271,20 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes_pd_server_pd02_port_03: + 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_pd_server_pd02_port_03: + 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 memory.usage_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2294,86 +2314,66 @@ node_types: occurrences: - 1 - UNBOUNDED - cpu_pd_server: - 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_pd_server: - 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_pd_server: + network.incoming.packets.rate_pd_server_pd02_port_03: 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_pd_server: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_pd_server_pd02_port_03: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - disk.device.read.bytes.rate_pd_server: + cpu_pd_server: 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_pd_server_pd02_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 - network.outgoing.packets.rate_pd_server_pd02_port: + cpu_util_pd_server: 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.iops_pd_server: + disk.device.write.requests.rate_pd_server: 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_pd_server: + disk.read.bytes_pd_server: 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_pd_server: + network.outgoing.bytes.rate_pd_server_pd02_port_03: 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_pd_server_pd02_port: + disk.device.read.bytes.rate_pd_server: 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_pd_server_pd02_port: - type: tosca.capabilities.Node + disk.iops_pd_server: + 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_pd_server_pd02_port: + memory.resident_pd_server: 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_pd_server_pd02_port: + cpu.delta_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2397,13 +2397,14 @@ node_types: occurrences: - 1 - UNBOUNDED - endpoint_pd_server: - type: tosca.capabilities.Endpoint.Admin + network.outgoing.packets.rate_pd_server_pd02_port_03: + 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_pd_server_pd02_port: - type: org.openecomp.capabilities.Forwarder + endpoint_pd_server: + type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED @@ -2425,12 +2426,17 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_pd_server_pd02_port: + network.outgoing.bytes_pd_server_pd02_port_03: 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_pd_server_pd02_port_03: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED binding_pd_server: type: tosca.capabilities.network.Bindable occurrences: @@ -2442,18 +2448,24 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server: - type: tosca.capabilities.Node + network.incoming.packets_pd_server_pd02_port_03: + 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_pd_server: + network.outpoing.packets_pd_server_pd02_port_03: 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_pd_server_pd02_port: + feature_pd_server: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + disk.usage_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2508,8 +2520,8 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pd02_port: - type: tosca.capabilities.Attachment + feature_pd_server_pd02_port_03: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -2537,12 +2549,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pd02_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.latency_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2561,15 +2567,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd02_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.pd_server_2: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_pd02_port_02_order: + type: integer + required: true + status: SUPPORTED index_value: type: integer description: Index value of this substitution service template runtime instance @@ -2578,6 +2582,12 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 + port_pd02_port_02_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements compute_pd_server_availability_zone: type: list required: true @@ -2590,51 +2600,47 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd02_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pd02_port_02_network_role: + type: string required: true status: SUPPORTED vm_flavor_name: type: string required: true status: SUPPORTED - port_pd02_port_order: - type: integer - required: true - status: SUPPORTED - port_pd02_port_subnetpoolid: + port_pd02_port_02_subnetpoolid: type: string required: true status: SUPPORTED - port_pd02_port_network_role_tag: - type: string + port_pd02_port_02_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_pd02_port_vlan_requirements: + port_pd02_port_02_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - vm_image_name: - type: string + port_pd02_port_02_related_networks: + type: list required: true status: SUPPORTED - port_pd02_port_network_role: + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + vm_image_name: type: string required: true status: SUPPORTED - port_pd02_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd02_port_02_network_role_tag: + type: string required: true status: SUPPORTED - port_pd02_port_ip_requirements: - type: list + port_pd02_port_02_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd02_port_network: + port_pd02_port_02_network: type: list required: true status: SUPPORTED @@ -2646,12 +2652,6 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd02_port_related_networks: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments requirements: - dependency_pd_server: capability: tosca.capabilities.Node @@ -2667,20 +2667,26 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pd02_port: + - dependency_pd_server_pd02_port_02: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd02_port: + - link_pd_server_pd02_port_02: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: + network.incoming.bytes.rate_pd_server_pd02_port_02: + 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_pd_server: type: tosca.capabilities.Scalable occurrences: @@ -2692,12 +2698,26 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes_pd_server_pd02_port_02: + 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_pd_server: 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_pd_server_pd02_port_02: + 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 memory_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2721,104 +2741,90 @@ node_types: occurrences: - 1 - UNBOUNDED - cpu_pd_server: + network.incoming.packets.rate_pd_server_pd02_port_02: 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_pd_server: + cpu_pd_server: 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_pd_server: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_pd_server_pd02_port_02: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - disk.read.bytes_pd_server: + cpu_util_pd_server: 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_pd_server: + disk.device.write.requests.rate_pd_server: 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_pd_server_pd02_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 - network.outgoing.packets.rate_pd_server_pd02_port: + disk.read.bytes_pd_server: 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.iops_pd_server: + network.outgoing.bytes.rate_pd_server_pd02_port_02: 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_pd_server: + disk.device.read.bytes.rate_pd_server: 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_pd_server: + disk.iops_pd_server: 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_pd_server_pd02_port: + memory.resident_pd_server: 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_pd_server_pd02_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - network.incoming.bytes.rate_pd_server_pd02_port: + cpu.delta_pd_server: 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_pd_server_pd02_port: + vcpus_pd_server: 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_pd_server: + disk.device.write.bytes.rate_pd_server: 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_pd_server: + disk.device.write.requests_pd_server: 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_pd_server: + network.outgoing.packets.rate_pd_server_pd02_port_02: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2829,17 +2835,17 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_pd_server_pd02_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED disk.capacity_pd_server: 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_pd_server_pd02_port_02: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.allocation_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2852,7 +2858,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_pd_server_pd02_port: + network.outgoing.bytes_pd_server_pd02_port_02: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2869,18 +2875,24 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server: - type: tosca.capabilities.Node + network.incoming.packets_pd_server_pd02_port_02: + 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_pd_server: + network.outpoing.packets_pd_server_pd02_port_02: 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_pd_server_pd02_port: + feature_pd_server: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + disk.usage_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2935,8 +2947,8 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pd02_port: - type: tosca.capabilities.Attachment + feature_pd_server_pd02_port_02: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -2964,12 +2976,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pd02_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.latency_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2988,15 +2994,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd02_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.pd_server_3: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_pd01_port_02_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_02_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED index_value: type: integer description: Index value of this substitution service template runtime instance @@ -3017,62 +3027,52 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd01_port_02_network_role: + type: string required: true status: SUPPORTED - port_pd01_port_related_networks: - type: list + port_pd01_port_02_order: + type: integer required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true status: SUPPORTED - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - vm_image_name: + port_pd01_port_02_network_role_tag: type: string required: true status: SUPPORTED - port_pd01_port_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + port_pd01_port_02_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd01_port_order: - type: integer + port_pd01_port_02_subnetpoolid: + type: string required: true status: SUPPORTED - port_pd01_port_subnetpoolid: - type: string + port_pd01_port_02_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_pd01_port_network_role: + vm_image_name: type: string required: true status: SUPPORTED - port_pd01_port_network_role_tag: - type: string + port_pd01_port_02_ip_requirements: + type: list required: true status: SUPPORTED - port_pd01_port_vlan_requirements: + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_02_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.RelatedNetworksAssignments compute_pd_server_user_data_format: type: list required: true @@ -3094,20 +3094,26 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pd01_port: + - dependency_pd_server_pd01_port_02: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd01_port: + - link_pd_server_pd01_port_02: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: + network.outgoing.bytes_pd_server_pd01_port_02: + 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_pd_server: type: tosca.capabilities.Scalable occurrences: @@ -3137,24 +3143,18 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pd01_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 os_pd_server: type: tosca.capabilities.OperatingSystem occurrences: - 1 - UNBOUNDED - disk.write.bytes.rate_pd_server: + network.outpoing.packets_pd_server_pd01_port_02: 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_pd_server_pd01_port: + disk.write.bytes.rate_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -3190,15 +3190,14 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd01_port: + disk.iops_pd_server: 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.iops_pd_server: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_pd_server_pd01_port_02: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -3214,12 +3213,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pd01_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 vcpus_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3243,11 +3236,6 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pd01_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED disk.capacity_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3266,17 +3254,37 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes_pd_server_pd01_port_02: + 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_pd_server: type: tosca.capabilities.network.Bindable occurrences: - 1 - UNBOUNDED + binding_pd_server_pd01_port_02: + 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 disk.read.requests_pd_server: 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_pd_server_pd01_port_02: + 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_pd_server: type: tosca.capabilities.Node occurrences: @@ -3288,13 +3296,10 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_pd01_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 + attachment_pd_server_pd01_port_02: + type: tosca.capabilities.Attachment occurrences: - - 0 + - 1 - UNBOUNDED disk.write.bytes_pd_server: type: org.openecomp.capabilities.metric.Ceilometer @@ -3302,13 +3307,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pd_server_pd01_port: + network.incoming.packets.rate_pd_server_pd01_port_02: 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_pd_server_pd01_port: + network.outgoing.bytes.rate_pd_server_pd01_port_02: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -3357,24 +3362,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pd01_port: + disk.write.requests.rate_pd_server: 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_pd_server_pd01_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - disk.write.requests.rate_pd_server: + disk.ephemeral.size_pd_server: 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.ephemeral.size_pd_server: + network.outgoing.packets.rate_pd_server_pd01_port_02: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -3386,8 +3386,8 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_pd01_port: - type: tosca.capabilities.Node + forwarder_pd_server_pd01_port_02: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED @@ -3409,13 +3409,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pd01_port: + disk.device.iops_pd_server: 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.iops_pd_server: + network.incoming.packets_pd_server_pd01_port_02: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -7692,4 +7692,4 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - - UNBOUNDED \ No newline at end of file + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/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 9914f9b938..22342cabed 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 @@ -133,28 +133,28 @@ topology_template: directives: - substitutable properties: + port_pd02_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: - get_input: - pd_server_names - 1 - port_pd02_port_mac_requirements: - mac_count_required: - is_required: false vm_flavor_name: get_input: pd_flavor_name - port_pd02_port_network_role_tag: oam + port_pd02_port_0_network: + - get_input: oam_net_name + port_pd02_port_0_mac_requirements: + mac_count_required: + is_required: false vm_image_name: get_input: pd_image_name - port_pd02_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false - port_pd02_port_network: - - get_input: oam_net_name + port_pd02_port_0_network_role_tag: oam compute_pd_server_user_data_format: - RAW service_template_filter: @@ -170,6 +170,18 @@ topology_template: directives: - substitutable properties: + port_pd01_port_0_mac_requirements: + mac_count_required: + is_required: false + port_pd01_port_0_network: + - get_input: oam_net_name + port_pd01_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_pd01_port_0_network_role_tag: oam compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: @@ -178,20 +190,8 @@ topology_template: - 0 vm_flavor_name: get_input: pd_flavor_name - port_pd01_port_mac_requirements: - mac_count_required: - is_required: false vm_image_name: get_input: pd_image_name - port_pd01_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false - port_pd01_port_network: - - get_input: oam_net_name - port_pd01_port_network_role_tag: oam 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/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_serverServiceTemplate.yaml index 2d01270aaf..5548e79a3d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_serverServiceTemplate.yaml @@ -11,6 +11,15 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pd01_port_03_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_pd01_port_03_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_pd01_port_03_network_role: + type: string + required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -28,10 +37,12 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd01_port_03_vlan_requirements: + type: list required: true - port_pd01_port_related_networks: + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_03_related_networks: type: list required: true entry_schema: @@ -39,98 +50,90 @@ topology_template: vm_flavor_name: type: string required: true - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - vm_image_name: - type: string - required: true - port_pd01_port_ip_requirements: + port_pd01_port_03_ip_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: - type: list - required: true - entry_schema: - type: string - port_pd01_port_order: - type: integer - required: true - port_pd01_port_subnetpoolid: + vm_image_name: type: string required: true - port_pd01_port_network_role: + port_pd01_port_03_subnetpoolid: type: string required: true - port_pd01_port_network_role_tag: - type: string + port_pd01_port_03_order: + type: integer required: true - port_pd01_port_vlan_requirements: + port_pd01_port_03_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: string + port_pd01_port_03_network_role_tag: + type: string + required: true compute_pd_server_user_data_format: type: list required: true entry_schema: type: string node_templates: - pd_server: - type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server - properties: - availability_zone: - get_input: - - compute_pd_server_availability_zone - - index_value - flavor: - get_input: vm_flavor_name - image: - get_input: vm_image_name - name: - get_input: - - compute_pd_server_name - - index_value - user_data_format: - get_input: - - compute_pd_server_user_data_format - - index_value - pd_server_pd01_port: + pd_server_pd01_port_03: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd01_port_exCP_naming + get_input: port_pd01_port_03_exCP_naming vlan_requirements: - get_input: port_pd01_port_vlan_requirements + get_input: port_pd01_port_03_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_pd01_port_related_networks + get_input: port_pd01_port_03_related_networks ip_requirements: - get_input: port_pd01_port_ip_requirements + get_input: port_pd01_port_03_ip_requirements network_role_tag: - get_input: port_pd01_port_network_role_tag + get_input: port_pd01_port_03_network_role_tag mac_requirements: - get_input: port_pd01_port_mac_requirements + get_input: port_pd01_port_03_mac_requirements order: - get_input: port_pd01_port_order + get_input: port_pd01_port_03_order network_role: - get_input: port_pd01_port_network_role + get_input: port_pd01_port_03_network_role subnetpoolid: - get_input: port_pd01_port_subnetpoolid + get_input: port_pd01_port_03_subnetpoolid network: get_input: - - port_pd01_port_network + - port_pd01_port_03_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: pd_server relationship: tosca.relationships.network.BindsTo + pd_server: + type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server + properties: + availability_zone: + get_input: + - compute_pd_server_availability_zone + - index_value + flavor: + get_input: vm_flavor_name + image: + get_input: vm_image_name + name: + get_input: + - compute_pd_server_name + - index_value + user_data_format: + get_input: + - compute_pd_server_user_data_format + - index_value substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server capabilities: + network.outgoing.bytes_pd_server_pd01_port_03: + - pd_server_pd01_port_03 + - network.outgoing.bytes scalable_pd_server: - pd_server - scalable @@ -146,18 +149,15 @@ topology_template: disk.device.usage_pd_server: - pd_server - disk.device.usage - network.outgoing.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.packets.rate + network.outpoing.packets_pd_server_pd01_port_03: + - pd_server_pd01_port_03 + - network.outpoing.packets os_pd_server: - pd_server - os disk.write.bytes.rate_pd_server: - pd_server - disk.write.bytes.rate - network.incoming.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes cpu_pd_server: - pd_server - cpu @@ -173,9 +173,9 @@ topology_template: disk.device.read.bytes.rate_pd_server: - pd_server - disk.device.read.bytes.rate - network.outgoing.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes + feature_pd_server_pd01_port_03: + - pd_server_pd01_port_03 + - feature disk.iops_pd_server: - pd_server - disk.iops @@ -185,9 +185,6 @@ topology_template: cpu.delta_pd_server: - pd_server - cpu.delta - network.incoming.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets.rate vcpus_pd_server: - pd_server - vcpus @@ -200,9 +197,9 @@ topology_template: endpoint_pd_server: - pd_server - endpoint - attachment_pd_server_pd01_port: - - pd_server_pd01_port - - attachment + network.incoming.bytes_pd_server_pd01_port_03: + - pd_server_pd01_port_03 + - network.incoming.bytes disk.capacity_pd_server: - pd_server - disk.capacity @@ -215,27 +212,33 @@ topology_template: binding_pd_server: - pd_server - binding + binding_pd_server_pd01_port_03: + - pd_server_pd01_port_03 + - binding disk.read.requests_pd_server: - pd_server - disk.read.requests + network.incoming.bytes.rate_pd_server_pd01_port_03: + - pd_server_pd01_port_03 + - network.incoming.bytes.rate + attachment_pd_server_pd01_port_03: + - pd_server_pd01_port_03 + - attachment feature_pd_server: - pd_server - feature disk.usage_pd_server: - pd_server - disk.usage - binding_pd_server_pd01_port: - - pd_server_pd01_port - - binding disk.write.bytes_pd_server: - pd_server - disk.write.bytes - network.incoming.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes.rate - network.incoming.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets + network.outgoing.bytes.rate_pd_server_pd01_port_03: + - pd_server_pd01_port_03 + - network.outgoing.bytes.rate + network.incoming.packets.rate_pd_server_pd01_port_03: + - pd_server_pd01_port_03 + - network.incoming.packets.rate disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -257,24 +260,24 @@ topology_template: host_pd_server: - pd_server - host - network.outpoing.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.outpoing.packets - forwarder_pd_server_pd01_port: - - pd_server_pd01_port - - forwarder + network.outgoing.packets.rate_pd_server_pd01_port_03: + - pd_server_pd01_port_03 + - network.outgoing.packets.rate disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate disk.ephemeral.size_pd_server: - pd_server - disk.ephemeral.size + forwarder_pd_server_pd01_port_03: + - pd_server_pd01_port_03 + - forwarder disk.write.requests_pd_server: - pd_server - disk.write.requests - feature_pd_server_pd01_port: - - pd_server_pd01_port - - feature + network.incoming.packets_pd_server_pd01_port_03: + - pd_server_pd01_port_03 + - network.incoming.packets disk.device.latency_pd_server: - pd_server - disk.device.latency @@ -284,9 +287,6 @@ topology_template: disk.device.capacity_pd_server: - pd_server - disk.device.capacity - network.outgoing.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes.rate disk.device.iops_pd_server: - pd_server - disk.device.iops @@ -294,12 +294,12 @@ topology_template: local_storage_pd_server: - pd_server - local_storage - link_pd_server_pd01_port: - - pd_server_pd01_port - - link - dependency_pd_server_pd01_port: - - pd_server_pd01_port + dependency_pd_server_pd01_port_03: + - pd_server_pd01_port_03 - dependency dependency_pd_server: - pd_server - - dependency \ No newline at end of file + - dependency + link_pd_server_pd01_port_03: + - pd_server_pd01_port_03 + - link 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/Nested_pd_server_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_1ServiceTemplate.yaml index c46b8e7c0f..8dd1090b25 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_1ServiceTemplate.yaml @@ -11,6 +11,14 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pd02_port_03_network_role_tag: + type: string + required: true + port_pd02_port_03_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments index_value: type: integer description: Index value of this substitution service template runtime instance @@ -28,55 +36,47 @@ topology_template: required: true entry_schema: type: string - port_pd02_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - vm_flavor_name: - type: string - required: true - port_pd02_port_order: + port_pd02_port_03_order: type: integer required: true - port_pd02_port_subnetpoolid: + port_pd02_port_03_network_role: type: string required: true - port_pd02_port_network_role_tag: + vm_flavor_name: type: string required: true - port_pd02_port_vlan_requirements: - type: list + port_pd02_port_03_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - vm_image_name: - type: string + port_pd02_port_03_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_pd02_port_network_role: + port_pd02_port_03_subnetpoolid: type: string required: true - port_pd02_port_exCP_naming: - type: org.openecomp.datatypes.Naming + vm_image_name: + type: string required: true - port_pd02_port_ip_requirements: + port_pd02_port_03_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd02_port_network: + type: string + port_pd02_port_03_ip_requirements: type: list required: true entry_schema: - type: string + type: org.openecomp.datatypes.network.IpRequirements compute_pd_server_user_data_format: type: list required: true entry_schema: type: string - port_pd02_port_related_networks: + port_pd02_port_03_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments + type: org.openecomp.datatypes.network.VlanRequirements node_templates: pd_server: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server @@ -97,31 +97,31 @@ topology_template: get_input: - compute_pd_server_user_data_format - index_value - pd_server_pd02_port: + pd_server_pd02_port_03: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd02_port_exCP_naming + get_input: port_pd02_port_03_exCP_naming vlan_requirements: - get_input: port_pd02_port_vlan_requirements + get_input: port_pd02_port_03_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_pd02_port_related_networks + get_input: port_pd02_port_03_related_networks ip_requirements: - get_input: port_pd02_port_ip_requirements + get_input: port_pd02_port_03_ip_requirements network_role_tag: - get_input: port_pd02_port_network_role_tag + get_input: port_pd02_port_03_network_role_tag mac_requirements: - get_input: port_pd02_port_mac_requirements + get_input: port_pd02_port_03_mac_requirements order: - get_input: port_pd02_port_order + get_input: port_pd02_port_03_order network_role: - get_input: port_pd02_port_network_role + get_input: port_pd02_port_03_network_role subnetpoolid: - get_input: port_pd02_port_subnetpoolid + get_input: port_pd02_port_03_subnetpoolid network: get_input: - - port_pd02_port_network + - port_pd02_port_03_network - index_value requirements: - binding: @@ -131,12 +131,21 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server_1 capabilities: + network.incoming.bytes.rate_pd_server_pd02_port_03: + - pd_server_pd02_port_03 + - network.incoming.bytes.rate scalable_pd_server: - pd_server - scalable disk.read.bytes.rate_pd_server: - pd_server - disk.read.bytes.rate + network.incoming.bytes_pd_server_pd02_port_03: + - pd_server_pd02_port_03 + - network.incoming.bytes + binding_pd_server_pd02_port_03: + - pd_server_pd02_port_03 + - binding memory.usage_pd_server: - pd_server - memory.usage @@ -152,6 +161,12 @@ topology_template: disk.write.bytes.rate_pd_server: - pd_server - disk.write.bytes.rate + network.incoming.packets.rate_pd_server_pd02_port_03: + - pd_server_pd02_port_03 + - network.incoming.packets.rate + attachment_pd_server_pd02_port_03: + - pd_server_pd02_port_03 + - attachment cpu_pd_server: - pd_server - cpu @@ -164,15 +179,12 @@ topology_template: disk.read.bytes_pd_server: - pd_server - disk.read.bytes + network.outgoing.bytes.rate_pd_server_pd02_port_03: + - pd_server_pd02_port_03 + - network.outgoing.bytes.rate disk.device.read.bytes.rate_pd_server: - pd_server - disk.device.read.bytes.rate - binding_pd_server_pd02_port: - - pd_server_pd02_port - - binding - network.outgoing.packets.rate_pd_server_pd02_port: - - pd_server_pd02_port - - network.outgoing.packets.rate disk.iops_pd_server: - pd_server - disk.iops @@ -182,18 +194,6 @@ topology_template: cpu.delta_pd_server: - pd_server - cpu.delta - network.outgoing.bytes_pd_server_pd02_port: - - pd_server_pd02_port - - network.outgoing.bytes - feature_pd_server_pd02_port: - - pd_server_pd02_port - - feature - network.incoming.bytes.rate_pd_server_pd02_port: - - pd_server_pd02_port - - network.incoming.bytes.rate - network.outgoing.bytes.rate_pd_server_pd02_port: - - pd_server_pd02_port - - network.outgoing.bytes.rate vcpus_pd_server: - pd_server - vcpus @@ -203,12 +203,12 @@ topology_template: disk.device.write.requests_pd_server: - pd_server - disk.device.write.requests + network.outgoing.packets.rate_pd_server_pd02_port_03: + - pd_server_pd02_port_03 + - network.outgoing.packets.rate endpoint_pd_server: - pd_server - endpoint - forwarder_pd_server_pd02_port: - - pd_server_pd02_port - - forwarder disk.capacity_pd_server: - pd_server - disk.capacity @@ -218,24 +218,30 @@ topology_template: disk.allocation_pd_server: - pd_server - disk.allocation - network.incoming.packets_pd_server_pd02_port: - - pd_server_pd02_port - - network.incoming.packets + network.outgoing.bytes_pd_server_pd02_port_03: + - pd_server_pd02_port_03 + - network.outgoing.bytes + forwarder_pd_server_pd02_port_03: + - pd_server_pd02_port_03 + - forwarder binding_pd_server: - pd_server - binding disk.read.requests_pd_server: - pd_server - disk.read.requests + network.incoming.packets_pd_server_pd02_port_03: + - pd_server_pd02_port_03 + - network.incoming.packets + network.outpoing.packets_pd_server_pd02_port_03: + - pd_server_pd02_port_03 + - network.outpoing.packets feature_pd_server: - pd_server - feature disk.usage_pd_server: - pd_server - disk.usage - network.outpoing.packets_pd_server_pd02_port: - - pd_server_pd02_port - - network.outpoing.packets disk.write.bytes_pd_server: - pd_server - disk.write.bytes @@ -260,9 +266,9 @@ topology_template: host_pd_server: - pd_server - host - attachment_pd_server_pd02_port: - - pd_server_pd02_port - - attachment + feature_pd_server_pd02_port_03: + - pd_server_pd02_port_03 + - feature disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate @@ -275,9 +281,6 @@ topology_template: disk.device.latency_pd_server: - pd_server - disk.device.latency - network.incoming.packets.rate_pd_server_pd02_port: - - pd_server_pd02_port - - network.incoming.packets.rate disk.latency_pd_server: - pd_server - disk.latency @@ -287,19 +290,16 @@ topology_template: disk.device.iops_pd_server: - pd_server - disk.device.iops - network.incoming.bytes_pd_server_pd02_port: - - pd_server_pd02_port - - network.incoming.bytes requirements: local_storage_pd_server: - pd_server - local_storage - link_pd_server_pd02_port: - - pd_server_pd02_port - - link + dependency_pd_server_pd02_port_03: + - pd_server_pd02_port_03 + - dependency dependency_pd_server: - pd_server - dependency - dependency_pd_server_pd02_port: - - pd_server_pd02_port - - dependency \ No newline at end of file + link_pd_server_pd02_port_03: + - pd_server_pd02_port_03 + - link 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/Nested_pd_server_2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_2ServiceTemplate.yaml index 7ecfd2d3ca..cf7af8017b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_2ServiceTemplate.yaml @@ -11,6 +11,9 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pd02_port_02_order: + type: integer + required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -18,6 +21,11 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 + port_pd02_port_02_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements compute_pd_server_availability_zone: type: list required: true @@ -28,41 +36,38 @@ topology_template: required: true entry_schema: type: string - port_pd02_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pd02_port_02_network_role: + type: string required: true vm_flavor_name: type: string required: true - port_pd02_port_order: - type: integer - required: true - port_pd02_port_subnetpoolid: + port_pd02_port_02_subnetpoolid: type: string required: true - port_pd02_port_network_role_tag: - type: string + port_pd02_port_02_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - port_pd02_port_vlan_requirements: + port_pd02_port_02_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements + port_pd02_port_02_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_image_name: type: string required: true - port_pd02_port_network_role: + port_pd02_port_02_network_role_tag: type: string required: true - port_pd02_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd02_port_02_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_pd02_port_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd02_port_network: + port_pd02_port_02_network: type: list required: true entry_schema: @@ -72,11 +77,6 @@ topology_template: required: true entry_schema: type: string - port_pd02_port_related_networks: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments node_templates: pd_server: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server @@ -97,31 +97,31 @@ topology_template: get_input: - compute_pd_server_user_data_format - index_value - pd_server_pd02_port: + pd_server_pd02_port_02: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd02_port_exCP_naming + get_input: port_pd02_port_02_exCP_naming vlan_requirements: - get_input: port_pd02_port_vlan_requirements + get_input: port_pd02_port_02_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_pd02_port_related_networks + get_input: port_pd02_port_02_related_networks ip_requirements: - get_input: port_pd02_port_ip_requirements + get_input: port_pd02_port_02_ip_requirements network_role_tag: - get_input: port_pd02_port_network_role_tag + get_input: port_pd02_port_02_network_role_tag mac_requirements: - get_input: port_pd02_port_mac_requirements + get_input: port_pd02_port_02_mac_requirements order: - get_input: port_pd02_port_order + get_input: port_pd02_port_02_order network_role: - get_input: port_pd02_port_network_role + get_input: port_pd02_port_02_network_role subnetpoolid: - get_input: port_pd02_port_subnetpoolid + get_input: port_pd02_port_02_subnetpoolid network: get_input: - - port_pd02_port_network + - port_pd02_port_02_network - index_value requirements: - binding: @@ -131,15 +131,24 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server_2 capabilities: + network.incoming.bytes.rate_pd_server_pd02_port_02: + - pd_server_pd02_port_02 + - network.incoming.bytes.rate scalable_pd_server: - pd_server - scalable disk.read.bytes.rate_pd_server: - pd_server - disk.read.bytes.rate + network.incoming.bytes_pd_server_pd02_port_02: + - pd_server_pd02_port_02 + - network.incoming.bytes memory.usage_pd_server: - pd_server - memory.usage + binding_pd_server_pd02_port_02: + - pd_server_pd02_port_02 + - binding memory_pd_server: - pd_server - memory @@ -152,9 +161,15 @@ topology_template: disk.write.bytes.rate_pd_server: - pd_server - disk.write.bytes.rate + network.incoming.packets.rate_pd_server_pd02_port_02: + - pd_server_pd02_port_02 + - network.incoming.packets.rate cpu_pd_server: - pd_server - cpu + attachment_pd_server_pd02_port_02: + - pd_server_pd02_port_02 + - attachment cpu_util_pd_server: - pd_server - cpu_util @@ -164,15 +179,12 @@ topology_template: disk.read.bytes_pd_server: - pd_server - disk.read.bytes + network.outgoing.bytes.rate_pd_server_pd02_port_02: + - pd_server_pd02_port_02 + - network.outgoing.bytes.rate disk.device.read.bytes.rate_pd_server: - pd_server - disk.device.read.bytes.rate - binding_pd_server_pd02_port: - - pd_server_pd02_port - - binding - network.outgoing.packets.rate_pd_server_pd02_port: - - pd_server_pd02_port - - network.outgoing.packets.rate disk.iops_pd_server: - pd_server - disk.iops @@ -182,18 +194,6 @@ topology_template: cpu.delta_pd_server: - pd_server - cpu.delta - network.outgoing.bytes_pd_server_pd02_port: - - pd_server_pd02_port - - network.outgoing.bytes - feature_pd_server_pd02_port: - - pd_server_pd02_port - - feature - network.incoming.bytes.rate_pd_server_pd02_port: - - pd_server_pd02_port - - network.incoming.bytes.rate - network.outgoing.bytes.rate_pd_server_pd02_port: - - pd_server_pd02_port - - network.outgoing.bytes.rate vcpus_pd_server: - pd_server - vcpus @@ -203,39 +203,45 @@ topology_template: disk.device.write.requests_pd_server: - pd_server - disk.device.write.requests + network.outgoing.packets.rate_pd_server_pd02_port_02: + - pd_server_pd02_port_02 + - network.outgoing.packets.rate endpoint_pd_server: - pd_server - endpoint - forwarder_pd_server_pd02_port: - - pd_server_pd02_port - - forwarder disk.capacity_pd_server: - pd_server - disk.capacity + forwarder_pd_server_pd02_port_02: + - pd_server_pd02_port_02 + - forwarder disk.device.allocation_pd_server: - pd_server - disk.device.allocation disk.allocation_pd_server: - pd_server - disk.allocation - network.incoming.packets_pd_server_pd02_port: - - pd_server_pd02_port - - network.incoming.packets + network.outgoing.bytes_pd_server_pd02_port_02: + - pd_server_pd02_port_02 + - network.outgoing.bytes binding_pd_server: - pd_server - binding disk.read.requests_pd_server: - pd_server - disk.read.requests + network.incoming.packets_pd_server_pd02_port_02: + - pd_server_pd02_port_02 + - network.incoming.packets + network.outpoing.packets_pd_server_pd02_port_02: + - pd_server_pd02_port_02 + - network.outpoing.packets feature_pd_server: - pd_server - feature disk.usage_pd_server: - pd_server - disk.usage - network.outpoing.packets_pd_server_pd02_port: - - pd_server_pd02_port - - network.outpoing.packets disk.write.bytes_pd_server: - pd_server - disk.write.bytes @@ -260,9 +266,9 @@ topology_template: host_pd_server: - pd_server - host - attachment_pd_server_pd02_port: - - pd_server_pd02_port - - attachment + feature_pd_server_pd02_port_02: + - pd_server_pd02_port_02 + - feature disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate @@ -275,9 +281,6 @@ topology_template: disk.device.latency_pd_server: - pd_server - disk.device.latency - network.incoming.packets.rate_pd_server_pd02_port: - - pd_server_pd02_port - - network.incoming.packets.rate disk.latency_pd_server: - pd_server - disk.latency @@ -287,19 +290,16 @@ topology_template: disk.device.iops_pd_server: - pd_server - disk.device.iops - network.incoming.bytes_pd_server_pd02_port: - - pd_server_pd02_port - - network.incoming.bytes requirements: local_storage_pd_server: - pd_server - local_storage - link_pd_server_pd02_port: - - pd_server_pd02_port - - link + dependency_pd_server_pd02_port_02: + - pd_server_pd02_port_02 + - dependency dependency_pd_server: - pd_server - dependency - dependency_pd_server_pd02_port: - - pd_server_pd02_port - - dependency \ No newline at end of file + link_pd_server_pd02_port_02: + - pd_server_pd02_port_02 + - link 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/Nested_pd_server_3ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_3ServiceTemplate.yaml index a802e130ad..e2187dccf6 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_3ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_3ServiceTemplate.yaml @@ -11,6 +11,14 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pd01_port_02_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_02_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -28,50 +36,42 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd01_port_02_network_role: + type: string required: true - port_pd01_port_related_networks: - type: list + port_pd01_port_02_order: + type: integer required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - vm_image_name: + port_pd01_port_02_network_role_tag: type: string required: true - port_pd01_port_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + port_pd01_port_02_network: type: list required: true entry_schema: type: string - port_pd01_port_order: - type: integer - required: true - port_pd01_port_subnetpoolid: + port_pd01_port_02_subnetpoolid: type: string required: true - port_pd01_port_network_role: - type: string + port_pd01_port_02_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_pd01_port_network_role_tag: + vm_image_name: type: string required: true - port_pd01_port_vlan_requirements: + port_pd01_port_02_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_02_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments compute_pd_server_user_data_format: type: list required: true @@ -97,31 +97,31 @@ topology_template: get_input: - compute_pd_server_user_data_format - index_value - pd_server_pd01_port: + pd_server_pd01_port_02: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd01_port_exCP_naming + get_input: port_pd01_port_02_exCP_naming vlan_requirements: - get_input: port_pd01_port_vlan_requirements + get_input: port_pd01_port_02_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_pd01_port_related_networks + get_input: port_pd01_port_02_related_networks ip_requirements: - get_input: port_pd01_port_ip_requirements + get_input: port_pd01_port_02_ip_requirements network_role_tag: - get_input: port_pd01_port_network_role_tag + get_input: port_pd01_port_02_network_role_tag mac_requirements: - get_input: port_pd01_port_mac_requirements + get_input: port_pd01_port_02_mac_requirements order: - get_input: port_pd01_port_order + get_input: port_pd01_port_02_order network_role: - get_input: port_pd01_port_network_role + get_input: port_pd01_port_02_network_role subnetpoolid: - get_input: port_pd01_port_subnetpoolid + get_input: port_pd01_port_02_subnetpoolid network: get_input: - - port_pd01_port_network + - port_pd01_port_02_network - index_value requirements: - binding: @@ -131,6 +131,9 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server_3 capabilities: + network.outgoing.bytes_pd_server_pd01_port_02: + - pd_server_pd01_port_02 + - network.outgoing.bytes scalable_pd_server: - pd_server - scalable @@ -146,18 +149,15 @@ topology_template: disk.device.usage_pd_server: - pd_server - disk.device.usage - network.outgoing.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.packets.rate os_pd_server: - pd_server - os + network.outpoing.packets_pd_server_pd01_port_02: + - pd_server_pd01_port_02 + - network.outpoing.packets disk.write.bytes.rate_pd_server: - pd_server - disk.write.bytes.rate - network.incoming.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes cpu_pd_server: - pd_server - cpu @@ -173,21 +173,18 @@ topology_template: disk.device.read.bytes.rate_pd_server: - pd_server - disk.device.read.bytes.rate - network.outgoing.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes disk.iops_pd_server: - pd_server - disk.iops + feature_pd_server_pd01_port_02: + - pd_server_pd01_port_02 + - feature memory.resident_pd_server: - pd_server - memory.resident cpu.delta_pd_server: - pd_server - cpu.delta - network.incoming.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets.rate vcpus_pd_server: - pd_server - vcpus @@ -200,9 +197,6 @@ topology_template: endpoint_pd_server: - pd_server - endpoint - attachment_pd_server_pd01_port: - - pd_server_pd01_port - - attachment disk.capacity_pd_server: - pd_server - disk.capacity @@ -212,30 +206,39 @@ topology_template: disk.allocation_pd_server: - pd_server - disk.allocation + network.incoming.bytes_pd_server_pd01_port_02: + - pd_server_pd01_port_02 + - network.incoming.bytes binding_pd_server: - pd_server - binding + binding_pd_server_pd01_port_02: + - pd_server_pd01_port_02 + - binding disk.read.requests_pd_server: - pd_server - disk.read.requests + network.incoming.bytes.rate_pd_server_pd01_port_02: + - pd_server_pd01_port_02 + - network.incoming.bytes.rate feature_pd_server: - pd_server - feature disk.usage_pd_server: - pd_server - disk.usage - binding_pd_server_pd01_port: - - pd_server_pd01_port - - binding + attachment_pd_server_pd01_port_02: + - pd_server_pd01_port_02 + - attachment disk.write.bytes_pd_server: - pd_server - disk.write.bytes - network.incoming.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes.rate - network.incoming.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets + network.incoming.packets.rate_pd_server_pd01_port_02: + - pd_server_pd01_port_02 + - network.incoming.packets.rate + network.outgoing.bytes.rate_pd_server_pd01_port_02: + - pd_server_pd01_port_02 + - network.outgoing.bytes.rate disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -257,24 +260,21 @@ topology_template: host_pd_server: - pd_server - host - network.outpoing.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.outpoing.packets - forwarder_pd_server_pd01_port: - - pd_server_pd01_port - - forwarder disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate disk.ephemeral.size_pd_server: - pd_server - disk.ephemeral.size + network.outgoing.packets.rate_pd_server_pd01_port_02: + - pd_server_pd01_port_02 + - network.outgoing.packets.rate disk.write.requests_pd_server: - pd_server - disk.write.requests - feature_pd_server_pd01_port: - - pd_server_pd01_port - - feature + forwarder_pd_server_pd01_port_02: + - pd_server_pd01_port_02 + - forwarder disk.device.latency_pd_server: - pd_server - disk.device.latency @@ -284,22 +284,22 @@ topology_template: disk.device.capacity_pd_server: - pd_server - disk.device.capacity - network.outgoing.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes.rate disk.device.iops_pd_server: - pd_server - disk.device.iops + network.incoming.packets_pd_server_pd01_port_02: + - pd_server_pd01_port_02 + - network.incoming.packets requirements: local_storage_pd_server: - pd_server - local_storage - link_pd_server_pd01_port: - - pd_server_pd01_port - - link - dependency_pd_server_pd01_port: - - pd_server_pd01_port + dependency_pd_server_pd01_port_02: + - pd_server_pd01_port_02 - dependency dependency_pd_server: - pd_server - - dependency \ No newline at end of file + - dependency + link_pd_server_pd01_port_02: + - pd_server_pd01_port_02 + - link 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/Nested_pd_server_4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_4ServiceTemplate.yaml index 752fc03a07..ad592f067c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_4ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_4ServiceTemplate.yaml @@ -11,6 +11,22 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pd01_port_01_network_role_tag: + type: string + required: true + port_pd01_port_01_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_01_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd01_port_01_network_role: + type: string + required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -28,46 +44,30 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd01_port_01_order: + type: integer required: true - port_pd01_port_related_networks: + port_pd01_port_01_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments + type: string vm_flavor_name: type: string required: true - port_pd01_port_mac_requirements: + port_pd01_port_01_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true - vm_image_name: - type: string - required: true - port_pd01_port_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: - type: list - required: true - entry_schema: - type: string - port_pd01_port_order: - type: integer - required: true - port_pd01_port_subnetpoolid: - type: string + port_pd01_port_01_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - port_pd01_port_network_role: + port_pd01_port_01_subnetpoolid: type: string required: true - port_pd01_port_network_role_tag: + vm_image_name: type: string required: true - port_pd01_port_vlan_requirements: + port_pd01_port_01_vlan_requirements: type: list required: true entry_schema: @@ -97,31 +97,31 @@ topology_template: get_input: - compute_pd_server_user_data_format - index_value - pd_server_pd01_port: + pd_server_pd01_port_01: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd01_port_exCP_naming + get_input: port_pd01_port_01_exCP_naming vlan_requirements: - get_input: port_pd01_port_vlan_requirements + get_input: port_pd01_port_01_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_pd01_port_related_networks + get_input: port_pd01_port_01_related_networks ip_requirements: - get_input: port_pd01_port_ip_requirements + get_input: port_pd01_port_01_ip_requirements network_role_tag: - get_input: port_pd01_port_network_role_tag + get_input: port_pd01_port_01_network_role_tag mac_requirements: - get_input: port_pd01_port_mac_requirements + get_input: port_pd01_port_01_mac_requirements order: - get_input: port_pd01_port_order + get_input: port_pd01_port_01_order network_role: - get_input: port_pd01_port_network_role + get_input: port_pd01_port_01_network_role subnetpoolid: - get_input: port_pd01_port_subnetpoolid + get_input: port_pd01_port_01_subnetpoolid network: get_input: - - port_pd01_port_network + - port_pd01_port_01_network - index_value requirements: - binding: @@ -131,6 +131,9 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server_4 capabilities: + network.outgoing.bytes_pd_server_pd01_port_01: + - pd_server_pd01_port_01 + - network.outgoing.bytes scalable_pd_server: - pd_server - scalable @@ -146,18 +149,15 @@ topology_template: disk.device.usage_pd_server: - pd_server - disk.device.usage - network.outgoing.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.packets.rate + network.outpoing.packets_pd_server_pd01_port_01: + - pd_server_pd01_port_01 + - network.outpoing.packets os_pd_server: - pd_server - os disk.write.bytes.rate_pd_server: - pd_server - disk.write.bytes.rate - network.incoming.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes cpu_pd_server: - pd_server - cpu @@ -173,9 +173,6 @@ topology_template: disk.device.read.bytes.rate_pd_server: - pd_server - disk.device.read.bytes.rate - network.outgoing.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes disk.iops_pd_server: - pd_server - disk.iops @@ -185,9 +182,6 @@ topology_template: cpu.delta_pd_server: - pd_server - cpu.delta - network.incoming.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets.rate vcpus_pd_server: - pd_server - vcpus @@ -200,9 +194,9 @@ topology_template: endpoint_pd_server: - pd_server - endpoint - attachment_pd_server_pd01_port: - - pd_server_pd01_port - - attachment + feature_pd_server_pd01_port_01: + - pd_server_pd01_port_01 + - feature disk.capacity_pd_server: - pd_server - disk.capacity @@ -212,30 +206,39 @@ topology_template: disk.allocation_pd_server: - pd_server - disk.allocation + network.incoming.bytes_pd_server_pd01_port_01: + - pd_server_pd01_port_01 + - network.incoming.bytes + binding_pd_server_pd01_port_01: + - pd_server_pd01_port_01 + - binding binding_pd_server: - pd_server - binding disk.read.requests_pd_server: - pd_server - disk.read.requests + network.incoming.bytes.rate_pd_server_pd01_port_01: + - pd_server_pd01_port_01 + - network.incoming.bytes.rate feature_pd_server: - pd_server - feature disk.usage_pd_server: - pd_server - disk.usage - binding_pd_server_pd01_port: - - pd_server_pd01_port - - binding + attachment_pd_server_pd01_port_01: + - pd_server_pd01_port_01 + - attachment disk.write.bytes_pd_server: - pd_server - disk.write.bytes - network.incoming.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes.rate - network.incoming.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets + network.incoming.packets.rate_pd_server_pd01_port_01: + - pd_server_pd01_port_01 + - network.incoming.packets.rate + network.outgoing.bytes.rate_pd_server_pd01_port_01: + - pd_server_pd01_port_01 + - network.outgoing.bytes.rate disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -257,24 +260,21 @@ topology_template: host_pd_server: - pd_server - host - network.outpoing.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.outpoing.packets - forwarder_pd_server_pd01_port: - - pd_server_pd01_port - - forwarder disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate + forwarder_pd_server_pd01_port_01: + - pd_server_pd01_port_01 + - forwarder disk.ephemeral.size_pd_server: - pd_server - disk.ephemeral.size + network.outgoing.packets.rate_pd_server_pd01_port_01: + - pd_server_pd01_port_01 + - network.outgoing.packets.rate disk.write.requests_pd_server: - pd_server - disk.write.requests - feature_pd_server_pd01_port: - - pd_server_pd01_port - - feature disk.device.latency_pd_server: - pd_server - disk.device.latency @@ -284,22 +284,22 @@ topology_template: disk.device.capacity_pd_server: - pd_server - disk.device.capacity - network.outgoing.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes.rate disk.device.iops_pd_server: - pd_server - disk.device.iops + network.incoming.packets_pd_server_pd01_port_01: + - pd_server_pd01_port_01 + - network.incoming.packets requirements: local_storage_pd_server: - pd_server - local_storage - link_pd_server_pd01_port: - - pd_server_pd01_port - - link - dependency_pd_server_pd01_port: - - pd_server_pd01_port + dependency_pd_server_pd01_port_01: + - pd_server_pd01_port_01 - dependency dependency_pd_server: - pd_server - - dependency \ No newline at end of file + - dependency + link_pd_server_pd01_port_01: + - pd_server_pd01_port_01 + - link 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/Nested_pd_server_5ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_5ServiceTemplate.yaml index 6e87a88d97..5e1e46fd42 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_5ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_5ServiceTemplate.yaml @@ -11,6 +11,11 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_ps02_port_01_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements index_value: type: integer description: Index value of this substitution service template runtime instance @@ -18,11 +23,14 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_ps02_port_ip_requirements: + port_ps02_port_01_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: org.openecomp.datatypes.network.VlanRequirements + port_ps02_port_01_order: + type: integer + required: true compute_pd_server_availability_zone: type: list required: true @@ -33,101 +41,93 @@ topology_template: required: true entry_schema: type: string - port_ps02_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_ps02_port_01_related_networks: + type: list required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true - port_ps02_port_network_role_tag: + vm_image_name: type: string required: true - port_ps02_port_network_role: + port_ps02_port_01_network_role: type: string required: true - port_ps02_port_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_ps02_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - vm_image_name: + port_ps02_port_01_network_role_tag: type: string required: true - port_ps02_port_related_networks: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_ps02_port_subnetpoolid: - type: string + port_ps02_port_01_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_ps02_port_order: - type: integer + port_ps02_port_01_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - compute_pd_server_user_data_format: + port_ps02_port_01_network: type: list required: true entry_schema: type: string - port_ps02_port_network: + compute_pd_server_user_data_format: type: list required: true entry_schema: type: string + port_ps02_port_01_subnetpoolid: + type: string + required: true node_templates: - pd_server: - type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server - properties: - availability_zone: - get_input: - - compute_pd_server_availability_zone - - index_value - flavor: - get_input: vm_flavor_name - image: - get_input: vm_image_name - name: - get_input: - - compute_pd_server_name - - index_value - user_data_format: - get_input: - - compute_pd_server_user_data_format - - index_value - pd_server_ps02_port: + pd_server_ps02_port_01: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_ps02_port_exCP_naming + get_input: port_ps02_port_01_exCP_naming vlan_requirements: - get_input: port_ps02_port_vlan_requirements + get_input: port_ps02_port_01_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_ps02_port_related_networks + get_input: port_ps02_port_01_related_networks ip_requirements: - get_input: port_ps02_port_ip_requirements + get_input: port_ps02_port_01_ip_requirements network_role_tag: - get_input: port_ps02_port_network_role_tag + get_input: port_ps02_port_01_network_role_tag mac_requirements: - get_input: port_ps02_port_mac_requirements + get_input: port_ps02_port_01_mac_requirements order: - get_input: port_ps02_port_order + get_input: port_ps02_port_01_order network_role: - get_input: port_ps02_port_network_role + get_input: port_ps02_port_01_network_role subnetpoolid: - get_input: port_ps02_port_subnetpoolid + get_input: port_ps02_port_01_subnetpoolid network: get_input: - - port_ps02_port_network + - port_ps02_port_01_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: pd_server relationship: tosca.relationships.network.BindsTo + pd_server: + type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server + properties: + availability_zone: + get_input: + - compute_pd_server_availability_zone + - index_value + flavor: + get_input: vm_flavor_name + image: + get_input: vm_image_name + name: + get_input: + - compute_pd_server_name + - index_value + user_data_format: + get_input: + - compute_pd_server_user_data_format + - index_value substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server_5 capabilities: @@ -137,9 +137,6 @@ topology_template: disk.read.bytes.rate_pd_server: - pd_server - disk.read.bytes.rate - binding_pd_server_ps02_port: - - pd_server_ps02_port - - binding memory.usage_pd_server: - pd_server - memory.usage @@ -149,9 +146,9 @@ topology_template: disk.device.usage_pd_server: - pd_server - disk.device.usage - network.incoming.bytes.rate_pd_server_ps02_port: - - pd_server_ps02_port - - network.incoming.bytes.rate + network.outgoing.packets.rate_pd_server_ps02_port_01: + - pd_server_ps02_port_01 + - network.outgoing.packets.rate os_pd_server: - pd_server - os @@ -173,15 +170,21 @@ topology_template: disk.device.read.bytes.rate_pd_server: - pd_server - disk.device.read.bytes.rate + network.incoming.packets.rate_pd_server_ps02_port_01: + - pd_server_ps02_port_01 + - network.incoming.packets.rate + network.outpoing.packets_pd_server_ps02_port_01: + - pd_server_ps02_port_01 + - network.outpoing.packets disk.iops_pd_server: - pd_server - disk.iops - network.incoming.packets.rate_pd_server_ps02_port: - - pd_server_ps02_port - - network.incoming.packets.rate memory.resident_pd_server: - pd_server - memory.resident + attachment_pd_server_ps02_port_01: + - pd_server_ps02_port_01 + - attachment cpu.delta_pd_server: - pd_server - cpu.delta @@ -194,30 +197,30 @@ topology_template: disk.device.write.requests_pd_server: - pd_server - disk.device.write.requests + network.incoming.bytes_pd_server_ps02_port_01: + - pd_server_ps02_port_01 + - network.incoming.bytes endpoint_pd_server: - pd_server - endpoint disk.capacity_pd_server: - pd_server - disk.capacity - network.incoming.bytes_pd_server_ps02_port: - - pd_server_ps02_port - - network.incoming.bytes disk.device.allocation_pd_server: - pd_server - disk.device.allocation disk.allocation_pd_server: - pd_server - disk.allocation + feature_pd_server_ps02_port_01: + - pd_server_ps02_port_01 + - feature binding_pd_server: - pd_server - binding disk.read.requests_pd_server: - pd_server - disk.read.requests - attachment_pd_server_ps02_port: - - pd_server_ps02_port - - attachment feature_pd_server: - pd_server - feature @@ -227,12 +230,6 @@ topology_template: disk.write.bytes_pd_server: - pd_server - disk.write.bytes - feature_pd_server_ps02_port: - - pd_server_ps02_port - - feature - network.outgoing.bytes.rate_pd_server_ps02_port: - - pd_server_ps02_port - - network.outgoing.bytes.rate disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -245,9 +242,6 @@ topology_template: disk.device.write.bytes_pd_server: - pd_server - disk.device.write.bytes - network.outgoing.packets.rate_pd_server_ps02_port: - - pd_server_ps02_port - - network.outgoing.packets.rate disk.device.read.requests_pd_server: - pd_server - disk.device.read.requests @@ -257,36 +251,42 @@ topology_template: host_pd_server: - pd_server - host - network.outpoing.packets_pd_server_ps02_port: - - pd_server_ps02_port - - network.outpoing.packets + network.incoming.bytes.rate_pd_server_ps02_port_01: + - pd_server_ps02_port_01 + - network.incoming.bytes.rate + network.outgoing.bytes_pd_server_ps02_port_01: + - pd_server_ps02_port_01 + - network.outgoing.bytes + forwarder_pd_server_ps02_port_01: + - pd_server_ps02_port_01 + - forwarder + network.outgoing.bytes.rate_pd_server_ps02_port_01: + - pd_server_ps02_port_01 + - network.outgoing.bytes.rate disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate disk.ephemeral.size_pd_server: - pd_server - disk.ephemeral.size - network.outgoing.bytes_pd_server_ps02_port: - - pd_server_ps02_port - - network.outgoing.bytes disk.write.requests_pd_server: - pd_server - disk.write.requests disk.device.latency_pd_server: - pd_server - disk.device.latency - forwarder_pd_server_ps02_port: - - pd_server_ps02_port - - forwarder + network.incoming.packets_pd_server_ps02_port_01: + - pd_server_ps02_port_01 + - network.incoming.packets + binding_pd_server_ps02_port_01: + - pd_server_ps02_port_01 + - binding disk.latency_pd_server: - pd_server - disk.latency disk.device.capacity_pd_server: - pd_server - disk.device.capacity - network.incoming.packets_pd_server_ps02_port: - - pd_server_ps02_port - - network.incoming.packets disk.device.iops_pd_server: - pd_server - disk.device.iops @@ -294,12 +294,12 @@ topology_template: local_storage_pd_server: - pd_server - local_storage - link_pd_server_ps02_port: - - pd_server_ps02_port + link_pd_server_ps02_port_01: + - pd_server_ps02_port_01 - link dependency_pd_server: - pd_server - dependency - dependency_pd_server_ps02_port: - - pd_server_ps02_port - - dependency \ No newline at end of file + dependency_pd_server_ps02_port_01: + - pd_server_ps02_port_01 + - dependency 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/Nested_pd_server_6ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_6ServiceTemplate.yaml index 1289e6e812..fddf5efbed 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_6ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_6ServiceTemplate.yaml @@ -11,6 +11,11 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pd02_port_0_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements index_value: type: integer description: Index value of this substitution service template runtime instance @@ -28,55 +33,50 @@ topology_template: required: true entry_schema: type: string - port_pd02_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pd02_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true vm_flavor_name: type: string required: true - port_pd02_port_order: - type: integer + port_pd02_port_0_network: + type: list required: true - port_pd02_port_subnetpoolid: + entry_schema: + type: string + port_pd02_port_0_network_role: type: string required: true - port_pd02_port_network_role_tag: - type: string + port_pd02_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_pd02_port_vlan_requirements: - type: list + port_pd02_port_0_order: + type: integer required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements vm_image_name: type: string required: true - port_pd02_port_network_role: + port_pd02_port_0_network_role_tag: type: string required: true - port_pd02_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_pd02_port_ip_requirements: + port_pd02_port_0_related_networks: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd02_port_network: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd02_port_0_subnetpoolid: + type: string + required: true + port_pd02_port_0_vlan_requirements: type: list required: true entry_schema: - type: string + type: org.openecomp.datatypes.network.VlanRequirements compute_pd_server_user_data_format: type: list required: true entry_schema: type: string - port_pd02_port_related_networks: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments node_templates: pd_server: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server @@ -97,31 +97,31 @@ topology_template: get_input: - compute_pd_server_user_data_format - index_value - pd_server_pd02_port: + pd_server_pd02_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd02_port_exCP_naming + get_input: port_pd02_port_0_exCP_naming vlan_requirements: - get_input: port_pd02_port_vlan_requirements + get_input: port_pd02_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_pd02_port_related_networks + get_input: port_pd02_port_0_related_networks ip_requirements: - get_input: port_pd02_port_ip_requirements + get_input: port_pd02_port_0_ip_requirements network_role_tag: - get_input: port_pd02_port_network_role_tag + get_input: port_pd02_port_0_network_role_tag mac_requirements: - get_input: port_pd02_port_mac_requirements + get_input: port_pd02_port_0_mac_requirements order: - get_input: port_pd02_port_order + get_input: port_pd02_port_0_order network_role: - get_input: port_pd02_port_network_role + get_input: port_pd02_port_0_network_role subnetpoolid: - get_input: port_pd02_port_subnetpoolid + get_input: port_pd02_port_0_subnetpoolid network: get_input: - - port_pd02_port_network + - port_pd02_port_0_network - index_value requirements: - binding: @@ -131,6 +131,9 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server_6 capabilities: + binding_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - binding scalable_pd_server: - pd_server - scalable @@ -152,6 +155,9 @@ topology_template: disk.write.bytes.rate_pd_server: - pd_server - disk.write.bytes.rate + network.outgoing.packets.rate_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.outgoing.packets.rate cpu_pd_server: - pd_server - cpu @@ -167,12 +173,9 @@ topology_template: disk.device.read.bytes.rate_pd_server: - pd_server - disk.device.read.bytes.rate - binding_pd_server_pd02_port: - - pd_server_pd02_port - - binding - network.outgoing.packets.rate_pd_server_pd02_port: - - pd_server_pd02_port - - network.outgoing.packets.rate + network.outpoing.packets_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.outpoing.packets disk.iops_pd_server: - pd_server - disk.iops @@ -182,18 +185,9 @@ topology_template: cpu.delta_pd_server: - pd_server - cpu.delta - network.outgoing.bytes_pd_server_pd02_port: - - pd_server_pd02_port - - network.outgoing.bytes - feature_pd_server_pd02_port: - - pd_server_pd02_port + feature_pd_server_pd02_port_0: + - pd_server_pd02_port_0 - feature - network.incoming.bytes.rate_pd_server_pd02_port: - - pd_server_pd02_port - - network.incoming.bytes.rate - network.outgoing.bytes.rate_pd_server_pd02_port: - - pd_server_pd02_port - - network.outgoing.bytes.rate vcpus_pd_server: - pd_server - vcpus @@ -206,9 +200,6 @@ topology_template: endpoint_pd_server: - pd_server - endpoint - forwarder_pd_server_pd02_port: - - pd_server_pd02_port - - forwarder disk.capacity_pd_server: - pd_server - disk.capacity @@ -218,9 +209,6 @@ topology_template: disk.allocation_pd_server: - pd_server - disk.allocation - network.incoming.packets_pd_server_pd02_port: - - pd_server_pd02_port - - network.incoming.packets binding_pd_server: - pd_server - binding @@ -233,12 +221,18 @@ topology_template: disk.usage_pd_server: - pd_server - disk.usage - network.outpoing.packets_pd_server_pd02_port: - - pd_server_pd02_port - - network.outpoing.packets + network.outgoing.bytes.rate_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.outgoing.bytes.rate disk.write.bytes_pd_server: - pd_server - disk.write.bytes + network.outgoing.bytes_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.outgoing.bytes + network.incoming.bytes_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.incoming.bytes disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -251,6 +245,9 @@ topology_template: disk.device.write.bytes_pd_server: - pd_server - disk.device.write.bytes + network.incoming.packets_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.incoming.packets disk.device.read.requests_pd_server: - pd_server - disk.device.read.requests @@ -260,24 +257,27 @@ topology_template: host_pd_server: - pd_server - host - attachment_pd_server_pd02_port: - - pd_server_pd02_port - - attachment + network.incoming.packets.rate_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.incoming.packets.rate + network.incoming.bytes.rate_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.incoming.bytes.rate disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate disk.ephemeral.size_pd_server: - pd_server - disk.ephemeral.size + attachment_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - attachment disk.write.requests_pd_server: - pd_server - disk.write.requests disk.device.latency_pd_server: - pd_server - disk.device.latency - network.incoming.packets.rate_pd_server_pd02_port: - - pd_server_pd02_port - - network.incoming.packets.rate disk.latency_pd_server: - pd_server - disk.latency @@ -287,19 +287,19 @@ topology_template: disk.device.iops_pd_server: - pd_server - disk.device.iops - network.incoming.bytes_pd_server_pd02_port: - - pd_server_pd02_port - - network.incoming.bytes + forwarder_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - forwarder requirements: local_storage_pd_server: - pd_server - local_storage - link_pd_server_pd02_port: - - pd_server_pd02_port - - link dependency_pd_server: - pd_server - dependency - dependency_pd_server_pd02_port: - - pd_server_pd02_port - - dependency \ No newline at end of file + link_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - link + dependency_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - dependency 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/Nested_pd_server_7ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_7ServiceTemplate.yaml index 4c81d47d18..7e40cdd1bb 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_7ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_7ServiceTemplate.yaml @@ -11,67 +11,67 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - constraints: - - greater_or_equal: 0 - compute_pd_server_availability_zone: - type: list + port_pd01_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: string - compute_pd_server_name: + port_pd01_port_0_network: type: list required: true entry_schema: type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_pd01_port_related_networks: + port_pd01_port_0_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - vm_flavor_name: + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role_tag: type: string required: true - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - vm_image_name: + port_pd01_port_0_network_role: type: string required: true - port_pd01_port_ip_requirements: + port_pd01_port_0_related_networks: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + constraints: + - greater_or_equal: 0 + compute_pd_server_availability_zone: type: list required: true entry_schema: type: string - port_pd01_port_order: - type: integer + compute_pd_server_name: + type: list required: true - port_pd01_port_subnetpoolid: + entry_schema: + type: string + vm_flavor_name: type: string required: true - port_pd01_port_network_role: - type: string + port_pd01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_pd01_port_0_order: + type: integer required: true - port_pd01_port_network_role_tag: + vm_image_name: type: string required: true - port_pd01_port_vlan_requirements: + port_pd01_port_0_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_0_subnetpoolid: + type: string + required: true compute_pd_server_user_data_format: type: list required: true @@ -97,31 +97,31 @@ topology_template: get_input: - compute_pd_server_user_data_format - index_value - pd_server_pd01_port: + pd_server_pd01_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd01_port_exCP_naming + get_input: port_pd01_port_0_exCP_naming vlan_requirements: - get_input: port_pd01_port_vlan_requirements + get_input: port_pd01_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_pd01_port_related_networks + get_input: port_pd01_port_0_related_networks ip_requirements: - get_input: port_pd01_port_ip_requirements + get_input: port_pd01_port_0_ip_requirements network_role_tag: - get_input: port_pd01_port_network_role_tag + get_input: port_pd01_port_0_network_role_tag mac_requirements: - get_input: port_pd01_port_mac_requirements + get_input: port_pd01_port_0_mac_requirements order: - get_input: port_pd01_port_order + get_input: port_pd01_port_0_order network_role: - get_input: port_pd01_port_network_role + get_input: port_pd01_port_0_network_role subnetpoolid: - get_input: port_pd01_port_subnetpoolid + get_input: port_pd01_port_0_subnetpoolid network: get_input: - - port_pd01_port_network + - port_pd01_port_0_network - index_value requirements: - binding: @@ -131,6 +131,9 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server_7 capabilities: + binding_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - binding scalable_pd_server: - pd_server - scalable @@ -146,18 +149,12 @@ topology_template: disk.device.usage_pd_server: - pd_server - disk.device.usage - network.outgoing.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.packets.rate os_pd_server: - pd_server - os disk.write.bytes.rate_pd_server: - pd_server - disk.write.bytes.rate - network.incoming.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes cpu_pd_server: - pd_server - cpu @@ -173,9 +170,9 @@ topology_template: disk.device.read.bytes.rate_pd_server: - pd_server - disk.device.read.bytes.rate - network.outgoing.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes + network.incoming.packets_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.packets disk.iops_pd_server: - pd_server - disk.iops @@ -185,27 +182,36 @@ topology_template: cpu.delta_pd_server: - pd_server - cpu.delta - network.incoming.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port + network.incoming.packets.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 - network.incoming.packets.rate + network.incoming.bytes.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.bytes.rate + network.outgoing.packets.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.packets.rate vcpus_pd_server: - pd_server - vcpus disk.device.write.bytes.rate_pd_server: - pd_server - disk.device.write.bytes.rate + attachment_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - attachment disk.device.write.requests_pd_server: - pd_server - disk.device.write.requests endpoint_pd_server: - pd_server - endpoint - attachment_pd_server_pd01_port: - - pd_server_pd01_port - - attachment disk.capacity_pd_server: - pd_server - disk.capacity + forwarder_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - forwarder disk.device.allocation_pd_server: - pd_server - disk.device.allocation @@ -218,24 +224,24 @@ topology_template: disk.read.requests_pd_server: - pd_server - disk.read.requests + network.outgoing.bytes.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.bytes.rate feature_pd_server: - pd_server - feature disk.usage_pd_server: - pd_server - disk.usage - binding_pd_server_pd01_port: - - pd_server_pd01_port - - binding disk.write.bytes_pd_server: - pd_server - disk.write.bytes - network.incoming.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes.rate - network.incoming.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets + network.outgoing.bytes_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.bytes + network.incoming.bytes_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.bytes disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -248,6 +254,9 @@ topology_template: disk.device.write.bytes_pd_server: - pd_server - disk.device.write.bytes + network.outpoing.packets_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outpoing.packets disk.device.read.requests_pd_server: - pd_server - disk.device.read.requests @@ -257,12 +266,9 @@ topology_template: host_pd_server: - pd_server - host - network.outpoing.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.outpoing.packets - forwarder_pd_server_pd01_port: - - pd_server_pd01_port - - forwarder + feature_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - feature disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate @@ -272,9 +278,6 @@ topology_template: disk.write.requests_pd_server: - pd_server - disk.write.requests - feature_pd_server_pd01_port: - - pd_server_pd01_port - - feature disk.device.latency_pd_server: - pd_server - disk.device.latency @@ -284,9 +287,6 @@ topology_template: disk.device.capacity_pd_server: - pd_server - disk.device.capacity - network.outgoing.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes.rate disk.device.iops_pd_server: - pd_server - disk.device.iops @@ -294,12 +294,12 @@ topology_template: local_storage_pd_server: - pd_server - local_storage - link_pd_server_pd01_port: - - pd_server_pd01_port - - link - dependency_pd_server_pd01_port: - - pd_server_pd01_port - - dependency dependency_pd_server: - pd_server - - dependency \ No newline at end of file + - dependency + dependency_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - dependency + link_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - link 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 c51dcc3d09..db8d29c093 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 @@ -62,28 +62,28 @@ topology_template: directives: - substitutable properties: + port_pd01_port_01_network_role_tag: oam + port_pd01_port_01_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: - get_input: - pd_server_names - 0 + port_pd01_port_01_network: + - get_input: oam_net_name vm_flavor_name: get_input: pd_flavor_name - port_pd01_port_mac_requirements: + port_pd01_port_01_mac_requirements: mac_count_required: is_required: false vm_image_name: get_input: pd_image_name - port_pd01_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false - port_pd01_port_network: - - get_input: oam_net_name - port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW service_template_filter: @@ -99,7 +99,7 @@ topology_template: directives: - substitutable properties: - port_ps02_port_ip_requirements: + port_ps02_port_01_ip_requirements: - ip_version: 4 ip_count_required: is_required: false @@ -111,18 +111,18 @@ topology_template: - get_input: - pd_server_names - 1 - port_ps02_port_mac_requirements: - mac_count_required: - is_required: false vm_flavor_name: get_input: pd_flavor_name - port_ps02_port_network_role_tag: oam vm_image_name: get_input: pd_image_name + port_ps02_port_01_network_role_tag: oam + port_ps02_port_01_mac_requirements: + mac_count_required: + is_required: false + port_ps02_port_01_network: + - get_input: oam_net_name compute_pd_server_user_data_format: - RAW - port_ps02_port_network: - - get_input: oam_net_name service_template_filter: substitute_service_template: Nested_pd_server_5ServiceTemplate.yaml count: 1 @@ -194,16 +194,16 @@ topology_template: - disk.device.write.bytes_server_pd_32_test_nested3Level feature_ps02_port_01: - abstract_pd_server_5 - - feature_pd_server_ps02_port + - feature_pd_server_ps02_port_01 disk.usage_server_pd_21_test_nested2Level: - test_nested2Level - disk.usage_server_pd_21 network.incoming.packets.rate_ps02_port_01: - abstract_pd_server_5 - - network.incoming.packets.rate_pd_server_ps02_port + - network.incoming.packets.rate_pd_server_ps02_port_01 network.outgoing.bytes_pd01_port_01: - abstract_pd_server_4 - - network.outgoing.bytes_pd_server_pd01_port + - network.outgoing.bytes_pd_server_pd01_port_01 disk.device.read.bytes.rate_server_pd_11: - abstract_pd_server_4 - disk.device.read.bytes.rate_pd_server @@ -218,7 +218,7 @@ topology_template: - disk.device.write.bytes_server_pd_31_test_nested3Level network.incoming.bytes.rate_ps02_port_01: - abstract_pd_server_5 - - network.incoming.bytes.rate_pd_server_ps02_port + - network.incoming.bytes.rate_pd_server_ps02_port_01 disk.device.read.requests_server_pd_11: - abstract_pd_server_4 - disk.device.read.requests_pd_server @@ -251,7 +251,7 @@ topology_template: - attachment_pd01_port_02 network.incoming.bytes_ps02_port_01: - abstract_pd_server_5 - - network.incoming.bytes_pd_server_ps02_port + - network.incoming.bytes_pd_server_ps02_port_01 feature_server_pd_32_test_nested3Level_test_nested2Level: - test_nested2Level - feature_server_pd_32_test_nested3Level @@ -263,7 +263,7 @@ topology_template: - disk.read.requests_server_pd_31_test_nested3Level attachment_pd01_port_01: - abstract_pd_server_4 - - attachment_pd_server_pd01_port + - attachment_pd_server_pd01_port_01 disk.write.bytes.rate_server_pd_21_test_nested2Level: - test_nested2Level - disk.write.bytes.rate_server_pd_21 @@ -299,13 +299,13 @@ topology_template: - disk.usage_server_pd_32_test_nested3Level binding_pd01_port_01: - abstract_pd_server_4 - - binding_pd_server_pd01_port + - binding_pd_server_pd01_port_01 disk.latency_server_pd_22_test_nested2Level: - test_nested2Level - disk.latency_server_pd_22 binding_ps02_port_01: - abstract_pd_server_5 - - binding_pd_server_ps02_port + - binding_pd_server_ps02_port_01 disk.read.requests_server_pd_21_test_nested2Level: - test_nested2Level - disk.read.requests_server_pd_21 @@ -374,7 +374,7 @@ topology_template: - disk.device.read.bytes_pd_server network.incoming.bytes.rate_pd01_port_01: - abstract_pd_server_4 - - network.incoming.bytes.rate_pd_server_pd01_port + - network.incoming.bytes.rate_pd_server_pd01_port_01 endpoint_server_pd_12: - abstract_pd_server_5 - endpoint_pd_server @@ -413,7 +413,7 @@ topology_template: - disk.latency_pd_server network.outgoing.bytes_ps02_port_01: - abstract_pd_server_5 - - network.outgoing.bytes_pd_server_ps02_port + - network.outgoing.bytes_pd_server_ps02_port_01 disk.device.write.requests.rate_server_pd_21_test_nested2Level: - test_nested2Level - disk.device.write.requests.rate_server_pd_21 @@ -446,7 +446,7 @@ topology_template: - endpoint_server_pd_31_test_nested3Level network.outgoing.bytes.rate_pd01_port_01: - abstract_pd_server_4 - - network.outgoing.bytes.rate_pd_server_pd01_port + - network.outgoing.bytes.rate_pd_server_pd01_port_01 disk.write.requests_server_pd_21_test_nested2Level: - test_nested2Level - disk.write.requests_server_pd_21 @@ -476,7 +476,7 @@ topology_template: - disk.device.allocation_pd_server network.outgoing.packets.rate_pd01_port_01: - abstract_pd_server_4 - - network.outgoing.packets.rate_pd_server_pd01_port + - network.outgoing.packets.rate_pd_server_pd01_port_01 disk.device.latency_server_pd_32_test_nested3Level_test_nested2Level: - test_nested2Level - disk.device.latency_server_pd_32_test_nested3Level @@ -524,7 +524,7 @@ topology_template: - feature_pd01_port_03_test_nested3Level network.outgoing.packets.rate_ps02_port_01: - abstract_pd_server_5 - - network.outgoing.packets.rate_pd_server_ps02_port + - network.outgoing.packets.rate_pd_server_ps02_port_01 network.outgoing.bytes_pd01_port_03_test_nested3Level_test_nested2Level: - test_nested2Level - network.outgoing.bytes_pd01_port_03_test_nested3Level @@ -581,7 +581,7 @@ topology_template: - network.outgoing.bytes_pd02_port_02 network.outpoing.packets_pd01_port_01: - abstract_pd_server_4 - - network.outpoing.packets_pd_server_pd01_port + - network.outpoing.packets_pd_server_pd01_port_01 disk.allocation_server_pd_31_test_nested3Level_test_nested2Level: - test_nested2Level - disk.allocation_server_pd_31_test_nested3Level @@ -611,7 +611,7 @@ topology_template: - network.outpoing.packets_pd01_port_03_test_nested3Level attachment_ps02_port_01: - abstract_pd_server_5 - - attachment_pd_server_ps02_port + - attachment_pd_server_ps02_port_01 network.incoming.bytes.rate_pd02_port_03_test_nested3Level_test_nested2Level: - test_nested2Level - network.incoming.bytes.rate_pd02_port_03_test_nested3Level @@ -731,7 +731,7 @@ topology_template: - network.incoming.packets.rate_pd01_port_02 network.incoming.packets_ps02_port_01: - abstract_pd_server_5 - - network.incoming.packets_pd_server_ps02_port + - network.incoming.packets_pd_server_ps02_port_01 disk.device.iops_server_pd_31_test_nested3Level_test_nested2Level: - test_nested2Level - disk.device.iops_server_pd_31_test_nested3Level @@ -761,13 +761,13 @@ topology_template: - disk.root.size_server_pd_31_test_nested3Level network.outgoing.bytes.rate_ps02_port_01: - abstract_pd_server_5 - - network.outgoing.bytes.rate_pd_server_ps02_port + - network.outgoing.bytes.rate_pd_server_ps02_port_01 disk.iops_server_pd_22_test_nested2Level: - test_nested2Level - disk.iops_server_pd_22 feature_pd01_port_01: - abstract_pd_server_4 - - feature_pd_server_pd01_port + - feature_pd_server_pd01_port_01 disk.device.write.bytes.rate_server_pd_12: - abstract_pd_server_5 - disk.device.write.bytes.rate_pd_server @@ -803,10 +803,10 @@ topology_template: - binding_server_pd_21 network.incoming.packets_pd01_port_01: - abstract_pd_server_4 - - network.incoming.packets_pd_server_pd01_port + - network.incoming.packets_pd_server_pd01_port_01 network.incoming.packets.rate_pd01_port_01: - abstract_pd_server_4 - - network.incoming.packets.rate_pd_server_pd01_port + - network.incoming.packets.rate_pd_server_pd01_port_01 cpu_util_server_pd_12: - abstract_pd_server_5 - cpu_util_pd_server @@ -926,10 +926,10 @@ topology_template: - scalable_server_pd_31_test_nested3Level network.incoming.bytes_pd01_port_01: - abstract_pd_server_4 - - network.incoming.bytes_pd_server_pd01_port + - network.incoming.bytes_pd_server_pd01_port_01 network.outpoing.packets_ps02_port_01: - abstract_pd_server_5 - - network.outpoing.packets_pd_server_ps02_port + - network.outpoing.packets_pd_server_ps02_port_01 disk.device.write.bytes.rate_server_pd_32_test_nested3Level_test_nested2Level: - test_nested2Level - disk.device.write.bytes.rate_server_pd_32_test_nested3Level @@ -1076,13 +1076,13 @@ topology_template: - vcpus_pd_server forwarder_ps02_port_01: - abstract_pd_server_5 - - forwarder_pd_server_ps02_port + - forwarder_pd_server_ps02_port_01 disk.device.write.bytes_server_pd_11: - abstract_pd_server_4 - disk.device.write.bytes_pd_server forwarder_pd01_port_01: - abstract_pd_server_4 - - forwarder_pd_server_pd01_port + - forwarder_pd_server_pd01_port_01 disk.allocation_server_pd_11: - abstract_pd_server_4 - disk.allocation_pd_server @@ -1143,10 +1143,10 @@ topology_template: - dependency_server_pd_22 dependency_ps02_port_01: - abstract_pd_server_5 - - dependency_pd_server_ps02_port + - dependency_pd_server_ps02_port_01 dependency_pd01_port_01: - abstract_pd_server_4 - - dependency_pd_server_pd01_port + - dependency_pd_server_pd01_port_01 local_storage_server_pd_11: - abstract_pd_server_4 - local_storage_pd_server @@ -1164,7 +1164,7 @@ topology_template: - dependency_pd02_port_03_test_nested3Level link_pd01_port_01: - abstract_pd_server_4 - - link_pd_server_pd01_port + - link_pd_server_pd01_port_01 local_storage_server_pd_12: - abstract_pd_server_5 - local_storage_pd_server @@ -1179,7 +1179,7 @@ topology_template: - dependency_pd01_port_02 link_ps02_port_01: - abstract_pd_server_5 - - link_pd_server_ps02_port + - link_pd_server_ps02_port_01 dependency_server_pd_12: - abstract_pd_server_5 - dependency_pd_server 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 64678af2fe..568252d1f3 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 @@ -71,27 +71,27 @@ topology_template: directives: - substitutable properties: + port_pd02_port_02_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: - get_input: - pd_server_names - 1 - port_pd02_port_mac_requirements: - mac_count_required: - is_required: false vm_flavor_name: get_input: pd_flavor_name - port_pd02_port_network_role_tag: oam vm_image_name: get_input: pd_image_name - port_pd02_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: + port_pd02_port_02_network_role_tag: oam + port_pd02_port_02_mac_requirements: + mac_count_required: is_required: false - port_pd02_port_network: + port_pd02_port_02_network: - get_input: oam_net_name compute_pd_server_user_data_format: - RAW @@ -116,20 +116,20 @@ topology_template: - 0 vm_flavor_name: get_input: pd_flavor_name - port_pd01_port_mac_requirements: + port_pd01_port_02_network_role_tag: oam + port_pd01_port_02_network: + - get_input: oam_net_name + port_pd01_port_02_mac_requirements: mac_count_required: is_required: false vm_image_name: get_input: pd_image_name - port_pd01_port_ip_requirements: + port_pd01_port_02_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_network: - - get_input: oam_net_name - port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW service_template_filter: @@ -206,7 +206,7 @@ topology_template: - memory.usage_pd_server network.outgoing.bytes_pd01_port_02: - abstract_pd_server_3 - - network.outgoing.bytes_pd_server_pd01_port + - network.outgoing.bytes_pd_server_pd01_port_02 disk.device.read.bytes.rate_server_pd_31_test_nested3Level: - test_nested3Level - disk.device.read.bytes.rate_server_pd_31 @@ -218,7 +218,7 @@ topology_template: - disk.read.requests_server_pd_32 network.incoming.packets.rate_pd02_port_02: - abstract_pd_server_2 - - network.incoming.packets.rate_pd_server_pd02_port + - network.incoming.packets.rate_pd_server_pd02_port_02 network.outpoing.packets_pd02_port_03_test_nested3Level: - test_nested3Level - network.outpoing.packets_pd02_port_03 @@ -227,7 +227,7 @@ topology_template: - disk.read.bytes.rate_server_pd_31 feature_pd02_port_02: - abstract_pd_server_2 - - feature_pd_server_pd02_port + - feature_pd_server_pd02_port_02 disk.read.bytes.rate_server_pd_32_test_nested3Level: - test_nested3Level - disk.read.bytes.rate_server_pd_32 @@ -236,10 +236,10 @@ topology_template: - disk.write.requests.rate_server_pd_31 attachment_pd01_port_02: - abstract_pd_server_3 - - attachment_pd_server_pd01_port + - attachment_pd_server_pd01_port_02 binding_pd01_port_02: - abstract_pd_server_3 - - binding_pd_server_pd01_port + - binding_pd_server_pd01_port_02 disk.allocation_server_pd_32_test_nested3Level: - test_nested3Level - disk.allocation_server_pd_32 @@ -257,13 +257,13 @@ topology_template: - disk.device.iops_server_pd_32 network.outpoing.packets_pd02_port_02: - abstract_pd_server_2 - - network.outpoing.packets_pd_server_pd02_port + - network.outpoing.packets_pd_server_pd02_port_02 network.incoming.bytes_pd01_port_03_test_nested3Level: - test_nested3Level - network.incoming.bytes_pd01_port_03 network.incoming.bytes.rate_pd02_port_02: - abstract_pd_server_2 - - network.incoming.bytes.rate_pd_server_pd02_port + - network.incoming.bytes.rate_pd_server_pd02_port_02 host_server_pd_31_test_nested3Level: - test_nested3Level - host_server_pd_31 @@ -296,10 +296,10 @@ topology_template: - memory_server_pd_32 network.incoming.bytes.rate_pd01_port_02: - abstract_pd_server_3 - - network.incoming.bytes.rate_pd_server_pd01_port + - network.incoming.bytes.rate_pd_server_pd01_port_02 binding_pd02_port_02: - abstract_pd_server_2 - - binding_pd_server_pd02_port + - binding_pd_server_pd02_port_02 memory.resident_server_pd_21: - abstract_pd_server_3 - memory.resident_pd_server @@ -338,7 +338,7 @@ topology_template: - disk.device.read.bytes_server_pd_32 network.incoming.packets_pd02_port_02: - abstract_pd_server_2 - - network.incoming.packets_pd_server_pd02_port + - network.incoming.packets_pd_server_pd02_port_02 disk.device.read.bytes_server_pd_31_test_nested3Level: - test_nested3Level - disk.device.read.bytes_server_pd_31 @@ -353,7 +353,7 @@ topology_template: - forwarder_pd02_port_03 network.outgoing.bytes.rate_pd01_port_02: - abstract_pd_server_3 - - network.outgoing.bytes.rate_pd_server_pd01_port + - network.outgoing.bytes.rate_pd_server_pd01_port_02 disk.device.write.requests.rate_server_pd_21: - abstract_pd_server_3 - disk.device.write.requests.rate_pd_server @@ -392,10 +392,10 @@ topology_template: - os_server_pd_32 network.outgoing.packets.rate_pd01_port_02: - abstract_pd_server_3 - - network.outgoing.packets.rate_pd_server_pd01_port + - network.outgoing.packets.rate_pd_server_pd01_port_02 network.incoming.bytes_pd02_port_02: - abstract_pd_server_2 - - network.incoming.bytes_pd_server_pd02_port + - network.incoming.bytes_pd_server_pd02_port_02 endpoint_server_pd_22: - abstract_pd_server_2 - endpoint_pd_server @@ -455,16 +455,16 @@ topology_template: - memory_pd_server network.outgoing.packets.rate_pd02_port_02: - abstract_pd_server_2 - - network.outgoing.packets.rate_pd_server_pd02_port + - network.outgoing.packets.rate_pd_server_pd02_port_02 disk.device.write.requests_server_pd_31_test_nested3Level: - test_nested3Level - disk.device.write.requests_server_pd_31 attachment_pd02_port_02: - abstract_pd_server_2 - - attachment_pd_server_pd02_port + - attachment_pd_server_pd02_port_02 network.outpoing.packets_pd01_port_02: - abstract_pd_server_3 - - network.outpoing.packets_pd_server_pd01_port + - network.outpoing.packets_pd_server_pd01_port_02 network.incoming.packets_pd02_port_03_test_nested3Level: - test_nested3Level - network.incoming.packets_pd02_port_03 @@ -524,7 +524,7 @@ topology_template: - disk.write.requests.rate_pd_server forwarder_pd02_port_02: - abstract_pd_server_2 - - forwarder_pd_server_pd02_port + - forwarder_pd_server_pd02_port_02 disk.device.latency_server_pd_31_test_nested3Level: - test_nested3Level - disk.device.latency_server_pd_31 @@ -560,7 +560,7 @@ topology_template: - disk.device.write.requests_pd_server feature_pd01_port_02: - abstract_pd_server_3 - - feature_pd_server_pd01_port + - feature_pd_server_pd01_port_02 memory.usage_server_pd_31_test_nested3Level: - test_nested3Level - memory.usage_server_pd_31 @@ -569,7 +569,7 @@ topology_template: - disk.read.bytes_server_pd_32 network.outgoing.bytes_pd02_port_02: - abstract_pd_server_2 - - network.outgoing.bytes_pd_server_pd02_port + - network.outgoing.bytes_pd_server_pd02_port_02 disk.device.read.requests.rate_server_pd_31_test_nested3Level: - test_nested3Level - disk.device.read.requests.rate_server_pd_31 @@ -590,10 +590,10 @@ topology_template: - disk.latency_server_pd_31 network.incoming.packets.rate_pd01_port_02: - abstract_pd_server_3 - - network.incoming.packets.rate_pd_server_pd01_port + - network.incoming.packets.rate_pd_server_pd01_port_02 network.incoming.packets_pd01_port_02: - abstract_pd_server_3 - - network.incoming.packets_pd_server_pd01_port + - network.incoming.packets_pd_server_pd01_port_02 disk.iops_server_pd_22: - abstract_pd_server_2 - disk.iops_pd_server @@ -671,7 +671,7 @@ topology_template: - cpu_server_pd_32 network.incoming.bytes_pd01_port_02: - abstract_pd_server_3 - - network.incoming.bytes_pd_server_pd01_port + - network.incoming.bytes_pd_server_pd01_port_02 cpu_util_server_pd_32_test_nested3Level: - test_nested3Level - cpu_util_server_pd_32 @@ -782,10 +782,10 @@ topology_template: - network.outgoing.bytes.rate_pd02_port_03 forwarder_pd01_port_02: - abstract_pd_server_3 - - forwarder_pd_server_pd01_port + - forwarder_pd_server_pd01_port_02 network.outgoing.bytes.rate_pd02_port_02: - abstract_pd_server_2 - - network.outgoing.bytes.rate_pd_server_pd02_port + - network.outgoing.bytes.rate_pd_server_pd02_port_02 disk.device.allocation_server_pd_31_test_nested3Level: - test_nested3Level - disk.device.allocation_server_pd_31 @@ -804,7 +804,7 @@ topology_template: - link_pd01_port_03 link_pd02_port_02: - abstract_pd_server_2 - - link_pd_server_pd02_port + - link_pd_server_pd02_port_02 dependency_pd02_port_03_test_nested3Level: - test_nested3Level - dependency_pd02_port_03 @@ -813,7 +813,7 @@ topology_template: - dependency_server_pd_31 link_pd01_port_02: - abstract_pd_server_3 - - link_pd_server_pd01_port + - link_pd_server_pd01_port_02 dependency_server_pd_22: - abstract_pd_server_2 - dependency_pd_server @@ -825,7 +825,7 @@ topology_template: - link_pd02_port_03 dependency_pd02_port_02: - abstract_pd_server_2 - - dependency_pd_server_pd02_port + - dependency_pd_server_pd02_port_02 dependency_server_pd_21: - abstract_pd_server_3 - dependency_pd_server @@ -843,4 +843,4 @@ topology_template: - dependency dependency_pd01_port_02: - abstract_pd_server_3 - - dependency_pd_server_pd01_port + - dependency_pd_server_pd01_port_02 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 6a84a53e6e..f8357e678b 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 @@ -62,6 +62,9 @@ topology_template: directives: - substitutable properties: + port_pd01_port_03_mac_requirements: + mac_count_required: + is_required: false compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: @@ -70,20 +73,17 @@ topology_template: - 0 vm_flavor_name: get_input: pd_flavor_name - port_pd01_port_mac_requirements: - mac_count_required: - is_required: false - vm_image_name: - get_input: pd_image_name - port_pd01_port_ip_requirements: + port_pd01_port_03_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_network: + vm_image_name: + get_input: pd_image_name + port_pd01_port_03_network: - get_input: oam_net_name - port_pd01_port_network_role_tag: oam + port_pd01_port_03_network_role_tag: oam compute_pd_server_user_data_format: - RAW service_template_filter: @@ -99,28 +99,28 @@ topology_template: directives: - substitutable properties: + port_pd02_port_03_network_role_tag: oam compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: - get_input: - pd_server_names - 1 - port_pd02_port_mac_requirements: - mac_count_required: - is_required: false vm_flavor_name: get_input: pd_flavor_name - port_pd02_port_network_role_tag: oam + port_pd02_port_03_mac_requirements: + mac_count_required: + is_required: false vm_image_name: get_input: pd_image_name - port_pd02_port_ip_requirements: + port_pd02_port_03_network: + - get_input: oam_net_name + port_pd02_port_03_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_pd02_port_network: - - get_input: oam_net_name compute_pd_server_user_data_format: - RAW service_template_filter: @@ -145,7 +145,7 @@ topology_template: capabilities: attachment_pd02_port_03: - abstract_pd_server_1 - - attachment_pd_server_pd02_port + - attachment_pd_server_pd02_port_03 disk.root.size_server_pd_31: - abstract_pd_server - disk.root.size_pd_server @@ -154,7 +154,7 @@ topology_template: - disk.root.size_pd_server network.outgoing.packets.rate_pd02_port_03: - abstract_pd_server_1 - - network.outgoing.packets.rate_pd_server_pd02_port + - network.outgoing.packets.rate_pd_server_pd02_port_03 disk.iops_server_pd_32: - abstract_pd_server_1 - disk.iops_pd_server @@ -163,7 +163,7 @@ topology_template: - disk.iops_pd_server network.outpoing.packets_pd01_port_03: - abstract_pd_server - - network.outpoing.packets_pd_server_pd01_port + - network.outpoing.packets_pd_server_pd01_port_03 disk.device.write.bytes.rate_server_pd_32: - abstract_pd_server_1 - disk.device.write.bytes.rate_pd_server @@ -172,7 +172,7 @@ topology_template: - disk.device.write.bytes.rate_pd_server network.outgoing.bytes_pd01_port_03: - abstract_pd_server - - network.outgoing.bytes_pd_server_pd01_port + - network.outgoing.bytes_pd_server_pd01_port_03 disk.write.requests_server_pd_32: - abstract_pd_server_1 - disk.write.requests_pd_server @@ -187,7 +187,7 @@ topology_template: - disk.read.bytes_pd_server network.incoming.packets.rate_pd02_port_03: - abstract_pd_server_1 - - network.incoming.packets.rate_pd_server_pd02_port + - network.incoming.packets.rate_pd_server_pd02_port_03 cpu_util_server_pd_31: - abstract_pd_server - cpu_util_pd_server @@ -205,7 +205,7 @@ topology_template: - disk.device.write.bytes_pd_server feature_pd02_port_03: - abstract_pd_server_1 - - feature_pd_server_pd02_port + - feature_pd_server_pd02_port_03 disk.device.write.bytes_server_pd_31: - abstract_pd_server - disk.device.write.bytes_pd_server @@ -217,7 +217,7 @@ topology_template: - memory.usage_pd_server forwarder_pd02_port_03: - abstract_pd_server_1 - - forwarder_pd_server_pd02_port + - forwarder_pd_server_pd02_port_03 disk.read.bytes.rate_server_pd_31: - abstract_pd_server - disk.read.bytes.rate_pd_server @@ -226,10 +226,10 @@ topology_template: - disk.read.bytes.rate_pd_server binding_pd01_port_03: - abstract_pd_server - - binding_pd_server_pd01_port + - binding_pd_server_pd01_port_03 attachment_pd01_port_03: - abstract_pd_server - - attachment_pd_server_pd01_port + - attachment_pd_server_pd01_port_03 disk.device.read.bytes_server_pd_32: - abstract_pd_server_1 - disk.device.read.bytes_pd_server @@ -265,10 +265,10 @@ topology_template: - disk.read.requests_pd_server network.outgoing.bytes_pd02_port_03: - abstract_pd_server_1 - - network.outgoing.bytes_pd_server_pd02_port + - network.outgoing.bytes_pd_server_pd02_port_03 network.outpoing.packets_pd02_port_03: - abstract_pd_server_1 - - network.outpoing.packets_pd_server_pd02_port + - network.outpoing.packets_pd_server_pd02_port_03 disk.device.write.requests.rate_server_pd_31: - abstract_pd_server - disk.device.write.requests.rate_pd_server @@ -277,7 +277,7 @@ topology_template: - disk.device.write.requests.rate_pd_server network.incoming.bytes.rate_pd02_port_03: - abstract_pd_server_1 - - network.incoming.bytes.rate_pd_server_pd02_port + - network.incoming.bytes.rate_pd_server_pd02_port_03 scalable_server_pd_32: - abstract_pd_server_1 - scalable_pd_server @@ -289,7 +289,7 @@ topology_template: - disk.device.write.requests_pd_server network.incoming.packets.rate_pd01_port_03: - abstract_pd_server - - network.incoming.packets.rate_pd_server_pd01_port + - network.incoming.packets.rate_pd_server_pd01_port_03 disk.device.write.requests_server_pd_31: - abstract_pd_server - disk.device.write.requests_pd_server @@ -298,7 +298,7 @@ topology_template: - disk.device.latency_pd_server network.incoming.packets_pd01_port_03: - abstract_pd_server - - network.incoming.packets_pd_server_pd01_port + - network.incoming.packets_pd_server_pd01_port_03 disk.device.usage_server_pd_31: - abstract_pd_server - disk.device.usage_pd_server @@ -307,7 +307,7 @@ topology_template: - disk.device.usage_pd_server feature_pd01_port_03: - abstract_pd_server - - feature_pd_server_pd01_port + - feature_pd_server_pd01_port_03 disk.device.read.requests_server_pd_32: - abstract_pd_server_1 - disk.device.read.requests_pd_server @@ -322,10 +322,10 @@ topology_template: - disk.device.read.requests_pd_server network.incoming.bytes.rate_pd01_port_03: - abstract_pd_server - - network.incoming.bytes.rate_pd_server_pd01_port + - network.incoming.bytes.rate_pd_server_pd01_port_03 binding_pd02_port_03: - abstract_pd_server_1 - - binding_pd_server_pd02_port + - binding_pd_server_pd02_port_03 disk.capacity_server_pd_32: - abstract_pd_server_1 - disk.capacity_pd_server @@ -334,13 +334,13 @@ topology_template: - disk.capacity_pd_server network.incoming.bytes_pd01_port_03: - abstract_pd_server - - network.incoming.bytes_pd_server_pd01_port + - network.incoming.bytes_pd_server_pd01_port_03 vcpus_server_pd_31: - abstract_pd_server - vcpus_pd_server network.incoming.packets_pd02_port_03: - abstract_pd_server_1 - - network.incoming.packets_pd_server_pd02_port + - network.incoming.packets_pd_server_pd02_port_03 disk.usage_server_pd_32: - abstract_pd_server_1 - disk.usage_pd_server @@ -358,7 +358,7 @@ topology_template: - memory.resident_pd_server network.outgoing.bytes.rate_pd01_port_03: - abstract_pd_server - - network.outgoing.bytes.rate_pd_server_pd01_port + - network.outgoing.bytes.rate_pd_server_pd01_port_03 cpu_server_pd_32: - abstract_pd_server_1 - cpu_pd_server @@ -400,13 +400,13 @@ topology_template: - disk.write.requests.rate_pd_server network.outgoing.packets.rate_pd01_port_03: - abstract_pd_server - - network.outgoing.packets.rate_pd_server_pd01_port + - network.outgoing.packets.rate_pd_server_pd01_port_03 memory_server_pd_32: - abstract_pd_server_1 - memory_pd_server network.incoming.bytes_pd02_port_03: - abstract_pd_server_1 - - network.incoming.bytes_pd_server_pd02_port + - network.incoming.bytes_pd_server_pd02_port_03 memory_server_pd_31: - abstract_pd_server - memory_pd_server @@ -430,7 +430,7 @@ topology_template: - instance_pd_server forwarder_pd01_port_03: - abstract_pd_server - - forwarder_pd_server_pd01_port + - forwarder_pd_server_pd01_port_03 disk.device.allocation_server_pd_31: - abstract_pd_server - disk.device.allocation_pd_server @@ -451,7 +451,7 @@ topology_template: - binding_pd_server network.outgoing.bytes.rate_pd02_port_03: - abstract_pd_server_1 - - network.outgoing.bytes.rate_pd_server_pd02_port + - network.outgoing.bytes.rate_pd_server_pd02_port_03 disk.write.bytes.rate_server_pd_32: - abstract_pd_server_1 - disk.write.bytes.rate_pd_server @@ -476,13 +476,13 @@ topology_template: - local_storage_pd_server link_pd02_port_03: - abstract_pd_server_1 - - link_pd_server_pd02_port + - link_pd_server_pd02_port_03 dependency_pd02_port_03: - abstract_pd_server_1 - - dependency_pd_server_pd02_port + - dependency_pd_server_pd02_port_03 link_pd01_port_03: - abstract_pd_server - - link_pd_server_pd01_port + - link_pd_server_pd01_port_03 dependency_pd01_port_03: - abstract_pd_server - - dependency_pd_server_pd01_port + - dependency_pd_server_pd01_port_03 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/in/nested-pattern-4.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/in/nested-pattern-4.yml index bbaa6a2636..6266dff927 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/in/nested-pattern-4.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/in/nested-pattern-4.yml @@ -34,14 +34,14 @@ parameters: type: string resources: - pd_server_port_1: + pd_server_1_port: type: OS::Neutron::Port properties: network: { get_param: net } fixed_ips: [{"ip_address": {get_param: [pd_server_ips, 0]}}] replacement_policy: AUTO - pd_server_port_2: + pd_server_2_port: type: OS::Neutron::Port properties: network: { get_param: net } @@ -56,8 +56,8 @@ resources: availability_zone: { get_param: availability_zone_0 } flavor: { get_param: pd_server_flavor } networks: - - port: { get_resource: pd_server_port_1 } - - port: { get_resource: pd_server_port_2 } + - port: { get_resource: pd_server_1_port } + - port: { get_resource: pd_server_2_port } outputs: pattern4_attr_1: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/in/nested1.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/in/nested1.yml index 65ef047317..8b93801e10 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/in/nested1.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/in/nested1.yml @@ -100,14 +100,14 @@ resources: networks: - port: { get_resource: ps_server_1b_port_1 } - cmaui_port_1: + cmaui_1c1_1_mgmt_port_0: type: OS::Neutron::Port properties: network: {get_resource: packet_external_network_1} fixed_ips: [{"ip_address": {get_param: [cmaui_oam_ips, 0]}}] replacement_policy: AUTO - cmaui_port_2: + cmaui_1c1_2_mgmt_port_0: type: OS::Neutron::Port properties: network: {get_resource: packet_external_network_1} @@ -122,7 +122,7 @@ resources: availability_zone: { get_param: availability_zone_0 } flavor: { get_param: cmaui_1c1_flavor } networks: - - port: { get_resource: cmaui_port_1 } + - port: { get_resource: cmaui_1c1_1_mgmt_port_0 } server_1c1_cmaui_2: type: OS::Nova::Server @@ -132,16 +132,16 @@ resources: availability_zone: { get_param: availability_zone_0 } flavor: { get_param: cmaui_1c1_flavor } networks: - - port: { get_resource: cmaui_port_2 } + - port: { get_resource: cmaui_1c1_2_mgmt_port_0 } - oam_port_1: + oam_server_1c2_1_mgmt_port_0: type: OS::Neutron::Port properties: network: {get_resource: packet_internal_network_1} fixed_ips: [{"ip_address": {get_param: [cmaui_oam_ips, 1]}}] replacement_policy: AUTO - oam_port_2: + oam_server_1c2_2_mgmt_port_0: type: OS::Neutron::Port properties: network: {get_resource: packet_external_network_1} @@ -156,7 +156,7 @@ resources: availability_zone: { get_param: availability_zone_0 } flavor: { get_param: oam_server_1c2_flavor } networks: - - port: { get_resource: oam_port_1 } + - port: { get_resource: oam_server_1c2_1_mgmt_port_0 } server_1c2_oam_2: type: OS::Nova::Server @@ -166,7 +166,7 @@ resources: availability_zone: { get_param: availability_zone_0 } flavor: { get_param: oam_server_1c2_flavor } networks: - - port: { get_resource: oam_port_2 } + - port: { get_resource: oam_server_1c2_2_mgmt_port_0 } metadata: { connectivity_to_pd_server_1b: {get_attr: [server_1b_pd_1, accessIPv4]}, connectivity_to_server_1c1_cmaui_1: {get_attr: [server_1c1_cmaui_1, accessIPv4]}, diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/in/nested2.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/in/nested2.yml index 33a64f5cc1..63a0573263 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/in/nested2.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/in/nested2.yml @@ -100,14 +100,14 @@ resources: networks: - port: { get_resource: ps_server_1b_port } - BE_port_1: + BE_1c1_1_mgmt_port_0: type: OS::Neutron::Port properties: network: {get_resource: packet_internal_network_2} fixed_ips: [{"ip_address": {get_param: [BE_osm_ips, 0]}}] replacement_policy: AUTO - BE_port_2: + BE_1c1_2_mgmt_port_0: type: OS::Neutron::Port properties: network: {get_resource: packet_internal_network_2} @@ -122,7 +122,7 @@ resources: availability_zone: { get_param: availability_zone_0 } flavor: { get_param: BE_1c1_flavor } networks: - - port: { get_resource: BE_port_1 } + - port: { get_resource: BE_1c1_1_mgmt_port_0 } server_1c1_BE_2: type: OS::Nova::Server @@ -132,16 +132,16 @@ resources: availability_zone: { get_param: availability_zone_0 } flavor: { get_param: BE_1c1_flavor } networks: - - port: { get_resource: BE_port_2 } + - port: { get_resource: BE_1c1_2_mgmt_port_0 } - osm_port_1: + osm_server_1c2_1_mgmt_port_0: type: OS::Neutron::Port properties: network: {get_resource: packet_internal_network_2} fixed_ips: [{"ip_address": {get_param: [BE_osm_ips, 1]}}] replacement_policy: AUTO - osm_port_2: + osm_server_1c2_2_mgmt_port_0: type: OS::Neutron::Port properties: network: {get_resource: packet_external_network_2} @@ -156,7 +156,7 @@ resources: availability_zone: { get_param: availability_zone_0 } flavor: { get_param: osm_server_1c2_flavor } networks: - - port: { get_resource: osm_port_1 } + - port: { get_resource: osm_server_1c2_1_mgmt_port_0 } server_1c2_osm_2: type: OS::Nova::Server @@ -166,7 +166,7 @@ resources: availability_zone: { get_param: availability_zone_0 } flavor: { get_param: osm_server_1c2_flavor } networks: - - port: { get_resource: osm_port_2 } + - port: { get_resource: osm_server_1c2_2_mgmt_port_0 } metadata: { connectivity_to_rd_server_1b: {get_attr: [server_1b_rd_1, accessIPv4]}, connectivity_to_server_1c1_BE_1: {get_attr: [server_1c1_BE_1, accessIPv4]}, 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/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml index 23264fd584..7bef7a1fce 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -14,85 +14,85 @@ node_types: status: SUPPORTED entry_schema: type: string - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - status: SUPPORTED - constraints: - - greater_or_equal: 0 - vm_flavor_name: + port_pd_server_1b_port_1_network_role_tag: type: string required: true status: SUPPORTED - port_pd_server_1b_port_vlan_requirements: + port_pd_server_1b_port_1_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_pd_server_1b_port_related_networks: - type: list + port_pd_server_1b_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd_server_1b_port_network_role_tag: + port_pd_server_1b_port_1_subnetpoolid: type: string required: true status: SUPPORTED - vm_image_name: - type: string + port_pd_server_1b_port_1_related_networks: + type: list required: true status: SUPPORTED - port_pd_server_1b_port_replacement_policy: + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + 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_pd_server_1b_port_1_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd_server_1b_port_mac_requirements: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_pd_server_1b_port_1_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_pd_server_1b_port_network_role: + vm_flavor_name: type: string required: true status: SUPPORTED - port_pd_server_1b_port_fixed_ips: - type: list + port_pd_server_1b_port_1_order: + type: integer required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_pd_server_1b_port_network: + vm_image_name: + type: string + required: true + status: SUPPORTED + port_pd_server_1b_port_1_network: type: list required: true status: SUPPORTED entry_schema: type: string - compute_pd_server_1b_availability_zone: + port_pd_server_1b_port_1_replacement_policy: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd_server_1b_port_order: - type: integer - required: true - status: SUPPORTED - port_pd_server_1b_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_1b_port_1_ip_requirements: + type: list required: true status: SUPPORTED - port_pd_server_1b_port_ip_requirements: + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + compute_pd_server_1b_availability_zone: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd_server_1b_port_subnetpoolid: + type: string + port_pd_server_1b_port_1_network_role: type: string required: true status: SUPPORTED @@ -115,14 +115,14 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_1b_pd_server_1b_port: + - dependency_pd_server_1b_pd_server_1b_port_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_1b_pd_server_1b_port: + - link_pd_server_1b_pd_server_1b_port_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -135,11 +135,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_1b_pd_server_1b_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED host_pd_server_1b: type: tosca.capabilities.Container valid_source_types: @@ -159,28 +154,25 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port: + cpu.delta_pd_server_1b: 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_pd_server_1b: + network.incoming.packets.rate_pd_server_1b_pd_server_1b_port_1: 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_pd_server_1b_pd_server_1b_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - network.incoming.bytes_pd_server_1b_pd_server_1b_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_pd_server_1b_pd_server_1b_port_1: + 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: - - 1 + - 0 - UNBOUNDED disk.device.read.requests_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer @@ -199,14 +191,6 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_1b_pd_server_1b_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 cpu_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -230,6 +214,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_pd_server_1b_pd_server_1b_port_1: + 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_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -242,7 +232,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_1b_pd_server_1b_port: + network.incoming.bytes_pd_server_1b_pd_server_1b_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -272,14 +262,15 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.usage_pd_server_1b: + network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port_1: 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 - attachment_pd_server_1b_pd_server_1b_port: - type: tosca.capabilities.Attachment + disk.device.usage_pd_server_1b: + 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 @@ -301,7 +292,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port: + network.outgoing.bytes_pd_server_1b_pd_server_1b_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -324,6 +315,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port_1: + 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_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -336,6 +333,16 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pd_server_1b_pd_server_1b_port_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + feature_pd_server_1b_pd_server_1b_port_1: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.write.bytes_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -359,12 +366,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_1b_pd_server_1b_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 instance_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -382,9 +383,8 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_1b_pd_server_1b_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_pd_server_1b_pd_server_1b_port_1: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED @@ -394,7 +394,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_pd_server_1b_pd_server_1b_port: + network.incoming.packets_pd_server_1b_pd_server_1b_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -418,25 +418,25 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port: + disk.capacity_pd_server_1b: 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_pd_server_1b: + disk.usage_pd_server_1b: 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_pd_server_1b: + disk.write.requests.rate_pd_server_1b: 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_pd_server_1b: + network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -445,20 +445,10 @@ node_types: org.openecomp.resource.abstract.nodes.osm_server_1c2: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_osm_port_replacement_policy: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_osm_port_exCP_naming: + port_osm_server_1c2_mgmt_port_0_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_osm_port_subnetpoolid: - type: string - required: true - status: SUPPORTED index_value: type: integer description: Index value of this substitution service template runtime instance @@ -467,7 +457,7 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_osm_port_network: + port_osm_server_1c2_mgmt_port_0_network: type: list required: true status: SUPPORTED @@ -479,79 +469,89 @@ node_types: status: SUPPORTED entry_schema: type: string - port_osm_port_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements vm_flavor_name: type: string required: true status: SUPPORTED - port_osm_port_ip_requirements: + port_osm_server_1c2_mgmt_port_0_replacement_policy: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_osm_port_fixed_ips: + type: string + port_osm_server_1c2_mgmt_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_osm_port_network_role_tag: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_osm_server_1c2_mgmt_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_osm_port_network_role: - type: string + port_osm_server_1c2_mgmt_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED vm_image_name: type: string required: true status: SUPPORTED - port_osm_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_osm_server_1c2_mgmt_port_0_network_role_tag: + type: string + required: true + status: SUPPORTED + port_osm_server_1c2_mgmt_port_0_vlan_requirements: + type: list required: true status: SUPPORTED - port_osm_port_order: + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_osm_server_1c2_mgmt_port_0_order: type: integer required: true status: SUPPORTED - port_osm_port_related_networks: + port_osm_server_1c2_mgmt_port_0_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments + type: org.openecomp.datatypes.heat.neutron.port.FixedIps compute_osm_server_1c2_metadata: type: list required: true status: SUPPORTED entry_schema: type: json + port_osm_server_1c2_mgmt_port_0_network_role: + type: string + required: true + status: SUPPORTED compute_osm_server_1c2_availability_zone: type: list required: true status: SUPPORTED entry_schema: type: string + port_osm_server_1c2_mgmt_port_0_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements attributes: osm_server_1c2_accessIPv4: type: string status: SUPPORTED requirements: - - dependency_osm_server_1c2_osm_port: + - dependency_osm_server_1c2_osm_server_1c2_mgmt_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_osm_server_1c2_osm_port: + - link_osm_server_1c2_osm_server_1c2_mgmt_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -577,13 +577,13 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_osm_server_1c2_osm_port: - type: tosca.capabilities.Node + os_osm_server_1c2: + type: tosca.capabilities.OperatingSystem occurrences: - 1 - UNBOUNDED - os_osm_server_1c2: - type: tosca.capabilities.OperatingSystem + feature_osm_server_1c2_osm_server_1c2_mgmt_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -630,6 +630,17 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_osm_server_1c2_osm_server_1c2_mgmt_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes_osm_server_1c2_osm_server_1c2_mgmt_port_0: + 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_osm_server_1c2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -672,8 +683,14 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_osm_server_1c2_osm_port: - type: tosca.capabilities.Attachment + forwarder_osm_server_1c2_osm_server_1c2_mgmt_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes_osm_server_1c2_osm_server_1c2_mgmt_port_0: + 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 @@ -694,12 +711,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_osm_server_1c2_osm_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.ephemeral.size_osm_server_1c2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -712,14 +723,6 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_osm_server_1c2_osm_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 disk.write.bytes_osm_server_1c2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -732,12 +735,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_osm_server_1c2_osm_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.write.requests_osm_server_1c2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -755,7 +752,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_osm_server_1c2_osm_port: + network.outgoing.packets.rate_osm_server_1c2_osm_server_1c2_mgmt_port_0: + 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_osm_server_1c2_osm_server_1c2_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -784,25 +787,25 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.root.size_osm_server_1c2: + network.outgoing.bytes.rate_osm_server_1c2_osm_server_1c2_mgmt_port_0: 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_osm_server_1c2: + disk.root.size_osm_server_1c2: 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_osm_server_1c2: + disk.usage_osm_server_1c2: 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_osm_server_1c2_osm_port: + memory.usage_osm_server_1c2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -826,60 +829,57 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_osm_server_1c2_osm_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_osm_server_1c2_osm_server_1c2_mgmt_port_0: + 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: - - 1 + - 0 - UNBOUNDED - disk.device.read.bytes_osm_server_1c2: + network.incoming.packets_osm_server_1c2_osm_server_1c2_mgmt_port_0: 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_osm_server_1c2_osm_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - disk.device.capacity_osm_server_1c2: + network.incoming.packets.rate_osm_server_1c2_osm_server_1c2_mgmt_port_0: 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_osm_server_1c2_osm_port: + disk.device.read.bytes_osm_server_1c2: 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_osm_server_1c2: + network.outpoing.packets_osm_server_1c2_osm_server_1c2_mgmt_port_0: 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_osm_server_1c2: + disk.device.capacity_osm_server_1c2: 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_osm_server_1c2_osm_port: + disk.device.write.bytes_osm_server_1c2: 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 - instance_osm_server_1c2: + disk.device.write.requests.rate_osm_server_1c2: 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_osm_server_1c2_osm_port: + instance_osm_server_1c2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -888,16 +888,24 @@ node_types: org.openecomp.resource.abstract.nodes.oam_server_1c2: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_oam_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_oam_server_1c2_mgmt_port_0_vlan_requirements: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements compute_oam_server_1c2_name: type: list required: true status: SUPPORTED entry_schema: type: string + port_oam_server_1c2_mgmt_port_0_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments index_value: type: integer description: Index value of this substitution service template runtime instance @@ -906,46 +914,36 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_oam_port_network: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_oam_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_oam_port_order: - type: integer + port_oam_server_1c2_mgmt_port_0_network_role_tag: + type: string required: true status: SUPPORTED - port_oam_port_subnetpoolid: - type: string + port_oam_server_1c2_mgmt_port_0_ip_requirements: + type: list required: true status: SUPPORTED - port_oam_port_related_networks: + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_oam_server_1c2_mgmt_port_0_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments + type: org.openecomp.datatypes.heat.neutron.port.FixedIps vm_flavor_name: type: string required: true status: SUPPORTED - compute_oam_server_1c2_availability_zone: - type: list + port_oam_server_1c2_mgmt_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: string - port_oam_port_fixed_ips: + compute_oam_server_1c2_availability_zone: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps + type: string vm_image_name: type: string required: true @@ -956,29 +954,31 @@ node_types: status: SUPPORTED entry_schema: type: json - port_oam_port_vlan_requirements: + port_oam_server_1c2_mgmt_port_0_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_oam_port_ip_requirements: - type: list + type: string + port_oam_server_1c2_mgmt_port_0_order: + type: integer required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_oam_port_replacement_policy: - type: list + port_oam_server_1c2_mgmt_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: string - port_oam_port_network_role_tag: + port_oam_server_1c2_mgmt_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_oam_port_network_role: + port_oam_server_1c2_mgmt_port_0_replacement_policy: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_oam_server_1c2_mgmt_port_0_network_role: type: string required: true status: SUPPORTED @@ -987,33 +987,33 @@ node_types: type: string status: SUPPORTED requirements: - - dependency_oam_server_1c2: + - dependency_oam_server_1c2_oam_server_1c2_mgmt_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - local_storage_oam_server_1c2: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo + - link_oam_server_1c2_oam_server_1c2_mgmt_port_0: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo occurrences: - - 0 - - UNBOUNDED - - dependency_oam_server_1c2_oam_port: + - 1 + - 1 + - dependency_oam_server_1c2: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_oam_server_1c2_oam_port: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo + - local_storage_oam_server_1c2: + capability: tosca.capabilities.Attachment + node: tosca.nodes.BlockStorage + relationship: tosca.relationships.AttachesTo occurrences: - - 1 - - 1 + - 0 + - UNBOUNDED capabilities: disk.device.usage_oam_server_1c2: type: org.openecomp.capabilities.metric.Ceilometer @@ -1050,18 +1050,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_oam_server_1c2_oam_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.outpoing.packets_oam_server_1c2_oam_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_util_oam_server_1c2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1074,18 +1062,15 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.allocation_oam_server_1c2: - 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 - attachment_oam_server_1c2_oam_port: - type: tosca.capabilities.Attachment + binding_oam_server_1c2_oam_server_1c2_mgmt_port_0: + 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: - - 1 + - 0 - UNBOUNDED - network.incoming.bytes.rate_oam_server_1c2_oam_port: + disk.device.allocation_oam_server_1c2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1109,7 +1094,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_oam_server_1c2_oam_port: + network.outgoing.bytes.rate_oam_server_1c2_oam_server_1c2_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1127,13 +1112,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_oam_server_1c2_oam_port: + network.incoming.packets_oam_server_1c2_oam_server_1c2_mgmt_port_0: 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_oam_server_1c2_oam_port: + network.incoming.packets.rate_oam_server_1c2_oam_server_1c2_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1151,13 +1136,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_oam_server_1c2_oam_port: + cpu_oam_server_1c2: 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_oam_server_1c2: + network.outpoing.packets_oam_server_1c2_oam_server_1c2_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1199,17 +1184,17 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_oam_server_1c2_oam_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED disk.ephemeral.size_oam_server_1c2: 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_oam_server_1c2_oam_server_1c2_mgmt_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED memory.resident_oam_server_1c2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1234,31 +1219,33 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_oam_server_1c2_oam_server_1c2_mgmt_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED disk.usage_oam_server_1c2: 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_oam_server_1c2_oam_port: + network.outgoing.bytes_oam_server_1c2_oam_server_1c2_mgmt_port_0: 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_oam_server_1c2_oam_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 os_oam_server_1c2: type: tosca.capabilities.OperatingSystem occurrences: - 1 - UNBOUNDED + forwarder_oam_server_1c2_oam_server_1c2_mgmt_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.read.requests_oam_server_1c2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1271,8 +1258,9 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_oam_server_1c2_oam_port: - type: tosca.capabilities.Node + network.incoming.bytes_oam_server_1c2_oam_server_1c2_mgmt_port_0: + 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 @@ -1310,6 +1298,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.packets.rate_oam_server_1c2_oam_server_1c2_mgmt_port_0: + 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_oam_server_1c2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1328,6 +1322,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes.rate_oam_server_1c2_oam_server_1c2_mgmt_port_0: + 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.pd_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: @@ -1341,10 +1341,6 @@ node_types: description: UID of OAM network required: true status: SUPPORTED - port_pd_server_port_1_order: - type: integer - required: true - status: SUPPORTED pd_server_names: type: list description: PD server names @@ -1352,16 +1348,18 @@ node_types: status: SUPPORTED entry_schema: &id001 type: string - port_pd_server_port_1_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pd_server_1_port_ip_requirements: + type: list required: true status: SUPPORTED - port_pd_server_port_2_network_role: - type: string + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd_server_1_port_order: + type: integer required: true status: SUPPORTED - port_pd_server_port_1_network_role: - type: string + port_pd_server_2_port_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED pd_server_flavor: @@ -1369,14 +1367,18 @@ node_types: description: Flavor for PD server required: true status: SUPPORTED - port_pd_server_port_2_ip_requirements: + port_pd_server_1_port_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd_server_port_2_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_2_port_network_role_tag: + type: string + required: true + status: SUPPORTED + port_pd_server_1_port_network_role: + type: string required: true status: SUPPORTED availability_zone_0: @@ -1388,34 +1390,36 @@ node_types: type: string required: true status: SUPPORTED - port_pd_server_port_2_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd_server_port_2_subnetpoolid: + pd_server_ips: type: string required: true status: SUPPORTED - pd_server_ips: + port_pd_server_1_port_subnetpoolid: type: string required: true status: SUPPORTED - port_pd_server_port_1_subnetpoolid: - type: string + port_pd_server_2_port_order: + type: integer required: true status: SUPPORTED - port_pd_server_port_1_related_networks: + port_pd_server_1_port_related_networks: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd_server_port_1_network_role_tag: + port_pd_server_1_port_network_role_tag: + type: string + required: true + status: SUPPORTED + port_pd_server_2_port_subnetpoolid: type: string required: true status: SUPPORTED + port_pd_server_1_port_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED security_group_name: type: list description: CMAUI1, CMAUI2 server names @@ -1428,23 +1432,29 @@ node_types: description: Flavor for PS server required: true status: SUPPORTED - port_pd_server_port_1_vlan_requirements: + port_pd_server_2_port_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd_server_port_2_order: - type: integer + type: org.openecomp.datatypes.network.IpRequirements + port_pd_server_2_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_pd_server_2_port_vlan_requirements: + type: list required: true status: SUPPORTED - port_pd_server_port_2_related_networks: + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_2_port_related_networks: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd_server_port_2_network_role_tag: + port_pd_server_2_port_network_role: type: string required: true status: SUPPORTED @@ -1453,18 +1463,8 @@ node_types: description: Flavor for PD server required: true status: SUPPORTED - port_pd_server_port_1_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd_server_port_2_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_pd_server_port_1_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_1_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED attributes: @@ -1473,27 +1473,27 @@ node_types: description: pattern4_attr_1_value status: SUPPORTED requirements: - - dependency_pd_server_port_1: + - dependency_pd_server_2_port: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_port_1: + - link_pd_server_2_port: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_pd_server_port_2: + - dependency_pd_server_1_port: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_port_2: + - link_pd_server_1_port: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -1514,6 +1514,17 @@ node_types: - 0 - UNBOUNDED capabilities: + feature_pd_server_2_port: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets.rate_pd_server_1_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.iops_server_pd: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1526,43 +1537,61 @@ node_types: occurrences: - 1 - UNBOUNDED - memory.resident_server_pd: + network.outgoing.bytes_pd_server_2_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_util_server_pd: + network.outgoing.packets.rate_pd_server_2_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.incoming.bytes_pd_server_port_1: + memory.resident_server_pd: 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_pd_server_port_2: + binding_pd_server_1_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 + cpu_util_server_pd: 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_server_pd: + attachment_pd_server_2_port: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets_pd_server_2_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.incoming.bytes.rate_pd_server_port_1: + disk.device.read.requests_server_pd: 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_pd_server_port_2: + forwarder_pd_server_1_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + network.outgoing.packets.rate_pd_server_1_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: @@ -1597,23 +1626,13 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_port_2: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - network.incoming.packets_pd_server_port_2: + network.outpoing.packets_pd_server_2_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 - attachment_pd_server_port_1: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - network.incoming.packets_pd_server_port_1: + network.incoming.bytes_pd_server_2_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: @@ -1655,35 +1674,43 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_port_1: - type: tosca.capabilities.Node + network.outpoing.packets_pd_server_1_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_pd_server_port_2: - type: tosca.capabilities.Node + binding_pd_server_2_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: - - 1 + - 0 - UNBOUNDED - disk.read.bytes_server_pd: + network.incoming.packets.rate_pd_server_2_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.device.read.bytes_server_pd: + disk.read.bytes_server_pd: 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_pd_server_port_2: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_pd_server_2_port: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_port_1: + feature_pd_server_1_port: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + disk.device.read.bytes_server_pd: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1695,21 +1722,11 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_port_2: - 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 - binding_pd_server_port_1: - 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 + network.incoming.bytes.rate_pd_server_2_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: - - 0 + - 1 - UNBOUNDED cpu.delta_server_pd: type: org.openecomp.capabilities.metric.Ceilometer @@ -1724,7 +1741,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_port_1: + network.incoming.bytes.rate_pd_server_1_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: @@ -1742,37 +1759,25 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_port_2: - 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.packets.rate_pd_server_port_2: - 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_server_pd: 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.packets.rate_pd_server_port_1: + disk.device.write.bytes.rate_server_pd: 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_server_pd: + disk.write.requests.rate_server_pd: 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_server_pd: + network.outgoing.bytes.rate_pd_server_2_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: @@ -1784,19 +1789,18 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_port_2: + disk.device.iops_server_pd: 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.iops_server_pd: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_pd_server_1_port: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_port_1: + network.incoming.packets_pd_server_1_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: @@ -1819,6 +1823,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes_pd_server_1_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 binding_server_pd: type: tosca.capabilities.network.Bindable occurrences: @@ -1829,58 +1839,48 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_port_2: + disk.write.bytes_server_pd: 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_pd_server_port_1: - type: org.openecomp.capabilities.Forwarder + disk.write.bytes.rate_server_pd: + 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_pd_server_port_1: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_server_pd: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.write.bytes_server_pd: + network.outgoing.bytes.rate_pd_server_1_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.write.bytes.rate_server_pd: + disk.root.size_server_pd: 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_pd_server_port_2: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - feature_server_pd: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - disk.root.size_server_pd: + disk.device.read.requests.rate_server_pd: 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_server_pd: + disk.device.write.requests.rate_server_pd: 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_server_pd: + network.incoming.bytes_pd_server_1_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: @@ -1901,32 +1901,22 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server_1b: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_ps_server_1b_port_vlan_requirements: - type: list + port_ps_server_1b_port_1_network_role_tag: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements compute_pd_server_1b_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_ps_server_1b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_ps_server_1b_port_network_role_tag: - type: string - required: true - status: SUPPORTED - port_ps_server_1b_port_fixed_ips: + port_ps_server_1b_port_1_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps + type: org.openecomp.datatypes.network.RelatedNetworksAssignments index_value: type: integer description: Index value of this substitution service template runtime instance @@ -1935,88 +1925,98 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_ps_server_1b_port_order: - type: integer + port_ps_server_1b_port_1_ip_requirements: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements vm_flavor_name: type: string required: true status: SUPPORTED - port_ps_server_1b_port_related_networks: - type: list + port_ps_server_1b_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_ps_server_1b_port_network: + port_ps_server_1b_port_1_network_role: + type: string + required: true + status: SUPPORTED + vm_image_name: + type: string + required: true + status: SUPPORTED + port_ps_server_1b_port_1_replacement_policy: type: list required: true status: SUPPORTED entry_schema: type: string - port_ps_server_1b_port_exCP_naming: + port_ps_server_1b_port_1_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_ps_server_1b_port_ip_requirements: + port_ps_server_1b_port_1_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - vm_image_name: - type: string + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_ps_server_1b_port_1_order: + type: integer required: true status: SUPPORTED - port_ps_server_1b_port_network_role: + port_ps_server_1b_port_1_subnetpoolid: type: string required: true status: SUPPORTED - port_ps_server_1b_port_replacement_policy: + port_ps_server_1b_port_1_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_ps_server_1b_port_subnetpoolid: - type: string - required: true - status: SUPPORTED compute_pd_server_1b_availability_zone: type: list required: true status: SUPPORTED entry_schema: type: string + port_ps_server_1b_port_1_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements requirements: - - dependency_pd_server_1b: + - dependency_pd_server_1b_ps_server_1b_port_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - local_storage_pd_server_1b: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo + - link_pd_server_1b_ps_server_1b_port_1: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo occurrences: - - 0 - - UNBOUNDED - - dependency_pd_server_1b_ps_server_1b_port: + - 1 + - 1 + - dependency_pd_server_1b: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_1b_ps_server_1b_port: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo + - local_storage_pd_server_1b: + capability: tosca.capabilities.Attachment + node: tosca.nodes.BlockStorage + relationship: tosca.relationships.AttachesTo occurrences: - - 1 - - 1 + - 0 + - UNBOUNDED capabilities: disk.device.read.bytes_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer @@ -2031,7 +2031,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_1b_ps_server_1b_port: + network.outgoing.bytes.rate_pd_server_1b_ps_server_1b_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2043,40 +2043,23 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.allocation_pd_server_1b: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_pd_server_1b_ps_server_1b_port_1: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pd_server_1b_ps_server_1b_port: + disk.allocation_pd_server_1b: 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_pd_server_1b_ps_server_1b_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED cpu.delta_pd_server_1b: 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_pd_server_1b_ps_server_1b_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 - forwarder_pd_server_1b_ps_server_1b_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED disk.device.read.requests_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2094,12 +2077,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_1b_ps_server_1b_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_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2141,7 +2118,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_1b_ps_server_1b_port: + network.outgoing.packets.rate_pd_server_1b_ps_server_1b_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2189,14 +2166,6 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_1b_ps_server_1b_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 scalable_pd_server_1b: type: tosca.capabilities.Scalable occurrences: @@ -2208,6 +2177,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes_pd_server_1b_ps_server_1b_port_1: + 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_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2220,12 +2195,30 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets.rate_pd_server_1b_ps_server_1b_port_1: + 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.iops_pd_server_1b: 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_pd_server_1b_ps_server_1b_port_1: + 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_pd_server_1b_ps_server_1b_port_1: + 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_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2238,6 +2231,11 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_pd_server_1b_ps_server_1b_port_1: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED os_pd_server_1b: type: tosca.capabilities.OperatingSystem occurrences: @@ -2255,12 +2253,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_1b_ps_server_1b_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 binding_pd_server_1b: type: tosca.capabilities.network.Bindable occurrences: @@ -2278,30 +2270,24 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_1b_ps_server_1b_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 - attachment_pd_server_1b_ps_server_1b_port: - type: tosca.capabilities.Attachment + feature_pd_server_1b_ps_server_1b_port_1: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_1b_ps_server_1b_port: + disk.device.write.requests.rate_pd_server_1b: 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_pd_server_1b: + disk.device.capacity_pd_server_1b: 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_pd_server_1b: + network.incoming.bytes.rate_pd_server_1b_ps_server_1b_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2325,6 +2311,20 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_pd_server_1b_ps_server_1b_port_1: + 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_pd_server_1b_ps_server_1b_port_1: + 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 disk.write.requests.rate_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2334,14 +2334,16 @@ node_types: org.openecomp.resource.abstract.nodes.BE_1c1: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_BE_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_BE_1c1_mgmt_port_0_network_role: + type: string required: true status: SUPPORTED - port_BE_port_network_role: - type: string + port_BE_1c1_mgmt_port_0_vlan_requirements: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements index_value: type: integer description: Index value of this substitution service template runtime instance @@ -2350,73 +2352,71 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_BE_port_order: + port_BE_1c1_mgmt_port_0_order: type: integer required: true status: SUPPORTED - port_BE_port_subnetpoolid: - type: string - required: true - status: SUPPORTED vm_flavor_name: type: string required: true status: SUPPORTED - port_BE_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_BE_port_fixed_ips: + port_BE_1c1_mgmt_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_BE_port_vlan_requirements: + type: org.openecomp.datatypes.network.IpRequirements + compute_BE_1c1_availability_zone: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - compute_BE_1c1_availability_zone: + type: string + port_BE_1c1_mgmt_port_0_subnetpoolid: + type: string + required: true + status: SUPPORTED + port_BE_1c1_mgmt_port_0_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: string - port_BE_port_network: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_BE_1c1_mgmt_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: string - port_BE_port_ip_requirements: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_BE_1c1_mgmt_port_0_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_BE_port_network_role_tag: + type: string + port_BE_1c1_mgmt_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_BE_port_related_networks: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_image_name: type: string required: true status: SUPPORTED - compute_BE_1c1_name: + port_BE_1c1_mgmt_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_BE_1c1_mgmt_port_0_replacement_policy: type: list required: true status: SUPPORTED entry_schema: type: string - port_BE_port_replacement_policy: + port_BE_1c1_mgmt_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + compute_BE_1c1_name: type: list required: true status: SUPPORTED @@ -2427,19 +2427,6 @@ node_types: type: string status: SUPPORTED requirements: - - dependency_BE_1c1_BE_port: - capability: tosca.capabilities.Node - node: tosca.nodes.Root - relationship: tosca.relationships.DependsOn - occurrences: - - 0 - - UNBOUNDED - - link_BE_1c1_BE_port: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - dependency_BE_1c1: capability: tosca.capabilities.Node node: tosca.nodes.Root @@ -2454,6 +2441,19 @@ node_types: occurrences: - 0 - UNBOUNDED + - dependency_BE_1c1_BE_1c1_mgmt_port_0: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - link_BE_1c1_BE_1c1_mgmt_port_0: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 capabilities: disk.ephemeral.size_BE_1c1: type: org.openecomp.capabilities.metric.Ceilometer @@ -2477,12 +2477,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_BE_1c1_BE_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.device.write.requests_BE_1c1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2501,18 +2495,12 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_BE_1c1_BE_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 - attachment_BE_1c1_BE_port: - type: tosca.capabilities.Attachment + feature_BE_1c1_BE_1c1_mgmt_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.incoming.bytes_BE_1c1_BE_port: + network.incoming.packets_BE_1c1_BE_1c1_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2549,20 +2537,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_BE_1c1_BE_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 - binding_BE_1c1_BE_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 disk.device.usage_BE_1c1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2575,14 +2549,14 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_BE_1c1_BE_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + scalable_BE_1c1: + type: tosca.capabilities.Scalable occurrences: - 1 - UNBOUNDED - scalable_BE_1c1: - type: tosca.capabilities.Scalable + network.outgoing.bytes.rate_BE_1c1_BE_1c1_mgmt_port_0: + 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 @@ -2610,24 +2584,25 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_BE_1c1_BE_port: + network.outgoing.bytes_BE_1c1_BE_1c1_mgmt_port_0: 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_BE_1c1_BE_port: - type: org.openecomp.capabilities.Forwarder + disk.device.latency_BE_1c1: + 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_BE_1c1: + disk.device.read.requests_BE_1c1: 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_BE_1c1: + network.incoming.packets.rate_BE_1c1_BE_1c1_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2669,6 +2644,19 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_BE_1c1_BE_1c1_mgmt_port_0: + 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 + forwarder_BE_1c1_BE_1c1_mgmt_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.iops_BE_1c1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2681,12 +2669,17 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_BE_1c1_BE_port: + network.outgoing.packets.rate_BE_1c1_BE_1c1_mgmt_port_0: 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 + attachment_BE_1c1_BE_1c1_mgmt_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED cpu_BE_1c1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2699,6 +2692,18 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes.rate_BE_1c1_BE_1c1_mgmt_port_0: + 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_BE_1c1_BE_1c1_mgmt_port_0: + 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_BE_1c1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2715,42 +2720,37 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.write.bytes.rate_BE_1c1: + network.incoming.bytes_BE_1c1_BE_1c1_mgmt_port_0: 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_BE_1c1: + disk.write.bytes.rate_BE_1c1: 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_BE_1c1: + disk.write.requests_BE_1c1: 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_BE_1c1_BE_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - disk.device.read.bytes.rate_BE_1c1: + disk.device.read.bytes_BE_1c1: 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_BE_1c1: + disk.device.read.bytes.rate_BE_1c1: 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_BE_1c1_BE_port: + disk.device.capacity_BE_1c1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2891,7 +2891,14 @@ node_types: description: all_pattern_attr_1 status: SUPPORTED requirements: - - dependency_cmaui_port_2: + - dependency_oam_server_1c2_1_mgmt_port_0: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - dependency_oam_server_1c2_2_mgmt_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn @@ -2905,27 +2912,27 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_port_1_nested1_pattern_4: + - dependency_pd_server_2_port_nested1_pattern_4: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_port_1_nested1_pattern_4: + - link_pd_server_2_port_nested1_pattern_4: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_pd_server_port_2_nested1_pattern_4: + - dependency_pd_server_1_port_nested1_pattern_4: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_port_2_nested1_pattern_4: + - link_pd_server_1_port_nested1_pattern_4: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -2973,48 +2980,48 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_server_1b_pd_2: + - dependency_cmaui_1c1_2_mgmt_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - local_storage_server_1b_pd_2: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo - occurrences: - - 0 - - UNBOUNDED - - dependency_cmaui_port_1: + - dependency_cmaui_1c1_1_mgmt_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - dependency_server_1b_pd_1: + - dependency_server_1b_pd_2: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - local_storage_server_1b_pd_1: + - local_storage_server_1b_pd_2: capability: tosca.capabilities.Attachment node: tosca.nodes.BlockStorage relationship: tosca.relationships.AttachesTo occurrences: - 0 - UNBOUNDED - - dependency_oam_port_1: + - dependency_server_1b_pd_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED + - local_storage_server_1b_pd_1: + capability: tosca.capabilities.Attachment + node: tosca.nodes.BlockStorage + relationship: tosca.relationships.AttachesTo + occurrences: + - 0 + - UNBOUNDED - dependency_packet_internal_network_1: capability: tosca.capabilities.Node node: tosca.nodes.Root @@ -3076,13 +3083,6 @@ node_types: occurrences: - 1 - 1 - - dependency_oam_port_2: - capability: tosca.capabilities.Node - node: tosca.nodes.Root - relationship: tosca.relationships.DependsOn - occurrences: - - 0 - - UNBOUNDED - dependency_packet_external_network_1: capability: tosca.capabilities.Node node: tosca.nodes.Root @@ -3105,6 +3105,11 @@ node_types: occurrences: - 0 - UNBOUNDED + feature_cmaui_1c1_1_mgmt_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.capacity_server_1b_pd_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3129,26 +3134,25 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.read.requests.rate_server_pd_nested1_pattern_4: + network.outpoing.packets_pd_server_1_port_nested1_pattern_4: 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_pd_server_1b_port_1: - type: tosca.capabilities.Node + disk.device.read.requests.rate_server_pd_nested1_pattern_4: + 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.packets.rate_oam_port_2: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_cmaui_1c1_2_mgmt_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_oam_port_1: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_pd_server_1b_port_1: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -3204,17 +3208,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_port_1_nested1_pattern_4: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - network.outpoing.packets_pd_server_port_1_nested1_pattern_4: - 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_server_1c1_cmaui_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3257,34 +3250,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_oam_port_1: - 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_oam_port_2: - 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_cmaui_port_1: - 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 - binding_cmaui_port_2: - 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 end_point_packet_internal_network_1: type: tosca.capabilities.Endpoint occurrences: @@ -3314,30 +3279,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pd_server_port_2_nested1_pattern_4: - 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_cmaui_port_2: - 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_cmaui_port_1: - 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_pd_server_port_2_nested1_pattern_4: - 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_server_1c2_oam_1: type: tosca.capabilities.OperatingSystem occurrences: @@ -3384,32 +3325,25 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.write.bytes.rate_server_pd_nested1_pattern_4: + network.outgoing.bytes_pd_server_2_port_nested1_pattern_4: 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_server_1c2_oam_2: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - network.incoming.packets.rate_cmaui_port_1: + disk.device.write.bytes.rate_server_pd_nested1_pattern_4: 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_cmaui_port_2: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_server_1c2_oam_2: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_oam_port_2: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_pd_server_1_port_nested1_pattern_4: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -3418,13 +3352,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_oam_port_1: + disk.device.capacity_server_1c1_cmaui_2: 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_server_1c1_cmaui_2: + network.outgoing.packets.rate_cmaui_1c1_1_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -3437,11 +3371,6 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_oam_port_2: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED disk.capacity_server_1c2_oam_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3459,7 +3388,7 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_oam_port_1: + attachment_oam_server_1c2_1_mgmt_port_0: type: tosca.capabilities.Attachment occurrences: - 1 @@ -3524,12 +3453,24 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes_oam_server_1c2_1_mgmt_port_0: + 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_server_1c1_cmaui_2: 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_oam_server_1c2_1_mgmt_port_0: + 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.allocation_server_1c2_oam_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3574,12 +3515,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_port_2_nested1_pattern_4: - 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_server_1c2_oam_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3592,21 +3527,10 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_oam_port_2: - 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 - binding_oam_port_1: - 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 + forwarder_oam_server_1c2_1_mgmt_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - - 0 + - 1 - UNBOUNDED disk.read.bytes.rate_server_1c1_cmaui_2: type: org.openecomp.capabilities.metric.Ceilometer @@ -3646,13 +3570,13 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.latency_server_1c2_oam_1: + network.incoming.packets.rate_pd_server_2_port_nested1_pattern_4: 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_pd_server_port_1_nested1_pattern_4: + disk.latency_server_1c2_oam_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -3664,6 +3588,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes.rate_pd_server_1_port_nested1_pattern_4: + 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_server_pd_nested1_pattern_4: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3700,19 +3630,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_oam_port_1: - 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_pd_server_port_1_nested1_pattern_4: + network.outgoing.bytes.rate_cmaui_1c1_1_mgmt_port_0: 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_oam_port_2: + network.outgoing.bytes.rate_cmaui_1c1_2_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -3757,22 +3681,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_port_2_nested1_pattern_4: - 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_oam_port_1: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - forwarder_oam_port_2: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED binding_server_1c2_oam_2: type: tosca.capabilities.network.Bindable occurrences: @@ -3783,6 +3691,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_cmaui_1c1_1_mgmt_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.read.bytes.rate_server_1b_pd_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3813,9 +3726,8 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_port_2_nested1_pattern_4: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_pd_server_2_port_nested1_pattern_4: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED @@ -3843,12 +3755,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_cmaui_port_2: - 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_server_1c2_oam_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3873,7 +3779,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_cmaui_port_1: + network.incoming.packets.rate_cmaui_1c1_2_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -3937,18 +3843,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_oam_port_1: - 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_oam_port_2: - 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.iops_server_1b_pd_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3979,42 +3873,30 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.write.requests_server_1c1_cmaui_2: - 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_server_1c1_cmaui_1: + network.outgoing.packets.rate_pd_server_2_port_nested1_pattern_4: 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 - link_packet_external_network_1: - type: tosca.capabilities.network.Linkable - occurrences: - - 1 - - UNBOUNDED - network.outgoing.bytes.rate_cmaui_port_2: + disk.write.requests_server_1c1_cmaui_2: 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_pd_server_port_1_nested1_pattern_4: + disk.write.requests_server_1c1_cmaui_1: 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_server_1c1_cmaui_2: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + link_packet_external_network_1: + type: tosca.capabilities.network.Linkable occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_cmaui_port_1: + cpu_server_1c1_cmaui_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -4050,6 +3932,11 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_cmaui_1c1_2_mgmt_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED disk.device.read.bytes_server_1b_pd_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4078,12 +3965,30 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets.rate_pd_server_1_port_nested1_pattern_4: + 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_server_1c2_oam_1: 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.packets.rate_cmaui_1c1_2_mgmt_port_0: + 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_pd_server_2_port_nested1_pattern_4: + 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_server_1b_pd_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4118,37 +4023,42 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_oam_server_1c2_2_mgmt_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED instance_server_pd_nested1_pattern_4: 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_server_1c1_cmaui_1: + network.outgoing.bytes.rate_pd_server_2_port_nested1_pattern_4: 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_server_1b_pd_2: + disk.latency_server_1c1_cmaui_1: 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_server_1c1_cmaui_2: + memory_server_1b_pd_2: 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_server_1b_pd_1: + disk.latency_server_1c1_cmaui_2: 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.packets.rate_pd_server_port_1_nested1_pattern_4: + memory_server_1b_pd_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -4159,51 +4069,49 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.latency_server_1b_pd_2: + network.outgoing.bytes_oam_server_1c2_2_mgmt_port_0: 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_server_1b_pd_1: + disk.device.latency_server_1b_pd_2: 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_server_pd_nested1_pattern_4: + disk.device.latency_server_1b_pd_1: 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.iops_server_pd_nested1_pattern_4: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_oam_server_1c2_1_mgmt_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.incoming.packets_oam_port_1: + disk.read.bytes_server_pd_nested1_pattern_4: 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_oam_port_2: + network.outpoing.packets_oam_server_1c2_2_mgmt_port_0: 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_cmaui_port_1: + disk.device.iops_server_pd_nested1_pattern_4: 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_cmaui_port_2: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_oam_server_1c2_2_mgmt_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED @@ -4231,18 +4139,19 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_pd_server_port_2_nested1_pattern_4: - type: org.openecomp.capabilities.Forwarder + disk.device.write.bytes_server_1c2_oam_1: + 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_server_1c2_oam_1: + disk.device.write.bytes_server_1c2_oam_2: 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_server_1c2_oam_2: + network.incoming.packets_pd_server_1_port_nested1_pattern_4: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -4254,8 +4163,17 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_port_2_nested1_pattern_4: - type: tosca.capabilities.Node + binding_pd_server_1_port_nested1_pattern_4: + 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 + network.incoming.packets_oam_server_1c2_1_mgmt_port_0: + 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 @@ -4283,6 +4201,17 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pd_server_1_port_nested1_pattern_4: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets_oam_server_1c2_2_mgmt_port_0: + 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.iops_server_1c2_oam_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4300,53 +4229,52 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_server_1c1_cmaui_1: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - disk.usage_server_1c2_oam_1: + network.outgoing.bytes_cmaui_1c1_1_mgmt_port_0: 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_server_1c1_cmaui_2: - type: tosca.capabilities.Node + attachment_pd_server_1_port_nested1_pattern_4: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_1b_port_1: + network.outgoing.bytes_cmaui_1c1_2_mgmt_port_0: 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_cmaui_port_2: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_server_1c1_cmaui_1: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.device.capacity_server_pd_nested1_pattern_4: + disk.usage_server_1c2_oam_1: 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.iops_server_1c2_oam_1: + feature_server_1c1_cmaui_2: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + network.outpoing.packets_pd_server_1b_port_1: 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_cmaui_port_1: + disk.device.capacity_server_pd_nested1_pattern_4: 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_pd_server_port_1_nested1_pattern_4: + disk.iops_server_1c2_oam_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -4415,13 +4343,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_port_2_nested1_pattern_4: + vcpus_server_pd_nested1_pattern_4: 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_server_pd_nested1_pattern_4: + network.outgoing.packets.rate_oam_server_1c2_2_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -4438,19 +4366,19 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.write.bytes_server_1b_pd_2: + network.incoming.packets.rate_oam_server_1c2_1_mgmt_port_0: 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_server_1c2_oam_2: + disk.write.bytes_server_1b_pd_2: 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_pd_server_port_2_nested1_pattern_4: + disk.device.usage_server_1c2_oam_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -4468,11 +4396,6 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_pd_server_port_1_nested1_pattern_4: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED disk.latency_server_pd_nested1_pattern_4: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4496,6 +4419,11 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_pd_server_2_port_nested1_pattern_4: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED os_server_pd_nested1_pattern_4: type: tosca.capabilities.OperatingSystem occurrences: @@ -4525,14 +4453,15 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_1b_port_1: + network.incoming.packets.rate_oam_server_1c2_2_mgmt_port_0: 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 - attachment_pd_server_port_1_nested1_pattern_4: - type: tosca.capabilities.Attachment + network.outgoing.bytes_pd_server_1b_port_1: + 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 @@ -4548,6 +4477,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.packets.rate_oam_server_1c2_1_mgmt_port_0: + 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_server_1c1_cmaui_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4560,29 +4495,31 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.root.size_server_pd_nested1_pattern_4: + network.incoming.bytes_cmaui_1c1_1_mgmt_port_0: 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_server_1c1_cmaui_1: + disk.root.size_server_pd_nested1_pattern_4: 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_cmaui_port_1: - type: tosca.capabilities.Node + vcpus_server_1c1_cmaui_1: + 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_cmaui_port_2: - type: tosca.capabilities.Node + instance_server_1c1_cmaui_2: + 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 - instance_server_1c1_cmaui_2: + network.outgoing.bytes.rate_oam_server_1c2_2_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -4600,7 +4537,7 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_port_2_nested1_pattern_4: + attachment_cmaui_1c1_1_mgmt_port_0: type: tosca.capabilities.Attachment occurrences: - 1 @@ -4622,11 +4559,25 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_oam_server_1c2_2_mgmt_port_0: + 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 os_server_1b_pd_2: type: tosca.capabilities.OperatingSystem occurrences: - 1 - UNBOUNDED + network.outpoing.packets_oam_server_1c2_1_mgmt_port_0: + 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_server_1b_pd_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4675,13 +4626,15 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_cmaui_port_2: - type: org.openecomp.capabilities.Forwarder + network.incoming.packets_cmaui_1c1_2_mgmt_port_0: + 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_cmaui_port_1: - type: org.openecomp.capabilities.Forwarder + network.incoming.bytes_pd_server_2_port_nested1_pattern_4: + 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 @@ -4691,6 +4644,14 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_cmaui_1c1_2_mgmt_port_0: + 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 disk.allocation_server_1b_pd_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4714,49 +4675,42 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.write.bytes.rate_server_1c1_cmaui_1: - 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_server_1c1_cmaui_2: + network.incoming.packets_pd_server_2_port_nested1_pattern_4: 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_server_pd_nested1_pattern_4: + disk.write.bytes.rate_server_1c1_cmaui_1: 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_pd_server_port_2_nested1_pattern_4: + disk.write.bytes.rate_server_1c1_cmaui_2: 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_ps_server_1b_port_1: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_oam_server_1c2_2_mgmt_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.device.allocation_server_pd_nested1_pattern_4: + memory.resident_server_pd_nested1_pattern_4: 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_cmaui_port_1: + network.outgoing.bytes_ps_server_1b_port_1: 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_cmaui_port_2: + disk.device.allocation_server_pd_nested1_pattern_4: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -4828,6 +4782,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes.rate_cmaui_1c1_2_mgmt_port_0: + 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_server_1c1_cmaui_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4839,6 +4799,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes.rate_oam_server_1c2_1_mgmt_port_0: + 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_server_1c1_cmaui_1: type: tosca.capabilities.OperatingSystem occurrences: @@ -4856,6 +4822,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes.rate_cmaui_1c1_1_mgmt_port_0: + 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 instance_server_1c2_oam_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4868,6 +4840,14 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_pd_server_2_port_nested1_pattern_4: + 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 network.incoming.bytes.rate_ps_server_1b_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4904,6 +4884,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_cmaui_1c1_2_mgmt_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED vcpus_server_1c2_oam_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4916,6 +4901,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes.rate_oam_server_1c2_2_mgmt_port_0: + 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_server_1b_pd_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4964,6 +4955,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets.rate_cmaui_1c1_1_mgmt_port_0: + 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_server_1b_pd_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -5018,6 +5015,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes.rate_pd_server_1_port_nested1_pattern_4: + 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_server_1c2_oam_2: type: tosca.capabilities.Container valid_source_types: @@ -5053,140 +5056,133 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_port_2_nested1_pattern_4: - 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 - disk.device.read.bytes.rate_server_1c1_cmaui_1: + network.outpoing.packets_cmaui_1c1_2_mgmt_port_0: 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_server_1c1_cmaui_2: + network.outpoing.packets_cmaui_1c1_1_mgmt_port_0: 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 - attachment_pd_server_1b_port_1: - type: tosca.capabilities.Attachment + forwarder_pd_server_2_port_nested1_pattern_4: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - cpu.delta_server_1c2_oam_2: + disk.device.read.bytes.rate_server_1c1_cmaui_1: 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.ephemeral.size_server_1b_pd_1: + disk.device.read.bytes.rate_server_1c1_cmaui_2: 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.ephemeral.size_server_1b_pd_2: + network.outpoing.packets_pd_server_2_port_nested1_pattern_4: 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_server_1c1_cmaui_2: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_pd_server_1b_port_1: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - disk.usage_server_1c1_cmaui_1: + network.outgoing.packets.rate_pd_server_1_port_nested1_pattern_4: 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_oam_port_2: + cpu.delta_server_1c2_oam_2: 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_oam_port_1: + network.outgoing.bytes.rate_oam_server_1c2_1_mgmt_port_0: 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_server_pd_nested1_pattern_4: + disk.ephemeral.size_server_1b_pd_1: 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 - attachment_cmaui_port_2: - type: tosca.capabilities.Attachment + disk.ephemeral.size_server_1b_pd_2: + 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_oam_port_1: + network.incoming.bytes_cmaui_1c1_2_mgmt_port_0: 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 - instance_server_1b_pd_1: + disk.usage_server_1c1_cmaui_2: 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_server_1b_pd_1: + disk.usage_server_1c1_cmaui_1: 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_oam_port_2: + disk.write.bytes.rate_server_pd_nested1_pattern_4: 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 - instance_server_1b_pd_2: + network.incoming.bytes_pd_server_1_port_nested1_pattern_4: 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_server_1b_pd_2: + instance_server_1b_pd_1: 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_server_1c1_cmaui_1: + disk.device.capacity_server_1b_pd_1: 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.packets.rate_cmaui_port_1: + instance_server_1b_pd_2: 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.packets.rate_cmaui_port_2: + disk.device.capacity_server_1b_pd_2: 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 - attachment_cmaui_port_1: - type: tosca.capabilities.Attachment + disk.capacity_server_1c1_cmaui_1: + 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 @@ -5208,6 +5204,14 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_oam_server_1c2_1_mgmt_port_0: + 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 disk.device.read.requests.rate_server_1c1_cmaui_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -5238,31 +5242,37 @@ node_types: occurrences: - 1 - UNBOUNDED - cpu.delta_server_1c2_oam_1: + network.incoming.packets_cmaui_1c1_1_mgmt_port_0: 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_server_1c2_oam_1: + network.outgoing.bytes_pd_server_1_port_nested1_pattern_4: 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_server_1b_pd_1: + cpu.delta_server_1c2_oam_1: 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_server_1b_pd_2: + disk.device.read.bytes.rate_server_1c2_oam_1: + 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_server_1b_pd_1: 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_pd_server_port_1_nested1_pattern_4: + disk.device.usage_server_1b_pd_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -5286,13 +5296,17 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_oam_port_2: - type: tosca.capabilities.Node + binding_cmaui_1c1_1_mgmt_port_0: + 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: - - 1 + - 0 - UNBOUNDED - feature_oam_port_1: - type: tosca.capabilities.Node + network.incoming.bytes_oam_server_1c2_2_mgmt_port_0: + 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 @@ -5301,12 +5315,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_pd_server_port_1_nested1_pattern_4: - 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_server_1c1_cmaui_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -5369,14 +5377,6 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_port_1_nested1_pattern_4: - 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 network.incoming.bytes.rate_pd_server_1b_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -6568,26 +6568,24 @@ node_types: description: UID of OAM network required: true status: SUPPORTED - port_pd_server_port_1_order: - type: integer - required: true - status: SUPPORTED pd_server_names: type: list description: PD server names required: true status: SUPPORTED entry_schema: *id001 - port_pd_server_port_1_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pd_server_1_port_ip_requirements: + type: list required: true status: SUPPORTED - port_pd_server_port_2_network_role: - type: string + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd_server_1_port_order: + type: integer required: true status: SUPPORTED - port_pd_server_port_1_network_role: - type: string + port_pd_server_2_port_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED pd_server_flavor: @@ -6595,14 +6593,18 @@ node_types: description: Flavor for PD server required: true status: SUPPORTED - port_pd_server_port_2_ip_requirements: + port_pd_server_1_port_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd_server_port_2_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_2_port_network_role_tag: + type: string + required: true + status: SUPPORTED + port_pd_server_1_port_network_role: + type: string required: true status: SUPPORTED availability_zone_0: @@ -6614,34 +6616,36 @@ node_types: type: string required: true status: SUPPORTED - port_pd_server_port_2_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd_server_port_2_subnetpoolid: + pd_server_ips: type: string required: true status: SUPPORTED - pd_server_ips: + port_pd_server_1_port_subnetpoolid: type: string required: true status: SUPPORTED - port_pd_server_port_1_subnetpoolid: - type: string + port_pd_server_2_port_order: + type: integer required: true status: SUPPORTED - port_pd_server_port_1_related_networks: + port_pd_server_1_port_related_networks: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd_server_port_1_network_role_tag: + port_pd_server_1_port_network_role_tag: + type: string + required: true + status: SUPPORTED + port_pd_server_2_port_subnetpoolid: type: string required: true status: SUPPORTED + port_pd_server_1_port_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED security_group_name: type: list description: CMAUI1, CMAUI2 server names @@ -6653,23 +6657,29 @@ node_types: description: Flavor for PS server required: true status: SUPPORTED - port_pd_server_port_1_vlan_requirements: + port_pd_server_2_port_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd_server_port_2_order: - type: integer + type: org.openecomp.datatypes.network.IpRequirements + port_pd_server_2_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_pd_server_port_2_related_networks: + port_pd_server_2_port_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_2_port_related_networks: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd_server_port_2_network_role_tag: + port_pd_server_2_port_network_role: type: string required: true status: SUPPORTED @@ -6678,18 +6688,8 @@ node_types: description: Flavor for PD server required: true status: SUPPORTED - port_pd_server_port_1_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd_server_port_2_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_pd_server_port_1_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_1_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED attributes: @@ -6698,27 +6698,27 @@ node_types: description: pattern4_attr_1_value status: SUPPORTED requirements: - - dependency_pd_server_port_1: + - dependency_pd_server_2_port: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_port_1: + - link_pd_server_2_port: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_pd_server_port_2: + - dependency_pd_server_1_port: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_port_2: + - link_pd_server_1_port: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -6739,6 +6739,17 @@ node_types: - 0 - UNBOUNDED capabilities: + feature_pd_server_2_port: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets.rate_pd_server_1_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.iops_server_pd: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -6751,43 +6762,61 @@ node_types: occurrences: - 1 - UNBOUNDED - memory.resident_server_pd: + network.outgoing.bytes_pd_server_2_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_util_server_pd: + network.outgoing.packets.rate_pd_server_2_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.incoming.bytes_pd_server_port_1: + memory.resident_server_pd: 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_pd_server_port_2: + binding_pd_server_1_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 + cpu_util_server_pd: 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_server_pd: + attachment_pd_server_2_port: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets_pd_server_2_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.incoming.bytes.rate_pd_server_port_1: + disk.device.read.requests_server_pd: 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_pd_server_port_2: + forwarder_pd_server_1_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + network.outgoing.packets.rate_pd_server_1_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: @@ -6822,23 +6851,13 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_port_2: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - network.incoming.packets_pd_server_port_2: + network.outpoing.packets_pd_server_2_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 - attachment_pd_server_port_1: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - network.incoming.packets_pd_server_port_1: + network.incoming.bytes_pd_server_2_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: @@ -6880,35 +6899,43 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_port_1: - type: tosca.capabilities.Node + network.outpoing.packets_pd_server_1_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_pd_server_port_2: - type: tosca.capabilities.Node + binding_pd_server_2_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: - - 1 + - 0 - UNBOUNDED - disk.read.bytes_server_pd: + network.incoming.packets.rate_pd_server_2_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.device.read.bytes_server_pd: + disk.read.bytes_server_pd: 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_pd_server_port_2: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_pd_server_2_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + feature_pd_server_1_port: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_port_1: + disk.device.read.bytes_server_pd: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -6920,21 +6947,11 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_port_2: - 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 - binding_pd_server_port_1: - 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 + network.incoming.bytes.rate_pd_server_2_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: - - 0 + - 1 - UNBOUNDED cpu.delta_server_pd: type: org.openecomp.capabilities.metric.Ceilometer @@ -6949,7 +6966,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_port_1: + network.incoming.bytes.rate_pd_server_1_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: @@ -6967,37 +6984,25 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_port_2: - 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.packets.rate_pd_server_port_2: - 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_server_pd: 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.packets.rate_pd_server_port_1: + disk.device.write.bytes.rate_server_pd: 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_server_pd: + disk.write.requests.rate_server_pd: 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_server_pd: + network.outgoing.bytes.rate_pd_server_2_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: @@ -7009,19 +7014,18 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_port_2: + disk.device.iops_server_pd: 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.iops_server_pd: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_pd_server_1_port: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_port_1: + network.incoming.packets_pd_server_1_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: @@ -7044,30 +7048,19 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_server_pd: - type: tosca.capabilities.network.Bindable - occurrences: - - 1 - - UNBOUNDED - scalable_server_pd: - type: tosca.capabilities.Scalable - occurrences: - - 1 - - UNBOUNDED - network.outgoing.bytes.rate_pd_server_port_2: + network.outgoing.bytes_pd_server_1_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 - forwarder_pd_server_port_1: - type: org.openecomp.capabilities.Forwarder + binding_server_pd: + type: tosca.capabilities.network.Bindable occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_port_1: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + scalable_server_pd: + type: tosca.capabilities.Scalable occurrences: - 1 - UNBOUNDED @@ -7083,13 +7076,14 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_pd_server_port_2: - type: org.openecomp.capabilities.Forwarder + feature_server_pd: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - feature_server_pd: - type: tosca.capabilities.Node + network.outgoing.bytes.rate_pd_server_1_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 @@ -7111,6 +7105,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes_pd_server_1_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.device.write.bytes_server_pd: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -7136,26 +7136,24 @@ node_types: description: UID of OAM network required: true status: SUPPORTED - port_pd_server_port_1_order: - type: integer - required: true - status: SUPPORTED pd_server_names: type: list description: PD server names required: true status: SUPPORTED entry_schema: *id001 - port_pd_server_port_1_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pd_server_1_port_ip_requirements: + type: list required: true status: SUPPORTED - port_pd_server_port_2_network_role: - type: string + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd_server_1_port_order: + type: integer required: true status: SUPPORTED - port_pd_server_port_1_network_role: - type: string + port_pd_server_2_port_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED pd_server_flavor: @@ -7163,14 +7161,18 @@ node_types: description: Flavor for PD server required: true status: SUPPORTED - port_pd_server_port_2_ip_requirements: + port_pd_server_1_port_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd_server_port_2_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_2_port_network_role_tag: + type: string + required: true + status: SUPPORTED + port_pd_server_1_port_network_role: + type: string required: true status: SUPPORTED availability_zone_0: @@ -7182,34 +7184,36 @@ node_types: type: string required: true status: SUPPORTED - port_pd_server_port_2_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd_server_port_2_subnetpoolid: + pd_server_ips: type: string required: true status: SUPPORTED - pd_server_ips: + port_pd_server_1_port_subnetpoolid: type: string required: true status: SUPPORTED - port_pd_server_port_1_subnetpoolid: - type: string + port_pd_server_2_port_order: + type: integer required: true status: SUPPORTED - port_pd_server_port_1_related_networks: + port_pd_server_1_port_related_networks: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd_server_port_1_network_role_tag: + port_pd_server_1_port_network_role_tag: type: string required: true status: SUPPORTED + port_pd_server_2_port_subnetpoolid: + type: string + required: true + status: SUPPORTED + port_pd_server_1_port_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED security_group_name: type: list description: CMAUI1, CMAUI2 server names @@ -7221,23 +7225,29 @@ node_types: description: Flavor for PS server required: true status: SUPPORTED - port_pd_server_port_1_vlan_requirements: + port_pd_server_2_port_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd_server_port_2_order: - type: integer + type: org.openecomp.datatypes.network.IpRequirements + port_pd_server_2_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_pd_server_2_port_vlan_requirements: + type: list required: true status: SUPPORTED - port_pd_server_port_2_related_networks: + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_2_port_related_networks: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd_server_port_2_network_role_tag: + port_pd_server_2_port_network_role: type: string required: true status: SUPPORTED @@ -7246,18 +7256,8 @@ node_types: description: Flavor for PD server required: true status: SUPPORTED - port_pd_server_port_1_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd_server_port_2_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_pd_server_port_1_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_1_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED attributes: @@ -7266,27 +7266,27 @@ node_types: description: pattern4_attr_1_value status: SUPPORTED requirements: - - dependency_pd_server_port_1: + - dependency_pd_server_2_port: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_port_1: + - link_pd_server_2_port: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_pd_server_port_2: + - dependency_pd_server_1_port: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_port_2: + - link_pd_server_1_port: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -7307,6 +7307,17 @@ node_types: - 0 - UNBOUNDED capabilities: + feature_pd_server_2_port: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets.rate_pd_server_1_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.iops_server_pd: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -7319,43 +7330,61 @@ node_types: occurrences: - 1 - UNBOUNDED - memory.resident_server_pd: + network.outgoing.bytes_pd_server_2_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_util_server_pd: + network.outgoing.packets.rate_pd_server_2_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.incoming.bytes_pd_server_port_1: + memory.resident_server_pd: 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_pd_server_port_2: + binding_pd_server_1_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 + cpu_util_server_pd: 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_server_pd: + attachment_pd_server_2_port: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets_pd_server_2_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.incoming.bytes.rate_pd_server_port_1: + disk.device.read.requests_server_pd: 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_pd_server_port_2: + forwarder_pd_server_1_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + network.outgoing.packets.rate_pd_server_1_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: @@ -7390,23 +7419,13 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_port_2: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - network.incoming.packets_pd_server_port_2: + network.outpoing.packets_pd_server_2_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 - attachment_pd_server_port_1: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - network.incoming.packets_pd_server_port_1: + network.incoming.bytes_pd_server_2_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: @@ -7448,35 +7467,43 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_port_1: - type: tosca.capabilities.Node + network.outpoing.packets_pd_server_1_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_pd_server_port_2: - type: tosca.capabilities.Node + binding_pd_server_2_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: - - 1 + - 0 - UNBOUNDED - disk.read.bytes_server_pd: + network.incoming.packets.rate_pd_server_2_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.device.read.bytes_server_pd: + disk.read.bytes_server_pd: 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_pd_server_port_2: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_pd_server_2_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + feature_pd_server_1_port: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_port_1: + disk.device.read.bytes_server_pd: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -7488,21 +7515,11 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_port_2: - 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 - binding_pd_server_port_1: - 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 + network.incoming.bytes.rate_pd_server_2_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: - - 0 + - 1 - UNBOUNDED cpu.delta_server_pd: type: org.openecomp.capabilities.metric.Ceilometer @@ -7517,7 +7534,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_port_1: + network.incoming.bytes.rate_pd_server_1_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: @@ -7535,37 +7552,25 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_port_2: - 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.packets.rate_pd_server_port_2: - 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_server_pd: 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.packets.rate_pd_server_port_1: + disk.device.write.bytes.rate_server_pd: 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_server_pd: + disk.write.requests.rate_server_pd: 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_server_pd: + network.outgoing.bytes.rate_pd_server_2_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: @@ -7577,19 +7582,18 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_port_2: + disk.device.iops_server_pd: 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.iops_server_pd: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_pd_server_1_port: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_port_1: + network.incoming.packets_pd_server_1_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: @@ -7612,30 +7616,19 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_server_pd: - type: tosca.capabilities.network.Bindable - occurrences: - - 1 - - UNBOUNDED - scalable_server_pd: - type: tosca.capabilities.Scalable - occurrences: - - 1 - - UNBOUNDED - network.outgoing.bytes.rate_pd_server_port_2: + network.outgoing.bytes_pd_server_1_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 - forwarder_pd_server_port_1: - type: org.openecomp.capabilities.Forwarder + binding_server_pd: + type: tosca.capabilities.network.Bindable occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_port_1: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + scalable_server_pd: + type: tosca.capabilities.Scalable occurrences: - 1 - UNBOUNDED @@ -7651,13 +7644,14 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_pd_server_port_2: - type: org.openecomp.capabilities.Forwarder + feature_server_pd: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - feature_server_pd: - type: tosca.capabilities.Node + network.outgoing.bytes.rate_pd_server_1_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 @@ -7679,6 +7673,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes_pd_server_1_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.device.write.bytes_server_pd: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -7694,71 +7694,73 @@ node_types: org.openecomp.resource.abstract.nodes.cmaui_1c1: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_cmaui_port_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_cmaui_port_fixed_ips: + port_cmaui_1c1_mgmt_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_cmaui_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true + type: org.openecomp.datatypes.network.IpRequirements + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 status: SUPPORTED - port_cmaui_port_network: + constraints: + - greater_or_equal: 0 + port_cmaui_1c1_mgmt_port_0_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_cmaui_port_related_networks: + port_cmaui_1c1_mgmt_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - status: SUPPORTED - constraints: - - greater_or_equal: 0 + type: org.openecomp.datatypes.network.VlanRequirements compute_cmaui_1c1_availability_zone: type: list required: true status: SUPPORTED entry_schema: type: string - port_cmaui_port_network_role_tag: - type: string + port_cmaui_1c1_mgmt_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_cmaui_port_order: - type: integer + port_cmaui_1c1_mgmt_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED vm_flavor_name: type: string required: true status: SUPPORTED - port_cmaui_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_cmaui_1c1_mgmt_port_0_fixed_ips: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_cmaui_1c1_mgmt_port_0_network_role: + type: string required: true status: SUPPORTED - port_cmaui_port_replacement_policy: + port_cmaui_1c1_mgmt_port_0_replacement_policy: type: list required: true status: SUPPORTED entry_schema: type: string - port_cmaui_port_network_role: + port_cmaui_1c1_mgmt_port_0_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_cmaui_1c1_mgmt_port_0_network_role_tag: type: string required: true status: SUPPORTED @@ -7766,35 +7768,33 @@ node_types: type: string required: true status: SUPPORTED - port_cmaui_port_ip_requirements: - type: list + port_cmaui_1c1_mgmt_port_0_order: + type: integer + required: true + status: SUPPORTED + port_cmaui_1c1_mgmt_port_0_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements compute_cmaui_1c1_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_cmaui_port_subnetpoolid: - type: string - required: true - status: SUPPORTED attributes: cmaui_1c1_accessIPv4: type: string status: SUPPORTED requirements: - - dependency_cmaui_1c1_cmaui_port: + - dependency_cmaui_1c1_cmaui_1c1_mgmt_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_cmaui_1c1_cmaui_port: + - link_cmaui_1c1_cmaui_1c1_mgmt_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -7815,14 +7815,6 @@ node_types: - 0 - UNBOUNDED capabilities: - binding_cmaui_1c1_cmaui_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 disk.iops_cmaui_1c1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -7846,49 +7838,50 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_cmaui_1c1_cmaui_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_cmaui_1c1_cmaui_1c1_mgmt_port_0: + 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: - - 1 + - 0 - UNBOUNDED - network.incoming.packets_cmaui_1c1_cmaui_port: + network.outgoing.bytes.rate_cmaui_1c1_cmaui_1c1_mgmt_port_0: 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_cmaui_1c1_cmaui_port: + network.outgoing.bytes_cmaui_1c1_cmaui_1c1_mgmt_port_0: 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_cmaui_1c1_cmaui_port: + memory_cmaui_1c1: 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_cmaui_1c1_cmaui_port: + disk.latency_cmaui_1c1: 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_cmaui_1c1: + disk.read.bytes.rate_cmaui_1c1: 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_cmaui_1c1: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_cmaui_1c1_cmaui_1c1_mgmt_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - disk.read.bytes.rate_cmaui_1c1: + network.incoming.packets_cmaui_1c1_cmaui_1c1_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -7924,25 +7917,25 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_cmaui_1c1_cmaui_port: + disk.device.read.bytes.rate_cmaui_1c1: 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_cmaui_1c1: + disk.ephemeral.size_cmaui_1c1: 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.ephemeral.size_cmaui_1c1: + instance_cmaui_1c1: 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 - instance_cmaui_1c1: + network.incoming.packets.rate_cmaui_1c1_cmaui_1c1_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -7954,6 +7947,11 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_cmaui_1c1_cmaui_1c1_mgmt_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.device.write.bytes.rate_cmaui_1c1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -7997,12 +7995,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_cmaui_1c1_cmaui_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.write.bytes.rate_cmaui_1c1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -8043,20 +8035,25 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes_cmaui_1c1_cmaui_1c1_mgmt_port_0: + 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_cmaui_1c1: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_cmaui_1c1_cmaui_port: + disk.allocation_cmaui_1c1: 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.allocation_cmaui_1c1: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_cmaui_1c1_cmaui_1c1_mgmt_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED @@ -8072,8 +8069,9 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_cmaui_1c1_cmaui_port: - type: org.openecomp.capabilities.Forwarder + network.outgoing.packets.rate_cmaui_1c1_cmaui_1c1_mgmt_port_0: + 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 @@ -8089,12 +8087,13 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_cmaui_1c1_cmaui_port: - type: tosca.capabilities.Attachment + disk.usage_cmaui_1c1: + 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_cmaui_1c1: + network.incoming.bytes.rate_cmaui_1c1_cmaui_1c1_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -8117,8 +8116,9 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_cmaui_1c1_cmaui_port: - type: tosca.capabilities.Node + network.outpoing.packets_cmaui_1c1_cmaui_1c1_mgmt_port_0: + 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 @@ -8127,4 +8127,4 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - - UNBOUNDED \ No newline at end of file + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/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 e8dbc5af26..ea071289d3 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 @@ -411,24 +411,24 @@ topology_template: get_attribute: - test_nested_no_compute - no_compute_attr_1 - port_pd_server_port_2_ip_requirements: + port_pd_server_2_port_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false - port_pd_server_port_2_mac_requirements: + port_pd_server_1_port_mac_requirements: mac_count_required: is_required: false - port_pd_server_port_1_ip_requirements: + port_pd_server_2_port_mac_requirements: + mac_count_required: + is_required: false + port_pd_server_1_port_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false - port_pd_server_port_1_mac_requirements: - mac_count_required: - is_required: false test_nested_no_compute: type: org.openecomp.resource.abstract.nodes.heat.nested-no-compute directives: @@ -449,32 +449,30 @@ topology_template: substitute_service_template: nested-pattern-4ServiceTemplate.yaml p2: get_input: p2 - port_pd_server_port_2_ip_requirements: + port_pd_server_2_port_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false - port_pd_server_port_2_mac_requirements: + port_pd_server_1_port_mac_requirements: mac_count_required: is_required: false - port_pd_server_port_1_ip_requirements: + port_pd_server_2_port_mac_requirements: + mac_count_required: + is_required: false + port_pd_server_1_port_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false - port_pd_server_port_1_mac_requirements: - mac_count_required: - is_required: false abstract_osm_server_1c2_0: type: org.openecomp.resource.abstract.nodes.osm_server_1c2 directives: - substitutable properties: - port_osm_port_replacement_policy: - - AUTO - port_osm_port_network: + port_osm_server_1c2_mgmt_port_0_network: - packet_internal_network_2 compute_osm_server_1c2_name: - get_input: @@ -482,24 +480,26 @@ topology_template: - 0 vm_flavor_name: get_input: osm_server_1c2_flavor - port_osm_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: + port_osm_server_1c2_mgmt_port_0_replacement_policy: + - AUTO + port_osm_server_1c2_mgmt_port_0_mac_requirements: + mac_count_required: is_required: false - port_osm_port_fixed_ips: + vm_image_name: + get_input: osm_server_1c2_image + port_osm_server_1c2_mgmt_port_0_fixed_ips: - ip_address: get_input: - BE_osm_ips - 1 - vm_image_name: - get_input: osm_server_1c2_image - port_osm_port_mac_requirements: - mac_count_required: - is_required: false compute_osm_server_1c2_availability_zone: - get_input: availability_zone_0 + port_osm_server_1c2_mgmt_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false service_template_filter: substitute_service_template: Nested_osm_server_1c2ServiceTemplate.yaml count: 1 @@ -509,7 +509,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_osm_server_1c2_osm_port: + - link_osm_server_1c2_osm_server_1c2_mgmt_port_0: capability: tosca.capabilities.network.Linkable node: packet_internal_network_2 relationship: tosca.relationships.network.LinksTo @@ -518,9 +518,7 @@ topology_template: directives: - substitutable properties: - port_osm_port_replacement_policy: - - AUTO - port_osm_port_network: + port_osm_server_1c2_mgmt_port_0_network: - packet_external_network_2 compute_osm_server_1c2_name: - get_input: @@ -528,22 +526,18 @@ topology_template: - 1 vm_flavor_name: get_input: osm_server_1c2_flavor - port_osm_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: + port_osm_server_1c2_mgmt_port_0_replacement_policy: + - AUTO + port_osm_server_1c2_mgmt_port_0_mac_requirements: + mac_count_required: is_required: false - port_osm_port_fixed_ips: + vm_image_name: + get_input: osm_server_1c2_image + port_osm_server_1c2_mgmt_port_0_fixed_ips: - ip_address: get_input: - BE_osm_ips - 1 - vm_image_name: - get_input: osm_server_1c2_image - port_osm_port_mac_requirements: - mac_count_required: - is_required: false compute_osm_server_1c2_metadata: - connectivity_to_server_1c1_BE_1: get_attribute: @@ -563,6 +557,12 @@ topology_template: - rd_server_1b_accessIPv4 compute_osm_server_1c2_availability_zone: - get_input: availability_zone_0 + port_osm_server_1c2_mgmt_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false service_template_filter: substitute_service_template: Nested_osm_server_1c2ServiceTemplate.yaml count: 1 @@ -572,7 +572,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_osm_server_1c2_osm_port: + - link_osm_server_1c2_osm_server_1c2_mgmt_port_0: capability: tosca.capabilities.network.Linkable node: packet_external_network_2 relationship: tosca.relationships.network.LinksTo @@ -593,10 +593,16 @@ topology_template: properties: vm_flavor_name: get_input: BE_1c1_flavor - port_BE_port_mac_requirements: - mac_count_required: + port_BE_1c1_mgmt_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: is_required: false - port_BE_port_fixed_ips: + compute_BE_1c1_availability_zone: + - get_input: availability_zone_0 + - get_input: availability_zone_0 + port_BE_1c1_mgmt_port_0_fixed_ips: - - ip_address: get_input: - BE_osm_ips @@ -605,20 +611,17 @@ topology_template: get_input: - BE_osm_ips - 0 - compute_BE_1c1_availability_zone: - - get_input: availability_zone_0 - - get_input: availability_zone_0 - port_BE_port_network: + port_BE_1c1_mgmt_port_0_network: - packet_internal_network_2 - packet_internal_network_2 - port_BE_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false vm_image_name: get_input: BE_1c1_image + port_BE_1c1_mgmt_port_0_replacement_policy: + - AUTO + - AUTO + port_BE_1c1_mgmt_port_0_mac_requirements: + mac_count_required: + is_required: false compute_BE_1c1_name: - get_input: - BE_1c1_names @@ -626,9 +629,6 @@ topology_template: - get_input: - BE_1c1_names - 0 - port_BE_port_replacement_policy: - - AUTO - - AUTO service_template_filter: substitute_service_template: Nested_BE_1c1ServiceTemplate.yaml count: 2 @@ -638,7 +638,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_BE_1c1_BE_port: + - link_BE_1c1_BE_1c1_mgmt_port_0: capability: tosca.capabilities.network.Linkable node: packet_internal_network_2 relationship: tosca.relationships.network.LinksTo @@ -689,4 +689,4 @@ topology_template: value: get_attribute: - abstract_osm_server_1c2_1 - - osm_server_1c2_accessIPv4 \ No newline at end of file + - osm_server_1c2_accessIPv4 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/Nested_BE_1c1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_BE_1c1ServiceTemplate.yaml index 5833cce311..b6584b992e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_BE_1c1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_BE_1c1ServiceTemplate.yaml @@ -11,12 +11,14 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_BE_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_BE_port_network_role: + port_BE_1c1_mgmt_port_0_network_role: type: string required: true + port_BE_1c1_mgmt_port_0_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements index_value: type: integer description: Index value of this substitution service template runtime instance @@ -24,119 +26,117 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_BE_port_order: + port_BE_1c1_mgmt_port_0_order: type: integer required: true - port_BE_port_subnetpoolid: - type: string - required: true vm_flavor_name: type: string required: true - port_BE_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_BE_port_fixed_ips: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_BE_port_vlan_requirements: + port_BE_1c1_mgmt_port_0_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.IpRequirements compute_BE_1c1_availability_zone: type: list required: true entry_schema: type: string - port_BE_port_network: + port_BE_1c1_mgmt_port_0_subnetpoolid: + type: string + required: true + port_BE_1c1_mgmt_port_0_fixed_ips: type: list required: true entry_schema: - type: string - port_BE_port_ip_requirements: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_BE_1c1_mgmt_port_0_related_networks: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_BE_port_network_role_tag: - type: string - required: true - port_BE_port_related_networks: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_BE_1c1_mgmt_port_0_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments + type: string + port_BE_1c1_mgmt_port_0_network_role_tag: + type: string + required: true vm_image_name: type: string required: true - compute_BE_1c1_name: + port_BE_1c1_mgmt_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_BE_1c1_mgmt_port_0_replacement_policy: type: list required: true entry_schema: type: string - port_BE_port_replacement_policy: + port_BE_1c1_mgmt_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + compute_BE_1c1_name: type: list required: true entry_schema: type: string node_templates: - BE_1c1_BE_port: + BE_1c1: + type: org.openecomp.resource.vfc.compute.nodes.heat.BE_1c1 + properties: + availability_zone: + get_input: + - compute_BE_1c1_availability_zone + - index_value + flavor: + get_input: vm_flavor_name + image: + get_input: vm_image_name + name: + get_input: + - compute_BE_1c1_name + - index_value + BE_1c1_BE_1c1_mgmt_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_BE_port_replacement_policy + - port_BE_1c1_mgmt_port_0_replacement_policy - index_value mac_requirements: - get_input: port_BE_port_mac_requirements + get_input: port_BE_1c1_mgmt_port_0_mac_requirements order: - get_input: port_BE_port_order + get_input: port_BE_1c1_mgmt_port_0_order exCP_naming: - get_input: port_BE_port_exCP_naming + get_input: port_BE_1c1_mgmt_port_0_exCP_naming vlan_requirements: - get_input: port_BE_port_vlan_requirements + get_input: port_BE_1c1_mgmt_port_0_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_BE_port_ip_requirements + get_input: port_BE_1c1_mgmt_port_0_ip_requirements related_networks: - get_input: port_BE_port_related_networks + get_input: port_BE_1c1_mgmt_port_0_related_networks network_role_tag: - get_input: port_BE_port_network_role_tag + get_input: port_BE_1c1_mgmt_port_0_network_role_tag network_role: - get_input: port_BE_port_network_role + get_input: port_BE_1c1_mgmt_port_0_network_role fixed_ips: get_input: - - port_BE_port_fixed_ips + - port_BE_1c1_mgmt_port_0_fixed_ips - index_value subnetpoolid: - get_input: port_BE_port_subnetpoolid + get_input: port_BE_1c1_mgmt_port_0_subnetpoolid network: get_input: - - port_BE_port_network + - port_BE_1c1_mgmt_port_0_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: BE_1c1 relationship: tosca.relationships.network.BindsTo - BE_1c1: - type: org.openecomp.resource.vfc.compute.nodes.heat.BE_1c1 - properties: - availability_zone: - get_input: - - compute_BE_1c1_availability_zone - - index_value - flavor: - get_input: vm_flavor_name - image: - get_input: vm_image_name - name: - get_input: - - compute_BE_1c1_name - - index_value outputs: BE_1c1_accessIPv4: type: string @@ -159,9 +159,6 @@ topology_template: endpoint_BE_1c1: - BE_1c1 - endpoint - network.outpoing.packets_BE_1c1_BE_port: - - BE_1c1_BE_port - - network.outpoing.packets disk.device.write.requests_BE_1c1: - BE_1c1 - disk.device.write.requests @@ -171,15 +168,12 @@ topology_template: vcpus_BE_1c1: - BE_1c1 - vcpus - network.incoming.packets.rate_BE_1c1_BE_port: - - BE_1c1_BE_port - - network.incoming.packets.rate - attachment_BE_1c1_BE_port: - - BE_1c1_BE_port - - attachment - network.incoming.bytes_BE_1c1_BE_port: - - BE_1c1_BE_port - - network.incoming.bytes + feature_BE_1c1_BE_1c1_mgmt_port_0: + - BE_1c1_BE_1c1_mgmt_port_0 + - feature + network.incoming.packets_BE_1c1_BE_1c1_mgmt_port_0: + - BE_1c1_BE_1c1_mgmt_port_0 + - network.incoming.packets disk.capacity_BE_1c1: - BE_1c1 - disk.capacity @@ -195,24 +189,18 @@ topology_template: disk.write.bytes_BE_1c1: - BE_1c1 - disk.write.bytes - network.outgoing.packets.rate_BE_1c1_BE_port: - - BE_1c1_BE_port - - network.outgoing.packets.rate - binding_BE_1c1_BE_port: - - BE_1c1_BE_port - - binding disk.device.usage_BE_1c1: - BE_1c1 - disk.device.usage disk.device.read.requests.rate_BE_1c1: - BE_1c1 - disk.device.read.requests.rate - network.outgoing.bytes.rate_BE_1c1_BE_port: - - BE_1c1_BE_port - - network.outgoing.bytes.rate scalable_BE_1c1: - BE_1c1 - scalable + network.outgoing.bytes.rate_BE_1c1_BE_1c1_mgmt_port_0: + - BE_1c1_BE_1c1_mgmt_port_0 + - network.outgoing.bytes.rate disk.read.requests_BE_1c1: - BE_1c1 - disk.read.requests @@ -225,18 +213,18 @@ topology_template: memory.usage_BE_1c1: - BE_1c1 - memory.usage - network.incoming.packets_BE_1c1_BE_port: - - BE_1c1_BE_port - - network.incoming.packets - forwarder_BE_1c1_BE_port: - - BE_1c1_BE_port - - forwarder + network.outgoing.bytes_BE_1c1_BE_1c1_mgmt_port_0: + - BE_1c1_BE_1c1_mgmt_port_0 + - network.outgoing.bytes disk.device.latency_BE_1c1: - BE_1c1 - disk.device.latency disk.device.read.requests_BE_1c1: - BE_1c1 - disk.device.read.requests + network.incoming.packets.rate_BE_1c1_BE_1c1_mgmt_port_0: + - BE_1c1_BE_1c1_mgmt_port_0 + - network.incoming.packets.rate memory.resident_BE_1c1: - BE_1c1 - memory.resident @@ -255,21 +243,36 @@ topology_template: disk.read.bytes.rate_BE_1c1: - BE_1c1 - disk.read.bytes.rate + binding_BE_1c1_BE_1c1_mgmt_port_0: + - BE_1c1_BE_1c1_mgmt_port_0 + - binding + forwarder_BE_1c1_BE_1c1_mgmt_port_0: + - BE_1c1_BE_1c1_mgmt_port_0 + - forwarder disk.device.iops_BE_1c1: - BE_1c1 - disk.device.iops disk.root.size_BE_1c1: - BE_1c1 - disk.root.size - network.incoming.bytes.rate_BE_1c1_BE_port: - - BE_1c1_BE_port - - network.incoming.bytes.rate + network.outgoing.packets.rate_BE_1c1_BE_1c1_mgmt_port_0: + - BE_1c1_BE_1c1_mgmt_port_0 + - network.outgoing.packets.rate + attachment_BE_1c1_BE_1c1_mgmt_port_0: + - BE_1c1_BE_1c1_mgmt_port_0 + - attachment cpu_BE_1c1: - BE_1c1 - cpu cpu.delta_BE_1c1: - BE_1c1 - cpu.delta + network.incoming.bytes.rate_BE_1c1_BE_1c1_mgmt_port_0: + - BE_1c1_BE_1c1_mgmt_port_0 + - network.incoming.bytes.rate + network.outpoing.packets_BE_1c1_BE_1c1_mgmt_port_0: + - BE_1c1_BE_1c1_mgmt_port_0 + - network.outpoing.packets disk.write.requests.rate_BE_1c1: - BE_1c1 - disk.write.requests.rate @@ -279,6 +282,9 @@ topology_template: feature_BE_1c1: - BE_1c1 - feature + network.incoming.bytes_BE_1c1_BE_1c1_mgmt_port_0: + - BE_1c1_BE_1c1_mgmt_port_0 + - network.incoming.bytes disk.write.bytes.rate_BE_1c1: - BE_1c1 - disk.write.bytes.rate @@ -288,18 +294,12 @@ topology_template: disk.device.read.bytes_BE_1c1: - BE_1c1 - disk.device.read.bytes - feature_BE_1c1_BE_port: - - BE_1c1_BE_port - - feature disk.device.read.bytes.rate_BE_1c1: - BE_1c1 - disk.device.read.bytes.rate disk.device.capacity_BE_1c1: - BE_1c1 - disk.device.capacity - network.outgoing.bytes_BE_1c1_BE_port: - - BE_1c1_BE_port - - network.outgoing.bytes disk.latency_BE_1c1: - BE_1c1 - disk.latency @@ -307,15 +307,15 @@ topology_template: - BE_1c1 - cpu_util requirements: - link_BE_1c1_BE_port: - - BE_1c1_BE_port - - link local_storage_BE_1c1: - BE_1c1 - local_storage - dependency_BE_1c1_BE_port: - - BE_1c1_BE_port - - dependency dependency_BE_1c1: - BE_1c1 - - dependency \ No newline at end of file + - dependency + dependency_BE_1c1_BE_1c1_mgmt_port_0: + - BE_1c1_BE_1c1_mgmt_port_0 + - dependency + link_BE_1c1_BE_1c1_mgmt_port_0: + - BE_1c1_BE_1c1_mgmt_port_0 + - link 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/Nested_cmaui_1c1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_cmaui_1c1ServiceTemplate.yaml index 334e680cc5..b7135a12b7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_cmaui_1c1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_cmaui_1c1ServiceTemplate.yaml @@ -11,29 +11,11 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_cmaui_port_vlan_requirements: + port_cmaui_1c1_mgmt_port_0_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_cmaui_port_fixed_ips: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_cmaui_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_cmaui_port_network: - type: list - required: true - entry_schema: - type: string - port_cmaui_port_related_networks: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments + type: org.openecomp.datatypes.network.IpRequirements index_value: type: integer description: Index value of this substitution service template runtime instance @@ -41,81 +23,99 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 + port_cmaui_1c1_mgmt_port_0_network: + type: list + required: true + entry_schema: + type: string + port_cmaui_1c1_mgmt_port_0_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements compute_cmaui_1c1_availability_zone: type: list required: true entry_schema: type: string - port_cmaui_port_network_role_tag: - type: string + port_cmaui_1c1_mgmt_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - port_cmaui_port_order: - type: integer + port_cmaui_1c1_mgmt_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true vm_flavor_name: type: string required: true - port_cmaui_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_cmaui_1c1_mgmt_port_0_fixed_ips: + type: list required: true - port_cmaui_port_replacement_policy: + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_cmaui_1c1_mgmt_port_0_network_role: + type: string + required: true + port_cmaui_1c1_mgmt_port_0_replacement_policy: type: list required: true entry_schema: type: string - port_cmaui_port_network_role: + port_cmaui_1c1_mgmt_port_0_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_cmaui_1c1_mgmt_port_0_network_role_tag: type: string required: true vm_image_name: type: string required: true - port_cmaui_port_ip_requirements: - type: list + port_cmaui_1c1_mgmt_port_0_order: + type: integer + required: true + port_cmaui_1c1_mgmt_port_0_subnetpoolid: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements compute_cmaui_1c1_name: type: list required: true entry_schema: type: string - port_cmaui_port_subnetpoolid: - type: string - required: true node_templates: - cmaui_1c1_cmaui_port: + cmaui_1c1_cmaui_1c1_mgmt_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_cmaui_port_replacement_policy + - port_cmaui_1c1_mgmt_port_0_replacement_policy - index_value mac_requirements: - get_input: port_cmaui_port_mac_requirements + get_input: port_cmaui_1c1_mgmt_port_0_mac_requirements order: - get_input: port_cmaui_port_order + get_input: port_cmaui_1c1_mgmt_port_0_order exCP_naming: - get_input: port_cmaui_port_exCP_naming + get_input: port_cmaui_1c1_mgmt_port_0_exCP_naming vlan_requirements: - get_input: port_cmaui_port_vlan_requirements + get_input: port_cmaui_1c1_mgmt_port_0_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_cmaui_port_ip_requirements + get_input: port_cmaui_1c1_mgmt_port_0_ip_requirements related_networks: - get_input: port_cmaui_port_related_networks + get_input: port_cmaui_1c1_mgmt_port_0_related_networks network_role_tag: - get_input: port_cmaui_port_network_role_tag + get_input: port_cmaui_1c1_mgmt_port_0_network_role_tag network_role: - get_input: port_cmaui_port_network_role + get_input: port_cmaui_1c1_mgmt_port_0_network_role fixed_ips: get_input: - - port_cmaui_port_fixed_ips + - port_cmaui_1c1_mgmt_port_0_fixed_ips - index_value subnetpoolid: - get_input: port_cmaui_port_subnetpoolid + get_input: port_cmaui_1c1_mgmt_port_0_subnetpoolid network: get_input: - - port_cmaui_port_network + - port_cmaui_1c1_mgmt_port_0_network - index_value requirements: - binding: @@ -147,9 +147,6 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.cmaui_1c1 capabilities: - binding_cmaui_1c1_cmaui_port: - - cmaui_1c1_cmaui_port - - binding disk.iops_cmaui_1c1: - cmaui_1c1 - disk.iops @@ -162,21 +159,15 @@ topology_template: endpoint_cmaui_1c1: - cmaui_1c1 - endpoint - network.incoming.bytes.rate_cmaui_1c1_cmaui_port: - - cmaui_1c1_cmaui_port - - network.incoming.bytes.rate - network.incoming.packets_cmaui_1c1_cmaui_port: - - cmaui_1c1_cmaui_port - - network.incoming.packets - network.outgoing.bytes_cmaui_1c1_cmaui_port: - - cmaui_1c1_cmaui_port - - network.outgoing.bytes - network.outgoing.bytes.rate_cmaui_1c1_cmaui_port: - - cmaui_1c1_cmaui_port + binding_cmaui_1c1_cmaui_1c1_mgmt_port_0: + - cmaui_1c1_cmaui_1c1_mgmt_port_0 + - binding + network.outgoing.bytes.rate_cmaui_1c1_cmaui_1c1_mgmt_port_0: + - cmaui_1c1_cmaui_1c1_mgmt_port_0 - network.outgoing.bytes.rate - network.outpoing.packets_cmaui_1c1_cmaui_port: - - cmaui_1c1_cmaui_port - - network.outpoing.packets + network.outgoing.bytes_cmaui_1c1_cmaui_1c1_mgmt_port_0: + - cmaui_1c1_cmaui_1c1_mgmt_port_0 + - network.outgoing.bytes memory_cmaui_1c1: - cmaui_1c1 - memory @@ -186,6 +177,12 @@ topology_template: disk.read.bytes.rate_cmaui_1c1: - cmaui_1c1 - disk.read.bytes.rate + attachment_cmaui_1c1_cmaui_1c1_mgmt_port_0: + - cmaui_1c1_cmaui_1c1_mgmt_port_0 + - attachment + network.incoming.packets_cmaui_1c1_cmaui_1c1_mgmt_port_0: + - cmaui_1c1_cmaui_1c1_mgmt_port_0 + - network.incoming.packets disk.write.requests.rate_cmaui_1c1: - cmaui_1c1 - disk.write.requests.rate @@ -201,9 +198,6 @@ topology_template: cpu_util_cmaui_1c1: - cmaui_1c1 - cpu_util - network.outgoing.packets.rate_cmaui_1c1_cmaui_port: - - cmaui_1c1_cmaui_port - - network.outgoing.packets.rate disk.device.read.bytes.rate_cmaui_1c1: - cmaui_1c1 - disk.device.read.bytes.rate @@ -213,9 +207,15 @@ topology_template: instance_cmaui_1c1: - cmaui_1c1 - instance + network.incoming.packets.rate_cmaui_1c1_cmaui_1c1_mgmt_port_0: + - cmaui_1c1_cmaui_1c1_mgmt_port_0 + - network.incoming.packets.rate disk.device.read.requests_cmaui_1c1: - cmaui_1c1 - disk.device.read.requests + feature_cmaui_1c1_cmaui_1c1_mgmt_port_0: + - cmaui_1c1_cmaui_1c1_mgmt_port_0 + - feature disk.device.write.bytes.rate_cmaui_1c1: - cmaui_1c1 - disk.device.write.bytes.rate @@ -237,9 +237,6 @@ topology_template: disk.device.latency_cmaui_1c1: - cmaui_1c1 - disk.device.latency - network.incoming.bytes_cmaui_1c1_cmaui_port: - - cmaui_1c1_cmaui_port - - network.incoming.bytes disk.write.bytes.rate_cmaui_1c1: - cmaui_1c1 - disk.write.bytes.rate @@ -261,36 +258,39 @@ topology_template: disk.device.read.requests.rate_cmaui_1c1: - cmaui_1c1 - disk.device.read.requests.rate + network.incoming.bytes_cmaui_1c1_cmaui_1c1_mgmt_port_0: + - cmaui_1c1_cmaui_1c1_mgmt_port_0 + - network.incoming.bytes feature_cmaui_1c1: - cmaui_1c1 - feature - network.incoming.packets.rate_cmaui_1c1_cmaui_port: - - cmaui_1c1_cmaui_port - - network.incoming.packets.rate disk.allocation_cmaui_1c1: - cmaui_1c1 - disk.allocation + forwarder_cmaui_1c1_cmaui_1c1_mgmt_port_0: + - cmaui_1c1_cmaui_1c1_mgmt_port_0 + - forwarder disk.device.allocation_cmaui_1c1: - cmaui_1c1 - disk.device.allocation disk.device.write.requests.rate_cmaui_1c1: - cmaui_1c1 - disk.device.write.requests.rate - forwarder_cmaui_1c1_cmaui_port: - - cmaui_1c1_cmaui_port - - forwarder + network.outgoing.packets.rate_cmaui_1c1_cmaui_1c1_mgmt_port_0: + - cmaui_1c1_cmaui_1c1_mgmt_port_0 + - network.outgoing.packets.rate disk.device.write.bytes_cmaui_1c1: - cmaui_1c1 - disk.device.write.bytes memory.resident_cmaui_1c1: - cmaui_1c1 - memory.resident - attachment_cmaui_1c1_cmaui_port: - - cmaui_1c1_cmaui_port - - attachment disk.usage_cmaui_1c1: - cmaui_1c1 - disk.usage + network.incoming.bytes.rate_cmaui_1c1_cmaui_1c1_mgmt_port_0: + - cmaui_1c1_cmaui_1c1_mgmt_port_0 + - network.incoming.bytes.rate disk.read.requests_cmaui_1c1: - cmaui_1c1 - disk.read.requests @@ -300,22 +300,22 @@ topology_template: vcpus_cmaui_1c1: - cmaui_1c1 - vcpus - feature_cmaui_1c1_cmaui_port: - - cmaui_1c1_cmaui_port - - feature + network.outpoing.packets_cmaui_1c1_cmaui_1c1_mgmt_port_0: + - cmaui_1c1_cmaui_1c1_mgmt_port_0 + - network.outpoing.packets cpu.delta_cmaui_1c1: - cmaui_1c1 - cpu.delta requirements: - dependency_cmaui_1c1_cmaui_port: - - cmaui_1c1_cmaui_port - - dependency + link_cmaui_1c1_cmaui_1c1_mgmt_port_0: + - cmaui_1c1_cmaui_1c1_mgmt_port_0 + - link dependency_cmaui_1c1: - cmaui_1c1 - dependency - link_cmaui_1c1_cmaui_port: - - cmaui_1c1_cmaui_port - - link + dependency_cmaui_1c1_cmaui_1c1_mgmt_port_0: + - cmaui_1c1_cmaui_1c1_mgmt_port_0 + - dependency local_storage_cmaui_1c1: - cmaui_1c1 - - local_storage \ No newline at end of file + - local_storage 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/Nested_oam_server_1c2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_oam_server_1c2ServiceTemplate.yaml index 5ad7f5d029..0b256d91f8 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_oam_server_1c2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_oam_server_1c2ServiceTemplate.yaml @@ -11,14 +11,21 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_oam_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_oam_server_1c2_mgmt_port_0_vlan_requirements: + type: list required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements compute_oam_server_1c2_name: type: list required: true entry_schema: type: string + port_oam_server_1c2_mgmt_port_0_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments index_value: type: integer description: Index value of this substitution service template runtime instance @@ -26,38 +33,30 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_oam_port_network: + port_oam_server_1c2_mgmt_port_0_network_role_tag: + type: string + required: true + port_oam_server_1c2_mgmt_port_0_ip_requirements: type: list required: true entry_schema: - type: string - port_oam_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_oam_port_order: - type: integer - required: true - port_oam_port_subnetpoolid: - type: string - required: true - port_oam_port_related_networks: + type: org.openecomp.datatypes.network.IpRequirements + port_oam_server_1c2_mgmt_port_0_fixed_ips: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments + type: org.openecomp.datatypes.heat.neutron.port.FixedIps vm_flavor_name: type: string required: true + port_oam_server_1c2_mgmt_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true compute_oam_server_1c2_availability_zone: type: list required: true entry_schema: type: string - port_oam_port_fixed_ips: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps vm_image_name: type: string required: true @@ -66,86 +65,87 @@ topology_template: required: true entry_schema: type: json - port_oam_port_vlan_requirements: + port_oam_server_1c2_mgmt_port_0_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_oam_port_ip_requirements: - type: list + type: string + port_oam_server_1c2_mgmt_port_0_order: + type: integer required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_oam_port_replacement_policy: + port_oam_server_1c2_mgmt_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_oam_server_1c2_mgmt_port_0_subnetpoolid: + type: string + required: true + port_oam_server_1c2_mgmt_port_0_replacement_policy: type: list required: true entry_schema: type: string - port_oam_port_network_role_tag: - type: string - required: true - port_oam_port_network_role: + port_oam_server_1c2_mgmt_port_0_network_role: type: string required: true node_templates: - oam_server_1c2: - type: org.openecomp.resource.vfc.compute.nodes.heat.oam_server_1c2 - properties: - availability_zone: - get_input: - - compute_oam_server_1c2_availability_zone - - index_value - flavor: - get_input: vm_flavor_name - metadata: - get_input: - - compute_oam_server_1c2_metadata - - index_value - image: - get_input: vm_image_name - name: - get_input: - - compute_oam_server_1c2_name - - index_value - oam_server_1c2_oam_port: + oam_server_1c2_oam_server_1c2_mgmt_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_oam_port_replacement_policy + - port_oam_server_1c2_mgmt_port_0_replacement_policy - index_value mac_requirements: - get_input: port_oam_port_mac_requirements + get_input: port_oam_server_1c2_mgmt_port_0_mac_requirements order: - get_input: port_oam_port_order + get_input: port_oam_server_1c2_mgmt_port_0_order exCP_naming: - get_input: port_oam_port_exCP_naming + get_input: port_oam_server_1c2_mgmt_port_0_exCP_naming vlan_requirements: - get_input: port_oam_port_vlan_requirements + get_input: port_oam_server_1c2_mgmt_port_0_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_oam_port_ip_requirements + get_input: port_oam_server_1c2_mgmt_port_0_ip_requirements related_networks: - get_input: port_oam_port_related_networks + get_input: port_oam_server_1c2_mgmt_port_0_related_networks network_role_tag: - get_input: port_oam_port_network_role_tag + get_input: port_oam_server_1c2_mgmt_port_0_network_role_tag network_role: - get_input: port_oam_port_network_role + get_input: port_oam_server_1c2_mgmt_port_0_network_role fixed_ips: get_input: - - port_oam_port_fixed_ips + - port_oam_server_1c2_mgmt_port_0_fixed_ips - index_value subnetpoolid: - get_input: port_oam_port_subnetpoolid + get_input: port_oam_server_1c2_mgmt_port_0_subnetpoolid network: get_input: - - port_oam_port_network + - port_oam_server_1c2_mgmt_port_0_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: oam_server_1c2 relationship: tosca.relationships.network.BindsTo + oam_server_1c2: + type: org.openecomp.resource.vfc.compute.nodes.heat.oam_server_1c2 + properties: + availability_zone: + get_input: + - compute_oam_server_1c2_availability_zone + - index_value + flavor: + get_input: vm_flavor_name + metadata: + get_input: + - compute_oam_server_1c2_metadata + - index_value + image: + get_input: vm_image_name + name: + get_input: + - compute_oam_server_1c2_name + - index_value outputs: oam_server_1c2_accessIPv4: type: string @@ -174,27 +174,18 @@ topology_template: disk.device.write.bytes.rate_oam_server_1c2: - oam_server_1c2 - disk.device.write.bytes.rate - network.outgoing.packets.rate_oam_server_1c2_oam_port: - - oam_server_1c2_oam_port - - network.outgoing.packets.rate - network.outpoing.packets_oam_server_1c2_oam_port: - - oam_server_1c2_oam_port - - network.outpoing.packets cpu_util_oam_server_1c2: - oam_server_1c2 - cpu_util disk.device.write.bytes_oam_server_1c2: - oam_server_1c2 - disk.device.write.bytes + binding_oam_server_1c2_oam_server_1c2_mgmt_port_0: + - oam_server_1c2_oam_server_1c2_mgmt_port_0 + - binding disk.device.allocation_oam_server_1c2: - oam_server_1c2 - disk.device.allocation - attachment_oam_server_1c2_oam_port: - - oam_server_1c2_oam_port - - attachment - network.incoming.bytes.rate_oam_server_1c2_oam_port: - - oam_server_1c2_oam_port - - network.incoming.bytes.rate disk.root.size_oam_server_1c2: - oam_server_1c2 - disk.root.size @@ -204,33 +195,33 @@ topology_template: disk.read.bytes.rate_oam_server_1c2: - oam_server_1c2 - disk.read.bytes.rate - network.outgoing.bytes_oam_server_1c2_oam_port: - - oam_server_1c2_oam_port - - network.outgoing.bytes + network.outgoing.bytes.rate_oam_server_1c2_oam_server_1c2_mgmt_port_0: + - oam_server_1c2_oam_server_1c2_mgmt_port_0 + - network.outgoing.bytes.rate disk.allocation_oam_server_1c2: - oam_server_1c2 - disk.allocation disk.read.bytes_oam_server_1c2: - oam_server_1c2 - disk.read.bytes - network.incoming.bytes_oam_server_1c2_oam_port: - - oam_server_1c2_oam_port - - network.incoming.bytes - network.outgoing.bytes.rate_oam_server_1c2_oam_port: - - oam_server_1c2_oam_port - - network.outgoing.bytes.rate + network.incoming.packets_oam_server_1c2_oam_server_1c2_mgmt_port_0: + - oam_server_1c2_oam_server_1c2_mgmt_port_0 + - network.incoming.packets + network.incoming.packets.rate_oam_server_1c2_oam_server_1c2_mgmt_port_0: + - oam_server_1c2_oam_server_1c2_mgmt_port_0 + - network.incoming.packets.rate vcpus_oam_server_1c2: - oam_server_1c2 - vcpus disk.device.read.bytes.rate_oam_server_1c2: - oam_server_1c2 - disk.device.read.bytes.rate - network.incoming.packets_oam_server_1c2_oam_port: - - oam_server_1c2_oam_port - - network.incoming.packets cpu_oam_server_1c2: - oam_server_1c2 - cpu + network.outpoing.packets_oam_server_1c2_oam_server_1c2_mgmt_port_0: + - oam_server_1c2_oam_server_1c2_mgmt_port_0 + - network.outpoing.packets disk.write.requests.rate_oam_server_1c2: - oam_server_1c2 - disk.write.requests.rate @@ -249,12 +240,12 @@ topology_template: endpoint_oam_server_1c2: - oam_server_1c2 - endpoint - forwarder_oam_server_1c2_oam_port: - - oam_server_1c2_oam_port - - forwarder disk.ephemeral.size_oam_server_1c2: - oam_server_1c2 - disk.ephemeral.size + feature_oam_server_1c2_oam_server_1c2_mgmt_port_0: + - oam_server_1c2_oam_server_1c2_mgmt_port_0 + - feature memory.resident_oam_server_1c2: - oam_server_1c2 - memory.resident @@ -267,27 +258,30 @@ topology_template: memory.usage_oam_server_1c2: - oam_server_1c2 - memory.usage + attachment_oam_server_1c2_oam_server_1c2_mgmt_port_0: + - oam_server_1c2_oam_server_1c2_mgmt_port_0 + - attachment disk.usage_oam_server_1c2: - oam_server_1c2 - disk.usage - network.incoming.packets.rate_oam_server_1c2_oam_port: - - oam_server_1c2_oam_port - - network.incoming.packets.rate - binding_oam_server_1c2_oam_port: - - oam_server_1c2_oam_port - - binding + network.outgoing.bytes_oam_server_1c2_oam_server_1c2_mgmt_port_0: + - oam_server_1c2_oam_server_1c2_mgmt_port_0 + - network.outgoing.bytes os_oam_server_1c2: - oam_server_1c2 - os + forwarder_oam_server_1c2_oam_server_1c2_mgmt_port_0: + - oam_server_1c2_oam_server_1c2_mgmt_port_0 + - forwarder disk.device.read.requests_oam_server_1c2: - oam_server_1c2 - disk.device.read.requests disk.latency_oam_server_1c2: - oam_server_1c2 - disk.latency - feature_oam_server_1c2_oam_port: - - oam_server_1c2_oam_port - - feature + network.incoming.bytes_oam_server_1c2_oam_server_1c2_mgmt_port_0: + - oam_server_1c2_oam_server_1c2_mgmt_port_0 + - network.incoming.bytes disk.write.requests_oam_server_1c2: - oam_server_1c2 - disk.write.requests @@ -306,6 +300,9 @@ topology_template: disk.write.bytes_oam_server_1c2: - oam_server_1c2 - disk.write.bytes + network.outgoing.packets.rate_oam_server_1c2_oam_server_1c2_mgmt_port_0: + - oam_server_1c2_oam_server_1c2_mgmt_port_0 + - network.outgoing.packets.rate disk.capacity_oam_server_1c2: - oam_server_1c2 - disk.capacity @@ -315,16 +312,19 @@ topology_template: disk.iops_oam_server_1c2: - oam_server_1c2 - disk.iops + network.incoming.bytes.rate_oam_server_1c2_oam_server_1c2_mgmt_port_0: + - oam_server_1c2_oam_server_1c2_mgmt_port_0 + - network.incoming.bytes.rate requirements: local_storage_oam_server_1c2: - oam_server_1c2 - local_storage + dependency_oam_server_1c2_oam_server_1c2_mgmt_port_0: + - oam_server_1c2_oam_server_1c2_mgmt_port_0 + - dependency dependency_oam_server_1c2: - oam_server_1c2 - dependency - link_oam_server_1c2_oam_port: - - oam_server_1c2_oam_port + link_oam_server_1c2_oam_server_1c2_mgmt_port_0: + - oam_server_1c2_oam_server_1c2_mgmt_port_0 - link - dependency_oam_server_1c2_oam_port: - - oam_server_1c2_oam_port - - 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/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_osm_server_1c2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_osm_server_1c2ServiceTemplate.yaml index 867f972c34..f00f07985c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_osm_server_1c2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_osm_server_1c2ServiceTemplate.yaml @@ -11,17 +11,9 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_osm_port_replacement_policy: - type: list - required: true - entry_schema: - type: string - port_osm_port_exCP_naming: + port_osm_server_1c2_mgmt_port_0_exCP_naming: type: org.openecomp.datatypes.Naming required: true - port_osm_port_subnetpoolid: - type: string - required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -29,7 +21,7 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_osm_port_network: + port_osm_server_1c2_mgmt_port_0_network: type: list required: true entry_schema: @@ -39,88 +31,96 @@ topology_template: required: true entry_schema: type: string - port_osm_port_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements vm_flavor_name: type: string required: true - port_osm_port_ip_requirements: + port_osm_server_1c2_mgmt_port_0_replacement_policy: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_osm_port_fixed_ips: + type: string + port_osm_server_1c2_mgmt_port_0_related_networks: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_osm_port_network_role_tag: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_osm_server_1c2_mgmt_port_0_subnetpoolid: type: string required: true - port_osm_port_network_role: - type: string + port_osm_server_1c2_mgmt_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true vm_image_name: type: string required: true - port_osm_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_osm_server_1c2_mgmt_port_0_network_role_tag: + type: string required: true - port_osm_port_order: + port_osm_server_1c2_mgmt_port_0_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_osm_server_1c2_mgmt_port_0_order: type: integer required: true - port_osm_port_related_networks: + port_osm_server_1c2_mgmt_port_0_fixed_ips: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments + type: org.openecomp.datatypes.heat.neutron.port.FixedIps compute_osm_server_1c2_metadata: type: list required: true entry_schema: type: json + port_osm_server_1c2_mgmt_port_0_network_role: + type: string + required: true compute_osm_server_1c2_availability_zone: type: list required: true entry_schema: type: string + port_osm_server_1c2_mgmt_port_0_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements node_templates: - osm_server_1c2_osm_port: + osm_server_1c2_osm_server_1c2_mgmt_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_osm_port_replacement_policy + - port_osm_server_1c2_mgmt_port_0_replacement_policy - index_value mac_requirements: - get_input: port_osm_port_mac_requirements + get_input: port_osm_server_1c2_mgmt_port_0_mac_requirements order: - get_input: port_osm_port_order + get_input: port_osm_server_1c2_mgmt_port_0_order exCP_naming: - get_input: port_osm_port_exCP_naming + get_input: port_osm_server_1c2_mgmt_port_0_exCP_naming vlan_requirements: - get_input: port_osm_port_vlan_requirements + get_input: port_osm_server_1c2_mgmt_port_0_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_osm_port_ip_requirements + get_input: port_osm_server_1c2_mgmt_port_0_ip_requirements related_networks: - get_input: port_osm_port_related_networks + get_input: port_osm_server_1c2_mgmt_port_0_related_networks network_role_tag: - get_input: port_osm_port_network_role_tag + get_input: port_osm_server_1c2_mgmt_port_0_network_role_tag network_role: - get_input: port_osm_port_network_role + get_input: port_osm_server_1c2_mgmt_port_0_network_role fixed_ips: get_input: - - port_osm_port_fixed_ips + - port_osm_server_1c2_mgmt_port_0_fixed_ips - index_value subnetpoolid: - get_input: port_osm_port_subnetpoolid + get_input: port_osm_server_1c2_mgmt_port_0_subnetpoolid network: get_input: - - port_osm_port_network + - port_osm_server_1c2_mgmt_port_0_network - index_value requirements: - binding: @@ -159,12 +159,12 @@ topology_template: endpoint_osm_server_1c2: - osm_server_1c2 - endpoint - feature_osm_server_1c2_osm_port: - - osm_server_1c2_osm_port - - feature os_osm_server_1c2: - osm_server_1c2 - os + feature_osm_server_1c2_osm_server_1c2_mgmt_port_0: + - osm_server_1c2_osm_server_1c2_mgmt_port_0 + - feature disk.device.read.bytes.rate_osm_server_1c2: - osm_server_1c2 - disk.device.read.bytes.rate @@ -186,6 +186,12 @@ topology_template: host_osm_server_1c2: - osm_server_1c2 - host + attachment_osm_server_1c2_osm_server_1c2_mgmt_port_0: + - osm_server_1c2_osm_server_1c2_mgmt_port_0 + - attachment + network.outgoing.bytes_osm_server_1c2_osm_server_1c2_mgmt_port_0: + - osm_server_1c2_osm_server_1c2_mgmt_port_0 + - network.outgoing.bytes memory_osm_server_1c2: - osm_server_1c2 - memory @@ -207,9 +213,12 @@ topology_template: memory.resident_osm_server_1c2: - osm_server_1c2 - memory.resident - attachment_osm_server_1c2_osm_port: - - osm_server_1c2_osm_port - - attachment + forwarder_osm_server_1c2_osm_server_1c2_mgmt_port_0: + - osm_server_1c2_osm_server_1c2_mgmt_port_0 + - forwarder + network.incoming.bytes_osm_server_1c2_osm_server_1c2_mgmt_port_0: + - osm_server_1c2_osm_server_1c2_mgmt_port_0 + - network.incoming.bytes feature_osm_server_1c2: - osm_server_1c2 - feature @@ -219,27 +228,18 @@ topology_template: disk.device.write.requests_osm_server_1c2: - osm_server_1c2 - disk.device.write.requests - network.outgoing.bytes_osm_server_1c2_osm_port: - - osm_server_1c2_osm_port - - network.outgoing.bytes disk.ephemeral.size_osm_server_1c2: - osm_server_1c2 - disk.ephemeral.size disk.allocation_osm_server_1c2: - osm_server_1c2 - disk.allocation - binding_osm_server_1c2_osm_port: - - osm_server_1c2_osm_port - - binding disk.write.bytes_osm_server_1c2: - osm_server_1c2 - disk.write.bytes disk.capacity_osm_server_1c2: - osm_server_1c2 - disk.capacity - network.incoming.bytes_osm_server_1c2_osm_port: - - osm_server_1c2_osm_port - - network.incoming.bytes disk.write.requests_osm_server_1c2: - osm_server_1c2 - disk.write.requests @@ -249,9 +249,12 @@ topology_template: binding_osm_server_1c2: - osm_server_1c2 - binding - network.incoming.packets.rate_osm_server_1c2_osm_port: - - osm_server_1c2_osm_port - - network.incoming.packets.rate + network.outgoing.packets.rate_osm_server_1c2_osm_server_1c2_mgmt_port_0: + - osm_server_1c2_osm_server_1c2_mgmt_port_0 + - network.outgoing.packets.rate + network.incoming.bytes.rate_osm_server_1c2_osm_server_1c2_mgmt_port_0: + - osm_server_1c2_osm_server_1c2_mgmt_port_0 + - network.incoming.bytes.rate scalable_osm_server_1c2: - osm_server_1c2 - scalable @@ -264,6 +267,9 @@ topology_template: disk.read.bytes_osm_server_1c2: - osm_server_1c2 - disk.read.bytes + network.outgoing.bytes.rate_osm_server_1c2_osm_server_1c2_mgmt_port_0: + - osm_server_1c2_osm_server_1c2_mgmt_port_0 + - network.outgoing.bytes.rate disk.root.size_osm_server_1c2: - osm_server_1c2 - disk.root.size @@ -273,9 +279,6 @@ topology_template: memory.usage_osm_server_1c2: - osm_server_1c2 - memory.usage - network.outpoing.packets_osm_server_1c2_osm_port: - - osm_server_1c2_osm_port - - network.outpoing.packets disk.write.bytes.rate_osm_server_1c2: - osm_server_1c2 - disk.write.bytes.rate @@ -285,46 +288,43 @@ topology_template: disk.device.usage_osm_server_1c2: - osm_server_1c2 - disk.device.usage - network.outgoing.packets.rate_osm_server_1c2_osm_port: - - osm_server_1c2_osm_port - - network.outgoing.packets.rate + binding_osm_server_1c2_osm_server_1c2_mgmt_port_0: + - osm_server_1c2_osm_server_1c2_mgmt_port_0 + - binding + network.incoming.packets_osm_server_1c2_osm_server_1c2_mgmt_port_0: + - osm_server_1c2_osm_server_1c2_mgmt_port_0 + - network.incoming.packets + network.incoming.packets.rate_osm_server_1c2_osm_server_1c2_mgmt_port_0: + - osm_server_1c2_osm_server_1c2_mgmt_port_0 + - network.incoming.packets.rate disk.device.read.bytes_osm_server_1c2: - osm_server_1c2 - disk.device.read.bytes - forwarder_osm_server_1c2_osm_port: - - osm_server_1c2_osm_port - - forwarder + network.outpoing.packets_osm_server_1c2_osm_server_1c2_mgmt_port_0: + - osm_server_1c2_osm_server_1c2_mgmt_port_0 + - network.outpoing.packets disk.device.capacity_osm_server_1c2: - osm_server_1c2 - disk.device.capacity - network.outgoing.bytes.rate_osm_server_1c2_osm_port: - - osm_server_1c2_osm_port - - network.outgoing.bytes.rate disk.device.write.bytes_osm_server_1c2: - osm_server_1c2 - disk.device.write.bytes disk.device.write.requests.rate_osm_server_1c2: - osm_server_1c2 - disk.device.write.requests.rate - network.incoming.bytes.rate_osm_server_1c2_osm_port: - - osm_server_1c2_osm_port - - network.incoming.bytes.rate instance_osm_server_1c2: - osm_server_1c2 - instance - network.incoming.packets_osm_server_1c2_osm_port: - - osm_server_1c2_osm_port - - network.incoming.packets requirements: - link_osm_server_1c2_osm_port: - - osm_server_1c2_osm_port - - link - dependency_osm_server_1c2_osm_port: - - osm_server_1c2_osm_port + dependency_osm_server_1c2_osm_server_1c2_mgmt_port_0: + - osm_server_1c2_osm_server_1c2_mgmt_port_0 - dependency local_storage_osm_server_1c2: - osm_server_1c2 - local_storage dependency_osm_server_1c2: - osm_server_1c2 - - dependency \ No newline at end of file + - dependency + link_osm_server_1c2_osm_server_1c2_mgmt_port_0: + - osm_server_1c2_osm_server_1c2_mgmt_port_0 + - link 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/Nested_pd_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_pd_server_1bServiceTemplate.yaml index 4c8a635991..e44613e5cb 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_pd_server_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_pd_server_1bServiceTemplate.yaml @@ -11,27 +11,19 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_ps_server_1b_port_vlan_requirements: - type: list + port_ps_server_1b_port_1_network_role_tag: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements compute_pd_server_1b_name: type: list required: true entry_schema: type: string - port_ps_server_1b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_ps_server_1b_port_network_role_tag: - type: string - required: true - port_ps_server_1b_port_fixed_ips: + port_ps_server_1b_port_1_related_networks: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps + type: org.openecomp.datatypes.network.RelatedNetworksAssignments index_value: type: integer description: Index value of this substitution service template runtime instance @@ -39,104 +31,112 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_ps_server_1b_port_order: - type: integer + port_ps_server_1b_port_1_ip_requirements: + type: list required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements vm_flavor_name: type: string required: true - port_ps_server_1b_port_related_networks: - type: list + port_ps_server_1b_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_ps_server_1b_port_network: + port_ps_server_1b_port_1_network_role: + type: string + required: true + vm_image_name: + type: string + required: true + port_ps_server_1b_port_1_replacement_policy: type: list required: true entry_schema: type: string - port_ps_server_1b_port_exCP_naming: + port_ps_server_1b_port_1_exCP_naming: type: org.openecomp.datatypes.Naming required: true - port_ps_server_1b_port_ip_requirements: + port_ps_server_1b_port_1_fixed_ips: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - vm_image_name: - type: string + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_ps_server_1b_port_1_order: + type: integer required: true - port_ps_server_1b_port_network_role: + port_ps_server_1b_port_1_subnetpoolid: type: string required: true - port_ps_server_1b_port_replacement_policy: + port_ps_server_1b_port_1_network: type: list required: true entry_schema: type: string - port_ps_server_1b_port_subnetpoolid: - type: string - required: true compute_pd_server_1b_availability_zone: type: list required: true entry_schema: type: string + port_ps_server_1b_port_1_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements node_templates: - pd_server_1b: - type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server_1b - properties: - availability_zone: - get_input: - - compute_pd_server_1b_availability_zone - - index_value - flavor: - get_input: vm_flavor_name - image: - get_input: vm_image_name - name: - get_input: - - compute_pd_server_1b_name - - index_value - pd_server_1b_ps_server_1b_port: + pd_server_1b_ps_server_1b_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_ps_server_1b_port_replacement_policy + - port_ps_server_1b_port_1_replacement_policy - index_value mac_requirements: - get_input: port_ps_server_1b_port_mac_requirements + get_input: port_ps_server_1b_port_1_mac_requirements order: - get_input: port_ps_server_1b_port_order + get_input: port_ps_server_1b_port_1_order exCP_naming: - get_input: port_ps_server_1b_port_exCP_naming + get_input: port_ps_server_1b_port_1_exCP_naming vlan_requirements: - get_input: port_ps_server_1b_port_vlan_requirements + get_input: port_ps_server_1b_port_1_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_ps_server_1b_port_ip_requirements + get_input: port_ps_server_1b_port_1_ip_requirements related_networks: - get_input: port_ps_server_1b_port_related_networks + get_input: port_ps_server_1b_port_1_related_networks network_role_tag: - get_input: port_ps_server_1b_port_network_role_tag + get_input: port_ps_server_1b_port_1_network_role_tag network_role: - get_input: port_ps_server_1b_port_network_role + get_input: port_ps_server_1b_port_1_network_role fixed_ips: get_input: - - port_ps_server_1b_port_fixed_ips + - port_ps_server_1b_port_1_fixed_ips - index_value subnetpoolid: - get_input: port_ps_server_1b_port_subnetpoolid + get_input: port_ps_server_1b_port_1_subnetpoolid network: get_input: - - port_ps_server_1b_port_network + - port_ps_server_1b_port_1_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: pd_server_1b relationship: tosca.relationships.network.BindsTo + pd_server_1b: + type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server_1b + properties: + availability_zone: + get_input: + - compute_pd_server_1b_availability_zone + - index_value + flavor: + get_input: vm_flavor_name + image: + get_input: vm_image_name + name: + get_input: + - compute_pd_server_1b_name + - index_value substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server_1b capabilities: @@ -146,30 +146,21 @@ topology_template: host_pd_server_1b: - pd_server_1b - host - network.outpoing.packets_pd_server_1b_ps_server_1b_port: - - pd_server_1b_ps_server_1b_port - - network.outpoing.packets + network.outgoing.bytes.rate_pd_server_1b_ps_server_1b_port_1: + - pd_server_1b_ps_server_1b_port_1 + - network.outgoing.bytes.rate disk.read.bytes.rate_pd_server_1b: - pd_server_1b - disk.read.bytes.rate + forwarder_pd_server_1b_ps_server_1b_port_1: + - pd_server_1b_ps_server_1b_port_1 + - forwarder disk.allocation_pd_server_1b: - pd_server_1b - disk.allocation - network.incoming.bytes.rate_pd_server_1b_ps_server_1b_port: - - pd_server_1b_ps_server_1b_port - - network.incoming.bytes.rate - feature_pd_server_1b_ps_server_1b_port: - - pd_server_1b_ps_server_1b_port - - feature cpu.delta_pd_server_1b: - pd_server_1b - cpu.delta - network.incoming.packets_pd_server_1b_ps_server_1b_port: - - pd_server_1b_ps_server_1b_port - - network.incoming.packets - forwarder_pd_server_1b_ps_server_1b_port: - - pd_server_1b_ps_server_1b_port - - forwarder disk.device.read.requests_pd_server_1b: - pd_server_1b - disk.device.read.requests @@ -179,9 +170,6 @@ topology_template: disk.device.iops_pd_server_1b: - pd_server_1b - disk.device.iops - network.outgoing.bytes.rate_pd_server_1b_ps_server_1b_port: - - pd_server_1b_ps_server_1b_port - - network.outgoing.bytes.rate cpu_pd_server_1b: - pd_server_1b - cpu @@ -203,9 +191,9 @@ topology_template: memory_pd_server_1b: - pd_server_1b - memory - network.outgoing.bytes_pd_server_1b_ps_server_1b_port: - - pd_server_1b_ps_server_1b_port - - network.outgoing.bytes + network.outgoing.packets.rate_pd_server_1b_ps_server_1b_port_1: + - pd_server_1b_ps_server_1b_port_1 + - network.outgoing.packets.rate disk.device.read.bytes.rate_pd_server_1b: - pd_server_1b - disk.device.read.bytes.rate @@ -227,30 +215,42 @@ topology_template: disk.ephemeral.size_pd_server_1b: - pd_server_1b - disk.ephemeral.size - binding_pd_server_1b_ps_server_1b_port: - - pd_server_1b_ps_server_1b_port - - binding scalable_pd_server_1b: - pd_server_1b - scalable disk.write.requests_pd_server_1b: - pd_server_1b - disk.write.requests + network.incoming.bytes_pd_server_1b_ps_server_1b_port_1: + - pd_server_1b_ps_server_1b_port_1 + - network.incoming.bytes disk.device.write.bytes.rate_pd_server_1b: - pd_server_1b - disk.device.write.bytes.rate disk.root.size_pd_server_1b: - pd_server_1b - disk.root.size + network.incoming.packets.rate_pd_server_1b_ps_server_1b_port_1: + - pd_server_1b_ps_server_1b_port_1 + - network.incoming.packets.rate disk.iops_pd_server_1b: - pd_server_1b - disk.iops + network.incoming.packets_pd_server_1b_ps_server_1b_port_1: + - pd_server_1b_ps_server_1b_port_1 + - network.incoming.packets + network.outgoing.bytes_pd_server_1b_ps_server_1b_port_1: + - pd_server_1b_ps_server_1b_port_1 + - network.outgoing.bytes disk.write.bytes_pd_server_1b: - pd_server_1b - disk.write.bytes disk.device.write.bytes_pd_server_1b: - pd_server_1b - disk.device.write.bytes + attachment_pd_server_1b_ps_server_1b_port_1: + - pd_server_1b_ps_server_1b_port_1 + - attachment os_pd_server_1b: - pd_server_1b - os @@ -260,9 +260,6 @@ topology_template: instance_pd_server_1b: - pd_server_1b - instance - network.outgoing.packets.rate_pd_server_1b_ps_server_1b_port: - - pd_server_1b_ps_server_1b_port - - network.outgoing.packets.rate binding_pd_server_1b: - pd_server_1b - binding @@ -272,21 +269,18 @@ topology_template: memory.resident_pd_server_1b: - pd_server_1b - memory.resident - network.incoming.packets.rate_pd_server_1b_ps_server_1b_port: - - pd_server_1b_ps_server_1b_port - - network.incoming.packets.rate - attachment_pd_server_1b_ps_server_1b_port: - - pd_server_1b_ps_server_1b_port - - attachment - network.incoming.bytes_pd_server_1b_ps_server_1b_port: - - pd_server_1b_ps_server_1b_port - - network.incoming.bytes + feature_pd_server_1b_ps_server_1b_port_1: + - pd_server_1b_ps_server_1b_port_1 + - feature disk.device.write.requests.rate_pd_server_1b: - pd_server_1b - disk.device.write.requests.rate disk.device.capacity_pd_server_1b: - pd_server_1b - disk.device.capacity + network.incoming.bytes.rate_pd_server_1b_ps_server_1b_port_1: + - pd_server_1b_ps_server_1b_port_1 + - network.incoming.bytes.rate disk.read.requests_pd_server_1b: - pd_server_1b - disk.read.requests @@ -296,19 +290,25 @@ topology_template: disk.usage_pd_server_1b: - pd_server_1b - disk.usage + network.outpoing.packets_pd_server_1b_ps_server_1b_port_1: + - pd_server_1b_ps_server_1b_port_1 + - network.outpoing.packets + binding_pd_server_1b_ps_server_1b_port_1: + - pd_server_1b_ps_server_1b_port_1 + - binding disk.write.requests.rate_pd_server_1b: - pd_server_1b - disk.write.requests.rate requirements: + dependency_pd_server_1b_ps_server_1b_port_1: + - pd_server_1b_ps_server_1b_port_1 + - dependency + link_pd_server_1b_ps_server_1b_port_1: + - pd_server_1b_ps_server_1b_port_1 + - link dependency_pd_server_1b: - pd_server_1b - dependency local_storage_pd_server_1b: - pd_server_1b - local_storage - dependency_pd_server_1b_ps_server_1b_port: - - pd_server_1b_ps_server_1b_port - - dependency - link_pd_server_1b_ps_server_1b_port: - - pd_server_1b_ps_server_1b_port - - link \ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_pd_server_1b_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_pd_server_1b_1ServiceTemplate.yaml index 798ca5a3de..287608b58e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_pd_server_1b_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_pd_server_1b_1ServiceTemplate.yaml @@ -16,6 +16,25 @@ topology_template: required: true entry_schema: type: string + port_pd_server_1b_port_1_network_role_tag: + type: string + required: true + port_pd_server_1b_port_1_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_1b_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_pd_server_1b_port_1_subnetpoolid: + type: string + required: true + port_pd_server_1b_port_1_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments index_value: type: integer description: Index value of this substitution service template runtime instance @@ -23,63 +42,44 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - vm_flavor_name: - type: string - required: true - port_pd_server_1b_port_vlan_requirements: + port_pd_server_1b_port_1_fixed_ips: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd_server_1b_port_related_networks: - type: list + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_pd_server_1b_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd_server_1b_port_network_role_tag: + vm_flavor_name: type: string required: true + port_pd_server_1b_port_1_order: + type: integer + required: true vm_image_name: type: string required: true - port_pd_server_1b_port_replacement_policy: + port_pd_server_1b_port_1_network: type: list required: true entry_schema: type: string - port_pd_server_1b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_pd_server_1b_port_network_role: - type: string - required: true - port_pd_server_1b_port_fixed_ips: + port_pd_server_1b_port_1_replacement_policy: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_pd_server_1b_port_network: + type: string + port_pd_server_1b_port_1_ip_requirements: type: list required: true entry_schema: - type: string + type: org.openecomp.datatypes.network.IpRequirements compute_pd_server_1b_availability_zone: type: list required: true entry_schema: type: string - port_pd_server_1b_port_order: - type: integer - required: true - port_pd_server_1b_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_pd_server_1b_port_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd_server_1b_port_subnetpoolid: + port_pd_server_1b_port_1_network_role: type: string required: true node_templates: @@ -98,39 +98,39 @@ topology_template: get_input: - compute_pd_server_1b_name - index_value - pd_server_1b_pd_server_1b_port: + pd_server_1b_pd_server_1b_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_pd_server_1b_port_replacement_policy + - port_pd_server_1b_port_1_replacement_policy - index_value mac_requirements: - get_input: port_pd_server_1b_port_mac_requirements + get_input: port_pd_server_1b_port_1_mac_requirements order: - get_input: port_pd_server_1b_port_order + get_input: port_pd_server_1b_port_1_order exCP_naming: - get_input: port_pd_server_1b_port_exCP_naming + get_input: port_pd_server_1b_port_1_exCP_naming vlan_requirements: - get_input: port_pd_server_1b_port_vlan_requirements + get_input: port_pd_server_1b_port_1_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_pd_server_1b_port_ip_requirements + get_input: port_pd_server_1b_port_1_ip_requirements related_networks: - get_input: port_pd_server_1b_port_related_networks + get_input: port_pd_server_1b_port_1_related_networks network_role_tag: - get_input: port_pd_server_1b_port_network_role_tag + get_input: port_pd_server_1b_port_1_network_role_tag network_role: - get_input: port_pd_server_1b_port_network_role + get_input: port_pd_server_1b_port_1_network_role fixed_ips: get_input: - - port_pd_server_1b_port_fixed_ips + - port_pd_server_1b_port_1_fixed_ips - index_value subnetpoolid: - get_input: port_pd_server_1b_port_subnetpoolid + get_input: port_pd_server_1b_port_1_subnetpoolid network: get_input: - - port_pd_server_1b_port_network + - port_pd_server_1b_port_1_network - index_value requirements: - binding: @@ -150,9 +150,6 @@ topology_template: disk.device.read.bytes_pd_server_1b: - pd_server_1b - disk.device.read.bytes - feature_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - feature host_pd_server_1b: - pd_server_1b - host @@ -162,18 +159,15 @@ topology_template: disk.allocation_pd_server_1b: - pd_server_1b - disk.allocation - network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.incoming.bytes.rate cpu.delta_pd_server_1b: - pd_server_1b - cpu.delta - forwarder_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - forwarder - network.incoming.bytes_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.incoming.bytes + network.incoming.packets.rate_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 + - network.incoming.packets.rate + binding_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 + - binding disk.device.read.requests_pd_server_1b: - pd_server_1b - disk.device.read.requests @@ -183,9 +177,6 @@ topology_template: disk.device.iops_pd_server_1b: - pd_server_1b - disk.device.iops - binding_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - binding cpu_pd_server_1b: - pd_server_1b - cpu @@ -198,15 +189,18 @@ topology_template: endpoint_pd_server_1b: - pd_server_1b - endpoint + network.outpoing.packets_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 + - network.outpoing.packets disk.device.allocation_pd_server_1b: - pd_server_1b - disk.device.allocation memory.usage_pd_server_1b: - pd_server_1b - memory.usage - network.outpoing.packets_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.outpoing.packets + network.incoming.bytes_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 + - network.incoming.bytes memory_pd_server_1b: - pd_server_1b - memory @@ -219,12 +213,12 @@ topology_template: disk.read.bytes_pd_server_1b: - pd_server_1b - disk.read.bytes + network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 + - network.incoming.bytes.rate disk.device.usage_pd_server_1b: - pd_server_1b - disk.device.usage - attachment_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - attachment disk.device.write.requests_pd_server_1b: - pd_server_1b - disk.device.write.requests @@ -234,9 +228,9 @@ topology_template: disk.ephemeral.size_pd_server_1b: - pd_server_1b - disk.ephemeral.size - network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.outgoing.bytes.rate + network.outgoing.bytes_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 + - network.outgoing.bytes scalable_pd_server_1b: - pd_server_1b - scalable @@ -246,12 +240,21 @@ topology_template: disk.device.write.bytes.rate_pd_server_1b: - pd_server_1b - disk.device.write.bytes.rate + network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 + - network.outgoing.bytes.rate disk.root.size_pd_server_1b: - pd_server_1b - disk.root.size disk.iops_pd_server_1b: - pd_server_1b - disk.iops + forwarder_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 + - forwarder + feature_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 + - feature disk.write.bytes_pd_server_1b: - pd_server_1b - disk.write.bytes @@ -264,9 +267,6 @@ topology_template: vcpus_pd_server_1b: - pd_server_1b - vcpus - network.incoming.packets.rate_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.incoming.packets.rate instance_pd_server_1b: - pd_server_1b - instance @@ -276,14 +276,14 @@ topology_template: cpu_util_pd_server_1b: - pd_server_1b - cpu_util - network.outgoing.bytes_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.outgoing.bytes + attachment_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 + - attachment memory.resident_pd_server_1b: - pd_server_1b - memory.resident - network.incoming.packets_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port + network.incoming.packets_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 - network.incoming.packets disk.device.write.requests.rate_pd_server_1b: - pd_server_1b @@ -294,9 +294,6 @@ topology_template: disk.read.requests_pd_server_1b: - pd_server_1b - disk.read.requests - network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.outgoing.packets.rate disk.capacity_pd_server_1b: - pd_server_1b - disk.capacity @@ -306,6 +303,9 @@ topology_template: disk.write.requests.rate_pd_server_1b: - pd_server_1b - disk.write.requests.rate + network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 + - network.outgoing.packets.rate requirements: dependency_pd_server_1b: - pd_server_1b @@ -313,9 +313,9 @@ topology_template: local_storage_pd_server_1b: - pd_server_1b - local_storage - link_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port + link_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 - link - dependency_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - dependency \ No newline at end of file + dependency_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 + - dependency 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/nested-pattern-4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/nested-pattern-4ServiceTemplate.yaml index 17cbb4ac54..a22e09cd2a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/nested-pattern-4ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/nested-pattern-4ServiceTemplate.yaml @@ -21,9 +21,6 @@ topology_template: immutable: false type: string description: UID of OAM network - port_pd_server_port_1_order: - type: integer - required: true pd_server_names: hidden: false immutable: false @@ -31,27 +28,32 @@ topology_template: description: PD server names entry_schema: type: string - port_pd_server_port_1_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pd_server_1_port_ip_requirements: + type: list required: true - port_pd_server_port_2_network_role: - type: string + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd_server_1_port_order: + type: integer required: true - port_pd_server_port_1_network_role: - type: string + port_pd_server_2_port_exCP_naming: + type: org.openecomp.datatypes.Naming required: true pd_server_flavor: hidden: false immutable: false type: string description: Flavor for PD server - port_pd_server_port_2_ip_requirements: + port_pd_server_1_port_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd_server_port_2_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_2_port_network_role_tag: + type: string + required: true + port_pd_server_1_port_network_role: + type: string required: true availability_zone_0: label: availabilityzone name @@ -63,29 +65,30 @@ topology_template: hidden: false immutable: false type: string - port_pd_server_port_2_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd_server_port_2_subnetpoolid: - type: string - required: true pd_server_ips: hidden: false immutable: false type: string - port_pd_server_port_1_subnetpoolid: + port_pd_server_1_port_subnetpoolid: type: string required: true - port_pd_server_port_1_related_networks: + port_pd_server_2_port_order: + type: integer + required: true + port_pd_server_1_port_related_networks: type: list required: true entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd_server_port_1_network_role_tag: + port_pd_server_1_port_network_role_tag: + type: string + required: true + port_pd_server_2_port_subnetpoolid: type: string required: true + port_pd_server_1_port_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true security_group_name: hidden: false immutable: false @@ -98,20 +101,25 @@ topology_template: immutable: false type: string description: Flavor for PS server - port_pd_server_port_1_vlan_requirements: + port_pd_server_2_port_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd_server_port_2_order: - type: integer + type: org.openecomp.datatypes.network.IpRequirements + port_pd_server_2_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_pd_server_port_2_related_networks: + port_pd_server_2_port_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_2_port_related_networks: type: list required: true entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd_server_port_2_network_role_tag: + port_pd_server_2_port_network_role: type: string required: true pd_server_image: @@ -119,83 +127,75 @@ topology_template: immutable: false type: string description: Flavor for PD server - port_pd_server_port_1_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd_server_port_2_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_pd_server_port_1_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_1_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true node_templates: - pd_server_port_1: + pd_server_2_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: subnetpoolid: - get_input: port_pd_server_port_1_subnetpoolid + get_input: port_pd_server_2_port_subnetpoolid related_networks: - get_input: port_pd_server_port_1_related_networks + get_input: port_pd_server_2_port_related_networks network: get_input: net replacement_policy: AUTO ip_requirements: - get_input: port_pd_server_port_1_ip_requirements + get_input: port_pd_server_2_port_ip_requirements network_role: - get_input: port_pd_server_port_1_network_role + get_input: port_pd_server_2_port_network_role fixed_ips: - ip_address: get_input: - pd_server_ips - - 0 + - 1 mac_requirements: - get_input: port_pd_server_port_1_mac_requirements + get_input: port_pd_server_2_port_mac_requirements subinterface_indicator: false exCP_naming: - get_input: port_pd_server_port_1_exCP_naming + get_input: port_pd_server_2_port_exCP_naming vlan_requirements: - get_input: port_pd_server_port_1_vlan_requirements + get_input: port_pd_server_2_port_vlan_requirements network_role_tag: - get_input: port_pd_server_port_1_network_role_tag + get_input: port_pd_server_2_port_network_role_tag order: - get_input: port_pd_server_port_1_order + get_input: port_pd_server_2_port_order requirements: - binding: capability: tosca.capabilities.network.Bindable node: server_pd relationship: tosca.relationships.network.BindsTo - pd_server_port_2: + pd_server_1_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: subnetpoolid: - get_input: port_pd_server_port_2_subnetpoolid + get_input: port_pd_server_1_port_subnetpoolid related_networks: - get_input: port_pd_server_port_2_related_networks + get_input: port_pd_server_1_port_related_networks network: get_input: net replacement_policy: AUTO ip_requirements: - get_input: port_pd_server_port_2_ip_requirements + get_input: port_pd_server_1_port_ip_requirements network_role: - get_input: port_pd_server_port_2_network_role + get_input: port_pd_server_1_port_network_role fixed_ips: - ip_address: get_input: - pd_server_ips - - 1 + - 0 mac_requirements: - get_input: port_pd_server_port_2_mac_requirements + get_input: port_pd_server_1_port_mac_requirements subinterface_indicator: false exCP_naming: - get_input: port_pd_server_port_2_exCP_naming + get_input: port_pd_server_1_port_exCP_naming vlan_requirements: - get_input: port_pd_server_port_2_vlan_requirements + get_input: port_pd_server_1_port_vlan_requirements network_role_tag: - get_input: port_pd_server_port_2_network_role_tag + get_input: port_pd_server_1_port_network_role_tag order: - get_input: port_pd_server_port_2_order + get_input: port_pd_server_1_port_order requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -221,8 +221,8 @@ topology_template: heat_file: ../Artifacts/nested-pattern-4.yml description: nested1 members: - - pd_server_port_1 - - pd_server_port_2 + - pd_server_2_port + - pd_server_1_port - server_pd outputs: pattern4_attr_1: @@ -231,33 +231,48 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.heat.pd_server capabilities: + feature_pd_server_2_port: + - pd_server_2_port + - feature + network.incoming.packets.rate_pd_server_1_port: + - pd_server_1_port + - network.incoming.packets.rate disk.iops_server_pd: - server_pd - disk.iops disk.device.read.bytes.rate_server_pd: - server_pd - disk.device.read.bytes.rate + network.outgoing.bytes_pd_server_2_port: + - pd_server_2_port + - network.outgoing.bytes + network.outgoing.packets.rate_pd_server_2_port: + - pd_server_2_port + - network.outgoing.packets.rate memory.resident_server_pd: - server_pd - memory.resident + binding_pd_server_1_port: + - pd_server_1_port + - binding cpu_util_server_pd: - server_pd - cpu_util - network.incoming.bytes_pd_server_port_1: - - pd_server_port_1 - - network.incoming.bytes - network.incoming.bytes_pd_server_port_2: - - pd_server_port_2 - - network.incoming.bytes + attachment_pd_server_2_port: + - pd_server_2_port + - attachment + network.incoming.packets_pd_server_2_port: + - pd_server_2_port + - network.incoming.packets disk.device.read.requests_server_pd: - server_pd - disk.device.read.requests - network.incoming.bytes.rate_pd_server_port_1: - - pd_server_port_1 - - network.incoming.bytes.rate - network.incoming.bytes.rate_pd_server_port_2: - - pd_server_port_2 - - network.incoming.bytes.rate + forwarder_pd_server_1_port: + - pd_server_1_port + - forwarder + network.outgoing.packets.rate_pd_server_1_port: + - pd_server_1_port + - network.outgoing.packets.rate disk.device.allocation_server_pd: - server_pd - disk.device.allocation @@ -273,18 +288,12 @@ topology_template: disk.device.capacity_server_pd: - server_pd - disk.device.capacity - attachment_pd_server_port_2: - - pd_server_port_2 - - attachment - network.incoming.packets_pd_server_port_2: - - pd_server_port_2 - - network.incoming.packets - attachment_pd_server_port_1: - - pd_server_port_1 - - attachment - network.incoming.packets_pd_server_port_1: - - pd_server_port_1 - - network.incoming.packets + network.outpoing.packets_pd_server_2_port: + - pd_server_2_port + - network.outpoing.packets + network.incoming.bytes_pd_server_2_port: + - pd_server_2_port + - network.incoming.bytes memory.usage_server_pd: - server_pd - memory.usage @@ -303,78 +312,72 @@ topology_template: disk.device.usage_server_pd: - server_pd - disk.device.usage - feature_pd_server_port_1: - - pd_server_port_1 - - feature - feature_pd_server_port_2: - - pd_server_port_2 - - feature + network.outpoing.packets_pd_server_1_port: + - pd_server_1_port + - network.outpoing.packets + binding_pd_server_2_port: + - pd_server_2_port + - binding + network.incoming.packets.rate_pd_server_2_port: + - pd_server_2_port + - network.incoming.packets.rate disk.read.bytes_server_pd: - server_pd - disk.read.bytes + forwarder_pd_server_2_port: + - pd_server_2_port + - forwarder + feature_pd_server_1_port: + - pd_server_1_port + - feature disk.device.read.bytes_server_pd: - server_pd - disk.device.read.bytes - network.incoming.packets.rate_pd_server_port_2: - - pd_server_port_2 - - network.incoming.packets.rate - network.incoming.packets.rate_pd_server_port_1: - - pd_server_port_1 - - network.incoming.packets.rate instance_server_pd: - server_pd - instance - binding_pd_server_port_2: - - pd_server_port_2 - - binding - binding_pd_server_port_1: - - pd_server_port_1 - - binding + network.incoming.bytes.rate_pd_server_2_port: + - pd_server_2_port + - network.incoming.bytes.rate cpu.delta_server_pd: - server_pd - cpu.delta host_server_pd: - server_pd - host - network.outpoing.packets_pd_server_port_1: - - pd_server_port_1 - - network.outpoing.packets + network.incoming.bytes.rate_pd_server_1_port: + - pd_server_1_port + - network.incoming.bytes.rate vcpus_server_pd: - server_pd - vcpus disk.ephemeral.size_server_pd: - server_pd - disk.ephemeral.size - network.outpoing.packets_pd_server_port_2: - - pd_server_port_2 - - network.outpoing.packets - network.outgoing.packets.rate_pd_server_port_2: - - pd_server_port_2 - - network.outgoing.packets.rate disk.latency_server_pd: - server_pd - disk.latency - network.outgoing.packets.rate_pd_server_port_1: - - pd_server_port_1 - - network.outgoing.packets.rate disk.device.write.bytes.rate_server_pd: - server_pd - disk.device.write.bytes.rate disk.write.requests.rate_server_pd: - server_pd - disk.write.requests.rate + network.outgoing.bytes.rate_pd_server_2_port: + - pd_server_2_port + - network.outgoing.bytes.rate disk.write.requests_server_pd: - server_pd - disk.write.requests - network.outgoing.bytes_pd_server_port_2: - - pd_server_port_2 - - network.outgoing.bytes disk.device.iops_server_pd: - server_pd - disk.device.iops - network.outgoing.bytes_pd_server_port_1: - - pd_server_port_1 - - network.outgoing.bytes + attachment_pd_server_1_port: + - pd_server_1_port + - attachment + network.incoming.packets_pd_server_1_port: + - pd_server_1_port + - network.incoming.packets disk.read.requests_server_pd: - server_pd - disk.read.requests @@ -384,33 +387,27 @@ topology_template: disk.device.latency_server_pd: - server_pd - disk.device.latency + network.outgoing.bytes_pd_server_1_port: + - pd_server_1_port + - network.outgoing.bytes binding_server_pd: - server_pd - binding scalable_server_pd: - server_pd - scalable - network.outgoing.bytes.rate_pd_server_port_2: - - pd_server_port_2 - - network.outgoing.bytes.rate - forwarder_pd_server_port_1: - - pd_server_port_1 - - forwarder - network.outgoing.bytes.rate_pd_server_port_1: - - pd_server_port_1 - - network.outgoing.bytes.rate disk.write.bytes_server_pd: - server_pd - disk.write.bytes disk.write.bytes.rate_server_pd: - server_pd - disk.write.bytes.rate - forwarder_pd_server_port_2: - - pd_server_port_2 - - forwarder feature_server_pd: - server_pd - feature + network.outgoing.bytes.rate_pd_server_1_port: + - pd_server_1_port + - network.outgoing.bytes.rate disk.root.size_server_pd: - server_pd - disk.root.size @@ -420,6 +417,9 @@ topology_template: disk.device.write.requests.rate_server_pd: - server_pd - disk.device.write.requests.rate + network.incoming.bytes_pd_server_1_port: + - pd_server_1_port + - network.incoming.bytes disk.device.write.bytes_server_pd: - server_pd - disk.device.write.bytes @@ -433,15 +433,15 @@ topology_template: dependency_server_pd: - server_pd - dependency - link_pd_server_port_2: - - pd_server_port_2 - - link - link_pd_server_port_1: - - pd_server_port_1 + dependency_pd_server_2_port: + - pd_server_2_port + - dependency + link_pd_server_2_port: + - pd_server_2_port - link - dependency_pd_server_port_1: - - pd_server_port_1 + dependency_pd_server_1_port: + - pd_server_1_port - dependency - dependency_pd_server_port_2: - - pd_server_port_2 - - dependency \ No newline at end of file + link_pd_server_1_port: + - pd_server_1_port + - link 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 327ade922e..5d62a6c5a6 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 @@ -133,30 +133,30 @@ topology_template: - get_input: - pd_server_1b_names - 0 - vm_flavor_name: - get_input: pd_server_1b_flavor - vm_image_name: - get_input: pd_server_1b_image - port_pd_server_1b_port_replacement_policy: - - AUTO - port_pd_server_1b_port_mac_requirements: - mac_count_required: - is_required: false - port_pd_server_1b_port_fixed_ips: + port_pd_server_1b_port_1_fixed_ips: - ip_address: get_input: - pd_server_1b_ips - 0 - port_pd_server_1b_port_network: + port_pd_server_1b_port_1_mac_requirements: + mac_count_required: + is_required: false + vm_flavor_name: + get_input: pd_server_1b_flavor + vm_image_name: + get_input: pd_server_1b_image + port_pd_server_1b_port_1_network: - get_input: net - compute_pd_server_1b_availability_zone: - - get_input: availability_zone_0 - port_pd_server_1b_port_ip_requirements: + port_pd_server_1b_port_1_replacement_policy: + - AUTO + port_pd_server_1b_port_1_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false + compute_pd_server_1b_availability_zone: + - get_input: availability_zone_0 service_template_filter: substitute_service_template: Nested_pd_server_1b_1ServiceTemplate.yaml count: 1 @@ -170,7 +170,24 @@ topology_template: directives: - substitutable properties: - port_cmaui_port_fixed_ips: + port_cmaui_1c1_mgmt_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + port_cmaui_1c1_mgmt_port_0_network: + - packet_external_network_1 + - packet_external_network_1 + compute_cmaui_1c1_availability_zone: + - get_input: availability_zone_0 + - get_input: availability_zone_0 + port_cmaui_1c1_mgmt_port_0_mac_requirements: + mac_count_required: + is_required: false + vm_flavor_name: + get_input: cmaui_1c1_flavor + port_cmaui_1c1_mgmt_port_0_fixed_ips: - - ip_address: get_input: - cmaui_oam_ips @@ -179,28 +196,11 @@ topology_template: get_input: - cmaui_oam_ips - 0 - port_cmaui_port_network: - - packet_external_network_1 - - packet_external_network_1 - compute_cmaui_1c1_availability_zone: - - get_input: availability_zone_0 - - get_input: availability_zone_0 - vm_flavor_name: - get_input: cmaui_1c1_flavor - port_cmaui_port_mac_requirements: - mac_count_required: - is_required: false - port_cmaui_port_replacement_policy: + port_cmaui_1c1_mgmt_port_0_replacement_policy: - AUTO - AUTO vm_image_name: get_input: cmaui_1c1_image - port_cmaui_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false compute_cmaui_1c1_name: - get_input: - cmaui_1c1_names @@ -217,7 +217,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_cmaui_1c1_cmaui_port: + - link_cmaui_1c1_cmaui_1c1_mgmt_port_0: capability: tosca.capabilities.network.Linkable node: packet_external_network_1 relationship: tosca.relationships.network.LinksTo @@ -230,24 +230,24 @@ topology_template: substitute_service_template: nested-pattern-4ServiceTemplate.yaml p2: get_input: p2 - port_pd_server_port_2_ip_requirements: + port_pd_server_2_port_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false - port_pd_server_port_2_mac_requirements: + port_pd_server_1_port_mac_requirements: + mac_count_required: + is_required: false + port_pd_server_2_port_mac_requirements: mac_count_required: is_required: false - port_pd_server_port_1_ip_requirements: + port_pd_server_1_port_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false - port_pd_server_port_1_mac_requirements: - mac_count_required: - is_required: false abstract_pd_server_1b: type: org.openecomp.resource.abstract.nodes.pd_server_1b directives: @@ -257,28 +257,28 @@ topology_template: - get_input: - pd_server_1b_names - 1 - port_ps_server_1b_port_mac_requirements: - mac_count_required: - is_required: false - port_ps_server_1b_port_fixed_ips: - - ip_address: - get_input: - - ps_server_1b_ips - - 0 - vm_flavor_name: - get_input: pd_server_1b_flavor - port_ps_server_1b_port_network: - - get_input: net - port_ps_server_1b_port_ip_requirements: + port_ps_server_1b_port_1_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false + vm_flavor_name: + get_input: pd_server_1b_flavor + port_ps_server_1b_port_1_mac_requirements: + mac_count_required: + is_required: false vm_image_name: get_input: pd_server_1b_image - port_ps_server_1b_port_replacement_policy: + port_ps_server_1b_port_1_replacement_policy: - AUTO + port_ps_server_1b_port_1_fixed_ips: + - ip_address: + get_input: + - ps_server_1b_ips + - 0 + port_ps_server_1b_port_1_network: + - get_input: net compute_pd_server_1b_availability_zone: - get_input: availability_zone_0 service_template_filter: @@ -299,24 +299,28 @@ topology_template: directives: - substitutable properties: - port_oam_port_mac_requirements: - mac_count_required: - is_required: false compute_oam_server_1c2_name: - get_input: - oam_server_1c2_names - 1 - port_oam_port_network: - - packet_external_network_1 - vm_flavor_name: - get_input: oam_server_1c2_flavor - compute_oam_server_1c2_availability_zone: - - get_input: availability_zone_0 - port_oam_port_fixed_ips: + port_oam_server_1c2_mgmt_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + port_oam_server_1c2_mgmt_port_0_fixed_ips: - ip_address: get_input: - cmaui_oam_ips - 1 + vm_flavor_name: + get_input: oam_server_1c2_flavor + port_oam_server_1c2_mgmt_port_0_mac_requirements: + mac_count_required: + is_required: false + compute_oam_server_1c2_availability_zone: + - get_input: availability_zone_0 vm_image_name: get_input: oam_server_1c2_image compute_oam_server_1c2_metadata: @@ -336,13 +340,9 @@ topology_template: get_attribute: - abstract_cmaui_1c1 - cmaui_1c1_accessIPv4 - port_oam_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false - port_oam_port_replacement_policy: + port_oam_server_1c2_mgmt_port_0_network: + - packet_external_network_1 + port_oam_server_1c2_mgmt_port_0_replacement_policy: - AUTO service_template_filter: substitute_service_template: Nested_oam_server_1c2ServiceTemplate.yaml @@ -353,7 +353,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_oam_server_1c2_oam_port: + - link_oam_server_1c2_oam_server_1c2_mgmt_port_0: capability: tosca.capabilities.network.Linkable node: packet_external_network_1 relationship: tosca.relationships.network.LinksTo @@ -362,33 +362,33 @@ topology_template: directives: - substitutable properties: - port_oam_port_mac_requirements: - mac_count_required: - is_required: false compute_oam_server_1c2_name: - get_input: - oam_server_1c2_names - 0 - port_oam_port_network: - - packet_internal_network_1 - vm_flavor_name: - get_input: oam_server_1c2_flavor - compute_oam_server_1c2_availability_zone: - - get_input: availability_zone_0 - port_oam_port_fixed_ips: + port_oam_server_1c2_mgmt_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + port_oam_server_1c2_mgmt_port_0_fixed_ips: - ip_address: get_input: - cmaui_oam_ips - 1 + vm_flavor_name: + get_input: oam_server_1c2_flavor + port_oam_server_1c2_mgmt_port_0_mac_requirements: + mac_count_required: + is_required: false + compute_oam_server_1c2_availability_zone: + - get_input: availability_zone_0 vm_image_name: get_input: oam_server_1c2_image - port_oam_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false - port_oam_port_replacement_policy: + port_oam_server_1c2_mgmt_port_0_network: + - packet_internal_network_1 + port_oam_server_1c2_mgmt_port_0_replacement_policy: - AUTO service_template_filter: substitute_service_template: Nested_oam_server_1c2ServiceTemplate.yaml @@ -399,7 +399,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_oam_server_1c2_oam_port: + - link_oam_server_1c2_oam_server_1c2_mgmt_port_0: capability: tosca.capabilities.network.Linkable node: packet_internal_network_1 relationship: tosca.relationships.network.LinksTo @@ -438,7 +438,10 @@ topology_template: - memory_server_pd binding_ps_server_1b_port_1: - abstract_pd_server_1b - - binding_pd_server_1b_ps_server_1b_port + - binding_pd_server_1b_ps_server_1b_port_1 + feature_cmaui_1c1_1_mgmt_port_0: + - abstract_cmaui_1c1 + - feature_cmaui_1c1_cmaui_1c1_mgmt_port_0 disk.capacity_server_1b_pd_1: - abstract_pd_server_1b_1 - disk.capacity_pd_server_1b @@ -451,18 +454,18 @@ topology_template: disk.read.requests_server_1c1_cmaui_1: - abstract_cmaui_1c1 - disk.read.requests_cmaui_1c1 + network.outpoing.packets_pd_server_1_port_nested1_pattern_4: + - nested1_pattern_4 + - network.outpoing.packets_pd_server_1_port disk.device.read.requests.rate_server_pd_nested1_pattern_4: - nested1_pattern_4 - disk.device.read.requests.rate_server_pd + feature_cmaui_1c1_2_mgmt_port_0: + - abstract_cmaui_1c1 + - feature_cmaui_1c1_cmaui_1c1_mgmt_port_0 feature_pd_server_1b_port_1: - abstract_pd_server_1b_1 - - feature_pd_server_1b_pd_server_1b_port - network.outgoing.packets.rate_oam_port_2: - - abstract_oam_server_1c2_1 - - network.outgoing.packets.rate_oam_server_1c2_oam_port - network.outgoing.packets.rate_oam_port_1: - - abstract_oam_server_1c2_0 - - network.outgoing.packets.rate_oam_server_1c2_oam_port + - feature_pd_server_1b_pd_server_1b_port_1 disk.device.iops_server_1b_pd_2: - abstract_pd_server_1b - disk.device.iops_pd_server_1b @@ -486,16 +489,10 @@ topology_template: - scalable_oam_server_1c2 network.outgoing.packets.rate_ps_server_1b_port_1: - abstract_pd_server_1b - - network.outgoing.packets.rate_pd_server_1b_ps_server_1b_port + - network.outgoing.packets.rate_pd_server_1b_ps_server_1b_port_1 disk.device.read.requests_server_pd_nested1_pattern_4: - nested1_pattern_4 - disk.device.read.requests_server_pd - feature_pd_server_port_1_nested1_pattern_4: - - nested1_pattern_4 - - feature_pd_server_port_1 - network.outpoing.packets_pd_server_port_1_nested1_pattern_4: - - nested1_pattern_4 - - network.outpoing.packets_pd_server_port_1 disk.device.write.requests_server_1c1_cmaui_2: - abstract_cmaui_1c1 - disk.device.write.requests_cmaui_1c1 @@ -517,18 +514,6 @@ topology_template: disk.device.capacity_server_1c2_oam_1: - abstract_oam_server_1c2_0 - disk.device.capacity_oam_server_1c2 - network.outpoing.packets_oam_port_1: - - abstract_oam_server_1c2_0 - - network.outpoing.packets_oam_server_1c2_oam_port - network.outpoing.packets_oam_port_2: - - abstract_oam_server_1c2_1 - - network.outpoing.packets_oam_server_1c2_oam_port - binding_cmaui_port_1: - - abstract_cmaui_1c1 - - binding_cmaui_1c1_cmaui_port - binding_cmaui_port_2: - - abstract_cmaui_1c1 - - binding_cmaui_1c1_cmaui_port end_point_packet_internal_network_1: - packet_internal_network_1 - end_point @@ -544,18 +529,6 @@ topology_template: disk.write.bytes_server_1c2_oam_2: - abstract_oam_server_1c2_1 - disk.write.bytes_oam_server_1c2 - network.incoming.bytes.rate_pd_server_port_2_nested1_pattern_4: - - nested1_pattern_4 - - network.incoming.bytes.rate_pd_server_port_2 - network.incoming.bytes_cmaui_port_2: - - abstract_cmaui_1c1 - - network.incoming.bytes_cmaui_1c1_cmaui_port - network.incoming.bytes_cmaui_port_1: - - abstract_cmaui_1c1 - - network.incoming.bytes_cmaui_1c1_cmaui_port - network.incoming.packets_pd_server_port_2_nested1_pattern_4: - - nested1_pattern_4 - - network.incoming.packets_pd_server_port_2 os_server_1c2_oam_1: - abstract_oam_server_1c2_0 - os_oam_server_1c2 @@ -567,7 +540,7 @@ topology_template: - disk.device.iops_cmaui_1c1 network.outgoing.packets.rate_pd_server_1b_port_1: - abstract_pd_server_1b_1 - - network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port + - network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port_1 memory.resident_server_1b_pd_2: - abstract_pd_server_1b - memory.resident_pd_server_1b @@ -580,36 +553,30 @@ topology_template: memory.resident_server_1b_pd_1: - abstract_pd_server_1b_1 - memory.resident_pd_server_1b + network.outgoing.bytes_pd_server_2_port_nested1_pattern_4: + - nested1_pattern_4 + - network.outgoing.bytes_pd_server_2_port disk.device.write.bytes.rate_server_pd_nested1_pattern_4: - nested1_pattern_4 - disk.device.write.bytes.rate_server_pd feature_server_1c2_oam_2: - abstract_oam_server_1c2_1 - feature_oam_server_1c2 - network.incoming.packets.rate_cmaui_port_1: - - abstract_cmaui_1c1 - - network.incoming.packets.rate_cmaui_1c1_cmaui_port - network.incoming.packets.rate_cmaui_port_2: - - abstract_cmaui_1c1 - - network.incoming.packets.rate_cmaui_1c1_cmaui_port - network.outgoing.bytes_oam_port_2: - - abstract_oam_server_1c2_1 - - network.outgoing.bytes_oam_server_1c2_oam_port + feature_pd_server_1_port_nested1_pattern_4: + - nested1_pattern_4 + - feature_pd_server_1_port feature_server_1c2_oam_1: - abstract_oam_server_1c2_0 - feature_oam_server_1c2 - network.outgoing.bytes_oam_port_1: - - abstract_oam_server_1c2_0 - - network.outgoing.bytes_oam_server_1c2_oam_port disk.device.capacity_server_1c1_cmaui_2: - abstract_cmaui_1c1 - disk.device.capacity_cmaui_1c1 + network.outgoing.packets.rate_cmaui_1c1_1_mgmt_port_0: + - abstract_cmaui_1c1 + - network.outgoing.packets.rate_cmaui_1c1_cmaui_1c1_mgmt_port_0 host_server_pd_nested1_pattern_4: - nested1_pattern_4 - host_server_pd - attachment_oam_port_2: - - abstract_oam_server_1c2_1 - - attachment_oam_server_1c2_oam_port disk.capacity_server_1c2_oam_1: - abstract_oam_server_1c2_0 - disk.capacity_oam_server_1c2 @@ -619,9 +586,9 @@ topology_template: endpoint_server_pd_nested1_pattern_4: - nested1_pattern_4 - endpoint_server_pd - attachment_oam_port_1: + attachment_oam_server_1c2_1_mgmt_port_0: - abstract_oam_server_1c2_0 - - attachment_oam_server_1c2_oam_port + - attachment_oam_server_1c2_oam_server_1c2_mgmt_port_0 disk.device.read.bytes.rate_server_pd_nested1_pattern_4: - nested1_pattern_4 - disk.device.read.bytes.rate_server_pd @@ -652,9 +619,15 @@ topology_template: disk.write.requests.rate_server_1c1_cmaui_1: - abstract_cmaui_1c1 - disk.write.requests.rate_cmaui_1c1 + network.outgoing.bytes_oam_server_1c2_1_mgmt_port_0: + - abstract_oam_server_1c2_0 + - network.outgoing.bytes_oam_server_1c2_oam_server_1c2_mgmt_port_0 cpu_util_server_1c1_cmaui_2: - abstract_cmaui_1c1 - cpu_util_cmaui_1c1 + network.incoming.bytes_oam_server_1c2_1_mgmt_port_0: + - abstract_oam_server_1c2_0 + - network.incoming.bytes_oam_server_1c2_oam_server_1c2_mgmt_port_0 disk.allocation_server_1c2_oam_2: - abstract_oam_server_1c2_1 - disk.allocation_oam_server_1c2 @@ -666,7 +639,7 @@ topology_template: - cpu_util_cmaui_1c1 binding_pd_server_1b_port_1: - abstract_pd_server_1b_1 - - binding_pd_server_1b_pd_server_1b_port + - binding_pd_server_1b_pd_server_1b_port_1 disk.device.latency_server_pd_nested1_pattern_4: - nested1_pattern_4 - disk.device.latency_server_pd @@ -676,21 +649,15 @@ topology_template: disk.read.bytes_server_1c2_oam_1: - abstract_oam_server_1c2_0 - disk.read.bytes_oam_server_1c2 - network.outpoing.packets_pd_server_port_2_nested1_pattern_4: - - nested1_pattern_4 - - network.outpoing.packets_pd_server_port_2 disk.read.bytes_server_1c2_oam_2: - abstract_oam_server_1c2_1 - disk.read.bytes_oam_server_1c2 disk.write.requests_server_1b_pd_1: - abstract_pd_server_1b_1 - disk.write.requests_pd_server_1b - binding_oam_port_2: - - abstract_oam_server_1c2_1 - - binding_oam_server_1c2_oam_port - binding_oam_port_1: + forwarder_oam_server_1c2_1_mgmt_port_0: - abstract_oam_server_1c2_0 - - binding_oam_server_1c2_oam_port + - forwarder_oam_server_1c2_oam_server_1c2_mgmt_port_0 disk.read.bytes.rate_server_1c1_cmaui_2: - abstract_cmaui_1c1 - disk.read.bytes.rate_cmaui_1c1 @@ -709,15 +676,18 @@ topology_template: vcpus_server_1b_pd_2: - abstract_pd_server_1b - vcpus_pd_server_1b + network.incoming.packets.rate_pd_server_2_port_nested1_pattern_4: + - nested1_pattern_4 + - network.incoming.packets.rate_pd_server_2_port disk.latency_server_1c2_oam_1: - abstract_oam_server_1c2_0 - disk.latency_oam_server_1c2 - network.incoming.bytes.rate_pd_server_port_1_nested1_pattern_4: - - nested1_pattern_4 - - network.incoming.bytes.rate_pd_server_port_1 disk.latency_server_1c2_oam_2: - abstract_oam_server_1c2_1 - disk.latency_oam_server_1c2 + network.incoming.bytes.rate_pd_server_1_port_nested1_pattern_4: + - nested1_pattern_4 + - network.incoming.bytes.rate_pd_server_1_port disk.device.usage_server_pd_nested1_pattern_4: - nested1_pattern_4 - disk.device.usage_server_pd @@ -736,15 +706,12 @@ topology_template: disk.device.write.requests_server_1b_pd_2: - abstract_pd_server_1b - disk.device.write.requests_pd_server_1b - network.incoming.bytes.rate_oam_port_1: - - abstract_oam_server_1c2_0 - - network.incoming.bytes.rate_oam_server_1c2_oam_port - network.outgoing.bytes.rate_pd_server_port_1_nested1_pattern_4: - - nested1_pattern_4 - - network.outgoing.bytes.rate_pd_server_port_1 - network.incoming.bytes.rate_oam_port_2: - - abstract_oam_server_1c2_1 - - network.incoming.bytes.rate_oam_server_1c2_oam_port + network.outgoing.bytes.rate_cmaui_1c1_1_mgmt_port_0: + - abstract_cmaui_1c1 + - network.outgoing.bytes.rate_cmaui_1c1_cmaui_1c1_mgmt_port_0 + network.outgoing.bytes.rate_cmaui_1c1_2_mgmt_port_0: + - abstract_cmaui_1c1 + - network.outgoing.bytes.rate_cmaui_1c1_cmaui_1c1_mgmt_port_0 memory.usage_server_1c1_cmaui_1: - abstract_cmaui_1c1 - memory.usage_cmaui_1c1 @@ -766,21 +733,15 @@ topology_template: disk.device.iops_server_1c2_oam_1: - abstract_oam_server_1c2_0 - disk.device.iops_oam_server_1c2 - network.incoming.bytes_pd_server_port_2_nested1_pattern_4: - - nested1_pattern_4 - - network.incoming.bytes_pd_server_port_2 - forwarder_oam_port_1: - - abstract_oam_server_1c2_0 - - forwarder_oam_server_1c2_oam_port - forwarder_oam_port_2: - - abstract_oam_server_1c2_1 - - forwarder_oam_server_1c2_oam_port binding_server_1c2_oam_2: - abstract_oam_server_1c2_1 - binding_oam_server_1c2 binding_server_1c2_oam_1: - abstract_oam_server_1c2_0 - binding_oam_server_1c2 + forwarder_cmaui_1c1_1_mgmt_port_0: + - abstract_cmaui_1c1 + - forwarder_cmaui_1c1_cmaui_1c1_mgmt_port_0 disk.device.read.bytes.rate_server_1b_pd_2: - abstract_pd_server_1b - disk.device.read.bytes.rate_pd_server_1b @@ -795,10 +756,10 @@ topology_template: - disk.device.read.bytes.rate_pd_server_1b network.incoming.bytes_ps_server_1b_port_1: - abstract_pd_server_1b - - network.incoming.bytes_pd_server_1b_ps_server_1b_port - network.outgoing.packets.rate_pd_server_port_2_nested1_pattern_4: + - network.incoming.bytes_pd_server_1b_ps_server_1b_port_1 + attachment_pd_server_2_port_nested1_pattern_4: - nested1_pattern_4 - - network.outgoing.packets.rate_pd_server_port_2 + - attachment_pd_server_2_port disk.usage_server_1b_pd_2: - abstract_pd_server_1b - disk.usage_pd_server_1b @@ -811,9 +772,6 @@ topology_template: disk.usage_server_1b_pd_1: - abstract_pd_server_1b_1 - disk.usage_pd_server_1b - network.incoming.packets_cmaui_port_2: - - abstract_cmaui_1c1 - - network.incoming.packets_cmaui_1c1_cmaui_port disk.device.write.requests_server_1c2_oam_2: - abstract_oam_server_1c2_1 - disk.device.write.requests_oam_server_1c2 @@ -826,9 +784,9 @@ topology_template: disk.device.write.bytes.rate_server_1b_pd_1: - abstract_pd_server_1b_1 - disk.device.write.bytes.rate_pd_server_1b - network.incoming.packets_cmaui_port_1: + network.incoming.packets.rate_cmaui_1c1_2_mgmt_port_0: - abstract_cmaui_1c1 - - network.incoming.packets_cmaui_1c1_cmaui_port + - network.incoming.packets.rate_cmaui_1c1_cmaui_1c1_mgmt_port_0 feature_server_1b_pd_1: - abstract_pd_server_1b_1 - feature_pd_server_1b @@ -859,12 +817,6 @@ topology_template: disk.device.read.bytes_server_pd_nested1_pattern_4: - nested1_pattern_4 - disk.device.read.bytes_server_pd - network.incoming.packets.rate_oam_port_1: - - abstract_oam_server_1c2_0 - - network.incoming.packets.rate_oam_server_1c2_oam_port - network.incoming.packets.rate_oam_port_2: - - abstract_oam_server_1c2_1 - - network.incoming.packets.rate_oam_server_1c2_oam_port disk.iops_server_1b_pd_1: - abstract_pd_server_1b_1 - disk.iops_pd_server_1b @@ -880,6 +832,9 @@ topology_template: disk.device.allocation_server_1c2_oam_1: - abstract_oam_server_1c2_0 - disk.device.allocation_oam_server_1c2 + network.outgoing.packets.rate_pd_server_2_port_nested1_pattern_4: + - nested1_pattern_4 + - network.outgoing.packets.rate_pd_server_2_port disk.write.requests_server_1c1_cmaui_2: - abstract_cmaui_1c1 - disk.write.requests_cmaui_1c1 @@ -889,24 +844,15 @@ topology_template: link_packet_external_network_1: - packet_external_network_1 - link - network.outgoing.bytes.rate_cmaui_port_2: - - abstract_cmaui_1c1 - - network.outgoing.bytes.rate_cmaui_1c1_cmaui_port - network.incoming.bytes_pd_server_port_1_nested1_pattern_4: - - nested1_pattern_4 - - network.incoming.bytes_pd_server_port_1 cpu_server_1c1_cmaui_2: - abstract_cmaui_1c1 - cpu_cmaui_1c1 - network.outgoing.bytes.rate_cmaui_port_1: - - abstract_cmaui_1c1 - - network.outgoing.bytes.rate_cmaui_1c1_cmaui_port cpu_server_1c1_cmaui_1: - abstract_cmaui_1c1 - cpu_cmaui_1c1 network.outpoing.packets_ps_server_1b_port_1: - abstract_pd_server_1b - - network.outpoing.packets_pd_server_1b_ps_server_1b_port + - network.outpoing.packets_pd_server_1b_ps_server_1b_port_1 cpu_server_1c2_oam_1: - abstract_oam_server_1c2_0 - cpu_oam_server_1c2 @@ -916,6 +862,9 @@ topology_template: disk.write.requests.rate_server_1c2_oam_2: - abstract_oam_server_1c2_1 - disk.write.requests.rate_oam_server_1c2 + attachment_cmaui_1c1_2_mgmt_port_0: + - abstract_cmaui_1c1 + - attachment_cmaui_1c1_cmaui_1c1_mgmt_port_0 disk.device.read.bytes_server_1b_pd_1: - abstract_pd_server_1b_1 - disk.device.read.bytes_pd_server_1b @@ -931,9 +880,18 @@ topology_template: disk.iops_server_pd_nested1_pattern_4: - nested1_pattern_4 - disk.iops_server_pd + network.incoming.packets.rate_pd_server_1_port_nested1_pattern_4: + - nested1_pattern_4 + - network.incoming.packets.rate_pd_server_1_port disk.write.requests.rate_server_1c2_oam_1: - abstract_oam_server_1c2_0 - disk.write.requests.rate_oam_server_1c2 + network.outgoing.packets.rate_cmaui_1c1_2_mgmt_port_0: + - abstract_cmaui_1c1 + - network.outgoing.packets.rate_cmaui_1c1_cmaui_1c1_mgmt_port_0 + network.incoming.bytes.rate_pd_server_2_port_nested1_pattern_4: + - nested1_pattern_4 + - network.incoming.bytes.rate_pd_server_2_port disk.read.bytes_server_1b_pd_2: - abstract_pd_server_1b - disk.read.bytes_pd_server_1b @@ -951,10 +909,16 @@ topology_template: - endpoint_pd_server_1b network.incoming.bytes_pd_server_1b_port_1: - abstract_pd_server_1b_1 - - network.incoming.bytes_pd_server_1b_pd_server_1b_port + - network.incoming.bytes_pd_server_1b_pd_server_1b_port_1 + attachment_oam_server_1c2_2_mgmt_port_0: + - abstract_oam_server_1c2_1 + - attachment_oam_server_1c2_oam_server_1c2_mgmt_port_0 instance_server_pd_nested1_pattern_4: - nested1_pattern_4 - instance_server_pd + network.outgoing.bytes.rate_pd_server_2_port_nested1_pattern_4: + - nested1_pattern_4 + - network.outgoing.bytes.rate_pd_server_2_port disk.latency_server_1c1_cmaui_1: - abstract_cmaui_1c1 - disk.latency_cmaui_1c1 @@ -967,36 +931,33 @@ topology_template: memory_server_1b_pd_1: - abstract_pd_server_1b_1 - memory_pd_server_1b - network.outgoing.packets.rate_pd_server_port_1_nested1_pattern_4: - - nested1_pattern_4 - - network.outgoing.packets.rate_pd_server_port_1 feature_packet_external_network_1: - packet_external_network_1 - feature + network.outgoing.bytes_oam_server_1c2_2_mgmt_port_0: + - abstract_oam_server_1c2_1 + - network.outgoing.bytes_oam_server_1c2_oam_server_1c2_mgmt_port_0 disk.device.latency_server_1b_pd_2: - abstract_pd_server_1b - disk.device.latency_pd_server_1b disk.device.latency_server_1b_pd_1: - abstract_pd_server_1b_1 - disk.device.latency_pd_server_1b + feature_oam_server_1c2_1_mgmt_port_0: + - abstract_oam_server_1c2_0 + - feature_oam_server_1c2_oam_server_1c2_mgmt_port_0 disk.read.bytes_server_pd_nested1_pattern_4: - nested1_pattern_4 - disk.read.bytes_server_pd + network.outpoing.packets_oam_server_1c2_2_mgmt_port_0: + - abstract_oam_server_1c2_1 + - network.outpoing.packets_oam_server_1c2_oam_server_1c2_mgmt_port_0 disk.device.iops_server_pd_nested1_pattern_4: - nested1_pattern_4 - disk.device.iops_server_pd - network.incoming.packets_oam_port_1: - - abstract_oam_server_1c2_0 - - network.incoming.packets_oam_server_1c2_oam_port - network.incoming.packets_oam_port_2: + forwarder_oam_server_1c2_2_mgmt_port_0: - abstract_oam_server_1c2_1 - - network.incoming.packets_oam_server_1c2_oam_port - network.incoming.bytes.rate_cmaui_port_1: - - abstract_cmaui_1c1 - - network.incoming.bytes.rate_cmaui_1c1_cmaui_port - network.incoming.bytes.rate_cmaui_port_2: - - abstract_cmaui_1c1 - - network.incoming.bytes.rate_cmaui_1c1_cmaui_port + - forwarder_oam_server_1c2_oam_server_1c2_mgmt_port_0 disk.iops_server_1c1_cmaui_2: - abstract_cmaui_1c1 - disk.iops_cmaui_1c1 @@ -1009,21 +970,24 @@ topology_template: disk.device.read.requests_server_1b_pd_1: - abstract_pd_server_1b_1 - disk.device.read.requests_pd_server_1b - forwarder_pd_server_port_2_nested1_pattern_4: - - nested1_pattern_4 - - forwarder_pd_server_port_2 disk.device.write.bytes_server_1c2_oam_1: - abstract_oam_server_1c2_0 - disk.device.write.bytes_oam_server_1c2 disk.device.write.bytes_server_1c2_oam_2: - abstract_oam_server_1c2_1 - disk.device.write.bytes_oam_server_1c2 + network.incoming.packets_pd_server_1_port_nested1_pattern_4: + - nested1_pattern_4 + - network.incoming.packets_pd_server_1_port disk.write.bytes_server_pd_nested1_pattern_4: - nested1_pattern_4 - disk.write.bytes_server_pd - feature_pd_server_port_2_nested1_pattern_4: + binding_pd_server_1_port_nested1_pattern_4: - nested1_pattern_4 - - feature_pd_server_port_2 + - binding_pd_server_1_port + network.incoming.packets_oam_server_1c2_1_mgmt_port_0: + - abstract_oam_server_1c2_0 + - network.incoming.packets_oam_server_1c2_oam_server_1c2_mgmt_port_0 disk.device.write.bytes.rate_server_1c2_oam_2: - abstract_oam_server_1c2_1 - disk.device.write.bytes.rate_oam_server_1c2 @@ -1036,15 +1000,30 @@ topology_template: disk.read.bytes_server_1c1_cmaui_1: - abstract_cmaui_1c1 - disk.read.bytes_cmaui_1c1 + forwarder_pd_server_1_port_nested1_pattern_4: + - nested1_pattern_4 + - forwarder_pd_server_1_port + network.incoming.packets_oam_server_1c2_2_mgmt_port_0: + - abstract_oam_server_1c2_1 + - network.incoming.packets_oam_server_1c2_oam_server_1c2_mgmt_port_0 disk.iops_server_1c2_oam_2: - abstract_oam_server_1c2_1 - disk.iops_oam_server_1c2 forwarder_pd_server_1b_port_1: - abstract_pd_server_1b_1 - - forwarder_pd_server_1b_pd_server_1b_port + - forwarder_pd_server_1b_pd_server_1b_port_1 disk.usage_server_1c2_oam_2: - abstract_oam_server_1c2_1 - disk.usage_oam_server_1c2 + network.outgoing.bytes_cmaui_1c1_1_mgmt_port_0: + - abstract_cmaui_1c1 + - network.outgoing.bytes_cmaui_1c1_cmaui_1c1_mgmt_port_0 + attachment_pd_server_1_port_nested1_pattern_4: + - nested1_pattern_4 + - attachment_pd_server_1_port + network.outgoing.bytes_cmaui_1c1_2_mgmt_port_0: + - abstract_cmaui_1c1 + - network.outgoing.bytes_cmaui_1c1_cmaui_1c1_mgmt_port_0 feature_server_1c1_cmaui_1: - abstract_cmaui_1c1 - feature_cmaui_1c1 @@ -1056,22 +1035,13 @@ topology_template: - feature_cmaui_1c1 network.outpoing.packets_pd_server_1b_port_1: - abstract_pd_server_1b_1 - - network.outpoing.packets_pd_server_1b_pd_server_1b_port - network.outgoing.bytes_cmaui_port_2: - - abstract_cmaui_1c1 - - network.outgoing.bytes_cmaui_1c1_cmaui_port + - network.outpoing.packets_pd_server_1b_pd_server_1b_port_1 disk.device.capacity_server_pd_nested1_pattern_4: - nested1_pattern_4 - disk.device.capacity_server_pd disk.iops_server_1c2_oam_1: - abstract_oam_server_1c2_0 - disk.iops_oam_server_1c2 - network.outgoing.bytes_cmaui_port_1: - - abstract_cmaui_1c1 - - network.outgoing.bytes_cmaui_1c1_cmaui_port - network.outgoing.bytes_pd_server_port_1_nested1_pattern_4: - - nested1_pattern_4 - - network.outgoing.bytes_pd_server_port_1 binding_server_pd_nested1_pattern_4: - nested1_pattern_4 - binding_server_pd @@ -1105,36 +1075,33 @@ topology_template: disk.usage_server_pd_nested1_pattern_4: - nested1_pattern_4 - disk.usage_server_pd - network.outgoing.bytes_pd_server_port_2_nested1_pattern_4: - - nested1_pattern_4 - - network.outgoing.bytes_pd_server_port_2 vcpus_server_pd_nested1_pattern_4: - nested1_pattern_4 - vcpus_server_pd + network.outgoing.packets.rate_oam_server_1c2_2_mgmt_port_0: + - abstract_oam_server_1c2_1 + - network.outgoing.packets.rate_oam_server_1c2_oam_server_1c2_mgmt_port_0 link_packet_internal_network_1: - packet_internal_network_1 - link disk.write.bytes_server_1b_pd_1: - abstract_pd_server_1b_1 - disk.write.bytes_pd_server_1b + network.incoming.packets.rate_oam_server_1c2_1_mgmt_port_0: + - abstract_oam_server_1c2_0 + - network.incoming.packets.rate_oam_server_1c2_oam_server_1c2_mgmt_port_0 disk.write.bytes_server_1b_pd_2: - abstract_pd_server_1b - disk.write.bytes_pd_server_1b disk.device.usage_server_1c2_oam_2: - abstract_oam_server_1c2_1 - disk.device.usage_oam_server_1c2 - network.incoming.packets.rate_pd_server_port_2_nested1_pattern_4: - - nested1_pattern_4 - - network.incoming.packets.rate_pd_server_port_2 disk.device.write.requests.rate_server_1b_pd_2: - abstract_pd_server_1b - disk.device.write.requests.rate_pd_server_1b disk.device.usage_server_1c2_oam_1: - abstract_oam_server_1c2_0 - disk.device.usage_oam_server_1c2 - forwarder_pd_server_port_1_nested1_pattern_4: - - nested1_pattern_4 - - forwarder_pd_server_port_1 disk.latency_server_pd_nested1_pattern_4: - nested1_pattern_4 - disk.latency_server_pd @@ -1147,6 +1114,9 @@ topology_template: disk.write.requests.rate_server_pd_nested1_pattern_4: - nested1_pattern_4 - disk.write.requests.rate_server_pd + feature_pd_server_2_port_nested1_pattern_4: + - nested1_pattern_4 + - feature_pd_server_2_port os_server_pd_nested1_pattern_4: - nested1_pattern_4 - os_server_pd @@ -1158,52 +1128,55 @@ topology_template: - cpu_util_oam_server_1c2 network.incoming.packets_ps_server_1b_port_1: - abstract_pd_server_1b - - network.incoming.packets_pd_server_1b_ps_server_1b_port + - network.incoming.packets_pd_server_1b_ps_server_1b_port_1 network.outgoing.bytes.rate_ps_server_1b_port_1: - abstract_pd_server_1b - - network.outgoing.bytes.rate_pd_server_1b_ps_server_1b_port + - network.outgoing.bytes.rate_pd_server_1b_ps_server_1b_port_1 + network.incoming.packets.rate_oam_server_1c2_2_mgmt_port_0: + - abstract_oam_server_1c2_1 + - network.incoming.packets.rate_oam_server_1c2_oam_server_1c2_mgmt_port_0 network.outgoing.bytes_pd_server_1b_port_1: - abstract_pd_server_1b_1 - - network.outgoing.bytes_pd_server_1b_pd_server_1b_port - attachment_pd_server_port_1_nested1_pattern_4: - - nested1_pattern_4 - - attachment_pd_server_port_1 + - network.outgoing.bytes_pd_server_1b_pd_server_1b_port_1 memory.resident_server_1c2_oam_2: - abstract_oam_server_1c2_1 - memory.resident_oam_server_1c2 memory.resident_server_1c2_oam_1: - abstract_oam_server_1c2_0 - memory.resident_oam_server_1c2 + network.outgoing.packets.rate_oam_server_1c2_1_mgmt_port_0: + - abstract_oam_server_1c2_0 + - network.outgoing.packets.rate_oam_server_1c2_oam_server_1c2_mgmt_port_0 disk.device.allocation_server_1c1_cmaui_1: - abstract_cmaui_1c1 - disk.device.allocation_cmaui_1c1 disk.device.allocation_server_1c1_cmaui_2: - abstract_cmaui_1c1 - disk.device.allocation_cmaui_1c1 + network.incoming.bytes_cmaui_1c1_1_mgmt_port_0: + - abstract_cmaui_1c1 + - network.incoming.bytes_cmaui_1c1_cmaui_1c1_mgmt_port_0 disk.root.size_server_pd_nested1_pattern_4: - nested1_pattern_4 - disk.root.size_server_pd vcpus_server_1c1_cmaui_1: - abstract_cmaui_1c1 - vcpus_cmaui_1c1 - feature_cmaui_port_1: - - abstract_cmaui_1c1 - - feature_cmaui_1c1_cmaui_port - feature_cmaui_port_2: - - abstract_cmaui_1c1 - - feature_cmaui_1c1_cmaui_port instance_server_1c1_cmaui_2: - abstract_cmaui_1c1 - instance_cmaui_1c1 + network.outgoing.bytes.rate_oam_server_1c2_2_mgmt_port_0: + - abstract_oam_server_1c2_1 + - network.outgoing.bytes.rate_oam_server_1c2_oam_server_1c2_mgmt_port_0 instance_server_1c1_cmaui_1: - abstract_cmaui_1c1 - instance_cmaui_1c1 network.outgoing.bytes.rate_pd_server_1b_port_1: - abstract_pd_server_1b_1 - - network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port - attachment_pd_server_port_2_nested1_pattern_4: - - nested1_pattern_4 - - attachment_pd_server_port_2 + - network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port_1 + attachment_cmaui_1c1_1_mgmt_port_0: + - abstract_cmaui_1c1 + - attachment_cmaui_1c1_cmaui_1c1_mgmt_port_0 disk.device.read.requests.rate_server_1c2_oam_1: - abstract_oam_server_1c2_0 - disk.device.read.requests.rate_oam_server_1c2 @@ -1213,9 +1186,15 @@ topology_template: os_server_1b_pd_1: - abstract_pd_server_1b_1 - os_pd_server_1b + binding_oam_server_1c2_2_mgmt_port_0: + - abstract_oam_server_1c2_1 + - binding_oam_server_1c2_oam_server_1c2_mgmt_port_0 os_server_1b_pd_2: - abstract_pd_server_1b - os_pd_server_1b + network.outpoing.packets_oam_server_1c2_1_mgmt_port_0: + - abstract_oam_server_1c2_0 + - network.outpoing.packets_oam_server_1c2_oam_server_1c2_mgmt_port_0 disk.root.size_server_1b_pd_2: - abstract_pd_server_1b - disk.root.size_pd_server_1b @@ -1224,7 +1203,7 @@ topology_template: - endpoint_cmaui_1c1 network.incoming.packets.rate_ps_server_1b_port_1: - abstract_pd_server_1b - - network.incoming.packets.rate_pd_server_1b_ps_server_1b_port + - network.incoming.packets.rate_pd_server_1b_ps_server_1b_port_1 host_server_1b_pd_1: - abstract_pd_server_1b_1 - host_pd_server_1b @@ -1240,51 +1219,51 @@ topology_template: vcpus_server_1c1_cmaui_2: - abstract_cmaui_1c1 - vcpus_cmaui_1c1 - forwarder_cmaui_port_2: - - abstract_cmaui_1c1 - - forwarder_cmaui_1c1_cmaui_port - forwarder_cmaui_port_1: + network.incoming.packets_cmaui_1c1_2_mgmt_port_0: - abstract_cmaui_1c1 - - forwarder_cmaui_1c1_cmaui_port + - network.incoming.packets_cmaui_1c1_cmaui_1c1_mgmt_port_0 + network.incoming.bytes_pd_server_2_port_nested1_pattern_4: + - nested1_pattern_4 + - network.incoming.bytes_pd_server_2_port disk.allocation_server_1b_pd_1: - abstract_pd_server_1b_1 - disk.allocation_pd_server_1b + binding_cmaui_1c1_2_mgmt_port_0: + - abstract_cmaui_1c1 + - binding_cmaui_1c1_cmaui_1c1_mgmt_port_0 disk.allocation_server_1b_pd_2: - abstract_pd_server_1b - disk.allocation_pd_server_1b attachment_ps_server_1b_port_1: - abstract_pd_server_1b - - attachment_pd_server_1b_ps_server_1b_port + - attachment_pd_server_1b_ps_server_1b_port_1 disk.device.read.requests.rate_server_1b_pd_1: - abstract_pd_server_1b_1 - disk.device.read.requests.rate_pd_server_1b disk.device.read.requests.rate_server_1b_pd_2: - abstract_pd_server_1b - disk.device.read.requests.rate_pd_server_1b + network.incoming.packets_pd_server_2_port_nested1_pattern_4: + - nested1_pattern_4 + - network.incoming.packets_pd_server_2_port disk.write.bytes.rate_server_1c1_cmaui_1: - abstract_cmaui_1c1 - disk.write.bytes.rate_cmaui_1c1 disk.write.bytes.rate_server_1c1_cmaui_2: - abstract_cmaui_1c1 - disk.write.bytes.rate_cmaui_1c1 + feature_oam_server_1c2_2_mgmt_port_0: + - abstract_oam_server_1c2_1 + - feature_oam_server_1c2_oam_server_1c2_mgmt_port_0 memory.resident_server_pd_nested1_pattern_4: - nested1_pattern_4 - memory.resident_server_pd - network.outgoing.bytes.rate_pd_server_port_2_nested1_pattern_4: - - nested1_pattern_4 - - network.outgoing.bytes.rate_pd_server_port_2 network.outgoing.bytes_ps_server_1b_port_1: - abstract_pd_server_1b - - network.outgoing.bytes_pd_server_1b_ps_server_1b_port + - network.outgoing.bytes_pd_server_1b_ps_server_1b_port_1 disk.device.allocation_server_pd_nested1_pattern_4: - nested1_pattern_4 - disk.device.allocation_server_pd - network.outpoing.packets_cmaui_port_1: - - abstract_cmaui_1c1 - - network.outpoing.packets_cmaui_1c1_cmaui_port - network.outpoing.packets_cmaui_port_2: - - abstract_cmaui_1c1 - - network.outpoing.packets_cmaui_1c1_cmaui_port disk.read.bytes.rate_server_1b_pd_2: - abstract_pd_server_1b - disk.read.bytes.rate_pd_server_1b @@ -1318,12 +1297,18 @@ topology_template: memory.resident_server_1c1_cmaui_2: - abstract_cmaui_1c1 - memory.resident_cmaui_1c1 + network.incoming.bytes.rate_cmaui_1c1_2_mgmt_port_0: + - abstract_cmaui_1c1 + - network.incoming.bytes.rate_cmaui_1c1_cmaui_1c1_mgmt_port_0 memory.resident_server_1c1_cmaui_1: - abstract_cmaui_1c1 - memory.resident_cmaui_1c1 os_server_1c1_cmaui_2: - abstract_cmaui_1c1 - os_cmaui_1c1 + network.incoming.bytes.rate_oam_server_1c2_1_mgmt_port_0: + - abstract_oam_server_1c2_0 + - network.incoming.bytes.rate_oam_server_1c2_oam_server_1c2_mgmt_port_0 os_server_1c1_cmaui_1: - abstract_cmaui_1c1 - os_cmaui_1c1 @@ -1333,15 +1318,21 @@ topology_template: instance_server_1c2_oam_1: - abstract_oam_server_1c2_0 - instance_oam_server_1c2 + network.incoming.bytes.rate_cmaui_1c1_1_mgmt_port_0: + - abstract_cmaui_1c1 + - network.incoming.bytes.rate_cmaui_1c1_cmaui_1c1_mgmt_port_0 instance_server_1c2_oam_2: - abstract_oam_server_1c2_1 - instance_oam_server_1c2 memory_server_1c1_cmaui_2: - abstract_cmaui_1c1 - memory_cmaui_1c1 + binding_pd_server_2_port_nested1_pattern_4: + - nested1_pattern_4 + - binding_pd_server_2_port network.incoming.bytes.rate_ps_server_1b_port_1: - abstract_pd_server_1b - - network.incoming.bytes.rate_pd_server_1b_ps_server_1b_port + - network.incoming.bytes.rate_pd_server_1b_ps_server_1b_port_1 disk.device.write.requests.rate_server_pd_nested1_pattern_4: - nested1_pattern_4 - disk.device.write.requests.rate_server_pd @@ -1357,12 +1348,18 @@ topology_template: disk.read.bytes.rate_server_pd_nested1_pattern_4: - nested1_pattern_4 - disk.read.bytes.rate_server_pd + forwarder_cmaui_1c1_2_mgmt_port_0: + - abstract_cmaui_1c1 + - forwarder_cmaui_1c1_cmaui_1c1_mgmt_port_0 vcpus_server_1c2_oam_1: - abstract_oam_server_1c2_0 - vcpus_oam_server_1c2 vcpus_server_1c2_oam_2: - abstract_oam_server_1c2_1 - vcpus_oam_server_1c2 + network.incoming.bytes.rate_oam_server_1c2_2_mgmt_port_0: + - abstract_oam_server_1c2_1 + - network.incoming.bytes.rate_oam_server_1c2_oam_server_1c2_mgmt_port_0 disk.device.allocation_server_1b_pd_2: - abstract_pd_server_1b - disk.device.allocation_pd_server_1b @@ -1387,6 +1384,9 @@ topology_template: disk.device.write.bytes.rate_server_1c1_cmaui_2: - abstract_cmaui_1c1 - disk.device.write.bytes.rate_cmaui_1c1 + network.incoming.packets.rate_cmaui_1c1_1_mgmt_port_0: + - abstract_cmaui_1c1 + - network.incoming.packets.rate_cmaui_1c1_cmaui_1c1_mgmt_port_0 disk.read.requests_server_1b_pd_1: - abstract_pd_server_1b_1 - disk.read.requests_pd_server_1b @@ -1401,7 +1401,7 @@ topology_template: - disk.write.requests_server_pd forwarder_ps_server_1b_port_1: - abstract_pd_server_1b - - forwarder_pd_server_1b_ps_server_1b_port + - forwarder_pd_server_1b_ps_server_1b_port_1 disk.device.write.bytes_server_1c1_cmaui_1: - abstract_cmaui_1c1 - disk.device.write.bytes_cmaui_1c1 @@ -1414,6 +1414,9 @@ topology_template: host_server_1c2_oam_1: - abstract_oam_server_1c2_0 - host_oam_server_1c2 + network.outgoing.bytes.rate_pd_server_1_port_nested1_pattern_4: + - nested1_pattern_4 + - network.outgoing.bytes.rate_pd_server_1_port host_server_1c2_oam_2: - abstract_oam_server_1c2_1 - host_oam_server_1c2 @@ -1432,57 +1435,63 @@ topology_template: binding_server_1b_pd_1: - abstract_pd_server_1b_1 - binding_pd_server_1b - binding_pd_server_port_2_nested1_pattern_4: + network.outpoing.packets_cmaui_1c1_2_mgmt_port_0: + - abstract_cmaui_1c1 + - network.outpoing.packets_cmaui_1c1_cmaui_1c1_mgmt_port_0 + network.outpoing.packets_cmaui_1c1_1_mgmt_port_0: + - abstract_cmaui_1c1 + - network.outpoing.packets_cmaui_1c1_cmaui_1c1_mgmt_port_0 + forwarder_pd_server_2_port_nested1_pattern_4: - nested1_pattern_4 - - binding_pd_server_port_2 + - forwarder_pd_server_2_port disk.device.read.bytes.rate_server_1c1_cmaui_1: - abstract_cmaui_1c1 - disk.device.read.bytes.rate_cmaui_1c1 disk.device.read.bytes.rate_server_1c1_cmaui_2: - abstract_cmaui_1c1 - disk.device.read.bytes.rate_cmaui_1c1 + network.outpoing.packets_pd_server_2_port_nested1_pattern_4: + - nested1_pattern_4 + - network.outpoing.packets_pd_server_2_port attachment_pd_server_1b_port_1: - abstract_pd_server_1b_1 - - attachment_pd_server_1b_pd_server_1b_port + - attachment_pd_server_1b_pd_server_1b_port_1 + network.outgoing.packets.rate_pd_server_1_port_nested1_pattern_4: + - nested1_pattern_4 + - network.outgoing.packets.rate_pd_server_1_port cpu.delta_server_1c2_oam_2: - abstract_oam_server_1c2_1 - cpu.delta_oam_server_1c2 + network.outgoing.bytes.rate_oam_server_1c2_1_mgmt_port_0: + - abstract_oam_server_1c2_0 + - network.outgoing.bytes.rate_oam_server_1c2_oam_server_1c2_mgmt_port_0 disk.ephemeral.size_server_1b_pd_1: - abstract_pd_server_1b_1 - disk.ephemeral.size_pd_server_1b disk.ephemeral.size_server_1b_pd_2: - abstract_pd_server_1b - disk.ephemeral.size_pd_server_1b + network.incoming.bytes_cmaui_1c1_2_mgmt_port_0: + - abstract_cmaui_1c1 + - network.incoming.bytes_cmaui_1c1_cmaui_1c1_mgmt_port_0 disk.usage_server_1c1_cmaui_2: - abstract_cmaui_1c1 - disk.usage_cmaui_1c1 disk.usage_server_1c1_cmaui_1: - abstract_cmaui_1c1 - disk.usage_cmaui_1c1 - network.incoming.bytes_oam_port_2: - - abstract_oam_server_1c2_1 - - network.incoming.bytes_oam_server_1c2_oam_port - network.incoming.bytes_oam_port_1: - - abstract_oam_server_1c2_0 - - network.incoming.bytes_oam_server_1c2_oam_port disk.write.bytes.rate_server_pd_nested1_pattern_4: - nested1_pattern_4 - disk.write.bytes.rate_server_pd - attachment_cmaui_port_2: - - abstract_cmaui_1c1 - - attachment_cmaui_1c1_cmaui_port - network.outgoing.bytes.rate_oam_port_1: - - abstract_oam_server_1c2_0 - - network.outgoing.bytes.rate_oam_server_1c2_oam_port + network.incoming.bytes_pd_server_1_port_nested1_pattern_4: + - nested1_pattern_4 + - network.incoming.bytes_pd_server_1_port instance_server_1b_pd_1: - abstract_pd_server_1b_1 - instance_pd_server_1b disk.device.capacity_server_1b_pd_1: - abstract_pd_server_1b_1 - disk.device.capacity_pd_server_1b - network.outgoing.bytes.rate_oam_port_2: - - abstract_oam_server_1c2_1 - - network.outgoing.bytes.rate_oam_server_1c2_oam_port instance_server_1b_pd_2: - abstract_pd_server_1b - instance_pd_server_1b @@ -1492,15 +1501,6 @@ topology_template: disk.capacity_server_1c1_cmaui_1: - abstract_cmaui_1c1 - disk.capacity_cmaui_1c1 - network.outgoing.packets.rate_cmaui_port_1: - - abstract_cmaui_1c1 - - network.outgoing.packets.rate_cmaui_1c1_cmaui_port - network.outgoing.packets.rate_cmaui_port_2: - - abstract_cmaui_1c1 - - network.outgoing.packets.rate_cmaui_1c1_cmaui_port - attachment_cmaui_port_1: - - abstract_cmaui_1c1 - - attachment_cmaui_1c1_cmaui_port disk.capacity_server_1c1_cmaui_2: - abstract_cmaui_1c1 - disk.capacity_cmaui_1c1 @@ -1510,12 +1510,15 @@ topology_template: disk.ephemeral.size_server_1c2_oam_1: - abstract_oam_server_1c2_0 - disk.ephemeral.size_oam_server_1c2 + binding_oam_server_1c2_1_mgmt_port_0: + - abstract_oam_server_1c2_0 + - binding_oam_server_1c2_oam_server_1c2_mgmt_port_0 disk.device.read.requests.rate_server_1c1_cmaui_1: - abstract_cmaui_1c1 - disk.device.read.requests.rate_cmaui_1c1 network.incoming.packets.rate_pd_server_1b_port_1: - abstract_pd_server_1b_1 - - network.incoming.packets.rate_pd_server_1b_pd_server_1b_port + - network.incoming.packets.rate_pd_server_1b_pd_server_1b_port_1 disk.device.read.bytes_server_1c2_oam_2: - abstract_oam_server_1c2_1 - disk.device.read.bytes_oam_server_1c2 @@ -1525,6 +1528,12 @@ topology_template: disk.device.read.requests.rate_server_1c1_cmaui_2: - abstract_cmaui_1c1 - disk.device.read.requests.rate_cmaui_1c1 + network.incoming.packets_cmaui_1c1_1_mgmt_port_0: + - abstract_cmaui_1c1 + - network.incoming.packets_cmaui_1c1_cmaui_1c1_mgmt_port_0 + network.outgoing.bytes_pd_server_1_port_nested1_pattern_4: + - nested1_pattern_4 + - network.outgoing.bytes_pd_server_1_port cpu.delta_server_1c2_oam_1: - abstract_oam_server_1c2_0 - cpu.delta_oam_server_1c2 @@ -1537,9 +1546,6 @@ topology_template: disk.device.usage_server_1b_pd_2: - abstract_pd_server_1b - disk.device.usage_pd_server_1b - network.incoming.packets.rate_pd_server_port_1_nested1_pattern_4: - - nested1_pattern_4 - - network.incoming.packets.rate_pd_server_port_1 disk.device.read.bytes.rate_server_1c2_oam_2: - abstract_oam_server_1c2_1 - disk.device.read.bytes.rate_oam_server_1c2 @@ -1549,18 +1555,15 @@ topology_template: disk.write.bytes_server_1c1_cmaui_2: - abstract_cmaui_1c1 - disk.write.bytes_cmaui_1c1 - feature_oam_port_2: + binding_cmaui_1c1_1_mgmt_port_0: + - abstract_cmaui_1c1 + - binding_cmaui_1c1_cmaui_1c1_mgmt_port_0 + network.incoming.bytes_oam_server_1c2_2_mgmt_port_0: - abstract_oam_server_1c2_1 - - feature_oam_server_1c2_oam_port - feature_oam_port_1: - - abstract_oam_server_1c2_0 - - feature_oam_server_1c2_oam_port + - network.incoming.bytes_oam_server_1c2_oam_server_1c2_mgmt_port_0 feature_nested1_pattern_4: - nested1_pattern_4 - feature - network.incoming.packets_pd_server_port_1_nested1_pattern_4: - - nested1_pattern_4 - - network.incoming.packets_pd_server_port_1 disk.device.latency_server_1c1_cmaui_1: - abstract_cmaui_1c1 - disk.device.latency_cmaui_1c1 @@ -1593,16 +1596,13 @@ topology_template: - cpu.delta_pd_server_1b network.incoming.packets_pd_server_1b_port_1: - abstract_pd_server_1b_1 - - network.incoming.packets_pd_server_1b_pd_server_1b_port - binding_pd_server_port_1_nested1_pattern_4: - - nested1_pattern_4 - - binding_pd_server_port_1 + - network.incoming.packets_pd_server_1b_pd_server_1b_port_1 network.incoming.bytes.rate_pd_server_1b_port_1: - abstract_pd_server_1b_1 - - network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port + - network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port_1 feature_ps_server_1b_port_1: - abstract_pd_server_1b - - feature_pd_server_1b_ps_server_1b_port + - feature_pd_server_1b_ps_server_1b_port_1 endpoint_server_1c2_oam_2: - abstract_oam_server_1c2_1 - endpoint_oam_server_1c2 @@ -1610,21 +1610,15 @@ topology_template: - abstract_oam_server_1c2_0 - endpoint_oam_server_1c2 requirements: - dependency_oam_port_2: - - abstract_oam_server_1c2_1 - - dependency_oam_server_1c2_oam_port - dependency_oam_port_1: - - abstract_oam_server_1c2_0 - - dependency_oam_server_1c2_oam_port - dependency_pd_server_port_1_nested1_pattern_4: + dependency_pd_server_1_port_nested1_pattern_4: - nested1_pattern_4 - - dependency_pd_server_port_1 - link_pd_server_port_2_nested1_pattern_4: - - nested1_pattern_4 - - link_pd_server_port_2 + - dependency_pd_server_1_port dependency_pd_server_1b_port_1: - abstract_pd_server_1b_1 - - dependency_pd_server_1b_pd_server_1b_port + - dependency_pd_server_1b_pd_server_1b_port_1 + dependency_oam_server_1c2_1_mgmt_port_0: + - abstract_oam_server_1c2_0 + - dependency_oam_server_1c2_oam_server_1c2_mgmt_port_0 dependency_server_1c2_oam_1: - abstract_oam_server_1c2_0 - dependency_oam_server_1c2 @@ -1637,24 +1631,18 @@ topology_template: local_storage_server_1c2_oam_1: - abstract_oam_server_1c2_0 - local_storage_oam_server_1c2 - dependency_cmaui_port_1: - - abstract_cmaui_1c1 - - dependency_cmaui_1c1_cmaui_port dependency_server_pd_nested1_pattern_4: - nested1_pattern_4 - dependency_server_pd - dependency_pd_server_port_2_nested1_pattern_4: + link_pd_server_1_port_nested1_pattern_4: - nested1_pattern_4 - - dependency_pd_server_port_2 - dependency_cmaui_port_2: - - abstract_cmaui_1c1 - - dependency_cmaui_1c1_cmaui_port + - link_pd_server_1_port + dependency_pd_server_2_port_nested1_pattern_4: + - nested1_pattern_4 + - dependency_pd_server_2_port dependency_packet_internal_network_1: - packet_internal_network_1 - dependency - link_pd_server_port_1_nested1_pattern_4: - - nested1_pattern_4 - - link_pd_server_port_1 dependency_server_1c1_cmaui_1: - abstract_cmaui_1c1 - dependency_cmaui_1c1 @@ -1672,16 +1660,22 @@ topology_template: - dependency_cmaui_1c1 link_pd_server_1b_port_1: - abstract_pd_server_1b_1 - - link_pd_server_1b_pd_server_1b_port + - link_pd_server_1b_pd_server_1b_port_1 + dependency_oam_server_1c2_2_mgmt_port_0: + - abstract_oam_server_1c2_1 + - dependency_oam_server_1c2_oam_server_1c2_mgmt_port_0 link_ps_server_1b_port_1: - abstract_pd_server_1b - - link_pd_server_1b_ps_server_1b_port + - link_pd_server_1b_ps_server_1b_port_1 dependency_packet_external_network_1: - packet_external_network_1 - dependency dependency_ps_server_1b_port_1: - abstract_pd_server_1b - - dependency_pd_server_1b_ps_server_1b_port + - dependency_pd_server_1b_ps_server_1b_port_1 + dependency_cmaui_1c1_1_mgmt_port_0: + - abstract_cmaui_1c1 + - dependency_cmaui_1c1_cmaui_1c1_mgmt_port_0 local_storage_server_1c1_cmaui_2: - abstract_cmaui_1c1 - local_storage_cmaui_1c1 @@ -1696,4 +1690,10 @@ topology_template: - dependency dependency_server_1b_pd_2: - abstract_pd_server_1b - - dependency_pd_server_1b \ No newline at end of file + - dependency_pd_server_1b + dependency_cmaui_1c1_2_mgmt_port_0: + - abstract_cmaui_1c1 + - dependency_cmaui_1c1_cmaui_1c1_mgmt_port_0 + link_pd_server_2_port_nested1_pattern_4: + - nested1_pattern_4 + - link_pd_server_2_port diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/in/nested1.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/in/nested1.yml index 065355486c..5780c76f91 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/in/nested1.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/in/nested1.yml @@ -100,14 +100,14 @@ resources: networks: - port: { get_resource: ps_server_1b_port } - cmaui_port_1: + cmaui_1c1_1_mgmt_port_0: type: OS::Neutron::Port properties: network: {get_resource: packet_internal_network} fixed_ips: [{"ip_address": {get_param: [cmaui_oam_ips, 0]}}] replacement_policy: AUTO - cmaui_port_2: + cmaui_1c1_2_mgmt_port_0: type: OS::Neutron::Port properties: network: {get_resource: packet_internal_network} @@ -122,7 +122,7 @@ resources: availability_zone: { get_param: availability_zone_0 } flavor: { get_param: cmaui_1c1_flavor } networks: - - port: { get_resource: cmaui_port_1 } + - port: { get_resource: cmaui_1c1_1_mgmt_port_0 } server_1c1_cmaui_2: type: OS::Nova::Server @@ -132,16 +132,16 @@ resources: availability_zone: { get_param: availability_zone_0 } flavor: { get_param: cmaui_1c1_flavor } networks: - - port: { get_resource: cmaui_port_2 } + - port: { get_resource: cmaui_1c1_2_mgmt_port_0 } - oam_port_1: + oam_server_1c2_1_mgmt_port_0: type: OS::Neutron::Port properties: network: {get_resource: packet_internal_network} fixed_ips: [{"ip_address": {get_param: [cmaui_oam_ips, 1]}}] replacement_policy: AUTO - oam_port_2: + oam_server_1c2_2_mgmt_port_0: type: OS::Neutron::Port properties: network: {get_resource: packet_external_network} @@ -156,7 +156,7 @@ resources: availability_zone: { get_param: availability_zone_0 } flavor: { get_param: oam_server_1c2_flavor } networks: - - port: { get_resource: oam_port_1 } + - port: { get_resource: oam_server_1c2_1_mgmt_port_0 } server_1c2_oam_2: type: OS::Nova::Server @@ -166,7 +166,7 @@ resources: availability_zone: { get_param: availability_zone_0 } flavor: { get_param: oam_server_1c2_flavor } networks: - - port: { get_resource: oam_port_2 } + - port: { get_resource: oam_server_1c2_2_mgmt_port_0 } packet_internal_network: type: OS::Neutron::Net 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/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/GlobalSubstitutionTypesServiceTemplate.yaml index efded1a6bc..f3636211a1 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,16 +8,24 @@ node_types: org.openecomp.resource.abstract.nodes.oam_server_1c2: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_oam_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_oam_server_1c2_mgmt_port_0_vlan_requirements: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements compute_oam_server_1c2_name: type: list required: true status: SUPPORTED entry_schema: type: string + port_oam_server_1c2_mgmt_port_0_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments index_value: type: integer description: Index value of this substitution service template runtime instance @@ -26,104 +34,96 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_oam_port_network: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_oam_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_oam_port_order: - type: integer + port_oam_server_1c2_mgmt_port_0_network_role_tag: + type: string required: true status: SUPPORTED - port_oam_port_subnetpoolid: - type: string + port_oam_server_1c2_mgmt_port_0_ip_requirements: + type: list required: true status: SUPPORTED - port_oam_port_related_networks: + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_oam_server_1c2_mgmt_port_0_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments + type: org.openecomp.datatypes.heat.neutron.port.FixedIps vm_flavor_name: type: string required: true status: SUPPORTED - compute_oam_server_1c2_availability_zone: - type: list + port_oam_server_1c2_mgmt_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: string - port_oam_port_fixed_ips: + compute_oam_server_1c2_availability_zone: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps + type: string vm_image_name: type: string required: true status: SUPPORTED - port_oam_port_vlan_requirements: + port_oam_server_1c2_mgmt_port_0_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_oam_port_ip_requirements: - type: list + type: string + port_oam_server_1c2_mgmt_port_0_order: + type: integer required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_oam_port_replacement_policy: - type: list + port_oam_server_1c2_mgmt_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: string - port_oam_port_network_role_tag: + port_oam_server_1c2_mgmt_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_oam_port_network_role: + port_oam_server_1c2_mgmt_port_0_replacement_policy: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_oam_server_1c2_mgmt_port_0_network_role: type: string required: true status: SUPPORTED requirements: - - dependency_oam_server_1c2: + - dependency_oam_server_1c2_oam_server_1c2_mgmt_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - local_storage_oam_server_1c2: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo + - link_oam_server_1c2_oam_server_1c2_mgmt_port_0: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo occurrences: - - 0 - - UNBOUNDED - - dependency_oam_server_1c2_oam_port: + - 1 + - 1 + - dependency_oam_server_1c2: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_oam_server_1c2_oam_port: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo + - local_storage_oam_server_1c2: + capability: tosca.capabilities.Attachment + node: tosca.nodes.BlockStorage + relationship: tosca.relationships.AttachesTo occurrences: - - 1 - - 1 + - 0 + - UNBOUNDED capabilities: disk.device.usage_oam_server_1c2: type: org.openecomp.capabilities.metric.Ceilometer @@ -160,18 +160,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_oam_server_1c2_oam_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.outpoing.packets_oam_server_1c2_oam_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_util_oam_server_1c2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -184,18 +172,15 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.allocation_oam_server_1c2: - 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 - attachment_oam_server_1c2_oam_port: - type: tosca.capabilities.Attachment + binding_oam_server_1c2_oam_server_1c2_mgmt_port_0: + 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: - - 1 + - 0 - UNBOUNDED - network.incoming.bytes.rate_oam_server_1c2_oam_port: + disk.device.allocation_oam_server_1c2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -219,7 +204,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_oam_server_1c2_oam_port: + network.outgoing.bytes.rate_oam_server_1c2_oam_server_1c2_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -237,13 +222,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_oam_server_1c2_oam_port: + network.incoming.packets_oam_server_1c2_oam_server_1c2_mgmt_port_0: 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_oam_server_1c2_oam_port: + network.incoming.packets.rate_oam_server_1c2_oam_server_1c2_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -261,13 +246,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_oam_server_1c2_oam_port: + cpu_oam_server_1c2: 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_oam_server_1c2: + network.outpoing.packets_oam_server_1c2_oam_server_1c2_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -309,17 +294,17 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_oam_server_1c2_oam_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED disk.ephemeral.size_oam_server_1c2: 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_oam_server_1c2_oam_server_1c2_mgmt_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED memory.resident_oam_server_1c2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -344,31 +329,33 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_oam_server_1c2_oam_server_1c2_mgmt_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED disk.usage_oam_server_1c2: 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_oam_server_1c2_oam_port: + network.outgoing.bytes_oam_server_1c2_oam_server_1c2_mgmt_port_0: 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_oam_server_1c2_oam_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 os_oam_server_1c2: type: tosca.capabilities.OperatingSystem occurrences: - 1 - UNBOUNDED + forwarder_oam_server_1c2_oam_server_1c2_mgmt_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.read.requests_oam_server_1c2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -381,8 +368,9 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_oam_server_1c2_oam_port: - type: tosca.capabilities.Node + network.incoming.bytes_oam_server_1c2_oam_server_1c2_mgmt_port_0: + 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 @@ -420,6 +408,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.packets.rate_oam_server_1c2_oam_server_1c2_mgmt_port_0: + 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_oam_server_1c2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -438,6 +432,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes.rate_oam_server_1c2_oam_server_1c2_mgmt_port_0: + 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.pd_server_1b: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: @@ -989,7 +989,14 @@ node_types: entry_schema: type: string requirements: - - dependency_cmaui_port_2: + - dependency_oam_server_1c2_1_mgmt_port_0: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - dependency_oam_server_1c2_2_mgmt_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn @@ -1038,7 +1045,14 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_cmaui_port_1: + - dependency_cmaui_1c1_2_mgmt_port_0: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - dependency_cmaui_1c1_1_mgmt_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn @@ -1058,13 +1072,6 @@ node_types: occurrences: - 1 - 1 - - dependency_oam_port_1: - capability: tosca.capabilities.Node - node: tosca.nodes.Root - relationship: tosca.relationships.DependsOn - occurrences: - - 0 - - UNBOUNDED - dependency_packet_external_network: capability: tosca.capabilities.Node node: tosca.nodes.Root @@ -1134,13 +1141,6 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_oam_port_2: - capability: tosca.capabilities.Node - node: tosca.nodes.Root - relationship: tosca.relationships.DependsOn - occurrences: - - 0 - - UNBOUNDED capabilities: disk.capacity_server_1b_pd: type: org.openecomp.capabilities.metric.Ceilometer @@ -1148,6 +1148,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets_oam_server_1c2_1_mgmt_port_0: + 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_server_1c2_oam_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1184,85 +1190,89 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.iops_server_1c2_oam_2: + network.incoming.packets_oam_server_1c2_2_mgmt_port_0: 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_server_1c2_oam_2: + feature_cmaui_1c1_1_mgmt_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + disk.iops_server_1c2_oam_2: 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_server_1c1_cmaui_2: + disk.usage_server_1c2_oam_2: 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_server_1c1_cmaui_1: - type: tosca.capabilities.Node + network.outgoing.bytes_cmaui_1c1_1_mgmt_port_0: + 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_server_1c2_oam_1: + disk.read.requests_server_1c1_cmaui_2: 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_pd_server_1b_port: + network.outgoing.bytes_cmaui_1c1_2_mgmt_port_0: 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_server_1c1_cmaui_2: + feature_server_1c1_cmaui_1: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.read.requests_server_1c1_cmaui_1: + disk.usage_server_1c2_oam_1: 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.iops_server_1b_ps: + network.incoming.bytes_pd_server_1b_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_cmaui_port_2: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_server_1c1_cmaui_2: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.iops_server_1c2_oam_1: + disk.read.requests_server_1c1_cmaui_1: 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_cmaui_port_1: + disk.device.iops_server_1b_ps: 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.packets.rate_oam_port_2: + disk.iops_server_1c2_oam_1: 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.packets.rate_oam_port_1: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_cmaui_1c1_2_mgmt_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -1340,6 +1350,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.packets.rate_oam_server_1c2_2_mgmt_port_0: + 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_server_1c1_cmaui_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1364,6 +1380,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets.rate_oam_server_1c2_1_mgmt_port_0: + 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_server_1b_ps: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1410,53 +1432,31 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_oam_port_1: - 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_oam_port_2: + memory.usage_server_1b_ps: 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_cmaui_port_1: - 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 - binding_cmaui_port_2: - 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 - memory.usage_server_1b_ps: + cpu_util_server_1b_pd: 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_server_1b_pd: + cpu_util_server_1c2_oam_1: 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_server_1c2_oam_1: + cpu_util_server_1c2_oam_2: 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_server_1c2_oam_2: + network.incoming.packets.rate_oam_server_1c2_2_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1504,13 +1504,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_cmaui_port_2: - 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_cmaui_port_1: + network.outgoing.packets.rate_oam_server_1c2_1_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1567,13 +1561,13 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.write.bytes_server_1b_ps: + network.incoming.bytes_cmaui_1c1_1_mgmt_port_0: 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_cmaui_port_1: + disk.device.write.bytes_server_1b_ps: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1585,64 +1579,48 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_cmaui_port_2: - 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_cmaui_port_1: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED network.incoming.bytes.rate_pd_server_1b_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_oam_port_2: + instance_server_1b_ps: 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_cmaui_port_2: + feature_server_1c2_oam_1: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - instance_server_1b_ps: + disk.device.capacity_server_1c1_cmaui_2: 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_server_1c2_oam_1: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - network.outgoing.bytes_oam_port_1: + instance_server_1c1_cmaui_2: 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_server_1c1_cmaui_2: + cpu.delta_server_1b_ps: 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 - instance_server_1c1_cmaui_2: + network.outgoing.bytes.rate_oam_server_1c2_2_mgmt_port_0: 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_server_1b_ps: + network.outgoing.packets.rate_cmaui_1c1_1_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1654,6 +1632,11 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_cmaui_1c1_1_mgmt_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED disk.device.read.requests.rate_server_1c2_oam_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1666,11 +1649,6 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_oam_port_2: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED disk.device.write.bytes.rate_server_1b_pd: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1695,7 +1673,21 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_oam_port_1: + binding_oam_server_1c2_2_mgmt_port_0: + 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 + network.outpoing.packets_oam_server_1c2_1_mgmt_port_0: + 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 + attachment_oam_server_1c2_1_mgmt_port_0: type: tosca.capabilities.Attachment occurrences: - 1 @@ -1769,6 +1761,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets_cmaui_1c1_2_mgmt_port_0: + 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_ps_server_1b_port: type: tosca.capabilities.network.Bindable valid_source_types: @@ -1783,16 +1781,6 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_cmaui_port_2: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - forwarder_cmaui_port_1: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED disk.device.write.requests_server_1b_ps: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1834,6 +1822,20 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_cmaui_1c1_2_mgmt_port_0: + 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 + network.outgoing.bytes_oam_server_1c2_1_mgmt_port_0: + 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_server_1b_pd: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1846,6 +1848,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes_oam_server_1c2_1_mgmt_port_0: + 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.allocation_server_1c2_oam_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1896,14 +1904,6 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_oam_port_2: - 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 disk.write.bytes.rate_server_1c1_cmaui_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1922,13 +1922,15 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_oam_port_1: - 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 + feature_oam_server_1c2_2_mgmt_port_0: + type: tosca.capabilities.Node occurrences: - - 0 + - 1 + - UNBOUNDED + forwarder_oam_server_1c2_1_mgmt_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 - UNBOUNDED disk.read.bytes.rate_server_1c1_cmaui_2: type: org.openecomp.capabilities.metric.Ceilometer @@ -1962,24 +1964,12 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_cmaui_port_1: - 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.allocation_server_1b_ps: 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_cmaui_port_2: - 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_server_1c2_oam_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2057,25 +2047,25 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.root.size_server_1c2_oam_2: + network.incoming.bytes.rate_cmaui_1c1_2_mgmt_port_0: 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_server_1c1_cmaui_1: + disk.root.size_server_1c2_oam_2: 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_ps_server_1b_port: + memory.resident_server_1c1_cmaui_1: 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_oam_port_1: + network.incoming.bytes.rate_ps_server_1b_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: @@ -2086,6 +2076,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes.rate_oam_server_1c2_1_mgmt_port_0: + 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_server_1c1_cmaui_1: type: tosca.capabilities.OperatingSystem occurrences: @@ -2097,13 +2093,19 @@ node_types: occurrences: - 1 - UNBOUNDED - instance_server_1c2_oam_2: + network.incoming.bytes.rate_cmaui_1c1_1_mgmt_port_0: + 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_cmaui_1c1_1_mgmt_port_0: 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_oam_port_2: + instance_server_1c2_oam_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2115,6 +2117,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes.rate_cmaui_1c1_2_mgmt_port_0: + 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_server_1c1_cmaui_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2178,16 +2186,6 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_oam_port_1: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - forwarder_oam_port_2: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED binding_server_1c2_oam_2: type: tosca.capabilities.network.Bindable occurrences: @@ -2208,6 +2206,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_cmaui_1c1_1_mgmt_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED network.outgoing.packets.rate_pd_server_1b_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2238,6 +2241,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_cmaui_1c1_2_mgmt_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.write.requests_server_1c2_oam_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2261,6 +2269,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes.rate_oam_server_1c2_2_mgmt_port_0: + 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_server_1b_ps: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2303,25 +2317,25 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_cmaui_port_2: + disk.device.write.bytes.rate_server_1c1_cmaui_2: 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_server_1c1_cmaui_2: + disk.ephemeral.size_server_1b_pd: 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.ephemeral.size_server_1b_pd: + disk.device.write.requests_server_1c2_oam_2: 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_server_1c2_oam_2: + network.incoming.packets.rate_cmaui_1c1_1_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2339,7 +2353,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_cmaui_port_1: + network.incoming.packets.rate_cmaui_1c1_2_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2455,24 +2469,12 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_oam_port_1: - 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_server_1b_ps: 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_oam_port_2: - 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 end_point_packet_external_network: type: tosca.capabilities.Endpoint occurrences: @@ -2507,6 +2509,18 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_cmaui_1c1_2_mgmt_port_0: + 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_cmaui_1c1_1_mgmt_port_0: + 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_server_1b_pd: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2561,12 +2575,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_cmaui_port_2: - 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_server_1b_pd: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2579,12 +2587,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_cmaui_port_1: - 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_server_1c1_cmaui_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2645,12 +2647,23 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_cmaui_1c1_2_mgmt_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED cpu.delta_server_1c2_oam_2: 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_oam_server_1c2_1_mgmt_port_0: + 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.iops_server_1b_pd: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2663,6 +2676,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes_cmaui_1c1_2_mgmt_port_0: + 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_server_1c1_cmaui_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2686,7 +2705,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_oam_port_2: + network.outgoing.packets.rate_cmaui_1c1_2_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2697,12 +2716,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_oam_port_1: - 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_pd_server_1b_port: type: org.openecomp.capabilities.Forwarder occurrences: @@ -2714,23 +2727,6 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_cmaui_port_2: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - network.outgoing.bytes.rate_oam_port_1: - 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_oam_port_2: - 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.iops_server_1b_ps: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2743,23 +2739,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_cmaui_port_1: - 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.packets.rate_cmaui_port_2: - 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 - attachment_cmaui_port_1: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED disk.capacity_server_1c1_cmaui_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2784,6 +2763,14 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_oam_server_1c2_1_mgmt_port_0: + 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 disk.device.read.requests.rate_server_1c1_cmaui_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2808,6 +2795,11 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_oam_server_1c2_2_mgmt_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED network.incoming.packets_ps_server_1b_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2820,6 +2812,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets_cmaui_1c1_1_mgmt_port_0: + 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_pd_server_1b_port: type: tosca.capabilities.Node occurrences: @@ -2895,13 +2893,23 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_oam_port_2: - type: tosca.capabilities.Node + network.outgoing.bytes_oam_server_1c2_2_mgmt_port_0: + 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_oam_port_1: - type: tosca.capabilities.Node + binding_cmaui_1c1_1_mgmt_port_0: + 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 + network.incoming.bytes_oam_server_1c2_2_mgmt_port_0: + 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 @@ -2928,6 +2936,11 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_oam_server_1c2_1_mgmt_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED link_packet_internal_network: type: tosca.capabilities.network.Linkable occurrences: @@ -2961,26 +2974,19 @@ node_types: occurrences: - 1 - UNBOUNDED - endpoint_server_1b_ps: - type: tosca.capabilities.Endpoint.Admin - occurrences: - - 1 - - UNBOUNDED - network.incoming.packets_oam_port_1: + network.outpoing.packets_oam_server_1c2_2_mgmt_port_0: 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_oam_port_2: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + endpoint_server_1b_ps: + type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_cmaui_port_1: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_oam_server_1c2_2_mgmt_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED @@ -2990,12 +2996,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_cmaui_port_2: - 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_server_1b_ps: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3496,71 +3496,73 @@ node_types: org.openecomp.resource.abstract.nodes.cmaui_1c1: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_cmaui_port_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_cmaui_port_fixed_ips: + port_cmaui_1c1_mgmt_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_cmaui_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true + type: org.openecomp.datatypes.network.IpRequirements + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 status: SUPPORTED - port_cmaui_port_network: + constraints: + - greater_or_equal: 0 + port_cmaui_1c1_mgmt_port_0_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_cmaui_port_related_networks: + port_cmaui_1c1_mgmt_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - status: SUPPORTED - constraints: - - greater_or_equal: 0 + type: org.openecomp.datatypes.network.VlanRequirements compute_cmaui_1c1_availability_zone: type: list required: true status: SUPPORTED entry_schema: type: string - port_cmaui_port_network_role_tag: - type: string + port_cmaui_1c1_mgmt_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_cmaui_port_order: - type: integer + port_cmaui_1c1_mgmt_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED vm_flavor_name: type: string required: true status: SUPPORTED - port_cmaui_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_cmaui_1c1_mgmt_port_0_fixed_ips: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_cmaui_1c1_mgmt_port_0_network_role: + type: string required: true status: SUPPORTED - port_cmaui_port_replacement_policy: + port_cmaui_1c1_mgmt_port_0_replacement_policy: type: list required: true status: SUPPORTED entry_schema: type: string - port_cmaui_port_network_role: + port_cmaui_1c1_mgmt_port_0_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_cmaui_1c1_mgmt_port_0_network_role_tag: type: string required: true status: SUPPORTED @@ -3568,31 +3570,29 @@ node_types: type: string required: true status: SUPPORTED - port_cmaui_port_ip_requirements: - type: list + port_cmaui_1c1_mgmt_port_0_order: + type: integer + required: true + status: SUPPORTED + port_cmaui_1c1_mgmt_port_0_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements compute_cmaui_1c1_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_cmaui_port_subnetpoolid: - type: string - required: true - status: SUPPORTED requirements: - - dependency_cmaui_1c1_cmaui_port: + - dependency_cmaui_1c1_cmaui_1c1_mgmt_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_cmaui_1c1_cmaui_port: + - link_cmaui_1c1_cmaui_1c1_mgmt_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -3613,14 +3613,6 @@ node_types: - 0 - UNBOUNDED capabilities: - binding_cmaui_1c1_cmaui_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 disk.iops_cmaui_1c1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3644,49 +3636,50 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_cmaui_1c1_cmaui_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_cmaui_1c1_cmaui_1c1_mgmt_port_0: + 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: - - 1 + - 0 - UNBOUNDED - network.incoming.packets_cmaui_1c1_cmaui_port: + network.outgoing.bytes.rate_cmaui_1c1_cmaui_1c1_mgmt_port_0: 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_cmaui_1c1_cmaui_port: + network.outgoing.bytes_cmaui_1c1_cmaui_1c1_mgmt_port_0: 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_cmaui_1c1_cmaui_port: + memory_cmaui_1c1: 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_cmaui_1c1_cmaui_port: + disk.latency_cmaui_1c1: 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_cmaui_1c1: + disk.read.bytes.rate_cmaui_1c1: 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_cmaui_1c1: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_cmaui_1c1_cmaui_1c1_mgmt_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - disk.read.bytes.rate_cmaui_1c1: + network.incoming.packets_cmaui_1c1_cmaui_1c1_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -3722,25 +3715,25 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_cmaui_1c1_cmaui_port: + disk.device.read.bytes.rate_cmaui_1c1: 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_cmaui_1c1: + disk.ephemeral.size_cmaui_1c1: 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.ephemeral.size_cmaui_1c1: + instance_cmaui_1c1: 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 - instance_cmaui_1c1: + network.incoming.packets.rate_cmaui_1c1_cmaui_1c1_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -3752,6 +3745,11 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_cmaui_1c1_cmaui_1c1_mgmt_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.device.write.bytes.rate_cmaui_1c1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3795,12 +3793,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_cmaui_1c1_cmaui_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.write.bytes.rate_cmaui_1c1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3841,20 +3833,25 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes_cmaui_1c1_cmaui_1c1_mgmt_port_0: + 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_cmaui_1c1: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_cmaui_1c1_cmaui_port: + disk.allocation_cmaui_1c1: 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.allocation_cmaui_1c1: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_cmaui_1c1_cmaui_1c1_mgmt_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED @@ -3870,8 +3867,9 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_cmaui_1c1_cmaui_port: - type: org.openecomp.capabilities.Forwarder + network.outgoing.packets.rate_cmaui_1c1_cmaui_1c1_mgmt_port_0: + 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 @@ -3887,12 +3885,13 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_cmaui_1c1_cmaui_port: - type: tosca.capabilities.Attachment + disk.usage_cmaui_1c1: + 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_cmaui_1c1: + network.incoming.bytes.rate_cmaui_1c1_cmaui_1c1_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -3915,8 +3914,9 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_cmaui_1c1_cmaui_port: - type: tosca.capabilities.Node + network.outpoing.packets_cmaui_1c1_cmaui_1c1_mgmt_port_0: + 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 @@ -3925,4 +3925,4 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - - UNBOUNDED \ No newline at end of file + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_cmaui_1c1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_cmaui_1c1ServiceTemplate.yaml index c7ec23eb2e..b75b3833cd 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_cmaui_1c1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_cmaui_1c1ServiceTemplate.yaml @@ -11,29 +11,11 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_cmaui_port_vlan_requirements: + port_cmaui_1c1_mgmt_port_0_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_cmaui_port_fixed_ips: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_cmaui_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_cmaui_port_network: - type: list - required: true - entry_schema: - type: string - port_cmaui_port_related_networks: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments + type: org.openecomp.datatypes.network.IpRequirements index_value: type: integer description: Index value of this substitution service template runtime instance @@ -41,81 +23,99 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 + port_cmaui_1c1_mgmt_port_0_network: + type: list + required: true + entry_schema: + type: string + port_cmaui_1c1_mgmt_port_0_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements compute_cmaui_1c1_availability_zone: type: list required: true entry_schema: type: string - port_cmaui_port_network_role_tag: - type: string + port_cmaui_1c1_mgmt_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - port_cmaui_port_order: - type: integer + port_cmaui_1c1_mgmt_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true vm_flavor_name: type: string required: true - port_cmaui_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_cmaui_1c1_mgmt_port_0_fixed_ips: + type: list required: true - port_cmaui_port_replacement_policy: + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_cmaui_1c1_mgmt_port_0_network_role: + type: string + required: true + port_cmaui_1c1_mgmt_port_0_replacement_policy: type: list required: true entry_schema: type: string - port_cmaui_port_network_role: + port_cmaui_1c1_mgmt_port_0_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_cmaui_1c1_mgmt_port_0_network_role_tag: type: string required: true vm_image_name: type: string required: true - port_cmaui_port_ip_requirements: - type: list + port_cmaui_1c1_mgmt_port_0_order: + type: integer + required: true + port_cmaui_1c1_mgmt_port_0_subnetpoolid: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements compute_cmaui_1c1_name: type: list required: true entry_schema: type: string - port_cmaui_port_subnetpoolid: - type: string - required: true node_templates: - cmaui_1c1_cmaui_port: + cmaui_1c1_cmaui_1c1_mgmt_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_cmaui_port_replacement_policy + - port_cmaui_1c1_mgmt_port_0_replacement_policy - index_value mac_requirements: - get_input: port_cmaui_port_mac_requirements + get_input: port_cmaui_1c1_mgmt_port_0_mac_requirements order: - get_input: port_cmaui_port_order + get_input: port_cmaui_1c1_mgmt_port_0_order exCP_naming: - get_input: port_cmaui_port_exCP_naming + get_input: port_cmaui_1c1_mgmt_port_0_exCP_naming vlan_requirements: - get_input: port_cmaui_port_vlan_requirements + get_input: port_cmaui_1c1_mgmt_port_0_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_cmaui_port_ip_requirements + get_input: port_cmaui_1c1_mgmt_port_0_ip_requirements related_networks: - get_input: port_cmaui_port_related_networks + get_input: port_cmaui_1c1_mgmt_port_0_related_networks network_role_tag: - get_input: port_cmaui_port_network_role_tag + get_input: port_cmaui_1c1_mgmt_port_0_network_role_tag network_role: - get_input: port_cmaui_port_network_role + get_input: port_cmaui_1c1_mgmt_port_0_network_role fixed_ips: get_input: - - port_cmaui_port_fixed_ips + - port_cmaui_1c1_mgmt_port_0_fixed_ips - index_value subnetpoolid: - get_input: port_cmaui_port_subnetpoolid + get_input: port_cmaui_1c1_mgmt_port_0_subnetpoolid network: get_input: - - port_cmaui_port_network + - port_cmaui_1c1_mgmt_port_0_network - index_value requirements: - binding: @@ -140,9 +140,6 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.cmaui_1c1 capabilities: - binding_cmaui_1c1_cmaui_port: - - cmaui_1c1_cmaui_port - - binding disk.iops_cmaui_1c1: - cmaui_1c1 - disk.iops @@ -155,21 +152,15 @@ topology_template: endpoint_cmaui_1c1: - cmaui_1c1 - endpoint - network.incoming.bytes.rate_cmaui_1c1_cmaui_port: - - cmaui_1c1_cmaui_port - - network.incoming.bytes.rate - network.incoming.packets_cmaui_1c1_cmaui_port: - - cmaui_1c1_cmaui_port - - network.incoming.packets - network.outgoing.bytes_cmaui_1c1_cmaui_port: - - cmaui_1c1_cmaui_port - - network.outgoing.bytes - network.outgoing.bytes.rate_cmaui_1c1_cmaui_port: - - cmaui_1c1_cmaui_port + binding_cmaui_1c1_cmaui_1c1_mgmt_port_0: + - cmaui_1c1_cmaui_1c1_mgmt_port_0 + - binding + network.outgoing.bytes.rate_cmaui_1c1_cmaui_1c1_mgmt_port_0: + - cmaui_1c1_cmaui_1c1_mgmt_port_0 - network.outgoing.bytes.rate - network.outpoing.packets_cmaui_1c1_cmaui_port: - - cmaui_1c1_cmaui_port - - network.outpoing.packets + network.outgoing.bytes_cmaui_1c1_cmaui_1c1_mgmt_port_0: + - cmaui_1c1_cmaui_1c1_mgmt_port_0 + - network.outgoing.bytes memory_cmaui_1c1: - cmaui_1c1 - memory @@ -179,6 +170,12 @@ topology_template: disk.read.bytes.rate_cmaui_1c1: - cmaui_1c1 - disk.read.bytes.rate + attachment_cmaui_1c1_cmaui_1c1_mgmt_port_0: + - cmaui_1c1_cmaui_1c1_mgmt_port_0 + - attachment + network.incoming.packets_cmaui_1c1_cmaui_1c1_mgmt_port_0: + - cmaui_1c1_cmaui_1c1_mgmt_port_0 + - network.incoming.packets disk.write.requests.rate_cmaui_1c1: - cmaui_1c1 - disk.write.requests.rate @@ -194,9 +191,6 @@ topology_template: cpu_util_cmaui_1c1: - cmaui_1c1 - cpu_util - network.outgoing.packets.rate_cmaui_1c1_cmaui_port: - - cmaui_1c1_cmaui_port - - network.outgoing.packets.rate disk.device.read.bytes.rate_cmaui_1c1: - cmaui_1c1 - disk.device.read.bytes.rate @@ -206,9 +200,15 @@ topology_template: instance_cmaui_1c1: - cmaui_1c1 - instance + network.incoming.packets.rate_cmaui_1c1_cmaui_1c1_mgmt_port_0: + - cmaui_1c1_cmaui_1c1_mgmt_port_0 + - network.incoming.packets.rate disk.device.read.requests_cmaui_1c1: - cmaui_1c1 - disk.device.read.requests + feature_cmaui_1c1_cmaui_1c1_mgmt_port_0: + - cmaui_1c1_cmaui_1c1_mgmt_port_0 + - feature disk.device.write.bytes.rate_cmaui_1c1: - cmaui_1c1 - disk.device.write.bytes.rate @@ -230,9 +230,6 @@ topology_template: disk.device.latency_cmaui_1c1: - cmaui_1c1 - disk.device.latency - network.incoming.bytes_cmaui_1c1_cmaui_port: - - cmaui_1c1_cmaui_port - - network.incoming.bytes disk.write.bytes.rate_cmaui_1c1: - cmaui_1c1 - disk.write.bytes.rate @@ -254,36 +251,39 @@ topology_template: disk.device.read.requests.rate_cmaui_1c1: - cmaui_1c1 - disk.device.read.requests.rate + network.incoming.bytes_cmaui_1c1_cmaui_1c1_mgmt_port_0: + - cmaui_1c1_cmaui_1c1_mgmt_port_0 + - network.incoming.bytes feature_cmaui_1c1: - cmaui_1c1 - feature - network.incoming.packets.rate_cmaui_1c1_cmaui_port: - - cmaui_1c1_cmaui_port - - network.incoming.packets.rate disk.allocation_cmaui_1c1: - cmaui_1c1 - disk.allocation + forwarder_cmaui_1c1_cmaui_1c1_mgmt_port_0: + - cmaui_1c1_cmaui_1c1_mgmt_port_0 + - forwarder disk.device.allocation_cmaui_1c1: - cmaui_1c1 - disk.device.allocation disk.device.write.requests.rate_cmaui_1c1: - cmaui_1c1 - disk.device.write.requests.rate - forwarder_cmaui_1c1_cmaui_port: - - cmaui_1c1_cmaui_port - - forwarder + network.outgoing.packets.rate_cmaui_1c1_cmaui_1c1_mgmt_port_0: + - cmaui_1c1_cmaui_1c1_mgmt_port_0 + - network.outgoing.packets.rate disk.device.write.bytes_cmaui_1c1: - cmaui_1c1 - disk.device.write.bytes memory.resident_cmaui_1c1: - cmaui_1c1 - memory.resident - attachment_cmaui_1c1_cmaui_port: - - cmaui_1c1_cmaui_port - - attachment disk.usage_cmaui_1c1: - cmaui_1c1 - disk.usage + network.incoming.bytes.rate_cmaui_1c1_cmaui_1c1_mgmt_port_0: + - cmaui_1c1_cmaui_1c1_mgmt_port_0 + - network.incoming.bytes.rate disk.read.requests_cmaui_1c1: - cmaui_1c1 - disk.read.requests @@ -293,22 +293,22 @@ topology_template: vcpus_cmaui_1c1: - cmaui_1c1 - vcpus - feature_cmaui_1c1_cmaui_port: - - cmaui_1c1_cmaui_port - - feature + network.outpoing.packets_cmaui_1c1_cmaui_1c1_mgmt_port_0: + - cmaui_1c1_cmaui_1c1_mgmt_port_0 + - network.outpoing.packets cpu.delta_cmaui_1c1: - cmaui_1c1 - cpu.delta requirements: - dependency_cmaui_1c1_cmaui_port: - - cmaui_1c1_cmaui_port - - dependency + link_cmaui_1c1_cmaui_1c1_mgmt_port_0: + - cmaui_1c1_cmaui_1c1_mgmt_port_0 + - link dependency_cmaui_1c1: - cmaui_1c1 - dependency - link_cmaui_1c1_cmaui_port: - - cmaui_1c1_cmaui_port - - link + dependency_cmaui_1c1_cmaui_1c1_mgmt_port_0: + - cmaui_1c1_cmaui_1c1_mgmt_port_0 + - dependency local_storage_cmaui_1c1: - cmaui_1c1 - - local_storage \ No newline at end of file + - local_storage 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/Nested_oam_server_1c2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_oam_server_1c2ServiceTemplate.yaml index 7fd2a8585f..a1b61484c5 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_oam_server_1c2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_oam_server_1c2ServiceTemplate.yaml @@ -11,14 +11,21 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_oam_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_oam_server_1c2_mgmt_port_0_vlan_requirements: + type: list required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements compute_oam_server_1c2_name: type: list required: true entry_schema: type: string + port_oam_server_1c2_mgmt_port_0_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments index_value: type: integer description: Index value of this substitution service template runtime instance @@ -26,117 +33,110 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_oam_port_network: + port_oam_server_1c2_mgmt_port_0_network_role_tag: + type: string + required: true + port_oam_server_1c2_mgmt_port_0_ip_requirements: type: list required: true entry_schema: - type: string - port_oam_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_oam_port_order: - type: integer - required: true - port_oam_port_subnetpoolid: - type: string - required: true - port_oam_port_related_networks: + type: org.openecomp.datatypes.network.IpRequirements + port_oam_server_1c2_mgmt_port_0_fixed_ips: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments + type: org.openecomp.datatypes.heat.neutron.port.FixedIps vm_flavor_name: type: string required: true + port_oam_server_1c2_mgmt_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true compute_oam_server_1c2_availability_zone: type: list required: true entry_schema: type: string - port_oam_port_fixed_ips: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps vm_image_name: type: string required: true - port_oam_port_vlan_requirements: + port_oam_server_1c2_mgmt_port_0_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_oam_port_ip_requirements: - type: list + type: string + port_oam_server_1c2_mgmt_port_0_order: + type: integer required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_oam_port_replacement_policy: + port_oam_server_1c2_mgmt_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_oam_server_1c2_mgmt_port_0_subnetpoolid: + type: string + required: true + port_oam_server_1c2_mgmt_port_0_replacement_policy: type: list required: true entry_schema: type: string - port_oam_port_network_role_tag: - type: string - required: true - port_oam_port_network_role: + port_oam_server_1c2_mgmt_port_0_network_role: type: string required: true node_templates: - oam_server_1c2: - type: org.openecomp.resource.vfc.compute.nodes.heat.oam_server_1c2 - properties: - availability_zone: - get_input: - - compute_oam_server_1c2_availability_zone - - index_value - flavor: - get_input: vm_flavor_name - image: - get_input: vm_image_name - name: - get_input: - - compute_oam_server_1c2_name - - index_value - oam_server_1c2_oam_port: + oam_server_1c2_oam_server_1c2_mgmt_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_oam_port_replacement_policy + - port_oam_server_1c2_mgmt_port_0_replacement_policy - index_value mac_requirements: - get_input: port_oam_port_mac_requirements + get_input: port_oam_server_1c2_mgmt_port_0_mac_requirements order: - get_input: port_oam_port_order + get_input: port_oam_server_1c2_mgmt_port_0_order exCP_naming: - get_input: port_oam_port_exCP_naming + get_input: port_oam_server_1c2_mgmt_port_0_exCP_naming vlan_requirements: - get_input: port_oam_port_vlan_requirements + get_input: port_oam_server_1c2_mgmt_port_0_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_oam_port_ip_requirements + get_input: port_oam_server_1c2_mgmt_port_0_ip_requirements related_networks: - get_input: port_oam_port_related_networks + get_input: port_oam_server_1c2_mgmt_port_0_related_networks network_role_tag: - get_input: port_oam_port_network_role_tag + get_input: port_oam_server_1c2_mgmt_port_0_network_role_tag network_role: - get_input: port_oam_port_network_role + get_input: port_oam_server_1c2_mgmt_port_0_network_role fixed_ips: get_input: - - port_oam_port_fixed_ips + - port_oam_server_1c2_mgmt_port_0_fixed_ips - index_value subnetpoolid: - get_input: port_oam_port_subnetpoolid + get_input: port_oam_server_1c2_mgmt_port_0_subnetpoolid network: get_input: - - port_oam_port_network + - port_oam_server_1c2_mgmt_port_0_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: oam_server_1c2 relationship: tosca.relationships.network.BindsTo + oam_server_1c2: + type: org.openecomp.resource.vfc.compute.nodes.heat.oam_server_1c2 + properties: + availability_zone: + get_input: + - compute_oam_server_1c2_availability_zone + - index_value + flavor: + get_input: vm_flavor_name + image: + get_input: vm_image_name + name: + get_input: + - compute_oam_server_1c2_name + - index_value substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.oam_server_1c2 capabilities: @@ -158,27 +158,18 @@ topology_template: disk.device.write.bytes.rate_oam_server_1c2: - oam_server_1c2 - disk.device.write.bytes.rate - network.outgoing.packets.rate_oam_server_1c2_oam_port: - - oam_server_1c2_oam_port - - network.outgoing.packets.rate - network.outpoing.packets_oam_server_1c2_oam_port: - - oam_server_1c2_oam_port - - network.outpoing.packets cpu_util_oam_server_1c2: - oam_server_1c2 - cpu_util disk.device.write.bytes_oam_server_1c2: - oam_server_1c2 - disk.device.write.bytes + binding_oam_server_1c2_oam_server_1c2_mgmt_port_0: + - oam_server_1c2_oam_server_1c2_mgmt_port_0 + - binding disk.device.allocation_oam_server_1c2: - oam_server_1c2 - disk.device.allocation - attachment_oam_server_1c2_oam_port: - - oam_server_1c2_oam_port - - attachment - network.incoming.bytes.rate_oam_server_1c2_oam_port: - - oam_server_1c2_oam_port - - network.incoming.bytes.rate disk.root.size_oam_server_1c2: - oam_server_1c2 - disk.root.size @@ -188,33 +179,33 @@ topology_template: disk.read.bytes.rate_oam_server_1c2: - oam_server_1c2 - disk.read.bytes.rate - network.outgoing.bytes_oam_server_1c2_oam_port: - - oam_server_1c2_oam_port - - network.outgoing.bytes + network.outgoing.bytes.rate_oam_server_1c2_oam_server_1c2_mgmt_port_0: + - oam_server_1c2_oam_server_1c2_mgmt_port_0 + - network.outgoing.bytes.rate disk.allocation_oam_server_1c2: - oam_server_1c2 - disk.allocation disk.read.bytes_oam_server_1c2: - oam_server_1c2 - disk.read.bytes - network.incoming.bytes_oam_server_1c2_oam_port: - - oam_server_1c2_oam_port - - network.incoming.bytes - network.outgoing.bytes.rate_oam_server_1c2_oam_port: - - oam_server_1c2_oam_port - - network.outgoing.bytes.rate + network.incoming.packets_oam_server_1c2_oam_server_1c2_mgmt_port_0: + - oam_server_1c2_oam_server_1c2_mgmt_port_0 + - network.incoming.packets + network.incoming.packets.rate_oam_server_1c2_oam_server_1c2_mgmt_port_0: + - oam_server_1c2_oam_server_1c2_mgmt_port_0 + - network.incoming.packets.rate vcpus_oam_server_1c2: - oam_server_1c2 - vcpus disk.device.read.bytes.rate_oam_server_1c2: - oam_server_1c2 - disk.device.read.bytes.rate - network.incoming.packets_oam_server_1c2_oam_port: - - oam_server_1c2_oam_port - - network.incoming.packets cpu_oam_server_1c2: - oam_server_1c2 - cpu + network.outpoing.packets_oam_server_1c2_oam_server_1c2_mgmt_port_0: + - oam_server_1c2_oam_server_1c2_mgmt_port_0 + - network.outpoing.packets disk.write.requests.rate_oam_server_1c2: - oam_server_1c2 - disk.write.requests.rate @@ -233,12 +224,12 @@ topology_template: endpoint_oam_server_1c2: - oam_server_1c2 - endpoint - forwarder_oam_server_1c2_oam_port: - - oam_server_1c2_oam_port - - forwarder disk.ephemeral.size_oam_server_1c2: - oam_server_1c2 - disk.ephemeral.size + feature_oam_server_1c2_oam_server_1c2_mgmt_port_0: + - oam_server_1c2_oam_server_1c2_mgmt_port_0 + - feature memory.resident_oam_server_1c2: - oam_server_1c2 - memory.resident @@ -251,27 +242,30 @@ topology_template: memory.usage_oam_server_1c2: - oam_server_1c2 - memory.usage + attachment_oam_server_1c2_oam_server_1c2_mgmt_port_0: + - oam_server_1c2_oam_server_1c2_mgmt_port_0 + - attachment disk.usage_oam_server_1c2: - oam_server_1c2 - disk.usage - network.incoming.packets.rate_oam_server_1c2_oam_port: - - oam_server_1c2_oam_port - - network.incoming.packets.rate - binding_oam_server_1c2_oam_port: - - oam_server_1c2_oam_port - - binding + network.outgoing.bytes_oam_server_1c2_oam_server_1c2_mgmt_port_0: + - oam_server_1c2_oam_server_1c2_mgmt_port_0 + - network.outgoing.bytes os_oam_server_1c2: - oam_server_1c2 - os + forwarder_oam_server_1c2_oam_server_1c2_mgmt_port_0: + - oam_server_1c2_oam_server_1c2_mgmt_port_0 + - forwarder disk.device.read.requests_oam_server_1c2: - oam_server_1c2 - disk.device.read.requests disk.latency_oam_server_1c2: - oam_server_1c2 - disk.latency - feature_oam_server_1c2_oam_port: - - oam_server_1c2_oam_port - - feature + network.incoming.bytes_oam_server_1c2_oam_server_1c2_mgmt_port_0: + - oam_server_1c2_oam_server_1c2_mgmt_port_0 + - network.incoming.bytes disk.write.requests_oam_server_1c2: - oam_server_1c2 - disk.write.requests @@ -290,6 +284,9 @@ topology_template: disk.write.bytes_oam_server_1c2: - oam_server_1c2 - disk.write.bytes + network.outgoing.packets.rate_oam_server_1c2_oam_server_1c2_mgmt_port_0: + - oam_server_1c2_oam_server_1c2_mgmt_port_0 + - network.outgoing.packets.rate disk.capacity_oam_server_1c2: - oam_server_1c2 - disk.capacity @@ -299,16 +296,19 @@ topology_template: disk.iops_oam_server_1c2: - oam_server_1c2 - disk.iops + network.incoming.bytes.rate_oam_server_1c2_oam_server_1c2_mgmt_port_0: + - oam_server_1c2_oam_server_1c2_mgmt_port_0 + - network.incoming.bytes.rate requirements: local_storage_oam_server_1c2: - oam_server_1c2 - local_storage + dependency_oam_server_1c2_oam_server_1c2_mgmt_port_0: + - oam_server_1c2_oam_server_1c2_mgmt_port_0 + - dependency dependency_oam_server_1c2: - oam_server_1c2 - dependency - link_oam_server_1c2_oam_port: - - oam_server_1c2_oam_port + link_oam_server_1c2_oam_server_1c2_mgmt_port_0: + - oam_server_1c2_oam_server_1c2_mgmt_port_0 - link - dependency_oam_server_1c2_oam_port: - - oam_server_1c2_oam_port - - 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/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 0b54217586..84767d7fd3 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 @@ -129,7 +129,24 @@ topology_template: directives: - substitutable properties: - port_cmaui_port_fixed_ips: + port_cmaui_1c1_mgmt_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + port_cmaui_1c1_mgmt_port_0_network: + - packet_internal_network + - packet_internal_network + compute_cmaui_1c1_availability_zone: + - get_input: availability_zone_0 + - get_input: availability_zone_0 + port_cmaui_1c1_mgmt_port_0_mac_requirements: + mac_count_required: + is_required: false + vm_flavor_name: + get_input: cmaui_1c1_flavor + port_cmaui_1c1_mgmt_port_0_fixed_ips: - - ip_address: get_input: - cmaui_oam_ips @@ -138,28 +155,11 @@ topology_template: get_input: - cmaui_oam_ips - 0 - port_cmaui_port_network: - - packet_internal_network - - packet_internal_network - compute_cmaui_1c1_availability_zone: - - get_input: availability_zone_0 - - get_input: availability_zone_0 - vm_flavor_name: - get_input: cmaui_1c1_flavor - port_cmaui_port_mac_requirements: - mac_count_required: - is_required: false - port_cmaui_port_replacement_policy: + port_cmaui_1c1_mgmt_port_0_replacement_policy: - AUTO - AUTO vm_image_name: get_input: cmaui_1c1_image - port_cmaui_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false compute_cmaui_1c1_name: - get_input: - cmaui_1c1_names @@ -176,7 +176,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_cmaui_1c1_cmaui_port: + - link_cmaui_1c1_cmaui_1c1_mgmt_port_0: capability: tosca.capabilities.network.Linkable node: packet_internal_network relationship: tosca.relationships.network.LinksTo @@ -277,33 +277,33 @@ topology_template: directives: - substitutable properties: - port_oam_port_mac_requirements: - mac_count_required: - is_required: false compute_oam_server_1c2_name: - get_input: - oam_server_1c2_names - 1 - port_oam_port_network: - - packet_external_network - vm_flavor_name: - get_input: oam_server_1c2_flavor - compute_oam_server_1c2_availability_zone: - - get_input: availability_zone_0 - port_oam_port_fixed_ips: + port_oam_server_1c2_mgmt_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + port_oam_server_1c2_mgmt_port_0_fixed_ips: - ip_address: get_input: - cmaui_oam_ips - 1 + vm_flavor_name: + get_input: oam_server_1c2_flavor + port_oam_server_1c2_mgmt_port_0_mac_requirements: + mac_count_required: + is_required: false + compute_oam_server_1c2_availability_zone: + - get_input: availability_zone_0 vm_image_name: get_input: oam_server_1c2_image - port_oam_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false - port_oam_port_replacement_policy: + port_oam_server_1c2_mgmt_port_0_network: + - packet_external_network + port_oam_server_1c2_mgmt_port_0_replacement_policy: - AUTO service_template_filter: substitute_service_template: Nested_oam_server_1c2ServiceTemplate.yaml @@ -314,7 +314,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_oam_server_1c2_oam_port: + - link_oam_server_1c2_oam_server_1c2_mgmt_port_0: capability: tosca.capabilities.network.Linkable node: packet_external_network relationship: tosca.relationships.network.LinksTo @@ -323,33 +323,33 @@ topology_template: directives: - substitutable properties: - port_oam_port_mac_requirements: - mac_count_required: - is_required: false compute_oam_server_1c2_name: - get_input: - oam_server_1c2_names - 0 - port_oam_port_network: - - packet_internal_network - vm_flavor_name: - get_input: oam_server_1c2_flavor - compute_oam_server_1c2_availability_zone: - - get_input: availability_zone_0 - port_oam_port_fixed_ips: + port_oam_server_1c2_mgmt_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + port_oam_server_1c2_mgmt_port_0_fixed_ips: - ip_address: get_input: - cmaui_oam_ips - 1 + vm_flavor_name: + get_input: oam_server_1c2_flavor + port_oam_server_1c2_mgmt_port_0_mac_requirements: + mac_count_required: + is_required: false + compute_oam_server_1c2_availability_zone: + - get_input: availability_zone_0 vm_image_name: get_input: oam_server_1c2_image - port_oam_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false - port_oam_port_replacement_policy: + port_oam_server_1c2_mgmt_port_0_network: + - packet_internal_network + port_oam_server_1c2_mgmt_port_0_replacement_policy: - AUTO service_template_filter: substitute_service_template: Nested_oam_server_1c2ServiceTemplate.yaml @@ -360,7 +360,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_oam_server_1c2_oam_port: + - link_oam_server_1c2_oam_server_1c2_mgmt_port_0: capability: tosca.capabilities.network.Linkable node: packet_internal_network relationship: tosca.relationships.network.LinksTo @@ -384,6 +384,9 @@ topology_template: disk.capacity_server_1b_pd: - abstract_pd_server_1b - disk.capacity_pd_server_1b + network.incoming.packets_oam_server_1c2_1_mgmt_port_0: + - abstract_oam_server_1c2_0 + - network.incoming.packets_oam_server_1c2_oam_server_1c2_mgmt_port_0 disk.device.write.bytes.rate_server_1c2_oam_2: - abstract_oam_server_1c2_1 - disk.device.write.bytes.rate_oam_server_1c2 @@ -402,15 +405,27 @@ topology_template: disk.usage_server_1b_pd: - abstract_pd_server_1b - disk.usage_pd_server_1b + network.incoming.packets_oam_server_1c2_2_mgmt_port_0: + - abstract_oam_server_1c2_1 + - network.incoming.packets_oam_server_1c2_oam_server_1c2_mgmt_port_0 + feature_cmaui_1c1_1_mgmt_port_0: + - abstract_cmaui_1c1 + - feature_cmaui_1c1_cmaui_1c1_mgmt_port_0 disk.iops_server_1c2_oam_2: - abstract_oam_server_1c2_1 - disk.iops_oam_server_1c2 disk.usage_server_1c2_oam_2: - abstract_oam_server_1c2_1 - disk.usage_oam_server_1c2 + network.outgoing.bytes_cmaui_1c1_1_mgmt_port_0: + - abstract_cmaui_1c1 + - network.outgoing.bytes_cmaui_1c1_cmaui_1c1_mgmt_port_0 disk.read.requests_server_1c1_cmaui_2: - abstract_cmaui_1c1 - disk.read.requests_cmaui_1c1 + network.outgoing.bytes_cmaui_1c1_2_mgmt_port_0: + - abstract_cmaui_1c1 + - network.outgoing.bytes_cmaui_1c1_cmaui_1c1_mgmt_port_0 feature_server_1c1_cmaui_1: - abstract_cmaui_1c1 - feature_cmaui_1c1 @@ -429,21 +444,12 @@ topology_template: disk.device.iops_server_1b_ps: - abstract_ps_server_1b - disk.device.iops_ps_server_1b - network.outgoing.bytes_cmaui_port_2: - - abstract_cmaui_1c1 - - network.outgoing.bytes_cmaui_1c1_cmaui_port disk.iops_server_1c2_oam_1: - abstract_oam_server_1c2_0 - disk.iops_oam_server_1c2 - network.outgoing.bytes_cmaui_port_1: + feature_cmaui_1c1_2_mgmt_port_0: - abstract_cmaui_1c1 - - network.outgoing.bytes_cmaui_1c1_cmaui_port - network.outgoing.packets.rate_oam_port_2: - - abstract_oam_server_1c2_1 - - network.outgoing.packets.rate_oam_server_1c2_oam_port - network.outgoing.packets.rate_oam_port_1: - - abstract_oam_server_1c2_0 - - network.outgoing.packets.rate_oam_server_1c2_oam_port + - feature_cmaui_1c1_cmaui_1c1_mgmt_port_0 disk.device.iops_server_1b_pd: - abstract_pd_server_1b - disk.device.iops_pd_server_1b @@ -483,6 +489,9 @@ topology_template: disk.device.read.requests.rate_server_1b_pd: - abstract_pd_server_1b - disk.device.read.requests.rate_pd_server_1b + network.outgoing.packets.rate_oam_server_1c2_2_mgmt_port_0: + - abstract_oam_server_1c2_1 + - network.outgoing.packets.rate_oam_server_1c2_oam_server_1c2_mgmt_port_0 disk.device.write.requests_server_1c1_cmaui_2: - abstract_cmaui_1c1 - disk.device.write.requests_cmaui_1c1 @@ -495,6 +504,9 @@ topology_template: disk.device.read.bytes_server_1c1_cmaui_1: - abstract_cmaui_1c1 - disk.device.read.bytes_cmaui_1c1 + network.incoming.packets.rate_oam_server_1c2_1_mgmt_port_0: + - abstract_oam_server_1c2_0 + - network.incoming.packets.rate_oam_server_1c2_oam_server_1c2_mgmt_port_0 disk.device.read.requests.rate_server_1b_ps: - abstract_ps_server_1b - disk.device.read.requests.rate_ps_server_1b @@ -519,18 +531,6 @@ topology_template: memory.usage_server_1b_pd: - abstract_pd_server_1b - memory.usage_pd_server_1b - network.outpoing.packets_oam_port_1: - - abstract_oam_server_1c2_0 - - network.outpoing.packets_oam_server_1c2_oam_port - network.outpoing.packets_oam_port_2: - - abstract_oam_server_1c2_1 - - network.outpoing.packets_oam_server_1c2_oam_port - binding_cmaui_port_1: - - abstract_cmaui_1c1 - - binding_cmaui_1c1_cmaui_port - binding_cmaui_port_2: - - abstract_cmaui_1c1 - - binding_cmaui_1c1_cmaui_port memory.usage_server_1b_ps: - abstract_ps_server_1b - memory.usage_ps_server_1b @@ -543,6 +543,9 @@ topology_template: cpu_util_server_1c2_oam_2: - abstract_oam_server_1c2_1 - cpu_util_oam_server_1c2 + network.incoming.packets.rate_oam_server_1c2_2_mgmt_port_0: + - abstract_oam_server_1c2_1 + - network.incoming.packets.rate_oam_server_1c2_oam_server_1c2_mgmt_port_0 memory_server_1c2_oam_1: - abstract_oam_server_1c2_0 - memory_oam_server_1c2 @@ -564,12 +567,9 @@ topology_template: cpu_util_server_1b_ps: - abstract_ps_server_1b - cpu_util_ps_server_1b - network.incoming.bytes_cmaui_port_2: - - abstract_cmaui_1c1 - - network.incoming.bytes_cmaui_1c1_cmaui_port - network.incoming.bytes_cmaui_port_1: - - abstract_cmaui_1c1 - - network.incoming.bytes_cmaui_1c1_cmaui_port + network.outgoing.packets.rate_oam_server_1c2_1_mgmt_port_0: + - abstract_oam_server_1c2_0 + - network.outgoing.packets.rate_oam_server_1c2_oam_server_1c2_mgmt_port_0 os_server_1c2_oam_1: - abstract_oam_server_1c2_0 - os_oam_server_1c2 @@ -597,39 +597,24 @@ topology_template: feature_server_1c2_oam_2: - abstract_oam_server_1c2_1 - feature_oam_server_1c2 + network.incoming.bytes_cmaui_1c1_1_mgmt_port_0: + - abstract_cmaui_1c1 + - network.incoming.bytes_cmaui_1c1_cmaui_1c1_mgmt_port_0 disk.device.write.bytes_server_1b_ps: - abstract_ps_server_1b - disk.device.write.bytes_ps_server_1b - network.incoming.packets.rate_cmaui_port_1: - - abstract_cmaui_1c1 - - network.incoming.packets.rate_cmaui_1c1_cmaui_port vcpus_server_1c1_cmaui_1: - abstract_cmaui_1c1 - vcpus_cmaui_1c1 - network.incoming.packets.rate_cmaui_port_2: - - abstract_cmaui_1c1 - - network.incoming.packets.rate_cmaui_1c1_cmaui_port - feature_cmaui_port_1: - - abstract_cmaui_1c1 - - feature_cmaui_1c1_cmaui_port network.incoming.bytes.rate_pd_server_1b_port: - abstract_pd_server_1b - network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port - network.outgoing.bytes_oam_port_2: - - abstract_oam_server_1c2_1 - - network.outgoing.bytes_oam_server_1c2_oam_port - feature_cmaui_port_2: - - abstract_cmaui_1c1 - - feature_cmaui_1c1_cmaui_port instance_server_1b_ps: - abstract_ps_server_1b - instance_ps_server_1b feature_server_1c2_oam_1: - abstract_oam_server_1c2_0 - feature_oam_server_1c2 - network.outgoing.bytes_oam_port_1: - - abstract_oam_server_1c2_0 - - network.outgoing.bytes_oam_server_1c2_oam_port disk.device.capacity_server_1c1_cmaui_2: - abstract_cmaui_1c1 - disk.device.capacity_cmaui_1c1 @@ -639,18 +624,24 @@ topology_template: cpu.delta_server_1b_ps: - abstract_ps_server_1b - cpu.delta_ps_server_1b + network.outgoing.bytes.rate_oam_server_1c2_2_mgmt_port_0: + - abstract_oam_server_1c2_1 + - network.outgoing.bytes.rate_oam_server_1c2_oam_server_1c2_mgmt_port_0 + network.outgoing.packets.rate_cmaui_1c1_1_mgmt_port_0: + - abstract_cmaui_1c1 + - network.outgoing.packets.rate_cmaui_1c1_cmaui_1c1_mgmt_port_0 instance_server_1c1_cmaui_1: - abstract_cmaui_1c1 - instance_cmaui_1c1 + attachment_cmaui_1c1_1_mgmt_port_0: + - abstract_cmaui_1c1 + - attachment_cmaui_1c1_cmaui_1c1_mgmt_port_0 disk.device.read.requests.rate_server_1c2_oam_1: - abstract_oam_server_1c2_0 - disk.device.read.requests.rate_oam_server_1c2 disk.device.read.requests.rate_server_1c2_oam_2: - abstract_oam_server_1c2_1 - disk.device.read.requests.rate_oam_server_1c2 - attachment_oam_port_2: - - abstract_oam_server_1c2_1 - - attachment_oam_server_1c2_oam_port disk.device.write.bytes.rate_server_1b_pd: - abstract_pd_server_1b - disk.device.write.bytes.rate_pd_server_1b @@ -663,9 +654,15 @@ topology_template: cpu.delta_server_1b_pd: - abstract_pd_server_1b - cpu.delta_pd_server_1b - attachment_oam_port_1: + binding_oam_server_1c2_2_mgmt_port_0: + - abstract_oam_server_1c2_1 + - binding_oam_server_1c2_oam_server_1c2_mgmt_port_0 + network.outpoing.packets_oam_server_1c2_1_mgmt_port_0: + - abstract_oam_server_1c2_0 + - network.outpoing.packets_oam_server_1c2_oam_server_1c2_mgmt_port_0 + attachment_oam_server_1c2_1_mgmt_port_0: - abstract_oam_server_1c2_0 - - attachment_oam_server_1c2_oam_port + - attachment_oam_server_1c2_oam_server_1c2_mgmt_port_0 disk.device.write.requests_server_1b_pd: - abstract_pd_server_1b - disk.device.write.requests_pd_server_1b @@ -702,18 +699,15 @@ topology_template: vcpus_server_1c1_cmaui_2: - abstract_cmaui_1c1 - vcpus_cmaui_1c1 + network.incoming.packets_cmaui_1c1_2_mgmt_port_0: + - abstract_cmaui_1c1 + - network.incoming.packets_cmaui_1c1_cmaui_1c1_mgmt_port_0 binding_ps_server_1b_port: - abstract_ps_server_1b - binding_ps_server_1b_ps_server_1b_port disk.device.write.bytes.rate_server_1b_ps: - abstract_ps_server_1b - disk.device.write.bytes.rate_ps_server_1b - forwarder_cmaui_port_2: - - abstract_cmaui_1c1 - - forwarder_cmaui_1c1_cmaui_port - forwarder_cmaui_port_1: - - abstract_cmaui_1c1 - - forwarder_cmaui_1c1_cmaui_port disk.device.write.requests_server_1b_ps: - abstract_ps_server_1b - disk.device.write.requests_ps_server_1b @@ -735,12 +729,21 @@ topology_template: disk.device.read.requests_server_1b_pd: - abstract_pd_server_1b - disk.device.read.requests_pd_server_1b + binding_cmaui_1c1_2_mgmt_port_0: + - abstract_cmaui_1c1 + - binding_cmaui_1c1_cmaui_1c1_mgmt_port_0 + network.outgoing.bytes_oam_server_1c2_1_mgmt_port_0: + - abstract_oam_server_1c2_0 + - network.outgoing.bytes_oam_server_1c2_oam_server_1c2_mgmt_port_0 disk.read.requests_server_1b_pd: - abstract_pd_server_1b - disk.read.requests_pd_server_1b cpu_util_server_1c1_cmaui_2: - abstract_cmaui_1c1 - cpu_util_cmaui_1c1 + network.incoming.bytes_oam_server_1c2_1_mgmt_port_0: + - abstract_oam_server_1c2_0 + - network.incoming.bytes_oam_server_1c2_oam_server_1c2_mgmt_port_0 disk.allocation_server_1c2_oam_2: - abstract_oam_server_1c2_1 - disk.allocation_oam_server_1c2 @@ -765,9 +768,6 @@ topology_template: cpu_server_1b_pd: - abstract_pd_server_1b - cpu_pd_server_1b - binding_oam_port_2: - - abstract_oam_server_1c2_1 - - binding_oam_server_1c2_oam_port disk.write.bytes.rate_server_1c1_cmaui_1: - abstract_cmaui_1c1 - disk.write.bytes.rate_cmaui_1c1 @@ -777,9 +777,12 @@ topology_template: disk.allocation_server_1b_pd: - abstract_pd_server_1b - disk.allocation_pd_server_1b - binding_oam_port_1: + feature_oam_server_1c2_2_mgmt_port_0: + - abstract_oam_server_1c2_1 + - feature_oam_server_1c2_oam_server_1c2_mgmt_port_0 + forwarder_oam_server_1c2_1_mgmt_port_0: - abstract_oam_server_1c2_0 - - binding_oam_server_1c2_oam_port + - forwarder_oam_server_1c2_oam_server_1c2_mgmt_port_0 disk.read.bytes.rate_server_1c1_cmaui_2: - abstract_cmaui_1c1 - disk.read.bytes.rate_cmaui_1c1 @@ -795,15 +798,9 @@ topology_template: cpu_server_1b_ps: - abstract_ps_server_1b - cpu_ps_server_1b - network.outpoing.packets_cmaui_port_1: - - abstract_cmaui_1c1 - - network.outpoing.packets_cmaui_1c1_cmaui_port disk.allocation_server_1b_ps: - abstract_ps_server_1b - disk.allocation_ps_server_1b - network.outpoing.packets_cmaui_port_2: - - abstract_cmaui_1c1 - - network.outpoing.packets_cmaui_1c1_cmaui_port disk.latency_server_1c2_oam_1: - abstract_oam_server_1c2_0 - disk.latency_oam_server_1c2 @@ -843,6 +840,9 @@ topology_template: memory.resident_server_1c1_cmaui_2: - abstract_cmaui_1c1 - memory.resident_cmaui_1c1 + network.incoming.bytes.rate_cmaui_1c1_2_mgmt_port_0: + - abstract_cmaui_1c1 + - network.incoming.bytes.rate_cmaui_1c1_cmaui_1c1_mgmt_port_0 disk.root.size_server_1c2_oam_2: - abstract_oam_server_1c2_1 - disk.root.size_oam_server_1c2 @@ -852,27 +852,33 @@ topology_template: network.incoming.bytes.rate_ps_server_1b_port: - abstract_ps_server_1b - network.incoming.bytes.rate_ps_server_1b_ps_server_1b_port - network.incoming.bytes.rate_oam_port_1: - - abstract_oam_server_1c2_0 - - network.incoming.bytes.rate_oam_server_1c2_oam_port os_server_1c1_cmaui_2: - abstract_cmaui_1c1 - os_cmaui_1c1 + network.incoming.bytes.rate_oam_server_1c2_1_mgmt_port_0: + - abstract_oam_server_1c2_0 + - network.incoming.bytes.rate_oam_server_1c2_oam_server_1c2_mgmt_port_0 os_server_1c1_cmaui_1: - abstract_cmaui_1c1 - os_cmaui_1c1 instance_server_1c2_oam_1: - abstract_oam_server_1c2_0 - instance_oam_server_1c2 + network.incoming.bytes.rate_cmaui_1c1_1_mgmt_port_0: + - abstract_cmaui_1c1 + - network.incoming.bytes.rate_cmaui_1c1_cmaui_1c1_mgmt_port_0 + network.outgoing.bytes.rate_cmaui_1c1_1_mgmt_port_0: + - abstract_cmaui_1c1 + - network.outgoing.bytes.rate_cmaui_1c1_cmaui_1c1_mgmt_port_0 instance_server_1c2_oam_2: - abstract_oam_server_1c2_1 - instance_oam_server_1c2 - network.incoming.bytes.rate_oam_port_2: - - abstract_oam_server_1c2_1 - - network.incoming.bytes.rate_oam_server_1c2_oam_port vcpus_server_1b_pd: - abstract_pd_server_1b - vcpus_pd_server_1b + network.outgoing.bytes.rate_cmaui_1c1_2_mgmt_port_0: + - abstract_cmaui_1c1 + - network.outgoing.bytes.rate_cmaui_1c1_cmaui_1c1_mgmt_port_0 memory.usage_server_1c1_cmaui_1: - abstract_cmaui_1c1 - memory.usage_cmaui_1c1 @@ -906,12 +912,6 @@ topology_template: disk.write.bytes.rate_server_1b_pd: - abstract_pd_server_1b - disk.write.bytes.rate_pd_server_1b - forwarder_oam_port_1: - - abstract_oam_server_1c2_0 - - forwarder_oam_server_1c2_oam_port - forwarder_oam_port_2: - - abstract_oam_server_1c2_1 - - forwarder_oam_server_1c2_oam_port binding_server_1c2_oam_2: - abstract_oam_server_1c2_1 - binding_oam_server_1c2 @@ -924,6 +924,9 @@ topology_template: attachment_packet_internal_network: - packet_internal_network - attachment + forwarder_cmaui_1c1_1_mgmt_port_0: + - abstract_cmaui_1c1 + - forwarder_cmaui_1c1_cmaui_1c1_mgmt_port_0 network.outgoing.packets.rate_pd_server_1b_port: - abstract_pd_server_1b - network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port @@ -939,6 +942,9 @@ topology_template: disk.device.usage_server_1b_pd: - abstract_pd_server_1b - disk.device.usage_pd_server_1b + forwarder_cmaui_1c1_2_mgmt_port_0: + - abstract_cmaui_1c1 + - forwarder_cmaui_1c1_cmaui_1c1_mgmt_port_0 disk.write.requests_server_1c2_oam_1: - abstract_oam_server_1c2_0 - disk.write.requests_oam_server_1c2 @@ -951,6 +957,9 @@ topology_template: os_server_1b_ps: - abstract_ps_server_1b - os_ps_server_1b + network.incoming.bytes.rate_oam_server_1c2_2_mgmt_port_0: + - abstract_oam_server_1c2_1 + - network.incoming.bytes.rate_oam_server_1c2_oam_server_1c2_mgmt_port_0 disk.device.latency_server_1b_ps: - abstract_ps_server_1b - disk.device.latency_ps_server_1b @@ -972,9 +981,6 @@ topology_template: disk.read.bytes_server_1b_ps: - abstract_ps_server_1b - disk.read.bytes_ps_server_1b - network.incoming.packets_cmaui_port_2: - - abstract_cmaui_1c1 - - network.incoming.packets_cmaui_1c1_cmaui_port disk.device.write.bytes.rate_server_1c1_cmaui_2: - abstract_cmaui_1c1 - disk.device.write.bytes.rate_cmaui_1c1 @@ -984,15 +990,18 @@ topology_template: disk.device.write.requests_server_1c2_oam_2: - abstract_oam_server_1c2_1 - disk.device.write.requests_oam_server_1c2 + network.incoming.packets.rate_cmaui_1c1_1_mgmt_port_0: + - abstract_cmaui_1c1 + - network.incoming.packets.rate_cmaui_1c1_cmaui_1c1_mgmt_port_0 disk.allocation_server_1c1_cmaui_1: - abstract_cmaui_1c1 - disk.allocation_cmaui_1c1 memory_server_1b_ps: - abstract_ps_server_1b - memory_ps_server_1b - network.incoming.packets_cmaui_port_1: + network.incoming.packets.rate_cmaui_1c1_2_mgmt_port_0: - abstract_cmaui_1c1 - - network.incoming.packets_cmaui_1c1_cmaui_port + - network.incoming.packets.rate_cmaui_1c1_cmaui_1c1_mgmt_port_0 network.outgoing.bytes.rate_ps_server_1b_port: - abstract_ps_server_1b - network.outgoing.bytes.rate_ps_server_1b_ps_server_1b_port @@ -1047,15 +1056,9 @@ topology_template: host_server_1c2_oam_2: - abstract_oam_server_1c2_1 - host_oam_server_1c2 - network.incoming.packets.rate_oam_port_1: - - abstract_oam_server_1c2_0 - - network.incoming.packets.rate_oam_server_1c2_oam_port disk.write.bytes_server_1b_ps: - abstract_ps_server_1b - disk.write.bytes_ps_server_1b - network.incoming.packets.rate_oam_port_2: - - abstract_oam_server_1c2_1 - - network.incoming.packets.rate_oam_server_1c2_oam_port end_point_packet_external_network: - packet_external_network - end_point @@ -1074,6 +1077,12 @@ topology_template: disk.device.read.requests_server_1c1_cmaui_1: - abstract_cmaui_1c1 - disk.device.read.requests_cmaui_1c1 + network.outpoing.packets_cmaui_1c1_2_mgmt_port_0: + - abstract_cmaui_1c1 + - network.outpoing.packets_cmaui_1c1_cmaui_1c1_mgmt_port_0 + network.outpoing.packets_cmaui_1c1_1_mgmt_port_0: + - abstract_cmaui_1c1 + - network.outpoing.packets_cmaui_1c1_cmaui_1c1_mgmt_port_0 disk.device.allocation_server_1b_pd: - abstract_pd_server_1b - disk.device.allocation_pd_server_1b @@ -1101,18 +1110,12 @@ topology_template: disk.device.capacity_server_1b_pd: - abstract_pd_server_1b - disk.device.capacity_pd_server_1b - network.outgoing.bytes.rate_cmaui_port_2: - - abstract_cmaui_1c1 - - network.outgoing.bytes.rate_cmaui_1c1_cmaui_port disk.root.size_server_1b_pd: - abstract_pd_server_1b - disk.root.size_pd_server_1b cpu_server_1c1_cmaui_2: - abstract_cmaui_1c1 - cpu_cmaui_1c1 - network.outgoing.bytes.rate_cmaui_port_1: - - abstract_cmaui_1c1 - - network.outgoing.bytes.rate_cmaui_1c1_cmaui_port cpu_server_1c1_cmaui_1: - abstract_cmaui_1c1 - cpu_cmaui_1c1 @@ -1143,15 +1146,24 @@ topology_template: disk.write.requests.rate_server_1c2_oam_2: - abstract_oam_server_1c2_1 - disk.write.requests.rate_oam_server_1c2 + attachment_cmaui_1c1_2_mgmt_port_0: + - abstract_cmaui_1c1 + - attachment_cmaui_1c1_cmaui_1c1_mgmt_port_0 cpu.delta_server_1c2_oam_2: - abstract_oam_server_1c2_1 - cpu.delta_oam_server_1c2 + network.outgoing.bytes.rate_oam_server_1c2_1_mgmt_port_0: + - abstract_oam_server_1c2_0 + - network.outgoing.bytes.rate_oam_server_1c2_oam_server_1c2_mgmt_port_0 disk.iops_server_1b_pd: - abstract_pd_server_1b - disk.iops_pd_server_1b disk.write.requests.rate_server_1c2_oam_1: - abstract_oam_server_1c2_0 - disk.write.requests.rate_oam_server_1c2 + network.incoming.bytes_cmaui_1c1_2_mgmt_port_0: + - abstract_cmaui_1c1 + - network.incoming.bytes_cmaui_1c1_cmaui_1c1_mgmt_port_0 disk.usage_server_1c1_cmaui_2: - abstract_cmaui_1c1 - disk.usage_cmaui_1c1 @@ -1164,45 +1176,24 @@ topology_template: end_point_packet_internal_network: - packet_internal_network - end_point - network.incoming.bytes_oam_port_2: - - abstract_oam_server_1c2_1 - - network.incoming.bytes_oam_server_1c2_oam_port + network.outgoing.packets.rate_cmaui_1c1_2_mgmt_port_0: + - abstract_cmaui_1c1 + - network.outgoing.packets.rate_cmaui_1c1_cmaui_1c1_mgmt_port_0 feature_packet_internal_network: - packet_internal_network - feature - network.incoming.bytes_oam_port_1: - - abstract_oam_server_1c2_0 - - network.incoming.bytes_oam_server_1c2_oam_port forwarder_pd_server_1b_port: - abstract_pd_server_1b - forwarder_pd_server_1b_pd_server_1b_port disk.device.write.requests.rate_server_1b_ps: - abstract_ps_server_1b - disk.device.write.requests.rate_ps_server_1b - attachment_cmaui_port_2: - - abstract_cmaui_1c1 - - attachment_cmaui_1c1_cmaui_port - network.outgoing.bytes.rate_oam_port_1: - - abstract_oam_server_1c2_0 - - network.outgoing.bytes.rate_oam_server_1c2_oam_port - network.outgoing.bytes.rate_oam_port_2: - - abstract_oam_server_1c2_1 - - network.outgoing.bytes.rate_oam_server_1c2_oam_port disk.iops_server_1b_ps: - abstract_ps_server_1b - disk.iops_ps_server_1b disk.capacity_server_1c1_cmaui_1: - abstract_cmaui_1c1 - disk.capacity_cmaui_1c1 - network.outgoing.packets.rate_cmaui_port_1: - - abstract_cmaui_1c1 - - network.outgoing.packets.rate_cmaui_1c1_cmaui_port - network.outgoing.packets.rate_cmaui_port_2: - - abstract_cmaui_1c1 - - network.outgoing.packets.rate_cmaui_1c1_cmaui_port - attachment_cmaui_port_1: - - abstract_cmaui_1c1 - - attachment_cmaui_1c1_cmaui_port disk.capacity_server_1c1_cmaui_2: - abstract_cmaui_1c1 - disk.capacity_cmaui_1c1 @@ -1215,6 +1206,9 @@ topology_template: disk.ephemeral.size_server_1c2_oam_1: - abstract_oam_server_1c2_0 - disk.ephemeral.size_oam_server_1c2 + binding_oam_server_1c2_1_mgmt_port_0: + - abstract_oam_server_1c2_0 + - binding_oam_server_1c2_oam_server_1c2_mgmt_port_0 disk.device.read.requests.rate_server_1c1_cmaui_1: - abstract_cmaui_1c1 - disk.device.read.requests.rate_cmaui_1c1 @@ -1227,12 +1221,18 @@ topology_template: disk.device.read.requests.rate_server_1c1_cmaui_2: - abstract_cmaui_1c1 - disk.device.read.requests.rate_cmaui_1c1 + attachment_oam_server_1c2_2_mgmt_port_0: + - abstract_oam_server_1c2_1 + - attachment_oam_server_1c2_oam_server_1c2_mgmt_port_0 network.incoming.packets_ps_server_1b_port: - abstract_ps_server_1b - network.incoming.packets_ps_server_1b_ps_server_1b_port disk.write.requests_server_1b_ps: - abstract_ps_server_1b - disk.write.requests_ps_server_1b + network.incoming.packets_cmaui_1c1_1_mgmt_port_0: + - abstract_cmaui_1c1 + - network.incoming.packets_cmaui_1c1_cmaui_1c1_mgmt_port_0 feature_pd_server_1b_port: - abstract_pd_server_1b - feature_pd_server_1b_pd_server_1b_port @@ -1272,12 +1272,15 @@ topology_template: disk.write.bytes_server_1c1_cmaui_2: - abstract_cmaui_1c1 - disk.write.bytes_cmaui_1c1 - feature_oam_port_2: + network.outgoing.bytes_oam_server_1c2_2_mgmt_port_0: - abstract_oam_server_1c2_1 - - feature_oam_server_1c2_oam_port - feature_oam_port_1: - - abstract_oam_server_1c2_0 - - feature_oam_server_1c2_oam_port + - network.outgoing.bytes_oam_server_1c2_oam_server_1c2_mgmt_port_0 + binding_cmaui_1c1_1_mgmt_port_0: + - abstract_cmaui_1c1 + - binding_cmaui_1c1_cmaui_1c1_mgmt_port_0 + network.incoming.bytes_oam_server_1c2_2_mgmt_port_0: + - abstract_oam_server_1c2_1 + - network.incoming.bytes_oam_server_1c2_oam_server_1c2_mgmt_port_0 network.incoming.packets.rate_pd_server_1b_port: - abstract_pd_server_1b - network.incoming.packets.rate_pd_server_1b_pd_server_1b_port @@ -1290,6 +1293,9 @@ topology_template: scalable_server_1c1_cmaui_1: - abstract_cmaui_1c1 - scalable_cmaui_1c1 + feature_oam_server_1c2_1_mgmt_port_0: + - abstract_oam_server_1c2_0 + - feature_oam_server_1c2_oam_server_1c2_mgmt_port_0 link_packet_internal_network: - packet_internal_network - link @@ -1308,24 +1314,18 @@ topology_template: cpu.delta_server_1c1_cmaui_1: - abstract_cmaui_1c1 - cpu.delta_cmaui_1c1 + network.outpoing.packets_oam_server_1c2_2_mgmt_port_0: + - abstract_oam_server_1c2_1 + - network.outpoing.packets_oam_server_1c2_oam_server_1c2_mgmt_port_0 endpoint_server_1b_ps: - abstract_ps_server_1b - endpoint_ps_server_1b - network.incoming.packets_oam_port_1: - - abstract_oam_server_1c2_0 - - network.incoming.packets_oam_server_1c2_oam_port - network.incoming.packets_oam_port_2: + forwarder_oam_server_1c2_2_mgmt_port_0: - abstract_oam_server_1c2_1 - - network.incoming.packets_oam_server_1c2_oam_port - network.incoming.bytes.rate_cmaui_port_1: - - abstract_cmaui_1c1 - - network.incoming.bytes.rate_cmaui_1c1_cmaui_port + - forwarder_oam_server_1c2_oam_server_1c2_mgmt_port_0 network.outgoing.bytes_ps_server_1b_port: - abstract_ps_server_1b - network.outgoing.bytes_ps_server_1b_ps_server_1b_port - network.incoming.bytes.rate_cmaui_port_2: - - abstract_cmaui_1c1 - - network.incoming.bytes.rate_cmaui_1c1_cmaui_port disk.device.read.bytes_server_1b_ps: - abstract_ps_server_1b - disk.device.read.bytes_ps_server_1b @@ -1369,12 +1369,6 @@ topology_template: local_storage_server_1b_ps: - abstract_ps_server_1b - local_storage_ps_server_1b - dependency_oam_port_2: - - abstract_oam_server_1c2_1 - - dependency_oam_server_1c2_oam_port - dependency_oam_port_1: - - abstract_oam_server_1c2_0 - - dependency_oam_server_1c2_oam_port dependency_server_1c1_cmaui_1: - abstract_cmaui_1c1 - dependency_cmaui_1c1 @@ -1384,9 +1378,15 @@ topology_template: link_ps_server_1b_port: - abstract_ps_server_1b - link_ps_server_1b_ps_server_1b_port + dependency_oam_server_1c2_2_mgmt_port_0: + - abstract_oam_server_1c2_1 + - dependency_oam_server_1c2_oam_server_1c2_mgmt_port_0 local_storage_server_1b_pd: - abstract_pd_server_1b - local_storage_pd_server_1b + dependency_oam_server_1c2_1_mgmt_port_0: + - abstract_oam_server_1c2_0 + - dependency_oam_server_1c2_oam_server_1c2_mgmt_port_0 dependency_ps_server_1b_port: - abstract_ps_server_1b - dependency_ps_server_1b_ps_server_1b_port @@ -1408,9 +1408,9 @@ topology_template: dependency_pd_server_1b_port: - abstract_pd_server_1b - dependency_pd_server_1b_pd_server_1b_port - dependency_cmaui_port_1: + dependency_cmaui_1c1_1_mgmt_port_0: - abstract_cmaui_1c1 - - dependency_cmaui_1c1_cmaui_port + - dependency_cmaui_1c1_cmaui_1c1_mgmt_port_0 dependency_packet_internal_network: - packet_internal_network - dependency @@ -1420,9 +1420,9 @@ topology_template: local_storage_server_1c1_cmaui_1: - abstract_cmaui_1c1 - local_storage_cmaui_1c1 - dependency_cmaui_port_2: + dependency_cmaui_1c1_2_mgmt_port_0: - abstract_cmaui_1c1 - - dependency_cmaui_1c1_cmaui_port + - dependency_cmaui_1c1_cmaui_1c1_mgmt_port_0 dependency_packet_external_network: - packet_external_network - - dependency \ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/in/nested1.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/in/nested1.yml index 625831f052..4182f20e06 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/in/nested1.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/in/nested1.yml @@ -100,14 +100,14 @@ resources: networks: - port: { get_resource: ps_server_1b_port } - cmaui_port_1: + cmaui_1c1_1_mgmt_port_0: type: OS::Neutron::Port properties: network: {get_resource: packet_internal_network} fixed_ips: [{"ip_address": {get_param: [cmaui_oam_ips, 0]}}] replacement_policy: AUTO - cmaui_port_2: + cmaui_1c1_2_mgmt_port_0: type: OS::Neutron::Port properties: network: {get_resource: packet_internal_network} @@ -122,7 +122,7 @@ resources: availability_zone: { get_param: availability_zone_0 } flavor: { get_param: cmaui_1c1_flavor } networks: - - port: { get_resource: cmaui_port_1 } + - port: { get_resource: cmaui_1c1_1_mgmt_port_0 } server_1c1_cmaui_2: type: OS::Nova::Server @@ -132,16 +132,16 @@ resources: availability_zone: { get_param: availability_zone_0 } flavor: { get_param: cmaui_1c1_flavor } networks: - - port: { get_resource: cmaui_port_2 } + - port: { get_resource: cmaui_1c1_2_mgmt_port_0 } - oam_port_1: + oam_server_1c2_1_mgmt_port_0: type: OS::Neutron::Port properties: network: {get_resource: packet_internal_network} fixed_ips: [{"ip_address": {get_param: [cmaui_oam_ips, 1]}}] replacement_policy: AUTO - oam_port_2: + oam_server_1c2_2_mgmt_port_0: type: OS::Neutron::Port properties: network: {get_resource: packet_external_network} @@ -156,7 +156,7 @@ resources: availability_zone: { get_param: availability_zone_0 } flavor: { get_param: oam_server_1c2_flavor } networks: - - port: { get_resource: oam_port_1 } + - port: { get_resource: oam_server_1c2_1_mgmt_port_0 } server_1c2_oam_2: type: OS::Nova::Server @@ -166,7 +166,7 @@ resources: availability_zone: { get_param: availability_zone_0 } flavor: { get_param: oam_server_1c2_flavor } networks: - - port: { get_resource: oam_port_2 } + - port: { get_resource: oam_server_1c2_2_mgmt_port_0 } packet_internal_network: type: OS::Neutron::Net 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/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml index 8735c51fee..fa714a9087 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,16 +8,24 @@ node_types: org.openecomp.resource.abstract.nodes.oam_server_1c2: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_oam_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_oam_server_1c2_mgmt_port_0_vlan_requirements: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements compute_oam_server_1c2_name: type: list required: true status: SUPPORTED entry_schema: type: string + port_oam_server_1c2_mgmt_port_0_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments index_value: type: integer description: Index value of this substitution service template runtime instance @@ -26,73 +34,65 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_oam_port_network: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_oam_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_oam_port_order: - type: integer + port_oam_server_1c2_mgmt_port_0_network_role_tag: + type: string required: true status: SUPPORTED - port_oam_port_subnetpoolid: - type: string + port_oam_server_1c2_mgmt_port_0_ip_requirements: + type: list required: true status: SUPPORTED - port_oam_port_related_networks: + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_oam_server_1c2_mgmt_port_0_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments + type: org.openecomp.datatypes.heat.neutron.port.FixedIps vm_flavor_name: type: string required: true status: SUPPORTED - compute_oam_server_1c2_availability_zone: - type: list + port_oam_server_1c2_mgmt_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: string - port_oam_port_fixed_ips: + compute_oam_server_1c2_availability_zone: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps + type: string vm_image_name: type: string required: true status: SUPPORTED - port_oam_port_vlan_requirements: + port_oam_server_1c2_mgmt_port_0_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_oam_port_ip_requirements: - type: list + type: string + port_oam_server_1c2_mgmt_port_0_order: + type: integer required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_oam_port_replacement_policy: - type: list + port_oam_server_1c2_mgmt_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: string - port_oam_port_network_role_tag: + port_oam_server_1c2_mgmt_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_oam_port_network_role: + port_oam_server_1c2_mgmt_port_0_replacement_policy: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_oam_server_1c2_mgmt_port_0_network_role: type: string required: true status: SUPPORTED @@ -101,33 +101,33 @@ node_types: type: string status: SUPPORTED requirements: - - dependency_oam_server_1c2: + - dependency_oam_server_1c2_oam_server_1c2_mgmt_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - local_storage_oam_server_1c2: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo + - link_oam_server_1c2_oam_server_1c2_mgmt_port_0: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo occurrences: - - 0 - - UNBOUNDED - - dependency_oam_server_1c2_oam_port: + - 1 + - 1 + - dependency_oam_server_1c2: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_oam_server_1c2_oam_port: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo + - local_storage_oam_server_1c2: + capability: tosca.capabilities.Attachment + node: tosca.nodes.BlockStorage + relationship: tosca.relationships.AttachesTo occurrences: - - 1 - - 1 + - 0 + - UNBOUNDED capabilities: disk.device.usage_oam_server_1c2: type: org.openecomp.capabilities.metric.Ceilometer @@ -164,18 +164,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_oam_server_1c2_oam_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.outpoing.packets_oam_server_1c2_oam_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_util_oam_server_1c2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -188,18 +176,15 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.allocation_oam_server_1c2: - 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 - attachment_oam_server_1c2_oam_port: - type: tosca.capabilities.Attachment + binding_oam_server_1c2_oam_server_1c2_mgmt_port_0: + 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: - - 1 + - 0 - UNBOUNDED - network.incoming.bytes.rate_oam_server_1c2_oam_port: + disk.device.allocation_oam_server_1c2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -223,7 +208,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_oam_server_1c2_oam_port: + network.outgoing.bytes.rate_oam_server_1c2_oam_server_1c2_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -241,13 +226,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_oam_server_1c2_oam_port: + network.incoming.packets_oam_server_1c2_oam_server_1c2_mgmt_port_0: 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_oam_server_1c2_oam_port: + network.incoming.packets.rate_oam_server_1c2_oam_server_1c2_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -265,13 +250,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_oam_server_1c2_oam_port: + cpu_oam_server_1c2: 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_oam_server_1c2: + network.outpoing.packets_oam_server_1c2_oam_server_1c2_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -313,17 +298,17 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_oam_server_1c2_oam_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED disk.ephemeral.size_oam_server_1c2: 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_oam_server_1c2_oam_server_1c2_mgmt_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED memory.resident_oam_server_1c2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -348,31 +333,33 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_oam_server_1c2_oam_server_1c2_mgmt_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED disk.usage_oam_server_1c2: 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_oam_server_1c2_oam_port: + network.outgoing.bytes_oam_server_1c2_oam_server_1c2_mgmt_port_0: 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_oam_server_1c2_oam_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 os_oam_server_1c2: type: tosca.capabilities.OperatingSystem occurrences: - 1 - UNBOUNDED + forwarder_oam_server_1c2_oam_server_1c2_mgmt_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.read.requests_oam_server_1c2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -385,8 +372,9 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_oam_server_1c2_oam_port: - type: tosca.capabilities.Node + network.incoming.bytes_oam_server_1c2_oam_server_1c2_mgmt_port_0: + 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 @@ -424,6 +412,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.packets.rate_oam_server_1c2_oam_server_1c2_mgmt_port_0: + 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_oam_server_1c2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -442,6 +436,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes.rate_oam_server_1c2_oam_server_1c2_mgmt_port_0: + 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.pd_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: @@ -1855,7 +1855,14 @@ node_types: description: all_pattern_attr_1 status: SUPPORTED requirements: - - dependency_cmaui_port_2: + - dependency_oam_server_1c2_1_mgmt_port_0: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - dependency_oam_server_1c2_2_mgmt_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn @@ -1904,7 +1911,14 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_cmaui_port_1: + - dependency_cmaui_1c1_2_mgmt_port_0: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - dependency_cmaui_1c1_1_mgmt_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn @@ -1924,13 +1938,6 @@ node_types: occurrences: - 1 - 1 - - dependency_oam_port_1: - capability: tosca.capabilities.Node - node: tosca.nodes.Root - relationship: tosca.relationships.DependsOn - occurrences: - - 0 - - UNBOUNDED - dependency_packet_external_network: capability: tosca.capabilities.Node node: tosca.nodes.Root @@ -2000,13 +2007,6 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_oam_port_2: - capability: tosca.capabilities.Node - node: tosca.nodes.Root - relationship: tosca.relationships.DependsOn - occurrences: - - 0 - - UNBOUNDED capabilities: disk.capacity_server_1b_pd: type: org.openecomp.capabilities.metric.Ceilometer @@ -2014,6 +2014,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets_oam_server_1c2_1_mgmt_port_0: + 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_server_1c2_oam_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2050,85 +2056,89 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.iops_server_1c2_oam_2: + network.incoming.packets_oam_server_1c2_2_mgmt_port_0: 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_server_1c2_oam_2: + feature_cmaui_1c1_1_mgmt_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + disk.iops_server_1c2_oam_2: 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_server_1c1_cmaui_2: + disk.usage_server_1c2_oam_2: 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_server_1c1_cmaui_1: - type: tosca.capabilities.Node + network.outgoing.bytes_cmaui_1c1_1_mgmt_port_0: + 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_server_1c2_oam_1: + disk.read.requests_server_1c1_cmaui_2: 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_pd_server_1b_port: + network.outgoing.bytes_cmaui_1c1_2_mgmt_port_0: 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_server_1c1_cmaui_2: + feature_server_1c1_cmaui_1: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.read.requests_server_1c1_cmaui_1: + disk.usage_server_1c2_oam_1: 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.iops_server_1b_ps: + network.incoming.bytes_pd_server_1b_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_cmaui_port_2: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_server_1c1_cmaui_2: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.iops_server_1c2_oam_1: + disk.read.requests_server_1c1_cmaui_1: 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_cmaui_port_1: + disk.device.iops_server_1b_ps: 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.packets.rate_oam_port_2: + disk.iops_server_1c2_oam_1: 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.packets.rate_oam_port_1: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_cmaui_1c1_2_mgmt_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -2206,6 +2216,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.packets.rate_oam_server_1c2_2_mgmt_port_0: + 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_server_1c1_cmaui_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2230,6 +2246,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets.rate_oam_server_1c2_1_mgmt_port_0: + 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_server_1b_ps: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2276,53 +2298,31 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_oam_port_1: - 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_oam_port_2: + memory.usage_server_1b_ps: 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_cmaui_port_1: - 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 - binding_cmaui_port_2: - 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 - memory.usage_server_1b_ps: + cpu_util_server_1b_pd: 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_server_1b_pd: + cpu_util_server_1c2_oam_1: 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_server_1c2_oam_1: + cpu_util_server_1c2_oam_2: 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_server_1c2_oam_2: + network.incoming.packets.rate_oam_server_1c2_2_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2370,13 +2370,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_cmaui_port_2: - 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_cmaui_port_1: + network.outgoing.packets.rate_oam_server_1c2_1_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2433,13 +2427,13 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.write.bytes_server_1b_ps: + network.incoming.bytes_cmaui_1c1_1_mgmt_port_0: 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_cmaui_port_1: + disk.device.write.bytes_server_1b_ps: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2451,117 +2445,115 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_cmaui_port_2: + network.incoming.bytes.rate_pd_server_1b_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 + instance_server_1b_ps: 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_cmaui_port_1: + feature_server_1c2_oam_1: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pd_server_1b_port: + disk.device.capacity_server_1c1_cmaui_2: 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_oam_port_2: + instance_server_1c1_cmaui_2: 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_cmaui_port_2: - type: tosca.capabilities.Node + cpu.delta_server_1b_ps: + 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 - instance_server_1b_ps: + network.outgoing.bytes.rate_oam_server_1c2_2_mgmt_port_0: 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_server_1c2_oam_1: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - network.outgoing.bytes_oam_port_1: + network.outgoing.packets.rate_cmaui_1c1_1_mgmt_port_0: 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_server_1c1_cmaui_2: + instance_server_1c1_cmaui_1: 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 - instance_server_1c1_cmaui_2: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_cmaui_1c1_1_mgmt_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - cpu.delta_server_1b_ps: + disk.device.read.requests.rate_server_1c2_oam_1: 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 - instance_server_1c1_cmaui_1: + disk.device.read.requests.rate_server_1c2_oam_2: 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_server_1c2_oam_1: + disk.device.write.bytes.rate_server_1b_pd: 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_server_1c2_oam_2: + disk.capacity_server_1c2_oam_1: 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 - attachment_oam_port_2: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - disk.device.write.bytes.rate_server_1b_pd: + disk.capacity_server_1c2_oam_2: 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_server_1c2_oam_1: + cpu.delta_server_1b_pd: 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_server_1c2_oam_2: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_oam_server_1c2_2_mgmt_port_0: + 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: - - 1 + - 0 - UNBOUNDED - cpu.delta_server_1b_pd: + network.outpoing.packets_oam_server_1c2_1_mgmt_port_0: 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 - attachment_oam_port_1: + attachment_oam_server_1c2_1_mgmt_port_0: type: tosca.capabilities.Attachment occurrences: - 1 @@ -2635,6 +2627,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets_cmaui_1c1_2_mgmt_port_0: + 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_ps_server_1b_port: type: tosca.capabilities.network.Bindable valid_source_types: @@ -2649,16 +2647,6 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_cmaui_port_2: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - forwarder_cmaui_port_1: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED disk.device.write.requests_server_1b_ps: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2700,6 +2688,20 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_cmaui_1c1_2_mgmt_port_0: + 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 + network.outgoing.bytes_oam_server_1c2_1_mgmt_port_0: + 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_server_1b_pd: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2712,6 +2714,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes_oam_server_1c2_1_mgmt_port_0: + 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.allocation_server_1c2_oam_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2762,14 +2770,6 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_oam_port_2: - 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 disk.write.bytes.rate_server_1c1_cmaui_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2788,13 +2788,15 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_oam_port_1: - 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 + feature_oam_server_1c2_2_mgmt_port_0: + type: tosca.capabilities.Node occurrences: - - 0 + - 1 + - UNBOUNDED + forwarder_oam_server_1c2_1_mgmt_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 - UNBOUNDED disk.read.bytes.rate_server_1c1_cmaui_2: type: org.openecomp.capabilities.metric.Ceilometer @@ -2828,24 +2830,12 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_cmaui_port_1: - 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.allocation_server_1b_ps: 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_cmaui_port_2: - 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_server_1c2_oam_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2923,25 +2913,25 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.root.size_server_1c2_oam_2: + network.incoming.bytes.rate_cmaui_1c1_2_mgmt_port_0: 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_server_1c1_cmaui_1: + disk.root.size_server_1c2_oam_2: 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_ps_server_1b_port: + memory.resident_server_1c1_cmaui_1: 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_oam_port_1: + network.incoming.bytes.rate_ps_server_1b_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: @@ -2952,6 +2942,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes.rate_oam_server_1c2_1_mgmt_port_0: + 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_server_1c1_cmaui_1: type: tosca.capabilities.OperatingSystem occurrences: @@ -2963,13 +2959,19 @@ node_types: occurrences: - 1 - UNBOUNDED - instance_server_1c2_oam_2: + network.incoming.bytes.rate_cmaui_1c1_1_mgmt_port_0: + 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_cmaui_1c1_1_mgmt_port_0: 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_oam_port_2: + instance_server_1c2_oam_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2981,6 +2983,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes.rate_cmaui_1c1_2_mgmt_port_0: + 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_server_1c1_cmaui_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3044,16 +3052,6 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_oam_port_1: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - forwarder_oam_port_2: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED binding_server_1c2_oam_2: type: tosca.capabilities.network.Bindable occurrences: @@ -3074,6 +3072,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_cmaui_1c1_1_mgmt_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED network.outgoing.packets.rate_pd_server_1b_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3104,6 +3107,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_cmaui_1c1_2_mgmt_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.write.requests_server_1c2_oam_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3127,6 +3135,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes.rate_oam_server_1c2_2_mgmt_port_0: + 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_server_1b_ps: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3169,25 +3183,25 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_cmaui_port_2: + disk.device.write.bytes.rate_server_1c1_cmaui_2: 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_server_1c1_cmaui_2: + disk.ephemeral.size_server_1b_pd: 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.ephemeral.size_server_1b_pd: + disk.device.write.requests_server_1c2_oam_2: 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_server_1c2_oam_2: + network.incoming.packets.rate_cmaui_1c1_1_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -3205,7 +3219,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_cmaui_port_1: + network.incoming.packets.rate_cmaui_1c1_2_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -3321,24 +3335,12 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_oam_port_1: - 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_server_1b_ps: 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_oam_port_2: - 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 end_point_packet_external_network: type: tosca.capabilities.Endpoint occurrences: @@ -3373,6 +3375,18 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_cmaui_1c1_2_mgmt_port_0: + 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_cmaui_1c1_1_mgmt_port_0: + 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_server_1b_pd: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3427,12 +3441,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_cmaui_port_2: - 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_server_1b_pd: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3445,12 +3453,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_cmaui_port_1: - 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_server_1c1_cmaui_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3511,12 +3513,23 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_cmaui_1c1_2_mgmt_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED cpu.delta_server_1c2_oam_2: 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_oam_server_1c2_1_mgmt_port_0: + 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.iops_server_1b_pd: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3529,6 +3542,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes_cmaui_1c1_2_mgmt_port_0: + 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_server_1c1_cmaui_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3552,7 +3571,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_oam_port_2: + network.outgoing.packets.rate_cmaui_1c1_2_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -3563,12 +3582,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_oam_port_1: - 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_pd_server_1b_port: type: org.openecomp.capabilities.Forwarder occurrences: @@ -3580,23 +3593,6 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_cmaui_port_2: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - network.outgoing.bytes.rate_oam_port_1: - 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_oam_port_2: - 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.iops_server_1b_ps: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3609,23 +3605,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_cmaui_port_1: - 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.packets.rate_cmaui_port_2: - 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 - attachment_cmaui_port_1: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED disk.capacity_server_1c1_cmaui_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3650,6 +3629,14 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_oam_server_1c2_1_mgmt_port_0: + 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 disk.device.read.requests.rate_server_1c1_cmaui_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3674,6 +3661,11 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_oam_server_1c2_2_mgmt_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED network.incoming.packets_ps_server_1b_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3686,6 +3678,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets_cmaui_1c1_1_mgmt_port_0: + 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_pd_server_1b_port: type: tosca.capabilities.Node occurrences: @@ -3761,13 +3759,23 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_oam_port_2: - type: tosca.capabilities.Node + network.outgoing.bytes_oam_server_1c2_2_mgmt_port_0: + 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_oam_port_1: - type: tosca.capabilities.Node + binding_cmaui_1c1_1_mgmt_port_0: + 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 + network.incoming.bytes_oam_server_1c2_2_mgmt_port_0: + 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 @@ -3794,6 +3802,11 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_oam_server_1c2_1_mgmt_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED link_packet_internal_network: type: tosca.capabilities.network.Linkable occurrences: @@ -3827,26 +3840,19 @@ node_types: occurrences: - 1 - UNBOUNDED - endpoint_server_1b_ps: - type: tosca.capabilities.Endpoint.Admin - occurrences: - - 1 - - UNBOUNDED - network.incoming.packets_oam_port_1: + network.outpoing.packets_oam_server_1c2_2_mgmt_port_0: 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_oam_port_2: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + endpoint_server_1b_ps: + type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_cmaui_port_1: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_oam_server_1c2_2_mgmt_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED @@ -3856,12 +3862,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_cmaui_port_2: - 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_server_1b_ps: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4362,71 +4362,73 @@ node_types: org.openecomp.resource.abstract.nodes.cmaui_1c1: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_cmaui_port_vlan_requirements: + port_cmaui_1c1_mgmt_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_cmaui_port_fixed_ips: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_cmaui_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true + type: org.openecomp.datatypes.network.IpRequirements + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 status: SUPPORTED - port_cmaui_port_network: + constraints: + - greater_or_equal: 0 + port_cmaui_1c1_mgmt_port_0_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_cmaui_port_related_networks: + port_cmaui_1c1_mgmt_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - status: SUPPORTED - constraints: - - greater_or_equal: 0 + type: org.openecomp.datatypes.network.VlanRequirements compute_cmaui_1c1_availability_zone: type: list required: true status: SUPPORTED entry_schema: type: string - port_cmaui_port_network_role_tag: - type: string + port_cmaui_1c1_mgmt_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_cmaui_port_order: - type: integer + port_cmaui_1c1_mgmt_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED vm_flavor_name: type: string required: true status: SUPPORTED - port_cmaui_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_cmaui_1c1_mgmt_port_0_fixed_ips: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_cmaui_1c1_mgmt_port_0_network_role: + type: string required: true status: SUPPORTED - port_cmaui_port_replacement_policy: + port_cmaui_1c1_mgmt_port_0_replacement_policy: type: list required: true status: SUPPORTED entry_schema: type: string - port_cmaui_port_network_role: + port_cmaui_1c1_mgmt_port_0_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_cmaui_1c1_mgmt_port_0_network_role_tag: type: string required: true status: SUPPORTED @@ -4434,31 +4436,29 @@ node_types: type: string required: true status: SUPPORTED - port_cmaui_port_ip_requirements: - type: list + port_cmaui_1c1_mgmt_port_0_order: + type: integer + required: true + status: SUPPORTED + port_cmaui_1c1_mgmt_port_0_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements compute_cmaui_1c1_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_cmaui_port_subnetpoolid: - type: string - required: true - status: SUPPORTED requirements: - - dependency_cmaui_1c1_cmaui_port: + - dependency_cmaui_1c1_cmaui_1c1_mgmt_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_cmaui_1c1_cmaui_port: + - link_cmaui_1c1_cmaui_1c1_mgmt_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -4479,14 +4479,6 @@ node_types: - 0 - UNBOUNDED capabilities: - binding_cmaui_1c1_cmaui_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 disk.iops_cmaui_1c1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4510,49 +4502,50 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_cmaui_1c1_cmaui_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_cmaui_1c1_cmaui_1c1_mgmt_port_0: + 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: - - 1 + - 0 - UNBOUNDED - network.incoming.packets_cmaui_1c1_cmaui_port: + network.outgoing.bytes.rate_cmaui_1c1_cmaui_1c1_mgmt_port_0: 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_cmaui_1c1_cmaui_port: + network.outgoing.bytes_cmaui_1c1_cmaui_1c1_mgmt_port_0: 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_cmaui_1c1_cmaui_port: + memory_cmaui_1c1: 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_cmaui_1c1_cmaui_port: + disk.latency_cmaui_1c1: 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_cmaui_1c1: + disk.read.bytes.rate_cmaui_1c1: 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_cmaui_1c1: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_cmaui_1c1_cmaui_1c1_mgmt_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - disk.read.bytes.rate_cmaui_1c1: + network.incoming.packets_cmaui_1c1_cmaui_1c1_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -4588,25 +4581,25 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_cmaui_1c1_cmaui_port: + disk.device.read.bytes.rate_cmaui_1c1: 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_cmaui_1c1: + disk.ephemeral.size_cmaui_1c1: 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.ephemeral.size_cmaui_1c1: + instance_cmaui_1c1: 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 - instance_cmaui_1c1: + network.incoming.packets.rate_cmaui_1c1_cmaui_1c1_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -4618,6 +4611,11 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_cmaui_1c1_cmaui_1c1_mgmt_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.device.write.bytes.rate_cmaui_1c1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4661,12 +4659,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_cmaui_1c1_cmaui_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.write.bytes.rate_cmaui_1c1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4707,20 +4699,25 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes_cmaui_1c1_cmaui_1c1_mgmt_port_0: + 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_cmaui_1c1: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_cmaui_1c1_cmaui_port: + disk.allocation_cmaui_1c1: 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.allocation_cmaui_1c1: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_cmaui_1c1_cmaui_1c1_mgmt_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED @@ -4736,8 +4733,9 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_cmaui_1c1_cmaui_port: - type: org.openecomp.capabilities.Forwarder + network.outgoing.packets.rate_cmaui_1c1_cmaui_1c1_mgmt_port_0: + 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 @@ -4753,12 +4751,13 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_cmaui_1c1_cmaui_port: - type: tosca.capabilities.Attachment + disk.usage_cmaui_1c1: + 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_cmaui_1c1: + network.incoming.bytes.rate_cmaui_1c1_cmaui_1c1_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -4781,8 +4780,9 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_cmaui_1c1_cmaui_port: - type: tosca.capabilities.Node + network.outpoing.packets_cmaui_1c1_cmaui_1c1_mgmt_port_0: + 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 @@ -4791,4 +4791,4 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - - UNBOUNDED \ No newline at end of file + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_cmaui_1c1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_cmaui_1c1ServiceTemplate.yaml index c7ec23eb2e..b75b3833cd 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_cmaui_1c1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_cmaui_1c1ServiceTemplate.yaml @@ -11,29 +11,11 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_cmaui_port_vlan_requirements: + port_cmaui_1c1_mgmt_port_0_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_cmaui_port_fixed_ips: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_cmaui_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_cmaui_port_network: - type: list - required: true - entry_schema: - type: string - port_cmaui_port_related_networks: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments + type: org.openecomp.datatypes.network.IpRequirements index_value: type: integer description: Index value of this substitution service template runtime instance @@ -41,81 +23,99 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 + port_cmaui_1c1_mgmt_port_0_network: + type: list + required: true + entry_schema: + type: string + port_cmaui_1c1_mgmt_port_0_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements compute_cmaui_1c1_availability_zone: type: list required: true entry_schema: type: string - port_cmaui_port_network_role_tag: - type: string + port_cmaui_1c1_mgmt_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - port_cmaui_port_order: - type: integer + port_cmaui_1c1_mgmt_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true vm_flavor_name: type: string required: true - port_cmaui_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_cmaui_1c1_mgmt_port_0_fixed_ips: + type: list required: true - port_cmaui_port_replacement_policy: + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_cmaui_1c1_mgmt_port_0_network_role: + type: string + required: true + port_cmaui_1c1_mgmt_port_0_replacement_policy: type: list required: true entry_schema: type: string - port_cmaui_port_network_role: + port_cmaui_1c1_mgmt_port_0_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_cmaui_1c1_mgmt_port_0_network_role_tag: type: string required: true vm_image_name: type: string required: true - port_cmaui_port_ip_requirements: - type: list + port_cmaui_1c1_mgmt_port_0_order: + type: integer + required: true + port_cmaui_1c1_mgmt_port_0_subnetpoolid: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements compute_cmaui_1c1_name: type: list required: true entry_schema: type: string - port_cmaui_port_subnetpoolid: - type: string - required: true node_templates: - cmaui_1c1_cmaui_port: + cmaui_1c1_cmaui_1c1_mgmt_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_cmaui_port_replacement_policy + - port_cmaui_1c1_mgmt_port_0_replacement_policy - index_value mac_requirements: - get_input: port_cmaui_port_mac_requirements + get_input: port_cmaui_1c1_mgmt_port_0_mac_requirements order: - get_input: port_cmaui_port_order + get_input: port_cmaui_1c1_mgmt_port_0_order exCP_naming: - get_input: port_cmaui_port_exCP_naming + get_input: port_cmaui_1c1_mgmt_port_0_exCP_naming vlan_requirements: - get_input: port_cmaui_port_vlan_requirements + get_input: port_cmaui_1c1_mgmt_port_0_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_cmaui_port_ip_requirements + get_input: port_cmaui_1c1_mgmt_port_0_ip_requirements related_networks: - get_input: port_cmaui_port_related_networks + get_input: port_cmaui_1c1_mgmt_port_0_related_networks network_role_tag: - get_input: port_cmaui_port_network_role_tag + get_input: port_cmaui_1c1_mgmt_port_0_network_role_tag network_role: - get_input: port_cmaui_port_network_role + get_input: port_cmaui_1c1_mgmt_port_0_network_role fixed_ips: get_input: - - port_cmaui_port_fixed_ips + - port_cmaui_1c1_mgmt_port_0_fixed_ips - index_value subnetpoolid: - get_input: port_cmaui_port_subnetpoolid + get_input: port_cmaui_1c1_mgmt_port_0_subnetpoolid network: get_input: - - port_cmaui_port_network + - port_cmaui_1c1_mgmt_port_0_network - index_value requirements: - binding: @@ -140,9 +140,6 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.cmaui_1c1 capabilities: - binding_cmaui_1c1_cmaui_port: - - cmaui_1c1_cmaui_port - - binding disk.iops_cmaui_1c1: - cmaui_1c1 - disk.iops @@ -155,21 +152,15 @@ topology_template: endpoint_cmaui_1c1: - cmaui_1c1 - endpoint - network.incoming.bytes.rate_cmaui_1c1_cmaui_port: - - cmaui_1c1_cmaui_port - - network.incoming.bytes.rate - network.incoming.packets_cmaui_1c1_cmaui_port: - - cmaui_1c1_cmaui_port - - network.incoming.packets - network.outgoing.bytes_cmaui_1c1_cmaui_port: - - cmaui_1c1_cmaui_port - - network.outgoing.bytes - network.outgoing.bytes.rate_cmaui_1c1_cmaui_port: - - cmaui_1c1_cmaui_port + binding_cmaui_1c1_cmaui_1c1_mgmt_port_0: + - cmaui_1c1_cmaui_1c1_mgmt_port_0 + - binding + network.outgoing.bytes.rate_cmaui_1c1_cmaui_1c1_mgmt_port_0: + - cmaui_1c1_cmaui_1c1_mgmt_port_0 - network.outgoing.bytes.rate - network.outpoing.packets_cmaui_1c1_cmaui_port: - - cmaui_1c1_cmaui_port - - network.outpoing.packets + network.outgoing.bytes_cmaui_1c1_cmaui_1c1_mgmt_port_0: + - cmaui_1c1_cmaui_1c1_mgmt_port_0 + - network.outgoing.bytes memory_cmaui_1c1: - cmaui_1c1 - memory @@ -179,6 +170,12 @@ topology_template: disk.read.bytes.rate_cmaui_1c1: - cmaui_1c1 - disk.read.bytes.rate + attachment_cmaui_1c1_cmaui_1c1_mgmt_port_0: + - cmaui_1c1_cmaui_1c1_mgmt_port_0 + - attachment + network.incoming.packets_cmaui_1c1_cmaui_1c1_mgmt_port_0: + - cmaui_1c1_cmaui_1c1_mgmt_port_0 + - network.incoming.packets disk.write.requests.rate_cmaui_1c1: - cmaui_1c1 - disk.write.requests.rate @@ -194,9 +191,6 @@ topology_template: cpu_util_cmaui_1c1: - cmaui_1c1 - cpu_util - network.outgoing.packets.rate_cmaui_1c1_cmaui_port: - - cmaui_1c1_cmaui_port - - network.outgoing.packets.rate disk.device.read.bytes.rate_cmaui_1c1: - cmaui_1c1 - disk.device.read.bytes.rate @@ -206,9 +200,15 @@ topology_template: instance_cmaui_1c1: - cmaui_1c1 - instance + network.incoming.packets.rate_cmaui_1c1_cmaui_1c1_mgmt_port_0: + - cmaui_1c1_cmaui_1c1_mgmt_port_0 + - network.incoming.packets.rate disk.device.read.requests_cmaui_1c1: - cmaui_1c1 - disk.device.read.requests + feature_cmaui_1c1_cmaui_1c1_mgmt_port_0: + - cmaui_1c1_cmaui_1c1_mgmt_port_0 + - feature disk.device.write.bytes.rate_cmaui_1c1: - cmaui_1c1 - disk.device.write.bytes.rate @@ -230,9 +230,6 @@ topology_template: disk.device.latency_cmaui_1c1: - cmaui_1c1 - disk.device.latency - network.incoming.bytes_cmaui_1c1_cmaui_port: - - cmaui_1c1_cmaui_port - - network.incoming.bytes disk.write.bytes.rate_cmaui_1c1: - cmaui_1c1 - disk.write.bytes.rate @@ -254,36 +251,39 @@ topology_template: disk.device.read.requests.rate_cmaui_1c1: - cmaui_1c1 - disk.device.read.requests.rate + network.incoming.bytes_cmaui_1c1_cmaui_1c1_mgmt_port_0: + - cmaui_1c1_cmaui_1c1_mgmt_port_0 + - network.incoming.bytes feature_cmaui_1c1: - cmaui_1c1 - feature - network.incoming.packets.rate_cmaui_1c1_cmaui_port: - - cmaui_1c1_cmaui_port - - network.incoming.packets.rate disk.allocation_cmaui_1c1: - cmaui_1c1 - disk.allocation + forwarder_cmaui_1c1_cmaui_1c1_mgmt_port_0: + - cmaui_1c1_cmaui_1c1_mgmt_port_0 + - forwarder disk.device.allocation_cmaui_1c1: - cmaui_1c1 - disk.device.allocation disk.device.write.requests.rate_cmaui_1c1: - cmaui_1c1 - disk.device.write.requests.rate - forwarder_cmaui_1c1_cmaui_port: - - cmaui_1c1_cmaui_port - - forwarder + network.outgoing.packets.rate_cmaui_1c1_cmaui_1c1_mgmt_port_0: + - cmaui_1c1_cmaui_1c1_mgmt_port_0 + - network.outgoing.packets.rate disk.device.write.bytes_cmaui_1c1: - cmaui_1c1 - disk.device.write.bytes memory.resident_cmaui_1c1: - cmaui_1c1 - memory.resident - attachment_cmaui_1c1_cmaui_port: - - cmaui_1c1_cmaui_port - - attachment disk.usage_cmaui_1c1: - cmaui_1c1 - disk.usage + network.incoming.bytes.rate_cmaui_1c1_cmaui_1c1_mgmt_port_0: + - cmaui_1c1_cmaui_1c1_mgmt_port_0 + - network.incoming.bytes.rate disk.read.requests_cmaui_1c1: - cmaui_1c1 - disk.read.requests @@ -293,22 +293,22 @@ topology_template: vcpus_cmaui_1c1: - cmaui_1c1 - vcpus - feature_cmaui_1c1_cmaui_port: - - cmaui_1c1_cmaui_port - - feature + network.outpoing.packets_cmaui_1c1_cmaui_1c1_mgmt_port_0: + - cmaui_1c1_cmaui_1c1_mgmt_port_0 + - network.outpoing.packets cpu.delta_cmaui_1c1: - cmaui_1c1 - cpu.delta requirements: - dependency_cmaui_1c1_cmaui_port: - - cmaui_1c1_cmaui_port - - dependency + link_cmaui_1c1_cmaui_1c1_mgmt_port_0: + - cmaui_1c1_cmaui_1c1_mgmt_port_0 + - link dependency_cmaui_1c1: - cmaui_1c1 - dependency - link_cmaui_1c1_cmaui_port: - - cmaui_1c1_cmaui_port - - link + dependency_cmaui_1c1_cmaui_1c1_mgmt_port_0: + - cmaui_1c1_cmaui_1c1_mgmt_port_0 + - dependency local_storage_cmaui_1c1: - cmaui_1c1 - - local_storage \ No newline at end of file + - local_storage 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/Nested_oam_server_1c2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_oam_server_1c2ServiceTemplate.yaml index 688ff91cd9..e3dc95a1a4 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_oam_server_1c2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_oam_server_1c2ServiceTemplate.yaml @@ -11,14 +11,21 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_oam_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_oam_server_1c2_mgmt_port_0_vlan_requirements: + type: list required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements compute_oam_server_1c2_name: type: list required: true entry_schema: type: string + port_oam_server_1c2_mgmt_port_0_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments index_value: type: integer description: Index value of this substitution service template runtime instance @@ -26,117 +33,110 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_oam_port_network: + port_oam_server_1c2_mgmt_port_0_network_role_tag: + type: string + required: true + port_oam_server_1c2_mgmt_port_0_ip_requirements: type: list required: true entry_schema: - type: string - port_oam_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_oam_port_order: - type: integer - required: true - port_oam_port_subnetpoolid: - type: string - required: true - port_oam_port_related_networks: + type: org.openecomp.datatypes.network.IpRequirements + port_oam_server_1c2_mgmt_port_0_fixed_ips: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments + type: org.openecomp.datatypes.heat.neutron.port.FixedIps vm_flavor_name: type: string required: true + port_oam_server_1c2_mgmt_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true compute_oam_server_1c2_availability_zone: type: list required: true entry_schema: type: string - port_oam_port_fixed_ips: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps vm_image_name: type: string required: true - port_oam_port_vlan_requirements: + port_oam_server_1c2_mgmt_port_0_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_oam_port_ip_requirements: - type: list + type: string + port_oam_server_1c2_mgmt_port_0_order: + type: integer required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_oam_port_replacement_policy: + port_oam_server_1c2_mgmt_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_oam_server_1c2_mgmt_port_0_subnetpoolid: + type: string + required: true + port_oam_server_1c2_mgmt_port_0_replacement_policy: type: list required: true entry_schema: type: string - port_oam_port_network_role_tag: - type: string - required: true - port_oam_port_network_role: + port_oam_server_1c2_mgmt_port_0_network_role: type: string required: true node_templates: - oam_server_1c2: - type: org.openecomp.resource.vfc.compute.nodes.heat.oam_server_1c2 - properties: - availability_zone: - get_input: - - compute_oam_server_1c2_availability_zone - - index_value - flavor: - get_input: vm_flavor_name - image: - get_input: vm_image_name - name: - get_input: - - compute_oam_server_1c2_name - - index_value - oam_server_1c2_oam_port: + oam_server_1c2_oam_server_1c2_mgmt_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_oam_port_replacement_policy + - port_oam_server_1c2_mgmt_port_0_replacement_policy - index_value mac_requirements: - get_input: port_oam_port_mac_requirements + get_input: port_oam_server_1c2_mgmt_port_0_mac_requirements order: - get_input: port_oam_port_order + get_input: port_oam_server_1c2_mgmt_port_0_order exCP_naming: - get_input: port_oam_port_exCP_naming + get_input: port_oam_server_1c2_mgmt_port_0_exCP_naming vlan_requirements: - get_input: port_oam_port_vlan_requirements + get_input: port_oam_server_1c2_mgmt_port_0_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_oam_port_ip_requirements + get_input: port_oam_server_1c2_mgmt_port_0_ip_requirements related_networks: - get_input: port_oam_port_related_networks + get_input: port_oam_server_1c2_mgmt_port_0_related_networks network_role_tag: - get_input: port_oam_port_network_role_tag + get_input: port_oam_server_1c2_mgmt_port_0_network_role_tag network_role: - get_input: port_oam_port_network_role + get_input: port_oam_server_1c2_mgmt_port_0_network_role fixed_ips: get_input: - - port_oam_port_fixed_ips + - port_oam_server_1c2_mgmt_port_0_fixed_ips - index_value subnetpoolid: - get_input: port_oam_port_subnetpoolid + get_input: port_oam_server_1c2_mgmt_port_0_subnetpoolid network: get_input: - - port_oam_port_network + - port_oam_server_1c2_mgmt_port_0_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: oam_server_1c2 relationship: tosca.relationships.network.BindsTo + oam_server_1c2: + type: org.openecomp.resource.vfc.compute.nodes.heat.oam_server_1c2 + properties: + availability_zone: + get_input: + - compute_oam_server_1c2_availability_zone + - index_value + flavor: + get_input: vm_flavor_name + image: + get_input: vm_image_name + name: + get_input: + - compute_oam_server_1c2_name + - index_value outputs: oam_server_1c2_accessIPv4: type: string @@ -165,27 +165,18 @@ topology_template: disk.device.write.bytes.rate_oam_server_1c2: - oam_server_1c2 - disk.device.write.bytes.rate - network.outgoing.packets.rate_oam_server_1c2_oam_port: - - oam_server_1c2_oam_port - - network.outgoing.packets.rate - network.outpoing.packets_oam_server_1c2_oam_port: - - oam_server_1c2_oam_port - - network.outpoing.packets cpu_util_oam_server_1c2: - oam_server_1c2 - cpu_util disk.device.write.bytes_oam_server_1c2: - oam_server_1c2 - disk.device.write.bytes + binding_oam_server_1c2_oam_server_1c2_mgmt_port_0: + - oam_server_1c2_oam_server_1c2_mgmt_port_0 + - binding disk.device.allocation_oam_server_1c2: - oam_server_1c2 - disk.device.allocation - attachment_oam_server_1c2_oam_port: - - oam_server_1c2_oam_port - - attachment - network.incoming.bytes.rate_oam_server_1c2_oam_port: - - oam_server_1c2_oam_port - - network.incoming.bytes.rate disk.root.size_oam_server_1c2: - oam_server_1c2 - disk.root.size @@ -195,33 +186,33 @@ topology_template: disk.read.bytes.rate_oam_server_1c2: - oam_server_1c2 - disk.read.bytes.rate - network.outgoing.bytes_oam_server_1c2_oam_port: - - oam_server_1c2_oam_port - - network.outgoing.bytes + network.outgoing.bytes.rate_oam_server_1c2_oam_server_1c2_mgmt_port_0: + - oam_server_1c2_oam_server_1c2_mgmt_port_0 + - network.outgoing.bytes.rate disk.allocation_oam_server_1c2: - oam_server_1c2 - disk.allocation disk.read.bytes_oam_server_1c2: - oam_server_1c2 - disk.read.bytes - network.incoming.bytes_oam_server_1c2_oam_port: - - oam_server_1c2_oam_port - - network.incoming.bytes - network.outgoing.bytes.rate_oam_server_1c2_oam_port: - - oam_server_1c2_oam_port - - network.outgoing.bytes.rate + network.incoming.packets_oam_server_1c2_oam_server_1c2_mgmt_port_0: + - oam_server_1c2_oam_server_1c2_mgmt_port_0 + - network.incoming.packets + network.incoming.packets.rate_oam_server_1c2_oam_server_1c2_mgmt_port_0: + - oam_server_1c2_oam_server_1c2_mgmt_port_0 + - network.incoming.packets.rate vcpus_oam_server_1c2: - oam_server_1c2 - vcpus disk.device.read.bytes.rate_oam_server_1c2: - oam_server_1c2 - disk.device.read.bytes.rate - network.incoming.packets_oam_server_1c2_oam_port: - - oam_server_1c2_oam_port - - network.incoming.packets cpu_oam_server_1c2: - oam_server_1c2 - cpu + network.outpoing.packets_oam_server_1c2_oam_server_1c2_mgmt_port_0: + - oam_server_1c2_oam_server_1c2_mgmt_port_0 + - network.outpoing.packets disk.write.requests.rate_oam_server_1c2: - oam_server_1c2 - disk.write.requests.rate @@ -240,12 +231,12 @@ topology_template: endpoint_oam_server_1c2: - oam_server_1c2 - endpoint - forwarder_oam_server_1c2_oam_port: - - oam_server_1c2_oam_port - - forwarder disk.ephemeral.size_oam_server_1c2: - oam_server_1c2 - disk.ephemeral.size + feature_oam_server_1c2_oam_server_1c2_mgmt_port_0: + - oam_server_1c2_oam_server_1c2_mgmt_port_0 + - feature memory.resident_oam_server_1c2: - oam_server_1c2 - memory.resident @@ -258,27 +249,30 @@ topology_template: memory.usage_oam_server_1c2: - oam_server_1c2 - memory.usage + attachment_oam_server_1c2_oam_server_1c2_mgmt_port_0: + - oam_server_1c2_oam_server_1c2_mgmt_port_0 + - attachment disk.usage_oam_server_1c2: - oam_server_1c2 - disk.usage - network.incoming.packets.rate_oam_server_1c2_oam_port: - - oam_server_1c2_oam_port - - network.incoming.packets.rate - binding_oam_server_1c2_oam_port: - - oam_server_1c2_oam_port - - binding + network.outgoing.bytes_oam_server_1c2_oam_server_1c2_mgmt_port_0: + - oam_server_1c2_oam_server_1c2_mgmt_port_0 + - network.outgoing.bytes os_oam_server_1c2: - oam_server_1c2 - os + forwarder_oam_server_1c2_oam_server_1c2_mgmt_port_0: + - oam_server_1c2_oam_server_1c2_mgmt_port_0 + - forwarder disk.device.read.requests_oam_server_1c2: - oam_server_1c2 - disk.device.read.requests disk.latency_oam_server_1c2: - oam_server_1c2 - disk.latency - feature_oam_server_1c2_oam_port: - - oam_server_1c2_oam_port - - feature + network.incoming.bytes_oam_server_1c2_oam_server_1c2_mgmt_port_0: + - oam_server_1c2_oam_server_1c2_mgmt_port_0 + - network.incoming.bytes disk.write.requests_oam_server_1c2: - oam_server_1c2 - disk.write.requests @@ -297,6 +291,9 @@ topology_template: disk.write.bytes_oam_server_1c2: - oam_server_1c2 - disk.write.bytes + network.outgoing.packets.rate_oam_server_1c2_oam_server_1c2_mgmt_port_0: + - oam_server_1c2_oam_server_1c2_mgmt_port_0 + - network.outgoing.packets.rate disk.capacity_oam_server_1c2: - oam_server_1c2 - disk.capacity @@ -306,16 +303,19 @@ topology_template: disk.iops_oam_server_1c2: - oam_server_1c2 - disk.iops + network.incoming.bytes.rate_oam_server_1c2_oam_server_1c2_mgmt_port_0: + - oam_server_1c2_oam_server_1c2_mgmt_port_0 + - network.incoming.bytes.rate requirements: local_storage_oam_server_1c2: - oam_server_1c2 - local_storage + dependency_oam_server_1c2_oam_server_1c2_mgmt_port_0: + - oam_server_1c2_oam_server_1c2_mgmt_port_0 + - dependency dependency_oam_server_1c2: - oam_server_1c2 - dependency - link_oam_server_1c2_oam_port: - - oam_server_1c2_oam_port + link_oam_server_1c2_oam_server_1c2_mgmt_port_0: + - oam_server_1c2_oam_server_1c2_mgmt_port_0 - link - dependency_oam_server_1c2_oam_port: - - oam_server_1c2_oam_port - - 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/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 f6b369aee2..5ab233070f 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 @@ -129,7 +129,24 @@ topology_template: directives: - substitutable properties: - port_cmaui_port_fixed_ips: + port_cmaui_1c1_mgmt_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + port_cmaui_1c1_mgmt_port_0_network: + - packet_internal_network + - packet_internal_network + compute_cmaui_1c1_availability_zone: + - get_input: availability_zone_0 + - get_input: availability_zone_0 + port_cmaui_1c1_mgmt_port_0_mac_requirements: + mac_count_required: + is_required: false + vm_flavor_name: + get_input: cmaui_1c1_flavor + port_cmaui_1c1_mgmt_port_0_fixed_ips: - - ip_address: get_input: - cmaui_oam_ips @@ -138,28 +155,11 @@ topology_template: get_input: - cmaui_oam_ips - 0 - port_cmaui_port_network: - - packet_internal_network - - packet_internal_network - compute_cmaui_1c1_availability_zone: - - get_input: availability_zone_0 - - get_input: availability_zone_0 - vm_flavor_name: - get_input: cmaui_1c1_flavor - port_cmaui_port_mac_requirements: - mac_count_required: - is_required: false - port_cmaui_port_replacement_policy: + port_cmaui_1c1_mgmt_port_0_replacement_policy: - AUTO - AUTO vm_image_name: get_input: cmaui_1c1_image - port_cmaui_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false compute_cmaui_1c1_name: - get_input: - cmaui_1c1_names @@ -176,7 +176,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_cmaui_1c1_cmaui_port: + - link_cmaui_1c1_cmaui_1c1_mgmt_port_0: capability: tosca.capabilities.network.Linkable node: packet_internal_network relationship: tosca.relationships.network.LinksTo @@ -277,33 +277,33 @@ topology_template: directives: - substitutable properties: - port_oam_port_mac_requirements: - mac_count_required: - is_required: false compute_oam_server_1c2_name: - get_input: - oam_server_1c2_names - 1 - port_oam_port_network: - - packet_external_network - vm_flavor_name: - get_input: oam_server_1c2_flavor - compute_oam_server_1c2_availability_zone: - - get_input: availability_zone_0 - port_oam_port_fixed_ips: + port_oam_server_1c2_mgmt_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + port_oam_server_1c2_mgmt_port_0_fixed_ips: - ip_address: get_input: - cmaui_oam_ips - 1 + vm_flavor_name: + get_input: oam_server_1c2_flavor + port_oam_server_1c2_mgmt_port_0_mac_requirements: + mac_count_required: + is_required: false + compute_oam_server_1c2_availability_zone: + - get_input: availability_zone_0 vm_image_name: get_input: oam_server_1c2_image - port_oam_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false - port_oam_port_replacement_policy: + port_oam_server_1c2_mgmt_port_0_network: + - packet_external_network + port_oam_server_1c2_mgmt_port_0_replacement_policy: - AUTO service_template_filter: substitute_service_template: Nested_oam_server_1c2ServiceTemplate.yaml @@ -314,7 +314,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_oam_server_1c2_oam_port: + - link_oam_server_1c2_oam_server_1c2_mgmt_port_0: capability: tosca.capabilities.network.Linkable node: packet_external_network relationship: tosca.relationships.network.LinksTo @@ -323,33 +323,33 @@ topology_template: directives: - substitutable properties: - port_oam_port_mac_requirements: - mac_count_required: - is_required: false compute_oam_server_1c2_name: - get_input: - oam_server_1c2_names - 0 - port_oam_port_network: - - packet_internal_network - vm_flavor_name: - get_input: oam_server_1c2_flavor - compute_oam_server_1c2_availability_zone: - - get_input: availability_zone_0 - port_oam_port_fixed_ips: + port_oam_server_1c2_mgmt_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + port_oam_server_1c2_mgmt_port_0_fixed_ips: - ip_address: get_input: - cmaui_oam_ips - 1 + vm_flavor_name: + get_input: oam_server_1c2_flavor + port_oam_server_1c2_mgmt_port_0_mac_requirements: + mac_count_required: + is_required: false + compute_oam_server_1c2_availability_zone: + - get_input: availability_zone_0 vm_image_name: get_input: oam_server_1c2_image - port_oam_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false - port_oam_port_replacement_policy: + port_oam_server_1c2_mgmt_port_0_network: + - packet_internal_network + port_oam_server_1c2_mgmt_port_0_replacement_policy: - AUTO service_template_filter: substitute_service_template: Nested_oam_server_1c2ServiceTemplate.yaml @@ -360,7 +360,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_oam_server_1c2_oam_port: + - link_oam_server_1c2_oam_server_1c2_mgmt_port_0: capability: tosca.capabilities.network.Linkable node: packet_internal_network relationship: tosca.relationships.network.LinksTo @@ -391,6 +391,9 @@ topology_template: disk.capacity_server_1b_pd: - abstract_pd_server_1b - disk.capacity_pd_server_1b + network.incoming.packets_oam_server_1c2_1_mgmt_port_0: + - abstract_oam_server_1c2_0 + - network.incoming.packets_oam_server_1c2_oam_server_1c2_mgmt_port_0 disk.device.write.bytes.rate_server_1c2_oam_2: - abstract_oam_server_1c2_1 - disk.device.write.bytes.rate_oam_server_1c2 @@ -409,15 +412,27 @@ topology_template: disk.usage_server_1b_pd: - abstract_pd_server_1b - disk.usage_pd_server_1b + network.incoming.packets_oam_server_1c2_2_mgmt_port_0: + - abstract_oam_server_1c2_1 + - network.incoming.packets_oam_server_1c2_oam_server_1c2_mgmt_port_0 + feature_cmaui_1c1_1_mgmt_port_0: + - abstract_cmaui_1c1 + - feature_cmaui_1c1_cmaui_1c1_mgmt_port_0 disk.iops_server_1c2_oam_2: - abstract_oam_server_1c2_1 - disk.iops_oam_server_1c2 disk.usage_server_1c2_oam_2: - abstract_oam_server_1c2_1 - disk.usage_oam_server_1c2 + network.outgoing.bytes_cmaui_1c1_1_mgmt_port_0: + - abstract_cmaui_1c1 + - network.outgoing.bytes_cmaui_1c1_cmaui_1c1_mgmt_port_0 disk.read.requests_server_1c1_cmaui_2: - abstract_cmaui_1c1 - disk.read.requests_cmaui_1c1 + network.outgoing.bytes_cmaui_1c1_2_mgmt_port_0: + - abstract_cmaui_1c1 + - network.outgoing.bytes_cmaui_1c1_cmaui_1c1_mgmt_port_0 feature_server_1c1_cmaui_1: - abstract_cmaui_1c1 - feature_cmaui_1c1 @@ -436,21 +451,12 @@ topology_template: disk.device.iops_server_1b_ps: - abstract_ps_server_1b - disk.device.iops_ps_server_1b - network.outgoing.bytes_cmaui_port_2: - - abstract_cmaui_1c1 - - network.outgoing.bytes_cmaui_1c1_cmaui_port disk.iops_server_1c2_oam_1: - abstract_oam_server_1c2_0 - disk.iops_oam_server_1c2 - network.outgoing.bytes_cmaui_port_1: + feature_cmaui_1c1_2_mgmt_port_0: - abstract_cmaui_1c1 - - network.outgoing.bytes_cmaui_1c1_cmaui_port - network.outgoing.packets.rate_oam_port_2: - - abstract_oam_server_1c2_1 - - network.outgoing.packets.rate_oam_server_1c2_oam_port - network.outgoing.packets.rate_oam_port_1: - - abstract_oam_server_1c2_0 - - network.outgoing.packets.rate_oam_server_1c2_oam_port + - feature_cmaui_1c1_cmaui_1c1_mgmt_port_0 disk.device.iops_server_1b_pd: - abstract_pd_server_1b - disk.device.iops_pd_server_1b @@ -490,6 +496,9 @@ topology_template: disk.device.read.requests.rate_server_1b_pd: - abstract_pd_server_1b - disk.device.read.requests.rate_pd_server_1b + network.outgoing.packets.rate_oam_server_1c2_2_mgmt_port_0: + - abstract_oam_server_1c2_1 + - network.outgoing.packets.rate_oam_server_1c2_oam_server_1c2_mgmt_port_0 disk.device.write.requests_server_1c1_cmaui_2: - abstract_cmaui_1c1 - disk.device.write.requests_cmaui_1c1 @@ -502,6 +511,9 @@ topology_template: disk.device.read.bytes_server_1c1_cmaui_1: - abstract_cmaui_1c1 - disk.device.read.bytes_cmaui_1c1 + network.incoming.packets.rate_oam_server_1c2_1_mgmt_port_0: + - abstract_oam_server_1c2_0 + - network.incoming.packets.rate_oam_server_1c2_oam_server_1c2_mgmt_port_0 disk.device.read.requests.rate_server_1b_ps: - abstract_ps_server_1b - disk.device.read.requests.rate_ps_server_1b @@ -526,18 +538,6 @@ topology_template: memory.usage_server_1b_pd: - abstract_pd_server_1b - memory.usage_pd_server_1b - network.outpoing.packets_oam_port_1: - - abstract_oam_server_1c2_0 - - network.outpoing.packets_oam_server_1c2_oam_port - network.outpoing.packets_oam_port_2: - - abstract_oam_server_1c2_1 - - network.outpoing.packets_oam_server_1c2_oam_port - binding_cmaui_port_1: - - abstract_cmaui_1c1 - - binding_cmaui_1c1_cmaui_port - binding_cmaui_port_2: - - abstract_cmaui_1c1 - - binding_cmaui_1c1_cmaui_port memory.usage_server_1b_ps: - abstract_ps_server_1b - memory.usage_ps_server_1b @@ -550,6 +550,9 @@ topology_template: cpu_util_server_1c2_oam_2: - abstract_oam_server_1c2_1 - cpu_util_oam_server_1c2 + network.incoming.packets.rate_oam_server_1c2_2_mgmt_port_0: + - abstract_oam_server_1c2_1 + - network.incoming.packets.rate_oam_server_1c2_oam_server_1c2_mgmt_port_0 memory_server_1c2_oam_1: - abstract_oam_server_1c2_0 - memory_oam_server_1c2 @@ -571,12 +574,9 @@ topology_template: cpu_util_server_1b_ps: - abstract_ps_server_1b - cpu_util_ps_server_1b - network.incoming.bytes_cmaui_port_2: - - abstract_cmaui_1c1 - - network.incoming.bytes_cmaui_1c1_cmaui_port - network.incoming.bytes_cmaui_port_1: - - abstract_cmaui_1c1 - - network.incoming.bytes_cmaui_1c1_cmaui_port + network.outgoing.packets.rate_oam_server_1c2_1_mgmt_port_0: + - abstract_oam_server_1c2_0 + - network.outgoing.packets.rate_oam_server_1c2_oam_server_1c2_mgmt_port_0 os_server_1c2_oam_1: - abstract_oam_server_1c2_0 - os_oam_server_1c2 @@ -604,39 +604,24 @@ topology_template: feature_server_1c2_oam_2: - abstract_oam_server_1c2_1 - feature_oam_server_1c2 + network.incoming.bytes_cmaui_1c1_1_mgmt_port_0: + - abstract_cmaui_1c1 + - network.incoming.bytes_cmaui_1c1_cmaui_1c1_mgmt_port_0 disk.device.write.bytes_server_1b_ps: - abstract_ps_server_1b - disk.device.write.bytes_ps_server_1b - network.incoming.packets.rate_cmaui_port_1: - - abstract_cmaui_1c1 - - network.incoming.packets.rate_cmaui_1c1_cmaui_port vcpus_server_1c1_cmaui_1: - abstract_cmaui_1c1 - vcpus_cmaui_1c1 - network.incoming.packets.rate_cmaui_port_2: - - abstract_cmaui_1c1 - - network.incoming.packets.rate_cmaui_1c1_cmaui_port - feature_cmaui_port_1: - - abstract_cmaui_1c1 - - feature_cmaui_1c1_cmaui_port network.incoming.bytes.rate_pd_server_1b_port: - abstract_pd_server_1b - network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port - network.outgoing.bytes_oam_port_2: - - abstract_oam_server_1c2_1 - - network.outgoing.bytes_oam_server_1c2_oam_port - feature_cmaui_port_2: - - abstract_cmaui_1c1 - - feature_cmaui_1c1_cmaui_port instance_server_1b_ps: - abstract_ps_server_1b - instance_ps_server_1b feature_server_1c2_oam_1: - abstract_oam_server_1c2_0 - feature_oam_server_1c2 - network.outgoing.bytes_oam_port_1: - - abstract_oam_server_1c2_0 - - network.outgoing.bytes_oam_server_1c2_oam_port disk.device.capacity_server_1c1_cmaui_2: - abstract_cmaui_1c1 - disk.device.capacity_cmaui_1c1 @@ -646,18 +631,24 @@ topology_template: cpu.delta_server_1b_ps: - abstract_ps_server_1b - cpu.delta_ps_server_1b + network.outgoing.bytes.rate_oam_server_1c2_2_mgmt_port_0: + - abstract_oam_server_1c2_1 + - network.outgoing.bytes.rate_oam_server_1c2_oam_server_1c2_mgmt_port_0 + network.outgoing.packets.rate_cmaui_1c1_1_mgmt_port_0: + - abstract_cmaui_1c1 + - network.outgoing.packets.rate_cmaui_1c1_cmaui_1c1_mgmt_port_0 instance_server_1c1_cmaui_1: - abstract_cmaui_1c1 - instance_cmaui_1c1 + attachment_cmaui_1c1_1_mgmt_port_0: + - abstract_cmaui_1c1 + - attachment_cmaui_1c1_cmaui_1c1_mgmt_port_0 disk.device.read.requests.rate_server_1c2_oam_1: - abstract_oam_server_1c2_0 - disk.device.read.requests.rate_oam_server_1c2 disk.device.read.requests.rate_server_1c2_oam_2: - abstract_oam_server_1c2_1 - disk.device.read.requests.rate_oam_server_1c2 - attachment_oam_port_2: - - abstract_oam_server_1c2_1 - - attachment_oam_server_1c2_oam_port disk.device.write.bytes.rate_server_1b_pd: - abstract_pd_server_1b - disk.device.write.bytes.rate_pd_server_1b @@ -670,9 +661,15 @@ topology_template: cpu.delta_server_1b_pd: - abstract_pd_server_1b - cpu.delta_pd_server_1b - attachment_oam_port_1: + binding_oam_server_1c2_2_mgmt_port_0: + - abstract_oam_server_1c2_1 + - binding_oam_server_1c2_oam_server_1c2_mgmt_port_0 + network.outpoing.packets_oam_server_1c2_1_mgmt_port_0: + - abstract_oam_server_1c2_0 + - network.outpoing.packets_oam_server_1c2_oam_server_1c2_mgmt_port_0 + attachment_oam_server_1c2_1_mgmt_port_0: - abstract_oam_server_1c2_0 - - attachment_oam_server_1c2_oam_port + - attachment_oam_server_1c2_oam_server_1c2_mgmt_port_0 disk.device.write.requests_server_1b_pd: - abstract_pd_server_1b - disk.device.write.requests_pd_server_1b @@ -709,18 +706,15 @@ topology_template: vcpus_server_1c1_cmaui_2: - abstract_cmaui_1c1 - vcpus_cmaui_1c1 + network.incoming.packets_cmaui_1c1_2_mgmt_port_0: + - abstract_cmaui_1c1 + - network.incoming.packets_cmaui_1c1_cmaui_1c1_mgmt_port_0 binding_ps_server_1b_port: - abstract_ps_server_1b - binding_ps_server_1b_ps_server_1b_port disk.device.write.bytes.rate_server_1b_ps: - abstract_ps_server_1b - disk.device.write.bytes.rate_ps_server_1b - forwarder_cmaui_port_2: - - abstract_cmaui_1c1 - - forwarder_cmaui_1c1_cmaui_port - forwarder_cmaui_port_1: - - abstract_cmaui_1c1 - - forwarder_cmaui_1c1_cmaui_port disk.device.write.requests_server_1b_ps: - abstract_ps_server_1b - disk.device.write.requests_ps_server_1b @@ -742,12 +736,21 @@ topology_template: disk.device.read.requests_server_1b_pd: - abstract_pd_server_1b - disk.device.read.requests_pd_server_1b + binding_cmaui_1c1_2_mgmt_port_0: + - abstract_cmaui_1c1 + - binding_cmaui_1c1_cmaui_1c1_mgmt_port_0 + network.outgoing.bytes_oam_server_1c2_1_mgmt_port_0: + - abstract_oam_server_1c2_0 + - network.outgoing.bytes_oam_server_1c2_oam_server_1c2_mgmt_port_0 disk.read.requests_server_1b_pd: - abstract_pd_server_1b - disk.read.requests_pd_server_1b cpu_util_server_1c1_cmaui_2: - abstract_cmaui_1c1 - cpu_util_cmaui_1c1 + network.incoming.bytes_oam_server_1c2_1_mgmt_port_0: + - abstract_oam_server_1c2_0 + - network.incoming.bytes_oam_server_1c2_oam_server_1c2_mgmt_port_0 disk.allocation_server_1c2_oam_2: - abstract_oam_server_1c2_1 - disk.allocation_oam_server_1c2 @@ -772,9 +775,6 @@ topology_template: cpu_server_1b_pd: - abstract_pd_server_1b - cpu_pd_server_1b - binding_oam_port_2: - - abstract_oam_server_1c2_1 - - binding_oam_server_1c2_oam_port disk.write.bytes.rate_server_1c1_cmaui_1: - abstract_cmaui_1c1 - disk.write.bytes.rate_cmaui_1c1 @@ -784,9 +784,12 @@ topology_template: disk.allocation_server_1b_pd: - abstract_pd_server_1b - disk.allocation_pd_server_1b - binding_oam_port_1: + feature_oam_server_1c2_2_mgmt_port_0: + - abstract_oam_server_1c2_1 + - feature_oam_server_1c2_oam_server_1c2_mgmt_port_0 + forwarder_oam_server_1c2_1_mgmt_port_0: - abstract_oam_server_1c2_0 - - binding_oam_server_1c2_oam_port + - forwarder_oam_server_1c2_oam_server_1c2_mgmt_port_0 disk.read.bytes.rate_server_1c1_cmaui_2: - abstract_cmaui_1c1 - disk.read.bytes.rate_cmaui_1c1 @@ -802,15 +805,9 @@ topology_template: cpu_server_1b_ps: - abstract_ps_server_1b - cpu_ps_server_1b - network.outpoing.packets_cmaui_port_1: - - abstract_cmaui_1c1 - - network.outpoing.packets_cmaui_1c1_cmaui_port disk.allocation_server_1b_ps: - abstract_ps_server_1b - disk.allocation_ps_server_1b - network.outpoing.packets_cmaui_port_2: - - abstract_cmaui_1c1 - - network.outpoing.packets_cmaui_1c1_cmaui_port disk.latency_server_1c2_oam_1: - abstract_oam_server_1c2_0 - disk.latency_oam_server_1c2 @@ -850,6 +847,9 @@ topology_template: memory.resident_server_1c1_cmaui_2: - abstract_cmaui_1c1 - memory.resident_cmaui_1c1 + network.incoming.bytes.rate_cmaui_1c1_2_mgmt_port_0: + - abstract_cmaui_1c1 + - network.incoming.bytes.rate_cmaui_1c1_cmaui_1c1_mgmt_port_0 disk.root.size_server_1c2_oam_2: - abstract_oam_server_1c2_1 - disk.root.size_oam_server_1c2 @@ -859,27 +859,33 @@ topology_template: network.incoming.bytes.rate_ps_server_1b_port: - abstract_ps_server_1b - network.incoming.bytes.rate_ps_server_1b_ps_server_1b_port - network.incoming.bytes.rate_oam_port_1: - - abstract_oam_server_1c2_0 - - network.incoming.bytes.rate_oam_server_1c2_oam_port os_server_1c1_cmaui_2: - abstract_cmaui_1c1 - os_cmaui_1c1 + network.incoming.bytes.rate_oam_server_1c2_1_mgmt_port_0: + - abstract_oam_server_1c2_0 + - network.incoming.bytes.rate_oam_server_1c2_oam_server_1c2_mgmt_port_0 os_server_1c1_cmaui_1: - abstract_cmaui_1c1 - os_cmaui_1c1 instance_server_1c2_oam_1: - abstract_oam_server_1c2_0 - instance_oam_server_1c2 + network.incoming.bytes.rate_cmaui_1c1_1_mgmt_port_0: + - abstract_cmaui_1c1 + - network.incoming.bytes.rate_cmaui_1c1_cmaui_1c1_mgmt_port_0 + network.outgoing.bytes.rate_cmaui_1c1_1_mgmt_port_0: + - abstract_cmaui_1c1 + - network.outgoing.bytes.rate_cmaui_1c1_cmaui_1c1_mgmt_port_0 instance_server_1c2_oam_2: - abstract_oam_server_1c2_1 - instance_oam_server_1c2 - network.incoming.bytes.rate_oam_port_2: - - abstract_oam_server_1c2_1 - - network.incoming.bytes.rate_oam_server_1c2_oam_port vcpus_server_1b_pd: - abstract_pd_server_1b - vcpus_pd_server_1b + network.outgoing.bytes.rate_cmaui_1c1_2_mgmt_port_0: + - abstract_cmaui_1c1 + - network.outgoing.bytes.rate_cmaui_1c1_cmaui_1c1_mgmt_port_0 memory.usage_server_1c1_cmaui_1: - abstract_cmaui_1c1 - memory.usage_cmaui_1c1 @@ -913,12 +919,6 @@ topology_template: disk.write.bytes.rate_server_1b_pd: - abstract_pd_server_1b - disk.write.bytes.rate_pd_server_1b - forwarder_oam_port_1: - - abstract_oam_server_1c2_0 - - forwarder_oam_server_1c2_oam_port - forwarder_oam_port_2: - - abstract_oam_server_1c2_1 - - forwarder_oam_server_1c2_oam_port binding_server_1c2_oam_2: - abstract_oam_server_1c2_1 - binding_oam_server_1c2 @@ -931,6 +931,9 @@ topology_template: attachment_packet_internal_network: - packet_internal_network - attachment + forwarder_cmaui_1c1_1_mgmt_port_0: + - abstract_cmaui_1c1 + - forwarder_cmaui_1c1_cmaui_1c1_mgmt_port_0 network.outgoing.packets.rate_pd_server_1b_port: - abstract_pd_server_1b - network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port @@ -946,6 +949,9 @@ topology_template: disk.device.usage_server_1b_pd: - abstract_pd_server_1b - disk.device.usage_pd_server_1b + forwarder_cmaui_1c1_2_mgmt_port_0: + - abstract_cmaui_1c1 + - forwarder_cmaui_1c1_cmaui_1c1_mgmt_port_0 disk.write.requests_server_1c2_oam_1: - abstract_oam_server_1c2_0 - disk.write.requests_oam_server_1c2 @@ -958,6 +964,9 @@ topology_template: os_server_1b_ps: - abstract_ps_server_1b - os_ps_server_1b + network.incoming.bytes.rate_oam_server_1c2_2_mgmt_port_0: + - abstract_oam_server_1c2_1 + - network.incoming.bytes.rate_oam_server_1c2_oam_server_1c2_mgmt_port_0 disk.device.latency_server_1b_ps: - abstract_ps_server_1b - disk.device.latency_ps_server_1b @@ -979,9 +988,6 @@ topology_template: disk.read.bytes_server_1b_ps: - abstract_ps_server_1b - disk.read.bytes_ps_server_1b - network.incoming.packets_cmaui_port_2: - - abstract_cmaui_1c1 - - network.incoming.packets_cmaui_1c1_cmaui_port disk.device.write.bytes.rate_server_1c1_cmaui_2: - abstract_cmaui_1c1 - disk.device.write.bytes.rate_cmaui_1c1 @@ -991,15 +997,18 @@ topology_template: disk.device.write.requests_server_1c2_oam_2: - abstract_oam_server_1c2_1 - disk.device.write.requests_oam_server_1c2 + network.incoming.packets.rate_cmaui_1c1_1_mgmt_port_0: + - abstract_cmaui_1c1 + - network.incoming.packets.rate_cmaui_1c1_cmaui_1c1_mgmt_port_0 disk.allocation_server_1c1_cmaui_1: - abstract_cmaui_1c1 - disk.allocation_cmaui_1c1 memory_server_1b_ps: - abstract_ps_server_1b - memory_ps_server_1b - network.incoming.packets_cmaui_port_1: + network.incoming.packets.rate_cmaui_1c1_2_mgmt_port_0: - abstract_cmaui_1c1 - - network.incoming.packets_cmaui_1c1_cmaui_port + - network.incoming.packets.rate_cmaui_1c1_cmaui_1c1_mgmt_port_0 network.outgoing.bytes.rate_ps_server_1b_port: - abstract_ps_server_1b - network.outgoing.bytes.rate_ps_server_1b_ps_server_1b_port @@ -1054,15 +1063,9 @@ topology_template: host_server_1c2_oam_2: - abstract_oam_server_1c2_1 - host_oam_server_1c2 - network.incoming.packets.rate_oam_port_1: - - abstract_oam_server_1c2_0 - - network.incoming.packets.rate_oam_server_1c2_oam_port disk.write.bytes_server_1b_ps: - abstract_ps_server_1b - disk.write.bytes_ps_server_1b - network.incoming.packets.rate_oam_port_2: - - abstract_oam_server_1c2_1 - - network.incoming.packets.rate_oam_server_1c2_oam_port end_point_packet_external_network: - packet_external_network - end_point @@ -1081,6 +1084,12 @@ topology_template: disk.device.read.requests_server_1c1_cmaui_1: - abstract_cmaui_1c1 - disk.device.read.requests_cmaui_1c1 + network.outpoing.packets_cmaui_1c1_2_mgmt_port_0: + - abstract_cmaui_1c1 + - network.outpoing.packets_cmaui_1c1_cmaui_1c1_mgmt_port_0 + network.outpoing.packets_cmaui_1c1_1_mgmt_port_0: + - abstract_cmaui_1c1 + - network.outpoing.packets_cmaui_1c1_cmaui_1c1_mgmt_port_0 disk.device.allocation_server_1b_pd: - abstract_pd_server_1b - disk.device.allocation_pd_server_1b @@ -1108,18 +1117,12 @@ topology_template: disk.device.capacity_server_1b_pd: - abstract_pd_server_1b - disk.device.capacity_pd_server_1b - network.outgoing.bytes.rate_cmaui_port_2: - - abstract_cmaui_1c1 - - network.outgoing.bytes.rate_cmaui_1c1_cmaui_port disk.root.size_server_1b_pd: - abstract_pd_server_1b - disk.root.size_pd_server_1b cpu_server_1c1_cmaui_2: - abstract_cmaui_1c1 - cpu_cmaui_1c1 - network.outgoing.bytes.rate_cmaui_port_1: - - abstract_cmaui_1c1 - - network.outgoing.bytes.rate_cmaui_1c1_cmaui_port cpu_server_1c1_cmaui_1: - abstract_cmaui_1c1 - cpu_cmaui_1c1 @@ -1150,15 +1153,24 @@ topology_template: disk.write.requests.rate_server_1c2_oam_2: - abstract_oam_server_1c2_1 - disk.write.requests.rate_oam_server_1c2 + attachment_cmaui_1c1_2_mgmt_port_0: + - abstract_cmaui_1c1 + - attachment_cmaui_1c1_cmaui_1c1_mgmt_port_0 cpu.delta_server_1c2_oam_2: - abstract_oam_server_1c2_1 - cpu.delta_oam_server_1c2 + network.outgoing.bytes.rate_oam_server_1c2_1_mgmt_port_0: + - abstract_oam_server_1c2_0 + - network.outgoing.bytes.rate_oam_server_1c2_oam_server_1c2_mgmt_port_0 disk.iops_server_1b_pd: - abstract_pd_server_1b - disk.iops_pd_server_1b disk.write.requests.rate_server_1c2_oam_1: - abstract_oam_server_1c2_0 - disk.write.requests.rate_oam_server_1c2 + network.incoming.bytes_cmaui_1c1_2_mgmt_port_0: + - abstract_cmaui_1c1 + - network.incoming.bytes_cmaui_1c1_cmaui_1c1_mgmt_port_0 disk.usage_server_1c1_cmaui_2: - abstract_cmaui_1c1 - disk.usage_cmaui_1c1 @@ -1171,45 +1183,24 @@ topology_template: end_point_packet_internal_network: - packet_internal_network - end_point - network.incoming.bytes_oam_port_2: - - abstract_oam_server_1c2_1 - - network.incoming.bytes_oam_server_1c2_oam_port + network.outgoing.packets.rate_cmaui_1c1_2_mgmt_port_0: + - abstract_cmaui_1c1 + - network.outgoing.packets.rate_cmaui_1c1_cmaui_1c1_mgmt_port_0 feature_packet_internal_network: - packet_internal_network - feature - network.incoming.bytes_oam_port_1: - - abstract_oam_server_1c2_0 - - network.incoming.bytes_oam_server_1c2_oam_port forwarder_pd_server_1b_port: - abstract_pd_server_1b - forwarder_pd_server_1b_pd_server_1b_port disk.device.write.requests.rate_server_1b_ps: - abstract_ps_server_1b - disk.device.write.requests.rate_ps_server_1b - attachment_cmaui_port_2: - - abstract_cmaui_1c1 - - attachment_cmaui_1c1_cmaui_port - network.outgoing.bytes.rate_oam_port_1: - - abstract_oam_server_1c2_0 - - network.outgoing.bytes.rate_oam_server_1c2_oam_port - network.outgoing.bytes.rate_oam_port_2: - - abstract_oam_server_1c2_1 - - network.outgoing.bytes.rate_oam_server_1c2_oam_port disk.iops_server_1b_ps: - abstract_ps_server_1b - disk.iops_ps_server_1b disk.capacity_server_1c1_cmaui_1: - abstract_cmaui_1c1 - disk.capacity_cmaui_1c1 - network.outgoing.packets.rate_cmaui_port_1: - - abstract_cmaui_1c1 - - network.outgoing.packets.rate_cmaui_1c1_cmaui_port - network.outgoing.packets.rate_cmaui_port_2: - - abstract_cmaui_1c1 - - network.outgoing.packets.rate_cmaui_1c1_cmaui_port - attachment_cmaui_port_1: - - abstract_cmaui_1c1 - - attachment_cmaui_1c1_cmaui_port disk.capacity_server_1c1_cmaui_2: - abstract_cmaui_1c1 - disk.capacity_cmaui_1c1 @@ -1222,6 +1213,9 @@ topology_template: disk.ephemeral.size_server_1c2_oam_1: - abstract_oam_server_1c2_0 - disk.ephemeral.size_oam_server_1c2 + binding_oam_server_1c2_1_mgmt_port_0: + - abstract_oam_server_1c2_0 + - binding_oam_server_1c2_oam_server_1c2_mgmt_port_0 disk.device.read.requests.rate_server_1c1_cmaui_1: - abstract_cmaui_1c1 - disk.device.read.requests.rate_cmaui_1c1 @@ -1234,12 +1228,18 @@ topology_template: disk.device.read.requests.rate_server_1c1_cmaui_2: - abstract_cmaui_1c1 - disk.device.read.requests.rate_cmaui_1c1 + attachment_oam_server_1c2_2_mgmt_port_0: + - abstract_oam_server_1c2_1 + - attachment_oam_server_1c2_oam_server_1c2_mgmt_port_0 network.incoming.packets_ps_server_1b_port: - abstract_ps_server_1b - network.incoming.packets_ps_server_1b_ps_server_1b_port disk.write.requests_server_1b_ps: - abstract_ps_server_1b - disk.write.requests_ps_server_1b + network.incoming.packets_cmaui_1c1_1_mgmt_port_0: + - abstract_cmaui_1c1 + - network.incoming.packets_cmaui_1c1_cmaui_1c1_mgmt_port_0 feature_pd_server_1b_port: - abstract_pd_server_1b - feature_pd_server_1b_pd_server_1b_port @@ -1279,12 +1279,15 @@ topology_template: disk.write.bytes_server_1c1_cmaui_2: - abstract_cmaui_1c1 - disk.write.bytes_cmaui_1c1 - feature_oam_port_2: + network.outgoing.bytes_oam_server_1c2_2_mgmt_port_0: - abstract_oam_server_1c2_1 - - feature_oam_server_1c2_oam_port - feature_oam_port_1: - - abstract_oam_server_1c2_0 - - feature_oam_server_1c2_oam_port + - network.outgoing.bytes_oam_server_1c2_oam_server_1c2_mgmt_port_0 + binding_cmaui_1c1_1_mgmt_port_0: + - abstract_cmaui_1c1 + - binding_cmaui_1c1_cmaui_1c1_mgmt_port_0 + network.incoming.bytes_oam_server_1c2_2_mgmt_port_0: + - abstract_oam_server_1c2_1 + - network.incoming.bytes_oam_server_1c2_oam_server_1c2_mgmt_port_0 network.incoming.packets.rate_pd_server_1b_port: - abstract_pd_server_1b - network.incoming.packets.rate_pd_server_1b_pd_server_1b_port @@ -1297,6 +1300,9 @@ topology_template: scalable_server_1c1_cmaui_1: - abstract_cmaui_1c1 - scalable_cmaui_1c1 + feature_oam_server_1c2_1_mgmt_port_0: + - abstract_oam_server_1c2_0 + - feature_oam_server_1c2_oam_server_1c2_mgmt_port_0 link_packet_internal_network: - packet_internal_network - link @@ -1315,24 +1321,18 @@ topology_template: cpu.delta_server_1c1_cmaui_1: - abstract_cmaui_1c1 - cpu.delta_cmaui_1c1 + network.outpoing.packets_oam_server_1c2_2_mgmt_port_0: + - abstract_oam_server_1c2_1 + - network.outpoing.packets_oam_server_1c2_oam_server_1c2_mgmt_port_0 endpoint_server_1b_ps: - abstract_ps_server_1b - endpoint_ps_server_1b - network.incoming.packets_oam_port_1: - - abstract_oam_server_1c2_0 - - network.incoming.packets_oam_server_1c2_oam_port - network.incoming.packets_oam_port_2: + forwarder_oam_server_1c2_2_mgmt_port_0: - abstract_oam_server_1c2_1 - - network.incoming.packets_oam_server_1c2_oam_port - network.incoming.bytes.rate_cmaui_port_1: - - abstract_cmaui_1c1 - - network.incoming.bytes.rate_cmaui_1c1_cmaui_port + - forwarder_oam_server_1c2_oam_server_1c2_mgmt_port_0 network.outgoing.bytes_ps_server_1b_port: - abstract_ps_server_1b - network.outgoing.bytes_ps_server_1b_ps_server_1b_port - network.incoming.bytes.rate_cmaui_port_2: - - abstract_cmaui_1c1 - - network.incoming.bytes.rate_cmaui_1c1_cmaui_port disk.device.read.bytes_server_1b_ps: - abstract_ps_server_1b - disk.device.read.bytes_ps_server_1b @@ -1376,12 +1376,6 @@ topology_template: local_storage_server_1b_ps: - abstract_ps_server_1b - local_storage_ps_server_1b - dependency_oam_port_2: - - abstract_oam_server_1c2_1 - - dependency_oam_server_1c2_oam_port - dependency_oam_port_1: - - abstract_oam_server_1c2_0 - - dependency_oam_server_1c2_oam_port dependency_server_1c1_cmaui_1: - abstract_cmaui_1c1 - dependency_cmaui_1c1 @@ -1391,9 +1385,15 @@ topology_template: link_ps_server_1b_port: - abstract_ps_server_1b - link_ps_server_1b_ps_server_1b_port + dependency_oam_server_1c2_2_mgmt_port_0: + - abstract_oam_server_1c2_1 + - dependency_oam_server_1c2_oam_server_1c2_mgmt_port_0 local_storage_server_1b_pd: - abstract_pd_server_1b - local_storage_pd_server_1b + dependency_oam_server_1c2_1_mgmt_port_0: + - abstract_oam_server_1c2_0 + - dependency_oam_server_1c2_oam_server_1c2_mgmt_port_0 dependency_ps_server_1b_port: - abstract_ps_server_1b - dependency_ps_server_1b_ps_server_1b_port @@ -1415,9 +1415,9 @@ topology_template: dependency_pd_server_1b_port: - abstract_pd_server_1b - dependency_pd_server_1b_pd_server_1b_port - dependency_cmaui_port_1: + dependency_cmaui_1c1_1_mgmt_port_0: - abstract_cmaui_1c1 - - dependency_cmaui_1c1_cmaui_port + - dependency_cmaui_1c1_cmaui_1c1_mgmt_port_0 dependency_packet_internal_network: - packet_internal_network - dependency @@ -1427,9 +1427,9 @@ topology_template: local_storage_server_1c1_cmaui_1: - abstract_cmaui_1c1 - local_storage_cmaui_1c1 - dependency_cmaui_port_2: + dependency_cmaui_1c1_2_mgmt_port_0: - abstract_cmaui_1c1 - - dependency_cmaui_1c1_cmaui_port + - dependency_cmaui_1c1_cmaui_1c1_mgmt_port_0 dependency_packet_external_network: - packet_external_network - - dependency \ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/in/nested1.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/in/nested1.yml index 22d5751be7..b1779bb4cd 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/in/nested1.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/in/nested1.yml @@ -35,13 +35,13 @@ parameters: type: string resources: - cmaui_port_1: + cmaui_1_mgmt_port_0: type: OS::Neutron::Port properties: network: {get_resource: packet_internal_network} replacement_policy: AUTO - cmaui_port_2: + cmaui_2_mgmt_port_0: type: OS::Neutron::Port properties: network: {get_resource: packet_external_network} @@ -56,7 +56,7 @@ resources: availability_zone: { get_param: availability_zone_0 } flavor: { get_param: cmaui_flavor } networks: - - port: { get_resource: cmaui_port_1 } + - port: { get_resource: cmaui_1_mgmt_port_0 } server_cmaui_2: type: OS::Nova::Server @@ -66,7 +66,7 @@ resources: availability_zone: { get_param: availability_zone_0 } flavor: { get_param: cmaui_flavor } networks: - - port: { get_resource: cmaui_port_2 } + - port: { get_resource: cmaui_2_mgmt_port_0 } packet_internal_network: type: OS::Neutron::Net 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/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out/GlobalSubstitutionTypesServiceTemplate.yaml index 1701b9971d..254be7a7da 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,34 +8,6 @@ node_types: org.openecomp.resource.abstract.nodes.cmaui: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_cmaui_port_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_cmaui_port_fixed_ips: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_cmaui_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_cmaui_port_network: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_cmaui_port_related_networks: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments index_value: type: integer description: Index value of this substitution service template runtime instance @@ -44,12 +16,12 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_cmaui_port_network_role_tag: - type: string + port_cmaui_mgmt_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_cmaui_port_order: - type: integer + port_cmaui_mgmt_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED vm_flavor_name: @@ -62,49 +34,77 @@ node_types: status: SUPPORTED entry_schema: type: string - port_cmaui_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_cmaui_mgmt_port_0_replacement_policy: + type: list required: true status: SUPPORTED - compute_cmaui_availability_zone: + entry_schema: + type: string + port_cmaui_mgmt_port_0_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_cmaui_port_replacement_policy: + compute_cmaui_availability_zone: type: list required: true status: SUPPORTED entry_schema: type: string - port_cmaui_port_network_role: - type: string + port_cmaui_mgmt_port_0_related_networks: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_image_name: type: string required: true status: SUPPORTED - port_cmaui_port_ip_requirements: + port_cmaui_mgmt_port_0_network_role_tag: + type: string + required: true + status: SUPPORTED + port_cmaui_mgmt_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_cmaui_port_subnetpoolid: + port_cmaui_mgmt_port_0_fixed_ips: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_cmaui_mgmt_port_0_subnetpoolid: + type: string + required: true + status: SUPPORTED + port_cmaui_mgmt_port_0_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_cmaui_mgmt_port_0_order: + type: integer + required: true + status: SUPPORTED + port_cmaui_mgmt_port_0_network_role: type: string required: true status: SUPPORTED requirements: - - dependency_cmaui_cmaui_port: + - dependency_cmaui_cmaui_mgmt_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_cmaui_cmaui_port: + - link_cmaui_cmaui_mgmt_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -131,6 +131,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets.rate_cmaui_cmaui_mgmt_port_0: + 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.ephemeral.size_cmaui: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -143,6 +149,14 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_cmaui_cmaui_mgmt_port_0: + 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 disk.device.iops_cmaui: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -168,25 +182,25 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_cmaui_cmaui_port: + disk.device.allocation_cmaui: 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_cmaui: + disk.read.bytes_cmaui: 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_cmaui: + disk.write.requests_cmaui: 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_cmaui: + network.incoming.packets_cmaui_cmaui_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -209,9 +223,8 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_cmaui_cmaui_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_cmaui_cmaui_mgmt_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED @@ -238,14 +251,8 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_cmaui_cmaui_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - network.incoming.packets_cmaui_cmaui_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_cmaui_cmaui_mgmt_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -285,40 +292,38 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_cmaui_cmaui_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 + attachment_cmaui_cmaui_mgmt_port_0: + type: tosca.capabilities.Attachment occurrences: - - 0 + - 1 - UNBOUNDED - disk.read.requests_cmaui: + network.incoming.bytes.rate_cmaui_cmaui_mgmt_port_0: 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_cmaui: + disk.read.requests_cmaui: 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_cmaui: + disk.device.read.bytes_cmaui: 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_cmaui_cmaui_port: + disk.device.write.requests_cmaui: 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_cmaui_cmaui_port: - type: tosca.capabilities.Node + network.outgoing.packets.rate_cmaui_cmaui_mgmt_port_0: + 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 @@ -328,23 +333,29 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_cmaui_cmaui_port: + network.incoming.bytes_cmaui_cmaui_mgmt_port_0: 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_cmaui: - type: tosca.capabilities.Node + network.outgoing.bytes_cmaui_cmaui_mgmt_port_0: + 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_cmaui_cmaui_port: + network.outgoing.bytes.rate_cmaui_cmaui_mgmt_port_0: 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_cmaui: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED binding_cmaui: type: tosca.capabilities.network.Bindable occurrences: @@ -373,24 +384,19 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.write.requests.rate_cmaui: + network.outpoing.packets_cmaui_cmaui_mgmt_port_0: 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_cmaui: + disk.write.requests.rate_cmaui: 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_cmaui_cmaui_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - network.outgoing.packets.rate_cmaui_cmaui_port: + disk.usage_cmaui: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -402,12 +408,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_cmaui_cmaui_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 instance_cmaui: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -497,6 +497,13 @@ node_types: required: true status: SUPPORTED requirements: + - dependency_cmaui_1_mgmt_port_0: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED - dependency_server_cmaui_2: capability: tosca.capabilities.Node node: tosca.nodes.Root @@ -511,13 +518,6 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_cmaui_port_2: - capability: tosca.capabilities.Node - node: tosca.nodes.Root - relationship: tosca.relationships.DependsOn - occurrences: - - 0 - - UNBOUNDED - dependency_server_cmaui_1: capability: tosca.capabilities.Node node: tosca.nodes.Root @@ -546,7 +546,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_cmaui_port_1: + - dependency_cmaui_2_mgmt_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn @@ -566,6 +566,14 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_cmaui_1_mgmt_port_0: + 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 disk.device.latency_server_cmaui_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -608,24 +616,12 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_cmaui_port_2: - 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_server_cmaui_1: 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_cmaui_port_1: - 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.iops_server_cmaui_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -667,6 +663,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes_cmaui_1_mgmt_port_0: + 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_server_cmaui_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -715,31 +717,31 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_cmaui_port_2: + disk.ephemeral.size_server_cmaui_1: 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_cmaui_port_1: + network.outgoing.packets.rate_cmaui_2_mgmt_port_0: 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.ephemeral.size_server_cmaui_1: + disk.ephemeral.size_server_cmaui_2: 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.ephemeral.size_server_cmaui_2: + disk.capacity_server_cmaui_1: 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_server_cmaui_1: + network.outgoing.packets.rate_cmaui_1_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -751,147 +753,151 @@ node_types: occurrences: - 1 - UNBOUNDED - end_point_packet_external_network: - type: tosca.capabilities.Endpoint + forwarder_cmaui_1_mgmt_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - binding_cmaui_port_1: - 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 + network.incoming.bytes_cmaui_2_mgmt_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - - 0 + - 1 - UNBOUNDED - binding_cmaui_port_2: - 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 + end_point_packet_external_network: + type: tosca.capabilities.Endpoint occurrences: - - 0 + - 1 - UNBOUNDED - disk.iops_server_cmaui_2: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_cmaui_2_mgmt_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - disk.iops_server_cmaui_1: + network.outgoing.bytes.rate_cmaui_1_mgmt_port_0: 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_server_cmaui_2: + network.outgoing.bytes.rate_cmaui_2_mgmt_port_0: 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_server_cmaui_1: + network.outpoing.packets_cmaui_1_mgmt_port_0: 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_cmaui_port_2: + network.outpoing.packets_cmaui_2_mgmt_port_0: 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_server_cmaui_1: + disk.iops_server_cmaui_2: 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_server_cmaui_1: + disk.iops_server_cmaui_1: 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_cmaui_port_1: + disk.device.write.requests_server_cmaui_2: 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_cmaui_port_2: + disk.device.write.requests_server_cmaui_1: 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 - link_packet_external_network: - type: tosca.capabilities.network.Linkable + network.incoming.packets_cmaui_1_mgmt_port_0: + 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_server_cmaui_2: + disk.device.write.bytes.rate_server_cmaui_1: 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_cmaui_port_1: + network.incoming.bytes.rate_cmaui_2_mgmt_port_0: 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_server_cmaui_2: + cpu_util_server_cmaui_1: 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_server_cmaui_2: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_cmaui_2_mgmt_port_0: + 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 + link_packet_external_network: + type: tosca.capabilities.network.Linkable occurrences: - 1 - UNBOUNDED - disk.device.write.bytes_server_cmaui_2: + cpu_util_server_cmaui_2: 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_server_cmaui_1: + network.incoming.bytes.rate_cmaui_1_mgmt_port_0: 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_server_cmaui_1: + disk.device.write.bytes.rate_server_cmaui_2: 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_cmaui_port_1: + disk.write.bytes.rate_server_cmaui_2: 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_cmaui_port_2: + disk.device.write.bytes_server_cmaui_2: 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_cmaui_port_1: - type: tosca.capabilities.Node + disk.write.bytes.rate_server_cmaui_1: + 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_cmaui_port_2: - type: tosca.capabilities.Node + disk.device.write.bytes_server_cmaui_1: + 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 @@ -934,6 +940,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets_cmaui_2_mgmt_port_0: + 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_server_cmaui_1: type: tosca.capabilities.network.Bindable occurrences: @@ -955,11 +967,6 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_cmaui_port_2: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED scalable_server_cmaui_2: type: tosca.capabilities.Scalable occurrences: @@ -970,30 +977,25 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_cmaui_port_1: + network.incoming.packets.rate_cmaui_1_mgmt_port_0: 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.packets.rate_cmaui_port_2: + disk.write.requests_server_cmaui_2: 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 - attachment_cmaui_port_1: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - disk.write.requests_server_cmaui_2: + disk.write.requests_server_cmaui_1: 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_server_cmaui_1: + network.incoming.packets.rate_cmaui_2_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1031,16 +1033,6 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_cmaui_port_2: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - forwarder_cmaui_port_1: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED feature_packet_external_network: type: tosca.capabilities.Node occurrences: @@ -1064,6 +1056,11 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_cmaui_1_mgmt_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED host_server_cmaui_2: type: tosca.capabilities.Container valid_source_types: @@ -1078,6 +1075,11 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_cmaui_2_mgmt_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED link_packet_internal_network: type: tosca.capabilities.network.Linkable occurrences: @@ -1095,25 +1097,23 @@ node_types: occurrences: - 1 - UNBOUNDED - instance_server_cmaui_1: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_cmaui_2_mgmt_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.device.read.requests.rate_server_cmaui_1: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_cmaui_1_mgmt_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_cmaui_port_1: + instance_server_cmaui_1: 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_cmaui_port_2: + disk.device.read.requests.rate_server_cmaui_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1137,55 +1137,55 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_cmaui_port_1: + disk.read.bytes.rate_server_cmaui_2: 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_server_cmaui_2: + disk.device.read.requests_server_cmaui_1: 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_cmaui_port_2: + cpu.delta_server_cmaui_1: 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_server_cmaui_1: + cpu.delta_server_cmaui_2: 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_server_cmaui_1: + disk.device.read.requests.rate_server_cmaui_2: 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_server_cmaui_2: + memory.resident_server_cmaui_2: 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_server_cmaui_2: + network.outgoing.bytes_cmaui_1_mgmt_port_0: 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_server_cmaui_2: + memory.resident_server_cmaui_1: 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_server_cmaui_1: + network.outgoing.bytes_cmaui_2_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1219,4 +1219,4 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - - UNBOUNDED \ No newline at end of file + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out/Nested_cmauiServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out/Nested_cmauiServiceTemplate.yaml index b0417f718d..153c258527 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out/Nested_cmauiServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out/Nested_cmauiServiceTemplate.yaml @@ -11,29 +11,6 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_cmaui_port_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_cmaui_port_fixed_ips: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_cmaui_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_cmaui_port_network: - type: list - required: true - entry_schema: - type: string - port_cmaui_port_related_networks: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments index_value: type: integer description: Index value of this substitution service template runtime instance @@ -41,11 +18,11 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_cmaui_port_network_role_tag: - type: string + port_cmaui_mgmt_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_cmaui_port_order: - type: integer + port_cmaui_mgmt_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true vm_flavor_name: type: string @@ -55,67 +32,90 @@ topology_template: required: true entry_schema: type: string - port_cmaui_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_cmaui_mgmt_port_0_replacement_policy: + type: list required: true - compute_cmaui_availability_zone: + entry_schema: + type: string + port_cmaui_mgmt_port_0_network: type: list required: true entry_schema: type: string - port_cmaui_port_replacement_policy: + compute_cmaui_availability_zone: type: list required: true entry_schema: type: string - port_cmaui_port_network_role: - type: string + port_cmaui_mgmt_port_0_related_networks: + type: list required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_image_name: type: string required: true - port_cmaui_port_ip_requirements: + port_cmaui_mgmt_port_0_network_role_tag: + type: string + required: true + port_cmaui_mgmt_port_0_ip_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_cmaui_port_subnetpoolid: + port_cmaui_mgmt_port_0_fixed_ips: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_cmaui_mgmt_port_0_subnetpoolid: + type: string + required: true + port_cmaui_mgmt_port_0_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_cmaui_mgmt_port_0_order: + type: integer + required: true + port_cmaui_mgmt_port_0_network_role: type: string required: true node_templates: - cmaui_cmaui_port: + cmaui_cmaui_mgmt_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_cmaui_port_replacement_policy + - port_cmaui_mgmt_port_0_replacement_policy - index_value mac_requirements: - get_input: port_cmaui_port_mac_requirements + get_input: port_cmaui_mgmt_port_0_mac_requirements order: - get_input: port_cmaui_port_order + get_input: port_cmaui_mgmt_port_0_order exCP_naming: - get_input: port_cmaui_port_exCP_naming + get_input: port_cmaui_mgmt_port_0_exCP_naming vlan_requirements: - get_input: port_cmaui_port_vlan_requirements + get_input: port_cmaui_mgmt_port_0_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_cmaui_port_ip_requirements + get_input: port_cmaui_mgmt_port_0_ip_requirements related_networks: - get_input: port_cmaui_port_related_networks + get_input: port_cmaui_mgmt_port_0_related_networks network_role_tag: - get_input: port_cmaui_port_network_role_tag + get_input: port_cmaui_mgmt_port_0_network_role_tag network_role: - get_input: port_cmaui_port_network_role + get_input: port_cmaui_mgmt_port_0_network_role fixed_ips: get_input: - - port_cmaui_port_fixed_ips + - port_cmaui_mgmt_port_0_fixed_ips - index_value subnetpoolid: - get_input: port_cmaui_port_subnetpoolid + get_input: port_cmaui_mgmt_port_0_subnetpoolid network: get_input: - - port_cmaui_port_network + - port_cmaui_mgmt_port_0_network - index_value requirements: - binding: @@ -143,12 +143,18 @@ topology_template: disk.read.bytes.rate_cmaui: - cmaui - disk.read.bytes.rate + network.incoming.packets.rate_cmaui_cmaui_mgmt_port_0: + - cmaui_cmaui_mgmt_port_0 + - network.incoming.packets.rate disk.ephemeral.size_cmaui: - cmaui - disk.ephemeral.size disk.device.write.bytes_cmaui: - cmaui - disk.device.write.bytes + binding_cmaui_cmaui_mgmt_port_0: + - cmaui_cmaui_mgmt_port_0 + - binding disk.device.iops_cmaui: - cmaui - disk.device.iops @@ -161,9 +167,6 @@ topology_template: host_cmaui: - cmaui - host - network.incoming.bytes.rate_cmaui_cmaui_port: - - cmaui_cmaui_port - - network.incoming.bytes.rate disk.device.allocation_cmaui: - cmaui - disk.device.allocation @@ -173,6 +176,9 @@ topology_template: disk.write.requests_cmaui: - cmaui - disk.write.requests + network.incoming.packets_cmaui_cmaui_mgmt_port_0: + - cmaui_cmaui_mgmt_port_0 + - network.incoming.packets scalable_cmaui: - cmaui - scalable @@ -182,9 +188,9 @@ topology_template: cpu.delta_cmaui: - cmaui - cpu.delta - network.incoming.bytes_cmaui_cmaui_port: - - cmaui_cmaui_port - - network.incoming.bytes + forwarder_cmaui_cmaui_mgmt_port_0: + - cmaui_cmaui_mgmt_port_0 + - forwarder disk.root.size_cmaui: - cmaui - disk.root.size @@ -197,12 +203,9 @@ topology_template: disk.device.read.bytes.rate_cmaui: - cmaui - disk.device.read.bytes.rate - attachment_cmaui_cmaui_port: - - cmaui_cmaui_port - - attachment - network.incoming.packets_cmaui_cmaui_port: - - cmaui_cmaui_port - - network.incoming.packets + feature_cmaui_cmaui_mgmt_port_0: + - cmaui_cmaui_mgmt_port_0 + - feature disk.device.usage_cmaui: - cmaui - disk.device.usage @@ -221,9 +224,12 @@ topology_template: cpu_cmaui: - cmaui - cpu - binding_cmaui_cmaui_port: - - cmaui_cmaui_port - - binding + attachment_cmaui_cmaui_mgmt_port_0: + - cmaui_cmaui_mgmt_port_0 + - attachment + network.incoming.bytes.rate_cmaui_cmaui_mgmt_port_0: + - cmaui_cmaui_mgmt_port_0 + - network.incoming.bytes.rate disk.read.requests_cmaui: - cmaui - disk.read.requests @@ -233,24 +239,24 @@ topology_template: disk.device.write.requests_cmaui: - cmaui - disk.device.write.requests - network.outgoing.bytes_cmaui_cmaui_port: - - cmaui_cmaui_port - - network.outgoing.bytes - feature_cmaui_cmaui_port: - - cmaui_cmaui_port - - feature + network.outgoing.packets.rate_cmaui_cmaui_mgmt_port_0: + - cmaui_cmaui_mgmt_port_0 + - network.outgoing.packets.rate vcpus_cmaui: - cmaui - vcpus - network.outpoing.packets_cmaui_cmaui_port: - - cmaui_cmaui_port - - network.outpoing.packets + network.incoming.bytes_cmaui_cmaui_mgmt_port_0: + - cmaui_cmaui_mgmt_port_0 + - network.incoming.bytes + network.outgoing.bytes_cmaui_cmaui_mgmt_port_0: + - cmaui_cmaui_mgmt_port_0 + - network.outgoing.bytes + network.outgoing.bytes.rate_cmaui_cmaui_mgmt_port_0: + - cmaui_cmaui_mgmt_port_0 + - network.outgoing.bytes.rate feature_cmaui: - cmaui - feature - network.outgoing.bytes.rate_cmaui_cmaui_port: - - cmaui_cmaui_port - - network.outgoing.bytes.rate binding_cmaui: - cmaui - binding @@ -266,24 +272,18 @@ topology_template: memory_cmaui: - cmaui - memory + network.outpoing.packets_cmaui_cmaui_mgmt_port_0: + - cmaui_cmaui_mgmt_port_0 + - network.outpoing.packets disk.write.requests.rate_cmaui: - cmaui - disk.write.requests.rate disk.usage_cmaui: - cmaui - disk.usage - forwarder_cmaui_cmaui_port: - - cmaui_cmaui_port - - forwarder - network.outgoing.packets.rate_cmaui_cmaui_port: - - cmaui_cmaui_port - - network.outgoing.packets.rate disk.latency_cmaui: - cmaui - disk.latency - network.incoming.packets.rate_cmaui_cmaui_port: - - cmaui_cmaui_port - - network.incoming.packets.rate instance_cmaui: - cmaui - instance @@ -300,15 +300,15 @@ topology_template: - cmaui - disk.device.write.requests.rate requirements: - link_cmaui_cmaui_port: - - cmaui_cmaui_port + link_cmaui_cmaui_mgmt_port_0: + - cmaui_cmaui_mgmt_port_0 - link - dependency_cmaui_cmaui_port: - - cmaui_cmaui_port + dependency_cmaui_cmaui_mgmt_port_0: + - cmaui_cmaui_mgmt_port_0 - dependency dependency_cmaui: - cmaui - dependency local_storage_cmaui: - cmaui - - local_storage \ No newline at end of file + - local_storage 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 7e77e65af5..08ded6905c 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 @@ -80,24 +80,24 @@ topology_template: directives: - substitutable properties: - port_cmaui_port_network: - - packet_internal_network + port_cmaui_mgmt_port_0_mac_requirements: + mac_count_required: + is_required: false vm_flavor_name: get_input: cmaui_flavor compute_cmaui_name: - get_input: - cmaui_names - 0 - port_cmaui_port_mac_requirements: - mac_count_required: - is_required: false + port_cmaui_mgmt_port_0_replacement_policy: + - AUTO + port_cmaui_mgmt_port_0_network: + - packet_internal_network compute_cmaui_availability_zone: - get_input: availability_zone_0 - port_cmaui_port_replacement_policy: - - AUTO vm_image_name: get_input: cmaui_image - port_cmaui_port_ip_requirements: + port_cmaui_mgmt_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false @@ -112,7 +112,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_cmaui_cmaui_port: + - link_cmaui_cmaui_mgmt_port_0: capability: tosca.capabilities.network.Linkable node: packet_internal_network relationship: tosca.relationships.network.LinksTo @@ -121,34 +121,34 @@ topology_template: directives: - substitutable properties: - port_cmaui_port_fixed_ips: - - ip_address: - get_input: - - cmaui_oam_ips - - 0 - port_cmaui_port_network: - - packet_external_network + port_cmaui_mgmt_port_0_mac_requirements: + mac_count_required: + is_required: false vm_flavor_name: get_input: cmaui_flavor compute_cmaui_name: - get_input: - cmaui_names - 1 - port_cmaui_port_mac_requirements: - mac_count_required: - is_required: false + port_cmaui_mgmt_port_0_replacement_policy: + - AUTO + port_cmaui_mgmt_port_0_network: + - packet_external_network compute_cmaui_availability_zone: - get_input: availability_zone_0 - port_cmaui_port_replacement_policy: - - AUTO vm_image_name: get_input: cmaui_image - port_cmaui_port_ip_requirements: + port_cmaui_mgmt_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false + port_cmaui_mgmt_port_0_fixed_ips: + - ip_address: + get_input: + - cmaui_oam_ips + - 0 service_template_filter: substitute_service_template: Nested_cmauiServiceTemplate.yaml count: 1 @@ -158,7 +158,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_cmaui_cmaui_port: + - link_cmaui_cmaui_mgmt_port_0: capability: tosca.capabilities.network.Linkable node: packet_external_network relationship: tosca.relationships.network.LinksTo @@ -182,6 +182,9 @@ topology_template: disk.device.usage_server_cmaui_2: - abstract_cmaui_0 - disk.device.usage_cmaui + binding_cmaui_1_mgmt_port_0: + - abstract_cmaui_1 + - binding_cmaui_cmaui_mgmt_port_0 disk.device.latency_server_cmaui_1: - abstract_cmaui_1 - disk.device.latency_cmaui @@ -203,15 +206,9 @@ topology_template: disk.read.requests_server_cmaui_2: - abstract_cmaui_0 - disk.read.requests_cmaui - network.outgoing.bytes_cmaui_port_2: - - abstract_cmaui_0 - - network.outgoing.bytes_cmaui_cmaui_port disk.read.requests_server_cmaui_1: - abstract_cmaui_1 - disk.read.requests_cmaui - network.outgoing.bytes_cmaui_port_1: - - abstract_cmaui_1 - - network.outgoing.bytes_cmaui_cmaui_port disk.device.iops_server_cmaui_1: - abstract_cmaui_1 - disk.device.iops_cmaui @@ -233,6 +230,9 @@ topology_template: disk.read.bytes_server_cmaui_2: - abstract_cmaui_0 - disk.read.bytes_cmaui + network.incoming.bytes_cmaui_1_mgmt_port_0: + - abstract_cmaui_1 + - network.incoming.bytes_cmaui_cmaui_mgmt_port_0 disk.read.bytes_server_cmaui_1: - abstract_cmaui_1 - disk.read.bytes_cmaui @@ -257,33 +257,48 @@ topology_template: cpu_server_cmaui_1: - abstract_cmaui_1 - cpu_cmaui - network.incoming.packets_cmaui_port_2: - - abstract_cmaui_0 - - network.incoming.packets_cmaui_cmaui_port - network.incoming.packets_cmaui_port_1: - - abstract_cmaui_1 - - network.incoming.packets_cmaui_cmaui_port disk.ephemeral.size_server_cmaui_1: - abstract_cmaui_1 - disk.ephemeral.size_cmaui + network.outgoing.packets.rate_cmaui_2_mgmt_port_0: + - abstract_cmaui_0 + - network.outgoing.packets.rate_cmaui_cmaui_mgmt_port_0 disk.ephemeral.size_server_cmaui_2: - abstract_cmaui_0 - disk.ephemeral.size_cmaui disk.capacity_server_cmaui_1: - abstract_cmaui_1 - disk.capacity_cmaui + network.outgoing.packets.rate_cmaui_1_mgmt_port_0: + - abstract_cmaui_1 + - network.outgoing.packets.rate_cmaui_cmaui_mgmt_port_0 disk.capacity_server_cmaui_2: - abstract_cmaui_0 - disk.capacity_cmaui + forwarder_cmaui_1_mgmt_port_0: + - abstract_cmaui_1 + - forwarder_cmaui_cmaui_mgmt_port_0 + network.incoming.bytes_cmaui_2_mgmt_port_0: + - abstract_cmaui_0 + - network.incoming.bytes_cmaui_cmaui_mgmt_port_0 end_point_packet_external_network: - packet_external_network - end_point - binding_cmaui_port_1: + forwarder_cmaui_2_mgmt_port_0: + - abstract_cmaui_0 + - forwarder_cmaui_cmaui_mgmt_port_0 + network.outgoing.bytes.rate_cmaui_1_mgmt_port_0: - abstract_cmaui_1 - - binding_cmaui_cmaui_port - binding_cmaui_port_2: + - network.outgoing.bytes.rate_cmaui_cmaui_mgmt_port_0 + network.outgoing.bytes.rate_cmaui_2_mgmt_port_0: - abstract_cmaui_0 - - binding_cmaui_cmaui_port + - network.outgoing.bytes.rate_cmaui_cmaui_mgmt_port_0 + network.outpoing.packets_cmaui_1_mgmt_port_0: + - abstract_cmaui_1 + - network.outpoing.packets_cmaui_cmaui_mgmt_port_0 + network.outpoing.packets_cmaui_2_mgmt_port_0: + - abstract_cmaui_0 + - network.outpoing.packets_cmaui_cmaui_mgmt_port_0 disk.iops_server_cmaui_2: - abstract_cmaui_0 - disk.iops_cmaui @@ -296,30 +311,30 @@ topology_template: disk.device.write.requests_server_cmaui_1: - abstract_cmaui_1 - disk.device.write.requests_cmaui - network.outgoing.bytes.rate_cmaui_port_2: - - abstract_cmaui_0 - - network.outgoing.bytes.rate_cmaui_cmaui_port + network.incoming.packets_cmaui_1_mgmt_port_0: + - abstract_cmaui_1 + - network.incoming.packets_cmaui_cmaui_mgmt_port_0 disk.device.write.bytes.rate_server_cmaui_1: - abstract_cmaui_1 - disk.device.write.bytes.rate_cmaui + network.incoming.bytes.rate_cmaui_2_mgmt_port_0: + - abstract_cmaui_0 + - network.incoming.bytes.rate_cmaui_cmaui_mgmt_port_0 cpu_util_server_cmaui_1: - abstract_cmaui_1 - cpu_util_cmaui - network.outgoing.bytes.rate_cmaui_port_1: - - abstract_cmaui_1 - - network.outgoing.bytes.rate_cmaui_cmaui_port - network.incoming.bytes_cmaui_port_2: + binding_cmaui_2_mgmt_port_0: - abstract_cmaui_0 - - network.incoming.bytes_cmaui_cmaui_port + - binding_cmaui_cmaui_mgmt_port_0 link_packet_external_network: - packet_external_network - link cpu_util_server_cmaui_2: - abstract_cmaui_0 - cpu_util_cmaui - network.incoming.bytes_cmaui_port_1: + network.incoming.bytes.rate_cmaui_1_mgmt_port_0: - abstract_cmaui_1 - - network.incoming.bytes_cmaui_cmaui_port + - network.incoming.bytes.rate_cmaui_cmaui_mgmt_port_0 disk.device.write.bytes.rate_server_cmaui_2: - abstract_cmaui_0 - disk.device.write.bytes.rate_cmaui @@ -335,18 +350,6 @@ topology_template: disk.device.write.bytes_server_cmaui_1: - abstract_cmaui_1 - disk.device.write.bytes_cmaui - network.incoming.packets.rate_cmaui_port_1: - - abstract_cmaui_1 - - network.incoming.packets.rate_cmaui_cmaui_port - network.incoming.packets.rate_cmaui_port_2: - - abstract_cmaui_0 - - network.incoming.packets.rate_cmaui_cmaui_port - feature_cmaui_port_1: - - abstract_cmaui_1 - - feature_cmaui_cmaui_port - feature_cmaui_port_2: - - abstract_cmaui_0 - - feature_cmaui_cmaui_port disk.write.bytes_server_cmaui_1: - abstract_cmaui_1 - disk.write.bytes_cmaui @@ -368,6 +371,9 @@ topology_template: disk.allocation_server_cmaui_2: - abstract_cmaui_0 - disk.allocation_cmaui + network.incoming.packets_cmaui_2_mgmt_port_0: + - abstract_cmaui_0 + - network.incoming.packets_cmaui_cmaui_mgmt_port_0 binding_server_cmaui_1: - abstract_cmaui_1 - binding_cmaui @@ -380,30 +386,24 @@ topology_template: vcpus_server_cmaui_2: - abstract_cmaui_0 - vcpus_cmaui - attachment_cmaui_port_2: - - abstract_cmaui_0 - - attachment_cmaui_cmaui_port scalable_server_cmaui_2: - abstract_cmaui_0 - scalable_cmaui scalable_server_cmaui_1: - abstract_cmaui_1 - scalable_cmaui - network.outgoing.packets.rate_cmaui_port_1: - - abstract_cmaui_1 - - network.outgoing.packets.rate_cmaui_cmaui_port - network.outgoing.packets.rate_cmaui_port_2: - - abstract_cmaui_0 - - network.outgoing.packets.rate_cmaui_cmaui_port - attachment_cmaui_port_1: + network.incoming.packets.rate_cmaui_1_mgmt_port_0: - abstract_cmaui_1 - - attachment_cmaui_cmaui_port + - network.incoming.packets.rate_cmaui_cmaui_mgmt_port_0 disk.write.requests_server_cmaui_2: - abstract_cmaui_0 - disk.write.requests_cmaui disk.write.requests_server_cmaui_1: - abstract_cmaui_1 - disk.write.requests_cmaui + network.incoming.packets.rate_cmaui_2_mgmt_port_0: + - abstract_cmaui_0 + - network.incoming.packets.rate_cmaui_cmaui_mgmt_port_0 disk.usage_server_cmaui_1: - abstract_cmaui_1 - disk.usage_cmaui @@ -422,12 +422,6 @@ topology_template: os_server_cmaui_1: - abstract_cmaui_1 - os_cmaui - forwarder_cmaui_port_2: - - abstract_cmaui_0 - - forwarder_cmaui_cmaui_port - forwarder_cmaui_port_1: - - abstract_cmaui_1 - - forwarder_cmaui_cmaui_port feature_packet_external_network: - packet_external_network - feature @@ -440,12 +434,18 @@ topology_template: memory_server_cmaui_1: - abstract_cmaui_1 - memory_cmaui + attachment_cmaui_1_mgmt_port_0: + - abstract_cmaui_1 + - attachment_cmaui_cmaui_mgmt_port_0 host_server_cmaui_2: - abstract_cmaui_0 - host_cmaui host_server_cmaui_1: - abstract_cmaui_1 - host_cmaui + attachment_cmaui_2_mgmt_port_0: + - abstract_cmaui_0 + - attachment_cmaui_cmaui_mgmt_port_0 link_packet_internal_network: - packet_internal_network - link @@ -455,18 +455,18 @@ topology_template: disk.device.capacity_server_cmaui_1: - abstract_cmaui_1 - disk.device.capacity_cmaui + feature_cmaui_2_mgmt_port_0: + - abstract_cmaui_0 + - feature_cmaui_cmaui_mgmt_port_0 + feature_cmaui_1_mgmt_port_0: + - abstract_cmaui_1 + - feature_cmaui_cmaui_mgmt_port_0 instance_server_cmaui_1: - abstract_cmaui_1 - instance_cmaui disk.device.read.requests.rate_server_cmaui_1: - abstract_cmaui_1 - disk.device.read.requests.rate_cmaui - network.incoming.bytes.rate_cmaui_port_1: - - abstract_cmaui_1 - - network.incoming.bytes.rate_cmaui_cmaui_port - network.incoming.bytes.rate_cmaui_port_2: - - abstract_cmaui_0 - - network.incoming.bytes.rate_cmaui_cmaui_port vcpus_server_cmaui_1: - abstract_cmaui_1 - vcpus_cmaui @@ -476,15 +476,9 @@ topology_template: disk.read.bytes.rate_server_cmaui_1: - abstract_cmaui_1 - disk.read.bytes.rate_cmaui - network.outpoing.packets_cmaui_port_1: - - abstract_cmaui_1 - - network.outpoing.packets_cmaui_cmaui_port disk.read.bytes.rate_server_cmaui_2: - abstract_cmaui_0 - disk.read.bytes.rate_cmaui - network.outpoing.packets_cmaui_port_2: - - abstract_cmaui_0 - - network.outpoing.packets_cmaui_cmaui_port disk.device.read.requests_server_cmaui_1: - abstract_cmaui_1 - disk.device.read.requests_cmaui @@ -500,9 +494,15 @@ topology_template: memory.resident_server_cmaui_2: - abstract_cmaui_0 - memory.resident_cmaui + network.outgoing.bytes_cmaui_1_mgmt_port_0: + - abstract_cmaui_1 + - network.outgoing.bytes_cmaui_cmaui_mgmt_port_0 memory.resident_server_cmaui_1: - abstract_cmaui_1 - memory.resident_cmaui + network.outgoing.bytes_cmaui_2_mgmt_port_0: + - abstract_cmaui_0 + - network.outgoing.bytes_cmaui_cmaui_mgmt_port_0 attachment_packet_external_network: - packet_external_network - attachment @@ -522,21 +522,21 @@ topology_template: dependency_packet_internal_network: - packet_internal_network - dependency - dependency_cmaui_port_1: - - abstract_cmaui_1 - - dependency_cmaui_cmaui_port local_storage_server_cmaui_2: - abstract_cmaui_0 - local_storage_cmaui + dependency_cmaui_2_mgmt_port_0: + - abstract_cmaui_0 + - dependency_cmaui_cmaui_mgmt_port_0 dependency_server_cmaui_2: - abstract_cmaui_0 - dependency_cmaui + dependency_cmaui_1_mgmt_port_0: + - abstract_cmaui_1 + - dependency_cmaui_cmaui_mgmt_port_0 dependency_server_cmaui_1: - abstract_cmaui_1 - dependency_cmaui - dependency_cmaui_port_2: - - abstract_cmaui_0 - - dependency_cmaui_cmaui_port local_storage_server_cmaui_1: - abstract_cmaui_1 - local_storage_cmaui diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance/in/nested1.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance/in/nested1.yml index ae31f072a5..586a1fae71 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance/in/nested1.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance/in/nested1.yml @@ -31,14 +31,14 @@ parameters: type: string resources: - cmaui_port_1: + cmaui_1_mgmt_port_0: type: OS::Neutron::Port properties: network: { get_param: net } fixed_ips: [{"ip_address": {get_param: [cmaui_oam_ips, 0]}}] replacement_policy: AUTO - cmaui_port_2: + cmaui_2_mgmt_port_0: type: OS::Neutron::Port properties: network: { get_param: net } @@ -53,7 +53,7 @@ resources: availability_zone: { get_param: availability_zone_0 } flavor: { get_param: cmaui_flavor } networks: - - port: { get_resource: cmaui_port_1 } + - port: { get_resource: cmaui_1_mgmt_port_0 } server_cmaui_2: type: OS::Nova::Server @@ -63,6 +63,6 @@ resources: availability_zone: { get_param: availability_zone_0 } flavor: { get_param: cmaui_flavor } networks: - - port: { get_resource: cmaui_port_2 } + - port: { get_resource: cmaui_2_mgmt_port_0 } 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/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance/out/GlobalSubstitutionTypesServiceTemplate.yaml index 2c58916cea..0cca83c5fa 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,34 +8,6 @@ node_types: org.openecomp.resource.abstract.nodes.cmaui: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_cmaui_port_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_cmaui_port_fixed_ips: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_cmaui_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_cmaui_port_network: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_cmaui_port_related_networks: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments index_value: type: integer description: Index value of this substitution service template runtime instance @@ -44,12 +16,12 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_cmaui_port_network_role_tag: - type: string + port_cmaui_mgmt_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_cmaui_port_order: - type: integer + port_cmaui_mgmt_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED vm_flavor_name: @@ -62,49 +34,77 @@ node_types: status: SUPPORTED entry_schema: type: string - port_cmaui_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_cmaui_mgmt_port_0_replacement_policy: + type: list required: true status: SUPPORTED - compute_cmaui_availability_zone: + entry_schema: + type: string + port_cmaui_mgmt_port_0_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_cmaui_port_replacement_policy: + compute_cmaui_availability_zone: type: list required: true status: SUPPORTED entry_schema: type: string - port_cmaui_port_network_role: - type: string + port_cmaui_mgmt_port_0_related_networks: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_image_name: type: string required: true status: SUPPORTED - port_cmaui_port_ip_requirements: + port_cmaui_mgmt_port_0_network_role_tag: + type: string + required: true + status: SUPPORTED + port_cmaui_mgmt_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_cmaui_port_subnetpoolid: + port_cmaui_mgmt_port_0_fixed_ips: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_cmaui_mgmt_port_0_subnetpoolid: + type: string + required: true + status: SUPPORTED + port_cmaui_mgmt_port_0_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_cmaui_mgmt_port_0_order: + type: integer + required: true + status: SUPPORTED + port_cmaui_mgmt_port_0_network_role: type: string required: true status: SUPPORTED requirements: - - dependency_cmaui_cmaui_port: + - dependency_cmaui_cmaui_mgmt_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_cmaui_cmaui_port: + - link_cmaui_cmaui_mgmt_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -131,6 +131,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets.rate_cmaui_cmaui_mgmt_port_0: + 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.ephemeral.size_cmaui: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -143,6 +149,14 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_cmaui_cmaui_mgmt_port_0: + 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 disk.device.iops_cmaui: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -168,25 +182,25 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_cmaui_cmaui_port: + disk.device.allocation_cmaui: 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_cmaui: + disk.read.bytes_cmaui: 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_cmaui: + disk.write.requests_cmaui: 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_cmaui: + network.incoming.packets_cmaui_cmaui_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -209,9 +223,8 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_cmaui_cmaui_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_cmaui_cmaui_mgmt_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED @@ -238,14 +251,8 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_cmaui_cmaui_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - network.incoming.packets_cmaui_cmaui_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_cmaui_cmaui_mgmt_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -285,40 +292,38 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_cmaui_cmaui_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 + attachment_cmaui_cmaui_mgmt_port_0: + type: tosca.capabilities.Attachment occurrences: - - 0 + - 1 - UNBOUNDED - disk.read.requests_cmaui: + network.incoming.bytes.rate_cmaui_cmaui_mgmt_port_0: 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_cmaui: + disk.read.requests_cmaui: 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_cmaui: + disk.device.read.bytes_cmaui: 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_cmaui_cmaui_port: + disk.device.write.requests_cmaui: 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_cmaui_cmaui_port: - type: tosca.capabilities.Node + network.outgoing.packets.rate_cmaui_cmaui_mgmt_port_0: + 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 @@ -328,23 +333,29 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_cmaui_cmaui_port: + network.incoming.bytes_cmaui_cmaui_mgmt_port_0: 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_cmaui: - type: tosca.capabilities.Node + network.outgoing.bytes_cmaui_cmaui_mgmt_port_0: + 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_cmaui_cmaui_port: + network.outgoing.bytes.rate_cmaui_cmaui_mgmt_port_0: 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_cmaui: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED binding_cmaui: type: tosca.capabilities.network.Bindable occurrences: @@ -373,24 +384,19 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.write.requests.rate_cmaui: + network.outpoing.packets_cmaui_cmaui_mgmt_port_0: 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_cmaui: + disk.write.requests.rate_cmaui: 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_cmaui_cmaui_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - network.outgoing.packets.rate_cmaui_cmaui_port: + disk.usage_cmaui: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -402,12 +408,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_cmaui_cmaui_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 instance_cmaui: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -489,33 +489,33 @@ node_types: required: true status: SUPPORTED requirements: - - dependency_server_cmaui_2: + - dependency_cmaui_1_mgmt_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - local_storage_server_cmaui_2: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo + - link_cmaui_1_mgmt_port_0: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo occurrences: - - 0 - - UNBOUNDED - - dependency_cmaui_port_2: + - 1 + - 1 + - dependency_server_cmaui_2: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_cmaui_port_2: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo + - local_storage_server_cmaui_2: + capability: tosca.capabilities.Attachment + node: tosca.nodes.BlockStorage + relationship: tosca.relationships.AttachesTo occurrences: - - 1 - - 1 + - 0 + - UNBOUNDED - dependency_server_cmaui_1: capability: tosca.capabilities.Node node: tosca.nodes.Root @@ -530,14 +530,14 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_cmaui_port_1: + - dependency_cmaui_2_mgmt_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_cmaui_port_1: + - link_cmaui_2_mgmt_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -556,6 +556,14 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_cmaui_1_mgmt_port_0: + 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 disk.device.latency_server_cmaui_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -598,24 +606,12 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_cmaui_port_2: - 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_server_cmaui_1: 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_cmaui_port_1: - 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.iops_server_cmaui_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -652,6 +648,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes_cmaui_1_mgmt_port_0: + 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_server_cmaui_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -700,31 +702,31 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_cmaui_port_2: + disk.ephemeral.size_server_cmaui_1: 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_cmaui_port_1: + network.outgoing.packets.rate_cmaui_2_mgmt_port_0: 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.ephemeral.size_server_cmaui_1: + disk.ephemeral.size_server_cmaui_2: 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.ephemeral.size_server_cmaui_2: + disk.capacity_server_cmaui_1: 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_server_cmaui_1: + network.outgoing.packets.rate_cmaui_1_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -736,137 +738,141 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_cmaui_port_1: - 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 - binding_cmaui_port_2: - 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 + forwarder_cmaui_1_mgmt_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - - 0 + - 1 - UNBOUNDED - disk.iops_server_cmaui_2: + network.incoming.bytes_cmaui_2_mgmt_port_0: 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.iops_server_cmaui_1: + forwarder_cmaui_2_mgmt_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes.rate_cmaui_1_mgmt_port_0: 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_server_cmaui_2: + network.outgoing.bytes.rate_cmaui_2_mgmt_port_0: 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_server_cmaui_1: + network.outpoing.packets_cmaui_1_mgmt_port_0: 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_cmaui_port_2: + network.outpoing.packets_cmaui_2_mgmt_port_0: 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_server_cmaui_1: + disk.iops_server_cmaui_2: 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_server_cmaui_1: + disk.iops_server_cmaui_1: 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_cmaui_port_1: + disk.device.write.requests_server_cmaui_2: 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_cmaui_port_2: + disk.device.write.requests_server_cmaui_1: 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_server_cmaui_2: + network.incoming.packets_cmaui_1_mgmt_port_0: 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_cmaui_port_1: + disk.device.write.bytes.rate_server_cmaui_1: 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_server_cmaui_2: + network.incoming.bytes.rate_cmaui_2_mgmt_port_0: 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_server_cmaui_2: + cpu_util_server_cmaui_1: 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_server_cmaui_2: + binding_cmaui_2_mgmt_port_0: + 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 + cpu_util_server_cmaui_2: 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_server_cmaui_1: + network.incoming.bytes.rate_cmaui_1_mgmt_port_0: 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_server_cmaui_1: + disk.device.write.bytes.rate_server_cmaui_2: 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_cmaui_port_1: + disk.write.bytes.rate_server_cmaui_2: 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_cmaui_port_2: + disk.device.write.bytes_server_cmaui_2: 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_cmaui_port_1: - type: tosca.capabilities.Node + disk.write.bytes.rate_server_cmaui_1: + 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_cmaui_port_2: - type: tosca.capabilities.Node + disk.device.write.bytes_server_cmaui_1: + 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 @@ -904,6 +910,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets_cmaui_2_mgmt_port_0: + 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_server_cmaui_1: type: tosca.capabilities.network.Bindable occurrences: @@ -920,11 +932,6 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_cmaui_port_2: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED scalable_server_cmaui_2: type: tosca.capabilities.Scalable occurrences: @@ -935,30 +942,25 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_cmaui_port_1: + network.incoming.packets.rate_cmaui_1_mgmt_port_0: 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.packets.rate_cmaui_port_2: + disk.write.requests_server_cmaui_2: 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 - attachment_cmaui_port_1: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - disk.write.requests_server_cmaui_2: + disk.write.requests_server_cmaui_1: 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_server_cmaui_1: + network.incoming.packets.rate_cmaui_2_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -996,16 +998,6 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_cmaui_port_2: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - forwarder_cmaui_port_1: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED disk.device.allocation_server_cmaui_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1024,6 +1016,11 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_cmaui_1_mgmt_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED host_server_cmaui_2: type: tosca.capabilities.Container valid_source_types: @@ -1038,6 +1035,11 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_cmaui_2_mgmt_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED instance_server_cmaui_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1050,25 +1052,23 @@ node_types: occurrences: - 1 - UNBOUNDED - instance_server_cmaui_1: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_cmaui_2_mgmt_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.device.read.requests.rate_server_cmaui_1: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_cmaui_1_mgmt_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_cmaui_port_1: + instance_server_cmaui_1: 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_cmaui_port_2: + disk.device.read.requests.rate_server_cmaui_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1092,55 +1092,55 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_cmaui_port_1: + disk.read.bytes.rate_server_cmaui_2: 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_server_cmaui_2: + disk.device.read.requests_server_cmaui_1: 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_cmaui_port_2: + cpu.delta_server_cmaui_1: 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_server_cmaui_1: + cpu.delta_server_cmaui_2: 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_server_cmaui_1: + disk.device.read.requests.rate_server_cmaui_2: 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_server_cmaui_2: + memory.resident_server_cmaui_2: 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_server_cmaui_2: + network.outgoing.bytes_cmaui_1_mgmt_port_0: 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_server_cmaui_2: + memory.resident_server_cmaui_1: 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_server_cmaui_1: + network.outgoing.bytes_cmaui_2_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1169,4 +1169,4 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - - UNBOUNDED \ No newline at end of file + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance/out/Nested_cmauiServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance/out/Nested_cmauiServiceTemplate.yaml index b0417f718d..153c258527 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance/out/Nested_cmauiServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance/out/Nested_cmauiServiceTemplate.yaml @@ -11,29 +11,6 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_cmaui_port_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_cmaui_port_fixed_ips: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_cmaui_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_cmaui_port_network: - type: list - required: true - entry_schema: - type: string - port_cmaui_port_related_networks: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments index_value: type: integer description: Index value of this substitution service template runtime instance @@ -41,11 +18,11 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_cmaui_port_network_role_tag: - type: string + port_cmaui_mgmt_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_cmaui_port_order: - type: integer + port_cmaui_mgmt_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true vm_flavor_name: type: string @@ -55,67 +32,90 @@ topology_template: required: true entry_schema: type: string - port_cmaui_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_cmaui_mgmt_port_0_replacement_policy: + type: list required: true - compute_cmaui_availability_zone: + entry_schema: + type: string + port_cmaui_mgmt_port_0_network: type: list required: true entry_schema: type: string - port_cmaui_port_replacement_policy: + compute_cmaui_availability_zone: type: list required: true entry_schema: type: string - port_cmaui_port_network_role: - type: string + port_cmaui_mgmt_port_0_related_networks: + type: list required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_image_name: type: string required: true - port_cmaui_port_ip_requirements: + port_cmaui_mgmt_port_0_network_role_tag: + type: string + required: true + port_cmaui_mgmt_port_0_ip_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_cmaui_port_subnetpoolid: + port_cmaui_mgmt_port_0_fixed_ips: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_cmaui_mgmt_port_0_subnetpoolid: + type: string + required: true + port_cmaui_mgmt_port_0_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_cmaui_mgmt_port_0_order: + type: integer + required: true + port_cmaui_mgmt_port_0_network_role: type: string required: true node_templates: - cmaui_cmaui_port: + cmaui_cmaui_mgmt_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_cmaui_port_replacement_policy + - port_cmaui_mgmt_port_0_replacement_policy - index_value mac_requirements: - get_input: port_cmaui_port_mac_requirements + get_input: port_cmaui_mgmt_port_0_mac_requirements order: - get_input: port_cmaui_port_order + get_input: port_cmaui_mgmt_port_0_order exCP_naming: - get_input: port_cmaui_port_exCP_naming + get_input: port_cmaui_mgmt_port_0_exCP_naming vlan_requirements: - get_input: port_cmaui_port_vlan_requirements + get_input: port_cmaui_mgmt_port_0_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_cmaui_port_ip_requirements + get_input: port_cmaui_mgmt_port_0_ip_requirements related_networks: - get_input: port_cmaui_port_related_networks + get_input: port_cmaui_mgmt_port_0_related_networks network_role_tag: - get_input: port_cmaui_port_network_role_tag + get_input: port_cmaui_mgmt_port_0_network_role_tag network_role: - get_input: port_cmaui_port_network_role + get_input: port_cmaui_mgmt_port_0_network_role fixed_ips: get_input: - - port_cmaui_port_fixed_ips + - port_cmaui_mgmt_port_0_fixed_ips - index_value subnetpoolid: - get_input: port_cmaui_port_subnetpoolid + get_input: port_cmaui_mgmt_port_0_subnetpoolid network: get_input: - - port_cmaui_port_network + - port_cmaui_mgmt_port_0_network - index_value requirements: - binding: @@ -143,12 +143,18 @@ topology_template: disk.read.bytes.rate_cmaui: - cmaui - disk.read.bytes.rate + network.incoming.packets.rate_cmaui_cmaui_mgmt_port_0: + - cmaui_cmaui_mgmt_port_0 + - network.incoming.packets.rate disk.ephemeral.size_cmaui: - cmaui - disk.ephemeral.size disk.device.write.bytes_cmaui: - cmaui - disk.device.write.bytes + binding_cmaui_cmaui_mgmt_port_0: + - cmaui_cmaui_mgmt_port_0 + - binding disk.device.iops_cmaui: - cmaui - disk.device.iops @@ -161,9 +167,6 @@ topology_template: host_cmaui: - cmaui - host - network.incoming.bytes.rate_cmaui_cmaui_port: - - cmaui_cmaui_port - - network.incoming.bytes.rate disk.device.allocation_cmaui: - cmaui - disk.device.allocation @@ -173,6 +176,9 @@ topology_template: disk.write.requests_cmaui: - cmaui - disk.write.requests + network.incoming.packets_cmaui_cmaui_mgmt_port_0: + - cmaui_cmaui_mgmt_port_0 + - network.incoming.packets scalable_cmaui: - cmaui - scalable @@ -182,9 +188,9 @@ topology_template: cpu.delta_cmaui: - cmaui - cpu.delta - network.incoming.bytes_cmaui_cmaui_port: - - cmaui_cmaui_port - - network.incoming.bytes + forwarder_cmaui_cmaui_mgmt_port_0: + - cmaui_cmaui_mgmt_port_0 + - forwarder disk.root.size_cmaui: - cmaui - disk.root.size @@ -197,12 +203,9 @@ topology_template: disk.device.read.bytes.rate_cmaui: - cmaui - disk.device.read.bytes.rate - attachment_cmaui_cmaui_port: - - cmaui_cmaui_port - - attachment - network.incoming.packets_cmaui_cmaui_port: - - cmaui_cmaui_port - - network.incoming.packets + feature_cmaui_cmaui_mgmt_port_0: + - cmaui_cmaui_mgmt_port_0 + - feature disk.device.usage_cmaui: - cmaui - disk.device.usage @@ -221,9 +224,12 @@ topology_template: cpu_cmaui: - cmaui - cpu - binding_cmaui_cmaui_port: - - cmaui_cmaui_port - - binding + attachment_cmaui_cmaui_mgmt_port_0: + - cmaui_cmaui_mgmt_port_0 + - attachment + network.incoming.bytes.rate_cmaui_cmaui_mgmt_port_0: + - cmaui_cmaui_mgmt_port_0 + - network.incoming.bytes.rate disk.read.requests_cmaui: - cmaui - disk.read.requests @@ -233,24 +239,24 @@ topology_template: disk.device.write.requests_cmaui: - cmaui - disk.device.write.requests - network.outgoing.bytes_cmaui_cmaui_port: - - cmaui_cmaui_port - - network.outgoing.bytes - feature_cmaui_cmaui_port: - - cmaui_cmaui_port - - feature + network.outgoing.packets.rate_cmaui_cmaui_mgmt_port_0: + - cmaui_cmaui_mgmt_port_0 + - network.outgoing.packets.rate vcpus_cmaui: - cmaui - vcpus - network.outpoing.packets_cmaui_cmaui_port: - - cmaui_cmaui_port - - network.outpoing.packets + network.incoming.bytes_cmaui_cmaui_mgmt_port_0: + - cmaui_cmaui_mgmt_port_0 + - network.incoming.bytes + network.outgoing.bytes_cmaui_cmaui_mgmt_port_0: + - cmaui_cmaui_mgmt_port_0 + - network.outgoing.bytes + network.outgoing.bytes.rate_cmaui_cmaui_mgmt_port_0: + - cmaui_cmaui_mgmt_port_0 + - network.outgoing.bytes.rate feature_cmaui: - cmaui - feature - network.outgoing.bytes.rate_cmaui_cmaui_port: - - cmaui_cmaui_port - - network.outgoing.bytes.rate binding_cmaui: - cmaui - binding @@ -266,24 +272,18 @@ topology_template: memory_cmaui: - cmaui - memory + network.outpoing.packets_cmaui_cmaui_mgmt_port_0: + - cmaui_cmaui_mgmt_port_0 + - network.outpoing.packets disk.write.requests.rate_cmaui: - cmaui - disk.write.requests.rate disk.usage_cmaui: - cmaui - disk.usage - forwarder_cmaui_cmaui_port: - - cmaui_cmaui_port - - forwarder - network.outgoing.packets.rate_cmaui_cmaui_port: - - cmaui_cmaui_port - - network.outgoing.packets.rate disk.latency_cmaui: - cmaui - disk.latency - network.incoming.packets.rate_cmaui_cmaui_port: - - cmaui_cmaui_port - - network.incoming.packets.rate instance_cmaui: - cmaui - instance @@ -300,15 +300,15 @@ topology_template: - cmaui - disk.device.write.requests.rate requirements: - link_cmaui_cmaui_port: - - cmaui_cmaui_port + link_cmaui_cmaui_mgmt_port_0: + - cmaui_cmaui_mgmt_port_0 - link - dependency_cmaui_cmaui_port: - - cmaui_cmaui_port + dependency_cmaui_cmaui_mgmt_port_0: + - cmaui_cmaui_mgmt_port_0 - dependency dependency_cmaui: - cmaui - dependency local_storage_cmaui: - cmaui - - local_storage \ No newline at end of file + - local_storage 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 5ea441dfea..f2cc457af6 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 @@ -62,18 +62,9 @@ topology_template: directives: - substitutable properties: - port_cmaui_port_fixed_ips: - - - ip_address: - get_input: - - cmaui_oam_ips - - 0 - - - ip_address: - get_input: - - cmaui_oam_ips - - 0 - port_cmaui_port_network: - - get_input: net - - get_input: net + port_cmaui_mgmt_port_0_mac_requirements: + mac_count_required: + is_required: false vm_flavor_name: get_input: cmaui_flavor compute_cmaui_name: @@ -83,23 +74,32 @@ topology_template: - get_input: - cmaui_names - 0 - port_cmaui_port_mac_requirements: - mac_count_required: - is_required: false + port_cmaui_mgmt_port_0_replacement_policy: + - AUTO + - AUTO + port_cmaui_mgmt_port_0_network: + - get_input: net + - get_input: net compute_cmaui_availability_zone: - get_input: availability_zone_0 - get_input: availability_zone_0 - port_cmaui_port_replacement_policy: - - AUTO - - AUTO vm_image_name: get_input: cmaui_image - port_cmaui_port_ip_requirements: + port_cmaui_mgmt_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false + port_cmaui_mgmt_port_0_fixed_ips: + - - ip_address: + get_input: + - cmaui_oam_ips + - 0 + - - ip_address: + get_input: + - cmaui_oam_ips + - 0 service_template_filter: substitute_service_template: Nested_cmauiServiceTemplate.yaml count: 2 @@ -125,6 +125,9 @@ topology_template: disk.device.usage_server_cmaui_2: - abstract_cmaui - disk.device.usage_cmaui + binding_cmaui_1_mgmt_port_0: + - abstract_cmaui + - binding_cmaui_cmaui_mgmt_port_0 disk.device.latency_server_cmaui_1: - abstract_cmaui - disk.device.latency_cmaui @@ -146,15 +149,9 @@ topology_template: disk.read.requests_server_cmaui_2: - abstract_cmaui - disk.read.requests_cmaui - network.outgoing.bytes_cmaui_port_2: - - abstract_cmaui - - network.outgoing.bytes_cmaui_cmaui_port disk.read.requests_server_cmaui_1: - abstract_cmaui - disk.read.requests_cmaui - network.outgoing.bytes_cmaui_port_1: - - abstract_cmaui - - network.outgoing.bytes_cmaui_cmaui_port disk.device.iops_server_cmaui_1: - abstract_cmaui - disk.device.iops_cmaui @@ -173,6 +170,9 @@ topology_template: disk.read.bytes_server_cmaui_2: - abstract_cmaui - disk.read.bytes_cmaui + network.incoming.bytes_cmaui_1_mgmt_port_0: + - abstract_cmaui + - network.incoming.bytes_cmaui_cmaui_mgmt_port_0 disk.read.bytes_server_cmaui_1: - abstract_cmaui - disk.read.bytes_cmaui @@ -197,30 +197,45 @@ topology_template: cpu_server_cmaui_1: - abstract_cmaui - cpu_cmaui - network.incoming.packets_cmaui_port_2: - - abstract_cmaui - - network.incoming.packets_cmaui_cmaui_port - network.incoming.packets_cmaui_port_1: - - abstract_cmaui - - network.incoming.packets_cmaui_cmaui_port disk.ephemeral.size_server_cmaui_1: - abstract_cmaui - disk.ephemeral.size_cmaui + network.outgoing.packets.rate_cmaui_2_mgmt_port_0: + - abstract_cmaui + - network.outgoing.packets.rate_cmaui_cmaui_mgmt_port_0 disk.ephemeral.size_server_cmaui_2: - abstract_cmaui - disk.ephemeral.size_cmaui disk.capacity_server_cmaui_1: - abstract_cmaui - disk.capacity_cmaui + network.outgoing.packets.rate_cmaui_1_mgmt_port_0: + - abstract_cmaui + - network.outgoing.packets.rate_cmaui_cmaui_mgmt_port_0 disk.capacity_server_cmaui_2: - abstract_cmaui - disk.capacity_cmaui - binding_cmaui_port_1: + forwarder_cmaui_1_mgmt_port_0: + - abstract_cmaui + - forwarder_cmaui_cmaui_mgmt_port_0 + network.incoming.bytes_cmaui_2_mgmt_port_0: + - abstract_cmaui + - network.incoming.bytes_cmaui_cmaui_mgmt_port_0 + forwarder_cmaui_2_mgmt_port_0: + - abstract_cmaui + - forwarder_cmaui_cmaui_mgmt_port_0 + network.outgoing.bytes.rate_cmaui_1_mgmt_port_0: + - abstract_cmaui + - network.outgoing.bytes.rate_cmaui_cmaui_mgmt_port_0 + network.outgoing.bytes.rate_cmaui_2_mgmt_port_0: + - abstract_cmaui + - network.outgoing.bytes.rate_cmaui_cmaui_mgmt_port_0 + network.outpoing.packets_cmaui_1_mgmt_port_0: - abstract_cmaui - - binding_cmaui_cmaui_port - binding_cmaui_port_2: + - network.outpoing.packets_cmaui_cmaui_mgmt_port_0 + network.outpoing.packets_cmaui_2_mgmt_port_0: - abstract_cmaui - - binding_cmaui_cmaui_port + - network.outpoing.packets_cmaui_cmaui_mgmt_port_0 disk.iops_server_cmaui_2: - abstract_cmaui - disk.iops_cmaui @@ -233,27 +248,27 @@ topology_template: disk.device.write.requests_server_cmaui_1: - abstract_cmaui - disk.device.write.requests_cmaui - network.outgoing.bytes.rate_cmaui_port_2: + network.incoming.packets_cmaui_1_mgmt_port_0: - abstract_cmaui - - network.outgoing.bytes.rate_cmaui_cmaui_port + - network.incoming.packets_cmaui_cmaui_mgmt_port_0 disk.device.write.bytes.rate_server_cmaui_1: - abstract_cmaui - disk.device.write.bytes.rate_cmaui + network.incoming.bytes.rate_cmaui_2_mgmt_port_0: + - abstract_cmaui + - network.incoming.bytes.rate_cmaui_cmaui_mgmt_port_0 cpu_util_server_cmaui_1: - abstract_cmaui - cpu_util_cmaui - network.outgoing.bytes.rate_cmaui_port_1: - - abstract_cmaui - - network.outgoing.bytes.rate_cmaui_cmaui_port - network.incoming.bytes_cmaui_port_2: + binding_cmaui_2_mgmt_port_0: - abstract_cmaui - - network.incoming.bytes_cmaui_cmaui_port + - binding_cmaui_cmaui_mgmt_port_0 cpu_util_server_cmaui_2: - abstract_cmaui - cpu_util_cmaui - network.incoming.bytes_cmaui_port_1: + network.incoming.bytes.rate_cmaui_1_mgmt_port_0: - abstract_cmaui - - network.incoming.bytes_cmaui_cmaui_port + - network.incoming.bytes.rate_cmaui_cmaui_mgmt_port_0 disk.device.write.bytes.rate_server_cmaui_2: - abstract_cmaui - disk.device.write.bytes.rate_cmaui @@ -269,18 +284,6 @@ topology_template: disk.device.write.bytes_server_cmaui_1: - abstract_cmaui - disk.device.write.bytes_cmaui - network.incoming.packets.rate_cmaui_port_1: - - abstract_cmaui - - network.incoming.packets.rate_cmaui_cmaui_port - network.incoming.packets.rate_cmaui_port_2: - - abstract_cmaui - - network.incoming.packets.rate_cmaui_cmaui_port - feature_cmaui_port_1: - - abstract_cmaui - - feature_cmaui_cmaui_port - feature_cmaui_port_2: - - abstract_cmaui - - feature_cmaui_cmaui_port disk.write.bytes_server_cmaui_1: - abstract_cmaui - disk.write.bytes_cmaui @@ -299,6 +302,9 @@ topology_template: disk.allocation_server_cmaui_2: - abstract_cmaui - disk.allocation_cmaui + network.incoming.packets_cmaui_2_mgmt_port_0: + - abstract_cmaui + - network.incoming.packets_cmaui_cmaui_mgmt_port_0 binding_server_cmaui_1: - abstract_cmaui - binding_cmaui @@ -308,30 +314,24 @@ topology_template: vcpus_server_cmaui_2: - abstract_cmaui - vcpus_cmaui - attachment_cmaui_port_2: - - abstract_cmaui - - attachment_cmaui_cmaui_port scalable_server_cmaui_2: - abstract_cmaui - scalable_cmaui scalable_server_cmaui_1: - abstract_cmaui - scalable_cmaui - network.outgoing.packets.rate_cmaui_port_1: + network.incoming.packets.rate_cmaui_1_mgmt_port_0: - abstract_cmaui - - network.outgoing.packets.rate_cmaui_cmaui_port - network.outgoing.packets.rate_cmaui_port_2: - - abstract_cmaui - - network.outgoing.packets.rate_cmaui_cmaui_port - attachment_cmaui_port_1: - - abstract_cmaui - - attachment_cmaui_cmaui_port + - network.incoming.packets.rate_cmaui_cmaui_mgmt_port_0 disk.write.requests_server_cmaui_2: - abstract_cmaui - disk.write.requests_cmaui disk.write.requests_server_cmaui_1: - abstract_cmaui - disk.write.requests_cmaui + network.incoming.packets.rate_cmaui_2_mgmt_port_0: + - abstract_cmaui + - network.incoming.packets.rate_cmaui_cmaui_mgmt_port_0 disk.usage_server_cmaui_1: - abstract_cmaui - disk.usage_cmaui @@ -350,12 +350,6 @@ topology_template: os_server_cmaui_1: - abstract_cmaui - os_cmaui - forwarder_cmaui_port_2: - - abstract_cmaui - - forwarder_cmaui_cmaui_port - forwarder_cmaui_port_1: - - abstract_cmaui - - forwarder_cmaui_cmaui_port disk.device.allocation_server_cmaui_1: - abstract_cmaui - disk.device.allocation_cmaui @@ -365,30 +359,36 @@ topology_template: memory_server_cmaui_1: - abstract_cmaui - memory_cmaui + attachment_cmaui_1_mgmt_port_0: + - abstract_cmaui + - attachment_cmaui_cmaui_mgmt_port_0 host_server_cmaui_2: - abstract_cmaui - host_cmaui host_server_cmaui_1: - abstract_cmaui - host_cmaui + attachment_cmaui_2_mgmt_port_0: + - abstract_cmaui + - attachment_cmaui_cmaui_mgmt_port_0 instance_server_cmaui_2: - abstract_cmaui - instance_cmaui disk.device.capacity_server_cmaui_1: - abstract_cmaui - disk.device.capacity_cmaui + feature_cmaui_2_mgmt_port_0: + - abstract_cmaui + - feature_cmaui_cmaui_mgmt_port_0 + feature_cmaui_1_mgmt_port_0: + - abstract_cmaui + - feature_cmaui_cmaui_mgmt_port_0 instance_server_cmaui_1: - abstract_cmaui - instance_cmaui disk.device.read.requests.rate_server_cmaui_1: - abstract_cmaui - disk.device.read.requests.rate_cmaui - network.incoming.bytes.rate_cmaui_port_1: - - abstract_cmaui - - network.incoming.bytes.rate_cmaui_cmaui_port - network.incoming.bytes.rate_cmaui_port_2: - - abstract_cmaui - - network.incoming.bytes.rate_cmaui_cmaui_port vcpus_server_cmaui_1: - abstract_cmaui - vcpus_cmaui @@ -398,15 +398,9 @@ topology_template: disk.read.bytes.rate_server_cmaui_1: - abstract_cmaui - disk.read.bytes.rate_cmaui - network.outpoing.packets_cmaui_port_1: - - abstract_cmaui - - network.outpoing.packets_cmaui_cmaui_port disk.read.bytes.rate_server_cmaui_2: - abstract_cmaui - disk.read.bytes.rate_cmaui - network.outpoing.packets_cmaui_port_2: - - abstract_cmaui - - network.outpoing.packets_cmaui_cmaui_port disk.device.read.requests_server_cmaui_1: - abstract_cmaui - disk.device.read.requests_cmaui @@ -422,9 +416,15 @@ topology_template: memory.resident_server_cmaui_2: - abstract_cmaui - memory.resident_cmaui + network.outgoing.bytes_cmaui_1_mgmt_port_0: + - abstract_cmaui + - network.outgoing.bytes_cmaui_cmaui_mgmt_port_0 memory.resident_server_cmaui_1: - abstract_cmaui - memory.resident_cmaui + network.outgoing.bytes_cmaui_2_mgmt_port_0: + - abstract_cmaui + - network.outgoing.bytes_cmaui_cmaui_mgmt_port_0 disk.latency_server_cmaui_2: - abstract_cmaui - disk.latency_cmaui @@ -438,27 +438,27 @@ topology_template: - abstract_cmaui - memory.usage_cmaui requirements: - dependency_cmaui_port_1: + link_cmaui_1_mgmt_port_0: - abstract_cmaui - - dependency_cmaui_cmaui_port + - link_cmaui_cmaui_mgmt_port_0 local_storage_server_cmaui_2: - abstract_cmaui - local_storage_cmaui - link_cmaui_port_2: + dependency_cmaui_2_mgmt_port_0: - abstract_cmaui - - link_cmaui_cmaui_port + - dependency_cmaui_cmaui_mgmt_port_0 dependency_server_cmaui_2: - abstract_cmaui - dependency_cmaui - link_cmaui_port_1: + dependency_cmaui_1_mgmt_port_0: - abstract_cmaui - - link_cmaui_cmaui_port + - dependency_cmaui_cmaui_mgmt_port_0 dependency_server_cmaui_1: - abstract_cmaui - dependency_cmaui - dependency_cmaui_port_2: + link_cmaui_2_mgmt_port_0: - abstract_cmaui - - dependency_cmaui_cmaui_port + - link_cmaui_cmaui_mgmt_port_0 local_storage_server_cmaui_1: - abstract_cmaui - - local_storage_cmaui \ No newline at end of file + - local_storage_cmaui diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/GlobalSubstitutionTypesServiceTemplate.yaml index 9172dc400f..fc2a5b73f2 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,70 +8,56 @@ node_types: org.openecomp.resource.abstract.nodes.cdi: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_cdi_internal_0_port_network_role: + port_cdi_internal_0_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_cdi_ims_core_0_port_vlan_requirements: + port_cdi_ims_core_0_port_1_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_cdi_internal_0_port_ip_requirements: + port_cdi_internal_0_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_cdi_ims_core_0_port_related_networks: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true status: SUPPORTED - port_cdi_internal_0_port_vlan_requirements: + port_cdi_ims_core_0_port_1_security_groups: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_cdi_ims_core_0_port_name: - type: list + type: json + port_cdi_ims_core_0_port_1_order: + type: integer required: true status: SUPPORTED - entry_schema: - type: string - port_cdi_internal_0_port_exCP_naming: + port_cdi_ims_core_0_port_1_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_cdi_ims_core_0_port_network_role: - type: string - required: true - status: SUPPORTED - port_cdi_internal_0_port_allowed_address_pairs: + port_cdi_ims_core_0_port_1_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.network.AddressPair - port_cdi_internal_0_port_network_role_tag: - type: string - required: true - status: SUPPORTED - port_cdi_internal_0_port_subnetpoolid: + type: string + vm_image_name: type: string required: true status: SUPPORTED - vm_image_name: - type: string + port_cdi_internal_0_port_0_vlan_requirements: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements compute_cdi_scheduler_hints: type: list required: true @@ -84,62 +70,58 @@ node_types: status: SUPPORTED entry_schema: type: string - port_cdi_ims_core_0_port_ip_requirements: + compute_cdi_user_data_format: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_cdi_ims_core_0_port_network_role_tag: - type: string + type: string + port_cdi_internal_0_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - compute_cdi_user_data_format: + compute_cdi_availability_zone: type: list required: true status: SUPPORTED entry_schema: type: string - port_cdi_internal_0_port_name: - type: list + port_cdi_ims_core_0_port_1_network_role_tag: + type: string required: true status: SUPPORTED - entry_schema: - type: string - port_cdi_ims_core_0_port_order: - type: integer + port_cdi_internal_0_port_0_network_role_tag: + type: string required: true status: SUPPORTED - compute_cdi_availability_zone: + port_cdi_internal_0_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: string - port_cdi_ims_core_0_port_network: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + compute_cdi_config_drive: type: list required: true status: SUPPORTED entry_schema: - type: string - port_cdi_internal_0_port_network: + type: boolean + port_cdi_internal_0_port_0_allowed_address_pairs: type: list required: true status: SUPPORTED entry_schema: - type: string - port_cdi_internal_0_port_fixed_ips: - type: list + type: org.openecomp.datatypes.heat.network.AddressPair + port_cdi_internal_0_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - compute_cdi_config_drive: + port_cdi_internal_0_port_0_security_groups: type: list required: true status: SUPPORTED entry_schema: - type: boolean + type: json index_value: type: integer description: Index value of this substitution service template runtime instance @@ -148,76 +130,81 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_cdi_internal_0_port_security_groups: - type: list + port_cdi_ims_core_0_port_1_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: json - port_cdi_ims_core_0_port_security_groups: + port_cdi_ims_core_0_port_1_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: json - port_cdi_ims_core_0_port_fixed_ips: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_cdi_internal_0_port_0_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_cdi_internal_0_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + type: string + port_cdi_ims_core_0_port_1_ip_requirements: + type: list required: true status: SUPPORTED - port_cdi_ims_core_0_port_subnetpoolid: - type: string + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_cdi_internal_0_port_0_fixed_ips: + type: list required: true status: SUPPORTED - port_cdi_internal_0_port_order: - type: integer + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_cdi_ims_core_0_port_1_fixed_ips: + type: list required: true status: SUPPORTED - port_cdi_internal_0_port_related_networks: + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_cdi_internal_0_port_0_name: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_cdi_ims_core_0_port_allowed_address_pairs: + type: string + port_cdi_ims_core_0_port_1_name: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.network.AddressPair + type: string + port_cdi_internal_0_port_0_network_role: + type: string + required: true + status: SUPPORTED compute_cdi_metadata: type: list required: true status: SUPPORTED entry_schema: type: json - port_cdi_ims_core_0_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_cdi_internal_0_port_0_order: + type: integer required: true status: SUPPORTED - port_cdi_ims_core_0_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_cdi_ims_core_0_port_1_allowed_address_pairs: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.heat.network.AddressPair + port_cdi_ims_core_0_port_1_network_role: + type: string + required: true + status: SUPPORTED + port_cdi_ims_core_0_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED requirements: - - dependency_cdi_cdi_ims_core_0_port: - capability: tosca.capabilities.Node - node: tosca.nodes.Root - relationship: tosca.relationships.DependsOn - occurrences: - - 0 - - UNBOUNDED - - link_cdi_cdi_ims_core_0_port: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - dependency_cdi: capability: tosca.capabilities.Node node: tosca.nodes.Root @@ -232,43 +219,39 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_cdi_cdi_internal_0_port: + - dependency_cdi_cdi_ims_core_0_port_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_cdi_cdi_internal_0_port: + - link_cdi_cdi_ims_core_0_port_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - capabilities: - attachment_cdi_cdi_internal_0_port: - type: tosca.capabilities.Attachment + - dependency_cdi_cdi_internal_0_port_0: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn occurrences: - - 1 + - 0 - UNBOUNDED - network.incoming.bytes.rate_cdi_cdi_internal_0_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + - link_cdi_cdi_internal_0_port_0: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo occurrences: - 1 - - UNBOUNDED - forwarder_cdi_cdi_ims_core_0_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - 1 - - UNBOUNDED - network.outgoing.bytes_cdi_cdi_internal_0_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + capabilities: + feature_cdi_cdi_internal_0_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_cdi_cdi_internal_0_port: + network.outgoing.bytes.rate_cdi_cdi_ims_core_0_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -299,56 +282,57 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.write.requests.rate_cdi: + network.incoming.packets_cdi_cdi_internal_0_port_0: 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_cdi: + disk.device.write.requests.rate_cdi: 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.ephemeral.size_cdi: + disk.write.bytes.rate_cdi: 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_cdi: + network.outpoing.packets_cdi_cdi_ims_core_0_port_1: 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_cdi: + disk.ephemeral.size_cdi: 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_cdi_cdi_internal_0_port: + cpu_util_cdi: 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_cdi_cdi_internal_0_port: + cpu.delta_cdi: 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_cdi: + network.incoming.packets_cdi_cdi_ims_core_0_port_1: 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_cdi_cdi_ims_core_0_port: - type: tosca.capabilities.Node + disk.device.write.bytes_cdi: + 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 @@ -369,19 +353,25 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes.rate_cdi_cdi_internal_0_port_0: + 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_cdi: 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_cdi_cdi_ims_core_0_port: + network.incoming.packets.rate_cdi_cdi_ims_core_0_port_1: 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_cdi_cdi_internal_0_port: + network.outgoing.bytes.rate_cdi_cdi_internal_0_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -393,7 +383,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_cdi_cdi_ims_core_0_port: + network.outgoing.packets.rate_cdi_cdi_ims_core_0_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -405,6 +395,11 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_cdi_cdi_ims_core_0_port_1: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED endpoint_cdi: type: tosca.capabilities.Endpoint.Admin occurrences: @@ -416,25 +411,31 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_cdi_cdi_ims_core_0_port: + memory.resident_cdi: 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_cdi: + disk.latency_cdi: 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_cdi: + disk.read.bytes.rate_cdi: 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_cdi: + network.outgoing.bytes_cdi_cdi_ims_core_0_port_1: + 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_cdi_cdi_internal_0_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -458,34 +459,38 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_cdi_cdi_ims_core_0_port: + network.incoming.packets.rate_cdi_cdi_internal_0_port_0: 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_cdi_cdi_internal_0_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 + disk.allocation_cdi: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - - 0 + - 1 - UNBOUNDED - network.incoming.packets.rate_cdi_cdi_internal_0_port: + network.incoming.bytes.rate_cdi_cdi_ims_core_0_port_1: 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.allocation_cdi: + forwarder_cdi_cdi_internal_0_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + network.outgoing.packets.rate_cdi_cdi_internal_0_port_0: 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_cdi_cdi_internal_0_port: - type: org.openecomp.capabilities.Forwarder + network.outpoing.packets_cdi_cdi_internal_0_port_0: + 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 @@ -511,17 +516,27 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_cdi_cdi_ims_core_0_port_1: + 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 disk.iops_cdi: 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_cdi_cdi_internal_0_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_cdi_cdi_internal_0_port_0: + 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: - - 1 + - 0 - UNBOUNDED disk.usage_cdi: type: org.openecomp.capabilities.metric.Ceilometer @@ -529,6 +544,16 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_cdi_cdi_internal_0_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + attachment_cdi_cdi_ims_core_0_port_1: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED disk.device.write.bytes.rate_cdi: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -541,9 +566,8 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_cdi_cdi_ims_core_0_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_cdi_cdi_ims_core_0_port_1: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED @@ -558,11 +582,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_cdi_cdi_internal_0_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.device.read.bytes_cdi: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -581,50 +600,31 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_cdi_cdi_ims_core_0_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 - binding_cdi_cdi_ims_core_0_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_cdi: 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 - attachment_cdi_cdi_ims_core_0_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - disk.device.allocation_cdi: + network.incoming.bytes_cdi_cdi_internal_0_port_0: 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_cdi_cdi_ims_core_0_port: + network.incoming.bytes_cdi_cdi_ims_core_0_port_1: 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_cdi: + disk.device.allocation_cdi: 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_cdi_cdi_ims_core_0_port: + disk.write.requests_cdi: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -633,201 +633,179 @@ node_types: org.openecomp.resource.abstract.nodes.lbd: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_lbd_ims_core_1_port_allowed_address_pairs: + port_lbd_ims_core_1_port_2_security_groups: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.network.AddressPair + type: json compute_lbd_user_data_format: type: list required: true status: SUPPORTED entry_schema: type: string - port_lbd_internal_1_port_name: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_lbd_dpdk_1_port_allowed_address_pairs: - type: list + port_lbd_ims_core_1_port_2_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.network.AddressPair - port_lbd_dpdk_1_port_subnetpoolid: - type: string + port_lbd_ims_core_1_port_2_order: + type: integer required: true status: SUPPORTED vm_flavor_name: type: string required: true status: SUPPORTED - port_lbd_internal_1_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_lbd_ims_core_1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED compute_lbd_availability_zone: type: list required: true status: SUPPORTED entry_schema: type: string - port_lbd_internal_1_port_network_role_tag: - type: string + port_lbd_dpdk_1_port_1_related_networks: + type: list required: true status: SUPPORTED - port_lbd_internal_1_port_order: - type: integer + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_lbd_internal_1_port_0_network_role: + type: string required: true status: SUPPORTED vm_image_name: type: string required: true status: SUPPORTED - port_lbd_dpdk_1_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_lbd_internal_1_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_lbd_ims_core_1_port_order: - type: integer + port_lbd_ims_core_1_port_2_subnetpoolid: + type: string required: true status: SUPPORTED - port_lbd_dpdk_1_port_network: + port_lbd_dpdk_1_port_1_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_lbd_ims_core_1_port_name: + type: org.openecomp.datatypes.network.IpRequirements + port_lbd_internal_1_port_0_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_lbd_dpdk_1_port_order: - type: integer + port_lbd_ims_core_1_port_2_network_role_tag: + type: string required: true status: SUPPORTED - port_lbd_ims_core_1_port_network_role: + port_lbd_internal_1_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_lbd_ims_core_1_port_related_networks: + port_lbd_ims_core_1_port_2_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - compute_lbd_scheduler_hints: + type: org.openecomp.datatypes.network.IpRequirements + port_lbd_dpdk_1_port_1_name: type: list required: true status: SUPPORTED entry_schema: - type: json - port_lbd_dpdk_1_port_name: + type: string + compute_lbd_scheduler_hints: type: list required: true status: SUPPORTED entry_schema: - type: string - port_lbd_ims_core_1_port_exCP_naming: + type: json + port_lbd_ims_core_1_port_2_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_lbd_internal_1_port_network: + port_lbd_dpdk_1_port_1_order: + type: integer + required: true + status: SUPPORTED + compute_lbd_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_lbd_internal_1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - compute_lbd_name: + port_lbd_dpdk_1_port_1_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_lbd_ims_core_1_port_network_role_tag: - type: string + port_lbd_internal_1_port_0_order: + type: integer required: true status: SUPPORTED - port_lbd_internal_1_port_vlan_requirements: + port_lbd_dpdk_1_port_1_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements + port_lbd_dpdk_1_port_1_network_role_tag: + type: string + required: true + status: SUPPORTED compute_lbd_config_drive: type: list required: true status: SUPPORTED entry_schema: type: boolean - port_lbd_ims_core_1_port_ip_requirements: + port_lbd_internal_1_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_lbd_ims_core_1_port_vlan_requirements: - type: list + type: org.openecomp.datatypes.network.VlanRequirements + port_lbd_internal_1_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_lbd_dpdk_1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_lbd_ims_core_1_port_2_network_role: + type: string required: true status: SUPPORTED - port_lbd_internal_1_port_ip_requirements: + port_lbd_ims_core_1_port_2_name: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_lbd_internal_1_port_security_groups: + type: string + port_lbd_internal_1_port_0_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: json - port_lbd_ims_core_1_port_subnetpoolid: - type: string - required: true - status: SUPPORTED - port_lbd_internal_1_port_related_networks: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_lbd_ims_core_1_port_2_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_lbd_internal_1_port_subnetpoolid: - type: string - required: true - status: SUPPORTED - port_lbd_ims_core_1_port_security_groups: + type: org.openecomp.datatypes.network.VlanRequirements + port_lbd_ims_core_1_port_2_allowed_address_pairs: type: list required: true status: SUPPORTED entry_schema: - type: json - port_lbd_ims_core_1_port_fixed_ips: - type: list + type: org.openecomp.datatypes.heat.network.AddressPair + port_lbd_dpdk_1_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_lbd_internal_1_port_fixed_ips: + port_lbd_dpdk_1_port_1_fixed_ips: type: list required: true status: SUPPORTED @@ -841,95 +819,117 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_lbd_ims_core_1_port_network: + port_lbd_ims_core_1_port_2_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: string - port_lbd_dpdk_1_port_network_role_tag: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_lbd_dpdk_1_port_1_security_groups: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_lbd_dpdk_1_port_1_network_role: type: string required: true status: SUPPORTED - port_lbd_dpdk_1_port_security_groups: + port_lbd_ims_core_1_port_2_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: json - port_lbd_dpdk_1_port_fixed_ips: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_lbd_internal_1_port_0_network_role_tag: + type: string + required: true + status: SUPPORTED + port_lbd_dpdk_1_port_1_allowed_address_pairs: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_lbd_internal_1_port_network_role: - type: string + type: org.openecomp.datatypes.heat.network.AddressPair + port_lbd_internal_1_port_0_security_groups: + type: list required: true status: SUPPORTED - port_lbd_dpdk_1_port_ip_requirements: + entry_schema: + type: json + port_lbd_internal_1_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_lbd_dpdk_1_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED compute_lbd_metadata: type: list required: true status: SUPPORTED entry_schema: type: json - port_lbd_dpdk_1_port_vlan_requirements: + port_lbd_dpdk_1_port_1_subnetpoolid: + type: string + required: true + status: SUPPORTED + port_lbd_internal_1_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_lbd_dpdk_1_port_related_networks: + type: org.openecomp.datatypes.network.IpRequirements + port_lbd_internal_1_port_0_name: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_lbd_dpdk_1_port_network_role: - type: string + type: string + port_lbd_ims_core_1_port_2_network: + type: list required: true status: SUPPORTED + entry_schema: + type: string requirements: - - dependency_lbd_lbd_ims_core_1_port: + - dependency_lbd_lbd_dpdk_1_port_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_lbd_lbd_ims_core_1_port: + - link_lbd_lbd_dpdk_1_port_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_lbd_lbd_dpdk_1_port: + - dependency_lbd_lbd_internal_1_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_lbd_lbd_dpdk_1_port: + - link_lbd_lbd_internal_1_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_lbd_lbd_internal_1_port: + - dependency_lbd_lbd_ims_core_1_port_2: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_lbd_lbd_internal_1_port: + - link_lbd_lbd_ims_core_1_port_2: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -980,11 +980,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_lbd_lbd_ims_core_1_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_lbd_lbd_dpdk_1_port_1: + 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: - - 1 + - 0 - UNBOUNDED host_lbd: type: tosca.capabilities.Container @@ -993,126 +995,123 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.capacity_lbd: + network.outgoing.bytes_lbd_lbd_internal_1_port_0: 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_lbd: + network.incoming.bytes.rate_lbd_lbd_dpdk_1_port_1: 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_lbd: + network.incoming.packets.rate_lbd_lbd_dpdk_1_port_1: 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 - attachment_lbd_lbd_ims_core_1_port: - type: tosca.capabilities.Attachment + feature_lbd_lbd_internal_1_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - memory.usage_lbd: + disk.device.capacity_lbd: 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_lbd_lbd_dpdk_1_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 - network.outpoing.packets_lbd_lbd_ims_core_1_port: + network.outgoing.bytes.rate_lbd_lbd_ims_core_1_port_2: 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_lbd_lbd_ims_core_1_port: + network.incoming.bytes_lbd_lbd_ims_core_1_port_2: 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_lbd_lbd_internal_1_port: + network.outpoing.packets_lbd_lbd_dpdk_1_port_1: 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_lbd: + cpu_util_lbd: 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_lbd_lbd_internal_1_port: - type: tosca.capabilities.Node + disk.device.read.requests_lbd: + 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_lbd_lbd_ims_core_1_port: + network.outgoing.packets.rate_lbd_lbd_dpdk_1_port_1: 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_lbd: + memory.usage_lbd: 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_lbd: + feature_lbd_lbd_ims_core_1_port_2: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + disk.read.requests_lbd: 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_lbd: + cpu.delta_lbd: 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_lbd: - type: tosca.capabilities.Scalable + attachment_lbd_lbd_internal_1_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_lbd_lbd_dpdk_1_port: + memory_lbd: 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_lbd_lbd_dpdk_1_port: + disk.write.bytes_lbd: 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_lbd_lbd_ims_core_1_port: + network.incoming.bytes_lbd_lbd_dpdk_1_port_1: 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_lbd: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + scalable_lbd: + type: tosca.capabilities.Scalable occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_lbd_lbd_dpdk_1_port: + disk.device.read.requests.rate_lbd: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1124,6 +1123,11 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_lbd_lbd_dpdk_1_port_1: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED vcpus_lbd: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1136,11 +1140,6 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_lbd_lbd_dpdk_1_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED disk.device.write.requests_lbd: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1158,38 +1157,20 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_lbd_lbd_dpdk_1_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 memory.resident_lbd: 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_lbd_lbd_internal_1_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED disk.read.bytes.rate_lbd: 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_lbd_lbd_internal_1_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_lbd_lbd_internal_1_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_lbd_lbd_ims_core_1_port_2: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED @@ -1199,42 +1180,37 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_lbd_lbd_internal_1_port: + network.incoming.bytes.rate_lbd_lbd_ims_core_1_port_2: 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_lbd_lbd_internal_1_port: + network.outpoing.packets_lbd_lbd_internal_1_port_0: 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_lbd_lbd_ims_core_1_port: - type: org.openecomp.capabilities.Forwarder + attachment_lbd_lbd_dpdk_1_port_1: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_lbd_lbd_dpdk_1_port: + network.incoming.bytes_lbd_lbd_internal_1_port_0: 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_lbd_lbd_dpdk_1_port: + network.incoming.packets.rate_lbd_lbd_internal_1_port_0: 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 - attachment_lbd_lbd_internal_1_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - feature_lbd_lbd_dpdk_1_port: - type: tosca.capabilities.Node + forwarder_lbd_lbd_internal_1_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED @@ -1244,8 +1220,9 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_lbd_lbd_ims_core_1_port: - type: tosca.capabilities.Node + network.outgoing.bytes.rate_lbd_lbd_internal_1_port_0: + 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 @@ -1260,19 +1237,24 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_lbd_lbd_ims_core_1_port_2: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.write.bytes.rate_lbd: 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.iops_lbd: + network.outgoing.bytes_lbd_lbd_dpdk_1_port_1: 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.packets.rate_lbd_lbd_dpdk_1_port: + disk.iops_lbd: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1284,14 +1266,6 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_lbd_lbd_ims_core_1_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 disk.usage_lbd: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1310,18 +1284,19 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_lbd_lbd_dpdk_1_port: - type: tosca.capabilities.Attachment + disk.device.write.bytes_lbd: + 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_lbd: + network.incoming.bytes.rate_lbd_lbd_internal_1_port_0: 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_lbd_lbd_ims_core_1_port: + network.incoming.packets.rate_lbd_lbd_ims_core_1_port_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1333,12 +1308,20 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_lbd_lbd_internal_1_port_0: + 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 feature_lbd: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_lbd_lbd_ims_core_1_port: + network.outgoing.bytes_lbd_lbd_ims_core_1_port_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1350,7 +1333,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_lbd_lbd_ims_core_1_port: + network.outpoing.packets_lbd_lbd_ims_core_1_port_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1362,24 +1345,29 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.packets.rate_lbd_lbd_internal_1_port_0: + 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_lbd: type: tosca.capabilities.network.Bindable occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_lbd_lbd_internal_1_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_lbd_lbd_dpdk_1_port_1: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - network.outpoing.packets_lbd_lbd_internal_1_port: + network.outgoing.bytes.rate_lbd_lbd_dpdk_1_port_1: 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_lbd_lbd_internal_1_port: + binding_lbd_lbd_ims_core_1_port_2: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface @@ -1387,13 +1375,25 @@ node_types: occurrences: - 0 - UNBOUNDED - network.incoming.bytes_lbd_lbd_internal_1_port: + network.incoming.packets_lbd_lbd_dpdk_1_port_1: + 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_lbd_lbd_internal_1_port_0: + 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.packets.rate_lbd_lbd_ims_core_1_port_2: 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_lbd_lbd_dpdk_1_port: + network.incoming.packets_lbd_lbd_ims_core_1_port_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1408,56 +1408,36 @@ node_types: org.openecomp.resource.abstract.nodes.oam_1: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_oam_internal_1_port_network_role_tag: - type: string - required: true - status: SUPPORTED - port_oam_internal_1_port_related_networks: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_oam_internal_1_port_security_groups: + port_oam_oam_1_port_1_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: json - port_oam_internal_1_port_network_role: + type: org.openecomp.datatypes.network.VlanRequirements + port_oam_internal_1_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_oam_oam_1_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_oam_oam_1_port_allowed_address_pairs: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.network.AddressPair vm_flavor_name: type: string required: true status: SUPPORTED - port_oam_oam_1_port_ip_requirements: + port_oam_internal_1_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_oam_oam_1_port_network_role_tag: + port_oam_oam_1_port_1_network_role_tag: type: string required: true status: SUPPORTED - port_oam_oam_1_port_security_groups: + port_oam_internal_1_port_0_name: type: list required: true status: SUPPORTED entry_schema: - type: json + type: string vm_image_name: type: string required: true @@ -1468,46 +1448,38 @@ node_types: status: SUPPORTED entry_schema: type: boolean - port_oam_internal_1_port_network: - type: list + port_oam_oam_1_port_1_order: + type: integer required: true status: SUPPORTED - entry_schema: - type: string - port_oam_oam_1_port_fixed_ips: - type: list + port_oam_internal_1_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_oam_oam_1_port_related_networks: - type: list + port_oam_oam_1_port_1_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_oam_internal_1_port_vlan_requirements: + port_oam_oam_1_port_1_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_oam_internal_1_port_ip_requirements: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_oam_oam_1_port_1_allowed_address_pairs: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_oam_oam_1_port_order: - type: integer + type: org.openecomp.datatypes.heat.network.AddressPair + port_oam_oam_1_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_oam_oam_1_port_network: - type: list + port_oam_internal_1_port_0_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: string index_value: type: integer description: Index value of this substitution service template runtime instance @@ -1516,64 +1488,82 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_oam_internal_1_port_allowed_address_pairs: + port_oam_oam_1_port_1_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.network.AddressPair - compute_oam_user_data_format: - type: list - required: true + type: org.openecomp.datatypes.network.IpRequirements + port_oam_oam_1_port_1_network_role: + type: string + required: true + status: SUPPORTED + compute_oam_user_data_format: + type: list + required: true status: SUPPORTED entry_schema: type: string - port_oam_internal_1_port_exCP_naming: + port_oam_oam_1_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_oam_internal_1_port_0_order: + type: integer + required: true + status: SUPPORTED + port_oam_internal_1_port_0_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_oam_internal_1_port_name: + port_oam_internal_1_port_0_allowed_address_pairs: type: list required: true status: SUPPORTED entry_schema: - type: string - port_oam_internal_1_port_fixed_ips: + type: org.openecomp.datatypes.heat.network.AddressPair + port_oam_oam_1_port_1_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_oam_internal_1_port_subnetpoolid: - type: string - required: true - status: SUPPORTED - port_oam_oam_1_port_name: + type: string + port_oam_oam_1_port_1_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_oam_internal_1_port_order: - type: integer + port_oam_internal_1_port_0_fixed_ips: + type: list required: true status: SUPPORTED - port_oam_oam_1_port_vlan_requirements: + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_oam_internal_1_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_oam_oam_1_port_subnetpoolid: - type: string + compute_oam_scheduler_hints: + type: list required: true status: SUPPORTED - compute_oam_scheduler_hints: + entry_schema: + type: json + port_oam_internal_1_port_0_security_groups: type: list required: true status: SUPPORTED entry_schema: type: json + port_oam_internal_1_port_0_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments compute_oam_availability_zone: type: list required: true @@ -1586,46 +1576,43 @@ node_types: status: SUPPORTED entry_schema: type: json - port_oam_internal_1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_oam_internal_1_port_0_network_role: + type: string + required: true + status: SUPPORTED + port_oam_oam_1_port_1_security_groups: + type: list required: true status: SUPPORTED + entry_schema: + type: json compute_oam_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_oam_oam_1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_oam_internal_1_port_0_network: + type: list required: true status: SUPPORTED - port_oam_oam_1_port_network_role: - type: string + entry_schema: + type: string + port_oam_oam_1_port_1_fixed_ips: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps requirements: - - dependency_oam_oam_internal_1_port: - capability: tosca.capabilities.Node - node: tosca.nodes.Root - relationship: tosca.relationships.DependsOn - occurrences: - - 0 - - UNBOUNDED - - link_oam_oam_internal_1_port: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - - dependency_oam_oam_oam_1_port: + - dependency_oam_oam_oam_1_port_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_oam_oam_oam_1_port: + - link_oam_oam_oam_1_port_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -1645,6 +1632,19 @@ node_types: occurrences: - 0 - UNBOUNDED + - dependency_oam_oam_internal_1_port_0: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - link_oam_oam_internal_1_port_0: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 capabilities: cpu_oam: type: org.openecomp.capabilities.metric.Ceilometer @@ -1652,63 +1652,55 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_oam_oam_oam_1_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_oam_oam_internal_1_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.outpoing.packets_oam_oam_oam_1_port: + disk.usage_oam: 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_oam_oam_internal_1_port: + memory.resident_oam: 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_oam: + disk.device.write.bytes_oam: 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_oam: + disk.read.bytes_oam: 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_oam: + network.incoming.bytes_oam_oam_oam_1_port_1: 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_oam_oam_internal_1_port: - type: org.openecomp.capabilities.Forwarder + scalable_oam: + type: tosca.capabilities.Scalable occurrences: - 1 - UNBOUNDED - disk.read.bytes_oam: + network.outgoing.bytes_oam_oam_internal_1_port_0: 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_oam_oam_internal_1_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 - scalable_oam: - type: tosca.capabilities.Scalable + network.incoming.bytes_oam_oam_internal_1_port_0: + 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 @@ -1723,7 +1715,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_oam_oam_oam_1_port: + network.incoming.packets.rate_oam_oam_oam_1_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1735,6 +1727,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_oam_oam_oam_1_port_1: + 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_oam: type: tosca.capabilities.network.Bindable occurrences: @@ -1746,7 +1744,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_oam_oam_oam_1_port: + network.outgoing.bytes.rate_oam_oam_oam_1_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1770,81 +1768,86 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_oam_oam_internal_1_port: + disk.ephemeral.size_oam: 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.ephemeral.size_oam: + network.outgoing.bytes_oam_oam_oam_1_port_1: 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_oam_oam_oam_1_port: + disk.write.requests_oam: 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_oam: + network.incoming.packets_oam_oam_internal_1_port_0: 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 - attachment_oam_oam_oam_1_port: - type: tosca.capabilities.Attachment + disk.capacity_oam: + 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_oam: + network.incoming.bytes.rate_oam_oam_internal_1_port_0: 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 - instance_oam: + network.outgoing.packets.rate_oam_oam_oam_1_port_1: 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_oam_oam_internal_1_port: + instance_oam: 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_oam: + network.outpoing.packets_oam_oam_internal_1_port_0: 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_oam_oam_oam_1_port: + disk.root.size_oam: 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_oam_oam_oam_1_port: - type: tosca.capabilities.Node + binding_oam_oam_internal_1_port_0: + 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: - - 1 + - 0 - UNBOUNDED - network.outgoing.packets.rate_oam_oam_internal_1_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_oam_oam_internal_1_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_oam_oam_internal_1_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_oam_oam_oam_1_port_1: + 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: - - 1 + - 0 - UNBOUNDED memory_oam: type: org.openecomp.capabilities.metric.Ceilometer @@ -1864,13 +1867,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_oam_oam_internal_1_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.incoming.bytes_oam_oam_oam_1_port: + network.outgoing.packets.rate_oam_oam_internal_1_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1900,20 +1897,14 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_oam_oam_internal_1_port: + network.incoming.packets.rate_oam_oam_internal_1_port_0: 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_oam_oam_internal_1_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - network.incoming.packets.rate_oam_oam_oam_1_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_oam_oam_internal_1_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED @@ -1929,11 +1920,6 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_oam_oam_internal_1_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED disk.device.read.bytes_oam: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1952,6 +1938,11 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_oam_oam_oam_1_port_1: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.device.read.requests_oam: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1970,19 +1961,22 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_oam_oam_internal_1_port: + network.outgoing.bytes.rate_oam_oam_internal_1_port_0: 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_oam_oam_oam_1_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 + forwarder_oam_oam_oam_1_port_1: + type: org.openecomp.capabilities.Forwarder occurrences: - - 0 + - 1 + - UNBOUNDED + network.incoming.packets_oam_oam_oam_1_port_1: + 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_oam: type: org.openecomp.capabilities.metric.Ceilometer @@ -2007,14 +2001,20 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_oam_oam_oam_1_port_1: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED disk.write.bytes_oam: 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_oam_oam_oam_1_port: - type: org.openecomp.capabilities.Forwarder + network.incoming.bytes.rate_oam_oam_oam_1_port_1: + 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 @@ -2033,58 +2033,40 @@ node_types: org.openecomp.resource.abstract.nodes.oam_2: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_oam_oam_2_port_network_role_tag: + port_oam_internal_2_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_oam_oam_2_port_related_networks: + port_oam_internal_2_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_oam_oam_2_port_security_groups: - type: list - required: true - status: SUPPORTED - entry_schema: - type: json - port_oam_oam_2_port_name: - type: list + vm_flavor_name: + type: string required: true status: SUPPORTED - entry_schema: - type: string - port_oam_internal_2_port_name: + port_oam_internal_2_port_0_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_oam_oam_2_port_network_role: - type: string - required: true - status: SUPPORTED - vm_flavor_name: - type: string - required: true - status: SUPPORTED - port_oam_internal_2_port_mac_requirements: + port_oam_internal_2_port_0_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_oam_oam_2_port_subnetpoolid: - type: string - required: true - status: SUPPORTED - port_oam_internal_2_port_subnetpoolid: + port_oam_internal_2_port_0_network_role: type: string required: true status: SUPPORTED - port_oam_oam_2_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_oam_oam_2_port_1_allowed_address_pairs: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.heat.network.AddressPair vm_image_name: type: string required: true @@ -2095,50 +2077,56 @@ node_types: status: SUPPORTED entry_schema: type: boolean - port_oam_oam_2_port_vlan_requirements: + port_oam_internal_2_port_0_allowed_address_pairs: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_oam_internal_2_port_allowed_address_pairs: + type: org.openecomp.datatypes.heat.network.AddressPair + port_oam_oam_2_port_1_order: + type: integer + required: true + status: SUPPORTED + port_oam_oam_2_port_1_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.network.AddressPair - port_oam_internal_2_port_network: + type: org.openecomp.datatypes.network.IpRequirements + port_oam_oam_2_port_1_security_groups: type: list required: true status: SUPPORTED entry_schema: - type: string - port_oam_internal_2_port_network_role_tag: + type: json + port_oam_oam_2_port_1_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_oam_oam_2_port_1_network_role_tag: type: string required: true status: SUPPORTED - port_oam_internal_2_port_order: - type: integer + port_oam_oam_2_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_oam_internal_2_port_fixed_ips: + port_oam_internal_2_port_0_security_groups: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_oam_internal_2_port_network_role: - type: string - required: true - status: SUPPORTED - port_oam_oam_2_port_fixed_ips: + type: json + port_oam_oam_2_port_1_fixed_ips: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_oam_oam_2_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_oam_internal_2_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED index_value: @@ -2149,62 +2137,76 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_oam_internal_2_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_oam_oam_2_port_1_subnetpoolid: + type: string required: true status: SUPPORTED - port_oam_oam_2_port_network: + compute_oam_user_data_format: type: list required: true status: SUPPORTED entry_schema: type: string - compute_oam_user_data_format: + port_oam_internal_2_port_0_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: string - port_oam_internal_2_port_security_groups: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_oam_internal_2_port_0_network: type: list required: true status: SUPPORTED entry_schema: - type: json - port_oam_oam_2_port_ip_requirements: + type: string + port_oam_internal_2_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_oam_internal_2_port_vlan_requirements: + port_oam_internal_2_port_0_order: + type: integer + required: true + status: SUPPORTED + port_oam_oam_2_port_1_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_oam_oam_2_port_order: - type: integer + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_oam_oam_2_port_1_network_role: + type: string required: true status: SUPPORTED - port_oam_internal_2_port_related_networks: + port_oam_oam_2_port_1_name: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments + type: string compute_oam_scheduler_hints: type: list required: true status: SUPPORTED entry_schema: type: json - port_oam_internal_2_port_ip_requirements: + port_oam_internal_2_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: org.openecomp.datatypes.network.VlanRequirements + port_oam_oam_2_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_oam_oam_2_port_1_network: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string compute_oam_availability_zone: type: list required: true @@ -2217,12 +2219,10 @@ node_types: status: SUPPORTED entry_schema: type: json - port_oam_oam_2_port_allowed_address_pairs: - type: list + port_oam_internal_2_port_0_network_role_tag: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.network.AddressPair compute_oam_name: type: list required: true @@ -2230,46 +2230,46 @@ node_types: entry_schema: type: string requirements: - - dependency_oam_oam_internal_2_port: + - dependency_oam: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_oam_oam_internal_2_port: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - - dependency_oam_oam_oam_2_port: + - local_storage_oam: + capability: tosca.capabilities.Attachment + node: tosca.nodes.BlockStorage + relationship: tosca.relationships.AttachesTo + occurrences: + - 0 + - UNBOUNDED + - dependency_oam_oam_oam_2_port_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_oam_oam_oam_2_port: + - link_oam_oam_oam_2_port_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_oam: + - dependency_oam_oam_internal_2_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - local_storage_oam: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo + - link_oam_oam_internal_2_port_0: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo occurrences: - - 0 - - UNBOUNDED + - 1 + - 1 capabilities: cpu_oam: type: org.openecomp.capabilities.metric.Ceilometer @@ -2277,48 +2277,54 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_oam_oam_oam_2_port: + disk.usage_oam: 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.packets.rate_oam_oam_oam_2_port: + feature_oam_oam_internal_2_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + memory.resident_oam: 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_oam: + disk.device.write.bytes_oam: 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_oam: + disk.read.bytes_oam: 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_oam_oam_internal_2_port: - type: tosca.capabilities.Node + network.incoming.bytes_oam_oam_oam_2_port_1: + 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_oam_oam_oam_2_port: + network.outgoing.bytes.rate_oam_oam_internal_2_port_0: 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_oam: + network.outgoing.bytes_oam_oam_internal_2_port_0: 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_oam: + network.incoming.bytes_oam_oam_internal_2_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2346,18 +2352,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_oam_oam_oam_2_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.incoming.bytes.rate_oam_oam_internal_2_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 binding_oam: type: tosca.capabilities.network.Bindable occurrences: @@ -2381,60 +2375,58 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.allocation_oam: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_oam_oam_oam_2_port_1: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - disk.ephemeral.size_oam: + disk.device.allocation_oam: 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_oam_oam_internal_2_port: + network.incoming.packets_oam_oam_oam_2_port_1: 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_oam: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_oam_oam_oam_2_port_1: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.capacity_oam: + disk.ephemeral.size_oam: 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_oam_oam_oam_2_port: + disk.write.requests_oam: 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 - instance_oam: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_oam_oam_oam_2_port_1: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_oam_oam_internal_2_port: + disk.capacity_oam: 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_oam_oam_internal_2_port: - type: org.openecomp.capabilities.Forwarder + network.incoming.bytes.rate_oam_oam_oam_2_port_1: + 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_oam_oam_internal_2_port: + instance_oam: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2446,6 +2438,14 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_oam_oam_oam_2_port_1: + 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 memory_oam: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2464,55 +2464,47 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_oam_oam_oam_2_port: + attachment_oam_oam_internal_2_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + disk.device.read.requests.rate_oam: 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_oam_oam_oam_2_port: + forwarder_oam_oam_internal_2_port_0: type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_oam_oam_internal_2_port: + disk.write.requests.rate_oam: 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_oam_oam_oam_2_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 - disk.device.read.requests.rate_oam: + disk.device.latency_oam: 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_oam_oam_oam_2_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - disk.write.requests.rate_oam: + network.incoming.packets.rate_oam_oam_internal_2_port_0: 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_oam: + disk.device.iops_oam: 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.iops_oam: + network.outpoing.packets_oam_oam_oam_2_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2543,24 +2535,16 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_oam_oam_internal_2_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 endpoint_oam: type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED - binding_oam_oam_internal_2_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 + network.incoming.packets.rate_oam_oam_oam_2_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - - 0 + - 1 - UNBOUNDED disk.device.read.requests_oam: type: org.openecomp.capabilities.metric.Ceilometer @@ -2580,12 +2564,7 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_oam_oam_internal_2_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - network.incoming.packets.rate_oam_oam_oam_2_port: + network.outgoing.bytes.rate_oam_oam_oam_2_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2608,41 +2587,56 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_oam_oam_oam_2_port: - type: tosca.capabilities.Attachment + disk.latency_oam: + 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_oam: + network.incoming.packets_oam_oam_internal_2_port_0: 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_oam_oam_oam_2_port: + network.outgoing.packets.rate_oam_oam_internal_2_port_0: 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_oam_oam_internal_2_port: + disk.write.bytes_oam: 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_oam: + network.outgoing.bytes_oam_oam_oam_2_port_1: + 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.packets.rate_oam_oam_oam_2_port_1: 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_oam_oam_internal_2_port: + network.incoming.bytes.rate_oam_oam_internal_2_port_0: 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_oam_oam_internal_2_port_0: + 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 disk.read.requests_oam: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2655,6 +2649,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_oam_oam_internal_2_port_0: + 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.tdcore_1: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: @@ -3324,44 +3324,58 @@ node_types: org.openecomp.resource.abstract.nodes.cdi_1: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_cdi_internal_1_port_order: - type: integer + port_cdi_ims_core_1_port_1_fixed_ips: + type: list required: true status: SUPPORTED - port_cdi_ims_core_1_port_security_groups: + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_cdi_internal_1_port_0_security_groups: type: list required: true status: SUPPORTED entry_schema: type: json - port_cdi_internal_1_port_network_role_tag: + port_cdi_ims_core_1_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + vm_flavor_name: type: string required: true status: SUPPORTED - port_cdi_internal_1_port_related_networks: + port_cdi_ims_core_1_port_1_order: + type: integer + required: true + status: SUPPORTED + port_cdi_internal_1_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - vm_flavor_name: - type: string + port_cdi_ims_core_1_port_1_security_groups: + type: list required: true status: SUPPORTED - port_cdi_ims_core_1_port_order: - type: integer + entry_schema: + type: json + port_cdi_ims_core_1_port_1_network_role_tag: + type: string required: true status: SUPPORTED - port_cdi_internal_1_port_security_groups: + port_cdi_internal_1_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: json - port_cdi_ims_core_1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + type: org.openecomp.datatypes.network.VlanRequirements + port_cdi_ims_core_1_port_1_ip_requirements: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements vm_image_name: type: string required: true @@ -3372,84 +3386,54 @@ node_types: status: SUPPORTED entry_schema: type: json - port_cdi_ims_core_1_port_fixed_ips: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps compute_cdi_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_cdi_ims_core_1_port_network_role_tag: - type: string - required: true - status: SUPPORTED - port_cdi_ims_core_1_port_name: + compute_cdi_user_data_format: type: list required: true status: SUPPORTED entry_schema: type: string - port_cdi_ims_core_1_port_subnetpoolid: + port_cdi_ims_core_1_port_1_network_role: type: string required: true status: SUPPORTED - compute_cdi_user_data_format: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_cdi_ims_core_1_port_network: + port_cdi_ims_core_1_port_1_network: type: list required: true status: SUPPORTED entry_schema: type: string - compute_cdi_availability_zone: + port_cdi_internal_1_port_0_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: string - port_cdi_internal_1_port_network: - type: list + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_cdi_internal_1_port_0_network_role: + type: string required: true status: SUPPORTED - entry_schema: - type: string - port_cdi_ims_core_1_port_ip_requirements: - type: list + port_cdi_ims_core_1_port_1_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_cdi_internal_1_port_allowed_address_pairs: + compute_cdi_availability_zone: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.network.AddressPair + type: string compute_cdi_config_drive: type: list required: true status: SUPPORTED entry_schema: type: boolean - port_cdi_internal_1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_cdi_ims_core_1_port_allowed_address_pairs: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.network.AddressPair index_value: type: integer description: Index value of this substitution service template runtime instance @@ -3458,77 +3442,93 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_cdi_ims_core_1_port_vlan_requirements: - type: list + port_cdi_internal_1_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_cdi_ims_core_1_port_network_role: + port_cdi_internal_1_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_cdi_internal_1_port_vlan_requirements: + port_cdi_ims_core_1_port_1_allowed_address_pairs: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_cdi_internal_1_port_fixed_ips: + type: org.openecomp.datatypes.heat.network.AddressPair + port_cdi_internal_1_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_cdi_internal_1_port_name: + type: org.openecomp.datatypes.network.IpRequirements + port_cdi_internal_1_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_cdi_internal_1_port_0_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_cdi_ims_core_1_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_cdi_ims_core_1_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_cdi_internal_1_port_ip_requirements: + port_cdi_ims_core_1_port_1_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_cdi_ims_core_1_port_related_networks: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_cdi_ims_core_1_port_1_name: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - compute_cdi_metadata: + type: string + port_cdi_ims_core_1_port_1_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: json - port_cdi_internal_1_port_subnetpoolid: - type: string + type: org.openecomp.datatypes.network.VlanRequirements + port_cdi_internal_1_port_0_allowed_address_pairs: + type: list required: true status: SUPPORTED - port_cdi_internal_1_port_network_role: + entry_schema: + type: org.openecomp.datatypes.heat.network.AddressPair + port_cdi_internal_1_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_cdi_internal_1_port_exCP_naming: - type: org.openecomp.datatypes.Naming + compute_cdi_metadata: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_cdi_internal_1_port_0_network: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_cdi_internal_1_port_0_order: + type: integer required: true status: SUPPORTED requirements: - - dependency_cdi_cdi_internal_1_port: + - dependency_cdi_cdi_internal_1_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_cdi_cdi_internal_1_port: + - link_cdi_cdi_internal_1_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -3548,31 +3548,26 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_cdi_cdi_ims_core_1_port: + - dependency_cdi_cdi_ims_core_1_port_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_cdi_cdi_ims_core_1_port: + - link_cdi_cdi_ims_core_1_port_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: - network.outpoing.packets_cdi_cdi_internal_1_port: + network.incoming.bytes_cdi_cdi_ims_core_1_port_1: 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_cdi_cdi_ims_core_1_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED host_cdi: type: tosca.capabilities.Container valid_source_types: @@ -3592,53 +3587,42 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.write.requests.rate_cdi: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_cdi_cdi_internal_1_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.device.write.requests.rate_cdi: + network.outgoing.bytes.rate_cdi_cdi_ims_core_1_port_1: 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_cdi_cdi_ims_core_1_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - network.incoming.bytes_cdi_cdi_ims_core_1_port: + disk.write.requests.rate_cdi: 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_cdi_cdi_ims_core_1_port: + network.incoming.packets_cdi_cdi_internal_1_port_0: 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_cdi_cdi_internal_1_port: + disk.device.write.requests.rate_cdi: 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 - attachment_cdi_cdi_internal_1_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED disk.write.bytes.rate_cdi: 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.packets.rate_cdi_cdi_internal_1_port: + network.outpoing.packets_cdi_cdi_ims_core_1_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -3656,33 +3640,20 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_cdi_cdi_ims_core_1_port: + cpu.delta_cdi: 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_cdi: + disk.device.write.bytes_cdi: 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_cdi: - 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_cdi_cdi_ims_core_1_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.incoming.packets.rate_cdi_cdi_internal_1_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_cdi_cdi_ims_core_1_port_1: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED @@ -3709,34 +3680,12 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_cdi_cdi_ims_core_1_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 - binding_cdi_cdi_internal_1_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 vcpus_cdi: 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_cdi_cdi_internal_1_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.device.read.requests_cdi: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3754,18 +3703,19 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_cdi_cdi_ims_core_1_port: - type: tosca.capabilities.Attachment + memory.resident_cdi: + 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_cdi: + disk.latency_cdi: 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_cdi: + network.incoming.bytes_cdi_cdi_internal_1_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -3795,26 +3745,26 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_cdi_cdi_ims_core_1_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_cdi_cdi_internal_1_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - disk.allocation_cdi: + network.incoming.packets.rate_cdi_cdi_internal_1_port_0: 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_cdi_cdi_ims_core_1_port: + disk.allocation_cdi: 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_cdi_cdi_internal_1_port: - type: org.openecomp.capabilities.Forwarder + network.outgoing.packets.rate_cdi_cdi_internal_1_port_0: + 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 @@ -3828,6 +3778,14 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_cdi_cdi_internal_1_port_0: + 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 cpu_cdi: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3840,26 +3798,37 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.iops_cdi: + attachment_cdi_cdi_ims_core_1_port_1: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes.rate_cdi_cdi_ims_core_1_port_1: 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_cdi: + disk.iops_cdi: 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_cdi_cdi_ims_core_1_port: + attachment_cdi_cdi_internal_1_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + disk.usage_cdi: 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_cdi_cdi_internal_1_port: - type: tosca.capabilities.Node + network.outpoing.packets_cdi_cdi_internal_1_port_0: + 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 @@ -3875,9 +3844,8 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_cdi_cdi_internal_1_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_cdi_cdi_ims_core_1_port_1: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -3887,18 +3855,26 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_cdi_cdi_ims_core_1_port: + network.incoming.bytes.rate_cdi_cdi_internal_1_port_0: 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_cdi_cdi_internal_1_port: + network.outgoing.bytes.rate_cdi_cdi_internal_1_port_0: 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_cdi_cdi_ims_core_1_port_1: + 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 binding_cdi: type: tosca.capabilities.network.Bindable occurrences: @@ -3922,13 +3898,25 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.packets.rate_cdi_cdi_ims_core_1_port_1: + 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_cdi_cdi_ims_core_1_port_1: + 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 instance_cdi: 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_cdi_cdi_internal_1_port: + network.incoming.packets.rate_cdi_cdi_ims_core_1_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -3940,6 +3928,18 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes_cdi_cdi_internal_1_port_0: + 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_cdi_cdi_ims_core_1_port_1: + 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_cdi: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3949,51 +3949,55 @@ node_types: org.openecomp.resource.abstract.nodes.lbd_1: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_lbd_internal_0_port_network_role_tag: - type: string - required: true - status: SUPPORTED compute_lbd_user_data_format: type: list required: true status: SUPPORTED entry_schema: type: string - port_lbd_internal_0_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_lbd_ims_core_0_port_2_ip_requirements: + type: list required: true status: SUPPORTED - port_lbd_dpdk_0_port_exCP_naming: - type: org.openecomp.datatypes.Naming + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_lbd_internal_0_port_0_related_networks: + type: list required: true status: SUPPORTED - port_lbd_internal_0_port_network_role: - type: string + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_lbd_internal_0_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_lbd_dpdk_0_port_related_networks: + port_lbd_internal_0_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments + type: org.openecomp.datatypes.network.VlanRequirements + port_lbd_dpdk_0_port_1_network_role: + type: string + required: true + status: SUPPORTED vm_flavor_name: type: string required: true status: SUPPORTED - compute_lbd_availability_zone: + port_lbd_dpdk_0_port_1_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_lbd_dpdk_0_port_allowed_address_pairs: + compute_lbd_availability_zone: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.network.AddressPair - port_lbd_dpdk_0_port_subnetpoolid: + type: string + port_lbd_dpdk_0_port_1_network_role_tag: type: string required: true status: SUPPORTED @@ -4001,180 +4005,162 @@ node_types: type: string required: true status: SUPPORTED - port_lbd_dpdk_0_port_ip_requirements: + port_lbd_ims_core_0_port_2_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_lbd_ims_core_0_port_order: - type: integer - required: true - status: SUPPORTED - port_lbd_ims_core_0_port_network: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_lbd_ims_core_0_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_lbd_ims_core_0_port_allowed_address_pairs: + type: org.openecomp.datatypes.network.VlanRequirements + port_lbd_internal_0_port_0_security_groups: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.network.AddressPair - port_lbd_internal_0_port_name: + type: json + port_lbd_ims_core_0_port_2_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: string - port_lbd_ims_core_0_port_network_role_tag: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_lbd_ims_core_0_port_2_subnetpoolid: type: string required: true status: SUPPORTED - port_lbd_ims_core_0_port_related_networks: + port_lbd_dpdk_0_port_1_name: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments + type: string + port_lbd_dpdk_0_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED compute_lbd_scheduler_hints: type: list required: true status: SUPPORTED entry_schema: type: json - port_lbd_internal_0_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_lbd_dpdk_0_port_order: - type: integer - required: true - status: SUPPORTED - port_lbd_ims_core_0_port_ip_requirements: + port_lbd_ims_core_0_port_2_security_groups: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_lbd_internal_0_port_network: + type: json + port_lbd_dpdk_0_port_1_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: string - port_lbd_dpdk_0_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_lbd_ims_core_0_port_2_network_role: + type: string required: true status: SUPPORTED - compute_lbd_name: + port_lbd_internal_0_port_0_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: string - port_lbd_ims_core_0_port_security_groups: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_lbd_ims_core_0_port_2_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: json - port_lbd_ims_core_0_port_name: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + compute_lbd_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_lbd_internal_0_port_vlan_requirements: - type: list + port_lbd_internal_0_port_0_network_role: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - compute_lbd_config_drive: - type: list + port_lbd_internal_0_port_0_order: + type: integer required: true status: SUPPORTED - entry_schema: - type: boolean - port_lbd_internal_0_port_related_networks: + port_lbd_dpdk_0_port_1_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_lbd_dpdk_0_port_fixed_ips: - type: list + type: org.openecomp.datatypes.network.IpRequirements + port_lbd_internal_0_port_0_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_lbd_internal_0_port_security_groups: - type: list + port_lbd_ims_core_0_port_2_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json - port_lbd_dpdk_0_port_security_groups: + port_lbd_dpdk_0_port_1_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: json - port_lbd_dpdk_0_port_vlan_requirements: + type: org.openecomp.datatypes.network.VlanRequirements + compute_lbd_config_drive: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_lbd_dpdk_0_port_name: + type: boolean + port_lbd_internal_0_port_0_network_role_tag: + type: string + required: true + status: SUPPORTED + port_lbd_dpdk_0_port_1_security_groups: type: list required: true status: SUPPORTED entry_schema: - type: string - port_lbd_internal_0_port_subnetpoolid: + type: json + port_lbd_ims_core_0_port_2_network_role_tag: type: string required: true status: SUPPORTED - port_lbd_ims_core_0_port_network_role: - type: string + port_lbd_ims_core_0_port_2_order: + type: integer required: true status: SUPPORTED - port_lbd_dpdk_0_port_network: + port_lbd_dpdk_0_port_1_allowed_address_pairs: type: list required: true status: SUPPORTED entry_schema: - type: string - port_lbd_dpdk_0_port_network_role_tag: - type: string + type: org.openecomp.datatypes.heat.network.AddressPair + port_lbd_dpdk_0_port_1_order: + type: integer required: true status: SUPPORTED - port_lbd_internal_0_port_order: - type: integer + port_lbd_ims_core_0_port_2_name: + type: list required: true status: SUPPORTED - port_lbd_dpdk_0_port_network_role: + entry_schema: + type: string + port_lbd_dpdk_0_port_1_subnetpoolid: type: string required: true status: SUPPORTED - port_lbd_ims_core_0_port_vlan_requirements: + port_lbd_internal_0_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_lbd_ims_core_0_port_subnetpoolid: - type: string + type: org.openecomp.datatypes.network.IpRequirements + port_lbd_ims_core_0_port_2_allowed_address_pairs: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.heat.network.AddressPair index_value: type: integer description: Index value of this substitution service template runtime instance @@ -4183,69 +4169,83 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_lbd_ims_core_0_port_fixed_ips: + port_lbd_ims_core_0_port_2_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_lbd_ims_core_0_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_lbd_internal_0_port_fixed_ips: + type: string + port_lbd_internal_0_port_0_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps + type: string + port_lbd_internal_0_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_lbd_ims_core_0_port_2_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED compute_lbd_metadata: type: list required: true status: SUPPORTED entry_schema: type: json - port_lbd_internal_0_port_ip_requirements: + port_lbd_dpdk_0_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_lbd_dpdk_0_port_1_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_lbd_internal_0_port_0_name: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string requirements: - - dependency_lbd_lbd_ims_core_0_port: + - dependency_lbd_lbd_dpdk_0_port_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_lbd_lbd_ims_core_0_port: + - link_lbd_lbd_dpdk_0_port_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_lbd_lbd_dpdk_0_port: + - dependency_lbd_lbd_internal_0_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_lbd_lbd_dpdk_0_port: + - link_lbd_lbd_internal_0_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_lbd_lbd_internal_0_port: + - dependency_lbd_lbd_ims_core_0_port_2: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_lbd_lbd_internal_0_port: + - link_lbd_lbd_ims_core_0_port_2: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -4272,127 +4272,158 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_lbd_lbd_ims_core_0_port: - type: tosca.capabilities.Attachment + disk.write.requests.rate_lbd: + 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_lbd_lbd_ims_core_0_port: + disk.write.bytes.rate_lbd: 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_lbd: + instance_lbd: 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_lbd: + binding_lbd_lbd_dpdk_0_port_1: + 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 + disk.device.iops_lbd: 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_lbd_lbd_internal_0_port: + host_lbd: + type: tosca.capabilities.Container + valid_source_types: + - tosca.nodes.SoftwareComponent + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes_lbd_lbd_internal_0_port_0: 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 - instance_lbd: + disk.device.capacity_lbd: 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_lbd_lbd_internal_0_port: + network.outgoing.bytes.rate_lbd_lbd_ims_core_0_port_2: 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.iops_lbd: + network.outgoing.packets.rate_lbd_lbd_dpdk_0_port_1: 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_lbd_lbd_ims_core_0_port: + cpu_util_lbd: 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_lbd_lbd_ims_core_0_port: + disk.device.read.requests_lbd: 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.packets.rate_lbd_lbd_dpdk_0_port: + network.outpoing.packets_lbd_lbd_dpdk_0_port_1: 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_lbd_lbd_dpdk_0_port: + memory.usage_lbd: 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_lbd: - type: tosca.capabilities.Container - valid_source_types: - - tosca.nodes.SoftwareComponent + network.incoming.packets.rate_lbd_lbd_dpdk_0_port_1: + 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_lbd_lbd_dpdk_0_port_1: + 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_lbd_lbd_internal_0_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + feature_lbd_lbd_ims_core_0_port_2: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.device.capacity_lbd: + disk.read.requests_lbd: 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_lbd_lbd_ims_core_0_port: + network.incoming.packets_lbd_lbd_dpdk_0_port_1: 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_lbd: + network.incoming.packets.rate_lbd_lbd_ims_core_0_port_2: 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_lbd: + cpu.delta_lbd: 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_lbd_lbd_internal_0_port: + memory_lbd: 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_lbd: + network.outpoing.packets_lbd_lbd_ims_core_0_port_2: 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_lbd_lbd_dpdk_0_port: + disk.write.bytes_lbd: 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_lbd_lbd_internal_0_port: + binding_lbd_lbd_internal_0_port_0: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface @@ -4400,66 +4431,60 @@ node_types: occurrences: - 0 - UNBOUNDED - disk.read.requests_lbd: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + scalable_lbd: + type: tosca.capabilities.Scalable occurrences: - 1 - UNBOUNDED - cpu.delta_lbd: + network.incoming.bytes.rate_lbd_lbd_internal_0_port_0: 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_lbd_lbd_ims_core_0_port: + network.outgoing.bytes_lbd_lbd_ims_core_0_port_2: 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_lbd: + disk.device.read.requests.rate_lbd: 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_lbd_lbd_dpdk_0_port: + disk.root.size_lbd: 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_lbd: + network.outgoing.bytes.rate_lbd_lbd_dpdk_0_port_1: 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.packets.rate_lbd_lbd_internal_0_port: + network.outgoing.packets.rate_lbd_lbd_ims_core_0_port_2: 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_lbd: - type: tosca.capabilities.Scalable - occurrences: - - 1 - - UNBOUNDED - disk.device.read.requests.rate_lbd: + vcpus_lbd: 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_lbd: + network.incoming.packets_lbd_lbd_internal_0_port_0: 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_lbd: + network.outgoing.packets.rate_lbd_lbd_internal_0_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -4471,8 +4496,8 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_lbd_lbd_dpdk_0_port: - type: tosca.capabilities.Attachment + forwarder_lbd_lbd_dpdk_0_port_1: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED @@ -4482,6 +4507,14 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_lbd_lbd_ims_core_0_port_2: + 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 os_lbd: type: tosca.capabilities.OperatingSystem occurrences: @@ -4499,66 +4532,55 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.read.bytes.rate_lbd: + network.incoming.packets_lbd_lbd_ims_core_0_port_2: 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_lbd: + disk.read.bytes.rate_lbd: 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_lbd_lbd_internal_0_port: + disk.read.bytes_lbd: 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_lbd_lbd_internal_0_port: + network.incoming.bytes.rate_lbd_lbd_ims_core_0_port_2: 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_lbd_lbd_ims_core_0_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 + attachment_lbd_lbd_ims_core_0_port_2: + type: tosca.capabilities.Attachment occurrences: - - 0 + - 1 - UNBOUNDED - network.incoming.packets_lbd_lbd_dpdk_0_port: + network.incoming.bytes_lbd_lbd_internal_0_port_0: 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_lbd_lbd_internal_0_port: + network.incoming.packets.rate_lbd_lbd_internal_0_port_0: 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_lbd_lbd_dpdk_0_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 - forwarder_lbd_lbd_ims_core_0_port: - type: org.openecomp.capabilities.Forwarder + network.outpoing.packets_lbd_lbd_internal_0_port_0: + 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_lbd_lbd_internal_0_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_lbd_lbd_ims_core_0_port_2: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED @@ -4568,51 +4590,45 @@ node_types: occurrences: - 1 - UNBOUNDED - endpoint_lbd: - type: tosca.capabilities.Endpoint.Admin + attachment_lbd_lbd_dpdk_0_port_1: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - disk.device.read.bytes.rate_lbd: + network.outgoing.bytes.rate_lbd_lbd_internal_0_port_0: 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_lbd_lbd_internal_0_port: - type: tosca.capabilities.Node + endpoint_lbd: + type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED - disk.device.write.bytes.rate_lbd: + disk.device.read.bytes.rate_lbd: 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_lbd_lbd_ims_core_0_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_lbd_lbd_internal_0_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - network.incoming.packets_lbd_lbd_ims_core_0_port: + disk.device.write.bytes.rate_lbd: 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_lbd_lbd_dpdk_0_port: + network.outgoing.bytes_lbd_lbd_dpdk_0_port_1: 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 - attachment_lbd_lbd_internal_0_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED disk.iops_lbd: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4637,12 +4653,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_lbd_lbd_dpdk_0_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.write.requests_lbd: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4655,8 +4665,8 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_lbd_lbd_internal_0_port: - type: org.openecomp.capabilities.Forwarder + attachment_lbd_lbd_internal_0_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED @@ -4666,13 +4676,14 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_lbd_lbd_dpdk_0_port: - type: org.openecomp.capabilities.Forwarder + feature_lbd: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - feature_lbd: - type: tosca.capabilities.Node + network.incoming.bytes_lbd_lbd_ims_core_0_port_2: + 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 @@ -4693,17 +4704,12 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_lbd_lbd_dpdk_0_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - feature_lbd_lbd_ims_core_0_port: + feature_lbd_lbd_dpdk_0_port_1: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_lbd_lbd_ims_core_0_port: + network.incoming.bytes_lbd_lbd_dpdk_0_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -4715,12 +4721,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_lbd_lbd_dpdk_0_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.cif_1: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: @@ -4730,18 +4730,30 @@ node_types: status: SUPPORTED entry_schema: type: string - port_cif_ims_core_1_port_security_groups: - type: list + port_cif_ims_core_1_port_2_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_cif_ims_li_1_port_4_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_cif_ims_li_1_port_4_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: json port_cif_oam_1_port_3_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements + port_cif_ims_core_1_port_2_fixed_ips: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps port_cif_oam_1_port_1_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -4752,10 +4764,6 @@ node_types: status: SUPPORTED entry_schema: type: string - port_cif_internal_1_port_subnetpoolid: - type: string - required: true - status: SUPPORTED vm_flavor_name: type: string required: true @@ -4770,6 +4778,14 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_cif_ims_core_1_port_2_subnetpoolid: + type: string + required: true + status: SUPPORTED + port_cif_internal_1_port_0_network_role_tag: + type: string + required: true + status: SUPPORTED vm_image_name: type: string required: true @@ -4790,70 +4806,54 @@ node_types: type: string required: true status: SUPPORTED - compute_cif_scheduler_hints: + port_cif_internal_1_port_0_allowed_address_pairs: type: list required: true status: SUPPORTED entry_schema: - type: json - port_cif_ims_li_1_port_order: - type: integer + type: org.openecomp.datatypes.heat.network.AddressPair + compute_cif_scheduler_hints: + type: list required: true status: SUPPORTED + entry_schema: + type: json port_cif_oam_1_port_3_ip_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_cif_internal_1_port_security_groups: + port_cif_ims_core_1_port_2_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_cif_ims_li_1_port_4_name: type: list required: true status: SUPPORTED entry_schema: - type: json + type: string port_cif_oam_1_port_1_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_cif_internal_1_port_order: + port_cif_internal_1_port_0_order: type: integer required: true status: SUPPORTED - port_cif_ims_core_1_port_network_role_tag: - type: string - required: true - status: SUPPORTED - port_cif_ims_li_1_port_security_groups: - type: list - required: true - status: SUPPORTED - entry_schema: - type: json - port_cif_ims_li_1_port_subnetpoolid: + port_cif_ims_li_1_port_4_network_role_tag: type: string required: true status: SUPPORTED - port_cif_ims_core_1_port_related_networks: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_cif_ims_li_1_port_allowed_address_pairs: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.network.AddressPair - port_cif_internal_1_port_allowed_address_pairs: + port_cif_internal_1_port_0_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.network.AddressPair + type: org.openecomp.datatypes.heat.neutron.port.FixedIps port_cif_oam_1_port_3_security_groups: type: list required: true @@ -4866,59 +4866,63 @@ node_types: status: SUPPORTED entry_schema: type: json - port_cif_ims_li_1_port_network_role: + port_cif_internal_1_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_cif_ims_core_1_port_order: - type: integer + port_cif_ims_core_1_port_2_allowed_address_pairs: + type: list required: true status: SUPPORTED - port_cif_oam_1_port_3_order: + entry_schema: + type: org.openecomp.datatypes.heat.network.AddressPair + port_cif_internal_1_port_0_network_role: + type: string + required: true + status: SUPPORTED + port_cif_ims_li_1_port_4_order: type: integer required: true status: SUPPORTED - port_cif_internal_1_port_vlan_requirements: + port_cif_ims_core_1_port_2_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_cif_internal_1_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_cif_internal_1_port_related_networks: + type: org.openecomp.datatypes.network.IpRequirements + port_cif_ims_core_1_port_2_security_groups: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments + type: json + port_cif_oam_1_port_3_order: + type: integer + required: true + status: SUPPORTED port_cif_oam_1_port_1_fixed_ips: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_cif_internal_1_port_network: + port_cif_oam_1_port_3_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: string - port_cif_ims_core_1_port_network: - type: list + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_cif_ims_core_1_port_2_network_role: + type: string required: true status: SUPPORTED - entry_schema: - type: string - port_cif_oam_1_port_3_fixed_ips: + port_cif_ims_li_1_port_4_allowed_address_pairs: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_cif_ims_li_1_port_exCP_naming: + type: org.openecomp.datatypes.heat.network.AddressPair + port_cif_internal_1_port_0_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED @@ -4926,10 +4930,12 @@ node_types: type: string required: true status: SUPPORTED - port_cif_internal_1_port_network_role: - type: string + port_cif_ims_core_1_port_2_name: + type: list required: true status: SUPPORTED + entry_schema: + type: string port_cif_oam_1_port_1_ip_requirements: type: list required: true @@ -4940,11 +4946,7 @@ node_types: type: integer required: true status: SUPPORTED - port_cif_ims_core_1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_cif_ims_core_1_port_vlan_requirements: + port_cif_ims_li_1_port_4_vlan_requirements: type: list required: true status: SUPPORTED @@ -4954,10 +4956,6 @@ node_types: type: string required: true status: SUPPORTED - port_cif_internal_1_port_network_role_tag: - type: string - required: true - status: SUPPORTED compute_cif_name: type: list required: true @@ -4980,62 +4978,58 @@ node_types: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_cif_internal_1_port_ip_requirements: + port_cif_ims_core_1_port_2_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_cif_ims_li_1_port_name: + type: string + port_cif_ims_li_1_port_4_network_role: + type: string + required: true + status: SUPPORTED + port_cif_internal_1_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: string - port_cif_internal_1_port_name: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_cif_internal_1_port_0_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_cif_ims_li_1_port_fixed_ips: + port_cif_ims_li_1_port_4_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_cif_ims_li_1_port_vlan_requirements: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_cif_internal_1_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_cif_internal_1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_cif_ims_li_1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_cif_ims_li_1_port_ip_requirements: + port_cif_ims_li_1_port_4_security_groups: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_cif_ims_core_1_port_fixed_ips: + type: json + port_cif_ims_li_1_port_4_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_cif_ims_core_1_port_allowed_address_pairs: + type: string + port_cif_internal_1_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.network.AddressPair + type: org.openecomp.datatypes.network.IpRequirements port_cif_oam_1_port_1_network_role_tag: type: string required: true @@ -5044,28 +5038,22 @@ node_types: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_cif_ims_core_1_port_ip_requirements: + port_cif_oam_1_port_1_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_cif_ims_li_1_port_network: - type: list + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_cif_ims_core_1_port_2_network_role_tag: + type: string required: true status: SUPPORTED - entry_schema: - type: string - port_cif_oam_1_port_1_related_networks: + port_cif_internal_1_port_0_security_groups: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_cif_ims_core_1_port_subnetpoolid: - type: string - required: true - status: SUPPORTED + type: json index_value: type: integer description: Index value of this substitution service template runtime instance @@ -5074,48 +5062,60 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_cif_internal_1_port_fixed_ips: + port_cif_ims_core_1_port_2_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_cif_ims_core_1_port_name: + type: org.openecomp.datatypes.network.VlanRequirements + compute_cif_config_drive: type: list required: true status: SUPPORTED entry_schema: - type: string - compute_cif_config_drive: + type: boolean + port_cif_ims_core_1_port_2_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: boolean + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_cif_ims_li_1_port_4_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_cif_ims_li_1_port_4_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED port_cif_oam_1_port_3_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_cif_oam_1_port_3_name: + port_cif_ims_li_1_port_4_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: string - port_cif_ims_li_1_port_related_networks: - type: list + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_cif_ims_core_1_port_2_order: + type: integer required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_cif_ims_li_1_port_network_role_tag: - type: string + port_cif_internal_1_port_0_network: + type: list required: true status: SUPPORTED - port_cif_ims_core_1_port_exCP_naming: - type: org.openecomp.datatypes.Naming + entry_schema: + type: string + port_cif_oam_1_port_3_name: + type: list required: true status: SUPPORTED + entry_schema: + type: string port_cif_oam_1_port_1_security_groups: type: list required: true @@ -5128,8 +5128,8 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.heat.network.AddressPair - port_cif_ims_core_1_port_network_role: - type: string + port_cif_internal_1_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED port_cif_oam_1_port_3_network_role_tag: @@ -5151,66 +5151,66 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_cif_cif_ims_li_1_port: + - dependency_cif_cif_ims_li_1_port_4: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_cif_cif_ims_li_1_port: + - link_cif_cif_ims_li_1_port_4: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_cif_cif_internal_1_port: + - dependency_cif_cif_oam_1_port_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_cif_cif_internal_1_port: + - link_cif_cif_oam_1_port_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_cif_cif_oam_1_port_1: + - dependency_cif_cif_oam_1_port_3: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_cif_cif_oam_1_port_1: + - link_cif_cif_oam_1_port_3: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_cif_cif_ims_core_1_port: + - dependency_cif_cif_internal_1_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_cif_cif_ims_core_1_port: + - link_cif_cif_internal_1_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_cif_cif_oam_1_port_3: + - dependency_cif_cif_ims_core_1_port_2: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_cif_cif_oam_1_port_3: + - link_cif_cif_ims_core_1_port_2: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -5228,6 +5228,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes.rate_cif_cif_ims_li_1_port_4: + 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_cif: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -5245,8 +5251,9 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_cif_cif_ims_li_1_port: - type: tosca.capabilities.Attachment + network.outgoing.bytes_cif_cif_internal_1_port_0: + 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 @@ -5256,13 +5263,12 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_cif_cif_internal_1_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_cif_cif_internal_1_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - feature_cif_cif_ims_core_1_port: + feature_cif_cif_internal_1_port_0: type: tosca.capabilities.Node occurrences: - 1 @@ -5273,18 +5279,36 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_cif_cif_oam_1_port_1: + network.outgoing.bytes.rate_cif_cif_ims_core_1_port_2: 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_cif_cif_ims_li_1_port: + feature_cif_cif_ims_li_1_port_4: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes.rate_cif_cif_oam_1_port_1: 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_cif_cif_internal_1_port_0: + 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 + forwarder_cif_cif_ims_li_1_port_4: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED network.incoming.packets.rate_cif_cif_oam_1_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -5313,31 +5337,31 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_cif_cif_ims_core_1_port: + network.incoming.packets.rate_cif_cif_oam_1_port_3: 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_cif_cif_oam_1_port_3: + network.outpoing.packets_cif_cif_ims_core_1_port_2: 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_cif_cif_ims_li_1_port: + network.incoming.bytes_cif_cif_oam_1_port_1: 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_cif_cif_oam_1_port_1: + disk.usage_cif: 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_cif: + network.incoming.bytes.rate_cif_cif_ims_li_1_port_4: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -5349,25 +5373,25 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.write.requests.rate_cif: + network.incoming.bytes.rate_cif_cif_internal_1_port_0: 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_cif: + disk.write.requests.rate_cif: 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_cif_cif_ims_core_1_port: + disk.read.bytes_cif: 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.packets.rate_cif_cif_internal_1_port: + network.outgoing.packets.rate_cif_cif_internal_1_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -5379,31 +5403,31 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.allocation_cif: + network.incoming.packets_cif_cif_internal_1_port_0: 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_cif: + network.outgoing.packets.rate_cif_cif_ims_core_1_port_2: 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_cif: + disk.device.allocation_cif: 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.packets.rate_cif_cif_ims_li_1_port: + disk.device.read.bytes.rate_cif: 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_cif_cif_ims_li_1_port: + vcpus_cif: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -5414,9 +5438,8 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_cif_cif_ims_li_1_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_cif_cif_ims_core_1_port_2: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED @@ -5426,7 +5449,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_cif_cif_ims_core_1_port: + network.outpoing.packets_cif_cif_internal_1_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -5455,25 +5478,25 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.read.requests_cif: + network.outpoing.packets_cif_cif_ims_li_1_port_4: 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_cif: + network.incoming.packets.rate_cif_cif_ims_core_1_port_2: 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_cif_cif_ims_li_1_port: + disk.read.requests_cif: 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_cif_cif_ims_li_1_port: + disk.write.bytes_cif: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -5497,25 +5520,24 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_cif_cif_internal_1_port: + network.incoming.bytes_cif_cif_ims_core_1_port_2: 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_cif: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_cif_cif_internal_1_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - network.incoming.bytes_cif_cif_internal_1_port: + network.outgoing.bytes_cif_cif_ims_li_1_port_4: 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_cif_cif_internal_1_port: + cpu_cif: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -5527,53 +5549,47 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_cif_cif_ims_core_1_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_cif: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.incoming.packets_cif_cif_ims_core_1_port: + network.incoming.packets.rate_cif_cif_ims_li_1_port_4: 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_cif_cif_internal_1_port: + cpu_util_cif: 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_cif: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - network.incoming.bytes.rate_cif_cif_ims_core_1_port: + network.incoming.bytes_cif_cif_ims_li_1_port_4: 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_cif: + disk.device.write.bytes_cif: 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_cif: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_cif_cif_ims_li_1_port_4: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - feature_cif_cif_ims_li_1_port: - type: tosca.capabilities.Node + network.incoming.packets_cif_cif_oam_1_port_3: + 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_cif_cif_oam_1_port_3: + network.outgoing.packets.rate_cif_cif_ims_li_1_port_4: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -5591,13 +5607,12 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.allocation_cif: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_cif_cif_ims_core_1_port_2: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_cif_cif_internal_1_port: + disk.allocation_cif: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -5615,25 +5630,12 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_cif_cif_internal_1_port: + network.outgoing.bytes_cif_cif_ims_core_1_port_2: 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_cif_cif_ims_core_1_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 - attachment_cif_cif_ims_core_1_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED attachment_cif_cif_oam_1_port_3: type: tosca.capabilities.Attachment occurrences: @@ -5645,12 +5647,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_cif_cif_ims_core_1_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 host_cif: type: tosca.capabilities.Container valid_source_types: @@ -5674,11 +5670,23 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes.rate_cif_cif_ims_core_1_port_2: + 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_cif: type: tosca.capabilities.Scalable occurrences: - 1 - UNBOUNDED + network.incoming.packets_cif_cif_ims_li_1_port_4: + 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_cif_cif_oam_1_port_3: type: tosca.capabilities.network.Bindable valid_source_types: @@ -5687,8 +5695,9 @@ node_types: occurrences: - 0 - UNBOUNDED - feature_cif_cif_internal_1_port: - type: tosca.capabilities.Node + network.incoming.packets_cif_cif_ims_core_1_port_2: + 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 @@ -5700,36 +5709,45 @@ node_types: occurrences: - 0 - UNBOUNDED - disk.device.write.bytes.rate_cif: + network.incoming.bytes_cif_cif_internal_1_port_0: 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.iops_cif: + disk.device.write.bytes.rate_cif: 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_cif: + network.outgoing.bytes.rate_cif_cif_internal_1_port_0: 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_cif_cif_internal_1_port: - type: org.openecomp.capabilities.Forwarder + binding_cif_cif_ims_core_1_port_2: + 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 + disk.iops_cif: + 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_cif: + disk.read.bytes.rate_cif: 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_cif_cif_ims_li_1_port: + binding_cif_cif_ims_li_1_port_4: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface @@ -5737,78 +5755,60 @@ node_types: occurrences: - 0 - UNBOUNDED - memory_cif: + disk.write.requests_cif: 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.packets.rate_cif_cif_ims_core_1_port: + network.incoming.packets.rate_cif_cif_internal_1_port_0: 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_cif_cif_oam_1_port_1: + memory_cif: 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_cif: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_cif_cif_ims_core_1_port_2: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_cif_cif_oam_1_port_3: + network.outgoing.bytes.rate_cif_cif_oam_1_port_1: 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_cif_cif_internal_1_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 - network.incoming.packets_cif_cif_oam_1_port_1: + disk.capacity_cif: 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_cif_cif_ims_core_1_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - disk.device.latency_cif: + network.outgoing.bytes.rate_cif_cif_oam_1_port_3: 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_cif_cif_ims_li_1_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - disk.device.write.requests.rate_cif: + network.incoming.packets_cif_cif_oam_1_port_1: 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 - attachment_cif_cif_internal_1_port: - type: tosca.capabilities.Attachment + disk.device.latency_cif: + 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_cif_cif_ims_li_1_port: + disk.device.write.requests.rate_cif: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -6347,62 +6347,68 @@ node_types: org.openecomp.resource.abstract.nodes.oam: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_oam_oam_0_port_name: + port_oam_oam_0_port_1_network_role: + type: string + required: true + status: SUPPORTED + port_oam_oam_0_port_1_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_oam_internal_0_port_order: - type: integer + type: org.openecomp.datatypes.network.IpRequirements + port_oam_internal_0_port_0_fixed_ips: + type: list required: true status: SUPPORTED - port_oam_internal_0_port_subnetpoolid: + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + vm_flavor_name: type: string required: true status: SUPPORTED - port_oam_oam_0_port_fixed_ips: + port_oam_internal_0_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - vm_flavor_name: + type: org.openecomp.datatypes.network.VlanRequirements + port_oam_internal_0_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_oam_oam_0_port_vlan_requirements: + port_oam_oam_0_port_1_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_oam_oam_0_port_mac_requirements: + port_oam_internal_0_port_0_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_oam_internal_0_port_ip_requirements: + port_oam_oam_0_port_1_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_oam_internal_0_port_network: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_oam_oam_0_port_1_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: string - port_oam_oam_0_port_order: - type: integer - required: true - status: SUPPORTED - port_oam_internal_0_port_related_networks: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_oam_internal_0_port_0_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments + type: string + port_oam_oam_0_port_1_order: + type: integer + required: true + status: SUPPORTED vm_image_name: type: string required: true @@ -6413,46 +6419,48 @@ node_types: status: SUPPORTED entry_schema: type: boolean - port_oam_oam_0_port_network_role: + port_oam_oam_0_port_1_allowed_address_pairs: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.heat.network.AddressPair + port_oam_internal_0_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_oam_internal_0_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_oam_oam_0_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_oam_internal_0_port_name: + port_oam_internal_0_port_0_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_oam_oam_0_port_allowed_address_pairs: + port_oam_oam_0_port_1_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.network.AddressPair - port_oam_internal_0_port_security_groups: + type: string + port_oam_oam_0_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_oam_internal_0_port_0_security_groups: type: list required: true status: SUPPORTED entry_schema: type: json - port_oam_internal_0_port_fixed_ips: + port_oam_oam_0_port_1_security_groups: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_oam_oam_0_port_network_role_tag: - type: string - required: true - status: SUPPORTED - port_oam_oam_0_port_subnetpoolid: - type: string - required: true - status: SUPPORTED + type: json index_value: type: integer description: Index value of this substitution service template runtime instance @@ -6461,7 +6469,11 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_oam_oam_0_port_related_networks: + port_oam_internal_0_port_0_network_role: + type: string + required: true + status: SUPPORTED + port_oam_internal_0_port_0_related_networks: type: list required: true status: SUPPORTED @@ -6473,32 +6485,24 @@ node_types: status: SUPPORTED entry_schema: type: string - port_oam_oam_0_port_network: + port_oam_internal_0_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_oam_oam_0_port_1_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_oam_internal_0_port_network_role_tag: - type: string - required: true - status: SUPPORTED - port_oam_internal_0_port_network_role: - type: string - required: true - status: SUPPORTED - port_oam_oam_0_port_ip_requirements: + port_oam_internal_0_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_oam_internal_0_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_oam_oam_0_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_oam_oam_0_port_1_subnetpoolid: + type: string required: true status: SUPPORTED compute_oam_scheduler_hints: @@ -6507,18 +6511,10 @@ node_types: status: SUPPORTED entry_schema: type: json - port_oam_internal_0_port_allowed_address_pairs: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.network.AddressPair - port_oam_internal_0_port_vlan_requirements: - type: list + port_oam_internal_0_port_0_order: + type: integer required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements compute_oam_availability_zone: type: list required: true @@ -6537,34 +6533,25 @@ node_types: status: SUPPORTED entry_schema: type: string - port_oam_oam_0_port_security_groups: + port_oam_internal_0_port_0_allowed_address_pairs: type: list required: true status: SUPPORTED - entry_schema: - type: json + entry_schema: + type: org.openecomp.datatypes.heat.network.AddressPair + port_oam_oam_0_port_1_network_role_tag: + type: string + required: true + status: SUPPORTED requirements: - - dependency_oam_oam_oam_0_port: - capability: tosca.capabilities.Node - node: tosca.nodes.Root - relationship: tosca.relationships.DependsOn - occurrences: - - 0 - - UNBOUNDED - - link_oam_oam_oam_0_port: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - - dependency_oam_oam_internal_0_port: + - dependency_oam_oam_internal_0_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_oam_oam_internal_0_port: + - link_oam_oam_internal_0_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -6584,31 +6571,30 @@ node_types: occurrences: - 0 - UNBOUNDED - capabilities: - cpu_oam: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + - dependency_oam_oam_oam_0_port_1: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn occurrences: - - 1 + - 0 - UNBOUNDED - attachment_oam_oam_oam_0_port: - type: tosca.capabilities.Attachment + - link_oam_oam_oam_0_port_1: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo occurrences: - 1 - - UNBOUNDED - network.incoming.packets_oam_oam_oam_0_port: + - 1 + capabilities: + cpu_oam: 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_oam_oam_oam_0_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 + feature_oam_oam_internal_0_port_0: + type: tosca.capabilities.Node occurrences: - - 0 + - 1 - UNBOUNDED disk.usage_oam: type: org.openecomp.capabilities.metric.Ceilometer @@ -6628,39 +6614,32 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_oam_oam_internal_0_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 disk.read.bytes_oam: 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_oam_oam_oam_0_port: - type: org.openecomp.capabilities.Forwarder + network.incoming.bytes_oam_oam_oam_0_port_1: + 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_oam_oam_internal_0_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + scalable_oam: + type: tosca.capabilities.Scalable occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_oam_oam_internal_0_port: + network.outgoing.bytes_oam_oam_internal_0_port_0: 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_oam: - type: tosca.capabilities.Scalable + network.incoming.bytes_oam_oam_internal_0_port_0: + 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 @@ -6681,6 +6660,11 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_oam_oam_oam_0_port_1: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED binding_oam: type: tosca.capabilities.network.Bindable occurrences: @@ -6692,7 +6676,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_oam_oam_internal_0_port: + network.outgoing.bytes.rate_oam_oam_internal_0_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -6710,47 +6694,47 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.allocation_oam: + network.incoming.packets_oam_oam_oam_0_port_1: 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_oam_oam_internal_0_port: + disk.device.allocation_oam: 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_oam_oam_oam_0_port: - type: tosca.capabilities.Node + forwarder_oam_oam_oam_0_port_1: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_oam_oam_oam_0_port: + disk.ephemeral.size_oam: 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.ephemeral.size_oam: + disk.write.requests_oam: 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 - attachment_oam_oam_internal_0_port: + attachment_oam_oam_oam_0_port_1: type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - disk.write.requests_oam: + disk.capacity_oam: 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_oam: + network.incoming.bytes.rate_oam_oam_oam_0_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -6762,20 +6746,36 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_oam_oam_internal_0_port_0: + 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 disk.root.size_oam: 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_oam_oam_internal_0_port: + binding_oam_oam_oam_0_port_1: + 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 + network.outgoing.packets.rate_oam_oam_internal_0_port_0: 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_oam_oam_internal_0_port: - type: tosca.capabilities.Node + attachment_oam_oam_internal_0_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED @@ -6797,55 +6797,54 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_oam_oam_internal_0_port: + disk.device.read.requests.rate_oam: 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_oam_oam_oam_0_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_oam_oam_internal_0_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - disk.device.read.requests.rate_oam: + disk.write.requests.rate_oam: 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_oam: + disk.device.latency_oam: 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_oam: + disk.device.iops_oam: 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_oam_oam_internal_0_port: + vcpus_oam: 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.iops_oam: + disk.device.write.requests.rate_oam: 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_oam: + network.incoming.packets.rate_oam_oam_internal_0_port_0: 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_oam: + network.incoming.packets.rate_oam_oam_oam_0_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -6864,6 +6863,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_oam_oam_internal_0_port_0: + 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_oam: type: tosca.capabilities.Endpoint.Admin occurrences: @@ -6875,95 +6880,90 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_oam_oam_oam_0_port: + disk.iops_oam: 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.iops_oam: + disk.read.bytes.rate_oam: 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_oam: + network.outgoing.bytes.rate_oam_oam_oam_0_port_1: 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.packets.rate_oam_oam_internal_0_port: + network.outpoing.packets_oam_oam_oam_0_port_1: 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_oam_oam_oam_0_port: + cpu_util_oam: 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_oam_oam_internal_0_port: - type: org.openecomp.capabilities.Forwarder + os_oam: + type: tosca.capabilities.OperatingSystem occurrences: - 1 - UNBOUNDED - network.incoming.bytes_oam_oam_oam_0_port: + memory.usage_oam: 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_oam: + disk.latency_oam: 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_oam: - type: tosca.capabilities.OperatingSystem - occurrences: - - 1 - - UNBOUNDED - memory.usage_oam: + network.outgoing.packets.rate_oam_oam_oam_0_port_1: 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_oam: + network.incoming.packets_oam_oam_internal_0_port_0: 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_oam_oam_oam_0_port: + disk.write.bytes_oam: 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_oam: + network.outgoing.bytes_oam_oam_oam_0_port_1: 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_oam: + network.incoming.bytes.rate_oam_oam_internal_0_port_0: 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_oam: + disk.read.requests_oam: 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_oam_oam_oam_0_port: + disk.device.capacity_oam: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -7623,12 +7623,10 @@ node_types: org.openecomp.resource.abstract.nodes.cif: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_cif_ims_core_0_port_network: - type: list + port_cif_internal_0_port_0_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: string port_cif_oam_0_port_1_name: type: list required: true @@ -7641,44 +7639,56 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.heat.network.AddressPair - port_cif_oam_0_port_1_fixed_ips: + port_cif_internal_0_port_0_security_groups: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_cif_internal_0_port_related_networks: + type: json + port_cif_internal_0_port_0_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_cif_internal_0_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_cif_internal_0_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_cif_ims_li_0_port_network_role: - type: string + port_cif_oam_0_port_1_fixed_ips: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_cif_ims_li_0_port_4_related_networks: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true status: SUPPORTED - port_cif_internal_0_port_name: + port_cif_ims_core_0_port_2_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string + type: org.openecomp.datatypes.network.IpRequirements port_cif_oam_0_port_1_order: type: integer required: true status: SUPPORTED - port_cif_internal_0_port_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_cif_ims_core_0_port_network_role: - type: string + port_cif_oam_0_port_3_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED port_cif_oam_0_port_1_exCP_naming: @@ -7691,10 +7701,6 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_cif_oam_0_port_3_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED vm_image_name: type: string required: true @@ -7711,69 +7717,71 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_cif_ims_core_0_port_related_networks: + port_cif_ims_li_0_port_4_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments + type: org.openecomp.datatypes.network.VlanRequirements port_cif_oam_0_port_1_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_cif_ims_li_0_port_fixed_ips: + port_cif_ims_li_0_port_4_name: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps + type: string compute_cif_scheduler_hints: type: list required: true status: SUPPORTED entry_schema: type: json + port_cif_ims_li_0_port_4_subnetpoolid: + type: string + required: true + status: SUPPORTED port_cif_oam_0_port_1_security_groups: type: list required: true status: SUPPORTED entry_schema: type: json - port_cif_internal_0_port_network_role: - type: string + port_cif_internal_0_port_0_ip_requirements: + type: list required: true status: SUPPORTED - port_cif_ims_li_0_port_ip_requirements: + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_cif_ims_core_0_port_2_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: string compute_cif_metadata: type: list required: true status: SUPPORTED entry_schema: type: json - port_cif_oam_0_port_3_subnetpoolid: - type: string + port_cif_internal_0_port_0_order: + type: integer required: true status: SUPPORTED - port_cif_ims_li_0_port_name: - type: list + port_cif_oam_0_port_3_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: string - port_cif_ims_core_0_port_fixed_ips: - type: list + port_cif_internal_0_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_cif_ims_li_0_port_order: + port_cif_ims_li_0_port_4_order: type: integer required: true status: SUPPORTED @@ -7785,30 +7793,20 @@ node_types: type: string required: true status: SUPPORTED - port_cif_ims_core_0_port_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements port_cif_oam_0_port_1_network_role: type: string required: true status: SUPPORTED - port_cif_ims_core_0_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_cif_internal_0_port_subnetpoolid: + port_cif_ims_core_0_port_2_network_role_tag: type: string required: true status: SUPPORTED - port_cif_ims_core_0_port_security_groups: + port_cif_ims_core_0_port_2_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_cif_oam_0_port_3_related_networks: type: list required: true @@ -7819,40 +7817,18 @@ node_types: type: string required: true status: SUPPORTED - port_cif_ims_core_0_port_name: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string port_cif_oam_0_port_3_order: type: integer required: true status: SUPPORTED - port_cif_internal_0_port_network: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_cif_ims_core_0_port_order: - type: integer - required: true - status: SUPPORTED port_cif_oam_0_port_3_security_groups: type: list required: true status: SUPPORTED entry_schema: type: json - port_cif_ims_core_0_port_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_cif_ims_li_0_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_cif_internal_0_port_0_network_role_tag: + type: string required: true status: SUPPORTED port_cif_oam_0_port_1_network: @@ -7861,16 +7837,22 @@ node_types: status: SUPPORTED entry_schema: type: string - port_cif_ims_li_0_port_security_groups: + port_cif_ims_li_0_port_4_network_role: + type: string + required: true + status: SUPPORTED + port_cif_ims_li_0_port_4_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: json - port_cif_ims_li_0_port_subnetpoolid: - type: string + type: org.openecomp.datatypes.network.IpRequirements + port_cif_ims_core_0_port_2_name: + type: list required: true status: SUPPORTED + entry_schema: + type: string port_cif_oam_0_port_3_vlan_requirements: type: list required: true @@ -7883,10 +7865,6 @@ node_types: status: SUPPORTED entry_schema: type: string - port_cif_internal_0_port_order: - type: integer - required: true - status: SUPPORTED compute_cif_availability_zone: type: list required: true @@ -7897,74 +7875,68 @@ node_types: type: string required: true status: SUPPORTED - port_cif_oam_0_port_3_mac_requirements: + port_cif_ims_li_0_port_4_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_cif_ims_core_0_port_allowed_address_pairs: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.network.AddressPair - port_cif_oam_0_port_3_fixed_ips: + port_cif_ims_core_0_port_2_security_groups: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_cif_ims_core_0_port_network_role_tag: - type: string - required: true - status: SUPPORTED - port_cif_ims_li_0_port_exCP_naming: - type: org.openecomp.datatypes.Naming + type: json + port_cif_ims_core_0_port_2_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_cif_ims_li_0_port_allowed_address_pairs: - type: list + port_cif_oam_0_port_3_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.network.AddressPair - port_cif_ims_core_0_port_subnetpoolid: - type: string + port_cif_oam_0_port_3_fixed_ips: + type: list required: true status: SUPPORTED - port_cif_internal_0_port_network_role_tag: + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_cif_internal_0_port_0_network_role: type: string required: true status: SUPPORTED - port_cif_internal_0_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_cif_ims_li_0_port_network: + port_cif_ims_core_0_port_2_allowed_address_pairs: type: list required: true status: SUPPORTED entry_schema: - type: string - port_cif_ims_li_0_port_related_networks: + type: org.openecomp.datatypes.heat.network.AddressPair + port_cif_internal_0_port_0_name: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_cif_internal_0_port_security_groups: + type: string + port_cif_ims_li_0_port_4_allowed_address_pairs: type: list required: true status: SUPPORTED entry_schema: - type: json - port_cif_internal_0_port_exCP_naming: + type: org.openecomp.datatypes.heat.network.AddressPair + port_cif_ims_core_0_port_2_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_cif_ims_li_0_port_network_role_tag: - type: string + port_cif_ims_li_0_port_4_fixed_ips: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_cif_internal_0_port_0_allowed_address_pairs: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.heat.network.AddressPair index_value: type: integer description: Index value of this substitution service template runtime instance @@ -7979,57 +7951,85 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.heat.network.AddressPair - port_cif_internal_0_port_fixed_ips: + port_cif_internal_0_port_0_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps + type: string + port_cif_ims_core_0_port_2_subnetpoolid: + type: string + required: true + status: SUPPORTED + port_cif_ims_li_0_port_4_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_cif_ims_core_0_port_2_network_role: + type: string + required: true + status: SUPPORTED compute_cif_config_drive: type: list required: true status: SUPPORTED entry_schema: type: boolean - port_cif_oam_0_port_3_name: + port_cif_ims_li_0_port_4_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_cif_ims_li_0_port_vlan_requirements: + port_cif_ims_core_0_port_2_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements + port_cif_ims_core_0_port_2_order: + type: integer + required: true + status: SUPPORTED + port_cif_oam_0_port_3_name: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string port_cif_oam_0_port_3_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_cif_ims_core_0_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_cif_ims_core_0_port_2_fixed_ips: + type: list required: true status: SUPPORTED - port_cif_internal_0_port_allowed_address_pairs: + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_cif_internal_0_port_0_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.network.AddressPair + type: org.openecomp.datatypes.heat.neutron.port.FixedIps port_cif_oam_0_port_1_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_cif_oam_0_port_3_ip_requirements: + port_cif_ims_li_0_port_4_network_role_tag: + type: string + required: true + status: SUPPORTED + port_cif_ims_li_0_port_4_security_groups: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_cif_internal_0_port_ip_requirements: + type: json + port_cif_oam_0_port_3_ip_requirements: type: list required: true status: SUPPORTED @@ -8050,66 +8050,66 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_cif_cif_internal_0_port: + - dependency_cif_cif_ims_li_0_port_4: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_cif_cif_internal_0_port: + - link_cif_cif_ims_li_0_port_4: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_cif_cif_ims_li_0_port: + - dependency_cif_cif_oam_0_port_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_cif_cif_ims_li_0_port: + - link_cif_cif_oam_0_port_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_cif_cif_ims_core_0_port: + - dependency_cif_cif_internal_0_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_cif_cif_ims_core_0_port: + - link_cif_cif_internal_0_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_cif_cif_oam_0_port_1: + - dependency_cif_cif_oam_0_port_3: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_cif_cif_oam_0_port_1: + - link_cif_cif_oam_0_port_3: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_cif_cif_oam_0_port_3: + - dependency_cif_cif_ims_core_0_port_2: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_cif_cif_oam_0_port_3: + - link_cif_cif_ims_core_0_port_2: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -8121,12 +8121,23 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_cif_cif_ims_li_0_port_4: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.device.read.requests_cif: 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_cif_cif_ims_li_0_port_4: + 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_cif: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -8144,18 +8155,13 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_cif_cif_internal_0_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - network.incoming.bytes.rate_cif_cif_oam_0_port_3: + network.outgoing.bytes_cif_cif_internal_0_port_0: 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_cif_cif_ims_core_0_port: + network.incoming.bytes.rate_cif_cif_oam_0_port_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -8167,32 +8173,25 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_cif_cif_internal_0_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_cif_cif_internal_0_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_cif_cif_ims_li_0_port: + instance_cif: 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 - instance_cif: + network.outgoing.bytes.rate_cif_cif_ims_core_0_port_2: 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_cif_cif_ims_core_0_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - network.incoming.bytes_cif_cif_ims_li_0_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_cif_cif_internal_0_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -8214,37 +8213,24 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_cif_cif_ims_li_0_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.incoming.bytes.rate_cif_cif_ims_li_0_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.root.size_cif: 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_cif: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_cif_cif_internal_0_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - network.incoming.packets_cif_cif_ims_li_0_port: + memory.resident_cif: 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_cif_cif_ims_core_0_port: + network.outgoing.bytes_cif_cif_ims_li_0_port_4: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -8256,13 +8242,13 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.ephemeral.size_cif: + network.incoming.packets.rate_cif_cif_ims_li_0_port_4: 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_cif_cif_ims_li_0_port: + disk.ephemeral.size_cif: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -8286,30 +8272,36 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_cif_cif_internal_0_port: + disk.device.allocation_cif: 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 - attachment_cif_cif_ims_li_0_port: - type: tosca.capabilities.Attachment + disk.device.read.bytes.rate_cif: + 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.packets.rate_cif_cif_ims_li_0_port: + vcpus_cif: 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_cif: + network.incoming.bytes_cif_cif_internal_0_port_0: 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_cif_cif_internal_0_port: + endpoint_cif: + type: tosca.capabilities.Endpoint.Admin + occurrences: + - 1 + - UNBOUNDED + binding_cif_cif_ims_core_0_port_2: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface @@ -8317,73 +8309,55 @@ node_types: occurrences: - 0 - UNBOUNDED - network.outgoing.packets.rate_cif_cif_ims_core_0_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.device.read.bytes.rate_cif: + disk.device.usage_cif: 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_cif: + network.outgoing.packets.rate_cif_cif_oam_0_port_1: 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_cif_cif_internal_0_port: + network.incoming.bytes_cif_cif_oam_0_port_1: 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_cif: - type: tosca.capabilities.Endpoint.Admin - occurrences: - - 1 - - UNBOUNDED - disk.device.usage_cif: + network.outpoing.packets_cif_cif_ims_li_0_port_4: 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_cif_cif_ims_li_0_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - network.outgoing.packets.rate_cif_cif_oam_0_port_1: + network.incoming.bytes_cif_cif_oam_0_port_3: 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_cif_cif_oam_0_port_1: + network.incoming.packets.rate_cif_cif_ims_core_0_port_2: 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_cif_cif_oam_0_port_3: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_cif_cif_ims_core_0_port_2: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - network.outpoing.packets_cif_cif_ims_core_0_port: + disk.read.requests_cif: 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_cif: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_cif_cif_ims_core_0_port_2: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED @@ -8393,7 +8367,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_cif_cif_ims_core_0_port: + network.outpoing.packets_cif_cif_ims_core_0_port_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -8410,12 +8384,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_cif_cif_ims_core_0_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_cif_cif_oam_0_port_1: type: tosca.capabilities.Node occurrences: @@ -8439,14 +8407,15 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.read.bytes_cif: + network.outgoing.bytes_cif_cif_ims_core_0_port_2: 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_cif_cif_internal_0_port: - type: org.openecomp.capabilities.Forwarder + disk.device.read.bytes_cif: + 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 @@ -8455,16 +8424,46 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes.rate_cif_cif_ims_li_0_port_4: + 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_cif_cif_oam_0_port_3: type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED + network.incoming.bytes.rate_cif_cif_ims_core_0_port_2: + 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.packets.rate_cif_cif_ims_core_0_port_2: + 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_cif_cif_internal_0_port_0: + 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_cif: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED + network.incoming.packets_cif_cif_ims_li_0_port_4: + 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_cif_cif_oam_0_port_1: type: tosca.capabilities.network.Bindable valid_source_types: @@ -8473,12 +8472,6 @@ node_types: occurrences: - 0 - UNBOUNDED - network.incoming.bytes.rate_cif_cif_internal_0_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 binding_cif_cif_oam_0_port_3: type: tosca.capabilities.network.Bindable valid_source_types: @@ -8499,53 +8492,51 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_cif_cif_internal_0_port: + network.incoming.bytes_cif_cif_ims_li_0_port_4: 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_cif_cif_internal_0_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED network.incoming.packets_cif_cif_oam_0_port_1: 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 + attachment_cif_cif_ims_li_0_port_4: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED network.incoming.packets_cif_cif_oam_0_port_3: 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_cif_cif_ims_li_0_port: - type: tosca.capabilities.Node + network.outgoing.bytes_cif_cif_oam_0_port_3: + 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_cif_cif_oam_0_port_3: + network.outgoing.bytes_cif_cif_oam_0_port_1: 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_cif_cif_oam_0_port_1: + network.outgoing.packets.rate_cif_cif_ims_li_0_port_4: 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_cif_cif_ims_core_0_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 + feature_cif_cif_ims_core_0_port_2: + type: tosca.capabilities.Node occurrences: - - 0 + - 1 - UNBOUNDED disk.allocation_cif: type: org.openecomp.capabilities.metric.Ceilometer @@ -8559,13 +8550,13 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.write.requests_cif: + network.incoming.bytes_cif_cif_ims_core_0_port_2: 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_cif_cif_internal_0_port: + disk.device.write.requests_cif: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -8601,56 +8592,57 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_cif_cif_ims_li_0_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 disk.device.write.bytes.rate_cif: 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.iops_cif: + network.outgoing.bytes.rate_cif_cif_internal_0_port_0: 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_cif: + disk.iops_cif: 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_cif_cif_ims_core_0_port: + disk.read.bytes.rate_cif: 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_cif: + network.outpoing.packets_cif_cif_internal_0_port_0: 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_cif: + binding_cif_cif_ims_li_0_port_4: + 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 + network.incoming.packets.rate_cif_cif_internal_0_port_0: 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 - attachment_cif_cif_ims_core_0_port: - type: tosca.capabilities.Attachment + disk.write.requests_cif: + 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_cif_cif_ims_core_0_port: + memory_cif: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -8668,14 +8660,16 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_cif_cif_ims_li_0_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_cif_cif_internal_0_port_0: + 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: - - 1 + - 0 - UNBOUNDED - feature_cif_cif_ims_core_0_port: - type: tosca.capabilities.Node + forwarder_cif_cif_ims_li_0_port_4: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED @@ -8695,7 +8689,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_cif_cif_internal_0_port: + network.incoming.bytes.rate_cif_cif_internal_0_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -8707,7 +8701,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_cif_cif_internal_0_port: + network.outgoing.packets.rate_cif_cif_internal_0_port_0: + 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_cif_cif_ims_core_0_port_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -9227,4 +9227,4 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - - UNBOUNDED \ No newline at end of file + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/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 992afcd3c6..cd6075a9f2 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 @@ -1849,31 +1849,31 @@ topology_template: node: oam_oam_vip_1_port relationship: org.openecomp.relationships.AttachesTo - port: - capability: attachment_oam_oam_internal_0_port + capability: attachment_oam_oam_internal_0_port_0 node: abstract_oam relationship: org.openecomp.relationships.AttachesTo - port: - capability: attachment_oam_oam_oam_0_port + capability: attachment_oam_oam_oam_0_port_1 node: abstract_oam relationship: org.openecomp.relationships.AttachesTo - port: - capability: attachment_oam_oam_internal_1_port + capability: attachment_oam_oam_internal_1_port_0 node: abstract_oam_1 relationship: org.openecomp.relationships.AttachesTo - port: - capability: attachment_oam_oam_oam_1_port + capability: attachment_oam_oam_oam_1_port_1 node: abstract_oam_1 relationship: org.openecomp.relationships.AttachesTo - port: - capability: attachment_oam_oam_internal_2_port + capability: attachment_oam_oam_internal_2_port_0 node: abstract_oam_2 relationship: org.openecomp.relationships.AttachesTo - port: - capability: attachment_oam_oam_oam_2_port + capability: attachment_oam_oam_oam_2_port_1 node: abstract_oam_2 relationship: org.openecomp.relationships.AttachesTo - port: - capability: attachment_cif_cif_internal_0_port + capability: attachment_cif_cif_internal_0_port_0 node: abstract_cif relationship: org.openecomp.relationships.AttachesTo - port: @@ -1881,7 +1881,7 @@ topology_template: node: abstract_cif relationship: org.openecomp.relationships.AttachesTo - port: - capability: attachment_cif_cif_ims_core_0_port + capability: attachment_cif_cif_ims_core_0_port_2 node: abstract_cif relationship: org.openecomp.relationships.AttachesTo - port: @@ -1889,11 +1889,11 @@ topology_template: node: abstract_cif relationship: org.openecomp.relationships.AttachesTo - port: - capability: attachment_cif_cif_ims_li_0_port + capability: attachment_cif_cif_ims_li_0_port_4 node: abstract_cif relationship: org.openecomp.relationships.AttachesTo - port: - capability: attachment_cif_cif_internal_1_port + capability: attachment_cif_cif_internal_1_port_0 node: abstract_cif_1 relationship: org.openecomp.relationships.AttachesTo - port: @@ -1901,7 +1901,7 @@ topology_template: node: abstract_cif_1 relationship: org.openecomp.relationships.AttachesTo - port: - capability: attachment_cif_cif_ims_core_1_port + capability: attachment_cif_cif_ims_core_1_port_2 node: abstract_cif_1 relationship: org.openecomp.relationships.AttachesTo - port: @@ -1909,47 +1909,47 @@ topology_template: node: abstract_cif_1 relationship: org.openecomp.relationships.AttachesTo - port: - capability: attachment_cif_cif_ims_li_1_port + capability: attachment_cif_cif_ims_li_1_port_4 node: abstract_cif_1 relationship: org.openecomp.relationships.AttachesTo - port: - capability: attachment_lbd_lbd_internal_0_port + capability: attachment_lbd_lbd_internal_0_port_0 node: abstract_lbd_1 relationship: org.openecomp.relationships.AttachesTo - port: - capability: attachment_lbd_lbd_dpdk_0_port + capability: attachment_lbd_lbd_dpdk_0_port_1 node: abstract_lbd_1 relationship: org.openecomp.relationships.AttachesTo - port: - capability: attachment_lbd_lbd_ims_core_0_port + capability: attachment_lbd_lbd_ims_core_0_port_2 node: abstract_lbd_1 relationship: org.openecomp.relationships.AttachesTo - port: - capability: attachment_lbd_lbd_internal_1_port + capability: attachment_lbd_lbd_internal_1_port_0 node: abstract_lbd relationship: org.openecomp.relationships.AttachesTo - port: - capability: attachment_lbd_lbd_dpdk_1_port + capability: attachment_lbd_lbd_dpdk_1_port_1 node: abstract_lbd relationship: org.openecomp.relationships.AttachesTo - port: - capability: attachment_lbd_lbd_ims_core_1_port + capability: attachment_lbd_lbd_ims_core_1_port_2 node: abstract_lbd relationship: org.openecomp.relationships.AttachesTo - port: - capability: attachment_cdi_cdi_internal_0_port + capability: attachment_cdi_cdi_internal_0_port_0 node: abstract_cdi relationship: org.openecomp.relationships.AttachesTo - port: - capability: attachment_cdi_cdi_ims_core_0_port + capability: attachment_cdi_cdi_ims_core_0_port_1 node: abstract_cdi relationship: org.openecomp.relationships.AttachesTo - port: - capability: attachment_cdi_cdi_internal_1_port + capability: attachment_cdi_cdi_internal_1_port_0 node: abstract_cdi_1 relationship: org.openecomp.relationships.AttachesTo - port: - capability: attachment_cdi_cdi_ims_core_1_port + capability: attachment_cdi_cdi_ims_core_1_port_1 node: abstract_cdi_1 relationship: org.openecomp.relationships.AttachesTo - port: @@ -2071,66 +2071,59 @@ topology_template: directives: - substitutable properties: - port_cdi_ims_core_1_port_security_groups: + port_cdi_ims_core_1_port_1_fixed_ips: + - ip_address: + get_input: cdi_ims_core_v6_ip_1 + port_cdi_internal_1_port_0_security_groups: - - cscf_RSG vm_flavor_name: get_input: cdi_flavor_name - port_cdi_internal_1_port_security_groups: + port_cdi_ims_core_1_port_1_security_groups: - - cscf_RSG - port_cdi_ims_core_1_port_mac_requirements: - mac_count_required: + port_cdi_ims_core_1_port_1_network_role_tag: ims_core + port_cdi_ims_core_1_port_1_ip_requirements: + - ip_version: 6 + ip_count_required: + is_required: true + floating_ip_count_required: is_required: false vm_image_name: get_input: cdi_image_name compute_cdi_scheduler_hints: - group: cdi_server_group_group - port_cdi_ims_core_1_port_fixed_ips: - - ip_address: - get_input: cdi_ims_core_v6_ip_1 compute_cdi_name: - get_input: cdi_name_1 - port_cdi_ims_core_1_port_network_role_tag: ims_core - port_cdi_ims_core_1_port_name: - - str_replace: - template: $PREFIX$DELeth1 - params: - $PREFIX: - get_input: cdi_name_1 - $DEL: - get_input: vcscf_name_delimeter compute_cdi_user_data_format: - RAW - port_cdi_ims_core_1_port_network: + port_cdi_ims_core_1_port_1_network: - get_input: ims_core_net_id + port_cdi_internal_1_port_0_fixed_ips: + - ip_address: + get_input: cdi_internal_ip_1 + - ip_address: + get_input: cdi_internal_v6_ip_1 compute_cdi_availability_zone: - get_input: availability_zone_1 - port_cdi_internal_1_port_network: - - cscf_internal_network_0 - port_cdi_ims_core_1_port_ip_requirements: + compute_cdi_config_drive: + - true + port_cdi_ims_core_1_port_1_allowed_address_pairs: + - ip_address: + get_input: cdi_ims_core_v6_vip_0 + port_cdi_internal_1_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false - ip_version: 6 ip_count_required: is_required: true floating_ip_count_required: is_required: false - port_cdi_internal_1_port_allowed_address_pairs: - - ip_address: 0.0.0.0/1 - - ip_address: 128.0.0.0/1 - - ip_address: ::/1 - - ip_address: 8000::/1 - compute_cdi_config_drive: - - true - port_cdi_internal_1_port_mac_requirements: + port_cdi_internal_1_port_0_mac_requirements: mac_count_required: is_required: false - port_cdi_ims_core_1_port_allowed_address_pairs: - - ip_address: - get_input: cdi_ims_core_v6_vip_0 - port_cdi_internal_1_port_fixed_ips: - - ip_address: - get_input: cdi_internal_ip_1 - - ip_address: - get_input: cdi_internal_v6_ip_1 - port_cdi_internal_1_port_name: + port_cdi_internal_1_port_0_name: - str_replace: template: $PREFIX$DELeth0 params: @@ -2138,17 +2131,22 @@ topology_template: get_input: cdi_name_1 $DEL: get_input: vcscf_name_delimeter - port_cdi_internal_1_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false - - ip_version: 6 - ip_count_required: - is_required: true - floating_ip_count_required: + port_cdi_ims_core_1_port_1_mac_requirements: + mac_count_required: is_required: false + port_cdi_ims_core_1_port_1_name: + - str_replace: + template: $PREFIX$DELeth1 + params: + $PREFIX: + get_input: cdi_name_1 + $DEL: + get_input: vcscf_name_delimeter + port_cdi_internal_1_port_0_allowed_address_pairs: + - ip_address: 0.0.0.0/1 + - ip_address: 128.0.0.0/1 + - ip_address: ::/1 + - ip_address: 8000::/1 compute_cdi_metadata: - vf_module_id: get_input: vf_module_id @@ -2159,6 +2157,8 @@ topology_template: get_input: vnf_name vf_module_name: get_input: vf_module_name + port_cdi_internal_1_port_0_network: + - cscf_internal_network_0 service_template_filter: substitute_service_template: Nested_cdi_1ServiceTemplate.yaml count: 1 @@ -2168,11 +2168,11 @@ topology_template: - service_template_filter - index_value requirements: - - link_cdi_cdi_internal_1_port: + - link_cdi_cdi_internal_1_port_0: capability: tosca.capabilities.network.Linkable node: cscf_internal_network_0 relationship: tosca.relationships.network.LinksTo - - dependency_cdi_cdi_internal_1_port: + - dependency_cdi_cdi_internal_1_port_0: capability: tosca.capabilities.Node node: cscf_internal_network_0 relationship: tosca.relationships.DependsOn @@ -2483,38 +2483,40 @@ topology_template: directives: - substitutable properties: - port_lbd_ims_core_1_port_allowed_address_pairs: - - ip_address: - get_input: lbd_ims_core_v6_vip_0 + port_lbd_ims_core_1_port_2_security_groups: + - - cscf_RSG compute_lbd_user_data_format: - RAW - port_lbd_internal_1_port_name: - - str_replace: - template: $PREFIX$DELeth0 - params: - $PREFIX: - get_input: lbd_name_1 - $DEL: - get_input: vcscf_name_delimeter - port_lbd_dpdk_1_port_allowed_address_pairs: - - ip_address: 0.0.0.0/1 - - ip_address: 128.0.0.0/1 - - ip_address: ::/1 - - ip_address: 8000::/1 - vm_flavor_name: - get_input: lbd_flavor_name - port_lbd_ims_core_1_port_mac_requirements: + port_lbd_ims_core_1_port_2_mac_requirements: mac_count_required: is_required: false + vm_flavor_name: + get_input: lbd_flavor_name compute_lbd_availability_zone: - get_input: availability_zone_1 vm_image_name: get_input: lbd_image_name - port_lbd_dpdk_1_port_network: - - cscf_internal_dpdk_network_0 - port_lbd_ims_core_1_port_name: + port_lbd_internal_1_port_0_mac_requirements: + mac_count_required: + is_required: false + port_lbd_dpdk_1_port_1_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + port_lbd_internal_1_port_0_network: + - cscf_internal_network_0 + port_lbd_ims_core_1_port_2_network_role_tag: ims_core + port_lbd_ims_core_1_port_2_ip_requirements: + - ip_version: 6 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + port_lbd_dpdk_1_port_1_name: - str_replace: - template: $PREFIX$DELeth2 + template: $PREFIX$DELeth1 params: $PREFIX: get_input: lbd_name_1 @@ -2522,62 +2524,44 @@ topology_template: get_input: vcscf_name_delimeter compute_lbd_scheduler_hints: - group: lbd_server_group_group - port_lbd_dpdk_1_port_name: + compute_lbd_name: + - get_input: lbd_name_1 + port_lbd_dpdk_1_port_1_network: + - cscf_internal_dpdk_network_0 + compute_lbd_config_drive: + - true + port_lbd_ims_core_1_port_2_name: - str_replace: - template: $PREFIX$DELeth1 + template: $PREFIX$DELeth2 params: $PREFIX: get_input: lbd_name_1 $DEL: get_input: vcscf_name_delimeter - port_lbd_internal_1_port_network: - - cscf_internal_network_0 - port_lbd_internal_1_port_mac_requirements: - mac_count_required: - is_required: false - compute_lbd_name: - - get_input: lbd_name_1 - port_lbd_ims_core_1_port_network_role_tag: ims_core - compute_lbd_config_drive: - - true - port_lbd_ims_core_1_port_ip_requirements: - - ip_version: 6 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false - port_lbd_dpdk_1_port_mac_requirements: + port_lbd_internal_1_port_0_fixed_ips: + - ip_address: + get_input: lbd_internal_ip_1 + port_lbd_ims_core_1_port_2_allowed_address_pairs: + - ip_address: + get_input: lbd_ims_core_v6_vip_0 + port_lbd_dpdk_1_port_1_mac_requirements: mac_count_required: is_required: false - port_lbd_internal_1_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false - port_lbd_internal_1_port_security_groups: - - - cscf_RSG - port_lbd_ims_core_1_port_security_groups: - - - cscf_RSG - port_lbd_ims_core_1_port_fixed_ips: + port_lbd_dpdk_1_port_1_fixed_ips: - ip_address: - get_input: lbd_ims_core_v6_ip_1 - port_lbd_internal_1_port_fixed_ips: + get_input: lbd_internal_dpdk_ip_1 + port_lbd_ims_core_1_port_2_fixed_ips: - ip_address: - get_input: lbd_internal_ip_1 - port_lbd_ims_core_1_port_network: - - get_input: ims_core_net_id - port_lbd_dpdk_1_port_security_groups: + get_input: lbd_ims_core_v6_ip_1 + port_lbd_dpdk_1_port_1_security_groups: + - - cscf_RSG + port_lbd_dpdk_1_port_1_allowed_address_pairs: + - ip_address: 0.0.0.0/1 + - ip_address: 128.0.0.0/1 + - ip_address: ::/1 + - ip_address: 8000::/1 + port_lbd_internal_1_port_0_security_groups: - - cscf_RSG - port_lbd_dpdk_1_port_fixed_ips: - - ip_address: - get_input: lbd_internal_dpdk_ip_1 - port_lbd_dpdk_1_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false compute_lbd_metadata: - vf_module_id: get_input: vf_module_id @@ -2588,6 +2572,22 @@ topology_template: get_input: vnf_name vf_module_name: get_input: vf_module_name + port_lbd_internal_1_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + port_lbd_internal_1_port_0_name: + - str_replace: + template: $PREFIX$DELeth0 + params: + $PREFIX: + get_input: lbd_name_1 + $DEL: + get_input: vcscf_name_delimeter + port_lbd_ims_core_1_port_2_network: + - get_input: ims_core_net_id service_template_filter: substitute_service_template: Nested_lbdServiceTemplate.yaml count: 1 @@ -2597,19 +2597,19 @@ topology_template: - service_template_filter - index_value requirements: - - link_lbd_lbd_internal_1_port: + - link_lbd_lbd_internal_1_port_0: capability: tosca.capabilities.network.Linkable node: cscf_internal_network_0 relationship: tosca.relationships.network.LinksTo - - dependency_lbd_lbd_internal_1_port: + - dependency_lbd_lbd_internal_1_port_0: capability: tosca.capabilities.Node node: cscf_internal_network_0 relationship: tosca.relationships.DependsOn - - link_lbd_lbd_dpdk_1_port: + - link_lbd_lbd_dpdk_1_port_1: capability: tosca.capabilities.network.Linkable node: cscf_internal_dpdk_network_0 relationship: tosca.relationships.network.LinksTo - - dependency_lbd_lbd_dpdk_1_port: + - dependency_lbd_lbd_dpdk_1_port_1: capability: tosca.capabilities.Node node: cscf_internal_dpdk_network_0 relationship: tosca.relationships.DependsOn @@ -2757,7 +2757,7 @@ topology_template: directives: - substitutable properties: - port_cdi_internal_0_port_ip_requirements: + port_cdi_internal_0_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: true @@ -2770,35 +2770,50 @@ topology_template: is_required: false vm_flavor_name: get_input: cdi_flavor_name - port_cdi_ims_core_0_port_name: - - str_replace: - template: $PREFIX$DELeth1 - params: - $PREFIX: - get_input: cdi_name_0 - $DEL: - get_input: vcscf_name_delimeter - port_cdi_internal_0_port_allowed_address_pairs: - - ip_address: 0.0.0.0/1 - - ip_address: 128.0.0.0/1 - - ip_address: ::/1 - - ip_address: 8000::/1 + port_cdi_ims_core_0_port_1_security_groups: + - - cscf_RSG + port_cdi_ims_core_0_port_1_network: + - get_input: ims_core_net_id vm_image_name: get_input: cdi_image_name compute_cdi_scheduler_hints: - group: cdi_server_group_group compute_cdi_name: - get_input: cdi_name_0 - port_cdi_ims_core_0_port_ip_requirements: + compute_cdi_user_data_format: + - RAW + port_cdi_internal_0_port_0_mac_requirements: + mac_count_required: + is_required: false + compute_cdi_availability_zone: + - get_input: availability_zone_0 + port_cdi_ims_core_0_port_1_network_role_tag: ims_core + compute_cdi_config_drive: + - true + port_cdi_internal_0_port_0_allowed_address_pairs: + - ip_address: 0.0.0.0/1 + - ip_address: 128.0.0.0/1 + - ip_address: ::/1 + - ip_address: 8000::/1 + port_cdi_internal_0_port_0_security_groups: + - - cscf_RSG + port_cdi_internal_0_port_0_network: + - cscf_internal_network_0 + port_cdi_ims_core_0_port_1_ip_requirements: - ip_version: 6 ip_count_required: is_required: true floating_ip_count_required: is_required: false - port_cdi_ims_core_0_port_network_role_tag: ims_core - compute_cdi_user_data_format: - - RAW - port_cdi_internal_0_port_name: + port_cdi_internal_0_port_0_fixed_ips: + - ip_address: + get_input: cdi_internal_ip_0 + - ip_address: + get_input: cdi_internal_v6_ip_0 + port_cdi_ims_core_0_port_1_fixed_ips: + - ip_address: + get_input: cdi_ims_core_v6_ip_0 + port_cdi_internal_0_port_0_name: - str_replace: template: $PREFIX$DELeth0 params: @@ -2806,32 +2821,14 @@ topology_template: get_input: cdi_name_0 $DEL: get_input: vcscf_name_delimeter - compute_cdi_availability_zone: - - get_input: availability_zone_0 - port_cdi_ims_core_0_port_network: - - get_input: ims_core_net_id - port_cdi_internal_0_port_network: - - cscf_internal_network_0 - port_cdi_internal_0_port_fixed_ips: - - ip_address: - get_input: cdi_internal_ip_0 - - ip_address: - get_input: cdi_internal_v6_ip_0 - compute_cdi_config_drive: - - true - port_cdi_internal_0_port_security_groups: - - - cscf_RSG - port_cdi_ims_core_0_port_security_groups: - - - cscf_RSG - port_cdi_ims_core_0_port_fixed_ips: - - ip_address: - get_input: cdi_ims_core_v6_ip_0 - port_cdi_internal_0_port_mac_requirements: - mac_count_required: - is_required: false - port_cdi_ims_core_0_port_allowed_address_pairs: - - ip_address: - get_input: cdi_ims_core_v6_vip_0 + port_cdi_ims_core_0_port_1_name: + - str_replace: + template: $PREFIX$DELeth1 + params: + $PREFIX: + get_input: cdi_name_0 + $DEL: + get_input: vcscf_name_delimeter compute_cdi_metadata: - vf_module_id: get_input: vf_module_id @@ -2842,7 +2839,10 @@ topology_template: get_input: vnf_name vf_module_name: get_input: vf_module_name - port_cdi_ims_core_0_port_mac_requirements: + port_cdi_ims_core_0_port_1_allowed_address_pairs: + - ip_address: + get_input: cdi_ims_core_v6_vip_0 + port_cdi_ims_core_0_port_1_mac_requirements: mac_count_required: is_required: false service_template_filter: @@ -2854,11 +2854,11 @@ topology_template: - service_template_filter - index_value requirements: - - link_cdi_cdi_internal_0_port: + - link_cdi_cdi_internal_0_port_0: capability: tosca.capabilities.network.Linkable node: cscf_internal_network_0 relationship: tosca.relationships.network.LinksTo - - dependency_cdi_cdi_internal_0_port: + - dependency_cdi_cdi_internal_0_port_0: capability: tosca.capabilities.Node node: cscf_internal_network_0 relationship: tosca.relationships.DependsOn @@ -2895,67 +2895,66 @@ topology_template: directives: - substitutable properties: - port_oam_internal_1_port_security_groups: - - - cscf_RSG - port_oam_oam_1_port_allowed_address_pairs: - - ip_address: - get_input: oam_oam_vip_0 vm_flavor_name: get_input: oam_flavor_name - port_oam_oam_1_port_ip_requirements: + port_oam_internal_1_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false - port_oam_oam_1_port_network_role_tag: oam - port_oam_oam_1_port_security_groups: - - - cscf_RSG + port_oam_oam_1_port_1_network_role_tag: oam + port_oam_internal_1_port_0_name: + - str_replace: + template: $PREFIX$DELeth0 + params: + $PREFIX: + get_input: oam_name_1 + $DEL: + get_input: vcscf_name_delimeter vm_image_name: get_input: oam_image_name compute_oam_config_drive: - true - port_oam_internal_1_port_network: - - cscf_internal_network_0 - port_oam_oam_1_port_fixed_ips: + port_oam_internal_1_port_0_mac_requirements: + mac_count_required: + is_required: false + port_oam_oam_1_port_1_allowed_address_pairs: - ip_address: - get_input: oam_oam_ip_1 - port_oam_internal_1_port_ip_requirements: + get_input: oam_oam_vip_0 + port_oam_oam_1_port_1_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false - port_oam_oam_1_port_network: - - get_input: oam_net_id - port_oam_internal_1_port_allowed_address_pairs: + compute_oam_user_data_format: + - RAW + port_oam_oam_1_port_1_mac_requirements: + mac_count_required: + is_required: false + port_oam_internal_1_port_0_allowed_address_pairs: - ip_address: 0.0.0.0/1 - ip_address: 128.0.0.0/1 - ip_address: ::/1 - ip_address: 8000::/1 - compute_oam_user_data_format: - - RAW - port_oam_internal_1_port_name: + port_oam_oam_1_port_1_network: + - get_input: oam_net_id + port_oam_oam_1_port_1_name: - str_replace: - template: $PREFIX$DELeth0 + template: $PREFIX$DELeth1 params: $PREFIX: get_input: oam_name_1 $DEL: get_input: vcscf_name_delimeter - port_oam_internal_1_port_fixed_ips: + port_oam_internal_1_port_0_fixed_ips: - ip_address: get_input: oam_internal_ip_1 - port_oam_oam_1_port_name: - - str_replace: - template: $PREFIX$DELeth1 - params: - $PREFIX: - get_input: oam_name_1 - $DEL: - get_input: vcscf_name_delimeter compute_oam_scheduler_hints: - group: oam_server_group_group + port_oam_internal_1_port_0_security_groups: + - - cscf_RSG compute_oam_availability_zone: - get_input: availability_zone_1 compute_oam_metadata: @@ -2968,14 +2967,15 @@ topology_template: get_input: vnf_name vf_module_name: get_input: vf_module_name - port_oam_internal_1_port_mac_requirements: - mac_count_required: - is_required: false + port_oam_oam_1_port_1_security_groups: + - - cscf_RSG compute_oam_name: - get_input: oam_name_1 - port_oam_oam_1_port_mac_requirements: - mac_count_required: - is_required: false + port_oam_internal_1_port_0_network: + - cscf_internal_network_0 + port_oam_oam_1_port_1_fixed_ips: + - ip_address: + get_input: oam_oam_ip_1 service_template_filter: substitute_service_template: Nested_oam_1ServiceTemplate.yaml count: 1 @@ -2985,11 +2985,11 @@ topology_template: - service_template_filter - index_value requirements: - - link_oam_oam_internal_1_port: + - link_oam_oam_internal_1_port_0: capability: tosca.capabilities.network.Linkable node: cscf_internal_network_0 relationship: tosca.relationships.network.LinksTo - - dependency_oam_oam_internal_1_port: + - dependency_oam_oam_internal_1_port_0: capability: tosca.capabilities.Node node: cscf_internal_network_0 relationship: tosca.relationships.DependsOn @@ -2998,18 +2998,9 @@ topology_template: directives: - substitutable properties: - port_oam_oam_2_port_network_role_tag: oam - port_oam_oam_2_port_security_groups: - - - cscf_RSG - port_oam_oam_2_port_name: - - str_replace: - template: $PREFIX$DELeth1 - params: - $PREFIX: - get_input: oam_name_2 - $DEL: - get_input: vcscf_name_delimeter - port_oam_internal_2_port_name: + vm_flavor_name: + get_input: oam_flavor_name + port_oam_internal_2_port_0_name: - str_replace: template: $PREFIX$DELeth0 params: @@ -3017,51 +3008,63 @@ topology_template: get_input: oam_name_2 $DEL: get_input: vcscf_name_delimeter - vm_flavor_name: - get_input: oam_flavor_name - port_oam_internal_2_port_mac_requirements: + port_oam_internal_2_port_0_mac_requirements: mac_count_required: is_required: false + port_oam_oam_2_port_1_allowed_address_pairs: + - ip_address: + get_input: oam_oam_vip_0 vm_image_name: get_input: oam_image_name compute_oam_config_drive: - true - port_oam_internal_2_port_allowed_address_pairs: + port_oam_internal_2_port_0_allowed_address_pairs: - ip_address: 0.0.0.0/1 - ip_address: 128.0.0.0/1 - ip_address: ::/1 - ip_address: 8000::/1 - port_oam_internal_2_port_network: - - cscf_internal_network_0 - port_oam_internal_2_port_fixed_ips: - - ip_address: - get_input: oam_internal_ip_2 - port_oam_oam_2_port_fixed_ips: + port_oam_oam_2_port_1_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + port_oam_oam_2_port_1_security_groups: + - - cscf_RSG + port_oam_oam_2_port_1_network_role_tag: oam + port_oam_internal_2_port_0_security_groups: + - - cscf_RSG + port_oam_oam_2_port_1_fixed_ips: - ip_address: get_input: oam_oam_ip_2 - port_oam_oam_2_port_mac_requirements: - mac_count_required: - is_required: false - port_oam_oam_2_port_network: - - get_input: oam_net_id compute_oam_user_data_format: - RAW - port_oam_internal_2_port_security_groups: - - - cscf_RSG - port_oam_oam_2_port_ip_requirements: + port_oam_internal_2_port_0_fixed_ips: + - ip_address: + get_input: oam_internal_ip_2 + port_oam_internal_2_port_0_network: + - cscf_internal_network_0 + port_oam_internal_2_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false + port_oam_oam_2_port_1_name: + - str_replace: + template: $PREFIX$DELeth1 + params: + $PREFIX: + get_input: oam_name_2 + $DEL: + get_input: vcscf_name_delimeter compute_oam_scheduler_hints: - group: oam_server_group_group - port_oam_internal_2_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: + port_oam_oam_2_port_1_mac_requirements: + mac_count_required: is_required: false + port_oam_oam_2_port_1_network: + - get_input: oam_net_id compute_oam_availability_zone: - get_input: availability_zone_0 compute_oam_metadata: @@ -3074,9 +3077,6 @@ topology_template: get_input: vnf_name vf_module_name: get_input: vf_module_name - port_oam_oam_2_port_allowed_address_pairs: - - ip_address: - get_input: oam_oam_vip_0 compute_oam_name: - get_input: oam_name_2 service_template_filter: @@ -3088,11 +3088,11 @@ topology_template: - service_template_filter - index_value requirements: - - link_oam_oam_internal_2_port: + - link_oam_oam_internal_2_port_0: capability: tosca.capabilities.network.Linkable node: cscf_internal_network_0 relationship: tosca.relationships.network.LinksTo - - dependency_oam_oam_internal_2_port: + - dependency_oam_oam_internal_2_port_0: capability: tosca.capabilities.Node node: cscf_internal_network_0 relationship: tosca.relationships.DependsOn @@ -3171,35 +3171,36 @@ topology_template: directives: - substitutable properties: - port_oam_oam_0_port_name: - - str_replace: - template: $PREFIX$DELeth1 - params: - $PREFIX: - get_input: oam_name_0 - $DEL: - get_input: vcscf_name_delimeter - port_oam_oam_0_port_fixed_ips: - - ip_address: - get_input: oam_oam_ip_0 - vm_flavor_name: - get_input: oam_flavor_name - port_oam_oam_0_port_mac_requirements: - mac_count_required: - is_required: false - port_oam_internal_0_port_ip_requirements: + port_oam_oam_0_port_1_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false - port_oam_internal_0_port_network: + port_oam_internal_0_port_0_fixed_ips: + - ip_address: + get_input: oam_internal_ip_0 + vm_flavor_name: + get_input: oam_flavor_name + port_oam_internal_0_port_0_mac_requirements: + mac_count_required: + is_required: false + port_oam_oam_0_port_1_fixed_ips: + - ip_address: + get_input: oam_oam_ip_0 + port_oam_internal_0_port_0_network: - cscf_internal_network_0 vm_image_name: get_input: oam_image_name compute_oam_config_drive: - true - port_oam_internal_0_port_name: + port_oam_oam_0_port_1_allowed_address_pairs: + - ip_address: + get_input: oam_oam_vip_0 + port_oam_oam_0_port_1_mac_requirements: + mac_count_required: + is_required: false + port_oam_internal_0_port_0_name: - str_replace: template: $PREFIX$DELeth0 params: @@ -3207,35 +3208,30 @@ topology_template: get_input: oam_name_0 $DEL: get_input: vcscf_name_delimeter - port_oam_oam_0_port_allowed_address_pairs: - - ip_address: - get_input: oam_oam_vip_0 - port_oam_internal_0_port_security_groups: + port_oam_oam_0_port_1_network: + - get_input: oam_net_id + port_oam_internal_0_port_0_security_groups: + - - cscf_RSG + port_oam_oam_0_port_1_security_groups: - - cscf_RSG - port_oam_internal_0_port_fixed_ips: - - ip_address: - get_input: oam_internal_ip_0 - port_oam_oam_0_port_network_role_tag: oam compute_oam_user_data_format: - RAW - port_oam_oam_0_port_network: - - get_input: oam_net_id - port_oam_oam_0_port_ip_requirements: + port_oam_oam_0_port_1_name: + - str_replace: + template: $PREFIX$DELeth1 + params: + $PREFIX: + get_input: oam_name_0 + $DEL: + get_input: vcscf_name_delimeter + port_oam_internal_0_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false - port_oam_internal_0_port_mac_requirements: - mac_count_required: - is_required: false compute_oam_scheduler_hints: - group: oam_server_group_group - port_oam_internal_0_port_allowed_address_pairs: - - ip_address: 0.0.0.0/1 - - ip_address: 128.0.0.0/1 - - ip_address: ::/1 - - ip_address: 8000::/1 compute_oam_availability_zone: - get_input: availability_zone_0 compute_oam_metadata: @@ -3250,8 +3246,12 @@ topology_template: get_input: vf_module_name compute_oam_name: - get_input: oam_name_0 - port_oam_oam_0_port_security_groups: - - - cscf_RSG + port_oam_internal_0_port_0_allowed_address_pairs: + - ip_address: 0.0.0.0/1 + - ip_address: 128.0.0.0/1 + - ip_address: ::/1 + - ip_address: 8000::/1 + port_oam_oam_0_port_1_network_role_tag: oam service_template_filter: substitute_service_template: Nested_oamServiceTemplate.yaml count: 1 @@ -3261,11 +3261,11 @@ topology_template: - service_template_filter - index_value requirements: - - link_oam_oam_internal_0_port: + - link_oam_oam_internal_0_port_0: capability: tosca.capabilities.network.Linkable node: cscf_internal_network_0 relationship: tosca.relationships.network.LinksTo - - dependency_oam_oam_internal_0_port: + - dependency_oam_oam_internal_0_port_0: capability: tosca.capabilities.Node node: cscf_internal_network_0 relationship: tosca.relationships.DependsOn @@ -3276,93 +3276,91 @@ topology_template: properties: compute_lbd_user_data_format: - RAW + port_lbd_ims_core_0_port_2_ip_requirements: + - ip_version: 6 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false vm_flavor_name: get_input: lbd_flavor_name + port_lbd_dpdk_0_port_1_network: + - cscf_internal_dpdk_network_0 compute_lbd_availability_zone: - get_input: availability_zone_0 - port_lbd_dpdk_0_port_allowed_address_pairs: - - ip_address: 0.0.0.0/1 - - ip_address: 128.0.0.0/1 - - ip_address: ::/1 - - ip_address: 8000::/1 vm_image_name: get_input: lbd_image_name - port_lbd_dpdk_0_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false - port_lbd_ims_core_0_port_network: - - get_input: ims_core_net_id - port_lbd_ims_core_0_port_mac_requirements: - mac_count_required: - is_required: false - port_lbd_ims_core_0_port_allowed_address_pairs: - - ip_address: - get_input: lbd_ims_core_v6_vip_0 - port_lbd_internal_0_port_name: + port_lbd_internal_0_port_0_security_groups: + - - cscf_RSG + port_lbd_dpdk_0_port_1_name: - str_replace: - template: $PREFIX$DELeth0 + template: $PREFIX$DELeth1 params: $PREFIX: get_input: lbd_name_0 $DEL: get_input: vcscf_name_delimeter - port_lbd_ims_core_0_port_network_role_tag: ims_core - compute_lbd_scheduler_hints: - - group: lbd_server_group_group - port_lbd_internal_0_port_mac_requirements: + port_lbd_dpdk_0_port_1_mac_requirements: mac_count_required: is_required: false - port_lbd_ims_core_0_port_ip_requirements: - - ip_version: 6 + compute_lbd_scheduler_hints: + - group: lbd_server_group_group + port_lbd_ims_core_0_port_2_security_groups: + - - cscf_RSG + port_lbd_dpdk_0_port_1_fixed_ips: + - ip_address: + get_input: lbd_internal_dpdk_ip_0 + port_lbd_internal_0_port_0_fixed_ips: + - ip_address: + get_input: lbd_internal_ip_0 + port_lbd_ims_core_0_port_2_fixed_ips: + - ip_address: + get_input: lbd_ims_core_v6_ip_0 + compute_lbd_name: + - get_input: lbd_name_0 + port_lbd_dpdk_0_port_1_ip_requirements: + - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false - port_lbd_internal_0_port_network: - - cscf_internal_network_0 - port_lbd_dpdk_0_port_mac_requirements: - mac_count_required: - is_required: false - compute_lbd_name: - - get_input: lbd_name_0 - port_lbd_ims_core_0_port_security_groups: - - - cscf_RSG - port_lbd_ims_core_0_port_name: - - str_replace: - template: $PREFIX$DELeth2 - params: - $PREFIX: - get_input: lbd_name_0 - $DEL: - get_input: vcscf_name_delimeter compute_lbd_config_drive: - true - port_lbd_dpdk_0_port_fixed_ips: - - ip_address: - get_input: lbd_internal_dpdk_ip_0 - port_lbd_internal_0_port_security_groups: - - - cscf_RSG - port_lbd_dpdk_0_port_security_groups: + port_lbd_dpdk_0_port_1_security_groups: - - cscf_RSG - port_lbd_dpdk_0_port_name: + port_lbd_ims_core_0_port_2_network_role_tag: ims_core + port_lbd_dpdk_0_port_1_allowed_address_pairs: + - ip_address: 0.0.0.0/1 + - ip_address: 128.0.0.0/1 + - ip_address: ::/1 + - ip_address: 8000::/1 + port_lbd_ims_core_0_port_2_name: - str_replace: - template: $PREFIX$DELeth1 + template: $PREFIX$DELeth2 params: $PREFIX: get_input: lbd_name_0 $DEL: get_input: vcscf_name_delimeter - port_lbd_dpdk_0_port_network: - - cscf_internal_dpdk_network_0 - port_lbd_ims_core_0_port_fixed_ips: - - ip_address: - get_input: lbd_ims_core_v6_ip_0 - port_lbd_internal_0_port_fixed_ips: + port_lbd_internal_0_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + port_lbd_ims_core_0_port_2_allowed_address_pairs: - ip_address: - get_input: lbd_internal_ip_0 + get_input: lbd_ims_core_v6_vip_0 + port_lbd_ims_core_0_port_2_network: + - get_input: ims_core_net_id + port_lbd_internal_0_port_0_network: + - cscf_internal_network_0 + port_lbd_internal_0_port_0_mac_requirements: + mac_count_required: + is_required: false + port_lbd_ims_core_0_port_2_mac_requirements: + mac_count_required: + is_required: false compute_lbd_metadata: - vf_module_id: get_input: vf_module_id @@ -3373,12 +3371,14 @@ topology_template: get_input: vnf_name vf_module_name: get_input: vf_module_name - port_lbd_internal_0_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false + port_lbd_internal_0_port_0_name: + - str_replace: + template: $PREFIX$DELeth0 + params: + $PREFIX: + get_input: lbd_name_0 + $DEL: + get_input: vcscf_name_delimeter service_template_filter: substitute_service_template: Nested_lbd_1ServiceTemplate.yaml count: 1 @@ -3388,19 +3388,19 @@ topology_template: - service_template_filter - index_value requirements: - - link_lbd_lbd_internal_0_port: + - link_lbd_lbd_internal_0_port_0: capability: tosca.capabilities.network.Linkable node: cscf_internal_network_0 relationship: tosca.relationships.network.LinksTo - - dependency_lbd_lbd_internal_0_port: + - dependency_lbd_lbd_internal_0_port_0: capability: tosca.capabilities.Node node: cscf_internal_network_0 relationship: tosca.relationships.DependsOn - - link_lbd_lbd_dpdk_0_port: + - link_lbd_lbd_dpdk_0_port_1: capability: tosca.capabilities.network.Linkable node: cscf_internal_dpdk_network_0 relationship: tosca.relationships.network.LinksTo - - dependency_lbd_lbd_dpdk_0_port: + - dependency_lbd_lbd_dpdk_0_port_1: capability: tosca.capabilities.Node node: cscf_internal_dpdk_network_0 relationship: tosca.relationships.DependsOn @@ -3579,8 +3579,6 @@ topology_template: directives: - substitutable properties: - port_cif_ims_core_0_port_network: - - get_input: ims_core_net_id port_cif_oam_0_port_1_name: - str_replace: template: $PREFIX$DELeth1 @@ -3592,19 +3590,19 @@ topology_template: port_cif_oam_0_port_1_allowed_address_pairs: - ip_address: get_input: cif_oam_vip_0 + port_cif_internal_0_port_0_security_groups: + - - cscf_RSG port_cif_oam_0_port_1_fixed_ips: - ip_address: get_input: cif_oam_ip_0 vm_flavor_name: get_input: cif_flavor_name - port_cif_internal_0_port_name: - - str_replace: - template: $PREFIX$DELeth0 - params: - $PREFIX: - get_input: cif_name_0 - $DEL: - get_input: vcscf_name_delimeter + port_cif_ims_core_0_port_2_ip_requirements: + - ip_version: 6 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false vm_image_name: get_input: cif_image_name compute_cif_user_data_format: @@ -3615,19 +3613,31 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - port_cif_ims_li_0_port_fixed_ips: - - ip_address: - get_input: cif_ims_li_v6_ip_0 + port_cif_ims_li_0_port_4_name: + - str_replace: + template: $PREFIX$DELeth4 + params: + $PREFIX: + get_input: cif_name_0 + $DEL: + get_input: vcscf_name_delimeter compute_cif_scheduler_hints: - group: cif_server_group_group port_cif_oam_0_port_1_security_groups: - - cscf_RSG - port_cif_ims_li_0_port_ip_requirements: + port_cif_internal_0_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false - ip_version: 6 ip_count_required: is_required: true floating_ip_count_required: is_required: false + port_cif_ims_core_0_port_2_network: + - get_input: ims_core_net_id compute_cif_metadata: - vf_module_id: get_input: vf_module_id @@ -3638,21 +3648,22 @@ topology_template: get_input: vnf_name vf_module_name: get_input: vf_module_name - port_cif_ims_li_0_port_name: - - str_replace: - template: $PREFIX$DELeth4 - params: - $PREFIX: - get_input: cif_name_0 - $DEL: - get_input: vcscf_name_delimeter - port_cif_ims_core_0_port_fixed_ips: - - ip_address: - get_input: cif_ims_core_v6_ip_0 + port_cif_internal_0_port_0_mac_requirements: + mac_count_required: + is_required: false port_cif_oam_0_port_3_network_role_tag: oam - port_cif_ims_core_0_port_security_groups: + port_cif_ims_core_0_port_2_network_role_tag: ims_core + port_cif_oam_0_port_3_security_groups: - - cscf_RSG - port_cif_ims_core_0_port_name: + port_cif_oam_0_port_1_network: + - get_input: oam_net_id + port_cif_ims_li_0_port_4_ip_requirements: + - ip_version: 6 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + port_cif_ims_core_0_port_2_name: - str_replace: template: $PREFIX$DELeth2 params: @@ -3660,59 +3671,54 @@ topology_template: get_input: cif_name_0 $DEL: get_input: vcscf_name_delimeter - port_cif_internal_0_port_network: - - cscf_internal_network_0 - port_cif_oam_0_port_3_security_groups: - - - cscf_RSG - port_cif_ims_core_0_port_ip_requirements: - - ip_version: 6 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false - port_cif_ims_li_0_port_mac_requirements: - mac_count_required: - is_required: false - port_cif_oam_0_port_1_network: - - get_input: oam_net_id - port_cif_ims_li_0_port_security_groups: - - - cscf_RSG compute_cif_name: - get_input: cif_name_0 compute_cif_availability_zone: - get_input: availability_zone_0 port_cif_oam_0_port_1_network_role_tag: oam + port_cif_ims_li_0_port_4_mac_requirements: + mac_count_required: + is_required: false + port_cif_ims_core_0_port_2_security_groups: + - - cscf_RSG + port_cif_ims_core_0_port_2_mac_requirements: + mac_count_required: + is_required: false port_cif_oam_0_port_3_mac_requirements: mac_count_required: is_required: false - port_cif_ims_core_0_port_allowed_address_pairs: - - ip_address: - get_input: cif_ims_core_v6_vip_0 port_cif_oam_0_port_3_fixed_ips: - ip_address: get_input: cif_oam_ip_2 - port_cif_ims_core_0_port_network_role_tag: ims_core - port_cif_ims_li_0_port_allowed_address_pairs: + port_cif_ims_core_0_port_2_allowed_address_pairs: + - ip_address: + get_input: cif_ims_core_v6_vip_0 + port_cif_internal_0_port_0_name: + - str_replace: + template: $PREFIX$DELeth0 + params: + $PREFIX: + get_input: cif_name_0 + $DEL: + get_input: vcscf_name_delimeter + port_cif_ims_li_0_port_4_allowed_address_pairs: - ip_address: get_input: cif_ims_li_v6_vip_0 - port_cif_internal_0_port_mac_requirements: - mac_count_required: - is_required: false - port_cif_ims_li_0_port_network: - - get_input: ims_li_v6_net_id - port_cif_internal_0_port_security_groups: - - - cscf_RSG - port_cif_ims_li_0_port_network_role_tag: ims_li_v6 - port_cif_oam_0_port_3_allowed_address_pairs: + port_cif_ims_li_0_port_4_fixed_ips: - ip_address: - get_input: cif_oam_vip_1 - port_cif_internal_0_port_fixed_ips: + get_input: cif_ims_li_v6_ip_0 + port_cif_internal_0_port_0_allowed_address_pairs: - ip_address: - get_input: cif_internal_ip_0 + get_input: cif_internal_vip_0 + port_cif_oam_0_port_3_allowed_address_pairs: - ip_address: - get_input: cif_internal_v6_ip_0 + get_input: cif_oam_vip_1 + port_cif_internal_0_port_0_network: + - cscf_internal_network_0 compute_cif_config_drive: - true + port_cif_ims_li_0_port_4_network: + - get_input: ims_li_v6_net_id port_cif_oam_0_port_3_name: - str_replace: template: $PREFIX$DELeth3 @@ -3723,32 +3729,26 @@ topology_template: get_input: vcscf_name_delimeter port_cif_oam_0_port_3_network: - get_input: oam_net_id - port_cif_ims_core_0_port_mac_requirements: - mac_count_required: - is_required: false - port_cif_internal_0_port_allowed_address_pairs: + port_cif_ims_core_0_port_2_fixed_ips: - ip_address: - get_input: cif_internal_vip_0 + get_input: cif_ims_core_v6_ip_0 + port_cif_internal_0_port_0_fixed_ips: + - ip_address: + get_input: cif_internal_ip_0 + - ip_address: + get_input: cif_internal_v6_ip_0 port_cif_oam_0_port_1_mac_requirements: mac_count_required: is_required: false + port_cif_ims_li_0_port_4_network_role_tag: ims_li_v6 + port_cif_ims_li_0_port_4_security_groups: + - - cscf_RSG port_cif_oam_0_port_3_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false - port_cif_internal_0_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false - - ip_version: 6 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false service_template_filter: substitute_service_template: Nested_cifServiceTemplate.yaml count: 1 @@ -3758,11 +3758,11 @@ topology_template: - service_template_filter - index_value requirements: - - link_cif_cif_internal_0_port: + - link_cif_cif_internal_0_port_0: capability: tosca.capabilities.network.Linkable node: cscf_internal_network_0 relationship: tosca.relationships.network.LinksTo - - dependency_cif_cif_internal_0_port: + - dependency_cif_cif_internal_0_port_0: capability: tosca.capabilities.Node node: cscf_internal_network_0 relationship: tosca.relationships.DependsOn @@ -3779,8 +3779,15 @@ topology_template: get_input: cif_name_1 $DEL: get_input: vcscf_name_delimeter - port_cif_ims_core_1_port_security_groups: - - - cscf_RSG + port_cif_ims_core_1_port_2_mac_requirements: + mac_count_required: + is_required: false + port_cif_ims_li_1_port_4_mac_requirements: + mac_count_required: + is_required: false + port_cif_ims_core_1_port_2_fixed_ips: + - ip_address: + get_input: cif_ims_core_v6_ip_1 port_cif_oam_1_port_1_mac_requirements: mac_count_required: is_required: false @@ -3795,6 +3802,9 @@ topology_template: port_cif_oam_1_port_3_allowed_address_pairs: - ip_address: get_input: cif_oam_vip_1 + port_cif_internal_1_port_0_allowed_address_pairs: + - ip_address: + get_input: cif_internal_vip_0 compute_cif_scheduler_hints: - group: cif_server_group_group port_cif_oam_1_port_3_ip_requirements: @@ -3803,19 +3813,22 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - port_cif_internal_1_port_security_groups: - - - cscf_RSG + port_cif_ims_li_1_port_4_name: + - str_replace: + template: $PREFIX$DELeth4 + params: + $PREFIX: + get_input: cif_name_1 + $DEL: + get_input: vcscf_name_delimeter port_cif_oam_1_port_1_network: - get_input: oam_net_id - port_cif_ims_core_1_port_network_role_tag: ims_core - port_cif_ims_li_1_port_security_groups: - - - cscf_RSG - port_cif_ims_li_1_port_allowed_address_pairs: + port_cif_ims_li_1_port_4_network_role_tag: ims_li_v6 + port_cif_internal_1_port_0_fixed_ips: - ip_address: - get_input: cif_ims_li_v6_vip_0 - port_cif_internal_1_port_allowed_address_pairs: + get_input: cif_internal_ip_1 - ip_address: - get_input: cif_internal_vip_0 + get_input: cif_internal_v6_ip_1 port_cif_oam_1_port_3_security_groups: - - cscf_RSG compute_cif_metadata: @@ -3828,49 +3841,47 @@ topology_template: get_input: vnf_name vf_module_name: get_input: vf_module_name + port_cif_ims_core_1_port_2_allowed_address_pairs: + - ip_address: + get_input: cif_ims_core_v6_vip_0 + port_cif_ims_core_1_port_2_ip_requirements: + - ip_version: 6 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + port_cif_ims_core_1_port_2_security_groups: + - - cscf_RSG port_cif_oam_1_port_1_fixed_ips: - ip_address: get_input: cif_oam_ip_1 - port_cif_internal_1_port_network: - - cscf_internal_network_0 - port_cif_ims_core_1_port_network: - - get_input: ims_core_net_id port_cif_oam_1_port_3_fixed_ips: - ip_address: get_input: cif_oam_ip_3 + port_cif_ims_li_1_port_4_allowed_address_pairs: + - ip_address: + get_input: cif_ims_li_v6_vip_0 + port_cif_ims_core_1_port_2_name: + - str_replace: + template: $PREFIX$DELeth2 + params: + $PREFIX: + get_input: cif_name_1 + $DEL: + get_input: vcscf_name_delimeter port_cif_oam_1_port_1_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false - port_cif_ims_core_1_port_mac_requirements: - mac_count_required: - is_required: false compute_cif_name: - get_input: cif_name_1 compute_cif_availability_zone: - get_input: availability_zone_1 - port_cif_internal_1_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false - - ip_version: 6 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false - port_cif_ims_li_1_port_name: - - str_replace: - template: $PREFIX$DELeth4 - params: - $PREFIX: - get_input: cif_name_1 - $DEL: - get_input: vcscf_name_delimeter - port_cif_internal_1_port_name: + port_cif_ims_core_1_port_2_network: + - get_input: ims_core_net_id + port_cif_internal_1_port_0_name: - str_replace: template: $PREFIX$DELeth0 params: @@ -3878,54 +3889,41 @@ topology_template: get_input: cif_name_1 $DEL: get_input: vcscf_name_delimeter - port_cif_ims_li_1_port_fixed_ips: - - ip_address: - get_input: cif_ims_li_v6_ip_1 - port_cif_internal_1_port_mac_requirements: - mac_count_required: - is_required: false - port_cif_ims_li_1_port_mac_requirements: - mac_count_required: + port_cif_ims_li_1_port_4_security_groups: + - - cscf_RSG + port_cif_ims_li_1_port_4_network: + - get_input: ims_li_v6_net_id + port_cif_internal_1_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: is_required: false - port_cif_ims_li_1_port_ip_requirements: - ip_version: 6 ip_count_required: is_required: true floating_ip_count_required: is_required: false - port_cif_ims_core_1_port_fixed_ips: - - ip_address: - get_input: cif_ims_core_v6_ip_1 - port_cif_ims_core_1_port_allowed_address_pairs: - - ip_address: - get_input: cif_ims_core_v6_vip_0 port_cif_oam_1_port_1_network_role_tag: oam port_cif_oam_1_port_3_mac_requirements: mac_count_required: is_required: false - port_cif_ims_core_1_port_ip_requirements: + port_cif_ims_core_1_port_2_network_role_tag: ims_core + port_cif_internal_1_port_0_security_groups: + - - cscf_RSG + compute_cif_config_drive: + - true + port_cif_ims_li_1_port_4_ip_requirements: - ip_version: 6 ip_count_required: is_required: true floating_ip_count_required: is_required: false - port_cif_ims_li_1_port_network: - - get_input: ims_li_v6_net_id - port_cif_internal_1_port_fixed_ips: - - ip_address: - get_input: cif_internal_ip_1 + port_cif_ims_li_1_port_4_fixed_ips: - ip_address: - get_input: cif_internal_v6_ip_1 - port_cif_ims_core_1_port_name: - - str_replace: - template: $PREFIX$DELeth2 - params: - $PREFIX: - get_input: cif_name_1 - $DEL: - get_input: vcscf_name_delimeter - compute_cif_config_drive: - - true + get_input: cif_ims_li_v6_ip_1 + port_cif_internal_1_port_0_network: + - cscf_internal_network_0 port_cif_oam_1_port_3_name: - str_replace: template: $PREFIX$DELeth3 @@ -3934,12 +3932,14 @@ topology_template: get_input: cif_name_0 $DEL: get_input: vcscf_name_delimeter - port_cif_ims_li_1_port_network_role_tag: ims_li_v6 port_cif_oam_1_port_1_security_groups: - - cscf_RSG port_cif_oam_1_port_1_allowed_address_pairs: - ip_address: get_input: cif_oam_vip_0 + port_cif_internal_1_port_0_mac_requirements: + mac_count_required: + is_required: false port_cif_oam_1_port_3_network_role_tag: oam service_template_filter: substitute_service_template: Nested_cif_1ServiceTemplate.yaml @@ -3950,11 +3950,11 @@ topology_template: - service_template_filter - index_value requirements: - - link_cif_cif_internal_1_port: + - link_cif_cif_internal_1_port_0: capability: tosca.capabilities.network.Linkable node: cscf_internal_network_0 relationship: tosca.relationships.network.LinksTo - - dependency_cif_cif_internal_1_port: + - dependency_cif_cif_internal_1_port_0: capability: tosca.capabilities.Node node: cscf_internal_network_0 relationship: tosca.relationships.DependsOn diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cdiServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cdiServiceTemplate.yaml index e41c99a6c8..76b51beb75 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cdiServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cdiServiceTemplate.yaml @@ -11,57 +11,46 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_cdi_internal_0_port_network_role: + port_cdi_internal_0_port_0_subnetpoolid: type: string required: true - port_cdi_ims_core_0_port_vlan_requirements: + port_cdi_ims_core_0_port_1_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_cdi_internal_0_port_ip_requirements: + port_cdi_internal_0_port_0_ip_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_cdi_ims_core_0_port_related_networks: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true - port_cdi_internal_0_port_vlan_requirements: + port_cdi_ims_core_0_port_1_security_groups: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_cdi_ims_core_0_port_name: - type: list + type: json + port_cdi_ims_core_0_port_1_order: + type: integer required: true - entry_schema: - type: string - port_cdi_internal_0_port_exCP_naming: + port_cdi_ims_core_0_port_1_exCP_naming: type: org.openecomp.datatypes.Naming required: true - port_cdi_ims_core_0_port_network_role: - type: string - required: true - port_cdi_internal_0_port_allowed_address_pairs: + port_cdi_ims_core_0_port_1_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.network.AddressPair - port_cdi_internal_0_port_network_role_tag: - type: string - required: true - port_cdi_internal_0_port_subnetpoolid: - type: string - required: true + type: string vm_image_name: type: string required: true + port_cdi_internal_0_port_0_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements compute_cdi_scheduler_hints: type: list required: true @@ -72,52 +61,48 @@ topology_template: required: true entry_schema: type: string - port_cdi_ims_core_0_port_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_cdi_ims_core_0_port_network_role_tag: - type: string - required: true compute_cdi_user_data_format: type: list required: true entry_schema: type: string - port_cdi_internal_0_port_name: - type: list - required: true - entry_schema: - type: string - port_cdi_ims_core_0_port_order: - type: integer + port_cdi_internal_0_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true compute_cdi_availability_zone: type: list required: true entry_schema: type: string - port_cdi_ims_core_0_port_network: + port_cdi_ims_core_0_port_1_network_role_tag: + type: string + required: true + port_cdi_internal_0_port_0_network_role_tag: + type: string + required: true + port_cdi_internal_0_port_0_related_networks: type: list required: true entry_schema: - type: string - port_cdi_internal_0_port_network: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + compute_cdi_config_drive: type: list required: true entry_schema: - type: string - port_cdi_internal_0_port_fixed_ips: + type: boolean + port_cdi_internal_0_port_0_allowed_address_pairs: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - compute_cdi_config_drive: + type: org.openecomp.datatypes.heat.network.AddressPair + port_cdi_internal_0_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_cdi_internal_0_port_0_security_groups: type: list required: true entry_schema: - type: boolean + type: json index_value: type: integer description: Index value of this substitution service template runtime instance @@ -125,97 +110,67 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_cdi_internal_0_port_security_groups: + port_cdi_ims_core_0_port_1_subnetpoolid: + type: string + required: true + port_cdi_ims_core_0_port_1_related_networks: type: list required: true entry_schema: - type: json - port_cdi_ims_core_0_port_security_groups: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_cdi_internal_0_port_0_network: type: list required: true entry_schema: - type: json - port_cdi_ims_core_0_port_fixed_ips: + type: string + port_cdi_ims_core_0_port_1_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_cdi_internal_0_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_cdi_ims_core_0_port_subnetpoolid: - type: string + type: org.openecomp.datatypes.network.IpRequirements + port_cdi_internal_0_port_0_fixed_ips: + type: list required: true - port_cdi_internal_0_port_order: - type: integer + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_cdi_ims_core_0_port_1_fixed_ips: + type: list required: true - port_cdi_internal_0_port_related_networks: + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_cdi_internal_0_port_0_name: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_cdi_ims_core_0_port_allowed_address_pairs: + type: string + port_cdi_ims_core_0_port_1_name: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.network.AddressPair + type: string + port_cdi_internal_0_port_0_network_role: + type: string + required: true compute_cdi_metadata: type: list required: true entry_schema: type: json - port_cdi_ims_core_0_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_cdi_internal_0_port_0_order: + type: integer required: true - port_cdi_ims_core_0_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_cdi_ims_core_0_port_1_allowed_address_pairs: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.heat.network.AddressPair + port_cdi_ims_core_0_port_1_network_role: + type: string + required: true + port_cdi_ims_core_0_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true node_templates: - cdi_cdi_ims_core_0_port: - type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port - properties: - mac_requirements: - get_input: port_cdi_ims_core_0_port_mac_requirements - allowed_address_pairs: - get_input: port_cdi_ims_core_0_port_allowed_address_pairs - order: - get_input: port_cdi_ims_core_0_port_order - security_groups: - get_input: - - port_cdi_ims_core_0_port_security_groups - - index_value - exCP_naming: - get_input: port_cdi_ims_core_0_port_exCP_naming - vlan_requirements: - get_input: port_cdi_ims_core_0_port_vlan_requirements - subinterface_indicator: false - related_networks: - get_input: port_cdi_ims_core_0_port_related_networks - ip_requirements: - get_input: port_cdi_ims_core_0_port_ip_requirements - network_role_tag: - get_input: port_cdi_ims_core_0_port_network_role_tag - network_role: - get_input: port_cdi_ims_core_0_port_network_role - subnetpoolid: - get_input: port_cdi_ims_core_0_port_subnetpoolid - fixed_ips: - get_input: - - port_cdi_ims_core_0_port_fixed_ips - - index_value - name: - get_input: - - port_cdi_ims_core_0_port_name - - index_value - network: - get_input: - - port_cdi_ims_core_0_port_network - - index_value - requirements: - - binding: - capability: tosca.capabilities.network.Bindable - node: cdi - relationship: tosca.relationships.network.BindsTo cdi: type: org.openecomp.resource.vfc.compute.nodes.heat.cdi properties: @@ -247,45 +202,90 @@ topology_template: get_input: - compute_cdi_user_data_format - index_value - cdi_cdi_internal_0_port: + cdi_cdi_ims_core_0_port_1: + type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port + properties: + mac_requirements: + get_input: port_cdi_ims_core_0_port_1_mac_requirements + allowed_address_pairs: + get_input: port_cdi_ims_core_0_port_1_allowed_address_pairs + order: + get_input: port_cdi_ims_core_0_port_1_order + security_groups: + get_input: + - port_cdi_ims_core_0_port_1_security_groups + - index_value + exCP_naming: + get_input: port_cdi_ims_core_0_port_1_exCP_naming + vlan_requirements: + get_input: port_cdi_ims_core_0_port_1_vlan_requirements + subinterface_indicator: false + related_networks: + get_input: port_cdi_ims_core_0_port_1_related_networks + ip_requirements: + get_input: port_cdi_ims_core_0_port_1_ip_requirements + network_role_tag: + get_input: port_cdi_ims_core_0_port_1_network_role_tag + network_role: + get_input: port_cdi_ims_core_0_port_1_network_role + subnetpoolid: + get_input: port_cdi_ims_core_0_port_1_subnetpoolid + fixed_ips: + get_input: + - port_cdi_ims_core_0_port_1_fixed_ips + - index_value + name: + get_input: + - port_cdi_ims_core_0_port_1_name + - index_value + network: + get_input: + - port_cdi_ims_core_0_port_1_network + - index_value + requirements: + - binding: + capability: tosca.capabilities.network.Bindable + node: cdi + relationship: tosca.relationships.network.BindsTo + cdi_cdi_internal_0_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_requirements: - get_input: port_cdi_internal_0_port_mac_requirements + get_input: port_cdi_internal_0_port_0_mac_requirements allowed_address_pairs: - get_input: port_cdi_internal_0_port_allowed_address_pairs + get_input: port_cdi_internal_0_port_0_allowed_address_pairs order: - get_input: port_cdi_internal_0_port_order + get_input: port_cdi_internal_0_port_0_order security_groups: get_input: - - port_cdi_internal_0_port_security_groups + - port_cdi_internal_0_port_0_security_groups - index_value exCP_naming: - get_input: port_cdi_internal_0_port_exCP_naming + get_input: port_cdi_internal_0_port_0_exCP_naming vlan_requirements: - get_input: port_cdi_internal_0_port_vlan_requirements + get_input: port_cdi_internal_0_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_cdi_internal_0_port_related_networks + get_input: port_cdi_internal_0_port_0_related_networks ip_requirements: - get_input: port_cdi_internal_0_port_ip_requirements + get_input: port_cdi_internal_0_port_0_ip_requirements network_role_tag: - get_input: port_cdi_internal_0_port_network_role_tag + get_input: port_cdi_internal_0_port_0_network_role_tag network_role: - get_input: port_cdi_internal_0_port_network_role + get_input: port_cdi_internal_0_port_0_network_role subnetpoolid: - get_input: port_cdi_internal_0_port_subnetpoolid + get_input: port_cdi_internal_0_port_0_subnetpoolid fixed_ips: get_input: - - port_cdi_internal_0_port_fixed_ips + - port_cdi_internal_0_port_0_fixed_ips - index_value name: get_input: - - port_cdi_internal_0_port_name + - port_cdi_internal_0_port_0_name - index_value network: get_input: - - port_cdi_internal_0_port_network + - port_cdi_internal_0_port_0_network - index_value requirements: - binding: @@ -295,21 +295,12 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.cdi capabilities: - attachment_cdi_cdi_internal_0_port: - - cdi_cdi_internal_0_port - - attachment - network.incoming.bytes.rate_cdi_cdi_internal_0_port: - - cdi_cdi_internal_0_port - - network.incoming.bytes.rate - forwarder_cdi_cdi_ims_core_0_port: - - cdi_cdi_ims_core_0_port - - forwarder - network.outgoing.bytes_cdi_cdi_internal_0_port: - - cdi_cdi_internal_0_port - - network.outgoing.bytes - network.outgoing.packets.rate_cdi_cdi_internal_0_port: - - cdi_cdi_internal_0_port - - network.outgoing.packets.rate + feature_cdi_cdi_internal_0_port_0: + - cdi_cdi_internal_0_port_0 + - feature + network.outgoing.bytes.rate_cdi_cdi_ims_core_0_port_1: + - cdi_cdi_ims_core_0_port_1 + - network.outgoing.bytes.rate host_cdi: - cdi - host @@ -322,12 +313,18 @@ topology_template: disk.write.requests.rate_cdi: - cdi - disk.write.requests.rate + network.incoming.packets_cdi_cdi_internal_0_port_0: + - cdi_cdi_internal_0_port_0 + - network.incoming.packets disk.device.write.requests.rate_cdi: - cdi - disk.device.write.requests.rate disk.write.bytes.rate_cdi: - cdi - disk.write.bytes.rate + network.outpoing.packets_cdi_cdi_ims_core_0_port_1: + - cdi_cdi_ims_core_0_port_1 + - network.outpoing.packets disk.ephemeral.size_cdi: - cdi - disk.ephemeral.size @@ -337,18 +334,12 @@ topology_template: cpu.delta_cdi: - cdi - cpu.delta - network.incoming.bytes_cdi_cdi_internal_0_port: - - cdi_cdi_internal_0_port - - network.incoming.bytes - network.outgoing.bytes.rate_cdi_cdi_internal_0_port: - - cdi_cdi_internal_0_port - - network.outgoing.bytes.rate + network.incoming.packets_cdi_cdi_ims_core_0_port_1: + - cdi_cdi_ims_core_0_port_1 + - network.incoming.packets disk.device.write.bytes_cdi: - cdi - disk.device.write.bytes - feature_cdi_cdi_ims_core_0_port: - - cdi_cdi_ims_core_0_port - - feature disk.device.read.requests.rate_cdi: - cdi - disk.device.read.requests.rate @@ -358,33 +349,36 @@ topology_template: os_cdi: - cdi - os + network.incoming.bytes.rate_cdi_cdi_internal_0_port_0: + - cdi_cdi_internal_0_port_0 + - network.incoming.bytes.rate memory.usage_cdi: - cdi - memory.usage - network.outgoing.bytes.rate_cdi_cdi_ims_core_0_port: - - cdi_cdi_ims_core_0_port + network.incoming.packets.rate_cdi_cdi_ims_core_0_port_1: + - cdi_cdi_ims_core_0_port_1 + - network.incoming.packets.rate + network.outgoing.bytes.rate_cdi_cdi_internal_0_port_0: + - cdi_cdi_internal_0_port_0 - network.outgoing.bytes.rate - network.outpoing.packets_cdi_cdi_internal_0_port: - - cdi_cdi_internal_0_port - - network.outpoing.packets vcpus_cdi: - cdi - vcpus - network.incoming.packets_cdi_cdi_ims_core_0_port: - - cdi_cdi_ims_core_0_port - - network.incoming.packets + network.outgoing.packets.rate_cdi_cdi_ims_core_0_port_1: + - cdi_cdi_ims_core_0_port_1 + - network.outgoing.packets.rate disk.device.read.requests_cdi: - cdi - disk.device.read.requests + feature_cdi_cdi_ims_core_0_port_1: + - cdi_cdi_ims_core_0_port_1 + - feature endpoint_cdi: - cdi - endpoint disk.read.requests_cdi: - cdi - disk.read.requests - network.incoming.bytes.rate_cdi_cdi_ims_core_0_port: - - cdi_cdi_ims_core_0_port - - network.incoming.bytes.rate memory.resident_cdi: - cdi - memory.resident @@ -394,6 +388,12 @@ topology_template: disk.read.bytes.rate_cdi: - cdi - disk.read.bytes.rate + network.outgoing.bytes_cdi_cdi_ims_core_0_port_1: + - cdi_cdi_ims_core_0_port_1 + - network.outgoing.bytes + network.outgoing.bytes_cdi_cdi_internal_0_port_0: + - cdi_cdi_internal_0_port_0 + - network.outgoing.bytes memory_cdi: - cdi - memory @@ -403,21 +403,24 @@ topology_template: disk.device.write.requests_cdi: - cdi - disk.device.write.requests - network.outgoing.packets.rate_cdi_cdi_ims_core_0_port: - - cdi_cdi_ims_core_0_port - - network.outgoing.packets.rate - binding_cdi_cdi_internal_0_port: - - cdi_cdi_internal_0_port - - binding - network.incoming.packets.rate_cdi_cdi_internal_0_port: - - cdi_cdi_internal_0_port + network.incoming.packets.rate_cdi_cdi_internal_0_port_0: + - cdi_cdi_internal_0_port_0 - network.incoming.packets.rate disk.allocation_cdi: - cdi - disk.allocation - forwarder_cdi_cdi_internal_0_port: - - cdi_cdi_internal_0_port + network.incoming.bytes.rate_cdi_cdi_ims_core_0_port_1: + - cdi_cdi_ims_core_0_port_1 + - network.incoming.bytes.rate + forwarder_cdi_cdi_internal_0_port_0: + - cdi_cdi_internal_0_port_0 - forwarder + network.outgoing.packets.rate_cdi_cdi_internal_0_port_0: + - cdi_cdi_internal_0_port_0 + - network.outgoing.packets.rate + network.outpoing.packets_cdi_cdi_internal_0_port_0: + - cdi_cdi_internal_0_port_0 + - network.outpoing.packets scalable_cdi: - cdi - scalable @@ -430,33 +433,39 @@ topology_template: disk.device.usage_cdi: - cdi - disk.device.usage + binding_cdi_cdi_ims_core_0_port_1: + - cdi_cdi_ims_core_0_port_1 + - binding disk.iops_cdi: - cdi - disk.iops - network.incoming.packets_cdi_cdi_internal_0_port: - - cdi_cdi_internal_0_port - - network.incoming.packets + binding_cdi_cdi_internal_0_port_0: + - cdi_cdi_internal_0_port_0 + - binding disk.usage_cdi: - cdi - disk.usage + attachment_cdi_cdi_internal_0_port_0: + - cdi_cdi_internal_0_port_0 + - attachment + attachment_cdi_cdi_ims_core_0_port_1: + - cdi_cdi_ims_core_0_port_1 + - attachment disk.device.write.bytes.rate_cdi: - cdi - disk.device.write.bytes.rate disk.read.bytes_cdi: - cdi - disk.read.bytes - network.incoming.bytes_cdi_cdi_ims_core_0_port: - - cdi_cdi_ims_core_0_port - - network.incoming.bytes + forwarder_cdi_cdi_ims_core_0_port_1: + - cdi_cdi_ims_core_0_port_1 + - forwarder disk.capacity_cdi: - cdi - disk.capacity binding_cdi: - cdi - binding - feature_cdi_cdi_internal_0_port: - - cdi_cdi_internal_0_port - - feature disk.device.read.bytes_cdi: - cdi - disk.device.read.bytes @@ -466,46 +475,37 @@ topology_template: disk.device.latency_cdi: - cdi - disk.device.latency - network.incoming.packets.rate_cdi_cdi_ims_core_0_port: - - cdi_cdi_ims_core_0_port - - network.incoming.packets.rate - binding_cdi_cdi_ims_core_0_port: - - cdi_cdi_ims_core_0_port - - binding instance_cdi: - cdi - instance - attachment_cdi_cdi_ims_core_0_port: - - cdi_cdi_ims_core_0_port - - attachment + network.incoming.bytes_cdi_cdi_internal_0_port_0: + - cdi_cdi_internal_0_port_0 + - network.incoming.bytes + network.incoming.bytes_cdi_cdi_ims_core_0_port_1: + - cdi_cdi_ims_core_0_port_1 + - network.incoming.bytes disk.device.allocation_cdi: - cdi - disk.device.allocation - network.outgoing.bytes_cdi_cdi_ims_core_0_port: - - cdi_cdi_ims_core_0_port - - network.outgoing.bytes disk.write.requests_cdi: - cdi - disk.write.requests - network.outpoing.packets_cdi_cdi_ims_core_0_port: - - cdi_cdi_ims_core_0_port - - network.outpoing.packets requirements: local_storage_cdi: - cdi - local_storage - link_cdi_cdi_ims_core_0_port: - - cdi_cdi_ims_core_0_port + link_cdi_cdi_internal_0_port_0: + - cdi_cdi_internal_0_port_0 - link - dependency_cdi_cdi_ims_core_0_port: - - cdi_cdi_ims_core_0_port - - dependency - link_cdi_cdi_internal_0_port: - - cdi_cdi_internal_0_port + link_cdi_cdi_ims_core_0_port_1: + - cdi_cdi_ims_core_0_port_1 - link + dependency_cdi_cdi_internal_0_port_0: + - cdi_cdi_internal_0_port_0 + - dependency dependency_cdi: - cdi - dependency - dependency_cdi_cdi_internal_0_port: - - cdi_cdi_internal_0_port + dependency_cdi_cdi_ims_core_0_port_1: + - cdi_cdi_ims_core_0_port_1 - 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/nestedSingleCompute/duplicateReqs/out/Nested_cdi_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cdi_1ServiceTemplate.yaml index d6d9cfe8dd..50473b042d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cdi_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cdi_1ServiceTemplate.yaml @@ -11,108 +11,95 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_cdi_internal_1_port_order: - type: integer - required: true - port_cdi_ims_core_1_port_security_groups: + port_cdi_ims_core_1_port_1_fixed_ips: type: list required: true entry_schema: - type: json - port_cdi_internal_1_port_network_role_tag: - type: string - required: true - port_cdi_internal_1_port_related_networks: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_cdi_internal_1_port_0_security_groups: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments + type: json + port_cdi_ims_core_1_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true vm_flavor_name: type: string required: true - port_cdi_ims_core_1_port_order: + port_cdi_ims_core_1_port_1_order: type: integer required: true - port_cdi_internal_1_port_security_groups: + port_cdi_internal_1_port_0_related_networks: type: list required: true entry_schema: - type: json - port_cdi_ims_core_1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - vm_image_name: - type: string - required: true - compute_cdi_scheduler_hints: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_cdi_ims_core_1_port_1_security_groups: type: list required: true entry_schema: type: json - port_cdi_ims_core_1_port_fixed_ips: - type: list + port_cdi_ims_core_1_port_1_network_role_tag: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - compute_cdi_name: + port_cdi_internal_1_port_0_vlan_requirements: type: list required: true entry_schema: - type: string - port_cdi_ims_core_1_port_network_role_tag: - type: string - required: true - port_cdi_ims_core_1_port_name: + type: org.openecomp.datatypes.network.VlanRequirements + port_cdi_ims_core_1_port_1_ip_requirements: type: list required: true entry_schema: - type: string - port_cdi_ims_core_1_port_subnetpoolid: + type: org.openecomp.datatypes.network.IpRequirements + vm_image_name: type: string required: true - compute_cdi_user_data_format: + compute_cdi_scheduler_hints: type: list required: true entry_schema: - type: string - port_cdi_ims_core_1_port_network: + type: json + compute_cdi_name: type: list required: true entry_schema: type: string - compute_cdi_availability_zone: + compute_cdi_user_data_format: type: list required: true entry_schema: type: string - port_cdi_internal_1_port_network: + port_cdi_ims_core_1_port_1_network_role: + type: string + required: true + port_cdi_ims_core_1_port_1_network: type: list required: true entry_schema: type: string - port_cdi_ims_core_1_port_ip_requirements: + port_cdi_internal_1_port_0_fixed_ips: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_cdi_internal_1_port_allowed_address_pairs: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_cdi_internal_1_port_0_network_role: + type: string + required: true + port_cdi_ims_core_1_port_1_subnetpoolid: + type: string + required: true + compute_cdi_availability_zone: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.network.AddressPair + type: string compute_cdi_config_drive: type: list required: true entry_schema: type: boolean - port_cdi_internal_1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_cdi_ims_core_1_port_allowed_address_pairs: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.heat.network.AddressPair index_value: type: integer description: Index value of this substitution service template runtime instance @@ -120,96 +107,109 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_cdi_ims_core_1_port_vlan_requirements: - type: list + port_cdi_internal_1_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_cdi_ims_core_1_port_network_role: + port_cdi_internal_1_port_0_subnetpoolid: type: string required: true - port_cdi_internal_1_port_vlan_requirements: + port_cdi_ims_core_1_port_1_allowed_address_pairs: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_cdi_internal_1_port_fixed_ips: + type: org.openecomp.datatypes.heat.network.AddressPair + port_cdi_internal_1_port_0_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_cdi_internal_1_port_name: + type: org.openecomp.datatypes.network.IpRequirements + port_cdi_internal_1_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_cdi_internal_1_port_0_name: type: list required: true entry_schema: type: string - port_cdi_ims_core_1_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_cdi_ims_core_1_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_cdi_internal_1_port_ip_requirements: + port_cdi_ims_core_1_port_1_related_networks: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_cdi_ims_core_1_port_related_networks: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_cdi_ims_core_1_port_1_name: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - compute_cdi_metadata: + type: string + port_cdi_ims_core_1_port_1_vlan_requirements: type: list required: true entry_schema: - type: json - port_cdi_internal_1_port_subnetpoolid: - type: string + type: org.openecomp.datatypes.network.VlanRequirements + port_cdi_internal_1_port_0_allowed_address_pairs: + type: list required: true - port_cdi_internal_1_port_network_role: + entry_schema: + type: org.openecomp.datatypes.heat.network.AddressPair + port_cdi_internal_1_port_0_network_role_tag: type: string required: true - port_cdi_internal_1_port_exCP_naming: - type: org.openecomp.datatypes.Naming + compute_cdi_metadata: + type: list + required: true + entry_schema: + type: json + port_cdi_internal_1_port_0_network: + type: list + required: true + entry_schema: + type: string + port_cdi_internal_1_port_0_order: + type: integer required: true node_templates: - cdi_cdi_internal_1_port: + cdi_cdi_internal_1_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_requirements: - get_input: port_cdi_internal_1_port_mac_requirements + get_input: port_cdi_internal_1_port_0_mac_requirements allowed_address_pairs: - get_input: port_cdi_internal_1_port_allowed_address_pairs + get_input: port_cdi_internal_1_port_0_allowed_address_pairs order: - get_input: port_cdi_internal_1_port_order + get_input: port_cdi_internal_1_port_0_order security_groups: get_input: - - port_cdi_internal_1_port_security_groups + - port_cdi_internal_1_port_0_security_groups - index_value exCP_naming: - get_input: port_cdi_internal_1_port_exCP_naming + get_input: port_cdi_internal_1_port_0_exCP_naming vlan_requirements: - get_input: port_cdi_internal_1_port_vlan_requirements + get_input: port_cdi_internal_1_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_cdi_internal_1_port_related_networks + get_input: port_cdi_internal_1_port_0_related_networks ip_requirements: - get_input: port_cdi_internal_1_port_ip_requirements + get_input: port_cdi_internal_1_port_0_ip_requirements network_role_tag: - get_input: port_cdi_internal_1_port_network_role_tag + get_input: port_cdi_internal_1_port_0_network_role_tag network_role: - get_input: port_cdi_internal_1_port_network_role + get_input: port_cdi_internal_1_port_0_network_role subnetpoolid: - get_input: port_cdi_internal_1_port_subnetpoolid + get_input: port_cdi_internal_1_port_0_subnetpoolid fixed_ips: get_input: - - port_cdi_internal_1_port_fixed_ips + - port_cdi_internal_1_port_0_fixed_ips - index_value name: get_input: - - port_cdi_internal_1_port_name + - port_cdi_internal_1_port_0_name - index_value network: get_input: - - port_cdi_internal_1_port_network + - port_cdi_internal_1_port_0_network - index_value requirements: - binding: @@ -247,45 +247,45 @@ topology_template: get_input: - compute_cdi_user_data_format - index_value - cdi_cdi_ims_core_1_port: + cdi_cdi_ims_core_1_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_requirements: - get_input: port_cdi_ims_core_1_port_mac_requirements + get_input: port_cdi_ims_core_1_port_1_mac_requirements allowed_address_pairs: - get_input: port_cdi_ims_core_1_port_allowed_address_pairs + get_input: port_cdi_ims_core_1_port_1_allowed_address_pairs order: - get_input: port_cdi_ims_core_1_port_order + get_input: port_cdi_ims_core_1_port_1_order security_groups: get_input: - - port_cdi_ims_core_1_port_security_groups + - port_cdi_ims_core_1_port_1_security_groups - index_value exCP_naming: - get_input: port_cdi_ims_core_1_port_exCP_naming + get_input: port_cdi_ims_core_1_port_1_exCP_naming vlan_requirements: - get_input: port_cdi_ims_core_1_port_vlan_requirements + get_input: port_cdi_ims_core_1_port_1_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_cdi_ims_core_1_port_related_networks + get_input: port_cdi_ims_core_1_port_1_related_networks ip_requirements: - get_input: port_cdi_ims_core_1_port_ip_requirements + get_input: port_cdi_ims_core_1_port_1_ip_requirements network_role_tag: - get_input: port_cdi_ims_core_1_port_network_role_tag + get_input: port_cdi_ims_core_1_port_1_network_role_tag network_role: - get_input: port_cdi_ims_core_1_port_network_role + get_input: port_cdi_ims_core_1_port_1_network_role subnetpoolid: - get_input: port_cdi_ims_core_1_port_subnetpoolid + get_input: port_cdi_ims_core_1_port_1_subnetpoolid fixed_ips: get_input: - - port_cdi_ims_core_1_port_fixed_ips + - port_cdi_ims_core_1_port_1_fixed_ips - index_value name: get_input: - - port_cdi_ims_core_1_port_name + - port_cdi_ims_core_1_port_1_name - index_value network: get_input: - - port_cdi_ims_core_1_port_network + - port_cdi_ims_core_1_port_1_network - index_value requirements: - binding: @@ -295,12 +295,9 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.cdi_1 capabilities: - network.outpoing.packets_cdi_cdi_internal_1_port: - - cdi_cdi_internal_1_port - - network.outpoing.packets - feature_cdi_cdi_ims_core_1_port: - - cdi_cdi_ims_core_1_port - - feature + network.incoming.bytes_cdi_cdi_ims_core_1_port_1: + - cdi_cdi_ims_core_1_port_1 + - network.incoming.bytes host_cdi: - cdi - host @@ -310,54 +307,42 @@ topology_template: disk.device.iops_cdi: - cdi - disk.device.iops + feature_cdi_cdi_internal_1_port_0: + - cdi_cdi_internal_1_port_0 + - feature + network.outgoing.bytes.rate_cdi_cdi_ims_core_1_port_1: + - cdi_cdi_ims_core_1_port_1 + - network.outgoing.bytes.rate disk.write.requests.rate_cdi: - cdi - disk.write.requests.rate + network.incoming.packets_cdi_cdi_internal_1_port_0: + - cdi_cdi_internal_1_port_0 + - network.incoming.packets disk.device.write.requests.rate_cdi: - cdi - disk.device.write.requests.rate - forwarder_cdi_cdi_ims_core_1_port: - - cdi_cdi_ims_core_1_port - - forwarder - network.incoming.bytes_cdi_cdi_ims_core_1_port: - - cdi_cdi_ims_core_1_port - - network.incoming.bytes - network.outgoing.bytes.rate_cdi_cdi_ims_core_1_port: - - cdi_cdi_ims_core_1_port - - network.outgoing.bytes.rate - network.outgoing.bytes_cdi_cdi_internal_1_port: - - cdi_cdi_internal_1_port - - network.outgoing.bytes - attachment_cdi_cdi_internal_1_port: - - cdi_cdi_internal_1_port - - attachment disk.write.bytes.rate_cdi: - cdi - disk.write.bytes.rate - network.outgoing.packets.rate_cdi_cdi_internal_1_port: - - cdi_cdi_internal_1_port - - network.outgoing.packets.rate + network.outpoing.packets_cdi_cdi_ims_core_1_port_1: + - cdi_cdi_ims_core_1_port_1 + - network.outpoing.packets disk.ephemeral.size_cdi: - cdi - disk.ephemeral.size cpu_util_cdi: - cdi - cpu_util - network.incoming.bytes.rate_cdi_cdi_ims_core_1_port: - - cdi_cdi_ims_core_1_port - - network.incoming.bytes.rate cpu.delta_cdi: - cdi - cpu.delta disk.device.write.bytes_cdi: - cdi - disk.device.write.bytes - network.outgoing.bytes_cdi_cdi_ims_core_1_port: - - cdi_cdi_ims_core_1_port - - network.outgoing.bytes - network.incoming.packets.rate_cdi_cdi_internal_1_port: - - cdi_cdi_internal_1_port - - network.incoming.packets.rate + forwarder_cdi_cdi_ims_core_1_port_1: + - cdi_cdi_ims_core_1_port_1 + - forwarder disk.device.read.requests.rate_cdi: - cdi - disk.device.read.requests.rate @@ -370,18 +355,9 @@ topology_template: memory.usage_cdi: - cdi - memory.usage - binding_cdi_cdi_ims_core_1_port: - - cdi_cdi_ims_core_1_port - - binding - binding_cdi_cdi_internal_1_port: - - cdi_cdi_internal_1_port - - binding vcpus_cdi: - cdi - vcpus - network.incoming.bytes_cdi_cdi_internal_1_port: - - cdi_cdi_internal_1_port - - network.incoming.bytes disk.device.read.requests_cdi: - cdi - disk.device.read.requests @@ -391,15 +367,15 @@ topology_template: disk.read.requests_cdi: - cdi - disk.read.requests - attachment_cdi_cdi_ims_core_1_port: - - cdi_cdi_ims_core_1_port - - attachment memory.resident_cdi: - cdi - memory.resident disk.latency_cdi: - cdi - disk.latency + network.incoming.bytes_cdi_cdi_internal_1_port_0: + - cdi_cdi_internal_1_port_0 + - network.incoming.bytes disk.read.bytes.rate_cdi: - cdi - disk.read.bytes.rate @@ -412,60 +388,72 @@ topology_template: disk.device.write.requests_cdi: - cdi - disk.device.write.requests - network.incoming.packets_cdi_cdi_ims_core_1_port: - - cdi_cdi_ims_core_1_port - - network.incoming.packets + forwarder_cdi_cdi_internal_1_port_0: + - cdi_cdi_internal_1_port_0 + - forwarder + network.incoming.packets.rate_cdi_cdi_internal_1_port_0: + - cdi_cdi_internal_1_port_0 + - network.incoming.packets.rate disk.allocation_cdi: - cdi - disk.allocation - network.outpoing.packets_cdi_cdi_ims_core_1_port: - - cdi_cdi_ims_core_1_port - - network.outpoing.packets - forwarder_cdi_cdi_internal_1_port: - - cdi_cdi_internal_1_port - - forwarder + network.outgoing.packets.rate_cdi_cdi_internal_1_port_0: + - cdi_cdi_internal_1_port_0 + - network.outgoing.packets.rate scalable_cdi: - cdi - scalable feature_cdi: - cdi - feature + binding_cdi_cdi_internal_1_port_0: + - cdi_cdi_internal_1_port_0 + - binding cpu_cdi: - cdi - cpu disk.device.usage_cdi: - cdi - disk.device.usage + attachment_cdi_cdi_ims_core_1_port_1: + - cdi_cdi_ims_core_1_port_1 + - attachment + network.incoming.bytes.rate_cdi_cdi_ims_core_1_port_1: + - cdi_cdi_ims_core_1_port_1 + - network.incoming.bytes.rate disk.iops_cdi: - cdi - disk.iops + attachment_cdi_cdi_internal_1_port_0: + - cdi_cdi_internal_1_port_0 + - attachment disk.usage_cdi: - cdi - disk.usage - network.incoming.packets.rate_cdi_cdi_ims_core_1_port: - - cdi_cdi_ims_core_1_port - - network.incoming.packets.rate - feature_cdi_cdi_internal_1_port: - - cdi_cdi_internal_1_port - - feature + network.outpoing.packets_cdi_cdi_internal_1_port_0: + - cdi_cdi_internal_1_port_0 + - network.outpoing.packets disk.device.write.bytes.rate_cdi: - cdi - disk.device.write.bytes.rate disk.read.bytes_cdi: - cdi - disk.read.bytes - network.outgoing.bytes.rate_cdi_cdi_internal_1_port: - - cdi_cdi_internal_1_port - - network.outgoing.bytes.rate + feature_cdi_cdi_ims_core_1_port_1: + - cdi_cdi_ims_core_1_port_1 + - feature disk.capacity_cdi: - cdi - disk.capacity - network.outgoing.packets.rate_cdi_cdi_ims_core_1_port: - - cdi_cdi_ims_core_1_port - - network.outgoing.packets.rate - network.incoming.bytes.rate_cdi_cdi_internal_1_port: - - cdi_cdi_internal_1_port + network.incoming.bytes.rate_cdi_cdi_internal_1_port_0: + - cdi_cdi_internal_1_port_0 - network.incoming.bytes.rate + network.outgoing.bytes.rate_cdi_cdi_internal_1_port_0: + - cdi_cdi_internal_1_port_0 + - network.outgoing.bytes.rate + binding_cdi_cdi_ims_core_1_port_1: + - cdi_cdi_ims_core_1_port_1 + - binding binding_cdi: - cdi - binding @@ -478,15 +466,27 @@ topology_template: disk.device.latency_cdi: - cdi - disk.device.latency + network.outgoing.packets.rate_cdi_cdi_ims_core_1_port_1: + - cdi_cdi_ims_core_1_port_1 + - network.outgoing.packets.rate + network.incoming.packets_cdi_cdi_ims_core_1_port_1: + - cdi_cdi_ims_core_1_port_1 + - network.incoming.packets instance_cdi: - cdi - instance - network.incoming.packets_cdi_cdi_internal_1_port: - - cdi_cdi_internal_1_port - - network.incoming.packets + network.incoming.packets.rate_cdi_cdi_ims_core_1_port_1: + - cdi_cdi_ims_core_1_port_1 + - network.incoming.packets.rate disk.device.allocation_cdi: - cdi - disk.device.allocation + network.outgoing.bytes_cdi_cdi_internal_1_port_0: + - cdi_cdi_internal_1_port_0 + - network.outgoing.bytes + network.outgoing.bytes_cdi_cdi_ims_core_1_port_1: + - cdi_cdi_ims_core_1_port_1 + - network.outgoing.bytes disk.write.requests_cdi: - cdi - disk.write.requests @@ -494,18 +494,18 @@ topology_template: local_storage_cdi: - cdi - local_storage - link_cdi_cdi_internal_1_port: - - cdi_cdi_internal_1_port + link_cdi_cdi_ims_core_1_port_1: + - cdi_cdi_ims_core_1_port_1 - link - link_cdi_cdi_ims_core_1_port: - - cdi_cdi_ims_core_1_port + link_cdi_cdi_internal_1_port_0: + - cdi_cdi_internal_1_port_0 - link - dependency_cdi_cdi_internal_1_port: - - cdi_cdi_internal_1_port - - dependency - dependency_cdi_cdi_ims_core_1_port: - - cdi_cdi_ims_core_1_port - - dependency dependency_cdi: - cdi + - dependency + dependency_cdi_cdi_ims_core_1_port_1: + - cdi_cdi_ims_core_1_port_1 + - dependency + dependency_cdi_cdi_internal_1_port_0: + - cdi_cdi_internal_1_port_0 - 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/nestedSingleCompute/duplicateReqs/out/Nested_cifServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cifServiceTemplate.yaml index 56fd1defd7..4aa7e9083d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cifServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cifServiceTemplate.yaml @@ -11,11 +11,9 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_cif_ims_core_0_port_network: - type: list + port_cif_internal_0_port_0_subnetpoolid: + type: string required: true - entry_schema: - type: string port_cif_oam_0_port_1_name: type: list required: true @@ -26,37 +24,47 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.heat.network.AddressPair + port_cif_internal_0_port_0_security_groups: + type: list + required: true + entry_schema: + type: json + port_cif_internal_0_port_0_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_cif_internal_0_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_cif_internal_0_port_0_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_cif_oam_0_port_1_fixed_ips: type: list required: true entry_schema: type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_cif_internal_0_port_related_networks: + port_cif_ims_li_0_port_4_related_networks: type: list required: true entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_cif_ims_li_0_port_network_role: - type: string - required: true vm_flavor_name: type: string required: true - port_cif_internal_0_port_name: + port_cif_ims_core_0_port_2_ip_requirements: type: list required: true entry_schema: - type: string + type: org.openecomp.datatypes.network.IpRequirements port_cif_oam_0_port_1_order: type: integer required: true - port_cif_internal_0_port_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_cif_ims_core_0_port_network_role: - type: string + port_cif_oam_0_port_3_exCP_naming: + type: org.openecomp.datatypes.Naming required: true port_cif_oam_0_port_1_exCP_naming: type: org.openecomp.datatypes.Naming @@ -66,9 +74,6 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_cif_oam_0_port_3_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true vm_image_name: type: string required: true @@ -82,58 +87,59 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_cif_ims_core_0_port_related_networks: + port_cif_ims_li_0_port_4_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments + type: org.openecomp.datatypes.network.VlanRequirements port_cif_oam_0_port_1_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_cif_ims_li_0_port_fixed_ips: + port_cif_ims_li_0_port_4_name: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps + type: string compute_cif_scheduler_hints: type: list required: true entry_schema: type: json + port_cif_ims_li_0_port_4_subnetpoolid: + type: string + required: true port_cif_oam_0_port_1_security_groups: type: list required: true entry_schema: type: json - port_cif_internal_0_port_network_role: - type: string - required: true - port_cif_ims_li_0_port_ip_requirements: + port_cif_internal_0_port_0_ip_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements + port_cif_ims_core_0_port_2_network: + type: list + required: true + entry_schema: + type: string compute_cif_metadata: type: list required: true entry_schema: type: json + port_cif_internal_0_port_0_order: + type: integer + required: true port_cif_oam_0_port_3_subnetpoolid: type: string required: true - port_cif_ims_li_0_port_name: - type: list - required: true - entry_schema: - type: string - port_cif_ims_core_0_port_fixed_ips: - type: list + port_cif_internal_0_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_cif_ims_li_0_port_order: + port_cif_ims_li_0_port_4_order: type: integer required: true port_cif_oam_0_port_3_network_role: @@ -142,25 +148,17 @@ topology_template: port_cif_oam_0_port_3_network_role_tag: type: string required: true - port_cif_ims_core_0_port_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements port_cif_oam_0_port_1_network_role: type: string required: true - port_cif_ims_core_0_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_cif_internal_0_port_subnetpoolid: + port_cif_ims_core_0_port_2_network_role_tag: type: string required: true - port_cif_ims_core_0_port_security_groups: + port_cif_ims_core_0_port_2_related_networks: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_cif_oam_0_port_3_related_networks: type: list required: true @@ -169,48 +167,35 @@ topology_template: port_cif_oam_0_port_1_subnetpoolid: type: string required: true - port_cif_ims_core_0_port_name: - type: list - required: true - entry_schema: - type: string port_cif_oam_0_port_3_order: type: integer required: true - port_cif_internal_0_port_network: - type: list - required: true - entry_schema: - type: string - port_cif_ims_core_0_port_order: - type: integer - required: true port_cif_oam_0_port_3_security_groups: type: list required: true entry_schema: type: json - port_cif_ims_core_0_port_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_cif_ims_li_0_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_cif_internal_0_port_0_network_role_tag: + type: string required: true port_cif_oam_0_port_1_network: type: list required: true entry_schema: type: string - port_cif_ims_li_0_port_security_groups: + port_cif_ims_li_0_port_4_network_role: + type: string + required: true + port_cif_ims_li_0_port_4_ip_requirements: type: list required: true entry_schema: - type: json - port_cif_ims_li_0_port_subnetpoolid: - type: string + type: org.openecomp.datatypes.network.IpRequirements + port_cif_ims_core_0_port_2_name: + type: list required: true + entry_schema: + type: string port_cif_oam_0_port_3_vlan_requirements: type: list required: true @@ -221,9 +206,6 @@ topology_template: required: true entry_schema: type: string - port_cif_internal_0_port_order: - type: integer - required: true compute_cif_availability_zone: type: list required: true @@ -232,60 +214,56 @@ topology_template: port_cif_oam_0_port_1_network_role_tag: type: string required: true - port_cif_oam_0_port_3_mac_requirements: + port_cif_ims_li_0_port_4_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true - port_cif_ims_core_0_port_allowed_address_pairs: + port_cif_ims_core_0_port_2_security_groups: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.network.AddressPair + type: json + port_cif_ims_core_0_port_2_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_cif_oam_0_port_3_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true port_cif_oam_0_port_3_fixed_ips: type: list required: true entry_schema: type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_cif_ims_core_0_port_network_role_tag: + port_cif_internal_0_port_0_network_role: type: string required: true - port_cif_ims_li_0_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_cif_ims_li_0_port_allowed_address_pairs: + port_cif_ims_core_0_port_2_allowed_address_pairs: type: list required: true entry_schema: type: org.openecomp.datatypes.heat.network.AddressPair - port_cif_ims_core_0_port_subnetpoolid: - type: string - required: true - port_cif_internal_0_port_network_role_tag: - type: string - required: true - port_cif_internal_0_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_cif_ims_li_0_port_network: + port_cif_internal_0_port_0_name: type: list required: true entry_schema: type: string - port_cif_ims_li_0_port_related_networks: + port_cif_ims_li_0_port_4_allowed_address_pairs: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_cif_internal_0_port_security_groups: + type: org.openecomp.datatypes.heat.network.AddressPair + port_cif_ims_core_0_port_2_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_cif_ims_li_0_port_4_fixed_ips: type: list required: true entry_schema: - type: json - port_cif_internal_0_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_cif_ims_li_0_port_network_role_tag: - type: string + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_cif_internal_0_port_0_allowed_address_pairs: + type: list required: true + entry_schema: + type: org.openecomp.datatypes.heat.network.AddressPair index_value: type: integer description: Index value of this substitution service template runtime instance @@ -298,48 +276,70 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.heat.network.AddressPair - port_cif_internal_0_port_fixed_ips: + port_cif_internal_0_port_0_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps + type: string + port_cif_ims_core_0_port_2_subnetpoolid: + type: string + required: true + port_cif_ims_li_0_port_4_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_cif_ims_core_0_port_2_network_role: + type: string + required: true compute_cif_config_drive: type: list required: true entry_schema: type: boolean - port_cif_oam_0_port_3_name: + port_cif_ims_li_0_port_4_network: type: list required: true entry_schema: type: string - port_cif_ims_li_0_port_vlan_requirements: + port_cif_ims_core_0_port_2_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements + port_cif_ims_core_0_port_2_order: + type: integer + required: true + port_cif_oam_0_port_3_name: + type: list + required: true + entry_schema: + type: string port_cif_oam_0_port_3_network: type: list required: true entry_schema: type: string - port_cif_ims_core_0_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_cif_ims_core_0_port_2_fixed_ips: + type: list required: true - port_cif_internal_0_port_allowed_address_pairs: + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_cif_internal_0_port_0_fixed_ips: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.network.AddressPair + type: org.openecomp.datatypes.heat.neutron.port.FixedIps port_cif_oam_0_port_1_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true - port_cif_oam_0_port_3_ip_requirements: + port_cif_ims_li_0_port_4_network_role_tag: + type: string + required: true + port_cif_ims_li_0_port_4_security_groups: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_cif_internal_0_port_ip_requirements: + type: json + port_cif_oam_0_port_3_ip_requirements: type: list required: true entry_schema: @@ -376,225 +376,225 @@ topology_template: get_input: - compute_cif_user_data_format - index_value - cif_cif_internal_0_port: + cif_cif_ims_li_0_port_4: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_requirements: - get_input: port_cif_internal_0_port_mac_requirements + get_input: port_cif_ims_li_0_port_4_mac_requirements allowed_address_pairs: - get_input: port_cif_internal_0_port_allowed_address_pairs + get_input: port_cif_ims_li_0_port_4_allowed_address_pairs order: - get_input: port_cif_internal_0_port_order + get_input: port_cif_ims_li_0_port_4_order security_groups: get_input: - - port_cif_internal_0_port_security_groups + - port_cif_ims_li_0_port_4_security_groups - index_value exCP_naming: - get_input: port_cif_internal_0_port_exCP_naming + get_input: port_cif_ims_li_0_port_4_exCP_naming vlan_requirements: - get_input: port_cif_internal_0_port_vlan_requirements + get_input: port_cif_ims_li_0_port_4_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_cif_internal_0_port_related_networks + get_input: port_cif_ims_li_0_port_4_related_networks ip_requirements: - get_input: port_cif_internal_0_port_ip_requirements + get_input: port_cif_ims_li_0_port_4_ip_requirements network_role_tag: - get_input: port_cif_internal_0_port_network_role_tag + get_input: port_cif_ims_li_0_port_4_network_role_tag network_role: - get_input: port_cif_internal_0_port_network_role + get_input: port_cif_ims_li_0_port_4_network_role subnetpoolid: - get_input: port_cif_internal_0_port_subnetpoolid + get_input: port_cif_ims_li_0_port_4_subnetpoolid fixed_ips: get_input: - - port_cif_internal_0_port_fixed_ips + - port_cif_ims_li_0_port_4_fixed_ips - index_value name: get_input: - - port_cif_internal_0_port_name + - port_cif_ims_li_0_port_4_name - index_value network: get_input: - - port_cif_internal_0_port_network + - port_cif_ims_li_0_port_4_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: cif relationship: tosca.relationships.network.BindsTo - cif_cif_ims_li_0_port: + cif_cif_oam_0_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_requirements: - get_input: port_cif_ims_li_0_port_mac_requirements + get_input: port_cif_oam_0_port_1_mac_requirements allowed_address_pairs: - get_input: port_cif_ims_li_0_port_allowed_address_pairs + get_input: port_cif_oam_0_port_1_allowed_address_pairs order: - get_input: port_cif_ims_li_0_port_order + get_input: port_cif_oam_0_port_1_order security_groups: get_input: - - port_cif_ims_li_0_port_security_groups + - port_cif_oam_0_port_1_security_groups - index_value exCP_naming: - get_input: port_cif_ims_li_0_port_exCP_naming + get_input: port_cif_oam_0_port_1_exCP_naming vlan_requirements: - get_input: port_cif_ims_li_0_port_vlan_requirements + get_input: port_cif_oam_0_port_1_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_cif_ims_li_0_port_related_networks + get_input: port_cif_oam_0_port_1_related_networks ip_requirements: - get_input: port_cif_ims_li_0_port_ip_requirements + get_input: port_cif_oam_0_port_1_ip_requirements network_role_tag: - get_input: port_cif_ims_li_0_port_network_role_tag + get_input: port_cif_oam_0_port_1_network_role_tag network_role: - get_input: port_cif_ims_li_0_port_network_role + get_input: port_cif_oam_0_port_1_network_role subnetpoolid: - get_input: port_cif_ims_li_0_port_subnetpoolid + get_input: port_cif_oam_0_port_1_subnetpoolid fixed_ips: get_input: - - port_cif_ims_li_0_port_fixed_ips + - port_cif_oam_0_port_1_fixed_ips - index_value name: get_input: - - port_cif_ims_li_0_port_name + - port_cif_oam_0_port_1_name - index_value network: get_input: - - port_cif_ims_li_0_port_network + - port_cif_oam_0_port_1_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: cif relationship: tosca.relationships.network.BindsTo - cif_cif_ims_core_0_port: + cif_cif_internal_0_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_requirements: - get_input: port_cif_ims_core_0_port_mac_requirements + get_input: port_cif_internal_0_port_0_mac_requirements allowed_address_pairs: - get_input: port_cif_ims_core_0_port_allowed_address_pairs + get_input: port_cif_internal_0_port_0_allowed_address_pairs order: - get_input: port_cif_ims_core_0_port_order + get_input: port_cif_internal_0_port_0_order security_groups: get_input: - - port_cif_ims_core_0_port_security_groups + - port_cif_internal_0_port_0_security_groups - index_value exCP_naming: - get_input: port_cif_ims_core_0_port_exCP_naming + get_input: port_cif_internal_0_port_0_exCP_naming vlan_requirements: - get_input: port_cif_ims_core_0_port_vlan_requirements + get_input: port_cif_internal_0_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_cif_ims_core_0_port_related_networks + get_input: port_cif_internal_0_port_0_related_networks ip_requirements: - get_input: port_cif_ims_core_0_port_ip_requirements + get_input: port_cif_internal_0_port_0_ip_requirements network_role_tag: - get_input: port_cif_ims_core_0_port_network_role_tag + get_input: port_cif_internal_0_port_0_network_role_tag network_role: - get_input: port_cif_ims_core_0_port_network_role + get_input: port_cif_internal_0_port_0_network_role subnetpoolid: - get_input: port_cif_ims_core_0_port_subnetpoolid + get_input: port_cif_internal_0_port_0_subnetpoolid fixed_ips: get_input: - - port_cif_ims_core_0_port_fixed_ips + - port_cif_internal_0_port_0_fixed_ips - index_value name: get_input: - - port_cif_ims_core_0_port_name + - port_cif_internal_0_port_0_name - index_value network: get_input: - - port_cif_ims_core_0_port_network + - port_cif_internal_0_port_0_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: cif relationship: tosca.relationships.network.BindsTo - cif_cif_oam_0_port_1: + cif_cif_oam_0_port_3: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_requirements: - get_input: port_cif_oam_0_port_1_mac_requirements + get_input: port_cif_oam_0_port_3_mac_requirements allowed_address_pairs: - get_input: port_cif_oam_0_port_1_allowed_address_pairs + get_input: port_cif_oam_0_port_3_allowed_address_pairs order: - get_input: port_cif_oam_0_port_1_order + get_input: port_cif_oam_0_port_3_order security_groups: get_input: - - port_cif_oam_0_port_1_security_groups + - port_cif_oam_0_port_3_security_groups - index_value exCP_naming: - get_input: port_cif_oam_0_port_1_exCP_naming + get_input: port_cif_oam_0_port_3_exCP_naming vlan_requirements: - get_input: port_cif_oam_0_port_1_vlan_requirements + get_input: port_cif_oam_0_port_3_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_cif_oam_0_port_1_related_networks + get_input: port_cif_oam_0_port_3_related_networks ip_requirements: - get_input: port_cif_oam_0_port_1_ip_requirements + get_input: port_cif_oam_0_port_3_ip_requirements network_role_tag: - get_input: port_cif_oam_0_port_1_network_role_tag + get_input: port_cif_oam_0_port_3_network_role_tag network_role: - get_input: port_cif_oam_0_port_1_network_role + get_input: port_cif_oam_0_port_3_network_role subnetpoolid: - get_input: port_cif_oam_0_port_1_subnetpoolid + get_input: port_cif_oam_0_port_3_subnetpoolid fixed_ips: get_input: - - port_cif_oam_0_port_1_fixed_ips + - port_cif_oam_0_port_3_fixed_ips - index_value name: get_input: - - port_cif_oam_0_port_1_name + - port_cif_oam_0_port_3_name - index_value network: get_input: - - port_cif_oam_0_port_1_network + - port_cif_oam_0_port_3_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: cif relationship: tosca.relationships.network.BindsTo - cif_cif_oam_0_port_3: + cif_cif_ims_core_0_port_2: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_requirements: - get_input: port_cif_oam_0_port_3_mac_requirements + get_input: port_cif_ims_core_0_port_2_mac_requirements allowed_address_pairs: - get_input: port_cif_oam_0_port_3_allowed_address_pairs + get_input: port_cif_ims_core_0_port_2_allowed_address_pairs order: - get_input: port_cif_oam_0_port_3_order + get_input: port_cif_ims_core_0_port_2_order security_groups: get_input: - - port_cif_oam_0_port_3_security_groups + - port_cif_ims_core_0_port_2_security_groups - index_value exCP_naming: - get_input: port_cif_oam_0_port_3_exCP_naming + get_input: port_cif_ims_core_0_port_2_exCP_naming vlan_requirements: - get_input: port_cif_oam_0_port_3_vlan_requirements + get_input: port_cif_ims_core_0_port_2_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_cif_oam_0_port_3_related_networks + get_input: port_cif_ims_core_0_port_2_related_networks ip_requirements: - get_input: port_cif_oam_0_port_3_ip_requirements + get_input: port_cif_ims_core_0_port_2_ip_requirements network_role_tag: - get_input: port_cif_oam_0_port_3_network_role_tag + get_input: port_cif_ims_core_0_port_2_network_role_tag network_role: - get_input: port_cif_oam_0_port_3_network_role + get_input: port_cif_ims_core_0_port_2_network_role subnetpoolid: - get_input: port_cif_oam_0_port_3_subnetpoolid + get_input: port_cif_ims_core_0_port_2_subnetpoolid fixed_ips: get_input: - - port_cif_oam_0_port_3_fixed_ips + - port_cif_ims_core_0_port_2_fixed_ips - index_value name: get_input: - - port_cif_oam_0_port_3_name + - port_cif_ims_core_0_port_2_name - index_value network: get_input: - - port_cif_oam_0_port_3_network + - port_cif_ims_core_0_port_2_network - index_value requirements: - binding: @@ -607,9 +607,15 @@ topology_template: binding_cif: - cif - binding + feature_cif_cif_ims_li_0_port_4: + - cif_cif_ims_li_0_port_4 + - feature disk.device.read.requests_cif: - cif - disk.device.read.requests + network.outgoing.bytes.rate_cif_cif_ims_li_0_port_4: + - cif_cif_ims_li_0_port_4 + - network.outgoing.bytes.rate disk.latency_cif: - cif - disk.latency @@ -619,33 +625,27 @@ topology_template: memory.usage_cif: - cif - memory.usage - attachment_cif_cif_internal_0_port: - - cif_cif_internal_0_port - - attachment + network.outgoing.bytes_cif_cif_internal_0_port_0: + - cif_cif_internal_0_port_0 + - network.outgoing.bytes network.incoming.bytes.rate_cif_cif_oam_0_port_3: - cif_cif_oam_0_port_3 - network.incoming.bytes.rate - network.incoming.packets.rate_cif_cif_ims_core_0_port: - - cif_cif_ims_core_0_port - - network.incoming.packets.rate network.incoming.bytes.rate_cif_cif_oam_0_port_1: - cif_cif_oam_0_port_1 - network.incoming.bytes.rate - network.outgoing.packets.rate_cif_cif_internal_0_port: - - cif_cif_internal_0_port - - network.outgoing.packets.rate - network.outgoing.bytes.rate_cif_cif_ims_li_0_port: - - cif_cif_ims_li_0_port - - network.outgoing.bytes.rate + attachment_cif_cif_internal_0_port_0: + - cif_cif_internal_0_port_0 + - attachment instance_cif: - cif - instance - forwarder_cif_cif_ims_core_0_port: - - cif_cif_ims_core_0_port - - forwarder - network.incoming.bytes_cif_cif_ims_li_0_port: - - cif_cif_ims_li_0_port - - network.incoming.bytes + network.outgoing.bytes.rate_cif_cif_ims_core_0_port_2: + - cif_cif_ims_core_0_port_2 + - network.outgoing.bytes.rate + feature_cif_cif_internal_0_port_0: + - cif_cif_internal_0_port_0 + - feature network.outgoing.bytes.rate_cif_cif_oam_0_port_3: - cif_cif_oam_0_port_3 - network.outgoing.bytes.rate @@ -655,33 +655,27 @@ topology_template: network.outpoing.packets_cif_cif_oam_0_port_1: - cif_cif_oam_0_port_1 - network.outpoing.packets - network.incoming.packets.rate_cif_cif_ims_li_0_port: - - cif_cif_ims_li_0_port - - network.incoming.packets.rate - network.incoming.bytes.rate_cif_cif_ims_li_0_port: - - cif_cif_ims_li_0_port - - network.incoming.bytes.rate disk.root.size_cif: - cif - disk.root.size + forwarder_cif_cif_internal_0_port_0: + - cif_cif_internal_0_port_0 + - forwarder memory.resident_cif: - cif - memory.resident - network.incoming.packets_cif_cif_ims_li_0_port: - - cif_cif_ims_li_0_port - - network.incoming.packets - network.incoming.packets_cif_cif_ims_core_0_port: - - cif_cif_ims_core_0_port - - network.incoming.packets + network.outgoing.bytes_cif_cif_ims_li_0_port_4: + - cif_cif_ims_li_0_port_4 + - network.outgoing.bytes disk.usage_cif: - cif - disk.usage + network.incoming.packets.rate_cif_cif_ims_li_0_port_4: + - cif_cif_ims_li_0_port_4 + - network.incoming.packets.rate disk.ephemeral.size_cif: - cif - disk.ephemeral.size - network.outgoing.bytes_cif_cif_ims_li_0_port: - - cif_cif_ims_li_0_port - - network.outgoing.bytes disk.write.requests.rate_cif: - cif - disk.write.requests.rate @@ -691,72 +685,63 @@ topology_template: disk.device.read.requests.rate_cif: - cif - disk.device.read.requests.rate - network.incoming.bytes_cif_cif_internal_0_port: - - cif_cif_internal_0_port - - network.incoming.bytes - attachment_cif_cif_ims_li_0_port: - - cif_cif_ims_li_0_port - - attachment - network.outgoing.packets.rate_cif_cif_ims_li_0_port: - - cif_cif_ims_li_0_port - - network.outgoing.packets.rate disk.device.allocation_cif: - cif - disk.device.allocation - binding_cif_cif_internal_0_port: - - cif_cif_internal_0_port - - binding - network.outgoing.packets.rate_cif_cif_ims_core_0_port: - - cif_cif_ims_core_0_port - - network.outgoing.packets.rate disk.device.read.bytes.rate_cif: - cif - disk.device.read.bytes.rate vcpus_cif: - cif - vcpus - network.incoming.packets.rate_cif_cif_internal_0_port: - - cif_cif_internal_0_port - - network.incoming.packets.rate + network.incoming.bytes_cif_cif_internal_0_port_0: + - cif_cif_internal_0_port_0 + - network.incoming.bytes endpoint_cif: - cif - endpoint + binding_cif_cif_ims_core_0_port_2: + - cif_cif_ims_core_0_port_2 + - binding disk.device.usage_cif: - cif - disk.device.usage - forwarder_cif_cif_ims_li_0_port: - - cif_cif_ims_li_0_port - - forwarder network.outgoing.packets.rate_cif_cif_oam_0_port_1: - cif_cif_oam_0_port_1 - network.outgoing.packets.rate network.incoming.bytes_cif_cif_oam_0_port_1: - cif_cif_oam_0_port_1 - network.incoming.bytes + network.outpoing.packets_cif_cif_ims_li_0_port_4: + - cif_cif_ims_li_0_port_4 + - network.outpoing.packets network.incoming.bytes_cif_cif_oam_0_port_3: - cif_cif_oam_0_port_3 - network.incoming.bytes - network.outpoing.packets_cif_cif_ims_core_0_port: - - cif_cif_ims_core_0_port - - network.outpoing.packets + network.incoming.packets.rate_cif_cif_ims_core_0_port_2: + - cif_cif_ims_core_0_port_2 + - network.incoming.packets.rate + attachment_cif_cif_ims_core_0_port_2: + - cif_cif_ims_core_0_port_2 + - attachment disk.read.requests_cif: - cif - disk.read.requests + forwarder_cif_cif_ims_core_0_port_2: + - cif_cif_ims_core_0_port_2 + - forwarder disk.write.bytes_cif: - cif - disk.write.bytes - network.outgoing.bytes_cif_cif_ims_core_0_port: - - cif_cif_ims_core_0_port - - network.outgoing.bytes + network.outpoing.packets_cif_cif_ims_core_0_port_2: + - cif_cif_ims_core_0_port_2 + - network.outpoing.packets disk.device.capacity_cif: - cif - disk.device.capacity feature_cif_cif_oam_0_port_3: - cif_cif_oam_0_port_3 - feature - network.incoming.bytes_cif_cif_ims_core_0_port: - - cif_cif_ims_core_0_port - - network.incoming.bytes feature_cif_cif_oam_0_port_1: - cif_cif_oam_0_port_1 - feature @@ -769,27 +754,39 @@ topology_template: cpu_cif: - cif - cpu + network.outgoing.bytes_cif_cif_ims_core_0_port_2: + - cif_cif_ims_core_0_port_2 + - network.outgoing.bytes disk.device.read.bytes_cif: - cif - disk.device.read.bytes - forwarder_cif_cif_internal_0_port: - - cif_cif_internal_0_port - - forwarder forwarder_cif_cif_oam_0_port_1: - cif_cif_oam_0_port_1 - forwarder + network.incoming.bytes.rate_cif_cif_ims_li_0_port_4: + - cif_cif_ims_li_0_port_4 + - network.incoming.bytes.rate forwarder_cif_cif_oam_0_port_3: - cif_cif_oam_0_port_3 - forwarder + network.incoming.bytes.rate_cif_cif_ims_core_0_port_2: + - cif_cif_ims_core_0_port_2 + - network.incoming.bytes.rate + network.outgoing.packets.rate_cif_cif_ims_core_0_port_2: + - cif_cif_ims_core_0_port_2 + - network.outgoing.packets.rate + network.incoming.packets_cif_cif_internal_0_port_0: + - cif_cif_internal_0_port_0 + - network.incoming.packets feature_cif: - cif - feature + network.incoming.packets_cif_cif_ims_li_0_port_4: + - cif_cif_ims_li_0_port_4 + - network.incoming.packets binding_cif_cif_oam_0_port_1: - cif_cif_oam_0_port_1 - binding - network.incoming.bytes.rate_cif_cif_internal_0_port: - - cif_cif_internal_0_port - - network.incoming.bytes.rate binding_cif_cif_oam_0_port_3: - cif_cif_oam_0_port_3 - binding @@ -799,42 +796,42 @@ topology_template: disk.device.write.bytes_cif: - cif - disk.device.write.bytes - network.outgoing.bytes_cif_cif_internal_0_port: - - cif_cif_internal_0_port - - network.outgoing.bytes - feature_cif_cif_internal_0_port: - - cif_cif_internal_0_port - - feature + network.incoming.bytes_cif_cif_ims_li_0_port_4: + - cif_cif_ims_li_0_port_4 + - network.incoming.bytes network.incoming.packets_cif_cif_oam_0_port_1: - cif_cif_oam_0_port_1 - network.incoming.packets + attachment_cif_cif_ims_li_0_port_4: + - cif_cif_ims_li_0_port_4 + - attachment network.incoming.packets_cif_cif_oam_0_port_3: - cif_cif_oam_0_port_3 - network.incoming.packets - feature_cif_cif_ims_li_0_port: - - cif_cif_ims_li_0_port - - feature network.outgoing.bytes_cif_cif_oam_0_port_3: - cif_cif_oam_0_port_3 - network.outgoing.bytes network.outgoing.bytes_cif_cif_oam_0_port_1: - cif_cif_oam_0_port_1 - network.outgoing.bytes - binding_cif_cif_ims_core_0_port: - - cif_cif_ims_core_0_port - - binding + network.outgoing.packets.rate_cif_cif_ims_li_0_port_4: + - cif_cif_ims_li_0_port_4 + - network.outgoing.packets.rate + feature_cif_cif_ims_core_0_port_2: + - cif_cif_ims_core_0_port_2 + - feature disk.allocation_cif: - cif - disk.allocation disk.device.iops_cif: - cif - disk.device.iops + network.incoming.bytes_cif_cif_ims_core_0_port_2: + - cif_cif_ims_core_0_port_2 + - network.incoming.bytes disk.device.write.requests_cif: - cif - disk.device.write.requests - network.outpoing.packets_cif_cif_internal_0_port: - - cif_cif_internal_0_port - - network.outpoing.packets network.outgoing.packets.rate_cif_cif_oam_0_port_3: - cif_cif_oam_0_port_3 - network.outgoing.packets.rate @@ -850,45 +847,45 @@ topology_template: scalable_cif: - cif - scalable - binding_cif_cif_ims_li_0_port: - - cif_cif_ims_li_0_port - - binding disk.device.write.bytes.rate_cif: - cif - disk.device.write.bytes.rate + network.outgoing.bytes.rate_cif_cif_internal_0_port_0: + - cif_cif_internal_0_port_0 + - network.outgoing.bytes.rate disk.iops_cif: - cif - disk.iops disk.read.bytes.rate_cif: - cif - disk.read.bytes.rate - network.incoming.bytes.rate_cif_cif_ims_core_0_port: - - cif_cif_ims_core_0_port - - network.incoming.bytes.rate + network.outpoing.packets_cif_cif_internal_0_port_0: + - cif_cif_internal_0_port_0 + - network.outpoing.packets + binding_cif_cif_ims_li_0_port_4: + - cif_cif_ims_li_0_port_4 + - binding + network.incoming.packets.rate_cif_cif_internal_0_port_0: + - cif_cif_internal_0_port_0 + - network.incoming.packets.rate disk.write.requests_cif: - cif - disk.write.requests memory_cif: - cif - memory - attachment_cif_cif_ims_core_0_port: - - cif_cif_ims_core_0_port - - attachment - network.outgoing.bytes.rate_cif_cif_ims_core_0_port: - - cif_cif_ims_core_0_port - - network.outgoing.bytes.rate disk.capacity_cif: - cif - disk.capacity network.outgoing.bytes.rate_cif_cif_oam_0_port_1: - cif_cif_oam_0_port_1 - network.outgoing.bytes.rate - network.outpoing.packets_cif_cif_ims_li_0_port: - - cif_cif_ims_li_0_port - - network.outpoing.packets - feature_cif_cif_ims_core_0_port: - - cif_cif_ims_core_0_port - - feature + binding_cif_cif_internal_0_port_0: + - cif_cif_internal_0_port_0 + - binding + forwarder_cif_cif_ims_li_0_port_4: + - cif_cif_ims_li_0_port_4 + - forwarder attachment_cif_cif_oam_0_port_3: - cif_cif_oam_0_port_3 - attachment @@ -898,49 +895,52 @@ topology_template: disk.device.latency_cif: - cif - disk.device.latency - network.incoming.packets_cif_cif_internal_0_port: - - cif_cif_internal_0_port - - network.incoming.packets + network.incoming.bytes.rate_cif_cif_internal_0_port_0: + - cif_cif_internal_0_port_0 + - network.incoming.bytes.rate disk.device.write.requests.rate_cif: - cif - disk.device.write.requests.rate - network.outgoing.bytes.rate_cif_cif_internal_0_port: - - cif_cif_internal_0_port - - network.outgoing.bytes.rate + network.outgoing.packets.rate_cif_cif_internal_0_port_0: + - cif_cif_internal_0_port_0 + - network.outgoing.packets.rate + network.incoming.packets_cif_cif_ims_core_0_port_2: + - cif_cif_ims_core_0_port_2 + - network.incoming.packets requirements: - link_cif_cif_ims_core_0_port: - - cif_cif_ims_core_0_port + link_cif_cif_ims_core_0_port_2: + - cif_cif_ims_core_0_port_2 + - link + link_cif_cif_ims_li_0_port_4: + - cif_cif_ims_li_0_port_4 - link - dependency_cif_cif_ims_li_0_port: - - cif_cif_ims_li_0_port - - dependency dependency_cif_cif_oam_0_port_1: - cif_cif_oam_0_port_1 - dependency + dependency_cif_cif_ims_li_0_port_4: + - cif_cif_ims_li_0_port_4 + - dependency dependency_cif: - cif - dependency - dependency_cif_cif_ims_core_0_port: - - cif_cif_ims_core_0_port - - dependency dependency_cif_cif_oam_0_port_3: - cif_cif_oam_0_port_3 - dependency local_storage_cif: - cif - local_storage - dependency_cif_cif_internal_0_port: - - cif_cif_internal_0_port + dependency_cif_cif_internal_0_port_0: + - cif_cif_internal_0_port_0 - dependency - link_cif_cif_ims_li_0_port: - - cif_cif_ims_li_0_port - - link link_cif_cif_oam_0_port_1: - cif_cif_oam_0_port_1 - link - link_cif_cif_internal_0_port: - - cif_cif_internal_0_port + dependency_cif_cif_ims_core_0_port_2: + - cif_cif_ims_core_0_port_2 + - dependency + link_cif_cif_internal_0_port_0: + - cif_cif_internal_0_port_0 - link link_cif_cif_oam_0_port_3: - cif_cif_oam_0_port_3 - - link \ No newline at end of file + - link diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cif_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cif_1ServiceTemplate.yaml index ae63110bf0..87e2c0eaa7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cif_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cif_1ServiceTemplate.yaml @@ -16,16 +16,25 @@ topology_template: required: true entry_schema: type: string - port_cif_ims_core_1_port_security_groups: - type: list + port_cif_ims_core_1_port_2_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_cif_ims_li_1_port_4_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_cif_ims_li_1_port_4_subnetpoolid: + type: string required: true - entry_schema: - type: json port_cif_oam_1_port_3_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements + port_cif_ims_core_1_port_2_fixed_ips: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps port_cif_oam_1_port_1_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -34,9 +43,6 @@ topology_template: required: true entry_schema: type: string - port_cif_internal_1_port_subnetpoolid: - type: string - required: true vm_flavor_name: type: string required: true @@ -48,6 +54,12 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_cif_ims_core_1_port_2_subnetpoolid: + type: string + required: true + port_cif_internal_1_port_0_network_role_tag: + type: string + required: true vm_image_name: type: string required: true @@ -64,58 +76,45 @@ topology_template: port_cif_oam_1_port_1_subnetpoolid: type: string required: true + port_cif_internal_1_port_0_allowed_address_pairs: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.heat.network.AddressPair compute_cif_scheduler_hints: type: list required: true entry_schema: type: json - port_cif_ims_li_1_port_order: - type: integer - required: true port_cif_oam_1_port_3_ip_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_cif_internal_1_port_security_groups: + port_cif_ims_core_1_port_2_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_cif_ims_li_1_port_4_name: type: list required: true entry_schema: - type: json + type: string port_cif_oam_1_port_1_network: type: list required: true entry_schema: type: string - port_cif_internal_1_port_order: + port_cif_internal_1_port_0_order: type: integer required: true - port_cif_ims_core_1_port_network_role_tag: - type: string - required: true - port_cif_ims_li_1_port_security_groups: - type: list - required: true - entry_schema: - type: json - port_cif_ims_li_1_port_subnetpoolid: + port_cif_ims_li_1_port_4_network_role_tag: type: string required: true - port_cif_ims_core_1_port_related_networks: + port_cif_internal_1_port_0_fixed_ips: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_cif_ims_li_1_port_allowed_address_pairs: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.heat.network.AddressPair - port_cif_internal_1_port_allowed_address_pairs: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.heat.network.AddressPair + type: org.openecomp.datatypes.heat.neutron.port.FixedIps port_cif_oam_1_port_3_security_groups: type: list required: true @@ -126,57 +125,62 @@ topology_template: required: true entry_schema: type: json - port_cif_ims_li_1_port_network_role: + port_cif_internal_1_port_0_subnetpoolid: type: string required: true - port_cif_ims_core_1_port_order: - type: integer + port_cif_ims_core_1_port_2_allowed_address_pairs: + type: list required: true - port_cif_oam_1_port_3_order: + entry_schema: + type: org.openecomp.datatypes.heat.network.AddressPair + port_cif_internal_1_port_0_network_role: + type: string + required: true + port_cif_ims_li_1_port_4_order: type: integer required: true - port_cif_internal_1_port_vlan_requirements: + port_cif_ims_core_1_port_2_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_cif_internal_1_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_cif_internal_1_port_related_networks: + type: org.openecomp.datatypes.network.IpRequirements + port_cif_ims_core_1_port_2_security_groups: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments + type: json + port_cif_oam_1_port_3_order: + type: integer + required: true port_cif_oam_1_port_1_fixed_ips: type: list required: true entry_schema: type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_cif_internal_1_port_network: + port_cif_oam_1_port_3_fixed_ips: type: list required: true entry_schema: - type: string - port_cif_ims_core_1_port_network: - type: list + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_cif_ims_core_1_port_2_network_role: + type: string required: true - entry_schema: - type: string - port_cif_oam_1_port_3_fixed_ips: + port_cif_ims_li_1_port_4_allowed_address_pairs: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_cif_ims_li_1_port_exCP_naming: + type: org.openecomp.datatypes.heat.network.AddressPair + port_cif_internal_1_port_0_exCP_naming: type: org.openecomp.datatypes.Naming required: true port_cif_oam_1_port_3_network_role: type: string required: true - port_cif_internal_1_port_network_role: - type: string + port_cif_ims_core_1_port_2_name: + type: list required: true + entry_schema: + type: string port_cif_oam_1_port_1_ip_requirements: type: list required: true @@ -185,10 +189,7 @@ topology_template: port_cif_oam_1_port_1_order: type: integer required: true - port_cif_ims_core_1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_cif_ims_core_1_port_vlan_requirements: + port_cif_ims_li_1_port_4_vlan_requirements: type: list required: true entry_schema: @@ -196,9 +197,6 @@ topology_template: port_cif_oam_1_port_1_network_role: type: string required: true - port_cif_internal_1_port_network_role_tag: - type: string - required: true compute_cif_name: type: list required: true @@ -217,76 +215,68 @@ topology_template: port_cif_oam_1_port_1_exCP_naming: type: org.openecomp.datatypes.Naming required: true - port_cif_internal_1_port_ip_requirements: + port_cif_ims_core_1_port_2_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_cif_ims_li_1_port_name: + type: string + port_cif_ims_li_1_port_4_network_role: + type: string + required: true + port_cif_internal_1_port_0_related_networks: type: list required: true entry_schema: - type: string - port_cif_internal_1_port_name: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_cif_internal_1_port_0_name: type: list required: true entry_schema: type: string - port_cif_ims_li_1_port_fixed_ips: + port_cif_ims_li_1_port_4_related_networks: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_cif_ims_li_1_port_vlan_requirements: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_cif_internal_1_port_0_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_cif_internal_1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_cif_ims_li_1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_cif_ims_li_1_port_ip_requirements: + port_cif_ims_li_1_port_4_security_groups: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_cif_ims_core_1_port_fixed_ips: + type: json + port_cif_ims_li_1_port_4_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_cif_ims_core_1_port_allowed_address_pairs: + type: string + port_cif_internal_1_port_0_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.network.AddressPair + type: org.openecomp.datatypes.network.IpRequirements port_cif_oam_1_port_1_network_role_tag: type: string required: true port_cif_oam_1_port_3_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true - port_cif_ims_core_1_port_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_cif_ims_li_1_port_network: - type: list - required: true - entry_schema: - type: string port_cif_oam_1_port_1_related_networks: type: list required: true entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_cif_ims_core_1_port_subnetpoolid: + port_cif_ims_core_1_port_2_network_role_tag: type: string required: true + port_cif_internal_1_port_0_security_groups: + type: list + required: true + entry_schema: + type: json index_value: type: integer description: Index value of this substitution service template runtime instance @@ -294,40 +284,50 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_cif_internal_1_port_fixed_ips: + port_cif_ims_core_1_port_2_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_cif_ims_core_1_port_name: + type: org.openecomp.datatypes.network.VlanRequirements + compute_cif_config_drive: type: list required: true entry_schema: - type: string - compute_cif_config_drive: + type: boolean + port_cif_ims_core_1_port_2_related_networks: type: list required: true entry_schema: - type: boolean + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_cif_ims_li_1_port_4_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_cif_ims_li_1_port_4_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true port_cif_oam_1_port_3_exCP_naming: type: org.openecomp.datatypes.Naming required: true - port_cif_oam_1_port_3_name: + port_cif_ims_li_1_port_4_fixed_ips: type: list required: true entry_schema: - type: string - port_cif_ims_li_1_port_related_networks: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_cif_ims_core_1_port_2_order: + type: integer + required: true + port_cif_internal_1_port_0_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_cif_ims_li_1_port_network_role_tag: - type: string - required: true - port_cif_ims_core_1_port_exCP_naming: - type: org.openecomp.datatypes.Naming + type: string + port_cif_oam_1_port_3_name: + type: list required: true + entry_schema: + type: string port_cif_oam_1_port_1_security_groups: type: list required: true @@ -338,8 +338,8 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.heat.network.AddressPair - port_cif_ims_core_1_port_network_role: - type: string + port_cif_internal_1_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true port_cif_oam_1_port_3_network_role_tag: type: string @@ -376,225 +376,225 @@ topology_template: get_input: - compute_cif_user_data_format - index_value - cif_cif_ims_li_1_port: + cif_cif_ims_li_1_port_4: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_requirements: - get_input: port_cif_ims_li_1_port_mac_requirements + get_input: port_cif_ims_li_1_port_4_mac_requirements allowed_address_pairs: - get_input: port_cif_ims_li_1_port_allowed_address_pairs + get_input: port_cif_ims_li_1_port_4_allowed_address_pairs order: - get_input: port_cif_ims_li_1_port_order + get_input: port_cif_ims_li_1_port_4_order security_groups: get_input: - - port_cif_ims_li_1_port_security_groups + - port_cif_ims_li_1_port_4_security_groups - index_value exCP_naming: - get_input: port_cif_ims_li_1_port_exCP_naming + get_input: port_cif_ims_li_1_port_4_exCP_naming vlan_requirements: - get_input: port_cif_ims_li_1_port_vlan_requirements + get_input: port_cif_ims_li_1_port_4_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_cif_ims_li_1_port_related_networks + get_input: port_cif_ims_li_1_port_4_related_networks ip_requirements: - get_input: port_cif_ims_li_1_port_ip_requirements + get_input: port_cif_ims_li_1_port_4_ip_requirements network_role_tag: - get_input: port_cif_ims_li_1_port_network_role_tag + get_input: port_cif_ims_li_1_port_4_network_role_tag network_role: - get_input: port_cif_ims_li_1_port_network_role + get_input: port_cif_ims_li_1_port_4_network_role subnetpoolid: - get_input: port_cif_ims_li_1_port_subnetpoolid + get_input: port_cif_ims_li_1_port_4_subnetpoolid fixed_ips: get_input: - - port_cif_ims_li_1_port_fixed_ips + - port_cif_ims_li_1_port_4_fixed_ips - index_value name: get_input: - - port_cif_ims_li_1_port_name + - port_cif_ims_li_1_port_4_name - index_value network: get_input: - - port_cif_ims_li_1_port_network + - port_cif_ims_li_1_port_4_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: cif relationship: tosca.relationships.network.BindsTo - cif_cif_internal_1_port: + cif_cif_oam_1_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_requirements: - get_input: port_cif_internal_1_port_mac_requirements + get_input: port_cif_oam_1_port_1_mac_requirements allowed_address_pairs: - get_input: port_cif_internal_1_port_allowed_address_pairs + get_input: port_cif_oam_1_port_1_allowed_address_pairs order: - get_input: port_cif_internal_1_port_order + get_input: port_cif_oam_1_port_1_order security_groups: get_input: - - port_cif_internal_1_port_security_groups + - port_cif_oam_1_port_1_security_groups - index_value exCP_naming: - get_input: port_cif_internal_1_port_exCP_naming + get_input: port_cif_oam_1_port_1_exCP_naming vlan_requirements: - get_input: port_cif_internal_1_port_vlan_requirements + get_input: port_cif_oam_1_port_1_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_cif_internal_1_port_related_networks + get_input: port_cif_oam_1_port_1_related_networks ip_requirements: - get_input: port_cif_internal_1_port_ip_requirements + get_input: port_cif_oam_1_port_1_ip_requirements network_role_tag: - get_input: port_cif_internal_1_port_network_role_tag + get_input: port_cif_oam_1_port_1_network_role_tag network_role: - get_input: port_cif_internal_1_port_network_role + get_input: port_cif_oam_1_port_1_network_role subnetpoolid: - get_input: port_cif_internal_1_port_subnetpoolid + get_input: port_cif_oam_1_port_1_subnetpoolid fixed_ips: get_input: - - port_cif_internal_1_port_fixed_ips + - port_cif_oam_1_port_1_fixed_ips - index_value name: get_input: - - port_cif_internal_1_port_name + - port_cif_oam_1_port_1_name - index_value network: get_input: - - port_cif_internal_1_port_network + - port_cif_oam_1_port_1_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: cif relationship: tosca.relationships.network.BindsTo - cif_cif_oam_1_port_1: + cif_cif_oam_1_port_3: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_requirements: - get_input: port_cif_oam_1_port_1_mac_requirements + get_input: port_cif_oam_1_port_3_mac_requirements allowed_address_pairs: - get_input: port_cif_oam_1_port_1_allowed_address_pairs + get_input: port_cif_oam_1_port_3_allowed_address_pairs order: - get_input: port_cif_oam_1_port_1_order + get_input: port_cif_oam_1_port_3_order security_groups: get_input: - - port_cif_oam_1_port_1_security_groups + - port_cif_oam_1_port_3_security_groups - index_value exCP_naming: - get_input: port_cif_oam_1_port_1_exCP_naming + get_input: port_cif_oam_1_port_3_exCP_naming vlan_requirements: - get_input: port_cif_oam_1_port_1_vlan_requirements + get_input: port_cif_oam_1_port_3_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_cif_oam_1_port_1_related_networks + get_input: port_cif_oam_1_port_3_related_networks ip_requirements: - get_input: port_cif_oam_1_port_1_ip_requirements + get_input: port_cif_oam_1_port_3_ip_requirements network_role_tag: - get_input: port_cif_oam_1_port_1_network_role_tag + get_input: port_cif_oam_1_port_3_network_role_tag network_role: - get_input: port_cif_oam_1_port_1_network_role + get_input: port_cif_oam_1_port_3_network_role subnetpoolid: - get_input: port_cif_oam_1_port_1_subnetpoolid + get_input: port_cif_oam_1_port_3_subnetpoolid fixed_ips: get_input: - - port_cif_oam_1_port_1_fixed_ips + - port_cif_oam_1_port_3_fixed_ips - index_value name: get_input: - - port_cif_oam_1_port_1_name + - port_cif_oam_1_port_3_name - index_value network: get_input: - - port_cif_oam_1_port_1_network + - port_cif_oam_1_port_3_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: cif relationship: tosca.relationships.network.BindsTo - cif_cif_ims_core_1_port: + cif_cif_internal_1_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_requirements: - get_input: port_cif_ims_core_1_port_mac_requirements + get_input: port_cif_internal_1_port_0_mac_requirements allowed_address_pairs: - get_input: port_cif_ims_core_1_port_allowed_address_pairs + get_input: port_cif_internal_1_port_0_allowed_address_pairs order: - get_input: port_cif_ims_core_1_port_order + get_input: port_cif_internal_1_port_0_order security_groups: get_input: - - port_cif_ims_core_1_port_security_groups + - port_cif_internal_1_port_0_security_groups - index_value exCP_naming: - get_input: port_cif_ims_core_1_port_exCP_naming + get_input: port_cif_internal_1_port_0_exCP_naming vlan_requirements: - get_input: port_cif_ims_core_1_port_vlan_requirements + get_input: port_cif_internal_1_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_cif_ims_core_1_port_related_networks + get_input: port_cif_internal_1_port_0_related_networks ip_requirements: - get_input: port_cif_ims_core_1_port_ip_requirements + get_input: port_cif_internal_1_port_0_ip_requirements network_role_tag: - get_input: port_cif_ims_core_1_port_network_role_tag + get_input: port_cif_internal_1_port_0_network_role_tag network_role: - get_input: port_cif_ims_core_1_port_network_role + get_input: port_cif_internal_1_port_0_network_role subnetpoolid: - get_input: port_cif_ims_core_1_port_subnetpoolid + get_input: port_cif_internal_1_port_0_subnetpoolid fixed_ips: get_input: - - port_cif_ims_core_1_port_fixed_ips + - port_cif_internal_1_port_0_fixed_ips - index_value name: get_input: - - port_cif_ims_core_1_port_name + - port_cif_internal_1_port_0_name - index_value network: get_input: - - port_cif_ims_core_1_port_network + - port_cif_internal_1_port_0_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: cif relationship: tosca.relationships.network.BindsTo - cif_cif_oam_1_port_3: + cif_cif_ims_core_1_port_2: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_requirements: - get_input: port_cif_oam_1_port_3_mac_requirements + get_input: port_cif_ims_core_1_port_2_mac_requirements allowed_address_pairs: - get_input: port_cif_oam_1_port_3_allowed_address_pairs + get_input: port_cif_ims_core_1_port_2_allowed_address_pairs order: - get_input: port_cif_oam_1_port_3_order + get_input: port_cif_ims_core_1_port_2_order security_groups: get_input: - - port_cif_oam_1_port_3_security_groups + - port_cif_ims_core_1_port_2_security_groups - index_value exCP_naming: - get_input: port_cif_oam_1_port_3_exCP_naming + get_input: port_cif_ims_core_1_port_2_exCP_naming vlan_requirements: - get_input: port_cif_oam_1_port_3_vlan_requirements + get_input: port_cif_ims_core_1_port_2_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_cif_oam_1_port_3_related_networks + get_input: port_cif_ims_core_1_port_2_related_networks ip_requirements: - get_input: port_cif_oam_1_port_3_ip_requirements + get_input: port_cif_ims_core_1_port_2_ip_requirements network_role_tag: - get_input: port_cif_oam_1_port_3_network_role_tag + get_input: port_cif_ims_core_1_port_2_network_role_tag network_role: - get_input: port_cif_oam_1_port_3_network_role + get_input: port_cif_ims_core_1_port_2_network_role subnetpoolid: - get_input: port_cif_oam_1_port_3_subnetpoolid + get_input: port_cif_ims_core_1_port_2_subnetpoolid fixed_ips: get_input: - - port_cif_oam_1_port_3_fixed_ips + - port_cif_ims_core_1_port_2_fixed_ips - index_value name: get_input: - - port_cif_oam_1_port_3_name + - port_cif_ims_core_1_port_2_name - index_value network: get_input: - - port_cif_oam_1_port_3_network + - port_cif_ims_core_1_port_2_network - index_value requirements: - binding: @@ -610,6 +610,9 @@ topology_template: disk.device.read.requests_cif: - cif - disk.device.read.requests + network.outgoing.bytes.rate_cif_cif_ims_li_1_port_4: + - cif_cif_ims_li_1_port_4 + - network.outgoing.bytes.rate disk.latency_cif: - cif - disk.latency @@ -619,27 +622,36 @@ topology_template: memory.usage_cif: - cif - memory.usage - attachment_cif_cif_ims_li_1_port: - - cif_cif_ims_li_1_port - - attachment + network.outgoing.bytes_cif_cif_internal_1_port_0: + - cif_cif_internal_1_port_0 + - network.outgoing.bytes network.incoming.bytes.rate_cif_cif_oam_1_port_3: - cif_cif_oam_1_port_3 - network.incoming.bytes.rate - network.incoming.packets_cif_cif_internal_1_port: - - cif_cif_internal_1_port - - network.incoming.packets - feature_cif_cif_ims_core_1_port: - - cif_cif_ims_core_1_port + attachment_cif_cif_internal_1_port_0: + - cif_cif_internal_1_port_0 + - attachment + feature_cif_cif_internal_1_port_0: + - cif_cif_internal_1_port_0 - feature instance_cif: - cif - instance + network.outgoing.bytes.rate_cif_cif_ims_core_1_port_2: + - cif_cif_ims_core_1_port_2 + - network.outgoing.bytes.rate + feature_cif_cif_ims_li_1_port_4: + - cif_cif_ims_li_1_port_4 + - feature network.incoming.bytes.rate_cif_cif_oam_1_port_1: - cif_cif_oam_1_port_1 - network.incoming.bytes.rate - network.outgoing.bytes_cif_cif_ims_li_1_port: - - cif_cif_ims_li_1_port - - network.outgoing.bytes + binding_cif_cif_internal_1_port_0: + - cif_cif_internal_1_port_0 + - binding + forwarder_cif_cif_ims_li_1_port_4: + - cif_cif_ims_li_1_port_4 + - forwarder network.incoming.packets.rate_cif_cif_oam_1_port_1: - cif_cif_oam_1_port_1 - network.incoming.packets.rate @@ -655,39 +667,45 @@ topology_template: memory.resident_cif: - cif - memory.resident - network.outgoing.bytes_cif_cif_ims_core_1_port: - - cif_cif_ims_core_1_port - - network.outgoing.bytes network.incoming.packets.rate_cif_cif_oam_1_port_3: - cif_cif_oam_1_port_3 - network.incoming.packets.rate - network.incoming.bytes_cif_cif_ims_li_1_port: - - cif_cif_ims_li_1_port - - network.incoming.bytes + network.outpoing.packets_cif_cif_ims_core_1_port_2: + - cif_cif_ims_core_1_port_2 + - network.outpoing.packets network.incoming.bytes_cif_cif_oam_1_port_1: - cif_cif_oam_1_port_1 - network.incoming.bytes disk.usage_cif: - cif - disk.usage + network.incoming.bytes.rate_cif_cif_ims_li_1_port_4: + - cif_cif_ims_li_1_port_4 + - network.incoming.bytes.rate disk.ephemeral.size_cif: - cif - disk.ephemeral.size + network.incoming.bytes.rate_cif_cif_internal_1_port_0: + - cif_cif_internal_1_port_0 + - network.incoming.bytes.rate disk.write.requests.rate_cif: - cif - disk.write.requests.rate disk.read.bytes_cif: - cif - disk.read.bytes - network.incoming.packets.rate_cif_cif_ims_core_1_port: - - cif_cif_ims_core_1_port - - network.incoming.packets.rate - network.outgoing.packets.rate_cif_cif_internal_1_port: - - cif_cif_internal_1_port + network.outgoing.packets.rate_cif_cif_internal_1_port_0: + - cif_cif_internal_1_port_0 - network.outgoing.packets.rate disk.device.read.requests.rate_cif: - cif - disk.device.read.requests.rate + network.incoming.packets_cif_cif_internal_1_port_0: + - cif_cif_internal_1_port_0 + - network.incoming.packets + network.outgoing.packets.rate_cif_cif_ims_core_1_port_2: + - cif_cif_ims_core_1_port_2 + - network.outgoing.packets.rate disk.device.allocation_cif: - cif - disk.device.allocation @@ -697,23 +715,17 @@ topology_template: vcpus_cif: - cif - vcpus - network.outgoing.packets.rate_cif_cif_ims_li_1_port: - - cif_cif_ims_li_1_port - - network.outgoing.packets.rate - network.incoming.bytes.rate_cif_cif_ims_li_1_port: - - cif_cif_ims_li_1_port - - network.incoming.bytes.rate endpoint_cif: - cif - endpoint - network.incoming.packets.rate_cif_cif_ims_li_1_port: - - cif_cif_ims_li_1_port - - network.incoming.packets.rate + attachment_cif_cif_ims_core_1_port_2: + - cif_cif_ims_core_1_port_2 + - attachment disk.device.usage_cif: - cif - disk.device.usage - network.outpoing.packets_cif_cif_ims_core_1_port: - - cif_cif_ims_core_1_port + network.outpoing.packets_cif_cif_internal_1_port_0: + - cif_cif_internal_1_port_0 - network.outpoing.packets attachment_cif_cif_oam_1_port_1: - cif_cif_oam_1_port_1 @@ -727,18 +739,18 @@ topology_template: network.outgoing.packets.rate_cif_cif_oam_1_port_1: - cif_cif_oam_1_port_1 - network.outgoing.packets.rate + network.outpoing.packets_cif_cif_ims_li_1_port_4: + - cif_cif_ims_li_1_port_4 + - network.outpoing.packets + network.incoming.packets.rate_cif_cif_ims_core_1_port_2: + - cif_cif_ims_core_1_port_2 + - network.incoming.packets.rate disk.read.requests_cif: - cif - disk.read.requests disk.write.bytes_cif: - cif - disk.write.bytes - network.outpoing.packets_cif_cif_ims_li_1_port: - - cif_cif_ims_li_1_port - - network.outpoing.packets - network.outgoing.bytes.rate_cif_cif_ims_li_1_port: - - cif_cif_ims_li_1_port - - network.outgoing.bytes.rate network.outpoing.packets_cif_cif_oam_1_port_3: - cif_cif_oam_1_port_3 - network.outpoing.packets @@ -748,84 +760,72 @@ topology_template: network.outpoing.packets_cif_cif_oam_1_port_1: - cif_cif_oam_1_port_1 - network.outpoing.packets - network.incoming.packets.rate_cif_cif_internal_1_port: - - cif_cif_internal_1_port - - network.incoming.packets.rate + network.incoming.bytes_cif_cif_ims_core_1_port_2: + - cif_cif_ims_core_1_port_2 + - network.incoming.bytes + forwarder_cif_cif_internal_1_port_0: + - cif_cif_internal_1_port_0 + - forwarder + network.outgoing.bytes_cif_cif_ims_li_1_port_4: + - cif_cif_ims_li_1_port_4 + - network.outgoing.bytes cpu_cif: - cif - cpu - network.incoming.bytes_cif_cif_internal_1_port: - - cif_cif_internal_1_port - - network.incoming.bytes - network.outgoing.bytes_cif_cif_internal_1_port: - - cif_cif_internal_1_port - - network.outgoing.bytes disk.device.read.bytes_cif: - cif - disk.device.read.bytes - network.outgoing.bytes.rate_cif_cif_ims_core_1_port: - - cif_cif_ims_core_1_port - - network.outgoing.bytes.rate - network.incoming.packets_cif_cif_ims_core_1_port: - - cif_cif_ims_core_1_port - - network.incoming.packets - network.outpoing.packets_cif_cif_internal_1_port: - - cif_cif_internal_1_port - - network.outpoing.packets feature_cif: - cif - feature - network.incoming.bytes.rate_cif_cif_ims_core_1_port: - - cif_cif_ims_core_1_port - - network.incoming.bytes.rate + network.incoming.packets.rate_cif_cif_ims_li_1_port_4: + - cif_cif_ims_li_1_port_4 + - network.incoming.packets.rate cpu_util_cif: - cif - cpu_util + network.incoming.bytes_cif_cif_ims_li_1_port_4: + - cif_cif_ims_li_1_port_4 + - network.incoming.bytes disk.device.write.bytes_cif: - cif - disk.device.write.bytes - feature_cif_cif_ims_li_1_port: - - cif_cif_ims_li_1_port - - feature + attachment_cif_cif_ims_li_1_port_4: + - cif_cif_ims_li_1_port_4 + - attachment network.incoming.packets_cif_cif_oam_1_port_3: - cif_cif_oam_1_port_3 - network.incoming.packets + network.outgoing.packets.rate_cif_cif_ims_li_1_port_4: + - cif_cif_ims_li_1_port_4 + - network.outgoing.packets.rate network.outgoing.bytes_cif_cif_oam_1_port_3: - cif_cif_oam_1_port_3 - network.outgoing.bytes network.outgoing.bytes_cif_cif_oam_1_port_1: - cif_cif_oam_1_port_1 - network.outgoing.bytes + feature_cif_cif_ims_core_1_port_2: + - cif_cif_ims_core_1_port_2 + - feature disk.allocation_cif: - cif - disk.allocation - network.outgoing.bytes.rate_cif_cif_internal_1_port: - - cif_cif_internal_1_port - - network.outgoing.bytes.rate disk.device.iops_cif: - cif - disk.device.iops disk.device.write.requests_cif: - cif - disk.device.write.requests - network.incoming.bytes.rate_cif_cif_internal_1_port: - - cif_cif_internal_1_port - - network.incoming.bytes.rate - binding_cif_cif_ims_core_1_port: - - cif_cif_ims_core_1_port - - binding - attachment_cif_cif_ims_core_1_port: - - cif_cif_ims_core_1_port - - attachment + network.outgoing.bytes_cif_cif_ims_core_1_port_2: + - cif_cif_ims_core_1_port_2 + - network.outgoing.bytes attachment_cif_cif_oam_1_port_3: - cif_cif_oam_1_port_3 - attachment disk.write.bytes.rate_cif: - cif - disk.write.bytes.rate - network.incoming.bytes_cif_cif_ims_core_1_port: - - cif_cif_ims_core_1_port - - network.incoming.bytes host_cif: - cif - host @@ -838,42 +838,57 @@ topology_template: cpu.delta_cif: - cif - cpu.delta + network.incoming.bytes.rate_cif_cif_ims_core_1_port_2: + - cif_cif_ims_core_1_port_2 + - network.incoming.bytes.rate scalable_cif: - cif - scalable + network.incoming.packets_cif_cif_ims_li_1_port_4: + - cif_cif_ims_li_1_port_4 + - network.incoming.packets binding_cif_cif_oam_1_port_3: - cif_cif_oam_1_port_3 - binding - feature_cif_cif_internal_1_port: - - cif_cif_internal_1_port - - feature + network.incoming.packets_cif_cif_ims_core_1_port_2: + - cif_cif_ims_core_1_port_2 + - network.incoming.packets binding_cif_cif_oam_1_port_1: - cif_cif_oam_1_port_1 - binding + network.incoming.bytes_cif_cif_internal_1_port_0: + - cif_cif_internal_1_port_0 + - network.incoming.bytes disk.device.write.bytes.rate_cif: - cif - disk.device.write.bytes.rate + network.outgoing.bytes.rate_cif_cif_internal_1_port_0: + - cif_cif_internal_1_port_0 + - network.outgoing.bytes.rate + binding_cif_cif_ims_core_1_port_2: + - cif_cif_ims_core_1_port_2 + - binding disk.iops_cif: - cif - disk.iops disk.read.bytes.rate_cif: - cif - disk.read.bytes.rate - forwarder_cif_cif_internal_1_port: - - cif_cif_internal_1_port - - forwarder + binding_cif_cif_ims_li_1_port_4: + - cif_cif_ims_li_1_port_4 + - binding disk.write.requests_cif: - cif - disk.write.requests - binding_cif_cif_ims_li_1_port: - - cif_cif_ims_li_1_port - - binding + network.incoming.packets.rate_cif_cif_internal_1_port_0: + - cif_cif_internal_1_port_0 + - network.incoming.packets.rate memory_cif: - cif - memory - network.outgoing.packets.rate_cif_cif_ims_core_1_port: - - cif_cif_ims_core_1_port - - network.outgoing.packets.rate + forwarder_cif_cif_ims_core_1_port_2: + - cif_cif_ims_core_1_port_2 + - forwarder network.outgoing.bytes.rate_cif_cif_oam_1_port_1: - cif_cif_oam_1_port_1 - network.outgoing.bytes.rate @@ -883,64 +898,49 @@ topology_template: network.outgoing.bytes.rate_cif_cif_oam_1_port_3: - cif_cif_oam_1_port_3 - network.outgoing.bytes.rate - binding_cif_cif_internal_1_port: - - cif_cif_internal_1_port - - binding network.incoming.packets_cif_cif_oam_1_port_1: - cif_cif_oam_1_port_1 - network.incoming.packets - forwarder_cif_cif_ims_core_1_port: - - cif_cif_ims_core_1_port - - forwarder disk.device.latency_cif: - cif - disk.device.latency - forwarder_cif_cif_ims_li_1_port: - - cif_cif_ims_li_1_port - - forwarder disk.device.write.requests.rate_cif: - cif - disk.device.write.requests.rate - attachment_cif_cif_internal_1_port: - - cif_cif_internal_1_port - - attachment - network.incoming.packets_cif_cif_ims_li_1_port: - - cif_cif_ims_li_1_port - - network.incoming.packets requirements: - dependency_cif_cif_ims_core_1_port: - - cif_cif_ims_core_1_port - - dependency + link_cif_cif_internal_1_port_0: + - cif_cif_internal_1_port_0 + - link dependency_cif_cif_oam_1_port_3: - cif_cif_oam_1_port_3 - dependency + dependency_cif_cif_ims_li_1_port_4: + - cif_cif_ims_li_1_port_4 + - dependency + link_cif_cif_ims_li_1_port_4: + - cif_cif_ims_li_1_port_4 + - link dependency_cif: - cif - dependency - dependency_cif_cif_ims_li_1_port: - - cif_cif_ims_li_1_port - - dependency local_storage_cif: - cif - local_storage - link_cif_cif_internal_1_port: - - cif_cif_internal_1_port - - link - link_cif_cif_ims_li_1_port: - - cif_cif_ims_li_1_port - - link dependency_cif_cif_oam_1_port_1: - cif_cif_oam_1_port_1 - dependency - dependency_cif_cif_internal_1_port: - - cif_cif_internal_1_port + dependency_cif_cif_internal_1_port_0: + - cif_cif_internal_1_port_0 - dependency link_cif_cif_oam_1_port_1: - cif_cif_oam_1_port_1 - link - link_cif_cif_ims_core_1_port: - - cif_cif_ims_core_1_port + dependency_cif_cif_ims_core_1_port_2: + - cif_cif_ims_core_1_port_2 + - dependency + link_cif_cif_ims_core_1_port_2: + - cif_cif_ims_core_1_port_2 - link link_cif_cif_oam_1_port_3: - cif_cif_oam_1_port_3 - - link \ No newline at end of file + - link diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_lbdServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_lbdServiceTemplate.yaml index 4724e88180..146a882317 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_lbdServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_lbdServiceTemplate.yaml @@ -11,163 +11,145 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_lbd_ims_core_1_port_allowed_address_pairs: + port_lbd_ims_core_1_port_2_security_groups: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.network.AddressPair + type: json compute_lbd_user_data_format: type: list required: true entry_schema: type: string - port_lbd_internal_1_port_name: - type: list - required: true - entry_schema: - type: string - port_lbd_dpdk_1_port_allowed_address_pairs: - type: list + port_lbd_ims_core_1_port_2_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: org.openecomp.datatypes.heat.network.AddressPair - port_lbd_dpdk_1_port_subnetpoolid: - type: string + port_lbd_ims_core_1_port_2_order: + type: integer required: true vm_flavor_name: type: string required: true - port_lbd_internal_1_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_lbd_ims_core_1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true compute_lbd_availability_zone: type: list required: true entry_schema: type: string - port_lbd_internal_1_port_network_role_tag: - type: string + port_lbd_dpdk_1_port_1_related_networks: + type: list required: true - port_lbd_internal_1_port_order: - type: integer + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_lbd_internal_1_port_0_network_role: + type: string required: true vm_image_name: type: string required: true - port_lbd_dpdk_1_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_lbd_internal_1_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_lbd_ims_core_1_port_order: - type: integer + port_lbd_ims_core_1_port_2_subnetpoolid: + type: string required: true - port_lbd_dpdk_1_port_network: + port_lbd_dpdk_1_port_1_ip_requirements: type: list required: true entry_schema: - type: string - port_lbd_ims_core_1_port_name: + type: org.openecomp.datatypes.network.IpRequirements + port_lbd_internal_1_port_0_network: type: list required: true entry_schema: type: string - port_lbd_dpdk_1_port_order: - type: integer + port_lbd_ims_core_1_port_2_network_role_tag: + type: string required: true - port_lbd_ims_core_1_port_network_role: + port_lbd_internal_1_port_0_subnetpoolid: type: string required: true - port_lbd_ims_core_1_port_related_networks: + port_lbd_ims_core_1_port_2_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - compute_lbd_scheduler_hints: + type: org.openecomp.datatypes.network.IpRequirements + port_lbd_dpdk_1_port_1_name: type: list required: true entry_schema: - type: json - port_lbd_dpdk_1_port_name: + type: string + compute_lbd_scheduler_hints: type: list required: true entry_schema: - type: string - port_lbd_ims_core_1_port_exCP_naming: + type: json + port_lbd_ims_core_1_port_2_exCP_naming: type: org.openecomp.datatypes.Naming required: true - port_lbd_internal_1_port_network: + port_lbd_dpdk_1_port_1_order: + type: integer + required: true + compute_lbd_name: type: list required: true entry_schema: type: string - port_lbd_internal_1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - compute_lbd_name: + port_lbd_dpdk_1_port_1_network: type: list required: true entry_schema: type: string - port_lbd_ims_core_1_port_network_role_tag: - type: string + port_lbd_internal_1_port_0_order: + type: integer required: true - port_lbd_internal_1_port_vlan_requirements: + port_lbd_dpdk_1_port_1_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements + port_lbd_dpdk_1_port_1_network_role_tag: + type: string + required: true compute_lbd_config_drive: type: list required: true entry_schema: type: boolean - port_lbd_ims_core_1_port_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_lbd_ims_core_1_port_vlan_requirements: + port_lbd_internal_1_port_0_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_lbd_dpdk_1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_lbd_internal_1_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - port_lbd_internal_1_port_ip_requirements: - type: list + port_lbd_ims_core_1_port_2_network_role: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_lbd_internal_1_port_security_groups: + port_lbd_ims_core_1_port_2_name: type: list required: true entry_schema: - type: json - port_lbd_ims_core_1_port_subnetpoolid: - type: string - required: true - port_lbd_internal_1_port_related_networks: + type: string + port_lbd_internal_1_port_0_fixed_ips: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_lbd_internal_1_port_subnetpoolid: - type: string - required: true - port_lbd_ims_core_1_port_security_groups: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_lbd_ims_core_1_port_2_vlan_requirements: type: list required: true entry_schema: - type: json - port_lbd_ims_core_1_port_fixed_ips: + type: org.openecomp.datatypes.network.VlanRequirements + port_lbd_ims_core_1_port_2_allowed_address_pairs: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_lbd_internal_1_port_fixed_ips: + type: org.openecomp.datatypes.heat.network.AddressPair + port_lbd_dpdk_1_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_lbd_dpdk_1_port_1_fixed_ips: type: list required: true entry_schema: @@ -179,178 +161,196 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_lbd_ims_core_1_port_network: + port_lbd_ims_core_1_port_2_fixed_ips: type: list required: true entry_schema: - type: string - port_lbd_dpdk_1_port_network_role_tag: - type: string - required: true - port_lbd_dpdk_1_port_security_groups: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_lbd_dpdk_1_port_1_security_groups: type: list required: true entry_schema: type: json - port_lbd_dpdk_1_port_fixed_ips: + port_lbd_dpdk_1_port_1_network_role: + type: string + required: true + port_lbd_ims_core_1_port_2_related_networks: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_lbd_internal_1_port_network_role: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_lbd_internal_1_port_0_network_role_tag: type: string required: true - port_lbd_dpdk_1_port_ip_requirements: + port_lbd_dpdk_1_port_1_allowed_address_pairs: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - compute_lbd_metadata: + type: org.openecomp.datatypes.heat.network.AddressPair + port_lbd_internal_1_port_0_security_groups: type: list required: true entry_schema: type: json - port_lbd_dpdk_1_port_vlan_requirements: + port_lbd_internal_1_port_0_related_networks: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_lbd_dpdk_1_port_related_networks: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_lbd_dpdk_1_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + compute_lbd_metadata: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_lbd_dpdk_1_port_network_role: + type: json + port_lbd_dpdk_1_port_1_subnetpoolid: type: string required: true + port_lbd_internal_1_port_0_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_lbd_internal_1_port_0_name: + type: list + required: true + entry_schema: + type: string + port_lbd_ims_core_1_port_2_network: + type: list + required: true + entry_schema: + type: string node_templates: - lbd_lbd_ims_core_1_port: + lbd_lbd_dpdk_1_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_requirements: - get_input: port_lbd_ims_core_1_port_mac_requirements + get_input: port_lbd_dpdk_1_port_1_mac_requirements allowed_address_pairs: - get_input: port_lbd_ims_core_1_port_allowed_address_pairs + get_input: port_lbd_dpdk_1_port_1_allowed_address_pairs order: - get_input: port_lbd_ims_core_1_port_order + get_input: port_lbd_dpdk_1_port_1_order security_groups: get_input: - - port_lbd_ims_core_1_port_security_groups + - port_lbd_dpdk_1_port_1_security_groups - index_value exCP_naming: - get_input: port_lbd_ims_core_1_port_exCP_naming + get_input: port_lbd_dpdk_1_port_1_exCP_naming vlan_requirements: - get_input: port_lbd_ims_core_1_port_vlan_requirements + get_input: port_lbd_dpdk_1_port_1_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_lbd_ims_core_1_port_related_networks + get_input: port_lbd_dpdk_1_port_1_related_networks ip_requirements: - get_input: port_lbd_ims_core_1_port_ip_requirements + get_input: port_lbd_dpdk_1_port_1_ip_requirements network_role_tag: - get_input: port_lbd_ims_core_1_port_network_role_tag + get_input: port_lbd_dpdk_1_port_1_network_role_tag network_role: - get_input: port_lbd_ims_core_1_port_network_role + get_input: port_lbd_dpdk_1_port_1_network_role subnetpoolid: - get_input: port_lbd_ims_core_1_port_subnetpoolid + get_input: port_lbd_dpdk_1_port_1_subnetpoolid fixed_ips: get_input: - - port_lbd_ims_core_1_port_fixed_ips + - port_lbd_dpdk_1_port_1_fixed_ips - index_value name: get_input: - - port_lbd_ims_core_1_port_name + - port_lbd_dpdk_1_port_1_name - index_value network: get_input: - - port_lbd_ims_core_1_port_network + - port_lbd_dpdk_1_port_1_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: lbd relationship: tosca.relationships.network.BindsTo - lbd_lbd_dpdk_1_port: + lbd_lbd_internal_1_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_requirements: - get_input: port_lbd_dpdk_1_port_mac_requirements - allowed_address_pairs: - get_input: port_lbd_dpdk_1_port_allowed_address_pairs + get_input: port_lbd_internal_1_port_0_mac_requirements order: - get_input: port_lbd_dpdk_1_port_order + get_input: port_lbd_internal_1_port_0_order security_groups: get_input: - - port_lbd_dpdk_1_port_security_groups + - port_lbd_internal_1_port_0_security_groups - index_value exCP_naming: - get_input: port_lbd_dpdk_1_port_exCP_naming + get_input: port_lbd_internal_1_port_0_exCP_naming vlan_requirements: - get_input: port_lbd_dpdk_1_port_vlan_requirements + get_input: port_lbd_internal_1_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_lbd_dpdk_1_port_related_networks + get_input: port_lbd_internal_1_port_0_related_networks ip_requirements: - get_input: port_lbd_dpdk_1_port_ip_requirements + get_input: port_lbd_internal_1_port_0_ip_requirements network_role_tag: - get_input: port_lbd_dpdk_1_port_network_role_tag + get_input: port_lbd_internal_1_port_0_network_role_tag network_role: - get_input: port_lbd_dpdk_1_port_network_role - subnetpoolid: - get_input: port_lbd_dpdk_1_port_subnetpoolid + get_input: port_lbd_internal_1_port_0_network_role fixed_ips: get_input: - - port_lbd_dpdk_1_port_fixed_ips + - port_lbd_internal_1_port_0_fixed_ips - index_value + subnetpoolid: + get_input: port_lbd_internal_1_port_0_subnetpoolid name: get_input: - - port_lbd_dpdk_1_port_name + - port_lbd_internal_1_port_0_name - index_value network: get_input: - - port_lbd_dpdk_1_port_network + - port_lbd_internal_1_port_0_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: lbd relationship: tosca.relationships.network.BindsTo - lbd_lbd_internal_1_port: + lbd_lbd_ims_core_1_port_2: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_requirements: - get_input: port_lbd_internal_1_port_mac_requirements + get_input: port_lbd_ims_core_1_port_2_mac_requirements + allowed_address_pairs: + get_input: port_lbd_ims_core_1_port_2_allowed_address_pairs order: - get_input: port_lbd_internal_1_port_order + get_input: port_lbd_ims_core_1_port_2_order security_groups: get_input: - - port_lbd_internal_1_port_security_groups + - port_lbd_ims_core_1_port_2_security_groups - index_value exCP_naming: - get_input: port_lbd_internal_1_port_exCP_naming + get_input: port_lbd_ims_core_1_port_2_exCP_naming vlan_requirements: - get_input: port_lbd_internal_1_port_vlan_requirements + get_input: port_lbd_ims_core_1_port_2_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_lbd_internal_1_port_related_networks + get_input: port_lbd_ims_core_1_port_2_related_networks ip_requirements: - get_input: port_lbd_internal_1_port_ip_requirements + get_input: port_lbd_ims_core_1_port_2_ip_requirements network_role_tag: - get_input: port_lbd_internal_1_port_network_role_tag + get_input: port_lbd_ims_core_1_port_2_network_role_tag network_role: - get_input: port_lbd_internal_1_port_network_role + get_input: port_lbd_ims_core_1_port_2_network_role + subnetpoolid: + get_input: port_lbd_ims_core_1_port_2_subnetpoolid fixed_ips: get_input: - - port_lbd_internal_1_port_fixed_ips + - port_lbd_ims_core_1_port_2_fixed_ips - index_value - subnetpoolid: - get_input: port_lbd_internal_1_port_subnetpoolid name: get_input: - - port_lbd_internal_1_port_name + - port_lbd_ims_core_1_port_2_name - index_value network: get_input: - - port_lbd_internal_1_port_network + - port_lbd_ims_core_1_port_2_network - index_value requirements: - binding: @@ -406,87 +406,87 @@ topology_template: disk.device.iops_lbd: - lbd - disk.device.iops - network.outgoing.packets.rate_lbd_lbd_ims_core_1_port: - - lbd_lbd_ims_core_1_port - - network.outgoing.packets.rate + binding_lbd_lbd_dpdk_1_port_1: + - lbd_lbd_dpdk_1_port_1 + - binding host_lbd: - lbd - host + network.outgoing.bytes_lbd_lbd_internal_1_port_0: + - lbd_lbd_internal_1_port_0 + - network.outgoing.bytes + network.incoming.bytes.rate_lbd_lbd_dpdk_1_port_1: + - lbd_lbd_dpdk_1_port_1 + - network.incoming.bytes.rate + network.incoming.packets.rate_lbd_lbd_dpdk_1_port_1: + - lbd_lbd_dpdk_1_port_1 + - network.incoming.packets.rate + feature_lbd_lbd_internal_1_port_0: + - lbd_lbd_internal_1_port_0 + - feature disk.device.capacity_lbd: - lbd - disk.device.capacity + network.outgoing.bytes.rate_lbd_lbd_ims_core_1_port_2: + - lbd_lbd_ims_core_1_port_2 + - network.outgoing.bytes.rate + network.incoming.bytes_lbd_lbd_ims_core_1_port_2: + - lbd_lbd_ims_core_1_port_2 + - network.incoming.bytes + network.outpoing.packets_lbd_lbd_dpdk_1_port_1: + - lbd_lbd_dpdk_1_port_1 + - network.outpoing.packets cpu_util_lbd: - lbd - cpu_util disk.device.read.requests_lbd: - lbd - disk.device.read.requests - attachment_lbd_lbd_ims_core_1_port: - - lbd_lbd_ims_core_1_port - - attachment + network.outgoing.packets.rate_lbd_lbd_dpdk_1_port_1: + - lbd_lbd_dpdk_1_port_1 + - network.outgoing.packets.rate memory.usage_lbd: - lbd - memory.usage - binding_lbd_lbd_dpdk_1_port: - - lbd_lbd_dpdk_1_port - - binding - network.outpoing.packets_lbd_lbd_ims_core_1_port: - - lbd_lbd_ims_core_1_port - - network.outpoing.packets - network.outgoing.bytes_lbd_lbd_ims_core_1_port: - - lbd_lbd_ims_core_1_port - - network.outgoing.bytes - network.incoming.packets_lbd_lbd_internal_1_port: - - lbd_lbd_internal_1_port - - network.incoming.packets + feature_lbd_lbd_ims_core_1_port_2: + - lbd_lbd_ims_core_1_port_2 + - feature disk.read.requests_lbd: - lbd - disk.read.requests - feature_lbd_lbd_internal_1_port: - - lbd_lbd_internal_1_port - - feature - network.incoming.bytes_lbd_lbd_ims_core_1_port: - - lbd_lbd_ims_core_1_port - - network.incoming.bytes cpu.delta_lbd: - lbd - cpu.delta + attachment_lbd_lbd_internal_1_port_0: + - lbd_lbd_internal_1_port_0 + - attachment memory_lbd: - lbd - memory disk.write.bytes_lbd: - lbd - disk.write.bytes + network.incoming.bytes_lbd_lbd_dpdk_1_port_1: + - lbd_lbd_dpdk_1_port_1 + - network.incoming.bytes scalable_lbd: - lbd - scalable - network.incoming.bytes.rate_lbd_lbd_dpdk_1_port: - - lbd_lbd_dpdk_1_port - - network.incoming.bytes.rate - network.outgoing.bytes.rate_lbd_lbd_dpdk_1_port: - - lbd_lbd_dpdk_1_port - - network.outgoing.bytes.rate - network.incoming.packets.rate_lbd_lbd_ims_core_1_port: - - lbd_lbd_ims_core_1_port - - network.incoming.packets.rate disk.device.read.requests.rate_lbd: - lbd - disk.device.read.requests.rate - network.outgoing.bytes_lbd_lbd_dpdk_1_port: - - lbd_lbd_dpdk_1_port - - network.outgoing.bytes disk.root.size_lbd: - lbd - disk.root.size + feature_lbd_lbd_dpdk_1_port_1: + - lbd_lbd_dpdk_1_port_1 + - feature vcpus_lbd: - lbd - vcpus disk.allocation_lbd: - lbd - disk.allocation - forwarder_lbd_lbd_dpdk_1_port: - - lbd_lbd_dpdk_1_port - - forwarder disk.device.write.requests_lbd: - lbd - disk.device.write.requests @@ -496,75 +496,63 @@ topology_template: disk.latency_lbd: - lbd - disk.latency - network.incoming.packets_lbd_lbd_dpdk_1_port: - - lbd_lbd_dpdk_1_port - - network.incoming.packets memory.resident_lbd: - lbd - memory.resident - forwarder_lbd_lbd_internal_1_port: - - lbd_lbd_internal_1_port - - forwarder disk.read.bytes.rate_lbd: - lbd - disk.read.bytes.rate - network.incoming.bytes.rate_lbd_lbd_internal_1_port: - - lbd_lbd_internal_1_port - - network.incoming.bytes.rate - network.outgoing.bytes.rate_lbd_lbd_internal_1_port: - - lbd_lbd_internal_1_port - - network.outgoing.bytes.rate + attachment_lbd_lbd_ims_core_1_port_2: + - lbd_lbd_ims_core_1_port_2 + - attachment disk.read.bytes_lbd: - lbd - disk.read.bytes - network.outgoing.packets.rate_lbd_lbd_internal_1_port: - - lbd_lbd_internal_1_port - - network.outgoing.packets.rate - network.outgoing.bytes_lbd_lbd_internal_1_port: - - lbd_lbd_internal_1_port - - network.outgoing.bytes - forwarder_lbd_lbd_ims_core_1_port: - - lbd_lbd_ims_core_1_port - - forwarder - network.incoming.packets.rate_lbd_lbd_dpdk_1_port: - - lbd_lbd_dpdk_1_port - - network.incoming.packets.rate - network.outpoing.packets_lbd_lbd_dpdk_1_port: - - lbd_lbd_dpdk_1_port + network.incoming.bytes.rate_lbd_lbd_ims_core_1_port_2: + - lbd_lbd_ims_core_1_port_2 + - network.incoming.bytes.rate + network.outpoing.packets_lbd_lbd_internal_1_port_0: + - lbd_lbd_internal_1_port_0 - network.outpoing.packets - attachment_lbd_lbd_internal_1_port: - - lbd_lbd_internal_1_port + attachment_lbd_lbd_dpdk_1_port_1: + - lbd_lbd_dpdk_1_port_1 - attachment - feature_lbd_lbd_dpdk_1_port: - - lbd_lbd_dpdk_1_port - - feature + network.incoming.bytes_lbd_lbd_internal_1_port_0: + - lbd_lbd_internal_1_port_0 + - network.incoming.bytes + network.incoming.packets.rate_lbd_lbd_internal_1_port_0: + - lbd_lbd_internal_1_port_0 + - network.incoming.packets.rate + forwarder_lbd_lbd_internal_1_port_0: + - lbd_lbd_internal_1_port_0 + - forwarder cpu_lbd: - lbd - cpu - feature_lbd_lbd_ims_core_1_port: - - lbd_lbd_ims_core_1_port - - feature + network.outgoing.bytes.rate_lbd_lbd_internal_1_port_0: + - lbd_lbd_internal_1_port_0 + - network.outgoing.bytes.rate endpoint_lbd: - lbd - endpoint disk.device.read.bytes.rate_lbd: - lbd - disk.device.read.bytes.rate + forwarder_lbd_lbd_ims_core_1_port_2: + - lbd_lbd_ims_core_1_port_2 + - forwarder disk.device.write.bytes.rate_lbd: - lbd - disk.device.write.bytes.rate + network.outgoing.bytes_lbd_lbd_dpdk_1_port_1: + - lbd_lbd_dpdk_1_port_1 + - network.outgoing.bytes disk.iops_lbd: - lbd - disk.iops - network.outgoing.packets.rate_lbd_lbd_dpdk_1_port: - - lbd_lbd_dpdk_1_port - - network.outgoing.packets.rate disk.device.usage_lbd: - lbd - disk.device.usage - binding_lbd_lbd_ims_core_1_port: - - lbd_lbd_ims_core_1_port - - binding disk.usage_lbd: - lbd - disk.usage @@ -574,51 +562,63 @@ topology_template: disk.write.requests_lbd: - lbd - disk.write.requests - attachment_lbd_lbd_dpdk_1_port: - - lbd_lbd_dpdk_1_port - - attachment disk.device.write.bytes_lbd: - lbd - disk.device.write.bytes - network.outgoing.bytes.rate_lbd_lbd_ims_core_1_port: - - lbd_lbd_ims_core_1_port - - network.outgoing.bytes.rate + network.incoming.bytes.rate_lbd_lbd_internal_1_port_0: + - lbd_lbd_internal_1_port_0 + - network.incoming.bytes.rate + network.incoming.packets.rate_lbd_lbd_ims_core_1_port_2: + - lbd_lbd_ims_core_1_port_2 + - network.incoming.packets.rate disk.capacity_lbd: - lbd - disk.capacity + binding_lbd_lbd_internal_1_port_0: + - lbd_lbd_internal_1_port_0 + - binding feature_lbd: - lbd - feature - network.incoming.bytes.rate_lbd_lbd_ims_core_1_port: - - lbd_lbd_ims_core_1_port - - network.incoming.bytes.rate + network.outgoing.bytes_lbd_lbd_ims_core_1_port_2: + - lbd_lbd_ims_core_1_port_2 + - network.outgoing.bytes disk.device.latency_lbd: - lbd - disk.device.latency - network.incoming.packets_lbd_lbd_ims_core_1_port: - - lbd_lbd_ims_core_1_port - - network.incoming.packets + network.outpoing.packets_lbd_lbd_ims_core_1_port_2: + - lbd_lbd_ims_core_1_port_2 + - network.outpoing.packets disk.device.write.requests.rate_lbd: - lbd - disk.device.write.requests.rate + network.outgoing.packets.rate_lbd_lbd_internal_1_port_0: + - lbd_lbd_internal_1_port_0 + - network.outgoing.packets.rate binding_lbd: - lbd - binding - network.incoming.packets.rate_lbd_lbd_internal_1_port: - - lbd_lbd_internal_1_port - - network.incoming.packets.rate - network.outpoing.packets_lbd_lbd_internal_1_port: - - lbd_lbd_internal_1_port - - network.outpoing.packets - binding_lbd_lbd_internal_1_port: - - lbd_lbd_internal_1_port + forwarder_lbd_lbd_dpdk_1_port_1: + - lbd_lbd_dpdk_1_port_1 + - forwarder + network.outgoing.bytes.rate_lbd_lbd_dpdk_1_port_1: + - lbd_lbd_dpdk_1_port_1 + - network.outgoing.bytes.rate + binding_lbd_lbd_ims_core_1_port_2: + - lbd_lbd_ims_core_1_port_2 - binding - network.incoming.bytes_lbd_lbd_internal_1_port: - - lbd_lbd_internal_1_port - - network.incoming.bytes - network.incoming.bytes_lbd_lbd_dpdk_1_port: - - lbd_lbd_dpdk_1_port - - network.incoming.bytes + network.incoming.packets_lbd_lbd_dpdk_1_port_1: + - lbd_lbd_dpdk_1_port_1 + - network.incoming.packets + network.incoming.packets_lbd_lbd_internal_1_port_0: + - lbd_lbd_internal_1_port_0 + - network.incoming.packets + network.outgoing.packets.rate_lbd_lbd_ims_core_1_port_2: + - lbd_lbd_ims_core_1_port_2 + - network.outgoing.packets.rate + network.incoming.packets_lbd_lbd_ims_core_1_port_2: + - lbd_lbd_ims_core_1_port_2 + - network.incoming.packets disk.device.allocation_lbd: - lbd - disk.device.allocation @@ -626,24 +626,24 @@ topology_template: dependency_lbd: - lbd - dependency + dependency_lbd_lbd_dpdk_1_port_1: + - lbd_lbd_dpdk_1_port_1 + - dependency + link_lbd_lbd_dpdk_1_port_1: + - lbd_lbd_dpdk_1_port_1 + - link + dependency_lbd_lbd_internal_1_port_0: + - lbd_lbd_internal_1_port_0 + - dependency local_storage_lbd: - lbd - local_storage - dependency_lbd_lbd_ims_core_1_port: - - lbd_lbd_ims_core_1_port - - dependency - dependency_lbd_lbd_internal_1_port: - - lbd_lbd_internal_1_port - - dependency - link_lbd_lbd_ims_core_1_port: - - lbd_lbd_ims_core_1_port + link_lbd_lbd_internal_1_port_0: + - lbd_lbd_internal_1_port_0 - link - link_lbd_lbd_dpdk_1_port: - - lbd_lbd_dpdk_1_port - - link - link_lbd_lbd_internal_1_port: - - lbd_lbd_internal_1_port + dependency_lbd_lbd_ims_core_1_port_2: + - lbd_lbd_ims_core_1_port_2 + - dependency + link_lbd_lbd_ims_core_1_port_2: + - lbd_lbd_ims_core_1_port_2 - link - dependency_lbd_lbd_dpdk_1_port: - - lbd_lbd_dpdk_1_port - - 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/nestedSingleCompute/duplicateReqs/out/Nested_lbd_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_lbd_1ServiceTemplate.yaml index 52f88a0642..9cace7c332 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_lbd_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_lbd_1ServiceTemplate.yaml @@ -11,121 +11,128 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_lbd_internal_0_port_network_role_tag: - type: string - required: true compute_lbd_user_data_format: type: list required: true entry_schema: type: string - port_lbd_internal_0_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_lbd_ims_core_0_port_2_ip_requirements: + type: list required: true - port_lbd_dpdk_0_port_exCP_naming: - type: org.openecomp.datatypes.Naming + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_lbd_internal_0_port_0_related_networks: + type: list required: true - port_lbd_internal_0_port_network_role: - type: string + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_lbd_internal_0_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - port_lbd_dpdk_0_port_related_networks: + port_lbd_internal_0_port_0_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments + type: org.openecomp.datatypes.network.VlanRequirements + port_lbd_dpdk_0_port_1_network_role: + type: string + required: true vm_flavor_name: type: string required: true - compute_lbd_availability_zone: + port_lbd_dpdk_0_port_1_network: type: list required: true entry_schema: type: string - port_lbd_dpdk_0_port_allowed_address_pairs: + compute_lbd_availability_zone: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.network.AddressPair - port_lbd_dpdk_0_port_subnetpoolid: + type: string + port_lbd_dpdk_0_port_1_network_role_tag: type: string required: true vm_image_name: type: string required: true - port_lbd_dpdk_0_port_ip_requirements: + port_lbd_ims_core_0_port_2_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_lbd_ims_core_0_port_order: - type: integer - required: true - port_lbd_ims_core_0_port_network: + type: org.openecomp.datatypes.network.VlanRequirements + port_lbd_internal_0_port_0_security_groups: type: list required: true entry_schema: - type: string - port_lbd_ims_core_0_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_lbd_ims_core_0_port_allowed_address_pairs: + type: json + port_lbd_ims_core_0_port_2_related_networks: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.network.AddressPair - port_lbd_internal_0_port_name: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_lbd_ims_core_0_port_2_subnetpoolid: + type: string + required: true + port_lbd_dpdk_0_port_1_name: type: list required: true entry_schema: type: string - port_lbd_ims_core_0_port_network_role_tag: - type: string + port_lbd_dpdk_0_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_lbd_ims_core_0_port_related_networks: + compute_lbd_scheduler_hints: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - compute_lbd_scheduler_hints: + type: json + port_lbd_ims_core_0_port_2_security_groups: type: list required: true entry_schema: type: json - port_lbd_internal_0_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_lbd_dpdk_0_port_1_fixed_ips: + type: list required: true - port_lbd_dpdk_0_port_order: - type: integer + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_lbd_ims_core_0_port_2_network_role: + type: string required: true - port_lbd_ims_core_0_port_ip_requirements: + port_lbd_internal_0_port_0_fixed_ips: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_lbd_internal_0_port_network: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_lbd_ims_core_0_port_2_fixed_ips: type: list required: true entry_schema: - type: string - port_lbd_dpdk_0_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true + type: org.openecomp.datatypes.heat.neutron.port.FixedIps compute_lbd_name: type: list required: true entry_schema: type: string - port_lbd_ims_core_0_port_security_groups: - type: list + port_lbd_internal_0_port_0_network_role: + type: string required: true - entry_schema: - type: json - port_lbd_ims_core_0_port_name: + port_lbd_internal_0_port_0_order: + type: integer + required: true + port_lbd_dpdk_0_port_1_ip_requirements: type: list required: true entry_schema: - type: string - port_lbd_internal_0_port_vlan_requirements: + type: org.openecomp.datatypes.network.IpRequirements + port_lbd_internal_0_port_0_subnetpoolid: + type: string + required: true + port_lbd_ims_core_0_port_2_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_lbd_dpdk_0_port_1_vlan_requirements: type: list required: true entry_schema: @@ -135,64 +142,46 @@ topology_template: required: true entry_schema: type: boolean - port_lbd_internal_0_port_related_networks: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_lbd_dpdk_0_port_fixed_ips: - type: list + port_lbd_internal_0_port_0_network_role_tag: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_lbd_internal_0_port_security_groups: + port_lbd_dpdk_0_port_1_security_groups: type: list required: true entry_schema: type: json - port_lbd_dpdk_0_port_security_groups: - type: list + port_lbd_ims_core_0_port_2_network_role_tag: + type: string required: true - entry_schema: - type: json - port_lbd_dpdk_0_port_vlan_requirements: - type: list + port_lbd_ims_core_0_port_2_order: + type: integer required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_lbd_dpdk_0_port_name: + port_lbd_dpdk_0_port_1_allowed_address_pairs: type: list required: true entry_schema: - type: string - port_lbd_internal_0_port_subnetpoolid: - type: string - required: true - port_lbd_ims_core_0_port_network_role: - type: string + type: org.openecomp.datatypes.heat.network.AddressPair + port_lbd_dpdk_0_port_1_order: + type: integer required: true - port_lbd_dpdk_0_port_network: + port_lbd_ims_core_0_port_2_name: type: list required: true entry_schema: type: string - port_lbd_dpdk_0_port_network_role_tag: + port_lbd_dpdk_0_port_1_subnetpoolid: type: string required: true - port_lbd_internal_0_port_order: - type: integer - required: true - port_lbd_dpdk_0_port_network_role: - type: string - required: true - port_lbd_ims_core_0_port_vlan_requirements: + port_lbd_internal_0_port_0_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_lbd_ims_core_0_port_subnetpoolid: - type: string + type: org.openecomp.datatypes.network.IpRequirements + port_lbd_ims_core_0_port_2_allowed_address_pairs: + type: list required: true + entry_schema: + type: org.openecomp.datatypes.heat.network.AddressPair index_value: type: integer description: Index value of this substitution service template runtime instance @@ -200,157 +189,168 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_lbd_ims_core_0_port_fixed_ips: + port_lbd_ims_core_0_port_2_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_lbd_ims_core_0_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_lbd_internal_0_port_fixed_ips: + type: string + port_lbd_internal_0_port_0_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps + type: string + port_lbd_internal_0_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_lbd_ims_core_0_port_2_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true compute_lbd_metadata: type: list required: true entry_schema: type: json - port_lbd_internal_0_port_ip_requirements: + port_lbd_dpdk_0_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_lbd_dpdk_0_port_1_related_networks: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_lbd_internal_0_port_0_name: + type: list + required: true + entry_schema: + type: string node_templates: - lbd_lbd_ims_core_0_port: + lbd_lbd_dpdk_0_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_requirements: - get_input: port_lbd_ims_core_0_port_mac_requirements + get_input: port_lbd_dpdk_0_port_1_mac_requirements allowed_address_pairs: - get_input: port_lbd_ims_core_0_port_allowed_address_pairs + get_input: port_lbd_dpdk_0_port_1_allowed_address_pairs order: - get_input: port_lbd_ims_core_0_port_order + get_input: port_lbd_dpdk_0_port_1_order security_groups: get_input: - - port_lbd_ims_core_0_port_security_groups + - port_lbd_dpdk_0_port_1_security_groups - index_value exCP_naming: - get_input: port_lbd_ims_core_0_port_exCP_naming + get_input: port_lbd_dpdk_0_port_1_exCP_naming vlan_requirements: - get_input: port_lbd_ims_core_0_port_vlan_requirements + get_input: port_lbd_dpdk_0_port_1_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_lbd_ims_core_0_port_related_networks + get_input: port_lbd_dpdk_0_port_1_related_networks ip_requirements: - get_input: port_lbd_ims_core_0_port_ip_requirements + get_input: port_lbd_dpdk_0_port_1_ip_requirements network_role_tag: - get_input: port_lbd_ims_core_0_port_network_role_tag + get_input: port_lbd_dpdk_0_port_1_network_role_tag network_role: - get_input: port_lbd_ims_core_0_port_network_role + get_input: port_lbd_dpdk_0_port_1_network_role subnetpoolid: - get_input: port_lbd_ims_core_0_port_subnetpoolid + get_input: port_lbd_dpdk_0_port_1_subnetpoolid fixed_ips: get_input: - - port_lbd_ims_core_0_port_fixed_ips + - port_lbd_dpdk_0_port_1_fixed_ips - index_value name: get_input: - - port_lbd_ims_core_0_port_name + - port_lbd_dpdk_0_port_1_name - index_value network: get_input: - - port_lbd_ims_core_0_port_network + - port_lbd_dpdk_0_port_1_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: lbd relationship: tosca.relationships.network.BindsTo - lbd_lbd_dpdk_0_port: + lbd_lbd_internal_0_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_requirements: - get_input: port_lbd_dpdk_0_port_mac_requirements - allowed_address_pairs: - get_input: port_lbd_dpdk_0_port_allowed_address_pairs + get_input: port_lbd_internal_0_port_0_mac_requirements order: - get_input: port_lbd_dpdk_0_port_order + get_input: port_lbd_internal_0_port_0_order security_groups: get_input: - - port_lbd_dpdk_0_port_security_groups + - port_lbd_internal_0_port_0_security_groups - index_value exCP_naming: - get_input: port_lbd_dpdk_0_port_exCP_naming + get_input: port_lbd_internal_0_port_0_exCP_naming vlan_requirements: - get_input: port_lbd_dpdk_0_port_vlan_requirements + get_input: port_lbd_internal_0_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_lbd_dpdk_0_port_related_networks + get_input: port_lbd_internal_0_port_0_related_networks ip_requirements: - get_input: port_lbd_dpdk_0_port_ip_requirements + get_input: port_lbd_internal_0_port_0_ip_requirements network_role_tag: - get_input: port_lbd_dpdk_0_port_network_role_tag + get_input: port_lbd_internal_0_port_0_network_role_tag network_role: - get_input: port_lbd_dpdk_0_port_network_role - subnetpoolid: - get_input: port_lbd_dpdk_0_port_subnetpoolid + get_input: port_lbd_internal_0_port_0_network_role fixed_ips: get_input: - - port_lbd_dpdk_0_port_fixed_ips + - port_lbd_internal_0_port_0_fixed_ips - index_value + subnetpoolid: + get_input: port_lbd_internal_0_port_0_subnetpoolid name: get_input: - - port_lbd_dpdk_0_port_name + - port_lbd_internal_0_port_0_name - index_value network: get_input: - - port_lbd_dpdk_0_port_network + - port_lbd_internal_0_port_0_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: lbd relationship: tosca.relationships.network.BindsTo - lbd_lbd_internal_0_port: + lbd_lbd_ims_core_0_port_2: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_requirements: - get_input: port_lbd_internal_0_port_mac_requirements + get_input: port_lbd_ims_core_0_port_2_mac_requirements + allowed_address_pairs: + get_input: port_lbd_ims_core_0_port_2_allowed_address_pairs order: - get_input: port_lbd_internal_0_port_order + get_input: port_lbd_ims_core_0_port_2_order security_groups: get_input: - - port_lbd_internal_0_port_security_groups + - port_lbd_ims_core_0_port_2_security_groups - index_value exCP_naming: - get_input: port_lbd_internal_0_port_exCP_naming + get_input: port_lbd_ims_core_0_port_2_exCP_naming vlan_requirements: - get_input: port_lbd_internal_0_port_vlan_requirements + get_input: port_lbd_ims_core_0_port_2_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_lbd_internal_0_port_related_networks + get_input: port_lbd_ims_core_0_port_2_related_networks ip_requirements: - get_input: port_lbd_internal_0_port_ip_requirements + get_input: port_lbd_ims_core_0_port_2_ip_requirements network_role_tag: - get_input: port_lbd_internal_0_port_network_role_tag + get_input: port_lbd_ims_core_0_port_2_network_role_tag network_role: - get_input: port_lbd_internal_0_port_network_role + get_input: port_lbd_ims_core_0_port_2_network_role + subnetpoolid: + get_input: port_lbd_ims_core_0_port_2_subnetpoolid fixed_ips: get_input: - - port_lbd_internal_0_port_fixed_ips + - port_lbd_ims_core_0_port_2_fixed_ips - index_value - subnetpoolid: - get_input: port_lbd_internal_0_port_subnetpoolid name: get_input: - - port_lbd_internal_0_port_name + - port_lbd_ims_core_0_port_2_name - index_value network: get_input: - - port_lbd_internal_0_port_network + - port_lbd_ims_core_0_port_2_network - index_value requirements: - binding: @@ -394,111 +394,126 @@ topology_template: disk.ephemeral.size_lbd: - lbd - disk.ephemeral.size - attachment_lbd_lbd_ims_core_0_port: - - lbd_lbd_ims_core_0_port - - attachment - network.incoming.bytes.rate_lbd_lbd_ims_core_0_port: - - lbd_lbd_ims_core_0_port - - network.incoming.bytes.rate disk.write.requests.rate_lbd: - lbd - disk.write.requests.rate disk.write.bytes.rate_lbd: - lbd - disk.write.bytes.rate - network.incoming.packets.rate_lbd_lbd_internal_0_port: - - lbd_lbd_internal_0_port - - network.incoming.packets.rate instance_lbd: - lbd - instance - network.incoming.packets_lbd_lbd_internal_0_port: - - lbd_lbd_internal_0_port - - network.incoming.packets + binding_lbd_lbd_dpdk_0_port_1: + - lbd_lbd_dpdk_0_port_1 + - binding disk.device.iops_lbd: - lbd - disk.device.iops - network.outgoing.bytes_lbd_lbd_ims_core_0_port: - - lbd_lbd_ims_core_0_port - - network.outgoing.bytes - network.outgoing.bytes.rate_lbd_lbd_ims_core_0_port: - - lbd_lbd_ims_core_0_port - - network.outgoing.bytes.rate - network.outgoing.packets.rate_lbd_lbd_dpdk_0_port: - - lbd_lbd_dpdk_0_port - - network.outgoing.packets.rate - network.incoming.bytes_lbd_lbd_dpdk_0_port: - - lbd_lbd_dpdk_0_port - - network.incoming.bytes host_lbd: - lbd - host + network.outgoing.bytes_lbd_lbd_internal_0_port_0: + - lbd_lbd_internal_0_port_0 + - network.outgoing.bytes disk.device.capacity_lbd: - lbd - disk.device.capacity - network.incoming.bytes_lbd_lbd_ims_core_0_port: - - lbd_lbd_ims_core_0_port - - network.incoming.bytes + network.outgoing.bytes.rate_lbd_lbd_ims_core_0_port_2: + - lbd_lbd_ims_core_0_port_2 + - network.outgoing.bytes.rate + network.outgoing.packets.rate_lbd_lbd_dpdk_0_port_1: + - lbd_lbd_dpdk_0_port_1 + - network.outgoing.packets.rate cpu_util_lbd: - lbd - cpu_util disk.device.read.requests_lbd: - lbd - disk.device.read.requests - network.outpoing.packets_lbd_lbd_internal_0_port: - - lbd_lbd_internal_0_port + network.outpoing.packets_lbd_lbd_dpdk_0_port_1: + - lbd_lbd_dpdk_0_port_1 - network.outpoing.packets memory.usage_lbd: - lbd - memory.usage - network.outgoing.bytes_lbd_lbd_dpdk_0_port: - - lbd_lbd_dpdk_0_port - - network.outgoing.bytes - binding_lbd_lbd_internal_0_port: - - lbd_lbd_internal_0_port - - binding + network.incoming.packets.rate_lbd_lbd_dpdk_0_port_1: + - lbd_lbd_dpdk_0_port_1 + - network.incoming.packets.rate + network.incoming.bytes.rate_lbd_lbd_dpdk_0_port_1: + - lbd_lbd_dpdk_0_port_1 + - network.incoming.bytes.rate + feature_lbd_lbd_internal_0_port_0: + - lbd_lbd_internal_0_port_0 + - feature + feature_lbd_lbd_ims_core_0_port_2: + - lbd_lbd_ims_core_0_port_2 + - feature disk.read.requests_lbd: - lbd - disk.read.requests + network.incoming.packets_lbd_lbd_dpdk_0_port_1: + - lbd_lbd_dpdk_0_port_1 + - network.incoming.packets + network.incoming.packets.rate_lbd_lbd_ims_core_0_port_2: + - lbd_lbd_ims_core_0_port_2 + - network.incoming.packets.rate cpu.delta_lbd: - lbd - cpu.delta - network.outpoing.packets_lbd_lbd_ims_core_0_port: - - lbd_lbd_ims_core_0_port - - network.outpoing.packets memory_lbd: - lbd - memory - network.incoming.packets.rate_lbd_lbd_dpdk_0_port: - - lbd_lbd_dpdk_0_port - - network.incoming.packets.rate + network.outpoing.packets_lbd_lbd_ims_core_0_port_2: + - lbd_lbd_ims_core_0_port_2 + - network.outpoing.packets disk.write.bytes_lbd: - lbd - disk.write.bytes - network.outgoing.packets.rate_lbd_lbd_internal_0_port: - - lbd_lbd_internal_0_port - - network.outgoing.packets.rate + binding_lbd_lbd_internal_0_port_0: + - lbd_lbd_internal_0_port_0 + - binding scalable_lbd: - lbd - scalable + network.incoming.bytes.rate_lbd_lbd_internal_0_port_0: + - lbd_lbd_internal_0_port_0 + - network.incoming.bytes.rate + network.outgoing.bytes_lbd_lbd_ims_core_0_port_2: + - lbd_lbd_ims_core_0_port_2 + - network.outgoing.bytes disk.device.read.requests.rate_lbd: - lbd - disk.device.read.requests.rate disk.root.size_lbd: - lbd - disk.root.size + network.outgoing.bytes.rate_lbd_lbd_dpdk_0_port_1: + - lbd_lbd_dpdk_0_port_1 + - network.outgoing.bytes.rate + network.outgoing.packets.rate_lbd_lbd_ims_core_0_port_2: + - lbd_lbd_ims_core_0_port_2 + - network.outgoing.packets.rate vcpus_lbd: - lbd - vcpus + network.incoming.packets_lbd_lbd_internal_0_port_0: + - lbd_lbd_internal_0_port_0 + - network.incoming.packets + network.outgoing.packets.rate_lbd_lbd_internal_0_port_0: + - lbd_lbd_internal_0_port_0 + - network.outgoing.packets.rate disk.allocation_lbd: - lbd - disk.allocation - attachment_lbd_lbd_dpdk_0_port: - - lbd_lbd_dpdk_0_port - - attachment + forwarder_lbd_lbd_dpdk_0_port_1: + - lbd_lbd_dpdk_0_port_1 + - forwarder disk.device.write.requests_lbd: - lbd - disk.device.write.requests + binding_lbd_lbd_ims_core_0_port_2: + - lbd_lbd_ims_core_0_port_2 + - binding os_lbd: - lbd - os @@ -508,63 +523,57 @@ topology_template: memory.resident_lbd: - lbd - memory.resident + network.incoming.packets_lbd_lbd_ims_core_0_port_2: + - lbd_lbd_ims_core_0_port_2 + - network.incoming.packets disk.read.bytes.rate_lbd: - lbd - disk.read.bytes.rate disk.read.bytes_lbd: - lbd - disk.read.bytes - network.incoming.bytes_lbd_lbd_internal_0_port: - - lbd_lbd_internal_0_port - - network.incoming.bytes - network.outgoing.bytes.rate_lbd_lbd_internal_0_port: - - lbd_lbd_internal_0_port - - network.outgoing.bytes.rate - binding_lbd_lbd_ims_core_0_port: - - lbd_lbd_ims_core_0_port - - binding - network.incoming.packets_lbd_lbd_dpdk_0_port: - - lbd_lbd_dpdk_0_port - - network.incoming.packets - network.incoming.bytes.rate_lbd_lbd_internal_0_port: - - lbd_lbd_internal_0_port + network.incoming.bytes.rate_lbd_lbd_ims_core_0_port_2: + - lbd_lbd_ims_core_0_port_2 - network.incoming.bytes.rate - binding_lbd_lbd_dpdk_0_port: - - lbd_lbd_dpdk_0_port - - binding - forwarder_lbd_lbd_ims_core_0_port: - - lbd_lbd_ims_core_0_port + attachment_lbd_lbd_ims_core_0_port_2: + - lbd_lbd_ims_core_0_port_2 + - attachment + network.incoming.bytes_lbd_lbd_internal_0_port_0: + - lbd_lbd_internal_0_port_0 + - network.incoming.bytes + network.incoming.packets.rate_lbd_lbd_internal_0_port_0: + - lbd_lbd_internal_0_port_0 + - network.incoming.packets.rate + network.outpoing.packets_lbd_lbd_internal_0_port_0: + - lbd_lbd_internal_0_port_0 + - network.outpoing.packets + forwarder_lbd_lbd_ims_core_0_port_2: + - lbd_lbd_ims_core_0_port_2 - forwarder - network.outgoing.bytes_lbd_lbd_internal_0_port: - - lbd_lbd_internal_0_port - - network.outgoing.bytes cpu_lbd: - lbd - cpu + attachment_lbd_lbd_dpdk_0_port_1: + - lbd_lbd_dpdk_0_port_1 + - attachment + network.outgoing.bytes.rate_lbd_lbd_internal_0_port_0: + - lbd_lbd_internal_0_port_0 + - network.outgoing.bytes.rate endpoint_lbd: - lbd - endpoint disk.device.read.bytes.rate_lbd: - lbd - disk.device.read.bytes.rate - feature_lbd_lbd_internal_0_port: - - lbd_lbd_internal_0_port - - feature + forwarder_lbd_lbd_internal_0_port_0: + - lbd_lbd_internal_0_port_0 + - forwarder disk.device.write.bytes.rate_lbd: - lbd - disk.device.write.bytes.rate - network.incoming.packets.rate_lbd_lbd_ims_core_0_port: - - lbd_lbd_ims_core_0_port - - network.incoming.packets.rate - network.incoming.packets_lbd_lbd_ims_core_0_port: - - lbd_lbd_ims_core_0_port - - network.incoming.packets - network.incoming.bytes.rate_lbd_lbd_dpdk_0_port: - - lbd_lbd_dpdk_0_port - - network.incoming.bytes.rate - attachment_lbd_lbd_internal_0_port: - - lbd_lbd_internal_0_port - - attachment + network.outgoing.bytes_lbd_lbd_dpdk_0_port_1: + - lbd_lbd_dpdk_0_port_1 + - network.outgoing.bytes disk.iops_lbd: - lbd - disk.iops @@ -577,27 +586,24 @@ topology_template: disk.device.read.bytes_lbd: - lbd - disk.device.read.bytes - network.outpoing.packets_lbd_lbd_dpdk_0_port: - - lbd_lbd_dpdk_0_port - - network.outpoing.packets disk.write.requests_lbd: - lbd - disk.write.requests disk.device.write.bytes_lbd: - lbd - disk.device.write.bytes - forwarder_lbd_lbd_internal_0_port: - - lbd_lbd_internal_0_port - - forwarder + attachment_lbd_lbd_internal_0_port_0: + - lbd_lbd_internal_0_port_0 + - attachment disk.capacity_lbd: - lbd - disk.capacity - forwarder_lbd_lbd_dpdk_0_port: - - lbd_lbd_dpdk_0_port - - forwarder feature_lbd: - lbd - feature + network.incoming.bytes_lbd_lbd_ims_core_0_port_2: + - lbd_lbd_ims_core_0_port_2 + - network.incoming.bytes disk.device.latency_lbd: - lbd - disk.device.latency @@ -607,43 +613,37 @@ topology_template: binding_lbd: - lbd - binding - feature_lbd_lbd_dpdk_0_port: - - lbd_lbd_dpdk_0_port + feature_lbd_lbd_dpdk_0_port_1: + - lbd_lbd_dpdk_0_port_1 - feature - feature_lbd_lbd_ims_core_0_port: - - lbd_lbd_ims_core_0_port - - feature - network.outgoing.packets.rate_lbd_lbd_ims_core_0_port: - - lbd_lbd_ims_core_0_port - - network.outgoing.packets.rate + network.incoming.bytes_lbd_lbd_dpdk_0_port_1: + - lbd_lbd_dpdk_0_port_1 + - network.incoming.bytes disk.device.allocation_lbd: - lbd - disk.device.allocation - network.outgoing.bytes.rate_lbd_lbd_dpdk_0_port: - - lbd_lbd_dpdk_0_port - - network.outgoing.bytes.rate requirements: - dependency_lbd_lbd_dpdk_0_port: - - lbd_lbd_dpdk_0_port - - dependency - link_lbd_lbd_dpdk_0_port: - - lbd_lbd_dpdk_0_port - - link dependency_lbd: - lbd - dependency - dependency_lbd_lbd_internal_0_port: - - lbd_lbd_internal_0_port - - dependency - dependency_lbd_lbd_ims_core_0_port: - - lbd_lbd_ims_core_0_port + dependency_lbd_lbd_internal_0_port_0: + - lbd_lbd_internal_0_port_0 - dependency + link_lbd_lbd_dpdk_0_port_1: + - lbd_lbd_dpdk_0_port_1 + - link local_storage_lbd: - lbd - local_storage - link_lbd_lbd_ims_core_0_port: - - lbd_lbd_ims_core_0_port + dependency_lbd_lbd_dpdk_0_port_1: + - lbd_lbd_dpdk_0_port_1 + - dependency + link_lbd_lbd_internal_0_port_0: + - lbd_lbd_internal_0_port_0 + - link + dependency_lbd_lbd_ims_core_0_port_2: + - lbd_lbd_ims_core_0_port_2 + - dependency + link_lbd_lbd_ims_core_0_port_2: + - lbd_lbd_ims_core_0_port_2 - link - link_lbd_lbd_internal_0_port: - - lbd_lbd_internal_0_port - - link \ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_oamServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_oamServiceTemplate.yaml index ea3d737e38..3babb784c2 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_oamServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_oamServiceTemplate.yaml @@ -11,51 +11,56 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_oam_oam_0_port_name: + port_oam_oam_0_port_1_network_role: + type: string + required: true + port_oam_oam_0_port_1_ip_requirements: type: list required: true entry_schema: - type: string - port_oam_internal_0_port_order: - type: integer + type: org.openecomp.datatypes.network.IpRequirements + port_oam_internal_0_port_0_fixed_ips: + type: list required: true - port_oam_internal_0_port_subnetpoolid: + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + vm_flavor_name: type: string required: true - port_oam_oam_0_port_fixed_ips: + port_oam_internal_0_port_0_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - vm_flavor_name: + type: org.openecomp.datatypes.network.VlanRequirements + port_oam_internal_0_port_0_subnetpoolid: type: string required: true - port_oam_oam_0_port_vlan_requirements: + port_oam_oam_0_port_1_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_oam_oam_0_port_mac_requirements: + port_oam_internal_0_port_0_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true - port_oam_internal_0_port_ip_requirements: + port_oam_oam_0_port_1_fixed_ips: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_oam_internal_0_port_network: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_oam_oam_0_port_1_related_networks: type: list required: true entry_schema: - type: string - port_oam_oam_0_port_order: - type: integer - required: true - port_oam_internal_0_port_related_networks: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_oam_internal_0_port_0_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments + type: string + port_oam_oam_0_port_1_order: + type: integer + required: true vm_image_name: type: string required: true @@ -64,38 +69,40 @@ topology_template: required: true entry_schema: type: boolean - port_oam_oam_0_port_network_role: + port_oam_oam_0_port_1_allowed_address_pairs: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.heat.network.AddressPair + port_oam_internal_0_port_0_network_role_tag: type: string required: true - port_oam_internal_0_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_oam_oam_0_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_oam_internal_0_port_name: + port_oam_internal_0_port_0_name: type: list required: true entry_schema: type: string - port_oam_oam_0_port_allowed_address_pairs: + port_oam_oam_0_port_1_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.network.AddressPair - port_oam_internal_0_port_security_groups: + type: string + port_oam_oam_0_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_oam_internal_0_port_0_security_groups: type: list required: true entry_schema: type: json - port_oam_internal_0_port_fixed_ips: + port_oam_oam_0_port_1_security_groups: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_oam_oam_0_port_network_role_tag: - type: string - required: true - port_oam_oam_0_port_subnetpoolid: - type: string - required: true + type: json index_value: type: integer description: Index value of this substitution service template runtime instance @@ -103,7 +110,10 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_oam_oam_0_port_related_networks: + port_oam_internal_0_port_0_network_role: + type: string + required: true + port_oam_internal_0_port_0_related_networks: type: list required: true entry_schema: @@ -113,43 +123,30 @@ topology_template: required: true entry_schema: type: string - port_oam_oam_0_port_network: + port_oam_internal_0_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_oam_oam_0_port_1_name: type: list required: true entry_schema: type: string - port_oam_internal_0_port_network_role_tag: - type: string - required: true - port_oam_internal_0_port_network_role: - type: string - required: true - port_oam_oam_0_port_ip_requirements: + port_oam_internal_0_port_0_ip_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_oam_internal_0_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_oam_oam_0_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_oam_oam_0_port_1_subnetpoolid: + type: string required: true compute_oam_scheduler_hints: type: list required: true entry_schema: type: json - port_oam_internal_0_port_allowed_address_pairs: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.heat.network.AddressPair - port_oam_internal_0_port_vlan_requirements: - type: list + port_oam_internal_0_port_0_order: + type: integer required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements compute_oam_availability_zone: type: list required: true @@ -165,96 +162,54 @@ topology_template: required: true entry_schema: type: string - port_oam_oam_0_port_security_groups: + port_oam_internal_0_port_0_allowed_address_pairs: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.heat.network.AddressPair + port_oam_oam_0_port_1_network_role_tag: + type: string + required: true node_templates: - oam_oam_oam_0_port: + oam_oam_internal_0_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_requirements: - get_input: port_oam_oam_0_port_mac_requirements + get_input: port_oam_internal_0_port_0_mac_requirements allowed_address_pairs: - get_input: port_oam_oam_0_port_allowed_address_pairs + get_input: port_oam_internal_0_port_0_allowed_address_pairs order: - get_input: port_oam_oam_0_port_order + get_input: port_oam_internal_0_port_0_order security_groups: get_input: - - port_oam_oam_0_port_security_groups + - port_oam_internal_0_port_0_security_groups - index_value exCP_naming: - get_input: port_oam_oam_0_port_exCP_naming + get_input: port_oam_internal_0_port_0_exCP_naming vlan_requirements: - get_input: port_oam_oam_0_port_vlan_requirements + get_input: port_oam_internal_0_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_oam_oam_0_port_related_networks + get_input: port_oam_internal_0_port_0_related_networks ip_requirements: - get_input: port_oam_oam_0_port_ip_requirements + get_input: port_oam_internal_0_port_0_ip_requirements network_role_tag: - get_input: port_oam_oam_0_port_network_role_tag + get_input: port_oam_internal_0_port_0_network_role_tag network_role: - get_input: port_oam_oam_0_port_network_role + get_input: port_oam_internal_0_port_0_network_role subnetpoolid: - get_input: port_oam_oam_0_port_subnetpoolid + get_input: port_oam_internal_0_port_0_subnetpoolid fixed_ips: get_input: - - port_oam_oam_0_port_fixed_ips + - port_oam_internal_0_port_0_fixed_ips - index_value name: get_input: - - port_oam_oam_0_port_name + - port_oam_internal_0_port_0_name - index_value network: get_input: - - port_oam_oam_0_port_network - - index_value - requirements: - - binding: - capability: tosca.capabilities.network.Bindable - node: oam - relationship: tosca.relationships.network.BindsTo - oam_oam_internal_0_port: - type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port - properties: - mac_requirements: - get_input: port_oam_internal_0_port_mac_requirements - allowed_address_pairs: - get_input: port_oam_internal_0_port_allowed_address_pairs - order: - get_input: port_oam_internal_0_port_order - security_groups: - get_input: - - port_oam_internal_0_port_security_groups - - index_value - exCP_naming: - get_input: port_oam_internal_0_port_exCP_naming - vlan_requirements: - get_input: port_oam_internal_0_port_vlan_requirements - subinterface_indicator: false - related_networks: - get_input: port_oam_internal_0_port_related_networks - ip_requirements: - get_input: port_oam_internal_0_port_ip_requirements - network_role_tag: - get_input: port_oam_internal_0_port_network_role_tag - network_role: - get_input: port_oam_internal_0_port_network_role - subnetpoolid: - get_input: port_oam_internal_0_port_subnetpoolid - fixed_ips: - get_input: - - port_oam_internal_0_port_fixed_ips - - index_value - name: - get_input: - - port_oam_internal_0_port_name - - index_value - network: - get_input: - - port_oam_internal_0_port_network + - port_oam_internal_0_port_0_network - index_value requirements: - binding: @@ -292,21 +247,60 @@ topology_template: get_input: - compute_oam_user_data_format - index_value + oam_oam_oam_0_port_1: + type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port + properties: + mac_requirements: + get_input: port_oam_oam_0_port_1_mac_requirements + allowed_address_pairs: + get_input: port_oam_oam_0_port_1_allowed_address_pairs + order: + get_input: port_oam_oam_0_port_1_order + security_groups: + get_input: + - port_oam_oam_0_port_1_security_groups + - index_value + exCP_naming: + get_input: port_oam_oam_0_port_1_exCP_naming + vlan_requirements: + get_input: port_oam_oam_0_port_1_vlan_requirements + subinterface_indicator: false + related_networks: + get_input: port_oam_oam_0_port_1_related_networks + ip_requirements: + get_input: port_oam_oam_0_port_1_ip_requirements + network_role_tag: + get_input: port_oam_oam_0_port_1_network_role_tag + network_role: + get_input: port_oam_oam_0_port_1_network_role + subnetpoolid: + get_input: port_oam_oam_0_port_1_subnetpoolid + fixed_ips: + get_input: + - port_oam_oam_0_port_1_fixed_ips + - index_value + name: + get_input: + - port_oam_oam_0_port_1_name + - index_value + network: + get_input: + - port_oam_oam_0_port_1_network + - index_value + requirements: + - binding: + capability: tosca.capabilities.network.Bindable + node: oam + relationship: tosca.relationships.network.BindsTo substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.oam capabilities: cpu_oam: - oam - cpu - attachment_oam_oam_oam_0_port: - - oam_oam_oam_0_port - - attachment - network.incoming.packets_oam_oam_oam_0_port: - - oam_oam_oam_0_port - - network.incoming.packets - binding_oam_oam_oam_0_port: - - oam_oam_oam_0_port - - binding + feature_oam_oam_internal_0_port_0: + - oam_oam_internal_0_port_0 + - feature disk.usage_oam: - oam - disk.usage @@ -316,24 +310,21 @@ topology_template: disk.device.write.bytes_oam: - oam - disk.device.write.bytes - binding_oam_oam_internal_0_port: - - oam_oam_internal_0_port - - binding disk.read.bytes_oam: - oam - disk.read.bytes - forwarder_oam_oam_oam_0_port: - - oam_oam_oam_0_port - - forwarder - network.incoming.packets_oam_oam_internal_0_port: - - oam_oam_internal_0_port - - network.incoming.packets - network.incoming.packets.rate_oam_oam_internal_0_port: - - oam_oam_internal_0_port - - network.incoming.packets.rate + network.incoming.bytes_oam_oam_oam_0_port_1: + - oam_oam_oam_0_port_1 + - network.incoming.bytes scalable_oam: - oam - scalable + network.outgoing.bytes_oam_oam_internal_0_port_0: + - oam_oam_internal_0_port_0 + - network.outgoing.bytes + network.incoming.bytes_oam_oam_internal_0_port_0: + - oam_oam_internal_0_port_0 + - network.incoming.bytes feature_oam: - oam - feature @@ -343,57 +334,66 @@ topology_template: disk.device.usage_oam: - oam - disk.device.usage + feature_oam_oam_oam_0_port_1: + - oam_oam_oam_0_port_1 + - feature binding_oam: - oam - binding disk.device.read.bytes.rate_oam: - oam - disk.device.read.bytes.rate - network.outgoing.bytes_oam_oam_internal_0_port: - - oam_oam_internal_0_port - - network.outgoing.bytes + network.outgoing.bytes.rate_oam_oam_internal_0_port_0: + - oam_oam_internal_0_port_0 + - network.outgoing.bytes.rate disk.write.bytes.rate_oam: - oam - disk.write.bytes.rate disk.device.write.bytes.rate_oam: - oam - disk.device.write.bytes.rate + network.incoming.packets_oam_oam_oam_0_port_1: + - oam_oam_oam_0_port_1 + - network.incoming.packets disk.device.allocation_oam: - oam - disk.device.allocation - network.outpoing.packets_oam_oam_internal_0_port: - - oam_oam_internal_0_port - - network.outpoing.packets - feature_oam_oam_oam_0_port: - - oam_oam_oam_0_port - - feature - network.incoming.packets.rate_oam_oam_oam_0_port: - - oam_oam_oam_0_port - - network.incoming.packets.rate + forwarder_oam_oam_oam_0_port_1: + - oam_oam_oam_0_port_1 + - forwarder disk.ephemeral.size_oam: - oam - disk.ephemeral.size - attachment_oam_oam_internal_0_port: - - oam_oam_internal_0_port - - attachment disk.write.requests_oam: - oam - disk.write.requests + attachment_oam_oam_oam_0_port_1: + - oam_oam_oam_0_port_1 + - attachment disk.capacity_oam: - oam - disk.capacity + network.incoming.bytes.rate_oam_oam_oam_0_port_1: + - oam_oam_oam_0_port_1 + - network.incoming.bytes.rate instance_oam: - oam - instance + binding_oam_oam_internal_0_port_0: + - oam_oam_internal_0_port_0 + - binding disk.root.size_oam: - oam - disk.root.size - network.incoming.bytes_oam_oam_internal_0_port: - - oam_oam_internal_0_port - - network.incoming.bytes - feature_oam_oam_internal_0_port: - - oam_oam_internal_0_port - - feature + binding_oam_oam_oam_0_port_1: + - oam_oam_oam_0_port_1 + - binding + network.outgoing.packets.rate_oam_oam_internal_0_port_0: + - oam_oam_internal_0_port_0 + - network.outgoing.packets.rate + attachment_oam_oam_internal_0_port_0: + - oam_oam_internal_0_port_0 + - attachment memory_oam: - oam - memory @@ -403,24 +403,18 @@ topology_template: disk.device.write.requests_oam: - oam - disk.device.write.requests - network.incoming.bytes.rate_oam_oam_internal_0_port: - - oam_oam_internal_0_port - - network.incoming.bytes.rate - network.outgoing.bytes_oam_oam_oam_0_port: - - oam_oam_oam_0_port - - network.outgoing.bytes disk.device.read.requests.rate_oam: - oam - disk.device.read.requests.rate + forwarder_oam_oam_internal_0_port_0: + - oam_oam_internal_0_port_0 + - forwarder disk.write.requests.rate_oam: - oam - disk.write.requests.rate disk.device.latency_oam: - oam - disk.device.latency - network.outgoing.bytes.rate_oam_oam_internal_0_port: - - oam_oam_internal_0_port - - network.outgoing.bytes.rate disk.device.iops_oam: - oam - disk.device.iops @@ -430,39 +424,39 @@ topology_template: disk.device.write.requests.rate_oam: - oam - disk.device.write.requests.rate + network.incoming.packets.rate_oam_oam_internal_0_port_0: + - oam_oam_internal_0_port_0 + - network.incoming.packets.rate + network.incoming.packets.rate_oam_oam_oam_0_port_1: + - oam_oam_oam_0_port_1 + - network.incoming.packets.rate disk.device.read.bytes_oam: - oam - disk.device.read.bytes host_oam: - oam - host + network.outpoing.packets_oam_oam_internal_0_port_0: + - oam_oam_internal_0_port_0 + - network.outpoing.packets endpoint_oam: - oam - endpoint disk.device.read.requests_oam: - oam - disk.device.read.requests - network.outgoing.packets.rate_oam_oam_oam_0_port: - - oam_oam_oam_0_port - - network.outgoing.packets.rate disk.iops_oam: - oam - disk.iops disk.read.bytes.rate_oam: - oam - disk.read.bytes.rate - network.outgoing.packets.rate_oam_oam_internal_0_port: - - oam_oam_internal_0_port - - network.outgoing.packets.rate - network.incoming.bytes.rate_oam_oam_oam_0_port: - - oam_oam_oam_0_port - - network.incoming.bytes.rate - forwarder_oam_oam_internal_0_port: - - oam_oam_internal_0_port - - forwarder - network.incoming.bytes_oam_oam_oam_0_port: - - oam_oam_oam_0_port - - network.incoming.bytes + network.outgoing.bytes.rate_oam_oam_oam_0_port_1: + - oam_oam_oam_0_port_1 + - network.outgoing.bytes.rate + network.outpoing.packets_oam_oam_oam_0_port_1: + - oam_oam_oam_0_port_1 + - network.outpoing.packets cpu_util_oam: - oam - cpu_util @@ -475,37 +469,43 @@ topology_template: disk.latency_oam: - oam - disk.latency - network.outpoing.packets_oam_oam_oam_0_port: - - oam_oam_oam_0_port - - network.outpoing.packets + network.outgoing.packets.rate_oam_oam_oam_0_port_1: + - oam_oam_oam_0_port_1 + - network.outgoing.packets.rate + network.incoming.packets_oam_oam_internal_0_port_0: + - oam_oam_internal_0_port_0 + - network.incoming.packets disk.write.bytes_oam: - oam - disk.write.bytes + network.outgoing.bytes_oam_oam_oam_0_port_1: + - oam_oam_oam_0_port_1 + - network.outgoing.bytes + network.incoming.bytes.rate_oam_oam_internal_0_port_0: + - oam_oam_internal_0_port_0 + - network.incoming.bytes.rate disk.read.requests_oam: - oam - disk.read.requests disk.device.capacity_oam: - oam - disk.device.capacity - network.outgoing.bytes.rate_oam_oam_oam_0_port: - - oam_oam_oam_0_port - - network.outgoing.bytes.rate requirements: - dependency_oam_oam_internal_0_port: - - oam_oam_internal_0_port - - dependency + link_oam_oam_internal_0_port_0: + - oam_oam_internal_0_port_0 + - link local_storage_oam: - oam - local_storage - link_oam_oam_oam_0_port: - - oam_oam_oam_0_port + link_oam_oam_oam_0_port_1: + - oam_oam_oam_0_port_1 - link - dependency_oam_oam_oam_0_port: - - oam_oam_oam_0_port + dependency_oam_oam_internal_0_port_0: + - oam_oam_internal_0_port_0 + - dependency + dependency_oam_oam_oam_0_port_1: + - oam_oam_oam_0_port_1 - dependency dependency_oam: - oam - dependency - link_oam_oam_internal_0_port: - - oam_oam_internal_0_port - - link \ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_oam_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_oam_1ServiceTemplate.yaml index ab1896910c..1988c6b9b3 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_oam_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_oam_1ServiceTemplate.yaml @@ -11,46 +11,30 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_oam_internal_1_port_network_role_tag: - type: string - required: true - port_oam_internal_1_port_related_networks: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_oam_internal_1_port_security_groups: + port_oam_oam_1_port_1_vlan_requirements: type: list required: true entry_schema: - type: json - port_oam_internal_1_port_network_role: + type: org.openecomp.datatypes.network.VlanRequirements + port_oam_internal_1_port_0_network_role_tag: type: string required: true - port_oam_oam_1_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_oam_oam_1_port_allowed_address_pairs: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.heat.network.AddressPair vm_flavor_name: type: string required: true - port_oam_oam_1_port_ip_requirements: + port_oam_internal_1_port_0_ip_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_oam_oam_1_port_network_role_tag: + port_oam_oam_1_port_1_network_role_tag: type: string required: true - port_oam_oam_1_port_security_groups: + port_oam_internal_1_port_0_name: type: list required: true entry_schema: - type: json + type: string vm_image_name: type: string required: true @@ -59,39 +43,31 @@ topology_template: required: true entry_schema: type: boolean - port_oam_internal_1_port_network: - type: list + port_oam_oam_1_port_1_order: + type: integer required: true - entry_schema: - type: string - port_oam_oam_1_port_fixed_ips: - type: list + port_oam_internal_1_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_oam_oam_1_port_related_networks: - type: list + port_oam_oam_1_port_1_subnetpoolid: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_oam_internal_1_port_vlan_requirements: + port_oam_oam_1_port_1_related_networks: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_oam_internal_1_port_ip_requirements: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_oam_oam_1_port_1_allowed_address_pairs: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_oam_oam_1_port_order: - type: integer + type: org.openecomp.datatypes.heat.network.AddressPair + port_oam_oam_1_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - port_oam_oam_1_port_network: - type: list + port_oam_internal_1_port_0_subnetpoolid: + type: string required: true - entry_schema: - type: string index_value: type: integer description: Index value of this substitution service template runtime instance @@ -99,53 +75,68 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_oam_internal_1_port_allowed_address_pairs: + port_oam_oam_1_port_1_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.network.AddressPair + type: org.openecomp.datatypes.network.IpRequirements + port_oam_oam_1_port_1_network_role: + type: string + required: true compute_oam_user_data_format: type: list required: true entry_schema: type: string - port_oam_internal_1_port_exCP_naming: + port_oam_oam_1_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_oam_internal_1_port_0_order: + type: integer + required: true + port_oam_internal_1_port_0_exCP_naming: type: org.openecomp.datatypes.Naming required: true - port_oam_internal_1_port_name: + port_oam_internal_1_port_0_allowed_address_pairs: type: list required: true entry_schema: - type: string - port_oam_internal_1_port_fixed_ips: + type: org.openecomp.datatypes.heat.network.AddressPair + port_oam_oam_1_port_1_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_oam_internal_1_port_subnetpoolid: - type: string - required: true - port_oam_oam_1_port_name: + type: string + port_oam_oam_1_port_1_name: type: list required: true entry_schema: type: string - port_oam_internal_1_port_order: - type: integer + port_oam_internal_1_port_0_fixed_ips: + type: list required: true - port_oam_oam_1_port_vlan_requirements: + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_oam_internal_1_port_0_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_oam_oam_1_port_subnetpoolid: - type: string - required: true compute_oam_scheduler_hints: type: list required: true entry_schema: type: json + port_oam_internal_1_port_0_security_groups: + type: list + required: true + entry_schema: + type: json + port_oam_internal_1_port_0_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments compute_oam_availability_zone: type: list required: true @@ -156,105 +147,69 @@ topology_template: required: true entry_schema: type: json - port_oam_internal_1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_oam_internal_1_port_0_network_role: + type: string + required: true + port_oam_oam_1_port_1_security_groups: + type: list required: true + entry_schema: + type: json compute_oam_name: type: list required: true entry_schema: type: string - port_oam_oam_1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_oam_internal_1_port_0_network: + type: list required: true - port_oam_oam_1_port_network_role: - type: string + entry_schema: + type: string + port_oam_oam_1_port_1_fixed_ips: + type: list required: true + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps node_templates: - oam_oam_internal_1_port: + oam_oam_oam_1_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_requirements: - get_input: port_oam_internal_1_port_mac_requirements + get_input: port_oam_oam_1_port_1_mac_requirements allowed_address_pairs: - get_input: port_oam_internal_1_port_allowed_address_pairs + get_input: port_oam_oam_1_port_1_allowed_address_pairs order: - get_input: port_oam_internal_1_port_order + get_input: port_oam_oam_1_port_1_order security_groups: get_input: - - port_oam_internal_1_port_security_groups + - port_oam_oam_1_port_1_security_groups - index_value exCP_naming: - get_input: port_oam_internal_1_port_exCP_naming + get_input: port_oam_oam_1_port_1_exCP_naming vlan_requirements: - get_input: port_oam_internal_1_port_vlan_requirements + get_input: port_oam_oam_1_port_1_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_oam_internal_1_port_related_networks + get_input: port_oam_oam_1_port_1_related_networks ip_requirements: - get_input: port_oam_internal_1_port_ip_requirements + get_input: port_oam_oam_1_port_1_ip_requirements network_role_tag: - get_input: port_oam_internal_1_port_network_role_tag + get_input: port_oam_oam_1_port_1_network_role_tag network_role: - get_input: port_oam_internal_1_port_network_role + get_input: port_oam_oam_1_port_1_network_role subnetpoolid: - get_input: port_oam_internal_1_port_subnetpoolid + get_input: port_oam_oam_1_port_1_subnetpoolid fixed_ips: get_input: - - port_oam_internal_1_port_fixed_ips + - port_oam_oam_1_port_1_fixed_ips - index_value name: get_input: - - port_oam_internal_1_port_name + - port_oam_oam_1_port_1_name - index_value network: get_input: - - port_oam_internal_1_port_network - - index_value - requirements: - - binding: - capability: tosca.capabilities.network.Bindable - node: oam - relationship: tosca.relationships.network.BindsTo - oam_oam_oam_1_port: - type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port - properties: - mac_requirements: - get_input: port_oam_oam_1_port_mac_requirements - allowed_address_pairs: - get_input: port_oam_oam_1_port_allowed_address_pairs - order: - get_input: port_oam_oam_1_port_order - security_groups: - get_input: - - port_oam_oam_1_port_security_groups - - index_value - exCP_naming: - get_input: port_oam_oam_1_port_exCP_naming - vlan_requirements: - get_input: port_oam_oam_1_port_vlan_requirements - subinterface_indicator: false - related_networks: - get_input: port_oam_oam_1_port_related_networks - ip_requirements: - get_input: port_oam_oam_1_port_ip_requirements - network_role_tag: - get_input: port_oam_oam_1_port_network_role_tag - network_role: - get_input: port_oam_oam_1_port_network_role - subnetpoolid: - get_input: port_oam_oam_1_port_subnetpoolid - fixed_ips: - get_input: - - port_oam_oam_1_port_fixed_ips - - index_value - name: - get_input: - - port_oam_oam_1_port_name - - index_value - network: - get_input: - - port_oam_oam_1_port_network + - port_oam_oam_1_port_1_network - index_value requirements: - binding: @@ -292,21 +247,60 @@ topology_template: get_input: - compute_oam_user_data_format - index_value + oam_oam_internal_1_port_0: + type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port + properties: + mac_requirements: + get_input: port_oam_internal_1_port_0_mac_requirements + allowed_address_pairs: + get_input: port_oam_internal_1_port_0_allowed_address_pairs + order: + get_input: port_oam_internal_1_port_0_order + security_groups: + get_input: + - port_oam_internal_1_port_0_security_groups + - index_value + exCP_naming: + get_input: port_oam_internal_1_port_0_exCP_naming + vlan_requirements: + get_input: port_oam_internal_1_port_0_vlan_requirements + subinterface_indicator: false + related_networks: + get_input: port_oam_internal_1_port_0_related_networks + ip_requirements: + get_input: port_oam_internal_1_port_0_ip_requirements + network_role_tag: + get_input: port_oam_internal_1_port_0_network_role_tag + network_role: + get_input: port_oam_internal_1_port_0_network_role + subnetpoolid: + get_input: port_oam_internal_1_port_0_subnetpoolid + fixed_ips: + get_input: + - port_oam_internal_1_port_0_fixed_ips + - index_value + name: + get_input: + - port_oam_internal_1_port_0_name + - index_value + network: + get_input: + - port_oam_internal_1_port_0_network + - index_value + requirements: + - binding: + capability: tosca.capabilities.network.Bindable + node: oam + relationship: tosca.relationships.network.BindsTo substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.oam_1 capabilities: cpu_oam: - oam - cpu - network.incoming.bytes.rate_oam_oam_oam_1_port: - - oam_oam_oam_1_port - - network.incoming.bytes.rate - network.outpoing.packets_oam_oam_oam_1_port: - - oam_oam_oam_1_port - - network.outpoing.packets - network.incoming.packets.rate_oam_oam_internal_1_port: - - oam_oam_internal_1_port - - network.incoming.packets.rate + feature_oam_oam_internal_1_port_0: + - oam_oam_internal_1_port_0 + - feature disk.usage_oam: - oam - disk.usage @@ -316,38 +310,44 @@ topology_template: disk.device.write.bytes_oam: - oam - disk.device.write.bytes - forwarder_oam_oam_internal_1_port: - - oam_oam_internal_1_port - - forwarder disk.read.bytes_oam: - oam - disk.read.bytes - binding_oam_oam_internal_1_port: - - oam_oam_internal_1_port - - binding + network.incoming.bytes_oam_oam_oam_1_port_1: + - oam_oam_oam_1_port_1 + - network.incoming.bytes scalable_oam: - oam - scalable + network.outgoing.bytes_oam_oam_internal_1_port_0: + - oam_oam_internal_1_port_0 + - network.outgoing.bytes + network.incoming.bytes_oam_oam_internal_1_port_0: + - oam_oam_internal_1_port_0 + - network.incoming.bytes feature_oam: - oam - feature disk.allocation_oam: - oam - disk.allocation - network.outgoing.packets.rate_oam_oam_oam_1_port: - - oam_oam_oam_1_port - - network.outgoing.packets.rate + network.incoming.packets.rate_oam_oam_oam_1_port_1: + - oam_oam_oam_1_port_1 + - network.incoming.packets.rate disk.device.usage_oam: - oam - disk.device.usage + network.outpoing.packets_oam_oam_oam_1_port_1: + - oam_oam_oam_1_port_1 + - network.outpoing.packets binding_oam: - oam - binding disk.device.read.bytes.rate_oam: - oam - disk.device.read.bytes.rate - network.outgoing.bytes.rate_oam_oam_oam_1_port: - - oam_oam_oam_1_port + network.outgoing.bytes.rate_oam_oam_oam_1_port_1: + - oam_oam_oam_1_port_1 - network.outgoing.bytes.rate disk.write.bytes.rate_oam: - oam @@ -358,45 +358,45 @@ topology_template: disk.device.allocation_oam: - oam - disk.device.allocation - network.incoming.bytes_oam_oam_internal_1_port: - - oam_oam_internal_1_port - - network.incoming.bytes disk.ephemeral.size_oam: - oam - disk.ephemeral.size - network.incoming.packets_oam_oam_oam_1_port: - - oam_oam_oam_1_port - - network.incoming.packets + network.outgoing.bytes_oam_oam_oam_1_port_1: + - oam_oam_oam_1_port_1 + - network.outgoing.bytes disk.write.requests_oam: - oam - disk.write.requests - attachment_oam_oam_oam_1_port: - - oam_oam_oam_1_port - - attachment + network.incoming.packets_oam_oam_internal_1_port_0: + - oam_oam_internal_1_port_0 + - network.incoming.packets disk.capacity_oam: - oam - disk.capacity + network.incoming.bytes.rate_oam_oam_internal_1_port_0: + - oam_oam_internal_1_port_0 + - network.incoming.bytes.rate + network.outgoing.packets.rate_oam_oam_oam_1_port_1: + - oam_oam_oam_1_port_1 + - network.outgoing.packets.rate instance_oam: - oam - instance - network.outgoing.bytes_oam_oam_internal_1_port: - - oam_oam_internal_1_port - - network.outgoing.bytes + network.outpoing.packets_oam_oam_internal_1_port_0: + - oam_oam_internal_1_port_0 + - network.outpoing.packets disk.root.size_oam: - oam - disk.root.size - network.outgoing.bytes_oam_oam_oam_1_port: - - oam_oam_oam_1_port - - network.outgoing.bytes - feature_oam_oam_oam_1_port: - - oam_oam_oam_1_port - - feature - network.outgoing.packets.rate_oam_oam_internal_1_port: - - oam_oam_internal_1_port - - network.outgoing.packets.rate - network.incoming.bytes.rate_oam_oam_internal_1_port: - - oam_oam_internal_1_port - - network.incoming.bytes.rate + binding_oam_oam_internal_1_port_0: + - oam_oam_internal_1_port_0 + - binding + attachment_oam_oam_internal_1_port_0: + - oam_oam_internal_1_port_0 + - attachment + binding_oam_oam_oam_1_port_1: + - oam_oam_oam_1_port_1 + - binding memory_oam: - oam - memory @@ -406,12 +406,9 @@ topology_template: disk.device.write.requests_oam: - oam - disk.device.write.requests - network.outgoing.bytes.rate_oam_oam_internal_1_port: - - oam_oam_internal_1_port - - network.outgoing.bytes.rate - network.incoming.bytes_oam_oam_oam_1_port: - - oam_oam_oam_1_port - - network.incoming.bytes + network.outgoing.packets.rate_oam_oam_internal_1_port_0: + - oam_oam_internal_1_port_0 + - network.outgoing.packets.rate disk.device.read.requests.rate_oam: - oam - disk.device.read.requests.rate @@ -424,24 +421,18 @@ topology_template: disk.device.iops_oam: - oam - disk.device.iops - network.outpoing.packets_oam_oam_internal_1_port: - - oam_oam_internal_1_port - - network.outpoing.packets - feature_oam_oam_internal_1_port: - - oam_oam_internal_1_port - - feature - network.incoming.packets.rate_oam_oam_oam_1_port: - - oam_oam_oam_1_port + network.incoming.packets.rate_oam_oam_internal_1_port_0: + - oam_oam_internal_1_port_0 - network.incoming.packets.rate + forwarder_oam_oam_internal_1_port_0: + - oam_oam_internal_1_port_0 + - forwarder vcpus_oam: - oam - vcpus disk.device.write.requests.rate_oam: - oam - disk.device.write.requests.rate - attachment_oam_oam_internal_1_port: - - oam_oam_internal_1_port - - attachment disk.device.read.bytes_oam: - oam - disk.device.read.bytes @@ -451,6 +442,9 @@ topology_template: endpoint_oam: - oam - endpoint + feature_oam_oam_oam_1_port_1: + - oam_oam_oam_1_port_1 + - feature disk.device.read.requests_oam: - oam - disk.device.read.requests @@ -460,12 +454,15 @@ topology_template: disk.read.bytes.rate_oam: - oam - disk.read.bytes.rate - network.incoming.packets_oam_oam_internal_1_port: - - oam_oam_internal_1_port + network.outgoing.bytes.rate_oam_oam_internal_1_port_0: + - oam_oam_internal_1_port_0 + - network.outgoing.bytes.rate + forwarder_oam_oam_oam_1_port_1: + - oam_oam_oam_1_port_1 + - forwarder + network.incoming.packets_oam_oam_oam_1_port_1: + - oam_oam_oam_1_port_1 - network.incoming.packets - binding_oam_oam_oam_1_port: - - oam_oam_oam_1_port - - binding cpu_util_oam: - oam - cpu_util @@ -478,12 +475,15 @@ topology_template: disk.latency_oam: - oam - disk.latency + attachment_oam_oam_oam_1_port_1: + - oam_oam_oam_1_port_1 + - attachment disk.write.bytes_oam: - oam - disk.write.bytes - forwarder_oam_oam_oam_1_port: - - oam_oam_oam_1_port - - forwarder + network.incoming.bytes.rate_oam_oam_oam_1_port_1: + - oam_oam_oam_1_port_1 + - network.incoming.bytes.rate disk.read.requests_oam: - oam - disk.read.requests @@ -491,21 +491,21 @@ topology_template: - oam - disk.device.capacity requirements: + link_oam_oam_internal_1_port_0: + - oam_oam_internal_1_port_0 + - link + link_oam_oam_oam_1_port_1: + - oam_oam_oam_1_port_1 + - link local_storage_oam: - oam - local_storage - link_oam_oam_internal_1_port: - - oam_oam_internal_1_port - - link - link_oam_oam_oam_1_port: - - oam_oam_oam_1_port - - link + dependency_oam_oam_internal_1_port_0: + - oam_oam_internal_1_port_0 + - dependency + dependency_oam_oam_oam_1_port_1: + - oam_oam_oam_1_port_1 + - dependency dependency_oam: - oam - dependency - dependency_oam_oam_internal_1_port: - - oam_oam_internal_1_port - - dependency - dependency_oam_oam_oam_1_port: - - oam_oam_oam_1_port - - 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/nestedSingleCompute/duplicateReqs/out/Nested_oam_2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_oam_2ServiceTemplate.yaml index d099f16268..6f42fdbce3 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_oam_2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_oam_2ServiceTemplate.yaml @@ -11,47 +11,33 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_oam_oam_2_port_network_role_tag: + port_oam_internal_2_port_0_subnetpoolid: type: string required: true - port_oam_oam_2_port_related_networks: + port_oam_internal_2_port_0_related_networks: type: list required: true entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_oam_oam_2_port_security_groups: - type: list - required: true - entry_schema: - type: json - port_oam_oam_2_port_name: - type: list + vm_flavor_name: + type: string required: true - entry_schema: - type: string - port_oam_internal_2_port_name: + port_oam_internal_2_port_0_name: type: list required: true entry_schema: type: string - port_oam_oam_2_port_network_role: - type: string - required: true - vm_flavor_name: - type: string - required: true - port_oam_internal_2_port_mac_requirements: + port_oam_internal_2_port_0_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true - port_oam_oam_2_port_subnetpoolid: - type: string - required: true - port_oam_internal_2_port_subnetpoolid: + port_oam_internal_2_port_0_network_role: type: string required: true - port_oam_oam_2_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_oam_oam_2_port_1_allowed_address_pairs: + type: list required: true + entry_schema: + type: org.openecomp.datatypes.heat.network.AddressPair vm_image_name: type: string required: true @@ -60,42 +46,47 @@ topology_template: required: true entry_schema: type: boolean - port_oam_oam_2_port_vlan_requirements: + port_oam_internal_2_port_0_allowed_address_pairs: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_oam_internal_2_port_allowed_address_pairs: + type: org.openecomp.datatypes.heat.network.AddressPair + port_oam_oam_2_port_1_order: + type: integer + required: true + port_oam_oam_2_port_1_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.network.AddressPair - port_oam_internal_2_port_network: + type: org.openecomp.datatypes.network.IpRequirements + port_oam_oam_2_port_1_security_groups: type: list required: true entry_schema: - type: string - port_oam_internal_2_port_network_role_tag: + type: json + port_oam_oam_2_port_1_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_oam_oam_2_port_1_network_role_tag: type: string required: true - port_oam_internal_2_port_order: - type: integer + port_oam_oam_2_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - port_oam_internal_2_port_fixed_ips: + port_oam_internal_2_port_0_security_groups: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_oam_internal_2_port_network_role: - type: string - required: true - port_oam_oam_2_port_fixed_ips: + type: json + port_oam_oam_2_port_1_fixed_ips: type: list required: true entry_schema: type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_oam_oam_2_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_oam_internal_2_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true index_value: type: integer @@ -104,52 +95,63 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_oam_internal_2_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_oam_oam_2_port_1_subnetpoolid: + type: string required: true - port_oam_oam_2_port_network: + compute_oam_user_data_format: type: list required: true entry_schema: type: string - compute_oam_user_data_format: + port_oam_internal_2_port_0_fixed_ips: type: list required: true entry_schema: - type: string - port_oam_internal_2_port_security_groups: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_oam_internal_2_port_0_network: type: list required: true entry_schema: - type: json - port_oam_oam_2_port_ip_requirements: + type: string + port_oam_internal_2_port_0_ip_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_oam_internal_2_port_vlan_requirements: + port_oam_internal_2_port_0_order: + type: integer + required: true + port_oam_oam_2_port_1_related_networks: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_oam_oam_2_port_order: - type: integer + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_oam_oam_2_port_1_network_role: + type: string required: true - port_oam_internal_2_port_related_networks: + port_oam_oam_2_port_1_name: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments + type: string compute_oam_scheduler_hints: type: list required: true entry_schema: type: json - port_oam_internal_2_port_ip_requirements: + port_oam_internal_2_port_0_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: org.openecomp.datatypes.network.VlanRequirements + port_oam_oam_2_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_oam_oam_2_port_1_network: + type: list + required: true + entry_schema: + type: string compute_oam_availability_zone: type: list required: true @@ -160,168 +162,169 @@ topology_template: required: true entry_schema: type: json - port_oam_oam_2_port_allowed_address_pairs: - type: list + port_oam_internal_2_port_0_network_role_tag: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.heat.network.AddressPair compute_oam_name: type: list required: true entry_schema: type: string node_templates: - oam_oam_internal_2_port: + oam: + type: org.openecomp.resource.vfc.compute.nodes.heat.oam + properties: + availability_zone: + get_input: + - compute_oam_availability_zone + - index_value + flavor: + get_input: vm_flavor_name + metadata: + get_input: + - compute_oam_metadata + - index_value + config_drive: + get_input: + - compute_oam_config_drive + - index_value + image: + get_input: vm_image_name + name: + get_input: + - compute_oam_name + - index_value + scheduler_hints: + get_input: + - compute_oam_scheduler_hints + - index_value + user_data_format: + get_input: + - compute_oam_user_data_format + - index_value + oam_oam_oam_2_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_requirements: - get_input: port_oam_internal_2_port_mac_requirements + get_input: port_oam_oam_2_port_1_mac_requirements allowed_address_pairs: - get_input: port_oam_internal_2_port_allowed_address_pairs + get_input: port_oam_oam_2_port_1_allowed_address_pairs order: - get_input: port_oam_internal_2_port_order + get_input: port_oam_oam_2_port_1_order security_groups: get_input: - - port_oam_internal_2_port_security_groups + - port_oam_oam_2_port_1_security_groups - index_value exCP_naming: - get_input: port_oam_internal_2_port_exCP_naming + get_input: port_oam_oam_2_port_1_exCP_naming vlan_requirements: - get_input: port_oam_internal_2_port_vlan_requirements + get_input: port_oam_oam_2_port_1_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_oam_internal_2_port_related_networks + get_input: port_oam_oam_2_port_1_related_networks ip_requirements: - get_input: port_oam_internal_2_port_ip_requirements + get_input: port_oam_oam_2_port_1_ip_requirements network_role_tag: - get_input: port_oam_internal_2_port_network_role_tag + get_input: port_oam_oam_2_port_1_network_role_tag network_role: - get_input: port_oam_internal_2_port_network_role + get_input: port_oam_oam_2_port_1_network_role subnetpoolid: - get_input: port_oam_internal_2_port_subnetpoolid + get_input: port_oam_oam_2_port_1_subnetpoolid fixed_ips: get_input: - - port_oam_internal_2_port_fixed_ips + - port_oam_oam_2_port_1_fixed_ips - index_value name: get_input: - - port_oam_internal_2_port_name + - port_oam_oam_2_port_1_name - index_value network: get_input: - - port_oam_internal_2_port_network + - port_oam_oam_2_port_1_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: oam relationship: tosca.relationships.network.BindsTo - oam_oam_oam_2_port: + oam_oam_internal_2_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_requirements: - get_input: port_oam_oam_2_port_mac_requirements + get_input: port_oam_internal_2_port_0_mac_requirements allowed_address_pairs: - get_input: port_oam_oam_2_port_allowed_address_pairs + get_input: port_oam_internal_2_port_0_allowed_address_pairs order: - get_input: port_oam_oam_2_port_order + get_input: port_oam_internal_2_port_0_order security_groups: get_input: - - port_oam_oam_2_port_security_groups + - port_oam_internal_2_port_0_security_groups - index_value exCP_naming: - get_input: port_oam_oam_2_port_exCP_naming + get_input: port_oam_internal_2_port_0_exCP_naming vlan_requirements: - get_input: port_oam_oam_2_port_vlan_requirements + get_input: port_oam_internal_2_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_oam_oam_2_port_related_networks + get_input: port_oam_internal_2_port_0_related_networks ip_requirements: - get_input: port_oam_oam_2_port_ip_requirements + get_input: port_oam_internal_2_port_0_ip_requirements network_role_tag: - get_input: port_oam_oam_2_port_network_role_tag + get_input: port_oam_internal_2_port_0_network_role_tag network_role: - get_input: port_oam_oam_2_port_network_role + get_input: port_oam_internal_2_port_0_network_role subnetpoolid: - get_input: port_oam_oam_2_port_subnetpoolid + get_input: port_oam_internal_2_port_0_subnetpoolid fixed_ips: get_input: - - port_oam_oam_2_port_fixed_ips + - port_oam_internal_2_port_0_fixed_ips - index_value name: get_input: - - port_oam_oam_2_port_name + - port_oam_internal_2_port_0_name - index_value network: get_input: - - port_oam_oam_2_port_network + - port_oam_internal_2_port_0_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: oam relationship: tosca.relationships.network.BindsTo - oam: - type: org.openecomp.resource.vfc.compute.nodes.heat.oam - properties: - availability_zone: - get_input: - - compute_oam_availability_zone - - index_value - flavor: - get_input: vm_flavor_name - metadata: - get_input: - - compute_oam_metadata - - index_value - config_drive: - get_input: - - compute_oam_config_drive - - index_value - image: - get_input: vm_image_name - name: - get_input: - - compute_oam_name - - index_value - scheduler_hints: - get_input: - - compute_oam_scheduler_hints - - index_value - user_data_format: - get_input: - - compute_oam_user_data_format - - index_value substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.oam_2 capabilities: cpu_oam: - oam - cpu - network.outgoing.bytes.rate_oam_oam_oam_2_port: - - oam_oam_oam_2_port - - network.outgoing.bytes.rate - network.outgoing.packets.rate_oam_oam_oam_2_port: - - oam_oam_oam_2_port - - network.outgoing.packets.rate disk.usage_oam: - oam - disk.usage + feature_oam_oam_internal_2_port_0: + - oam_oam_internal_2_port_0 + - feature memory.resident_oam: - oam - memory.resident - feature_oam_oam_internal_2_port: - - oam_oam_internal_2_port - - feature - network.incoming.bytes.rate_oam_oam_oam_2_port: - - oam_oam_oam_2_port - - network.incoming.bytes.rate disk.device.write.bytes_oam: - oam - disk.device.write.bytes disk.read.bytes_oam: - oam - disk.read.bytes + network.incoming.bytes_oam_oam_oam_2_port_1: + - oam_oam_oam_2_port_1 + - network.incoming.bytes + network.outgoing.bytes.rate_oam_oam_internal_2_port_0: + - oam_oam_internal_2_port_0 + - network.outgoing.bytes.rate + network.outgoing.bytes_oam_oam_internal_2_port_0: + - oam_oam_internal_2_port_0 + - network.outgoing.bytes + network.incoming.bytes_oam_oam_internal_2_port_0: + - oam_oam_internal_2_port_0 + - network.incoming.bytes scalable_oam: - oam - scalable @@ -334,12 +337,6 @@ topology_template: disk.device.usage_oam: - oam - disk.device.usage - network.outpoing.packets_oam_oam_oam_2_port: - - oam_oam_oam_2_port - - network.outpoing.packets - network.incoming.bytes.rate_oam_oam_internal_2_port: - - oam_oam_internal_2_port - - network.incoming.bytes.rate binding_oam: - oam - binding @@ -352,39 +349,42 @@ topology_template: disk.device.write.bytes.rate_oam: - oam - disk.device.write.bytes.rate + forwarder_oam_oam_oam_2_port_1: + - oam_oam_oam_2_port_1 + - forwarder disk.device.allocation_oam: - oam - disk.device.allocation + network.incoming.packets_oam_oam_oam_2_port_1: + - oam_oam_oam_2_port_1 + - network.incoming.packets + feature_oam_oam_oam_2_port_1: + - oam_oam_oam_2_port_1 + - feature disk.ephemeral.size_oam: - oam - disk.ephemeral.size - network.incoming.packets_oam_oam_internal_2_port: - - oam_oam_internal_2_port - - network.incoming.packets disk.write.requests_oam: - oam - disk.write.requests + attachment_oam_oam_oam_2_port_1: + - oam_oam_oam_2_port_1 + - attachment disk.capacity_oam: - oam - disk.capacity - network.outgoing.bytes_oam_oam_oam_2_port: - - oam_oam_oam_2_port - - network.outgoing.bytes + network.incoming.bytes.rate_oam_oam_oam_2_port_1: + - oam_oam_oam_2_port_1 + - network.incoming.bytes.rate instance_oam: - oam - instance - network.outgoing.bytes.rate_oam_oam_internal_2_port: - - oam_oam_internal_2_port - - network.outgoing.bytes.rate - forwarder_oam_oam_internal_2_port: - - oam_oam_internal_2_port - - forwarder - network.outpoing.packets_oam_oam_internal_2_port: - - oam_oam_internal_2_port - - network.outpoing.packets disk.root.size_oam: - oam - disk.root.size + binding_oam_oam_oam_2_port_1: + - oam_oam_oam_2_port_1 + - binding memory_oam: - oam - memory @@ -394,33 +394,30 @@ topology_template: disk.device.write.requests_oam: - oam - disk.device.write.requests - network.incoming.bytes_oam_oam_oam_2_port: - - oam_oam_oam_2_port - - network.incoming.bytes - forwarder_oam_oam_oam_2_port: - - oam_oam_oam_2_port - - forwarder - network.outgoing.packets.rate_oam_oam_internal_2_port: - - oam_oam_internal_2_port - - network.outgoing.packets.rate - binding_oam_oam_oam_2_port: - - oam_oam_oam_2_port - - binding + attachment_oam_oam_internal_2_port_0: + - oam_oam_internal_2_port_0 + - attachment disk.device.read.requests.rate_oam: - oam - disk.device.read.requests.rate - feature_oam_oam_oam_2_port: - - oam_oam_oam_2_port - - feature + forwarder_oam_oam_internal_2_port_0: + - oam_oam_internal_2_port_0 + - forwarder disk.write.requests.rate_oam: - oam - disk.write.requests.rate disk.device.latency_oam: - oam - disk.device.latency + network.incoming.packets.rate_oam_oam_internal_2_port_0: + - oam_oam_internal_2_port_0 + - network.incoming.packets.rate disk.device.iops_oam: - oam - disk.device.iops + network.outpoing.packets_oam_oam_oam_2_port_1: + - oam_oam_oam_2_port_1 + - network.outpoing.packets vcpus_oam: - oam - vcpus @@ -433,15 +430,12 @@ topology_template: host_oam: - oam - host - network.incoming.packets.rate_oam_oam_internal_2_port: - - oam_oam_internal_2_port - - network.incoming.packets.rate endpoint_oam: - oam - endpoint - binding_oam_oam_internal_2_port: - - oam_oam_internal_2_port - - binding + network.incoming.packets.rate_oam_oam_oam_2_port_1: + - oam_oam_oam_2_port_1 + - network.incoming.packets.rate disk.device.read.requests_oam: - oam - disk.device.read.requests @@ -451,12 +445,9 @@ topology_template: disk.read.bytes.rate_oam: - oam - disk.read.bytes.rate - attachment_oam_oam_internal_2_port: - - oam_oam_internal_2_port - - attachment - network.incoming.packets.rate_oam_oam_oam_2_port: - - oam_oam_oam_2_port - - network.incoming.packets.rate + network.outgoing.bytes.rate_oam_oam_oam_2_port_1: + - oam_oam_oam_2_port_1 + - network.outgoing.bytes.rate cpu_util_oam: - oam - cpu_util @@ -466,46 +457,55 @@ topology_template: memory.usage_oam: - oam - memory.usage - attachment_oam_oam_oam_2_port: - - oam_oam_oam_2_port - - attachment disk.latency_oam: - oam - disk.latency - network.incoming.packets_oam_oam_oam_2_port: - - oam_oam_oam_2_port + network.incoming.packets_oam_oam_internal_2_port_0: + - oam_oam_internal_2_port_0 - network.incoming.packets - network.outgoing.bytes_oam_oam_internal_2_port: - - oam_oam_internal_2_port - - network.outgoing.bytes + network.outgoing.packets.rate_oam_oam_internal_2_port_0: + - oam_oam_internal_2_port_0 + - network.outgoing.packets.rate disk.write.bytes_oam: - oam - disk.write.bytes - network.incoming.bytes_oam_oam_internal_2_port: - - oam_oam_internal_2_port - - network.incoming.bytes + network.outgoing.bytes_oam_oam_oam_2_port_1: + - oam_oam_oam_2_port_1 + - network.outgoing.bytes + network.outgoing.packets.rate_oam_oam_oam_2_port_1: + - oam_oam_oam_2_port_1 + - network.outgoing.packets.rate + network.incoming.bytes.rate_oam_oam_internal_2_port_0: + - oam_oam_internal_2_port_0 + - network.incoming.bytes.rate + binding_oam_oam_internal_2_port_0: + - oam_oam_internal_2_port_0 + - binding disk.read.requests_oam: - oam - disk.read.requests disk.device.capacity_oam: - oam - disk.device.capacity + network.outpoing.packets_oam_oam_internal_2_port_0: + - oam_oam_internal_2_port_0 + - network.outpoing.packets requirements: - link_oam_oam_internal_2_port: - - oam_oam_internal_2_port - - link - link_oam_oam_oam_2_port: - - oam_oam_oam_2_port - - link + dependency_oam_oam_internal_2_port_0: + - oam_oam_internal_2_port_0 + - dependency local_storage_oam: - oam - local_storage - dependency_oam_oam_internal_2_port: - - oam_oam_internal_2_port - - dependency - dependency_oam_oam_oam_2_port: - - oam_oam_oam_2_port + link_oam_oam_oam_2_port_1: + - oam_oam_oam_2_port_1 + - link + dependency_oam_oam_oam_2_port_1: + - oam_oam_oam_2_port_1 - dependency dependency_oam: - oam - - dependency \ No newline at end of file + - dependency + link_oam_oam_internal_2_port_0: + - oam_oam_internal_2_port_0 + - link diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/nested_cscfServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/nested_cscfServiceTemplate.yaml index 84325428a4..f5c6a407d3 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/nested_cscfServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/nested_cscfServiceTemplate.yaml @@ -446,4 +446,4 @@ topology_template: - link local_storage_cscf_server_0: - cscf_server_0 - - local_storage \ No newline at end of file + - local_storage diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/nested_tdcoreServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/nested_tdcoreServiceTemplate.yaml index 54bb2f500c..3418eb1d68 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/nested_tdcoreServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/nested_tdcoreServiceTemplate.yaml @@ -582,4 +582,4 @@ topology_template: - dependency local_storage_tdcore_server_0: - tdcore_server_0 - - local_storage \ No newline at end of file + - local_storage diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/GlobalSubstitutionTypesServiceTemplate.yaml index 26cf3450b7..242293f376 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -3906,11 +3906,11 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_cmaui_port_1_exCP_naming: + port_cmaui_port_2_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_cmaui_port_2_exCP_naming: + port_cmaui_port_1_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED @@ -6656,4 +6656,4 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - - UNBOUNDED \ No newline at end of file + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmaui_2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmaui_2ServiceTemplate.yaml index 63942e2108..97bc0655d1 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmaui_2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmaui_2ServiceTemplate.yaml @@ -90,10 +90,10 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_cmaui_port_1_exCP_naming: + port_cmaui_port_2_exCP_naming: type: org.openecomp.datatypes.Naming required: true - port_cmaui_port_2_exCP_naming: + port_cmaui_port_1_exCP_naming: type: org.openecomp.datatypes.Naming required: true port_cmaui_port_1_vlan_requirements: @@ -458,4 +458,4 @@ topology_template: - local_storage dependency_cmaui_cmaui_port_1: - cmaui_cmaui_port_1 - - dependency \ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/GlobalSubstitutionTypesServiceTemplate.yaml index 933ff40acc..654b73714e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -597,10 +597,12 @@ node_types: status: SUPPORTED entry_schema: type: string - port_compute_port_subnetpoolid: - type: string + port_compute_port_0_network: + type: list required: true status: SUPPORTED + entry_schema: + type: string index_value: type: integer description: Index value of this substitution service template runtime instance @@ -609,68 +611,66 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_compute_port_vlan_requirements: + compute_compute_name: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - compute_compute_name: + type: string + port_compute_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: string + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true status: SUPPORTED - port_compute_port_network_role: - type: string + port_compute_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_compute_port_0_vlan_requirements: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements vm_image_name: type: string required: true status: SUPPORTED - port_compute_port_network: - type: list + port_compute_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: string - port_compute_port_related_networks: - type: list + port_compute_port_0_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_compute_port_network_role_tag: - type: string + port_compute_port_0_ip_requirements: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements compute_compute_metadata: type: list required: true status: SUPPORTED entry_schema: type: json - port_compute_port_order: - type: integer - required: true - status: SUPPORTED - port_compute_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_compute_port_0_network_role: + type: string required: true status: SUPPORTED - port_compute_port_ip_requirements: - type: list + port_compute_port_0_network_role_tag: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_compute_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_compute_port_0_order: + type: integer required: true status: SUPPORTED requirements: @@ -688,20 +688,25 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_compute_compute_port: + - dependency_compute_compute_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_compute_compute_port: + - link_compute_compute_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: + attachment_compute_compute_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED disk.write.requests_compute: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -714,25 +719,33 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_compute_compute_port: + disk.root.size_compute: 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_compute: + disk.write.requests.rate_compute: 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_compute: + disk.read.requests_compute: 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_compute: + binding_compute_compute_port_0: + 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 + network.incoming.bytes_compute_compute_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -755,26 +768,32 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.iops_compute: + forwarder_compute_compute_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + network.outgoing.packets.rate_compute_compute_port_0: 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_compute_compute_port: + network.incoming.bytes.rate_compute_compute_port_0: 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_compute: + disk.device.iops_compute: 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 - attachment_compute_compute_port: - type: tosca.capabilities.Attachment + disk.device.write.requests.rate_compute: + 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 @@ -785,25 +804,28 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.write.bytes_compute: + network.incoming.packets.rate_compute_compute_port_0: 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_compute: + feature_compute_compute_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + disk.device.write.bytes_compute: 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_compute_compute_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 + cpu_compute: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - - 0 + - 1 - UNBOUNDED disk.allocation_compute: type: org.openecomp.capabilities.metric.Ceilometer @@ -822,29 +844,19 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_compute_compute_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.device.usage_compute: 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_compute_compute_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - network.incoming.packets_compute_compute_port: + instance_compute: 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 - instance_compute: + network.outpoing.packets_compute_compute_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -880,25 +892,25 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_compute_compute_port: + disk.device.read.requests.rate_compute: 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_compute: + disk.read.bytes_compute: 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_compute: + disk.device.read.bytes_compute: 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_compute: + network.incoming.packets_compute_compute_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -916,7 +928,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_compute_compute_port: + network.outgoing.bytes_compute_compute_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -952,18 +964,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_compute_compute_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_compute_compute_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 endpoint_compute: type: tosca.capabilities.Endpoint.Admin occurrences: @@ -991,27 +991,27 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_compute_compute_port: + disk.device.read.requests_compute: 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_compute: + disk.device.capacity_compute: 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_compute: + disk.device.allocation_compute: 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_compute: + network.outgoing.bytes.rate_compute_compute_port_0: 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 + - UNBOUNDED 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 038dc88281..fbf2553476 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 @@ -315,28 +315,28 @@ topology_template: - get_attribute: - server_pcm_001 - oam_net_gw + port_compute_port_0_network: + - get_input: port_net_name compute_compute_name: - compute_name: null vm_flavor_name: compute_flavor_name: null - vm_image_name: - get_input: compute_image_name - port_compute_port_network: - - get_input: port_net_name - port_compute_port_network_role_tag: port - compute_compute_metadata: - - get_attribute: - - server_pcm_001 - - server_pcm_id - port_compute_port_mac_requirements: + port_compute_port_0_mac_requirements: mac_count_required: is_required: false - port_compute_port_ip_requirements: + vm_image_name: + get_input: compute_image_name + port_compute_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false + compute_compute_metadata: + - get_attribute: + - server_pcm_001 + - server_pcm_id + port_compute_port_0_network_role_tag: port service_template_filter: substitute_service_template: Nested_computeServiceTemplate.yaml count: 1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/Nested_computeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/Nested_computeServiceTemplate.yaml index 82f94141bf..f97da8b6bc 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/Nested_computeServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/Nested_computeServiceTemplate.yaml @@ -16,9 +16,11 @@ topology_template: required: true entry_schema: type: string - port_compute_port_subnetpoolid: - type: string + port_compute_port_0_network: + type: list required: true + entry_schema: + type: string index_value: type: integer description: Index value of this substitution service template runtime instance @@ -26,56 +28,54 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_compute_port_vlan_requirements: + compute_compute_name: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - compute_compute_name: + type: string + port_compute_port_0_related_networks: type: list required: true entry_schema: - type: string + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true - port_compute_port_network_role: - type: string + port_compute_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true + port_compute_port_0_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements vm_image_name: type: string required: true - port_compute_port_network: - type: list + port_compute_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: string - port_compute_port_related_networks: + port_compute_port_0_subnetpoolid: + type: string + required: true + port_compute_port_0_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_compute_port_network_role_tag: - type: string - required: true + type: org.openecomp.datatypes.network.IpRequirements compute_compute_metadata: type: list required: true entry_schema: type: json - port_compute_port_order: - type: integer - required: true - port_compute_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_compute_port_0_network_role: + type: string required: true - port_compute_port_ip_requirements: - type: list + port_compute_port_0_network_role_tag: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_compute_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_compute_port_0_order: + type: integer required: true node_templates: compute: @@ -89,7 +89,7 @@ topology_template: - index_value config_drive: get_attribute: - - compute_compute_port + - compute_compute_port_0 - tenant_id - port_security_enabled - device_id @@ -115,31 +115,31 @@ topology_template: get_input: - compute_compute_user_data_format - index_value - compute_compute_port: + compute_compute_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_compute_port_exCP_naming + get_input: port_compute_port_0_exCP_naming vlan_requirements: - get_input: port_compute_port_vlan_requirements + get_input: port_compute_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_compute_port_related_networks + get_input: port_compute_port_0_related_networks ip_requirements: - get_input: port_compute_port_ip_requirements + get_input: port_compute_port_0_ip_requirements network_role_tag: - get_input: port_compute_port_network_role_tag + get_input: port_compute_port_0_network_role_tag mac_requirements: - get_input: port_compute_port_mac_requirements + get_input: port_compute_port_0_mac_requirements order: - get_input: port_compute_port_order + get_input: port_compute_port_0_order network_role: - get_input: port_compute_port_network_role + get_input: port_compute_port_0_network_role subnetpoolid: - get_input: port_compute_port_subnetpoolid + get_input: port_compute_port_0_subnetpoolid network: get_input: - - port_compute_port_network + - port_compute_port_0_network - index_value requirements: - binding: @@ -149,15 +149,15 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.compute capabilities: + attachment_compute_compute_port_0: + - compute_compute_port_0 + - attachment disk.write.requests_compute: - compute - disk.write.requests disk.latency_compute: - compute - disk.latency - network.incoming.bytes_compute_compute_port: - - compute_compute_port - - network.incoming.bytes disk.root.size_compute: - compute - disk.root.size @@ -167,6 +167,12 @@ topology_template: disk.read.requests_compute: - compute - disk.read.requests + binding_compute_compute_port_0: + - compute_compute_port_0 + - binding + network.incoming.bytes_compute_compute_port_0: + - compute_compute_port_0 + - network.incoming.bytes os_compute: - compute - os @@ -176,30 +182,36 @@ topology_template: vcpus_compute: - compute - vcpus + forwarder_compute_compute_port_0: + - compute_compute_port_0 + - forwarder + network.outgoing.packets.rate_compute_compute_port_0: + - compute_compute_port_0 + - network.outgoing.packets.rate + network.incoming.bytes.rate_compute_compute_port_0: + - compute_compute_port_0 + - network.incoming.bytes.rate disk.device.iops_compute: - compute - disk.device.iops - network.incoming.bytes.rate_compute_compute_port: - - compute_compute_port - - network.incoming.bytes.rate disk.device.write.requests.rate_compute: - compute - disk.device.write.requests.rate - attachment_compute_compute_port: - - compute_compute_port - - attachment host_compute: - compute - host + network.incoming.packets.rate_compute_compute_port_0: + - compute_compute_port_0 + - network.incoming.packets.rate + feature_compute_compute_port_0: + - compute_compute_port_0 + - feature disk.device.write.bytes_compute: - compute - disk.device.write.bytes cpu_compute: - compute - cpu - binding_compute_compute_port: - - compute_compute_port - - binding disk.allocation_compute: - compute - disk.allocation @@ -209,21 +221,15 @@ topology_template: binding_compute: - compute - binding - feature_compute_compute_port: - - compute_compute_port - - feature disk.device.usage_compute: - compute - disk.device.usage - forwarder_compute_compute_port: - - compute_compute_port - - forwarder - network.incoming.packets_compute_compute_port: - - compute_compute_port - - network.incoming.packets instance_compute: - compute - instance + network.outpoing.packets_compute_compute_port_0: + - compute_compute_port_0 + - network.outpoing.packets disk.ephemeral.size_compute: - compute - disk.ephemeral.size @@ -239,9 +245,6 @@ topology_template: disk.iops_compute: - compute - disk.iops - network.incoming.packets.rate_compute_compute_port: - - compute_compute_port - - network.incoming.packets.rate disk.device.read.requests.rate_compute: - compute - disk.device.read.requests.rate @@ -251,15 +254,18 @@ topology_template: disk.device.read.bytes_compute: - compute - disk.device.read.bytes + network.incoming.packets_compute_compute_port_0: + - compute_compute_port_0 + - network.incoming.packets disk.write.bytes_compute: - compute - disk.write.bytes disk.usage_compute: - compute - disk.usage - network.outgoing.bytes.rate_compute_compute_port: - - compute_compute_port - - network.outgoing.bytes.rate + network.outgoing.bytes_compute_compute_port_0: + - compute_compute_port_0 + - network.outgoing.bytes disk.capacity_compute: - compute - disk.capacity @@ -275,12 +281,6 @@ topology_template: disk.device.write.requests_compute: - compute - disk.device.write.requests - network.outgoing.packets.rate_compute_compute_port: - - compute_compute_port - - network.outgoing.packets.rate - network.outgoing.bytes_compute_compute_port: - - compute_compute_port - - network.outgoing.bytes endpoint_compute: - compute - endpoint @@ -296,9 +296,6 @@ topology_template: scalable_compute: - compute - scalable - network.outpoing.packets_compute_compute_port: - - compute_compute_port - - network.outpoing.packets disk.device.read.requests_compute: - compute - disk.device.read.requests @@ -308,16 +305,19 @@ topology_template: disk.device.allocation_compute: - compute - disk.device.allocation + network.outgoing.bytes.rate_compute_compute_port_0: + - compute_compute_port_0 + - network.outgoing.bytes.rate requirements: local_storage_compute: - compute - local_storage - dependency_compute_compute_port: - - compute_compute_port - - dependency - link_compute_compute_port: - - compute_compute_port + link_compute_compute_port_0: + - compute_compute_port_0 - link dependency_compute: - compute - - dependency \ No newline at end of file + - dependency + dependency_compute_compute_port_0: + - compute_compute_port_0 + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/in/nested-pcm_v0.1.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/in/nested-pcm_v0.1.yaml index 0c3eda5acc..359e0844cf 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/in/nested-pcm_v0.1.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/in/nested-pcm_v0.1.yaml @@ -66,7 +66,7 @@ resources: flavor: { get_param: pcm_flavor_name } availability_zone: { get_param: availabilityzone_name } networks: - - port: { get_resource: pcm_port_0} + - port: { get_resource: pcm_server_1_mgmt_port_0} block_device_mapping: - device_name: vdb volume_id: { get_param: pcm_vol} @@ -81,13 +81,13 @@ resources: flavor: { get_param: pcm_flavor_name } availability_zone: { get_param: availabilityzone_name } networks: - - port: { get_resource: pcm_port_1} + - port: { get_resource: pcm_server_2_mgmt_port_0} block_device_mapping: - device_name: vdb volume_id: { get_param: pcm_vol} user_data_format: RAW - pcm_port_0: + pcm_server_1_mgmt_port_0: type: OS::Neutron::Port properties: network: { get_param: cps_net_name } @@ -95,7 +95,7 @@ resources: - ip_address: { get_param: cps_net_ip } security_groups: [{ get_param: security_group_name }] - pcm_port_1: + pcm_server_2_mgmt_port_0: type: OS::Neutron::Port properties: network: { get_param: oam_net_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/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/out/GlobalSubstitutionTypesServiceTemplate.yaml index 6676af82c3..869685f7e5 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,12 +8,20 @@ node_types: org.openecomp.resource.abstract.nodes.pcm_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_pcm_port_related_networks: + port_pcm_server_mgmt_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pcm_server_mgmt_port_0_network_role_tag: + type: string + required: true + status: SUPPORTED + port_pcm_server_mgmt_port_0_network_role: + type: string + required: true + status: SUPPORTED index_value: type: integer description: Index value of this substitution service template runtime instance @@ -28,64 +36,50 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pcm_port_fixed_ips: - type: list + port_pcm_server_mgmt_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_pcm_port_network_role_tag: - type: string + port_pcm_server_mgmt_port_0_ip_requirements: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements vm_flavor_name: type: string required: true status: SUPPORTED - port_pcm_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_pcm_port_order: - type: integer - required: true - status: SUPPORTED - compute_pcm_server_name: + port_pcm_server_mgmt_port_0_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_pcm_port_network: + compute_pcm_server_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_pcm_port_vlan_requirements: + port_pcm_server_mgmt_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_pcm_port_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements compute_pcm_server_user_data_format: type: list required: true status: SUPPORTED entry_schema: type: string - vm_image_name: - type: string + port_pcm_server_mgmt_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_pcm_port_exCP_naming: - type: org.openecomp.datatypes.Naming + vm_image_name: + type: string required: true status: SUPPORTED compute_pcm_server_config_drive: @@ -94,15 +88,21 @@ node_types: status: SUPPORTED entry_schema: type: boolean - port_pcm_port_network_role: - type: string + port_pcm_server_mgmt_port_0_fixed_ips: + type: list required: true status: SUPPORTED - port_pcm_port_subnetpoolid: + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_pcm_server_mgmt_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_pcm_port_security_groups: + port_pcm_server_mgmt_port_0_order: + type: integer + required: true + status: SUPPORTED + port_pcm_server_mgmt_port_0_security_groups: type: list required: true status: SUPPORTED @@ -123,40 +123,41 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pcm_server_pcm_port: + - dependency_pcm_server_pcm_server_mgmt_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pcm_server_pcm_port: + - link_pcm_server_pcm_server_mgmt_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: - disk.device.read.requests_pcm_server: + network.incoming.packets_pcm_server_pcm_server_mgmt_port_0: 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_pcm_server: + network.outgoing.bytes.rate_pcm_server_pcm_server_mgmt_port_0: 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_pcm_server_pcm_port: + disk.device.read.requests_pcm_server: 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 - attachment_pcm_server_pcm_port: - type: tosca.capabilities.Attachment + disk.device.write.requests.rate_pcm_server: + 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 @@ -172,19 +173,19 @@ node_types: occurrences: - 1 - UNBOUNDED - vcpus_pcm_server: + network.outpoing.packets_pcm_server_pcm_server_mgmt_port_0: 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_pcm_server: + vcpus_pcm_server: 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.packets.rate_pcm_server_pcm_port: + memory.usage_pcm_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -202,41 +203,35 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.write.requests_pcm_server: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_pcm_server_pcm_server_mgmt_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - disk.read.requests_pcm_server: + disk.device.write.requests_pcm_server: 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_pcm_server: + disk.read.requests_pcm_server: 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_pcm_server_pcm_port: + memory.resident_pcm_server: 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_pcm_server_pcm_port: + network.incoming.packets.rate_pcm_server_pcm_server_mgmt_port_0: 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_pcm_server_pcm_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.iops_pcm_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -249,19 +244,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pcm_server_pcm_port: + disk.read.bytes.rate_pcm_server: 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_pcm_server: + disk.device.capacity_pcm_server: 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_pcm_server: + network.outgoing.bytes_pcm_server_pcm_server_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -272,6 +267,14 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_pcm_server_pcm_server_mgmt_port_0: + 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 cpu_pcm_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -296,17 +299,12 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_pcm_server_pcm_port: + network.outgoing.packets.rate_pcm_server_pcm_server_mgmt_port_0: 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_pcm_server_pcm_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED disk.device.usage_pcm_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -325,6 +323,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes_pcm_server_pcm_server_mgmt_port_0: + 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_pcm_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -344,6 +348,11 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_pcm_server_pcm_server_mgmt_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED cpu.delta_pcm_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -356,14 +365,6 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pcm_server_pcm_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 disk.device.read.bytes_pcm_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -381,6 +382,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes.rate_pcm_server_pcm_server_mgmt_port_0: + 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_pcm_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -421,9 +428,8 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pcm_server_pcm_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_pcm_server_pcm_server_mgmt_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED @@ -438,12 +444,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pcm_server_pcm_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.device.read.bytes.rate_pcm_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -528,14 +528,27 @@ node_types: description: the pcm nova service id status: SUPPORTED requirements: - - dependency_pcm_port_1: + - dependency_pcm_server_1_mgmt_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pcm_port_1: + - link_pcm_server_1_mgmt_port_0: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 + - dependency_pcm_server_2_mgmt_port_0: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - link_pcm_server_2_mgmt_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -569,44 +582,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pcm_port_0: - capability: tosca.capabilities.Node - node: tosca.nodes.Root - relationship: tosca.relationships.DependsOn - occurrences: - - 0 - - UNBOUNDED - - link_pcm_port_0: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 capabilities: - network.incoming.packets.rate_pcm_port_0: - 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_pcm_port_1: - 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_pcm_port_1: - 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_pcm_port_0: - 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_server_pcm_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -625,12 +601,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pcm_port_0: - 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_server_pcm_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -649,12 +619,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pcm_port_1: - 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_server_pcm_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -667,22 +631,6 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pcm_port_0: - 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 - binding_pcm_port_1: - 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 cpu_server_pcm_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -694,18 +642,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pcm_port_0: - 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.packets.rate_pcm_port_1: - 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_server_pcm_2: type: tosca.capabilities.Node occurrences: @@ -717,44 +653,12 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pcm_port_1: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - network.outgoing.bytes_pcm_port_0: - 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_pcm_port_0: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED cpu_server_pcm_1: 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_pcm_port_1: - 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 - attachment_pcm_port_0: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - attachment_pcm_port_1: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED host_server_pcm_2: type: tosca.capabilities.Container valid_source_types: @@ -762,6 +666,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_pcm_server_1_mgmt_port_0: + 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_server_pcm_2: type: tosca.capabilities.Endpoint.Admin occurrences: @@ -772,6 +682,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_pcm_server_2_mgmt_port_0: + 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_server_pcm_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -791,6 +707,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes.rate_pcm_server_2_mgmt_port_0: + 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_server_pcm_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -803,12 +725,22 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pcm_server_1_mgmt_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.write.requests.rate_server_pcm_2: 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_pcm_server_2_mgmt_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.write.requests.rate_server_pcm_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -845,6 +777,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes.rate_pcm_server_1_mgmt_port_0: + 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_server_pcm_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -869,6 +807,22 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_pcm_server_1_mgmt_port_0: + 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 + binding_pcm_server_2_mgmt_port_0: + 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 disk.device.read.requests.rate_server_pcm_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -933,6 +887,18 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets.rate_pcm_server_1_mgmt_port_0: + 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_pcm_server_1_mgmt_port_0: + 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_server_pcm_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -945,6 +911,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets_pcm_server_2_mgmt_port_0: + 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_server_pcm_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -981,6 +953,17 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets.rate_pcm_server_2_mgmt_port_0: + 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 + attachment_pcm_server_2_mgmt_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED disk.device.write.bytes_server_pcm_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1011,6 +994,11 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_pcm_server_1_mgmt_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED memory.usage_server_pcm_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1029,6 +1017,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes_pcm_server_1_mgmt_port_0: + 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_server_pcm_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1053,19 +1047,26 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes_pcm_server_2_mgmt_port_0: + 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_server_pcm_2: 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_pcm_port_0: - type: org.openecomp.capabilities.Forwarder + network.outgoing.packets.rate_pcm_server_1_mgmt_port_0: + 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_pcm_port_1: - type: org.openecomp.capabilities.Forwarder + feature_pcm_server_1_mgmt_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -1075,6 +1076,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes.rate_pcm_server_1_mgmt_port_0: + 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_server_pcm_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1105,71 +1112,76 @@ node_types: occurrences: - 1 - UNBOUNDED - scalable_server_pcm_2: - type: tosca.capabilities.Scalable + feature_pcm_server_2_mgmt_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - scalable_server_pcm_1: + network.outgoing.packets.rate_pcm_server_2_mgmt_port_0: + 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_server_pcm_2: type: tosca.capabilities.Scalable occurrences: - 1 - UNBOUNDED - disk.device.latency_server_pcm_2: + network.outgoing.bytes.rate_pcm_server_2_mgmt_port_0: 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_server_pcm_1: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + scalable_server_pcm_1: + type: tosca.capabilities.Scalable occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pcm_port_1: + disk.device.latency_server_pcm_2: 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_server_pcm_2: + disk.device.latency_server_pcm_1: 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_pcm_port_0: + disk.device.usage_server_pcm_2: 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_server_pcm_1: + network.outgoing.bytes_pcm_server_1_mgmt_port_0: 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_pcm_port_0: + network.outgoing.bytes_pcm_server_2_mgmt_port_0: 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_server_pcm_2: + disk.device.usage_server_pcm_1: 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_server_pcm_1: + disk.device.write.requests_server_pcm_2: 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_pcm_port_1: + disk.device.write.requests_server_pcm_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1197,18 +1209,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pcm_port_0: - 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_pcm_port_1: - 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.compute: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: @@ -1503,4 +1503,4 @@ node_types: type: tosca.capabilities.network.Bindable occurrences: - 1 - - UNBOUNDED \ No newline at end of file + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/out/Nested_pcm_serverServiceTemplate.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_serverServiceTemplate.yaml index 0e7c780c5d..aae557dd69 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_serverServiceTemplate.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_serverServiceTemplate.yaml @@ -11,11 +11,17 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_pcm_port_related_networks: + port_pcm_server_mgmt_port_0_related_networks: type: list required: true entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pcm_server_mgmt_port_0_network_role_tag: + type: string + required: true + port_pcm_server_mgmt_port_0_network_role: + type: string + required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -28,66 +34,60 @@ topology_template: required: true entry_schema: type: string - port_pcm_port_fixed_ips: + port_pcm_server_mgmt_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_pcm_server_mgmt_port_0_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_pcm_port_network_role_tag: - type: string - required: true + type: org.openecomp.datatypes.network.IpRequirements vm_flavor_name: type: string required: true - port_pcm_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_pcm_port_order: - type: integer - required: true - compute_pcm_server_name: + port_pcm_server_mgmt_port_0_network: type: list required: true entry_schema: type: string - port_pcm_port_network: + compute_pcm_server_name: type: list required: true entry_schema: type: string - port_pcm_port_vlan_requirements: + port_pcm_server_mgmt_port_0_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_pcm_port_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements compute_pcm_server_user_data_format: type: list required: true entry_schema: type: string + port_pcm_server_mgmt_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true vm_image_name: type: string required: true - port_pcm_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true compute_pcm_server_config_drive: type: list required: true entry_schema: type: boolean - port_pcm_port_network_role: - type: string + port_pcm_server_mgmt_port_0_fixed_ips: + type: list required: true - port_pcm_port_subnetpoolid: + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_pcm_server_mgmt_port_0_subnetpoolid: type: string required: true - port_pcm_port_security_groups: + port_pcm_server_mgmt_port_0_order: + type: integer + required: true + port_pcm_server_mgmt_port_0_security_groups: type: list required: true entry_schema: @@ -116,39 +116,39 @@ topology_template: get_input: - compute_pcm_server_user_data_format - index_value - pcm_server_pcm_port: + pcm_server_pcm_server_mgmt_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_requirements: - get_input: port_pcm_port_mac_requirements + get_input: port_pcm_server_mgmt_port_0_mac_requirements order: - get_input: port_pcm_port_order + get_input: port_pcm_server_mgmt_port_0_order security_groups: get_input: - - port_pcm_port_security_groups + - port_pcm_server_mgmt_port_0_security_groups - index_value exCP_naming: - get_input: port_pcm_port_exCP_naming + get_input: port_pcm_server_mgmt_port_0_exCP_naming vlan_requirements: - get_input: port_pcm_port_vlan_requirements + get_input: port_pcm_server_mgmt_port_0_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_pcm_port_ip_requirements + get_input: port_pcm_server_mgmt_port_0_ip_requirements related_networks: - get_input: port_pcm_port_related_networks + get_input: port_pcm_server_mgmt_port_0_related_networks network_role_tag: - get_input: port_pcm_port_network_role_tag + get_input: port_pcm_server_mgmt_port_0_network_role_tag network_role: - get_input: port_pcm_port_network_role + get_input: port_pcm_server_mgmt_port_0_network_role fixed_ips: get_input: - - port_pcm_port_fixed_ips + - port_pcm_server_mgmt_port_0_fixed_ips - index_value subnetpoolid: - get_input: port_pcm_port_subnetpoolid + get_input: port_pcm_server_mgmt_port_0_subnetpoolid network: get_input: - - port_pcm_port_network + - port_pcm_server_mgmt_port_0_network - index_value requirements: - binding: @@ -158,39 +158,42 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pcm_server capabilities: + network.incoming.packets_pcm_server_pcm_server_mgmt_port_0: + - pcm_server_pcm_server_mgmt_port_0 + - network.incoming.packets + network.outgoing.bytes.rate_pcm_server_pcm_server_mgmt_port_0: + - pcm_server_pcm_server_mgmt_port_0 + - network.outgoing.bytes.rate disk.device.read.requests_pcm_server: - pcm_server - disk.device.read.requests disk.device.write.requests.rate_pcm_server: - pcm_server - disk.device.write.requests.rate - network.outgoing.bytes.rate_pcm_server_pcm_port: - - pcm_server_pcm_port - - network.outgoing.bytes.rate - attachment_pcm_server_pcm_port: - - pcm_server_pcm_port - - attachment disk.root.size_pcm_server: - pcm_server - disk.root.size disk.device.write.bytes.rate_pcm_server: - pcm_server - disk.device.write.bytes.rate + network.outpoing.packets_pcm_server_pcm_server_mgmt_port_0: + - pcm_server_pcm_server_mgmt_port_0 + - network.outpoing.packets vcpus_pcm_server: - pcm_server - vcpus memory.usage_pcm_server: - pcm_server - memory.usage - network.outgoing.packets.rate_pcm_server_pcm_port: - - pcm_server_pcm_port - - network.outgoing.packets.rate disk.device.read.requests.rate_pcm_server: - pcm_server - disk.device.read.requests.rate disk.device.latency_pcm_server: - pcm_server - disk.device.latency + forwarder_pcm_server_pcm_server_mgmt_port_0: + - pcm_server_pcm_server_mgmt_port_0 + - forwarder disk.device.write.requests_pcm_server: - pcm_server - disk.device.write.requests @@ -200,33 +203,30 @@ topology_template: memory.resident_pcm_server: - pcm_server - memory.resident - network.outgoing.bytes_pcm_server_pcm_port: - - pcm_server_pcm_port - - network.outgoing.bytes - network.outpoing.packets_pcm_server_pcm_port: - - pcm_server_pcm_port - - network.outpoing.packets - feature_pcm_server_pcm_port: - - pcm_server_pcm_port - - feature + network.incoming.packets.rate_pcm_server_pcm_server_mgmt_port_0: + - pcm_server_pcm_server_mgmt_port_0 + - network.incoming.packets.rate disk.iops_pcm_server: - pcm_server - disk.iops disk.capacity_pcm_server: - pcm_server - disk.capacity - network.incoming.bytes.rate_pcm_server_pcm_port: - - pcm_server_pcm_port - - network.incoming.bytes.rate disk.read.bytes.rate_pcm_server: - pcm_server - disk.read.bytes.rate disk.device.capacity_pcm_server: - pcm_server - disk.device.capacity + network.outgoing.bytes_pcm_server_pcm_server_mgmt_port_0: + - pcm_server_pcm_server_mgmt_port_0 + - network.outgoing.bytes binding_pcm_server: - pcm_server - binding + binding_pcm_server_pcm_server_mgmt_port_0: + - pcm_server_pcm_server_mgmt_port_0 + - binding cpu_pcm_server: - pcm_server - cpu @@ -239,12 +239,9 @@ topology_template: disk.allocation_pcm_server: - pcm_server - disk.allocation - network.incoming.packets_pcm_server_pcm_port: - - pcm_server_pcm_port - - network.incoming.packets - forwarder_pcm_server_pcm_port: - - pcm_server_pcm_port - - forwarder + network.outgoing.packets.rate_pcm_server_pcm_server_mgmt_port_0: + - pcm_server_pcm_server_mgmt_port_0 + - network.outgoing.packets.rate disk.device.usage_pcm_server: - pcm_server - disk.device.usage @@ -254,6 +251,9 @@ topology_template: instance_pcm_server: - pcm_server - instance + network.incoming.bytes_pcm_server_pcm_server_mgmt_port_0: + - pcm_server_pcm_server_mgmt_port_0 + - network.incoming.bytes disk.write.requests_pcm_server: - pcm_server - disk.write.requests @@ -263,15 +263,15 @@ topology_template: host_pcm_server: - pcm_server - host + feature_pcm_server_pcm_server_mgmt_port_0: + - pcm_server_pcm_server_mgmt_port_0 + - feature cpu.delta_pcm_server: - pcm_server - cpu.delta disk.usage_pcm_server: - pcm_server - disk.usage - binding_pcm_server_pcm_port: - - pcm_server_pcm_port - - binding disk.device.read.bytes_pcm_server: - pcm_server - disk.device.read.bytes @@ -281,6 +281,9 @@ topology_template: feature_pcm_server: - pcm_server - feature + network.incoming.bytes.rate_pcm_server_pcm_server_mgmt_port_0: + - pcm_server_pcm_server_mgmt_port_0 + - network.incoming.bytes.rate disk.write.bytes.rate_pcm_server: - pcm_server - disk.write.bytes.rate @@ -302,31 +305,28 @@ topology_template: endpoint_pcm_server: - pcm_server - endpoint - network.incoming.bytes_pcm_server_pcm_port: - - pcm_server_pcm_port - - network.incoming.bytes + attachment_pcm_server_pcm_server_mgmt_port_0: + - pcm_server_pcm_server_mgmt_port_0 + - attachment scalable_pcm_server: - pcm_server - scalable disk.write.requests.rate_pcm_server: - pcm_server - disk.write.requests.rate - network.incoming.packets.rate_pcm_server_pcm_port: - - pcm_server_pcm_port - - network.incoming.packets.rate disk.device.read.bytes.rate_pcm_server: - pcm_server - disk.device.read.bytes.rate requirements: - link_pcm_server_pcm_port: - - pcm_server_pcm_port + link_pcm_server_pcm_server_mgmt_port_0: + - pcm_server_pcm_server_mgmt_port_0 - link - dependency_pcm_server_pcm_port: - - pcm_server_pcm_port + dependency_pcm_server_pcm_server_mgmt_port_0: + - pcm_server_pcm_server_mgmt_port_0 - dependency local_storage_pcm_server: - pcm_server - local_storage dependency_pcm_server: - pcm_server - - dependency \ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/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 bb6490a5ef..a617598044 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 @@ -92,34 +92,34 @@ topology_template: directives: - substitutable properties: + port_pcm_server_mgmt_port_0_network_role_tag: cps compute_pcm_server_availability_zone: - get_input: availabilityzone_name - port_pcm_port_fixed_ips: - - ip_address: - get_input: cps_net_ip - port_pcm_port_network_role_tag: cps - vm_flavor_name: - get_input: pcm_flavor_name - port_pcm_port_mac_requirements: + port_pcm_server_mgmt_port_0_mac_requirements: mac_count_required: is_required: false - compute_pcm_server_name: - - get_input: pcm_server_name - port_pcm_port_network: - - get_input: cps_net_name - port_pcm_port_ip_requirements: + port_pcm_server_mgmt_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false + vm_flavor_name: + get_input: pcm_flavor_name + port_pcm_server_mgmt_port_0_network: + - get_input: cps_net_name + compute_pcm_server_name: + - get_input: pcm_server_name compute_pcm_server_user_data_format: - RAW vm_image_name: get_input: pcm_image_name compute_pcm_server_config_drive: - true - port_pcm_port_security_groups: + port_pcm_server_mgmt_port_0_fixed_ips: + - ip_address: + get_input: cps_net_ip + port_pcm_server_mgmt_port_0_security_groups: - - get_input: security_group_name service_template_filter: substitute_service_template: Nested_pcm_serverServiceTemplate.yaml @@ -134,34 +134,34 @@ topology_template: directives: - substitutable properties: + port_pcm_server_mgmt_port_0_network_role_tag: oam compute_pcm_server_availability_zone: - get_input: availabilityzone_name - port_pcm_port_fixed_ips: - - ip_address: - get_input: oam_net_ip - port_pcm_port_network_role_tag: oam - vm_flavor_name: - get_input: pcm_flavor_name - port_pcm_port_mac_requirements: + port_pcm_server_mgmt_port_0_mac_requirements: mac_count_required: is_required: false - compute_pcm_server_name: - - get_input: pcm_server_name - port_pcm_port_network: - - get_input: oam_net_name - port_pcm_port_ip_requirements: + port_pcm_server_mgmt_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false + vm_flavor_name: + get_input: pcm_flavor_name + port_pcm_server_mgmt_port_0_network: + - get_input: oam_net_name + compute_pcm_server_name: + - get_input: pcm_server_name compute_pcm_server_user_data_format: - RAW vm_image_name: get_input: pcm_image_name compute_pcm_server_config_drive: - true - port_pcm_port_security_groups: + port_pcm_server_mgmt_port_0_fixed_ips: + - ip_address: + get_input: oam_net_ip + port_pcm_server_mgmt_port_0_security_groups: - - get_input: security_group_name service_template_filter: substitute_service_template: Nested_pcm_serverServiceTemplate.yaml @@ -190,18 +190,6 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.heat.nested-pcm_v0.1 capabilities: - network.incoming.packets.rate_pcm_port_0: - - abstract_pcm_server_1 - - network.incoming.packets.rate_pcm_server_pcm_port - network.incoming.packets.rate_pcm_port_1: - - abstract_pcm_server_0 - - network.incoming.packets.rate_pcm_server_pcm_port - network.outpoing.packets_pcm_port_1: - - abstract_pcm_server_0 - - network.outpoing.packets_pcm_server_pcm_port - network.outpoing.packets_pcm_port_0: - - abstract_pcm_server_1 - - network.outpoing.packets_pcm_server_pcm_port disk.usage_server_pcm_2: - abstract_pcm_server_0 - disk.usage_pcm_server @@ -211,9 +199,6 @@ topology_template: disk.capacity_server_pcm_2: - abstract_pcm_server_0 - disk.capacity_pcm_server - network.incoming.bytes_pcm_port_0: - - abstract_pcm_server_1 - - network.incoming.bytes_pcm_server_pcm_port disk.usage_server_pcm_1: - abstract_pcm_server_1 - disk.usage_pcm_server @@ -223,69 +208,42 @@ topology_template: memory.resident_server_pcm_1: - abstract_pcm_server_1 - memory.resident_pcm_server - network.incoming.bytes_pcm_port_1: - - abstract_pcm_server_0 - - network.incoming.bytes_pcm_server_pcm_port vcpus_server_pcm_2: - abstract_pcm_server_0 - vcpus_pcm_server memory.resident_server_pcm_2: - abstract_pcm_server_0 - memory.resident_pcm_server - binding_pcm_port_0: - - abstract_pcm_server_1 - - binding_pcm_server_pcm_port - binding_pcm_port_1: - - abstract_pcm_server_0 - - binding_pcm_server_pcm_port cpu_server_pcm_2: - abstract_pcm_server_0 - cpu_pcm_server feature_server_pcm_1: - abstract_pcm_server_1 - feature_pcm_server - network.outgoing.packets.rate_pcm_port_0: - - abstract_pcm_server_1 - - network.outgoing.packets.rate_pcm_server_pcm_port - network.outgoing.packets.rate_pcm_port_1: - - abstract_pcm_server_0 - - network.outgoing.packets.rate_pcm_server_pcm_port feature_server_pcm_2: - abstract_pcm_server_0 - feature_pcm_server disk.device.iops_server_pcm_2: - abstract_pcm_server_0 - disk.device.iops_pcm_server - feature_pcm_port_1: - - abstract_pcm_server_0 - - feature_pcm_server_pcm_port - network.outgoing.bytes_pcm_port_0: - - abstract_pcm_server_1 - - network.outgoing.bytes_pcm_server_pcm_port - feature_pcm_port_0: - - abstract_pcm_server_1 - - feature_pcm_server_pcm_port cpu_server_pcm_1: - abstract_pcm_server_1 - cpu_pcm_server - network.outgoing.bytes_pcm_port_1: - - abstract_pcm_server_0 - - network.outgoing.bytes_pcm_server_pcm_port - attachment_pcm_port_0: - - abstract_pcm_server_1 - - attachment_pcm_server_pcm_port - attachment_pcm_port_1: - - abstract_pcm_server_0 - - attachment_pcm_server_pcm_port host_server_pcm_2: - abstract_pcm_server_0 - host_pcm_server + network.outpoing.packets_pcm_server_1_mgmt_port_0: + - abstract_pcm_server_1 + - network.outpoing.packets_pcm_server_pcm_server_mgmt_port_0 endpoint_server_pcm_2: - abstract_pcm_server_0 - endpoint_pcm_server endpoint_server_pcm_1: - abstract_pcm_server_1 - endpoint_pcm_server + network.outpoing.packets_pcm_server_2_mgmt_port_0: + - abstract_pcm_server_0 + - network.outpoing.packets_pcm_server_pcm_server_mgmt_port_0 disk.device.capacity_server_pcm_2: - abstract_pcm_server_0 - disk.device.capacity_pcm_server @@ -295,15 +253,24 @@ topology_template: disk.device.capacity_server_pcm_1: - abstract_pcm_server_1 - disk.device.capacity_pcm_server + network.incoming.bytes.rate_pcm_server_2_mgmt_port_0: + - abstract_pcm_server_0 + - network.incoming.bytes.rate_pcm_server_pcm_server_mgmt_port_0 disk.latency_server_pcm_1: - abstract_pcm_server_1 - disk.latency_pcm_server disk.latency_server_pcm_2: - abstract_pcm_server_0 - disk.latency_pcm_server + forwarder_pcm_server_1_mgmt_port_0: + - abstract_pcm_server_1 + - forwarder_pcm_server_pcm_server_mgmt_port_0 disk.write.requests.rate_server_pcm_2: - abstract_pcm_server_0 - disk.write.requests.rate_pcm_server + forwarder_pcm_server_2_mgmt_port_0: + - abstract_pcm_server_0 + - forwarder_pcm_server_pcm_server_mgmt_port_0 disk.write.requests.rate_server_pcm_1: - abstract_pcm_server_1 - disk.write.requests.rate_pcm_server @@ -322,6 +289,9 @@ topology_template: disk.write.bytes_server_pcm_2: - abstract_pcm_server_0 - disk.write.bytes_pcm_server + network.incoming.bytes.rate_pcm_server_1_mgmt_port_0: + - abstract_pcm_server_1 + - network.incoming.bytes.rate_pcm_server_pcm_server_mgmt_port_0 disk.write.bytes_server_pcm_1: - abstract_pcm_server_1 - disk.write.bytes_pcm_server @@ -334,6 +304,12 @@ topology_template: disk.device.read.requests.rate_server_pcm_1: - abstract_pcm_server_1 - disk.device.read.requests.rate_pcm_server + binding_pcm_server_1_mgmt_port_0: + - abstract_pcm_server_1 + - binding_pcm_server_pcm_server_mgmt_port_0 + binding_pcm_server_2_mgmt_port_0: + - abstract_pcm_server_0 + - binding_pcm_server_pcm_server_mgmt_port_0 disk.device.read.requests.rate_server_pcm_2: - abstract_pcm_server_0 - disk.device.read.requests.rate_pcm_server @@ -367,12 +343,21 @@ topology_template: disk.iops_server_pcm_1: - abstract_pcm_server_1 - disk.iops_pcm_server + network.incoming.packets.rate_pcm_server_1_mgmt_port_0: + - abstract_pcm_server_1 + - network.incoming.packets.rate_pcm_server_pcm_server_mgmt_port_0 + network.incoming.packets_pcm_server_1_mgmt_port_0: + - abstract_pcm_server_1 + - network.incoming.packets_pcm_server_pcm_server_mgmt_port_0 disk.device.write.bytes.rate_server_pcm_1: - abstract_pcm_server_1 - disk.device.write.bytes.rate_pcm_server disk.device.write.bytes.rate_server_pcm_2: - abstract_pcm_server_0 - disk.device.write.bytes.rate_pcm_server + network.incoming.packets_pcm_server_2_mgmt_port_0: + - abstract_pcm_server_0 + - network.incoming.packets_pcm_server_pcm_server_mgmt_port_0 disk.write.requests_server_pcm_2: - abstract_pcm_server_0 - disk.write.requests_pcm_server @@ -391,6 +376,12 @@ topology_template: cpu_util_server_pcm_2: - abstract_pcm_server_0 - cpu_util_pcm_server + network.incoming.packets.rate_pcm_server_2_mgmt_port_0: + - abstract_pcm_server_0 + - network.incoming.packets.rate_pcm_server_pcm_server_mgmt_port_0 + attachment_pcm_server_2_mgmt_port_0: + - abstract_pcm_server_0 + - attachment_pcm_server_pcm_server_mgmt_port_0 disk.device.write.bytes_server_pcm_2: - abstract_pcm_server_0 - disk.device.write.bytes_pcm_server @@ -406,6 +397,9 @@ topology_template: memory.usage_server_pcm_1: - abstract_pcm_server_1 - memory.usage_pcm_server + attachment_pcm_server_1_mgmt_port_0: + - abstract_pcm_server_1 + - attachment_pcm_server_pcm_server_mgmt_port_0 memory.usage_server_pcm_2: - abstract_pcm_server_0 - memory.usage_pcm_server @@ -415,6 +409,9 @@ topology_template: disk.device.read.bytes_server_pcm_1: - abstract_pcm_server_1 - disk.device.read.bytes_pcm_server + network.incoming.bytes_pcm_server_1_mgmt_port_0: + - abstract_pcm_server_1 + - network.incoming.bytes_pcm_server_pcm_server_mgmt_port_0 disk.read.bytes.rate_server_pcm_2: - abstract_pcm_server_0 - disk.read.bytes.rate_pcm_server @@ -427,18 +424,24 @@ topology_template: cpu.delta_server_pcm_1: - abstract_pcm_server_1 - cpu.delta_pcm_server + network.incoming.bytes_pcm_server_2_mgmt_port_0: + - abstract_pcm_server_0 + - network.incoming.bytes_pcm_server_pcm_server_mgmt_port_0 cpu.delta_server_pcm_2: - abstract_pcm_server_0 - cpu.delta_pcm_server - forwarder_pcm_port_0: + network.outgoing.packets.rate_pcm_server_1_mgmt_port_0: - abstract_pcm_server_1 - - forwarder_pcm_server_pcm_port - forwarder_pcm_port_1: - - abstract_pcm_server_0 - - forwarder_pcm_server_pcm_port + - network.outgoing.packets.rate_pcm_server_pcm_server_mgmt_port_0 + feature_pcm_server_1_mgmt_port_0: + - abstract_pcm_server_1 + - feature_pcm_server_pcm_server_mgmt_port_0 disk.device.write.requests.rate_server_pcm_2: - abstract_pcm_server_0 - disk.device.write.requests.rate_pcm_server + network.outgoing.bytes.rate_pcm_server_1_mgmt_port_0: + - abstract_pcm_server_1 + - network.outgoing.bytes.rate_pcm_server_pcm_server_mgmt_port_0 disk.read.requests_server_pcm_2: - abstract_pcm_server_0 - disk.read.requests_pcm_server @@ -454,9 +457,18 @@ topology_template: disk.ephemeral.size_server_pcm_2: - abstract_pcm_server_0 - disk.ephemeral.size_pcm_server + feature_pcm_server_2_mgmt_port_0: + - abstract_pcm_server_0 + - feature_pcm_server_pcm_server_mgmt_port_0 + network.outgoing.packets.rate_pcm_server_2_mgmt_port_0: + - abstract_pcm_server_0 + - network.outgoing.packets.rate_pcm_server_pcm_server_mgmt_port_0 scalable_server_pcm_2: - abstract_pcm_server_0 - scalable_pcm_server + network.outgoing.bytes.rate_pcm_server_2_mgmt_port_0: + - abstract_pcm_server_0 + - network.outgoing.bytes.rate_pcm_server_pcm_server_mgmt_port_0 scalable_server_pcm_1: - abstract_pcm_server_1 - scalable_pcm_server @@ -466,30 +478,24 @@ topology_template: disk.device.latency_server_pcm_1: - abstract_pcm_server_1 - disk.device.latency_pcm_server - network.outgoing.bytes.rate_pcm_port_1: - - abstract_pcm_server_0 - - network.outgoing.bytes.rate_pcm_server_pcm_port disk.device.usage_server_pcm_2: - abstract_pcm_server_0 - disk.device.usage_pcm_server - network.incoming.packets_pcm_port_0: + network.outgoing.bytes_pcm_server_1_mgmt_port_0: - abstract_pcm_server_1 - - network.incoming.packets_pcm_server_pcm_port + - network.outgoing.bytes_pcm_server_pcm_server_mgmt_port_0 + network.outgoing.bytes_pcm_server_2_mgmt_port_0: + - abstract_pcm_server_0 + - network.outgoing.bytes_pcm_server_pcm_server_mgmt_port_0 disk.device.usage_server_pcm_1: - abstract_pcm_server_1 - disk.device.usage_pcm_server - network.outgoing.bytes.rate_pcm_port_0: - - abstract_pcm_server_1 - - network.outgoing.bytes.rate_pcm_server_pcm_port disk.device.write.requests_server_pcm_2: - abstract_pcm_server_0 - disk.device.write.requests_pcm_server disk.device.write.requests_server_pcm_1: - abstract_pcm_server_1 - disk.device.write.requests_pcm_server - network.incoming.packets_pcm_port_1: - - abstract_pcm_server_0 - - network.incoming.packets_pcm_server_pcm_port os_server_pcm_2: - abstract_pcm_server_0 - os_pcm_server @@ -502,31 +508,25 @@ topology_template: os_server_pcm_1: - abstract_pcm_server_1 - os_pcm_server - network.incoming.bytes.rate_pcm_port_0: - - abstract_pcm_server_1 - - network.incoming.bytes.rate_pcm_server_pcm_port - network.incoming.bytes.rate_pcm_port_1: - - abstract_pcm_server_0 - - network.incoming.bytes.rate_pcm_server_pcm_port requirements: - link_pcm_port_0: + link_pcm_server_1_mgmt_port_0: - abstract_pcm_server_1 - - link_pcm_server_pcm_port - link_pcm_port_1: + - link_pcm_server_pcm_server_mgmt_port_0 + link_pcm_server_2_mgmt_port_0: - abstract_pcm_server_0 - - link_pcm_server_pcm_port + - link_pcm_server_pcm_server_mgmt_port_0 dependency_server_pcm_2: - abstract_pcm_server_0 - dependency_pcm_server + dependency_pcm_server_2_mgmt_port_0: + - abstract_pcm_server_0 + - dependency_pcm_server_pcm_server_mgmt_port_0 dependency_server_pcm_1: - abstract_pcm_server_1 - dependency_pcm_server - dependency_pcm_port_0: + dependency_pcm_server_1_mgmt_port_0: - abstract_pcm_server_1 - - dependency_pcm_server_pcm_port - dependency_pcm_port_1: - - abstract_pcm_server_0 - - dependency_pcm_server_pcm_port + - dependency_pcm_server_pcm_server_mgmt_port_0 local_storage_server_pcm_2: - abstract_pcm_server_0 - local_storage_pcm_server diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/GlobalSubstitutionTypesServiceTemplate.yaml index 438512f5e8..ce3d6964c1 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,12 +8,28 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_pcm_port_related_networks: + port_pcm_port_1_related_networks: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pcm_port_1_network_role_tag: + type: string + required: true + status: SUPPORTED + port_pcm_port_1_network: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_pcm_port_1_security_groups: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json index_value: type: integer description: Index value of this substitution service template runtime instance @@ -34,80 +50,64 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pcm_port_fixed_ips: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_pcm_port_network_role_tag: - type: string - required: true - status: SUPPORTED vm_flavor_name: type: string required: true status: SUPPORTED - port_pcm_port_mac_requirements: + port_pcm_port_1_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_pcm_port_order: - type: integer - required: true - status: SUPPORTED - port_pcm_port_network: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_pcm_port_vlan_requirements: + port_pcm_port_1_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_pcm_port_ip_requirements: + port_pcm_port_1_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: org.openecomp.datatypes.heat.neutron.port.FixedIps vm_image_name: type: string required: true status: SUPPORTED - port_pcm_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_pcm_port_network_role: + port_pcm_port_1_subnetpoolid: type: string required: true status: SUPPORTED - port_pcm_port_subnetpoolid: - type: string + port_pcm_port_1_ip_requirements: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements compute_pd_server_config_drive: type: list required: true status: SUPPORTED entry_schema: type: boolean + port_pcm_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED compute_pd_server_user_data_format: type: list required: true status: SUPPORTED entry_schema: type: string - port_pcm_port_security_groups: - type: list + port_pcm_port_1_order: + type: integer + required: true + status: SUPPORTED + port_pcm_port_1_network_role: + type: string required: true status: SUPPORTED - entry_schema: - type: json requirements: - dependency_pd_server: capability: tosca.capabilities.Node @@ -123,25 +123,20 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pcm_port: + - dependency_pd_server_pcm_port_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pcm_port: + - link_pd_server_pcm_port_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: - forwarder_pd_server_pcm_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED scalable_pd_server: type: tosca.capabilities.Scalable occurrences: @@ -153,25 +148,30 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pcm_port: + memory.usage_pd_server: 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_pd_server: + memory_pd_server: 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_pd_server: + disk.device.usage_pd_server: 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_pd_server: + forwarder_pd_server_pcm_port_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets_pd_server_pcm_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -188,19 +188,12 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_pcm_port: - type: tosca.capabilities.Node + network.outgoing.bytes.rate_pd_server_pcm_port_1: + 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_pd_server_pcm_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 cpu_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -231,25 +224,36 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.iops_pd_server: + network.incoming.bytes.rate_pd_server_pcm_port_1: 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_pd_server: + attachment_pd_server_pcm_port_1: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes_pd_server_pcm_port_1: 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_pd_server: + disk.iops_pd_server: + 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_pd_server: 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_pd_server_pcm_port: + cpu.delta_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -267,12 +271,23 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_pd_server_pcm_port_1: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.device.write.requests_pd_server: 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_pd_server_pcm_port_1: + 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_pd_server: type: tosca.capabilities.Endpoint.Admin occurrences: @@ -284,6 +299,14 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_pd_server_pcm_port_1: + 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 disk.device.allocation_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -307,7 +330,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pcm_port: + network.incoming.bytes_pd_server_pcm_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -330,12 +353,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pd_server_pcm_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.device.read.requests.rate_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -354,41 +371,18 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pcm_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.device.write.bytes_pd_server: 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_pd_server_pcm_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.device.read.requests_pd_server: 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_pd_server_pcm_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 - attachment_pd_server_pcm_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED instance_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -402,7 +396,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pcm_port: + network.outgoing.packets.rate_pd_server_pcm_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -450,15 +444,25 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_pd_server_pcm_port_1: + 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.pcm_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_pcm_port_related_networks: + port_pcm_port_0_network_role: + type: string + required: true + status: SUPPORTED + port_pcm_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments + type: org.openecomp.datatypes.network.IpRequirements index_value: type: integer description: Index value of this substitution service template runtime instance @@ -467,120 +471,116 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - compute_pcm_server_availability_zone: + port_pcm_port_0_fixed_ips: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_pcm_port_0_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_pcm_port_fixed_ips: + port_pcm_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_pcm_port_network_role_tag: - type: string + type: org.openecomp.datatypes.network.VlanRequirements + compute_pcm_server_availability_zone: + type: list required: true status: SUPPORTED + entry_schema: + type: string vm_flavor_name: type: string required: true status: SUPPORTED - port_pcm_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_pcm_port_order: - type: integer - required: true - status: SUPPORTED compute_pcm_server_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_pcm_port_network: + port_pcm_port_0_security_groups: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pcm_port_vlan_requirements: + type: json + compute_pcm_server_user_data_format: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pcm_port_ip_requirements: - type: list + type: string + port_pcm_port_0_order: + type: integer required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - compute_pcm_server_user_data_format: - type: list + port_pcm_port_0_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: string vm_image_name: type: string required: true status: SUPPORTED - port_pcm_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pcm_port_0_related_networks: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments compute_pcm_server_config_drive: type: list required: true status: SUPPORTED entry_schema: type: boolean - port_pcm_port_network_role: - type: string + port_pcm_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_pcm_port_subnetpoolid: + port_pcm_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_pcm_port_security_groups: - type: list + port_pcm_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json requirements: - - dependency_pcm_server: + - dependency_pcm_server_pcm_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - local_storage_pcm_server: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo + - link_pcm_server_pcm_port_0: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo occurrences: - - 0 - - UNBOUNDED - - dependency_pcm_server_pcm_port: + - 1 + - 1 + - dependency_pcm_server: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pcm_server_pcm_port: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo + - local_storage_pcm_server: + capability: tosca.capabilities.Attachment + node: tosca.nodes.BlockStorage + relationship: tosca.relationships.AttachesTo occurrences: - - 1 - - 1 + - 0 + - UNBOUNDED capabilities: disk.device.read.requests_pcm_server: type: org.openecomp.capabilities.metric.Ceilometer @@ -594,16 +594,18 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pcm_server_pcm_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_pcm_server_pcm_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - attachment_pcm_server_pcm_port: - type: tosca.capabilities.Attachment + binding_pcm_server_pcm_port_0: + 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: - - 1 + - 0 - UNBOUNDED disk.root.size_pcm_server: type: org.openecomp.capabilities.metric.Ceilometer @@ -629,7 +631,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pcm_server_pcm_port: + network.incoming.bytes.rate_pcm_server_pcm_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -647,41 +649,36 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.write.requests_pcm_server: + network.incoming.packets.rate_pcm_server_pcm_port_0: 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_pcm_server: + network.outgoing.packets.rate_pcm_server_pcm_port_0: 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_pcm_server: + disk.device.write.requests_pcm_server: 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_pcm_server_pcm_port: + disk.read.requests_pcm_server: 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_pcm_server_pcm_port: + memory.resident_pcm_server: 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_pcm_server_pcm_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.iops_pcm_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -694,12 +691,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pcm_server_pcm_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.bytes.rate_pcm_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -729,26 +720,26 @@ node_types: occurrences: - 1 - UNBOUNDED - cpu_util_pcm_server: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_pcm_server_pcm_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.allocation_pcm_server: + network.incoming.bytes_pcm_server_pcm_port_0: 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_pcm_server_pcm_port: + cpu_util_pcm_server: 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_pcm_server_pcm_port: - type: org.openecomp.capabilities.Forwarder + disk.allocation_pcm_server: + 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 @@ -801,13 +792,16 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pcm_server_pcm_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 + attachment_pcm_server_pcm_port_0: + type: tosca.capabilities.Attachment occurrences: - - 0 + - 1 + - UNBOUNDED + network.outgoing.bytes_pcm_server_pcm_port_0: + 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_pcm_server: type: org.openecomp.capabilities.metric.Ceilometer @@ -832,6 +826,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets_pcm_server_pcm_port_0: + 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_pcm_server: type: tosca.capabilities.OperatingSystem occurrences: @@ -849,41 +849,41 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.write.bytes_pcm_server: + network.outpoing.packets_pcm_server_pcm_port_0: 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.ephemeral.size_pcm_server: + disk.write.bytes_pcm_server: 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_pcm_server: - type: tosca.capabilities.Endpoint.Admin + disk.ephemeral.size_pcm_server: + 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_pcm_server_pcm_port: + network.outgoing.bytes.rate_pcm_server_pcm_port_0: 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_pcm_server: - type: tosca.capabilities.Scalable + endpoint_pcm_server: + type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED - disk.write.requests.rate_pcm_server: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + scalable_pcm_server: + type: tosca.capabilities.Scalable occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pcm_server_pcm_port: + disk.write.requests.rate_pcm_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1668,4 +1668,4 @@ node_types: type: tosca.capabilities.OperatingSystem occurrences: - 1 - - UNBOUNDED \ No newline at end of file + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/Nested_pcm_serverServiceTemplate.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_serverServiceTemplate.yaml index 0e7c780c5d..520a821c20 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_serverServiceTemplate.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_serverServiceTemplate.yaml @@ -11,11 +11,14 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_pcm_port_related_networks: + port_pcm_port_0_network_role: + type: string + required: true + port_pcm_port_0_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments + type: org.openecomp.datatypes.network.IpRequirements index_value: type: integer description: Index value of this substitution service template runtime instance @@ -23,138 +26,135 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - compute_pcm_server_availability_zone: + port_pcm_port_0_fixed_ips: type: list required: true entry_schema: - type: string - port_pcm_port_fixed_ips: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_pcm_port_0_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_pcm_port_network_role_tag: - type: string - required: true - vm_flavor_name: - type: string - required: true - port_pcm_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_pcm_port_order: - type: integer - required: true - compute_pcm_server_name: + type: string + port_pcm_port_0_vlan_requirements: type: list required: true entry_schema: - type: string - port_pcm_port_network: + type: org.openecomp.datatypes.network.VlanRequirements + compute_pcm_server_availability_zone: type: list required: true entry_schema: type: string - port_pcm_port_vlan_requirements: + vm_flavor_name: + type: string + required: true + compute_pcm_server_name: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pcm_port_ip_requirements: + type: string + port_pcm_port_0_security_groups: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: json compute_pcm_server_user_data_format: type: list required: true entry_schema: type: string + port_pcm_port_0_order: + type: integer + required: true + port_pcm_port_0_subnetpoolid: + type: string + required: true vm_image_name: type: string required: true - port_pcm_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pcm_port_0_related_networks: + type: list required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments compute_pcm_server_config_drive: type: list required: true entry_schema: type: boolean - port_pcm_port_network_role: - type: string + port_pcm_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_pcm_port_subnetpoolid: + port_pcm_port_0_network_role_tag: type: string required: true - port_pcm_port_security_groups: - type: list + port_pcm_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json node_templates: - pcm_server: - type: org.openecomp.resource.vfc.compute.nodes.heat.pcm_server - properties: - availability_zone: - get_input: - - compute_pcm_server_availability_zone - - index_value - flavor: - get_input: vm_flavor_name - config_drive: - get_input: - - compute_pcm_server_config_drive - - index_value - image: - get_input: vm_image_name - name: - get_input: - - compute_pcm_server_name - - index_value - user_data_format: - get_input: - - compute_pcm_server_user_data_format - - index_value - pcm_server_pcm_port: + pcm_server_pcm_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_requirements: - get_input: port_pcm_port_mac_requirements + get_input: port_pcm_port_0_mac_requirements order: - get_input: port_pcm_port_order + get_input: port_pcm_port_0_order security_groups: get_input: - - port_pcm_port_security_groups + - port_pcm_port_0_security_groups - index_value exCP_naming: - get_input: port_pcm_port_exCP_naming + get_input: port_pcm_port_0_exCP_naming vlan_requirements: - get_input: port_pcm_port_vlan_requirements + get_input: port_pcm_port_0_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_pcm_port_ip_requirements + get_input: port_pcm_port_0_ip_requirements related_networks: - get_input: port_pcm_port_related_networks + get_input: port_pcm_port_0_related_networks network_role_tag: - get_input: port_pcm_port_network_role_tag + get_input: port_pcm_port_0_network_role_tag network_role: - get_input: port_pcm_port_network_role + get_input: port_pcm_port_0_network_role fixed_ips: get_input: - - port_pcm_port_fixed_ips + - port_pcm_port_0_fixed_ips - index_value subnetpoolid: - get_input: port_pcm_port_subnetpoolid + get_input: port_pcm_port_0_subnetpoolid network: get_input: - - port_pcm_port_network + - port_pcm_port_0_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: pcm_server relationship: tosca.relationships.network.BindsTo + pcm_server: + type: org.openecomp.resource.vfc.compute.nodes.heat.pcm_server + properties: + availability_zone: + get_input: + - compute_pcm_server_availability_zone + - index_value + flavor: + get_input: vm_flavor_name + config_drive: + get_input: + - compute_pcm_server_config_drive + - index_value + image: + get_input: vm_image_name + name: + get_input: + - compute_pcm_server_name + - index_value + user_data_format: + get_input: + - compute_pcm_server_user_data_format + - index_value substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pcm_server capabilities: @@ -164,12 +164,12 @@ topology_template: disk.device.write.requests.rate_pcm_server: - pcm_server - disk.device.write.requests.rate - network.outgoing.bytes.rate_pcm_server_pcm_port: - - pcm_server_pcm_port - - network.outgoing.bytes.rate - attachment_pcm_server_pcm_port: - - pcm_server_pcm_port - - attachment + forwarder_pcm_server_pcm_port_0: + - pcm_server_pcm_port_0 + - forwarder + binding_pcm_server_pcm_port_0: + - pcm_server_pcm_port_0 + - binding disk.root.size_pcm_server: - pcm_server - disk.root.size @@ -182,15 +182,21 @@ topology_template: memory.usage_pcm_server: - pcm_server - memory.usage - network.outgoing.packets.rate_pcm_server_pcm_port: - - pcm_server_pcm_port - - network.outgoing.packets.rate + network.incoming.bytes.rate_pcm_server_pcm_port_0: + - pcm_server_pcm_port_0 + - network.incoming.bytes.rate disk.device.read.requests.rate_pcm_server: - pcm_server - disk.device.read.requests.rate disk.device.latency_pcm_server: - pcm_server - disk.device.latency + network.incoming.packets.rate_pcm_server_pcm_port_0: + - pcm_server_pcm_port_0 + - network.incoming.packets.rate + network.outgoing.packets.rate_pcm_server_pcm_port_0: + - pcm_server_pcm_port_0 + - network.outgoing.packets.rate disk.device.write.requests_pcm_server: - pcm_server - disk.device.write.requests @@ -200,24 +206,12 @@ topology_template: memory.resident_pcm_server: - pcm_server - memory.resident - network.outgoing.bytes_pcm_server_pcm_port: - - pcm_server_pcm_port - - network.outgoing.bytes - network.outpoing.packets_pcm_server_pcm_port: - - pcm_server_pcm_port - - network.outpoing.packets - feature_pcm_server_pcm_port: - - pcm_server_pcm_port - - feature disk.iops_pcm_server: - pcm_server - disk.iops disk.capacity_pcm_server: - pcm_server - disk.capacity - network.incoming.bytes.rate_pcm_server_pcm_port: - - pcm_server_pcm_port - - network.incoming.bytes.rate disk.read.bytes.rate_pcm_server: - pcm_server - disk.read.bytes.rate @@ -233,18 +227,18 @@ topology_template: disk.device.iops_pcm_server: - pcm_server - disk.device.iops + feature_pcm_server_pcm_port_0: + - pcm_server_pcm_port_0 + - feature + network.incoming.bytes_pcm_server_pcm_port_0: + - pcm_server_pcm_port_0 + - network.incoming.bytes cpu_util_pcm_server: - pcm_server - cpu_util disk.allocation_pcm_server: - pcm_server - disk.allocation - network.incoming.packets_pcm_server_pcm_port: - - pcm_server_pcm_port - - network.incoming.packets - forwarder_pcm_server_pcm_port: - - pcm_server_pcm_port - - forwarder disk.device.usage_pcm_server: - pcm_server - disk.device.usage @@ -269,9 +263,12 @@ topology_template: disk.usage_pcm_server: - pcm_server - disk.usage - binding_pcm_server_pcm_port: - - pcm_server_pcm_port - - binding + attachment_pcm_server_pcm_port_0: + - pcm_server_pcm_port_0 + - attachment + network.outgoing.bytes_pcm_server_pcm_port_0: + - pcm_server_pcm_port_0 + - network.outgoing.bytes disk.device.read.bytes_pcm_server: - pcm_server - disk.device.read.bytes @@ -284,6 +281,9 @@ topology_template: disk.write.bytes.rate_pcm_server: - pcm_server - disk.write.bytes.rate + network.incoming.packets_pcm_server_pcm_port_0: + - pcm_server_pcm_port_0 + - network.incoming.packets os_pcm_server: - pcm_server - os @@ -293,40 +293,40 @@ topology_template: disk.read.bytes_pcm_server: - pcm_server - disk.read.bytes + network.outpoing.packets_pcm_server_pcm_port_0: + - pcm_server_pcm_port_0 + - network.outpoing.packets disk.write.bytes_pcm_server: - pcm_server - disk.write.bytes disk.ephemeral.size_pcm_server: - pcm_server - disk.ephemeral.size + network.outgoing.bytes.rate_pcm_server_pcm_port_0: + - pcm_server_pcm_port_0 + - network.outgoing.bytes.rate endpoint_pcm_server: - pcm_server - endpoint - network.incoming.bytes_pcm_server_pcm_port: - - pcm_server_pcm_port - - network.incoming.bytes scalable_pcm_server: - pcm_server - scalable disk.write.requests.rate_pcm_server: - pcm_server - disk.write.requests.rate - network.incoming.packets.rate_pcm_server_pcm_port: - - pcm_server_pcm_port - - network.incoming.packets.rate disk.device.read.bytes.rate_pcm_server: - pcm_server - disk.device.read.bytes.rate requirements: - link_pcm_server_pcm_port: - - pcm_server_pcm_port - - link - dependency_pcm_server_pcm_port: - - pcm_server_pcm_port + dependency_pcm_server_pcm_port_0: + - pcm_server_pcm_port_0 - dependency + link_pcm_server_pcm_port_0: + - pcm_server_pcm_port_0 + - link local_storage_pcm_server: - pcm_server - local_storage dependency_pcm_server: - pcm_server - - dependency \ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/Nested_pd_serverServiceTemplate.yaml index 33fc4138da..f808c5a23a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/Nested_pd_serverServiceTemplate.yaml @@ -11,11 +11,24 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_pcm_port_related_networks: + port_pcm_port_1_related_networks: type: list required: true entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pcm_port_1_network_role_tag: + type: string + required: true + port_pcm_port_1_network: + type: list + required: true + entry_schema: + type: string + port_pcm_port_1_security_groups: + type: list + required: true + entry_schema: + type: json index_value: type: integer description: Index value of this substitution service template runtime instance @@ -33,65 +46,52 @@ topology_template: required: true entry_schema: type: string - port_pcm_port_fixed_ips: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_pcm_port_network_role_tag: - type: string - required: true vm_flavor_name: type: string required: true - port_pcm_port_mac_requirements: + port_pcm_port_1_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true - port_pcm_port_order: - type: integer - required: true - port_pcm_port_network: - type: list - required: true - entry_schema: - type: string - port_pcm_port_vlan_requirements: + port_pcm_port_1_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_pcm_port_ip_requirements: + port_pcm_port_1_fixed_ips: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: org.openecomp.datatypes.heat.neutron.port.FixedIps vm_image_name: type: string required: true - port_pcm_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_pcm_port_network_role: + port_pcm_port_1_subnetpoolid: type: string required: true - port_pcm_port_subnetpoolid: - type: string + port_pcm_port_1_ip_requirements: + type: list required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements compute_pd_server_config_drive: type: list required: true entry_schema: type: boolean + port_pcm_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true compute_pd_server_user_data_format: type: list required: true entry_schema: type: string - port_pcm_port_security_groups: - type: list + port_pcm_port_1_order: + type: integer + required: true + port_pcm_port_1_network_role: + type: string required: true - entry_schema: - type: json node_templates: pd_server: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server @@ -116,39 +116,39 @@ topology_template: get_input: - compute_pd_server_user_data_format - index_value - pd_server_pcm_port: + pd_server_pcm_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_requirements: - get_input: port_pcm_port_mac_requirements + get_input: port_pcm_port_1_mac_requirements order: - get_input: port_pcm_port_order + get_input: port_pcm_port_1_order security_groups: get_input: - - port_pcm_port_security_groups + - port_pcm_port_1_security_groups - index_value exCP_naming: - get_input: port_pcm_port_exCP_naming + get_input: port_pcm_port_1_exCP_naming vlan_requirements: - get_input: port_pcm_port_vlan_requirements + get_input: port_pcm_port_1_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_pcm_port_ip_requirements + get_input: port_pcm_port_1_ip_requirements related_networks: - get_input: port_pcm_port_related_networks + get_input: port_pcm_port_1_related_networks network_role_tag: - get_input: port_pcm_port_network_role_tag + get_input: port_pcm_port_1_network_role_tag network_role: - get_input: port_pcm_port_network_role + get_input: port_pcm_port_1_network_role fixed_ips: get_input: - - port_pcm_port_fixed_ips + - port_pcm_port_1_fixed_ips - index_value subnetpoolid: - get_input: port_pcm_port_subnetpoolid + get_input: port_pcm_port_1_subnetpoolid network: get_input: - - port_pcm_port_network + - port_pcm_port_1_network - index_value requirements: - binding: @@ -158,18 +158,12 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server capabilities: - forwarder_pd_server_pcm_port: - - pd_server_pcm_port - - forwarder scalable_pd_server: - pd_server - scalable disk.read.bytes.rate_pd_server: - pd_server - disk.read.bytes.rate - network.incoming.bytes_pd_server_pcm_port: - - pd_server_pcm_port - - network.incoming.bytes memory.usage_pd_server: - pd_server - memory.usage @@ -179,18 +173,21 @@ topology_template: disk.device.usage_pd_server: - pd_server - disk.device.usage + forwarder_pd_server_pcm_port_1: + - pd_server_pcm_port_1 + - forwarder + network.incoming.packets_pd_server_pcm_port_1: + - pd_server_pcm_port_1 + - network.incoming.packets os_pd_server: - pd_server - os disk.write.bytes.rate_pd_server: - pd_server - disk.write.bytes.rate - feature_pd_server_pcm_port: - - pd_server_pcm_port - - feature - binding_pd_server_pcm_port: - - pd_server_pcm_port - - binding + network.outgoing.bytes.rate_pd_server_pcm_port_1: + - pd_server_pcm_port_1 + - network.outgoing.bytes.rate cpu_pd_server: - pd_server - cpu @@ -206,6 +203,15 @@ topology_template: disk.device.read.bytes.rate_pd_server: - pd_server - disk.device.read.bytes.rate + network.incoming.bytes.rate_pd_server_pcm_port_1: + - pd_server_pcm_port_1 + - network.incoming.bytes.rate + attachment_pd_server_pcm_port_1: + - pd_server_pcm_port_1 + - attachment + network.outgoing.bytes_pd_server_pcm_port_1: + - pd_server_pcm_port_1 + - network.outgoing.bytes disk.iops_pd_server: - pd_server - disk.iops @@ -215,24 +221,30 @@ topology_template: cpu.delta_pd_server: - pd_server - cpu.delta - network.outgoing.bytes_pd_server_pcm_port: - - pd_server_pcm_port - - network.outgoing.bytes vcpus_pd_server: - pd_server - vcpus disk.device.write.bytes.rate_pd_server: - pd_server - disk.device.write.bytes.rate + feature_pd_server_pcm_port_1: + - pd_server_pcm_port_1 + - feature disk.device.write.requests_pd_server: - pd_server - disk.device.write.requests + network.incoming.packets.rate_pd_server_pcm_port_1: + - pd_server_pcm_port_1 + - network.incoming.packets.rate endpoint_pd_server: - pd_server - endpoint disk.capacity_pd_server: - pd_server - disk.capacity + binding_pd_server_pcm_port_1: + - pd_server_pcm_port_1 + - binding disk.device.allocation_pd_server: - pd_server - disk.device.allocation @@ -245,9 +257,9 @@ topology_template: disk.read.requests_pd_server: - pd_server - disk.read.requests - network.outgoing.packets.rate_pd_server_pcm_port: - - pd_server_pcm_port - - network.outgoing.packets.rate + network.incoming.bytes_pd_server_pcm_port_1: + - pd_server_pcm_port_1 + - network.incoming.bytes feature_pd_server: - pd_server - feature @@ -257,9 +269,6 @@ topology_template: disk.write.bytes_pd_server: - pd_server - disk.write.bytes - network.incoming.bytes.rate_pd_server_pcm_port: - - pd_server_pcm_port - - network.incoming.bytes.rate disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -269,33 +278,21 @@ topology_template: disk.device.read.bytes_pd_server: - pd_server - disk.device.read.bytes - network.outpoing.packets_pd_server_pcm_port: - - pd_server_pcm_port - - network.outpoing.packets disk.device.write.bytes_pd_server: - pd_server - disk.device.write.bytes - network.outgoing.bytes.rate_pd_server_pcm_port: - - pd_server_pcm_port - - network.outgoing.bytes.rate disk.device.read.requests_pd_server: - pd_server - disk.device.read.requests - network.incoming.packets_pd_server_pcm_port: - - pd_server_pcm_port - - network.incoming.packets - attachment_pd_server_pcm_port: - - pd_server_pcm_port - - attachment instance_pd_server: - pd_server - instance host_pd_server: - pd_server - host - network.incoming.packets.rate_pd_server_pcm_port: - - pd_server_pcm_port - - network.incoming.packets.rate + network.outgoing.packets.rate_pd_server_pcm_port_1: + - pd_server_pcm_port_1 + - network.outgoing.packets.rate disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate @@ -317,16 +314,19 @@ topology_template: disk.device.iops_pd_server: - pd_server - disk.device.iops + network.outpoing.packets_pd_server_pcm_port_1: + - pd_server_pcm_port_1 + - network.outpoing.packets requirements: local_storage_pd_server: - pd_server - local_storage + link_pd_server_pcm_port_1: + - pd_server_pcm_port_1 + - link dependency_pd_server: - pd_server - dependency - link_pd_server_pcm_port: - - pd_server_pcm_port - - link - dependency_pd_server_pcm_port: - - pd_server_pcm_port - - dependency \ No newline at end of file + dependency_pd_server_pcm_port_1: + - pd_server_pcm_port_1 + - dependency 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 8e26dac997..fc52a3f51b 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 @@ -110,35 +110,35 @@ topology_template: directives: - substitutable properties: - compute_pcm_server_availability_zone: - - get_input: availabilityzone_name - port_pcm_port_fixed_ips: + port_pcm_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + port_pcm_port_0_fixed_ips: - ip_address: get_input: cps_net_ip - port_pcm_port_network_role_tag: cps + port_pcm_port_0_network: + - get_input: cps_net_name + compute_pcm_server_availability_zone: + - get_input: availabilityzone_name vm_flavor_name: get_input: pcm_flavor_name - port_pcm_port_mac_requirements: - mac_count_required: - is_required: false compute_pcm_server_name: - get_input: pcm_server_name - port_pcm_port_network: - - get_input: cps_net_name - port_pcm_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false + port_pcm_port_0_security_groups: + - - get_input: security_group_name compute_pcm_server_user_data_format: - RAW vm_image_name: get_input: pcm_image_name compute_pcm_server_config_drive: - true - port_pcm_port_security_groups: - - - get_input: security_group_name + port_pcm_port_0_mac_requirements: + mac_count_required: + is_required: false + port_pcm_port_0_network_role_tag: cps service_template_filter: substitute_service_template: Nested_pcm_serverServiceTemplate.yaml count: 1 @@ -152,35 +152,35 @@ topology_template: directives: - substitutable properties: + port_pcm_port_1_network_role_tag: oam + port_pcm_port_1_network: + - get_input: oam_net_name + port_pcm_port_1_security_groups: + - - get_input: security_group_name compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: - get_input: pd_server_name - port_pcm_port_fixed_ips: - - ip_address: - get_input: oam_net_ip - port_pcm_port_network_role_tag: oam vm_flavor_name: get_input: pd_flavor_name - port_pcm_port_mac_requirements: + port_pcm_port_1_mac_requirements: mac_count_required: is_required: false - port_pcm_port_network: - - get_input: oam_net_name - port_pcm_port_ip_requirements: + port_pcm_port_1_fixed_ips: + - ip_address: + get_input: oam_net_ip + vm_image_name: + get_input: pd_image_name + port_pcm_port_1_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false - vm_image_name: - get_input: pd_image_name compute_pd_server_config_drive: - true compute_pd_server_user_data_format: - RAW - port_pcm_port_security_groups: - - - get_input: security_group_name service_template_filter: substitute_service_template: Nested_pd_serverServiceTemplate.yaml count: 1 @@ -210,19 +210,19 @@ topology_template: capabilities: network.incoming.packets.rate_pcm_port_0: - abstract_pcm_server - - network.incoming.packets.rate_pcm_server_pcm_port + - network.incoming.packets.rate_pcm_server_pcm_port_0 disk.iops_server_pd_0: - abstract_pd_server - disk.iops_pd_server network.incoming.packets.rate_pcm_port_1: - abstract_pd_server - - network.incoming.packets.rate_pd_server_pcm_port + - network.incoming.packets.rate_pd_server_pcm_port_1 network.outpoing.packets_pcm_port_1: - abstract_pd_server - - network.outpoing.packets_pd_server_pcm_port + - network.outpoing.packets_pd_server_pcm_port_1 network.outpoing.packets_pcm_port_0: - abstract_pcm_server - - network.outpoing.packets_pcm_server_pcm_port + - network.outpoing.packets_pcm_server_pcm_port_0 disk.write.bytes.rate_server_pd_0: - abstract_pd_server - disk.write.bytes.rate_pd_server @@ -243,19 +243,19 @@ topology_template: - memory_pd_server network.incoming.bytes_pcm_port_0: - abstract_pcm_server - - network.incoming.bytes_pcm_server_pcm_port + - network.incoming.bytes_pcm_server_pcm_port_0 network.incoming.bytes_pcm_port_1: - abstract_pd_server - - network.incoming.bytes_pd_server_pcm_port + - network.incoming.bytes_pd_server_pcm_port_1 disk.usage_server_pcm_0: - abstract_pcm_server - disk.usage_pcm_server binding_pcm_port_0: - abstract_pcm_server - - binding_pcm_server_pcm_port + - binding_pcm_server_pcm_port_0 binding_pcm_port_1: - abstract_pd_server - - binding_pd_server_pcm_port + - binding_pd_server_pcm_port_1 vcpus_server_pcm_0: - abstract_pcm_server - vcpus_pcm_server @@ -270,34 +270,34 @@ topology_template: - feature_pcm_server network.outgoing.packets.rate_pcm_port_0: - abstract_pcm_server - - network.outgoing.packets.rate_pcm_server_pcm_port + - network.outgoing.packets.rate_pcm_server_pcm_port_0 network.outgoing.packets.rate_pcm_port_1: - abstract_pd_server - - network.outgoing.packets.rate_pd_server_pcm_port + - network.outgoing.packets.rate_pd_server_pcm_port_1 feature_pcm_port_1: - abstract_pd_server - - feature_pd_server_pcm_port + - feature_pd_server_pcm_port_1 disk.ephemeral.size_server_pd_0: - abstract_pd_server - disk.ephemeral.size_pd_server network.outgoing.bytes_pcm_port_0: - abstract_pcm_server - - network.outgoing.bytes_pcm_server_pcm_port + - network.outgoing.bytes_pcm_server_pcm_port_0 feature_pcm_port_0: - abstract_pcm_server - - feature_pcm_server_pcm_port + - feature_pcm_server_pcm_port_0 network.outgoing.bytes_pcm_port_1: - abstract_pd_server - - network.outgoing.bytes_pd_server_pcm_port + - network.outgoing.bytes_pd_server_pcm_port_1 cpu_server_pcm_0: - abstract_pcm_server - cpu_pcm_server attachment_pcm_port_0: - abstract_pcm_server - - attachment_pcm_server_pcm_port + - attachment_pcm_server_pcm_port_0 attachment_pcm_port_1: - abstract_pd_server - - attachment_pd_server_pcm_port + - attachment_pd_server_pcm_port_1 disk.write.bytes_server_pd_0: - abstract_pd_server - disk.write.bytes_pd_server @@ -444,10 +444,10 @@ topology_template: - cpu.delta_pcm_server forwarder_pcm_port_0: - abstract_pcm_server - - forwarder_pcm_server_pcm_port + - forwarder_pcm_server_pcm_port_0 forwarder_pcm_port_1: - abstract_pd_server - - forwarder_pd_server_pcm_port + - forwarder_pd_server_pcm_port_1 memory.resident_server_pd_0: - abstract_pd_server - memory.resident_pd_server @@ -480,10 +480,10 @@ topology_template: - disk.device.read.requests_pd_server network.outgoing.bytes.rate_pcm_port_1: - abstract_pd_server - - network.outgoing.bytes.rate_pd_server_pcm_port + - network.outgoing.bytes.rate_pd_server_pcm_port_1 network.incoming.packets_pcm_port_0: - abstract_pcm_server - - network.incoming.packets_pcm_server_pcm_port + - network.incoming.packets_pcm_server_pcm_port_0 disk.device.latency_server_pcm_0: - abstract_pcm_server - disk.device.latency_pcm_server @@ -495,13 +495,13 @@ topology_template: - disk.latency_pd_server network.outgoing.bytes.rate_pcm_port_0: - abstract_pcm_server - - network.outgoing.bytes.rate_pcm_server_pcm_port + - network.outgoing.bytes.rate_pcm_server_pcm_port_0 memory.usage_server_pd_0: - abstract_pd_server - memory.usage_pd_server network.incoming.packets_pcm_port_1: - abstract_pd_server - - network.incoming.packets_pd_server_pcm_port + - network.incoming.packets_pd_server_pcm_port_1 disk.device.write.requests_server_pcm_0: - abstract_pcm_server - disk.device.write.requests_pcm_server @@ -519,10 +519,10 @@ topology_template: - os_pcm_server network.incoming.bytes.rate_pcm_port_0: - abstract_pcm_server - - network.incoming.bytes.rate_pcm_server_pcm_port + - network.incoming.bytes.rate_pcm_server_pcm_port_0 network.incoming.bytes.rate_pcm_port_1: - abstract_pd_server - - network.incoming.bytes.rate_pd_server_pcm_port + - network.incoming.bytes.rate_pd_server_pcm_port_1 os_server_pd_0: - abstract_pd_server - os_pd_server @@ -535,13 +535,13 @@ topology_template: - local_storage_pcm_server link_pcm_port_0: - abstract_pcm_server - - link_pcm_server_pcm_port + - link_pcm_server_pcm_port_0 link_pcm_port_1: - abstract_pd_server - - link_pd_server_pcm_port + - link_pd_server_pcm_port_1 dependency_pcm_port_0: - abstract_pcm_server - - dependency_pcm_server_pcm_port + - dependency_pcm_server_pcm_port_0 local_storage_server_pd_0: - abstract_pd_server - local_storage_pd_server @@ -550,4 +550,4 @@ topology_template: - dependency_pd_server dependency_pcm_port_1: - abstract_pd_server - - dependency_pd_server_pcm_port + - dependency_pd_server_pcm_port_1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/in/hot-mog-0108-bs1271.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/in/hot-mog-0108-bs1271.yml index 5e25e96923..552febb573 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/in/hot-mog-0108-bs1271.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/in/hot-mog-0108-bs1271.yml @@ -30,7 +30,7 @@ resources: flavor: {get_param: pd_flavor_name} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: pd01_port_0} + - port: {get_resource: pd_server_0_mgmt_port_0} user_data_format: RAW_SERVER_PD_1 server_pd_02: type: OS::Nova::Server @@ -40,14 +40,14 @@ resources: flavor: {get_param: pd_flavor_name} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: pd01_port_1} + - port: {get_resource: pd_server_1_mgmt_port_0} user_data_format: RAW_SERVER_PD_2 - pd01_port_0: + pd_server_0_mgmt_port_0: type: OS::Neutron::Port properties: network: Network-0 replacement_policy: AUTO_PORT_0 - pd01_port_1: + pd_server_1_mgmt_port_0: type: OS::Neutron::Port properties: network: Network-1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/GlobalSubstitutionTypesServiceTemplate.yaml index 2f86795f4a..5005610295 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,6 +8,16 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_pd_server_mgmt_port_0_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd_server_mgmt_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED index_value: type: integer description: Index value of this substitution service template runtime instance @@ -28,68 +38,58 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_replacement_policy: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_mgmt_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_pd01_port_related_networks: - type: list + port_pd_server_mgmt_port_0_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true status: SUPPORTED - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - vm_image_name: - type: string + port_pd_server_mgmt_port_0_order: + type: integer required: true status: SUPPORTED - port_pd01_port_ip_requirements: + port_pd_server_mgmt_port_0_replacement_policy: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + type: string + port_pd_server_mgmt_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd01_port_order: - type: integer + type: org.openecomp.datatypes.network.VlanRequirements + vm_image_name: + type: string required: true status: SUPPORTED - port_pd01_port_subnetpoolid: - type: string + port_pd_server_mgmt_port_0_network: + type: list required: true status: SUPPORTED - port_pd01_port_network_role: + entry_schema: + type: string + port_pd_server_mgmt_port_0_network_role: type: string required: true status: SUPPORTED - port_pd01_port_network_role_tag: + port_pd_server_mgmt_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_pd01_port_vlan_requirements: + port_pd_server_mgmt_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.IpRequirements compute_pd_server_user_data_format: type: list required: true @@ -111,14 +111,14 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pd01_port: + - dependency_pd_server_pd_server_mgmt_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd01_port: + - link_pd_server_pd_server_mgmt_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -154,7 +154,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pd01_port: + network.incoming.bytes.rate_pd_server_pd_server_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -171,19 +171,24 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd01_port: + cpu_pd_server: 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_pd_server: + cpu_util_pd_server: 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_pd_server: + attachment_pd_server_pd_server_mgmt_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets_pd_server_pd_server_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -207,13 +212,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd01_port: + disk.iops_pd_server: 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.iops_pd_server: + network.outgoing.bytes.rate_pd_server_pd_server_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -231,7 +236,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pd01_port: + network.outpoing.packets_pd_server_pd_server_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -243,6 +248,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.packets.rate_pd_server_pd_server_mgmt_port_0: + 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_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -260,11 +271,6 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pd01_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED disk.capacity_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -283,6 +289,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pd_server_pd_server_mgmt_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED binding_pd_server: type: tosca.capabilities.network.Bindable occurrences: @@ -294,6 +305,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes_pd_server_pd_server_mgmt_port_0: + 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_pd_server: type: tosca.capabilities.Node occurrences: @@ -305,31 +322,25 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_pd01_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 - disk.write.bytes_pd_server: + network.incoming.packets.rate_pd_server_pd_server_mgmt_port_0: 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_pd_server_pd01_port: + disk.write.bytes_pd_server: 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_pd_server_pd01_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_pd_server_pd_server_mgmt_port_0: + 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: - - 1 + - 0 - UNBOUNDED disk.device.read.requests.rate_pd_server: type: org.openecomp.capabilities.metric.Ceilometer @@ -374,14 +385,14 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pd01_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_pd_server_pd_server_mgmt_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - forwarder_pd_server_pd01_port: - type: org.openecomp.capabilities.Forwarder + network.outgoing.bytes_pd_server_pd_server_mgmt_port_0: + 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 @@ -403,11 +414,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_pd01_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.device.latency_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -426,15 +432,9 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pd01_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.device.iops_pd_server: 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 + - UNBOUNDED 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 27902bc77b..d048466cf3 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 @@ -88,25 +88,25 @@ topology_template: - get_input: - pd_server_names - 0 - port_pd01_port_replacement_policy: - - AUTO_PORT_1 - - AUTO_PORT_0 - vm_flavor_name: - get_input: pd_flavor_name - port_pd01_port_mac_requirements: + port_pd_server_mgmt_port_0_mac_requirements: mac_count_required: is_required: false + vm_flavor_name: + get_input: pd_flavor_name + port_pd_server_mgmt_port_0_replacement_policy: + - AUTO_PORT_1 + - AUTO_PORT_0 vm_image_name: get_input: pd_image_name - port_pd01_port_ip_requirements: + port_pd_server_mgmt_port_0_network: + - Network-1 + - Network-0 + port_pd_server_mgmt_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_network: - - Network-1 - - Network-0 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/oneComputeTypeOnePort/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/Nested_pd_serverServiceTemplate.yaml index 7f4ab4aa0f..2812df418b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/Nested_pd_serverServiceTemplate.yaml @@ -11,6 +11,14 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pd_server_mgmt_port_0_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd_server_mgmt_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -28,55 +36,47 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_replacement_policy: - type: list - required: true - entry_schema: - type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_mgmt_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_pd01_port_related_networks: - type: list + port_pd_server_mgmt_port_0_subnetpoolid: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - vm_image_name: - type: string + port_pd_server_mgmt_port_0_order: + type: integer required: true - port_pd01_port_ip_requirements: + port_pd_server_mgmt_port_0_replacement_policy: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + type: string + port_pd_server_mgmt_port_0_vlan_requirements: type: list required: true entry_schema: - type: string - port_pd01_port_order: - type: integer - required: true - port_pd01_port_subnetpoolid: + type: org.openecomp.datatypes.network.VlanRequirements + vm_image_name: type: string required: true - port_pd01_port_network_role: + port_pd_server_mgmt_port_0_network: + type: list + required: true + entry_schema: + type: string + port_pd_server_mgmt_port_0_network_role: type: string required: true - port_pd01_port_network_role_tag: + port_pd_server_mgmt_port_0_network_role_tag: type: string required: true - port_pd01_port_vlan_requirements: + port_pd_server_mgmt_port_0_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.IpRequirements compute_pd_server_user_data_format: type: list required: true @@ -102,35 +102,35 @@ topology_template: get_input: - compute_pd_server_user_data_format - index_value - pd_server_pd01_port: + pd_server_pd_server_mgmt_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_pd01_port_replacement_policy + - port_pd_server_mgmt_port_0_replacement_policy - index_value mac_requirements: - get_input: port_pd01_port_mac_requirements + get_input: port_pd_server_mgmt_port_0_mac_requirements order: - get_input: port_pd01_port_order + get_input: port_pd_server_mgmt_port_0_order exCP_naming: - get_input: port_pd01_port_exCP_naming + get_input: port_pd_server_mgmt_port_0_exCP_naming vlan_requirements: - get_input: port_pd01_port_vlan_requirements + get_input: port_pd_server_mgmt_port_0_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_pd01_port_ip_requirements + get_input: port_pd_server_mgmt_port_0_ip_requirements related_networks: - get_input: port_pd01_port_related_networks + get_input: port_pd_server_mgmt_port_0_related_networks network_role_tag: - get_input: port_pd01_port_network_role_tag + get_input: port_pd_server_mgmt_port_0_network_role_tag network_role: - get_input: port_pd01_port_network_role + get_input: port_pd_server_mgmt_port_0_network_role subnetpoolid: - get_input: port_pd01_port_subnetpoolid + get_input: port_pd_server_mgmt_port_0_subnetpoolid network: get_input: - - port_pd01_port_network + - port_pd_server_mgmt_port_0_network - index_value requirements: - binding: @@ -155,24 +155,27 @@ topology_template: disk.device.usage_pd_server: - pd_server - disk.device.usage - network.outgoing.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.packets.rate + network.incoming.bytes.rate_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.incoming.bytes.rate os_pd_server: - pd_server - os disk.write.bytes.rate_pd_server: - pd_server - disk.write.bytes.rate - network.incoming.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes cpu_pd_server: - pd_server - cpu cpu_util_pd_server: - pd_server - cpu_util + attachment_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - attachment + network.incoming.packets_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.incoming.packets disk.device.write.requests.rate_pd_server: - pd_server - disk.device.write.requests.rate @@ -182,24 +185,27 @@ topology_template: disk.device.read.bytes.rate_pd_server: - pd_server - disk.device.read.bytes.rate - network.outgoing.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes disk.iops_pd_server: - pd_server - disk.iops + network.outgoing.bytes.rate_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.outgoing.bytes.rate memory.resident_pd_server: - pd_server - memory.resident cpu.delta_pd_server: - pd_server - cpu.delta - network.incoming.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets.rate + network.outpoing.packets_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.outpoing.packets vcpus_pd_server: - pd_server - vcpus + network.outgoing.packets.rate_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.outgoing.packets.rate disk.device.write.bytes.rate_pd_server: - pd_server - disk.device.write.bytes.rate @@ -209,9 +215,6 @@ topology_template: endpoint_pd_server: - pd_server - endpoint - attachment_pd_server_pd01_port: - - pd_server_pd01_port - - attachment disk.capacity_pd_server: - pd_server - disk.capacity @@ -221,30 +224,33 @@ topology_template: disk.allocation_pd_server: - pd_server - disk.allocation + forwarder_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - forwarder binding_pd_server: - pd_server - binding disk.read.requests_pd_server: - pd_server - disk.read.requests + network.incoming.bytes_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.incoming.bytes feature_pd_server: - pd_server - feature disk.usage_pd_server: - pd_server - disk.usage - binding_pd_server_pd01_port: - - pd_server_pd01_port - - binding + network.incoming.packets.rate_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.incoming.packets.rate disk.write.bytes_pd_server: - pd_server - disk.write.bytes - network.incoming.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes.rate - network.incoming.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets + binding_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - binding disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -266,12 +272,12 @@ topology_template: host_pd_server: - pd_server - host - network.outpoing.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.outpoing.packets - forwarder_pd_server_pd01_port: - - pd_server_pd01_port - - forwarder + feature_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - feature + network.outgoing.bytes_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.outgoing.bytes disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate @@ -281,9 +287,6 @@ topology_template: disk.write.requests_pd_server: - pd_server - disk.write.requests - feature_pd_server_pd01_port: - - pd_server_pd01_port - - feature disk.device.latency_pd_server: - pd_server - disk.device.latency @@ -293,9 +296,6 @@ topology_template: disk.device.capacity_pd_server: - pd_server - disk.device.capacity - network.outgoing.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes.rate disk.device.iops_pd_server: - pd_server - disk.device.iops @@ -303,12 +303,12 @@ topology_template: local_storage_pd_server: - pd_server - local_storage - link_pd_server_pd01_port: - - pd_server_pd01_port + link_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 - link - dependency_pd_server_pd01_port: - - pd_server_pd01_port - - dependency dependency_pd_server: - pd_server - - dependency \ No newline at end of file + - dependency + dependency_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/in/hot-mog-0108-bs1271.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/in/hot-mog-0108-bs1271.yml index 1a753deeb2..364be4c182 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/in/hot-mog-0108-bs1271.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/in/hot-mog-0108-bs1271.yml @@ -30,7 +30,7 @@ resources: flavor: {get_param: pd_flavor_name} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: pd01_port_0} + - port: {get_resource: pd_server_0_mgmt_port_0} user_data_format: RAW_SERVER_PD_1 server_pd_02: type: OS::Nova::Server @@ -40,14 +40,14 @@ resources: flavor: {get_param: pd_flavor_name} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: pd01_port_1} + - port: {get_resource: pd_server_1_mgmt_port_0} user_data_format: RAW_SERVER_PD_2 - pd01_port_0: + pd_server_0_mgmt_port_0: type: OS::Neutron::Port properties: network: Network-0 replacement_policy: AUTO_PORT_0 - pd01_port_1: + pd_server_1_mgmt_port_0: type: OS::Neutron::Port properties: network: Network-1 @@ -63,4 +63,4 @@ resources: network_policy_port0: type: OS::Contrail::NetworkPolicy properties: - entries: {get_attr: [pd01_port_0, device_owner]} \ No newline at end of file + entries: {get_attr: [pd_server_0_mgmt_port_0, device_owner]} \ 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/oneComputeTypeOnePortGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml index 524008669b..efd25af52b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,6 +8,16 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_pd_server_mgmt_port_0_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd_server_mgmt_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED index_value: type: integer description: Index value of this substitution service template runtime instance @@ -28,68 +38,58 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_replacement_policy: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_mgmt_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_pd01_port_related_networks: - type: list + port_pd_server_mgmt_port_0_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true status: SUPPORTED - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - vm_image_name: - type: string + port_pd_server_mgmt_port_0_order: + type: integer required: true status: SUPPORTED - port_pd01_port_ip_requirements: + port_pd_server_mgmt_port_0_replacement_policy: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + type: string + port_pd_server_mgmt_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd01_port_order: - type: integer + type: org.openecomp.datatypes.network.VlanRequirements + vm_image_name: + type: string required: true status: SUPPORTED - port_pd01_port_subnetpoolid: - type: string + port_pd_server_mgmt_port_0_network: + type: list required: true status: SUPPORTED - port_pd01_port_network_role: + entry_schema: + type: string + port_pd_server_mgmt_port_0_network_role: type: string required: true status: SUPPORTED - port_pd01_port_network_role_tag: + port_pd_server_mgmt_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_pd01_port_vlan_requirements: + port_pd_server_mgmt_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.IpRequirements compute_pd_server_user_data_format: type: list required: true @@ -97,13 +97,13 @@ node_types: entry_schema: type: string attributes: - pd_server_accessIPv6: + pd_server_pd_server_mgmt_port_0_device_owner: type: string status: SUPPORTED - pd_server_accessIPv4: + pd_server_accessIPv6: type: string status: SUPPORTED - pd_server_pd01_port_device_owner: + pd_server_accessIPv4: type: string status: SUPPORTED requirements: @@ -121,14 +121,14 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pd01_port: + - dependency_pd_server_pd_server_mgmt_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd01_port: + - link_pd_server_pd_server_mgmt_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -164,7 +164,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pd01_port: + network.incoming.bytes.rate_pd_server_pd_server_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -181,19 +181,24 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd01_port: + cpu_pd_server: 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_pd_server: + cpu_util_pd_server: 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_pd_server: + attachment_pd_server_pd_server_mgmt_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets_pd_server_pd_server_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -217,13 +222,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd01_port: + disk.iops_pd_server: 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.iops_pd_server: + network.outgoing.bytes.rate_pd_server_pd_server_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -241,7 +246,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pd01_port: + network.outpoing.packets_pd_server_pd_server_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -253,6 +258,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.packets.rate_pd_server_pd_server_mgmt_port_0: + 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_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -270,11 +281,6 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pd01_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED disk.capacity_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -293,6 +299,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pd_server_pd_server_mgmt_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED binding_pd_server: type: tosca.capabilities.network.Bindable occurrences: @@ -304,6 +315,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes_pd_server_pd_server_mgmt_port_0: + 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_pd_server: type: tosca.capabilities.Node occurrences: @@ -315,31 +332,25 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_pd01_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 - disk.write.bytes_pd_server: + network.incoming.packets.rate_pd_server_pd_server_mgmt_port_0: 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_pd_server_pd01_port: + disk.write.bytes_pd_server: 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_pd_server_pd01_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_pd_server_pd_server_mgmt_port_0: + 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: - - 1 + - 0 - UNBOUNDED disk.device.read.requests.rate_pd_server: type: org.openecomp.capabilities.metric.Ceilometer @@ -384,14 +395,14 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pd01_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_pd_server_pd_server_mgmt_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - forwarder_pd_server_pd01_port: - type: org.openecomp.capabilities.Forwarder + network.outgoing.bytes_pd_server_pd_server_mgmt_port_0: + 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 @@ -413,11 +424,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_pd01_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.device.latency_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -436,15 +442,9 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pd01_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.device.iops_pd_server: 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 + - UNBOUNDED 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 dd4e11a31a..b194d421c5 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 @@ -102,25 +102,25 @@ topology_template: - get_input: - pd_server_names - 0 - port_pd01_port_replacement_policy: - - AUTO_PORT_1 - - AUTO_PORT_0 - vm_flavor_name: - get_input: pd_flavor_name - port_pd01_port_mac_requirements: + port_pd_server_mgmt_port_0_mac_requirements: mac_count_required: is_required: false + vm_flavor_name: + get_input: pd_flavor_name + port_pd_server_mgmt_port_0_replacement_policy: + - AUTO_PORT_1 + - AUTO_PORT_0 vm_image_name: get_input: pd_image_name - port_pd01_port_ip_requirements: + port_pd_server_mgmt_port_0_network: + - Network-1 + - Network-0 + port_pd_server_mgmt_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_network: - - Network-1 - - Network-0 compute_pd_server_user_data_format: - RAW_SERVER_PD_2 - RAW_SERVER_PD_1 @@ -138,7 +138,7 @@ topology_template: entries: get_attribute: - abstract_pd_server - - pd_server_pd01_port_device_owner + - pd_server_pd_server_mgmt_port_0_device_owner groups: hot-mog-0108-bs1271_group: type: org.openecomp.groups.heat.HeatStack diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml index 28b65b6e47..2f499b7e98 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml @@ -11,6 +11,14 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pd_server_mgmt_port_0_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd_server_mgmt_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -28,55 +36,47 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_replacement_policy: - type: list - required: true - entry_schema: - type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_mgmt_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_pd01_port_related_networks: - type: list + port_pd_server_mgmt_port_0_subnetpoolid: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - vm_image_name: - type: string + port_pd_server_mgmt_port_0_order: + type: integer required: true - port_pd01_port_ip_requirements: + port_pd_server_mgmt_port_0_replacement_policy: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + type: string + port_pd_server_mgmt_port_0_vlan_requirements: type: list required: true entry_schema: - type: string - port_pd01_port_order: - type: integer - required: true - port_pd01_port_subnetpoolid: + type: org.openecomp.datatypes.network.VlanRequirements + vm_image_name: type: string required: true - port_pd01_port_network_role: + port_pd_server_mgmt_port_0_network: + type: list + required: true + entry_schema: + type: string + port_pd_server_mgmt_port_0_network_role: type: string required: true - port_pd01_port_network_role_tag: + port_pd_server_mgmt_port_0_network_role_tag: type: string required: true - port_pd01_port_vlan_requirements: + port_pd_server_mgmt_port_0_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.IpRequirements compute_pd_server_user_data_format: type: list required: true @@ -102,35 +102,35 @@ topology_template: get_input: - compute_pd_server_user_data_format - index_value - pd_server_pd01_port: + pd_server_pd_server_mgmt_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_pd01_port_replacement_policy + - port_pd_server_mgmt_port_0_replacement_policy - index_value mac_requirements: - get_input: port_pd01_port_mac_requirements + get_input: port_pd_server_mgmt_port_0_mac_requirements order: - get_input: port_pd01_port_order + get_input: port_pd_server_mgmt_port_0_order exCP_naming: - get_input: port_pd01_port_exCP_naming + get_input: port_pd_server_mgmt_port_0_exCP_naming vlan_requirements: - get_input: port_pd01_port_vlan_requirements + get_input: port_pd_server_mgmt_port_0_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_pd01_port_ip_requirements + get_input: port_pd_server_mgmt_port_0_ip_requirements related_networks: - get_input: port_pd01_port_related_networks + get_input: port_pd_server_mgmt_port_0_related_networks network_role_tag: - get_input: port_pd01_port_network_role_tag + get_input: port_pd_server_mgmt_port_0_network_role_tag network_role: - get_input: port_pd01_port_network_role + get_input: port_pd_server_mgmt_port_0_network_role subnetpoolid: - get_input: port_pd01_port_subnetpoolid + get_input: port_pd_server_mgmt_port_0_subnetpoolid network: get_input: - - port_pd01_port_network + - port_pd_server_mgmt_port_0_network - index_value requirements: - binding: @@ -138,6 +138,12 @@ topology_template: node: pd_server relationship: tosca.relationships.network.BindsTo outputs: + pd_server_pd_server_mgmt_port_0_device_owner: + type: string + value: + get_attribute: + - pd_server_pd_server_mgmt_port_0 + - device_owner pd_server_accessIPv6: type: string value: @@ -150,12 +156,6 @@ topology_template: get_attribute: - pd_server - accessIPv4 - pd_server_pd01_port_device_owner: - type: string - value: - get_attribute: - - pd_server_pd01_port - - device_owner substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server capabilities: @@ -174,24 +174,27 @@ topology_template: disk.device.usage_pd_server: - pd_server - disk.device.usage - network.outgoing.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.packets.rate + network.incoming.bytes.rate_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.incoming.bytes.rate os_pd_server: - pd_server - os disk.write.bytes.rate_pd_server: - pd_server - disk.write.bytes.rate - network.incoming.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes cpu_pd_server: - pd_server - cpu cpu_util_pd_server: - pd_server - cpu_util + attachment_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - attachment + network.incoming.packets_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.incoming.packets disk.device.write.requests.rate_pd_server: - pd_server - disk.device.write.requests.rate @@ -201,24 +204,27 @@ topology_template: disk.device.read.bytes.rate_pd_server: - pd_server - disk.device.read.bytes.rate - network.outgoing.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes disk.iops_pd_server: - pd_server - disk.iops + network.outgoing.bytes.rate_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.outgoing.bytes.rate memory.resident_pd_server: - pd_server - memory.resident cpu.delta_pd_server: - pd_server - cpu.delta - network.incoming.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets.rate + network.outpoing.packets_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.outpoing.packets vcpus_pd_server: - pd_server - vcpus + network.outgoing.packets.rate_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.outgoing.packets.rate disk.device.write.bytes.rate_pd_server: - pd_server - disk.device.write.bytes.rate @@ -228,9 +234,6 @@ topology_template: endpoint_pd_server: - pd_server - endpoint - attachment_pd_server_pd01_port: - - pd_server_pd01_port - - attachment disk.capacity_pd_server: - pd_server - disk.capacity @@ -240,30 +243,33 @@ topology_template: disk.allocation_pd_server: - pd_server - disk.allocation + forwarder_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - forwarder binding_pd_server: - pd_server - binding disk.read.requests_pd_server: - pd_server - disk.read.requests + network.incoming.bytes_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.incoming.bytes feature_pd_server: - pd_server - feature disk.usage_pd_server: - pd_server - disk.usage - binding_pd_server_pd01_port: - - pd_server_pd01_port - - binding + network.incoming.packets.rate_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.incoming.packets.rate disk.write.bytes_pd_server: - pd_server - disk.write.bytes - network.incoming.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes.rate - network.incoming.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets + binding_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - binding disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -285,12 +291,12 @@ topology_template: host_pd_server: - pd_server - host - network.outpoing.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.outpoing.packets - forwarder_pd_server_pd01_port: - - pd_server_pd01_port - - forwarder + feature_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - feature + network.outgoing.bytes_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.outgoing.bytes disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate @@ -300,9 +306,6 @@ topology_template: disk.write.requests_pd_server: - pd_server - disk.write.requests - feature_pd_server_pd01_port: - - pd_server_pd01_port - - feature disk.device.latency_pd_server: - pd_server - disk.device.latency @@ -312,9 +315,6 @@ topology_template: disk.device.capacity_pd_server: - pd_server - disk.device.capacity - network.outgoing.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes.rate disk.device.iops_pd_server: - pd_server - disk.device.iops @@ -322,12 +322,12 @@ topology_template: local_storage_pd_server: - pd_server - local_storage - link_pd_server_pd01_port: - - pd_server_pd01_port + link_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 - link - dependency_pd_server_pd01_port: - - pd_server_pd01_port - - dependency dependency_pd_server: - pd_server - - dependency \ No newline at end of file + - dependency + dependency_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/in/hot-mog-0108-bs1271.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/in/hot-mog-0108-bs1271.yml index 09cabbf097..1df88783bb 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/in/hot-mog-0108-bs1271.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/in/hot-mog-0108-bs1271.yml @@ -33,7 +33,7 @@ resources: flavor: {get_param: pd_flavor_name} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: pd01_port_0} + - port: {get_resource: pd_server_0_mgmt_port_0} user_data_format: {get_attr: [network_policy_server, name]} server_pd_02: type: OS::Nova::Server @@ -43,15 +43,15 @@ resources: flavor: {get_param: pd_flavor_name} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: pd01_port_1} + - port: {get_resource: pd_server_1_mgmt_port_0} metadata: {get_attr: [network_policy_server, name]} user_data_format: RAW_SERVER_PD_2 - pd01_port_0: + pd_server_0_mgmt_port_0: type: OS::Neutron::Port properties: network: Network-0 replacement_policy: AUTO_PORT_0 - pd01_port_1: + pd_server_1_mgmt_port_0: type: OS::Neutron::Port properties: network: Network-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/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/GlobalSubstitutionTypesServiceTemplate.yaml index 389ae7404a..2e65005e29 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,6 +8,16 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_pd_server_mgmt_port_0_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd_server_mgmt_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED index_value: type: integer description: Index value of this substitution service template runtime instance @@ -28,68 +38,58 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_replacement_policy: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_mgmt_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_pd01_port_related_networks: - type: list + port_pd_server_mgmt_port_0_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true status: SUPPORTED - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - vm_image_name: - type: string + port_pd_server_mgmt_port_0_order: + type: integer required: true status: SUPPORTED - port_pd01_port_ip_requirements: + port_pd_server_mgmt_port_0_replacement_policy: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + type: string + port_pd_server_mgmt_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd01_port_order: - type: integer + type: org.openecomp.datatypes.network.VlanRequirements + vm_image_name: + type: string required: true status: SUPPORTED - port_pd01_port_subnetpoolid: - type: string + port_pd_server_mgmt_port_0_network: + type: list required: true status: SUPPORTED - port_pd01_port_network_role: + entry_schema: + type: string + port_pd_server_mgmt_port_0_network_role: type: string required: true status: SUPPORTED - port_pd01_port_network_role_tag: + port_pd_server_mgmt_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_pd01_port_vlan_requirements: + port_pd_server_mgmt_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.IpRequirements compute_pd_server_user_data_format: type: list required: true @@ -117,14 +117,14 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pd01_port: + - dependency_pd_server_pd_server_mgmt_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd01_port: + - link_pd_server_pd_server_mgmt_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -160,7 +160,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pd01_port: + network.incoming.bytes.rate_pd_server_pd_server_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -177,19 +177,24 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd01_port: + cpu_pd_server: 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_pd_server: + cpu_util_pd_server: 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_pd_server: + attachment_pd_server_pd_server_mgmt_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets_pd_server_pd_server_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -213,13 +218,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd01_port: + disk.iops_pd_server: 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.iops_pd_server: + network.outgoing.bytes.rate_pd_server_pd_server_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -237,7 +242,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pd01_port: + network.outpoing.packets_pd_server_pd_server_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -249,6 +254,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.packets.rate_pd_server_pd_server_mgmt_port_0: + 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_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -266,11 +277,6 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pd01_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED disk.capacity_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -289,6 +295,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pd_server_pd_server_mgmt_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED binding_pd_server: type: tosca.capabilities.network.Bindable occurrences: @@ -300,6 +311,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes_pd_server_pd_server_mgmt_port_0: + 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_pd_server: type: tosca.capabilities.Node occurrences: @@ -311,31 +328,25 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_pd01_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 - disk.write.bytes_pd_server: + network.incoming.packets.rate_pd_server_pd_server_mgmt_port_0: 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_pd_server_pd01_port: + disk.write.bytes_pd_server: 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_pd_server_pd01_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_pd_server_pd_server_mgmt_port_0: + 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: - - 1 + - 0 - UNBOUNDED disk.device.read.requests.rate_pd_server: type: org.openecomp.capabilities.metric.Ceilometer @@ -380,14 +391,14 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pd01_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_pd_server_pd_server_mgmt_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - forwarder_pd_server_pd01_port: - type: org.openecomp.capabilities.Forwarder + network.outgoing.bytes_pd_server_pd_server_mgmt_port_0: + 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 @@ -409,11 +420,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_pd01_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.device.latency_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -432,15 +438,9 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pd01_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.device.iops_pd_server: 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 + - UNBOUNDED 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 aa9558e0f4..534b0c9f32 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 @@ -103,27 +103,27 @@ topology_template: - get_input: - pd_server_names - 0 - port_pd01_port_replacement_policy: + port_pd_server_mgmt_port_0_mac_requirements: + mac_count_required: + is_required: false + vm_flavor_name: + get_input: pd_flavor_name + port_pd_server_mgmt_port_0_replacement_policy: - get_attribute: - network_policy_server - name - AUTO_PORT_0 - vm_flavor_name: - get_input: pd_flavor_name - port_pd01_port_mac_requirements: - mac_count_required: - is_required: false vm_image_name: get_input: pd_image_name - port_pd01_port_ip_requirements: + port_pd_server_mgmt_port_0_network: + - Network-1 + - Network-0 + port_pd_server_mgmt_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_network: - - Network-1 - - Network-0 compute_pd_server_user_data_format: - RAW_SERVER_PD_2 - get_attribute: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/Nested_pd_serverServiceTemplate.yaml index 3b9665a316..a9a05cb5d4 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/Nested_pd_serverServiceTemplate.yaml @@ -11,6 +11,14 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pd_server_mgmt_port_0_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd_server_mgmt_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -28,55 +36,47 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_replacement_policy: - type: list - required: true - entry_schema: - type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_mgmt_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_pd01_port_related_networks: - type: list + port_pd_server_mgmt_port_0_subnetpoolid: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - vm_image_name: - type: string + port_pd_server_mgmt_port_0_order: + type: integer required: true - port_pd01_port_ip_requirements: + port_pd_server_mgmt_port_0_replacement_policy: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + type: string + port_pd_server_mgmt_port_0_vlan_requirements: type: list required: true entry_schema: - type: string - port_pd01_port_order: - type: integer - required: true - port_pd01_port_subnetpoolid: + type: org.openecomp.datatypes.network.VlanRequirements + vm_image_name: type: string required: true - port_pd01_port_network_role: + port_pd_server_mgmt_port_0_network: + type: list + required: true + entry_schema: + type: string + port_pd_server_mgmt_port_0_network_role: type: string required: true - port_pd01_port_network_role_tag: + port_pd_server_mgmt_port_0_network_role_tag: type: string required: true - port_pd01_port_vlan_requirements: + port_pd_server_mgmt_port_0_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.IpRequirements compute_pd_server_user_data_format: type: list required: true @@ -111,35 +111,35 @@ topology_template: get_input: - compute_pd_server_user_data_format - index_value - pd_server_pd01_port: + pd_server_pd_server_mgmt_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_pd01_port_replacement_policy + - port_pd_server_mgmt_port_0_replacement_policy - index_value mac_requirements: - get_input: port_pd01_port_mac_requirements + get_input: port_pd_server_mgmt_port_0_mac_requirements order: - get_input: port_pd01_port_order + get_input: port_pd_server_mgmt_port_0_order exCP_naming: - get_input: port_pd01_port_exCP_naming + get_input: port_pd_server_mgmt_port_0_exCP_naming vlan_requirements: - get_input: port_pd01_port_vlan_requirements + get_input: port_pd_server_mgmt_port_0_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_pd01_port_ip_requirements + get_input: port_pd_server_mgmt_port_0_ip_requirements related_networks: - get_input: port_pd01_port_related_networks + get_input: port_pd_server_mgmt_port_0_related_networks network_role_tag: - get_input: port_pd01_port_network_role_tag + get_input: port_pd_server_mgmt_port_0_network_role_tag network_role: - get_input: port_pd01_port_network_role + get_input: port_pd_server_mgmt_port_0_network_role subnetpoolid: - get_input: port_pd01_port_subnetpoolid + get_input: port_pd_server_mgmt_port_0_subnetpoolid network: get_input: - - port_pd01_port_network + - port_pd_server_mgmt_port_0_network - index_value requirements: - binding: @@ -164,24 +164,27 @@ topology_template: disk.device.usage_pd_server: - pd_server - disk.device.usage - network.outgoing.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.packets.rate + network.incoming.bytes.rate_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.incoming.bytes.rate os_pd_server: - pd_server - os disk.write.bytes.rate_pd_server: - pd_server - disk.write.bytes.rate - network.incoming.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes cpu_pd_server: - pd_server - cpu cpu_util_pd_server: - pd_server - cpu_util + attachment_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - attachment + network.incoming.packets_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.incoming.packets disk.device.write.requests.rate_pd_server: - pd_server - disk.device.write.requests.rate @@ -191,24 +194,27 @@ topology_template: disk.device.read.bytes.rate_pd_server: - pd_server - disk.device.read.bytes.rate - network.outgoing.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes disk.iops_pd_server: - pd_server - disk.iops + network.outgoing.bytes.rate_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.outgoing.bytes.rate memory.resident_pd_server: - pd_server - memory.resident cpu.delta_pd_server: - pd_server - cpu.delta - network.incoming.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets.rate + network.outpoing.packets_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.outpoing.packets vcpus_pd_server: - pd_server - vcpus + network.outgoing.packets.rate_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.outgoing.packets.rate disk.device.write.bytes.rate_pd_server: - pd_server - disk.device.write.bytes.rate @@ -218,9 +224,6 @@ topology_template: endpoint_pd_server: - pd_server - endpoint - attachment_pd_server_pd01_port: - - pd_server_pd01_port - - attachment disk.capacity_pd_server: - pd_server - disk.capacity @@ -230,30 +233,33 @@ topology_template: disk.allocation_pd_server: - pd_server - disk.allocation + forwarder_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - forwarder binding_pd_server: - pd_server - binding disk.read.requests_pd_server: - pd_server - disk.read.requests + network.incoming.bytes_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.incoming.bytes feature_pd_server: - pd_server - feature disk.usage_pd_server: - pd_server - disk.usage - binding_pd_server_pd01_port: - - pd_server_pd01_port - - binding + network.incoming.packets.rate_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.incoming.packets.rate disk.write.bytes_pd_server: - pd_server - disk.write.bytes - network.incoming.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes.rate - network.incoming.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets + binding_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - binding disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -275,12 +281,12 @@ topology_template: host_pd_server: - pd_server - host - network.outpoing.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.outpoing.packets - forwarder_pd_server_pd01_port: - - pd_server_pd01_port - - forwarder + feature_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - feature + network.outgoing.bytes_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.outgoing.bytes disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate @@ -290,9 +296,6 @@ topology_template: disk.write.requests_pd_server: - pd_server - disk.write.requests - feature_pd_server_pd01_port: - - pd_server_pd01_port - - feature disk.device.latency_pd_server: - pd_server - disk.device.latency @@ -302,9 +305,6 @@ topology_template: disk.device.capacity_pd_server: - pd_server - disk.device.capacity - network.outgoing.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes.rate disk.device.iops_pd_server: - pd_server - disk.device.iops @@ -312,12 +312,12 @@ topology_template: local_storage_pd_server: - pd_server - local_storage - link_pd_server_pd01_port: - - pd_server_pd01_port + link_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 - link - dependency_pd_server_pd01_port: - - pd_server_pd01_port - - dependency dependency_pd_server: - pd_server - - dependency \ No newline at end of file + - dependency + dependency_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/in/hot-mog-0108-bs1271.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/in/hot-mog-0108-bs1271.yml index fe0b9b1c39..7a0ce5d2cd 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/in/hot-mog-0108-bs1271.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/in/hot-mog-0108-bs1271.yml @@ -30,8 +30,8 @@ resources: flavor: {get_param: pd_flavor_name} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: pd01_port_0} - user_data_format: {get_attr: [pd01_port_0, device_id]} + - port: {get_resource: pd_server_0_mgmt_port_0} + user_data_format: {get_attr: [pd_server_0_mgmt_port_0, device_id]} server_pd_02: type: OS::Nova::Server properties: @@ -40,14 +40,14 @@ resources: flavor: {get_param: pd_flavor_name} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: pd01_port_1} - user_data_format: {get_attr: [pd01_port_1, device_id]} - pd01_port_0: + - port: {get_resource: pd_server_1_mgmt_port_0} + user_data_format: {get_attr: [pd_server_1_mgmt_port_0, device_id]} + pd_server_0_mgmt_port_0: type: OS::Neutron::Port properties: network: Network-0 replacement_policy: {get_attr: [server_pd_01, accessIPv4]} - pd01_port_1: + pd_server_1_mgmt_port_0: type: OS::Neutron::Port properties: network: Network-1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/GlobalSubstitutionTypesServiceTemplate.yaml index 0869edfb2a..e9fdc8d8ec 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,6 +8,16 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_pd_server_mgmt_port_0_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd_server_mgmt_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED index_value: type: integer description: Index value of this substitution service template runtime instance @@ -28,62 +38,52 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_mgmt_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_pd01_port_related_networks: - type: list + port_pd_server_mgmt_port_0_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true status: SUPPORTED - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - vm_image_name: - type: string + port_pd_server_mgmt_port_0_order: + type: integer required: true status: SUPPORTED - port_pd01_port_ip_requirements: + port_pd_server_mgmt_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + type: org.openecomp.datatypes.network.VlanRequirements + vm_image_name: + type: string + required: true + status: SUPPORTED + port_pd_server_mgmt_port_0_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd01_port_order: - type: integer - required: true - status: SUPPORTED - port_pd01_port_subnetpoolid: - type: string - required: true - status: SUPPORTED - port_pd01_port_network_role: + port_pd_server_mgmt_port_0_network_role: type: string required: true status: SUPPORTED - port_pd01_port_network_role_tag: + port_pd_server_mgmt_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_pd01_port_vlan_requirements: + port_pd_server_mgmt_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.IpRequirements requirements: - dependency_pd_server: capability: tosca.capabilities.Node @@ -99,14 +99,14 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pd01_port: + - dependency_pd_server_pd_server_mgmt_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd01_port: + - link_pd_server_pd_server_mgmt_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -142,7 +142,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pd01_port: + network.incoming.bytes.rate_pd_server_pd_server_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -159,19 +159,24 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd01_port: + cpu_pd_server: 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_pd_server: + cpu_util_pd_server: 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_pd_server: + attachment_pd_server_pd_server_mgmt_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets_pd_server_pd_server_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -195,13 +200,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd01_port: + disk.iops_pd_server: 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.iops_pd_server: + network.outgoing.bytes.rate_pd_server_pd_server_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -219,7 +224,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pd01_port: + network.outpoing.packets_pd_server_pd_server_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -231,6 +236,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.packets.rate_pd_server_pd_server_mgmt_port_0: + 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_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -248,11 +259,6 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pd01_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED disk.capacity_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -271,6 +277,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pd_server_pd_server_mgmt_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED binding_pd_server: type: tosca.capabilities.network.Bindable occurrences: @@ -282,6 +293,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes_pd_server_pd_server_mgmt_port_0: + 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_pd_server: type: tosca.capabilities.Node occurrences: @@ -293,31 +310,25 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_pd01_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 - disk.write.bytes_pd_server: + network.incoming.packets.rate_pd_server_pd_server_mgmt_port_0: 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_pd_server_pd01_port: + disk.write.bytes_pd_server: 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_pd_server_pd01_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_pd_server_pd_server_mgmt_port_0: + 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: - - 1 + - 0 - UNBOUNDED disk.device.read.requests.rate_pd_server: type: org.openecomp.capabilities.metric.Ceilometer @@ -362,14 +373,14 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pd01_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_pd_server_pd_server_mgmt_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - forwarder_pd_server_pd01_port: - type: org.openecomp.capabilities.Forwarder + network.outgoing.bytes_pd_server_pd_server_mgmt_port_0: + 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 @@ -391,11 +402,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_pd01_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.device.latency_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -414,15 +420,9 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pd01_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.device.iops_pd_server: 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 + - UNBOUNDED 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 091e767de5..7d98912a3d 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 @@ -88,22 +88,22 @@ topology_template: - get_input: - pd_server_names - 0 - vm_flavor_name: - get_input: pd_flavor_name - port_pd01_port_mac_requirements: + port_pd_server_mgmt_port_0_mac_requirements: mac_count_required: is_required: false + vm_flavor_name: + get_input: pd_flavor_name vm_image_name: get_input: pd_image_name - port_pd01_port_ip_requirements: + port_pd_server_mgmt_port_0_network: + - Network-1 + - Network-0 + port_pd_server_mgmt_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_network: - - Network-1 - - Network-0 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/oneComputeTypeOnePortGetAttrOutComputePort/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/Nested_pd_serverServiceTemplate.yaml index 376d974422..3854e84393 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/Nested_pd_serverServiceTemplate.yaml @@ -11,6 +11,14 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pd_server_mgmt_port_0_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd_server_mgmt_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -28,50 +36,42 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_mgmt_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_pd01_port_related_networks: - type: list + port_pd_server_mgmt_port_0_subnetpoolid: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - vm_image_name: - type: string + port_pd_server_mgmt_port_0_order: + type: integer required: true - port_pd01_port_ip_requirements: + port_pd_server_mgmt_port_0_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + type: org.openecomp.datatypes.network.VlanRequirements + vm_image_name: + type: string + required: true + port_pd_server_mgmt_port_0_network: type: list required: true entry_schema: type: string - port_pd01_port_order: - type: integer - required: true - port_pd01_port_subnetpoolid: + port_pd_server_mgmt_port_0_network_role: type: string required: true - port_pd01_port_network_role: + port_pd_server_mgmt_port_0_network_role_tag: type: string required: true - port_pd01_port_network_role_tag: - type: string - required: true - port_pd01_port_vlan_requirements: + port_pd_server_mgmt_port_0_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.IpRequirements node_templates: pd_server: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server @@ -90,9 +90,9 @@ topology_template: - index_value user_data_format: get_attribute: - - pd_server_pd01_port + - pd_server_pd_server_mgmt_port_0 - device_id - pd_server_pd01_port: + pd_server_pd_server_mgmt_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: @@ -100,27 +100,27 @@ topology_template: - pd_server - accessIPv4 mac_requirements: - get_input: port_pd01_port_mac_requirements + get_input: port_pd_server_mgmt_port_0_mac_requirements order: - get_input: port_pd01_port_order + get_input: port_pd_server_mgmt_port_0_order exCP_naming: - get_input: port_pd01_port_exCP_naming + get_input: port_pd_server_mgmt_port_0_exCP_naming vlan_requirements: - get_input: port_pd01_port_vlan_requirements + get_input: port_pd_server_mgmt_port_0_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_pd01_port_ip_requirements + get_input: port_pd_server_mgmt_port_0_ip_requirements related_networks: - get_input: port_pd01_port_related_networks + get_input: port_pd_server_mgmt_port_0_related_networks network_role_tag: - get_input: port_pd01_port_network_role_tag + get_input: port_pd_server_mgmt_port_0_network_role_tag network_role: - get_input: port_pd01_port_network_role + get_input: port_pd_server_mgmt_port_0_network_role subnetpoolid: - get_input: port_pd01_port_subnetpoolid + get_input: port_pd_server_mgmt_port_0_subnetpoolid network: get_input: - - port_pd01_port_network + - port_pd_server_mgmt_port_0_network - index_value requirements: - binding: @@ -145,24 +145,27 @@ topology_template: disk.device.usage_pd_server: - pd_server - disk.device.usage - network.outgoing.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.packets.rate + network.incoming.bytes.rate_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.incoming.bytes.rate os_pd_server: - pd_server - os disk.write.bytes.rate_pd_server: - pd_server - disk.write.bytes.rate - network.incoming.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes cpu_pd_server: - pd_server - cpu cpu_util_pd_server: - pd_server - cpu_util + attachment_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - attachment + network.incoming.packets_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.incoming.packets disk.device.write.requests.rate_pd_server: - pd_server - disk.device.write.requests.rate @@ -172,24 +175,27 @@ topology_template: disk.device.read.bytes.rate_pd_server: - pd_server - disk.device.read.bytes.rate - network.outgoing.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes disk.iops_pd_server: - pd_server - disk.iops + network.outgoing.bytes.rate_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.outgoing.bytes.rate memory.resident_pd_server: - pd_server - memory.resident cpu.delta_pd_server: - pd_server - cpu.delta - network.incoming.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets.rate + network.outpoing.packets_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.outpoing.packets vcpus_pd_server: - pd_server - vcpus + network.outgoing.packets.rate_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.outgoing.packets.rate disk.device.write.bytes.rate_pd_server: - pd_server - disk.device.write.bytes.rate @@ -199,9 +205,6 @@ topology_template: endpoint_pd_server: - pd_server - endpoint - attachment_pd_server_pd01_port: - - pd_server_pd01_port - - attachment disk.capacity_pd_server: - pd_server - disk.capacity @@ -211,30 +214,33 @@ topology_template: disk.allocation_pd_server: - pd_server - disk.allocation + forwarder_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - forwarder binding_pd_server: - pd_server - binding disk.read.requests_pd_server: - pd_server - disk.read.requests + network.incoming.bytes_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.incoming.bytes feature_pd_server: - pd_server - feature disk.usage_pd_server: - pd_server - disk.usage - binding_pd_server_pd01_port: - - pd_server_pd01_port - - binding + network.incoming.packets.rate_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.incoming.packets.rate disk.write.bytes_pd_server: - pd_server - disk.write.bytes - network.incoming.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes.rate - network.incoming.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets + binding_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - binding disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -256,12 +262,12 @@ topology_template: host_pd_server: - pd_server - host - network.outpoing.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.outpoing.packets - forwarder_pd_server_pd01_port: - - pd_server_pd01_port - - forwarder + feature_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - feature + network.outgoing.bytes_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.outgoing.bytes disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate @@ -271,9 +277,6 @@ topology_template: disk.write.requests_pd_server: - pd_server - disk.write.requests - feature_pd_server_pd01_port: - - pd_server_pd01_port - - feature disk.device.latency_pd_server: - pd_server - disk.device.latency @@ -283,9 +286,6 @@ topology_template: disk.device.capacity_pd_server: - pd_server - disk.device.capacity - network.outgoing.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes.rate disk.device.iops_pd_server: - pd_server - disk.device.iops @@ -293,12 +293,12 @@ topology_template: local_storage_pd_server: - pd_server - local_storage - link_pd_server_pd01_port: - - pd_server_pd01_port + link_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 - link - dependency_pd_server_pd01_port: - - pd_server_pd01_port - - dependency dependency_pd_server: - pd_server - - dependency \ No newline at end of file + - dependency + dependency_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/in/hot-mog-0108-bs1271.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/in/hot-mog-0108-bs1271.yml index f949b8e431..bc72cac5fa 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/in/hot-mog-0108-bs1271.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/in/hot-mog-0108-bs1271.yml @@ -33,7 +33,7 @@ resources: flavor: {get_param: pd_flavor_name} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: pd01_port_0} + - port: {get_resource: pd_server_0_mgmt_port_0} user_data_format: RAW_SERVER_PD_1 server_pd_02: type: OS::Nova::Server @@ -43,15 +43,15 @@ resources: flavor: {get_param: pd_flavor_name} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: pd01_port_1} + - port: {get_resource: pd_server_1_mgmt_port_0} user_data_format: RAW_SERVER_PD_2 - pd01_port_0: + pd_server_0_mgmt_port_0: type: OS::Neutron::Port properties: network: Network-0 security_groups: [{get_resource: jsa_security_group}] replacement_policy: AUTO_PORT_0 - pd01_port_1: + pd_server_1_mgmt_port_0: type: OS::Neutron::Port properties: network: Network-1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml index 4cac9ccc47..5a99ad93ea 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,6 +8,16 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_pd_server_mgmt_port_0_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd_server_mgmt_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED index_value: type: integer description: Index value of this substitution service template runtime instance @@ -28,74 +38,64 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_replacement_policy: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_mgmt_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_pd01_port_related_networks: - type: list + port_pd_server_mgmt_port_0_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true status: SUPPORTED - port_pd01_port_security_groups: + port_pd_server_mgmt_port_0_order: + type: integer + required: true + status: SUPPORTED + port_pd_server_mgmt_port_0_replacement_policy: type: list required: true status: SUPPORTED entry_schema: - type: json - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + type: string + port_pd_server_mgmt_port_0_vlan_requirements: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements vm_image_name: type: string required: true status: SUPPORTED - port_pd01_port_ip_requirements: + port_pd_server_mgmt_port_0_security_groups: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + type: json + port_pd_server_mgmt_port_0_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd01_port_order: - type: integer - required: true - status: SUPPORTED - port_pd01_port_subnetpoolid: - type: string - required: true - status: SUPPORTED - port_pd01_port_network_role: + port_pd_server_mgmt_port_0_network_role: type: string required: true status: SUPPORTED - port_pd01_port_network_role_tag: + port_pd_server_mgmt_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_pd01_port_vlan_requirements: + port_pd_server_mgmt_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.IpRequirements compute_pd_server_user_data_format: type: list required: true @@ -117,14 +117,14 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pd01_port: + - dependency_pd_server_pd_server_mgmt_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd01_port: + - link_pd_server_pd_server_mgmt_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -160,7 +160,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pd01_port: + network.incoming.bytes.rate_pd_server_pd_server_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -177,19 +177,24 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd01_port: + cpu_pd_server: 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_pd_server: + cpu_util_pd_server: 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_pd_server: + attachment_pd_server_pd_server_mgmt_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets_pd_server_pd_server_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -213,13 +218,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd01_port: + disk.iops_pd_server: 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.iops_pd_server: + network.outgoing.bytes.rate_pd_server_pd_server_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -237,7 +242,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pd01_port: + network.outpoing.packets_pd_server_pd_server_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -249,6 +254,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.packets.rate_pd_server_pd_server_mgmt_port_0: + 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_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -266,11 +277,6 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pd01_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED disk.capacity_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -289,6 +295,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pd_server_pd_server_mgmt_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED binding_pd_server: type: tosca.capabilities.network.Bindable occurrences: @@ -300,6 +311,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes_pd_server_pd_server_mgmt_port_0: + 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_pd_server: type: tosca.capabilities.Node occurrences: @@ -311,31 +328,25 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_pd01_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 - disk.write.bytes_pd_server: + network.incoming.packets.rate_pd_server_pd_server_mgmt_port_0: 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_pd_server_pd01_port: + disk.write.bytes_pd_server: 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_pd_server_pd01_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_pd_server_pd_server_mgmt_port_0: + 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: - - 1 + - 0 - UNBOUNDED disk.device.read.requests.rate_pd_server: type: org.openecomp.capabilities.metric.Ceilometer @@ -380,14 +391,14 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pd01_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_pd_server_pd_server_mgmt_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - forwarder_pd_server_pd01_port: - type: org.openecomp.capabilities.Forwarder + network.outgoing.bytes_pd_server_pd_server_mgmt_port_0: + 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 @@ -409,11 +420,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_pd01_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.device.latency_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -432,15 +438,9 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pd01_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.device.iops_pd_server: 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 + - UNBOUNDED 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 fab4956ec6..68e221bb64 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 @@ -99,7 +99,7 @@ topology_template: direction: ingress requirements: - port: - capability: attachment_pd_server_pd01_port + capability: attachment_pd_server_pd_server_mgmt_port_0 node: abstract_pd_server relationship: org.openecomp.relationships.AttachesTo abstract_pd_server: @@ -117,28 +117,28 @@ topology_template: - get_input: - pd_server_names - 0 - port_pd01_port_replacement_policy: - - AUTO_PORT_1 - - AUTO_PORT_0 - vm_flavor_name: - get_input: pd_flavor_name - port_pd01_port_security_groups: - - - jsa_security_group - - - jsa_security_group - port_pd01_port_mac_requirements: + port_pd_server_mgmt_port_0_mac_requirements: mac_count_required: is_required: false + vm_flavor_name: + get_input: pd_flavor_name + port_pd_server_mgmt_port_0_replacement_policy: + - AUTO_PORT_1 + - AUTO_PORT_0 vm_image_name: get_input: pd_image_name - port_pd01_port_ip_requirements: + port_pd_server_mgmt_port_0_security_groups: + - - jsa_security_group + - - jsa_security_group + port_pd_server_mgmt_port_0_network: + - Network-1 + - Network-0 + port_pd_server_mgmt_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_network: - - Network-1 - - Network-0 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/oneComputeTypeOnePortNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml index 974367b48b..4db809022a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml @@ -11,6 +11,14 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pd_server_mgmt_port_0_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd_server_mgmt_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -28,60 +36,52 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_replacement_policy: - type: list - required: true - entry_schema: - type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_mgmt_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_pd01_port_related_networks: - type: list + port_pd_server_mgmt_port_0_subnetpoolid: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true - port_pd01_port_security_groups: + port_pd_server_mgmt_port_0_order: + type: integer + required: true + port_pd_server_mgmt_port_0_replacement_policy: type: list required: true entry_schema: - type: json - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + type: string + port_pd_server_mgmt_port_0_vlan_requirements: + type: list required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements vm_image_name: type: string required: true - port_pd01_port_ip_requirements: + port_pd_server_mgmt_port_0_security_groups: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + type: json + port_pd_server_mgmt_port_0_network: type: list required: true entry_schema: type: string - port_pd01_port_order: - type: integer - required: true - port_pd01_port_subnetpoolid: - type: string - required: true - port_pd01_port_network_role: + port_pd_server_mgmt_port_0_network_role: type: string required: true - port_pd01_port_network_role_tag: + port_pd_server_mgmt_port_0_network_role_tag: type: string required: true - port_pd01_port_vlan_requirements: + port_pd_server_mgmt_port_0_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.IpRequirements compute_pd_server_user_data_format: type: list required: true @@ -107,39 +107,39 @@ topology_template: get_input: - compute_pd_server_user_data_format - index_value - pd_server_pd01_port: + pd_server_pd_server_mgmt_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_pd01_port_replacement_policy + - port_pd_server_mgmt_port_0_replacement_policy - index_value mac_requirements: - get_input: port_pd01_port_mac_requirements + get_input: port_pd_server_mgmt_port_0_mac_requirements order: - get_input: port_pd01_port_order + get_input: port_pd_server_mgmt_port_0_order security_groups: get_input: - - port_pd01_port_security_groups + - port_pd_server_mgmt_port_0_security_groups - index_value exCP_naming: - get_input: port_pd01_port_exCP_naming + get_input: port_pd_server_mgmt_port_0_exCP_naming vlan_requirements: - get_input: port_pd01_port_vlan_requirements + get_input: port_pd_server_mgmt_port_0_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_pd01_port_ip_requirements + get_input: port_pd_server_mgmt_port_0_ip_requirements related_networks: - get_input: port_pd01_port_related_networks + get_input: port_pd_server_mgmt_port_0_related_networks network_role_tag: - get_input: port_pd01_port_network_role_tag + get_input: port_pd_server_mgmt_port_0_network_role_tag network_role: - get_input: port_pd01_port_network_role + get_input: port_pd_server_mgmt_port_0_network_role subnetpoolid: - get_input: port_pd01_port_subnetpoolid + get_input: port_pd_server_mgmt_port_0_subnetpoolid network: get_input: - - port_pd01_port_network + - port_pd_server_mgmt_port_0_network - index_value requirements: - binding: @@ -164,24 +164,27 @@ topology_template: disk.device.usage_pd_server: - pd_server - disk.device.usage - network.outgoing.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.packets.rate + network.incoming.bytes.rate_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.incoming.bytes.rate os_pd_server: - pd_server - os disk.write.bytes.rate_pd_server: - pd_server - disk.write.bytes.rate - network.incoming.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes cpu_pd_server: - pd_server - cpu cpu_util_pd_server: - pd_server - cpu_util + attachment_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - attachment + network.incoming.packets_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.incoming.packets disk.device.write.requests.rate_pd_server: - pd_server - disk.device.write.requests.rate @@ -191,24 +194,27 @@ topology_template: disk.device.read.bytes.rate_pd_server: - pd_server - disk.device.read.bytes.rate - network.outgoing.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes disk.iops_pd_server: - pd_server - disk.iops + network.outgoing.bytes.rate_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.outgoing.bytes.rate memory.resident_pd_server: - pd_server - memory.resident cpu.delta_pd_server: - pd_server - cpu.delta - network.incoming.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets.rate + network.outpoing.packets_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.outpoing.packets vcpus_pd_server: - pd_server - vcpus + network.outgoing.packets.rate_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.outgoing.packets.rate disk.device.write.bytes.rate_pd_server: - pd_server - disk.device.write.bytes.rate @@ -218,9 +224,6 @@ topology_template: endpoint_pd_server: - pd_server - endpoint - attachment_pd_server_pd01_port: - - pd_server_pd01_port - - attachment disk.capacity_pd_server: - pd_server - disk.capacity @@ -230,30 +233,33 @@ topology_template: disk.allocation_pd_server: - pd_server - disk.allocation + forwarder_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - forwarder binding_pd_server: - pd_server - binding disk.read.requests_pd_server: - pd_server - disk.read.requests + network.incoming.bytes_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.incoming.bytes feature_pd_server: - pd_server - feature disk.usage_pd_server: - pd_server - disk.usage - binding_pd_server_pd01_port: - - pd_server_pd01_port - - binding + network.incoming.packets.rate_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.incoming.packets.rate disk.write.bytes_pd_server: - pd_server - disk.write.bytes - network.incoming.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes.rate - network.incoming.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets + binding_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - binding disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -275,12 +281,12 @@ topology_template: host_pd_server: - pd_server - host - network.outpoing.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.outpoing.packets - forwarder_pd_server_pd01_port: - - pd_server_pd01_port - - forwarder + feature_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - feature + network.outgoing.bytes_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.outgoing.bytes disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate @@ -290,9 +296,6 @@ topology_template: disk.write.requests_pd_server: - pd_server - disk.write.requests - feature_pd_server_pd01_port: - - pd_server_pd01_port - - feature disk.device.latency_pd_server: - pd_server - disk.device.latency @@ -302,9 +305,6 @@ topology_template: disk.device.capacity_pd_server: - pd_server - disk.device.capacity - network.outgoing.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes.rate disk.device.iops_pd_server: - pd_server - disk.device.iops @@ -312,12 +312,12 @@ topology_template: local_storage_pd_server: - pd_server - local_storage - link_pd_server_pd01_port: - - pd_server_pd01_port + link_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 - link - dependency_pd_server_pd01_port: - - pd_server_pd01_port - - dependency dependency_pd_server: - pd_server - - dependency \ No newline at end of file + - dependency + dependency_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/in/hot-mog-0108-bs1271.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/in/hot-mog-0108-bs1271.yml index b8d704178f..fb96dcfb80 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/in/hot-mog-0108-bs1271.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/in/hot-mog-0108-bs1271.yml @@ -43,7 +43,7 @@ resources: flavor: {get_param: pd_flavor_name} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: pd01_port_0} + - port: {get_resource: pd_server_0_mgmt_port_0} user_data_format: RAW_SERVER_PD_1 server_pd_02: type: OS::Nova::Server @@ -55,14 +55,14 @@ resources: flavor: {get_param: pd_flavor_name} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: pd01_port_1} + - port: {get_resource: pd_server_1_mgmt_port_0} user_data_format: RAW_SERVER_PD_2 - pd01_port_0: + pd_server_0_mgmt_port_0: type: OS::Neutron::Port properties: network: { get_resource: packet_mirror_network } replacement_policy: AUTO_PORT_0 - pd01_port_1: + pd_server_1_mgmt_port_0: type: OS::Neutron::Port properties: network: { get_resource: packet_mirror_network } diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml index 2f86795f4a..5005610295 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,6 +8,16 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_pd_server_mgmt_port_0_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd_server_mgmt_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED index_value: type: integer description: Index value of this substitution service template runtime instance @@ -28,68 +38,58 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_replacement_policy: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_mgmt_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_pd01_port_related_networks: - type: list + port_pd_server_mgmt_port_0_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true status: SUPPORTED - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - vm_image_name: - type: string + port_pd_server_mgmt_port_0_order: + type: integer required: true status: SUPPORTED - port_pd01_port_ip_requirements: + port_pd_server_mgmt_port_0_replacement_policy: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + type: string + port_pd_server_mgmt_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd01_port_order: - type: integer + type: org.openecomp.datatypes.network.VlanRequirements + vm_image_name: + type: string required: true status: SUPPORTED - port_pd01_port_subnetpoolid: - type: string + port_pd_server_mgmt_port_0_network: + type: list required: true status: SUPPORTED - port_pd01_port_network_role: + entry_schema: + type: string + port_pd_server_mgmt_port_0_network_role: type: string required: true status: SUPPORTED - port_pd01_port_network_role_tag: + port_pd_server_mgmt_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_pd01_port_vlan_requirements: + port_pd_server_mgmt_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.IpRequirements compute_pd_server_user_data_format: type: list required: true @@ -111,14 +111,14 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pd01_port: + - dependency_pd_server_pd_server_mgmt_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd01_port: + - link_pd_server_pd_server_mgmt_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -154,7 +154,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pd01_port: + network.incoming.bytes.rate_pd_server_pd_server_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -171,19 +171,24 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd01_port: + cpu_pd_server: 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_pd_server: + cpu_util_pd_server: 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_pd_server: + attachment_pd_server_pd_server_mgmt_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets_pd_server_pd_server_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -207,13 +212,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd01_port: + disk.iops_pd_server: 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.iops_pd_server: + network.outgoing.bytes.rate_pd_server_pd_server_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -231,7 +236,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pd01_port: + network.outpoing.packets_pd_server_pd_server_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -243,6 +248,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.packets.rate_pd_server_pd_server_mgmt_port_0: + 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_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -260,11 +271,6 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pd01_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED disk.capacity_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -283,6 +289,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pd_server_pd_server_mgmt_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED binding_pd_server: type: tosca.capabilities.network.Bindable occurrences: @@ -294,6 +305,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes_pd_server_pd_server_mgmt_port_0: + 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_pd_server: type: tosca.capabilities.Node occurrences: @@ -305,31 +322,25 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_pd01_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 - disk.write.bytes_pd_server: + network.incoming.packets.rate_pd_server_pd_server_mgmt_port_0: 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_pd_server_pd01_port: + disk.write.bytes_pd_server: 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_pd_server_pd01_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_pd_server_pd_server_mgmt_port_0: + 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: - - 1 + - 0 - UNBOUNDED disk.device.read.requests.rate_pd_server: type: org.openecomp.capabilities.metric.Ceilometer @@ -374,14 +385,14 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pd01_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_pd_server_pd_server_mgmt_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - forwarder_pd_server_pd01_port: - type: org.openecomp.capabilities.Forwarder + network.outgoing.bytes_pd_server_pd_server_mgmt_port_0: + 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 @@ -403,11 +414,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_pd01_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.device.latency_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -426,15 +432,9 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pd01_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.device.iops_pd_server: 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 + - UNBOUNDED 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 bdf50b94e4..8768ffd8eb 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 @@ -141,25 +141,25 @@ topology_template: - get_input: - pd_server_names - 0 - port_pd01_port_replacement_policy: - - AUTO_PORT_1 - - AUTO_PORT_0 - vm_flavor_name: - get_input: pd_flavor_name - port_pd01_port_mac_requirements: + port_pd_server_mgmt_port_0_mac_requirements: mac_count_required: is_required: false + vm_flavor_name: + get_input: pd_flavor_name + port_pd_server_mgmt_port_0_replacement_policy: + - AUTO_PORT_1 + - AUTO_PORT_0 vm_image_name: get_input: pd_image_name - port_pd01_port_ip_requirements: + port_pd_server_mgmt_port_0_network: + - packet_mirror_network + - packet_mirror_network + port_pd_server_mgmt_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_network: - - packet_mirror_network - - packet_mirror_network compute_pd_server_user_data_format: - RAW_SERVER_PD_2 - RAW_SERVER_PD_1 @@ -176,7 +176,7 @@ topology_template: capability: tosca.capabilities.Node node: packet_mirror_network relationship: tosca.relationships.DependsOn - - link_pd_server_pd01_port: + - link_pd_server_pd_server_mgmt_port_0: capability: tosca.capabilities.network.Linkable node: packet_mirror_network relationship: tosca.relationships.network.LinksTo @@ -208,4 +208,4 @@ topology_template: members: - packet_mirror_network - pd01_volume - - abstract_pd_server \ No newline at end of file + - abstract_pd_server diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml index 7f4ab4aa0f..2812df418b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml @@ -11,6 +11,14 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pd_server_mgmt_port_0_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd_server_mgmt_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -28,55 +36,47 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_replacement_policy: - type: list - required: true - entry_schema: - type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_mgmt_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_pd01_port_related_networks: - type: list + port_pd_server_mgmt_port_0_subnetpoolid: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - vm_image_name: - type: string + port_pd_server_mgmt_port_0_order: + type: integer required: true - port_pd01_port_ip_requirements: + port_pd_server_mgmt_port_0_replacement_policy: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + type: string + port_pd_server_mgmt_port_0_vlan_requirements: type: list required: true entry_schema: - type: string - port_pd01_port_order: - type: integer - required: true - port_pd01_port_subnetpoolid: + type: org.openecomp.datatypes.network.VlanRequirements + vm_image_name: type: string required: true - port_pd01_port_network_role: + port_pd_server_mgmt_port_0_network: + type: list + required: true + entry_schema: + type: string + port_pd_server_mgmt_port_0_network_role: type: string required: true - port_pd01_port_network_role_tag: + port_pd_server_mgmt_port_0_network_role_tag: type: string required: true - port_pd01_port_vlan_requirements: + port_pd_server_mgmt_port_0_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.IpRequirements compute_pd_server_user_data_format: type: list required: true @@ -102,35 +102,35 @@ topology_template: get_input: - compute_pd_server_user_data_format - index_value - pd_server_pd01_port: + pd_server_pd_server_mgmt_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_pd01_port_replacement_policy + - port_pd_server_mgmt_port_0_replacement_policy - index_value mac_requirements: - get_input: port_pd01_port_mac_requirements + get_input: port_pd_server_mgmt_port_0_mac_requirements order: - get_input: port_pd01_port_order + get_input: port_pd_server_mgmt_port_0_order exCP_naming: - get_input: port_pd01_port_exCP_naming + get_input: port_pd_server_mgmt_port_0_exCP_naming vlan_requirements: - get_input: port_pd01_port_vlan_requirements + get_input: port_pd_server_mgmt_port_0_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_pd01_port_ip_requirements + get_input: port_pd_server_mgmt_port_0_ip_requirements related_networks: - get_input: port_pd01_port_related_networks + get_input: port_pd_server_mgmt_port_0_related_networks network_role_tag: - get_input: port_pd01_port_network_role_tag + get_input: port_pd_server_mgmt_port_0_network_role_tag network_role: - get_input: port_pd01_port_network_role + get_input: port_pd_server_mgmt_port_0_network_role subnetpoolid: - get_input: port_pd01_port_subnetpoolid + get_input: port_pd_server_mgmt_port_0_subnetpoolid network: get_input: - - port_pd01_port_network + - port_pd_server_mgmt_port_0_network - index_value requirements: - binding: @@ -155,24 +155,27 @@ topology_template: disk.device.usage_pd_server: - pd_server - disk.device.usage - network.outgoing.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.packets.rate + network.incoming.bytes.rate_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.incoming.bytes.rate os_pd_server: - pd_server - os disk.write.bytes.rate_pd_server: - pd_server - disk.write.bytes.rate - network.incoming.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes cpu_pd_server: - pd_server - cpu cpu_util_pd_server: - pd_server - cpu_util + attachment_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - attachment + network.incoming.packets_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.incoming.packets disk.device.write.requests.rate_pd_server: - pd_server - disk.device.write.requests.rate @@ -182,24 +185,27 @@ topology_template: disk.device.read.bytes.rate_pd_server: - pd_server - disk.device.read.bytes.rate - network.outgoing.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes disk.iops_pd_server: - pd_server - disk.iops + network.outgoing.bytes.rate_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.outgoing.bytes.rate memory.resident_pd_server: - pd_server - memory.resident cpu.delta_pd_server: - pd_server - cpu.delta - network.incoming.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets.rate + network.outpoing.packets_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.outpoing.packets vcpus_pd_server: - pd_server - vcpus + network.outgoing.packets.rate_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.outgoing.packets.rate disk.device.write.bytes.rate_pd_server: - pd_server - disk.device.write.bytes.rate @@ -209,9 +215,6 @@ topology_template: endpoint_pd_server: - pd_server - endpoint - attachment_pd_server_pd01_port: - - pd_server_pd01_port - - attachment disk.capacity_pd_server: - pd_server - disk.capacity @@ -221,30 +224,33 @@ topology_template: disk.allocation_pd_server: - pd_server - disk.allocation + forwarder_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - forwarder binding_pd_server: - pd_server - binding disk.read.requests_pd_server: - pd_server - disk.read.requests + network.incoming.bytes_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.incoming.bytes feature_pd_server: - pd_server - feature disk.usage_pd_server: - pd_server - disk.usage - binding_pd_server_pd01_port: - - pd_server_pd01_port - - binding + network.incoming.packets.rate_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.incoming.packets.rate disk.write.bytes_pd_server: - pd_server - disk.write.bytes - network.incoming.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes.rate - network.incoming.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets + binding_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - binding disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -266,12 +272,12 @@ topology_template: host_pd_server: - pd_server - host - network.outpoing.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.outpoing.packets - forwarder_pd_server_pd01_port: - - pd_server_pd01_port - - forwarder + feature_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - feature + network.outgoing.bytes_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.outgoing.bytes disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate @@ -281,9 +287,6 @@ topology_template: disk.write.requests_pd_server: - pd_server - disk.write.requests - feature_pd_server_pd01_port: - - pd_server_pd01_port - - feature disk.device.latency_pd_server: - pd_server - disk.device.latency @@ -293,9 +296,6 @@ topology_template: disk.device.capacity_pd_server: - pd_server - disk.device.capacity - network.outgoing.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes.rate disk.device.iops_pd_server: - pd_server - disk.device.iops @@ -303,12 +303,12 @@ topology_template: local_storage_pd_server: - pd_server - local_storage - link_pd_server_pd01_port: - - pd_server_pd01_port + link_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 - link - dependency_pd_server_pd01_port: - - pd_server_pd01_port - - dependency dependency_pd_server: - pd_server - - dependency \ No newline at end of file + - dependency + dependency_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/in/hot-mog-0108-bs1271.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/in/hot-mog-0108-bs1271.yml index 200fe3cf09..1cbae9e675 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/in/hot-mog-0108-bs1271.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/in/hot-mog-0108-bs1271.yml @@ -31,7 +31,7 @@ resources: availability_zone: {get_param: availabilityzone_name} scheduler_hints: { group: { get_resource: BE_Affinity } } networks: - - port: {get_resource: pd01_port_0} + - port: {get_resource: pd_server_0_mgmt_port_0} user_data_format: RAW_SERVER_PD_1 server_pd_02: type: OS::Nova::Server @@ -42,14 +42,14 @@ resources: availability_zone: {get_param: availabilityzone_name} scheduler_hints: { group: { get_resource: BE_Affinity } } networks: - - port: {get_resource: pd01_port_1} + - port: {get_resource: pd_server_1_mgmt_port_0} user_data_format: RAW_SERVER_PD_2 - pd01_port_0: + pd_server_0_mgmt_port_0: type: OS::Neutron::Port properties: network: Network-0 replacement_policy: AUTO_PORT_0 - pd01_port_1: + pd_server_1_mgmt_port_0: type: OS::Neutron::Port properties: network: Network-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/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/GlobalSubstitutionTypesServiceTemplate.yaml index 3c33dadc4c..21efa9de25 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -14,6 +14,16 @@ node_types: status: SUPPORTED entry_schema: type: json + port_pd_server_mgmt_port_0_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd_server_mgmt_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED index_value: type: integer description: Index value of this substitution service template runtime instance @@ -34,68 +44,58 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_replacement_policy: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_mgmt_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_pd01_port_related_networks: - type: list + port_pd_server_mgmt_port_0_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true status: SUPPORTED - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - vm_image_name: - type: string + port_pd_server_mgmt_port_0_order: + type: integer required: true status: SUPPORTED - port_pd01_port_ip_requirements: + port_pd_server_mgmt_port_0_replacement_policy: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + type: string + port_pd_server_mgmt_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd01_port_order: - type: integer + type: org.openecomp.datatypes.network.VlanRequirements + vm_image_name: + type: string required: true status: SUPPORTED - port_pd01_port_subnetpoolid: - type: string + port_pd_server_mgmt_port_0_network: + type: list required: true status: SUPPORTED - port_pd01_port_network_role: + entry_schema: + type: string + port_pd_server_mgmt_port_0_network_role: type: string required: true status: SUPPORTED - port_pd01_port_network_role_tag: + port_pd_server_mgmt_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_pd01_port_vlan_requirements: + port_pd_server_mgmt_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.IpRequirements compute_pd_server_user_data_format: type: list required: true @@ -117,14 +117,14 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pd01_port: + - dependency_pd_server_pd_server_mgmt_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd01_port: + - link_pd_server_pd_server_mgmt_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -160,7 +160,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pd01_port: + network.incoming.bytes.rate_pd_server_pd_server_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -177,19 +177,24 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd01_port: + cpu_pd_server: 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_pd_server: + cpu_util_pd_server: 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_pd_server: + attachment_pd_server_pd_server_mgmt_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets_pd_server_pd_server_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -213,13 +218,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd01_port: + disk.iops_pd_server: 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.iops_pd_server: + network.outgoing.bytes.rate_pd_server_pd_server_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -237,7 +242,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pd01_port: + network.outpoing.packets_pd_server_pd_server_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -249,6 +254,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.packets.rate_pd_server_pd_server_mgmt_port_0: + 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_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -266,11 +277,6 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pd01_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED disk.capacity_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -289,6 +295,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pd_server_pd_server_mgmt_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED binding_pd_server: type: tosca.capabilities.network.Bindable occurrences: @@ -300,6 +311,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes_pd_server_pd_server_mgmt_port_0: + 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_pd_server: type: tosca.capabilities.Node occurrences: @@ -311,31 +328,25 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_pd01_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 - disk.write.bytes_pd_server: + network.incoming.packets.rate_pd_server_pd_server_mgmt_port_0: 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_pd_server_pd01_port: + disk.write.bytes_pd_server: 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_pd_server_pd01_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_pd_server_pd_server_mgmt_port_0: + 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: - - 1 + - 0 - UNBOUNDED disk.device.read.requests.rate_pd_server: type: org.openecomp.capabilities.metric.Ceilometer @@ -380,14 +391,14 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pd01_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_pd_server_pd_server_mgmt_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - forwarder_pd_server_pd01_port: - type: org.openecomp.capabilities.Forwarder + network.outgoing.bytes_pd_server_pd_server_mgmt_port_0: + 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 @@ -409,11 +420,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_pd01_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.device.latency_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -432,15 +438,9 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pd01_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.device.iops_pd_server: 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 + - UNBOUNDED 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 41df4372dd..7f55e00553 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 @@ -91,25 +91,25 @@ topology_template: - get_input: - pd_server_names - 0 - port_pd01_port_replacement_policy: - - AUTO_PORT_1 - - AUTO_PORT_0 - vm_flavor_name: - get_input: pd_flavor_name - port_pd01_port_mac_requirements: + port_pd_server_mgmt_port_0_mac_requirements: mac_count_required: is_required: false + vm_flavor_name: + get_input: pd_flavor_name + port_pd_server_mgmt_port_0_replacement_policy: + - AUTO_PORT_1 + - AUTO_PORT_0 vm_image_name: get_input: pd_image_name - port_pd01_port_ip_requirements: + port_pd_server_mgmt_port_0_network: + - Network-1 + - Network-0 + port_pd_server_mgmt_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_network: - - Network-1 - - Network-0 compute_pd_server_user_data_format: - RAW_SERVER_PD_2 - RAW_SERVER_PD_1 @@ -140,4 +140,4 @@ topology_template: name: Policy_BE_Affinity affinity: host targets: - - BE_Affinity_group \ No newline at end of file + - BE_Affinity_group diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/Nested_pd_serverServiceTemplate.yaml index 51236d7661..97ae77f1be 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/Nested_pd_serverServiceTemplate.yaml @@ -16,6 +16,14 @@ topology_template: required: true entry_schema: type: json + port_pd_server_mgmt_port_0_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd_server_mgmt_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -33,55 +41,47 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_replacement_policy: - type: list - required: true - entry_schema: - type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_mgmt_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_pd01_port_related_networks: - type: list + port_pd_server_mgmt_port_0_subnetpoolid: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - vm_image_name: - type: string + port_pd_server_mgmt_port_0_order: + type: integer required: true - port_pd01_port_ip_requirements: + port_pd_server_mgmt_port_0_replacement_policy: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + type: string + port_pd_server_mgmt_port_0_vlan_requirements: type: list required: true entry_schema: - type: string - port_pd01_port_order: - type: integer - required: true - port_pd01_port_subnetpoolid: + type: org.openecomp.datatypes.network.VlanRequirements + vm_image_name: type: string required: true - port_pd01_port_network_role: + port_pd_server_mgmt_port_0_network: + type: list + required: true + entry_schema: + type: string + port_pd_server_mgmt_port_0_network_role: type: string required: true - port_pd01_port_network_role_tag: + port_pd_server_mgmt_port_0_network_role_tag: type: string required: true - port_pd01_port_vlan_requirements: + port_pd_server_mgmt_port_0_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.IpRequirements compute_pd_server_user_data_format: type: list required: true @@ -111,35 +111,35 @@ topology_template: get_input: - compute_pd_server_user_data_format - index_value - pd_server_pd01_port: + pd_server_pd_server_mgmt_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_pd01_port_replacement_policy + - port_pd_server_mgmt_port_0_replacement_policy - index_value mac_requirements: - get_input: port_pd01_port_mac_requirements + get_input: port_pd_server_mgmt_port_0_mac_requirements order: - get_input: port_pd01_port_order + get_input: port_pd_server_mgmt_port_0_order exCP_naming: - get_input: port_pd01_port_exCP_naming + get_input: port_pd_server_mgmt_port_0_exCP_naming vlan_requirements: - get_input: port_pd01_port_vlan_requirements + get_input: port_pd_server_mgmt_port_0_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_pd01_port_ip_requirements + get_input: port_pd_server_mgmt_port_0_ip_requirements related_networks: - get_input: port_pd01_port_related_networks + get_input: port_pd_server_mgmt_port_0_related_networks network_role_tag: - get_input: port_pd01_port_network_role_tag + get_input: port_pd_server_mgmt_port_0_network_role_tag network_role: - get_input: port_pd01_port_network_role + get_input: port_pd_server_mgmt_port_0_network_role subnetpoolid: - get_input: port_pd01_port_subnetpoolid + get_input: port_pd_server_mgmt_port_0_subnetpoolid network: get_input: - - port_pd01_port_network + - port_pd_server_mgmt_port_0_network - index_value requirements: - binding: @@ -164,24 +164,27 @@ topology_template: disk.device.usage_pd_server: - pd_server - disk.device.usage - network.outgoing.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.packets.rate + network.incoming.bytes.rate_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.incoming.bytes.rate os_pd_server: - pd_server - os disk.write.bytes.rate_pd_server: - pd_server - disk.write.bytes.rate - network.incoming.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes cpu_pd_server: - pd_server - cpu cpu_util_pd_server: - pd_server - cpu_util + attachment_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - attachment + network.incoming.packets_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.incoming.packets disk.device.write.requests.rate_pd_server: - pd_server - disk.device.write.requests.rate @@ -191,24 +194,27 @@ topology_template: disk.device.read.bytes.rate_pd_server: - pd_server - disk.device.read.bytes.rate - network.outgoing.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes disk.iops_pd_server: - pd_server - disk.iops + network.outgoing.bytes.rate_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.outgoing.bytes.rate memory.resident_pd_server: - pd_server - memory.resident cpu.delta_pd_server: - pd_server - cpu.delta - network.incoming.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets.rate + network.outpoing.packets_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.outpoing.packets vcpus_pd_server: - pd_server - vcpus + network.outgoing.packets.rate_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.outgoing.packets.rate disk.device.write.bytes.rate_pd_server: - pd_server - disk.device.write.bytes.rate @@ -218,9 +224,6 @@ topology_template: endpoint_pd_server: - pd_server - endpoint - attachment_pd_server_pd01_port: - - pd_server_pd01_port - - attachment disk.capacity_pd_server: - pd_server - disk.capacity @@ -230,30 +233,33 @@ topology_template: disk.allocation_pd_server: - pd_server - disk.allocation + forwarder_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - forwarder binding_pd_server: - pd_server - binding disk.read.requests_pd_server: - pd_server - disk.read.requests + network.incoming.bytes_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.incoming.bytes feature_pd_server: - pd_server - feature disk.usage_pd_server: - pd_server - disk.usage - binding_pd_server_pd01_port: - - pd_server_pd01_port - - binding + network.incoming.packets.rate_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.incoming.packets.rate disk.write.bytes_pd_server: - pd_server - disk.write.bytes - network.incoming.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes.rate - network.incoming.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets + binding_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - binding disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -275,12 +281,12 @@ topology_template: host_pd_server: - pd_server - host - network.outpoing.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.outpoing.packets - forwarder_pd_server_pd01_port: - - pd_server_pd01_port - - forwarder + feature_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - feature + network.outgoing.bytes_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.outgoing.bytes disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate @@ -290,9 +296,6 @@ topology_template: disk.write.requests_pd_server: - pd_server - disk.write.requests - feature_pd_server_pd01_port: - - pd_server_pd01_port - - feature disk.device.latency_pd_server: - pd_server - disk.device.latency @@ -302,9 +305,6 @@ topology_template: disk.device.capacity_pd_server: - pd_server - disk.device.capacity - network.outgoing.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes.rate disk.device.iops_pd_server: - pd_server - disk.device.iops @@ -312,12 +312,12 @@ topology_template: local_storage_pd_server: - pd_server - local_storage - link_pd_server_pd01_port: - - pd_server_pd01_port + link_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 - link - dependency_pd_server_pd01_port: - - pd_server_pd01_port - - dependency dependency_pd_server: - pd_server - - dependency \ No newline at end of file + - dependency + dependency_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/in/hot-mog-0108-bs1271.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/in/hot-mog-0108-bs1271.yml index 1180cb6e8e..09276b82c5 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/in/hot-mog-0108-bs1271.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/in/hot-mog-0108-bs1271.yml @@ -30,7 +30,7 @@ resources: flavor: {get_param: pd_flavor_name} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: pd01_port_0} + - port: {get_resource: pd_server_0_mgmt_port_0} user_data_format: RAW_SERVER_PD_1 server_pd_02: type: OS::Nova::Server @@ -40,14 +40,14 @@ resources: flavor: {get_param: pd_flavor_name} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: pd01_port_1} + - port: {get_resource: pd_server_1_mgmt_port_0} user_data_format: RAW_SERVER_PD_2 - pd01_port_0: + pd_server_0_mgmt_port_0: type: OS::Neutron::Port properties: network: Network-0 replacement_policy: AUTO_PORT_0 - pd01_port_1: + pd_server_1_mgmt_port_0: type: OS::Neutron::Port properties: network: Network-1 @@ -62,4 +62,4 @@ outputs: output_attr_port_pd_0: description: output attr port0 value: - get_attr: [pd01_port_0, device_id] \ No newline at end of file + get_attr: [pd_server_0_mgmt_port_0, device_id] \ 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/oneComputeTypeOnePortOutputParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml index 9dcebc39ab..0d6c5f68cb 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,6 +8,16 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_pd_server_mgmt_port_0_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd_server_mgmt_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED index_value: type: integer description: Index value of this substitution service template runtime instance @@ -28,68 +38,58 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_replacement_policy: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_mgmt_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_pd01_port_related_networks: - type: list + port_pd_server_mgmt_port_0_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true status: SUPPORTED - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - vm_image_name: - type: string + port_pd_server_mgmt_port_0_order: + type: integer required: true status: SUPPORTED - port_pd01_port_ip_requirements: + port_pd_server_mgmt_port_0_replacement_policy: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + type: string + port_pd_server_mgmt_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd01_port_order: - type: integer + type: org.openecomp.datatypes.network.VlanRequirements + vm_image_name: + type: string required: true status: SUPPORTED - port_pd01_port_subnetpoolid: - type: string + port_pd_server_mgmt_port_0_network: + type: list required: true status: SUPPORTED - port_pd01_port_network_role: + entry_schema: + type: string + port_pd_server_mgmt_port_0_network_role: type: string required: true status: SUPPORTED - port_pd01_port_network_role_tag: + port_pd_server_mgmt_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_pd01_port_vlan_requirements: + port_pd_server_mgmt_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.IpRequirements compute_pd_server_user_data_format: type: list required: true @@ -103,7 +103,7 @@ node_types: pd_server_accessIPv4: type: string status: SUPPORTED - pd_server_pd01_port_device_id: + pd_server_pd_server_mgmt_port_0_device_id: type: string status: SUPPORTED requirements: @@ -121,14 +121,14 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pd01_port: + - dependency_pd_server_pd_server_mgmt_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd01_port: + - link_pd_server_pd_server_mgmt_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -164,7 +164,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pd01_port: + network.incoming.bytes.rate_pd_server_pd_server_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -181,19 +181,24 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd01_port: + cpu_pd_server: 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_pd_server: + cpu_util_pd_server: 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_pd_server: + attachment_pd_server_pd_server_mgmt_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets_pd_server_pd_server_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -217,13 +222,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd01_port: + disk.iops_pd_server: 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.iops_pd_server: + network.outgoing.bytes.rate_pd_server_pd_server_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -241,7 +246,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pd01_port: + network.outpoing.packets_pd_server_pd_server_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -253,6 +258,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.packets.rate_pd_server_pd_server_mgmt_port_0: + 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_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -270,11 +281,6 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pd01_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED disk.capacity_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -293,6 +299,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pd_server_pd_server_mgmt_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED binding_pd_server: type: tosca.capabilities.network.Bindable occurrences: @@ -304,6 +315,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes_pd_server_pd_server_mgmt_port_0: + 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_pd_server: type: tosca.capabilities.Node occurrences: @@ -315,31 +332,25 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_pd01_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 - disk.write.bytes_pd_server: + network.incoming.packets.rate_pd_server_pd_server_mgmt_port_0: 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_pd_server_pd01_port: + disk.write.bytes_pd_server: 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_pd_server_pd01_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_pd_server_pd_server_mgmt_port_0: + 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: - - 1 + - 0 - UNBOUNDED disk.device.read.requests.rate_pd_server: type: org.openecomp.capabilities.metric.Ceilometer @@ -384,14 +395,14 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pd01_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_pd_server_pd_server_mgmt_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - forwarder_pd_server_pd01_port: - type: org.openecomp.capabilities.Forwarder + network.outgoing.bytes_pd_server_pd_server_mgmt_port_0: + 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 @@ -413,11 +424,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_pd01_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.device.latency_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -436,15 +442,9 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pd01_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.device.iops_pd_server: 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 + - UNBOUNDED 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 f0de88c8cc..504ef96d67 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 @@ -88,25 +88,25 @@ topology_template: - get_input: - pd_server_names - 0 - port_pd01_port_replacement_policy: - - AUTO_PORT_1 - - AUTO_PORT_0 - vm_flavor_name: - get_input: pd_flavor_name - port_pd01_port_mac_requirements: + port_pd_server_mgmt_port_0_mac_requirements: mac_count_required: is_required: false + vm_flavor_name: + get_input: pd_flavor_name + port_pd_server_mgmt_port_0_replacement_policy: + - AUTO_PORT_1 + - AUTO_PORT_0 vm_image_name: get_input: pd_image_name - port_pd01_port_ip_requirements: + port_pd_server_mgmt_port_0_network: + - Network-1 + - Network-0 + port_pd_server_mgmt_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_network: - - Network-1 - - Network-0 compute_pd_server_user_data_format: - RAW_SERVER_PD_2 - RAW_SERVER_PD_1 @@ -132,7 +132,7 @@ topology_template: value: get_attribute: - abstract_pd_server - - pd_server_pd01_port_device_id + - pd_server_pd_server_mgmt_port_0_device_id output_attr_server_pd_1: description: output attr pd1 value: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml index 2bbdf87416..1bd6282fc4 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml @@ -11,6 +11,14 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pd_server_mgmt_port_0_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd_server_mgmt_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -28,55 +36,47 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_replacement_policy: - type: list - required: true - entry_schema: - type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_mgmt_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_pd01_port_related_networks: - type: list + port_pd_server_mgmt_port_0_subnetpoolid: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - vm_image_name: - type: string + port_pd_server_mgmt_port_0_order: + type: integer required: true - port_pd01_port_ip_requirements: + port_pd_server_mgmt_port_0_replacement_policy: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + type: string + port_pd_server_mgmt_port_0_vlan_requirements: type: list required: true entry_schema: - type: string - port_pd01_port_order: - type: integer - required: true - port_pd01_port_subnetpoolid: + type: org.openecomp.datatypes.network.VlanRequirements + vm_image_name: type: string required: true - port_pd01_port_network_role: + port_pd_server_mgmt_port_0_network: + type: list + required: true + entry_schema: + type: string + port_pd_server_mgmt_port_0_network_role: type: string required: true - port_pd01_port_network_role_tag: + port_pd_server_mgmt_port_0_network_role_tag: type: string required: true - port_pd01_port_vlan_requirements: + port_pd_server_mgmt_port_0_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.IpRequirements compute_pd_server_user_data_format: type: list required: true @@ -102,35 +102,35 @@ topology_template: get_input: - compute_pd_server_user_data_format - index_value - pd_server_pd01_port: + pd_server_pd_server_mgmt_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_pd01_port_replacement_policy + - port_pd_server_mgmt_port_0_replacement_policy - index_value mac_requirements: - get_input: port_pd01_port_mac_requirements + get_input: port_pd_server_mgmt_port_0_mac_requirements order: - get_input: port_pd01_port_order + get_input: port_pd_server_mgmt_port_0_order exCP_naming: - get_input: port_pd01_port_exCP_naming + get_input: port_pd_server_mgmt_port_0_exCP_naming vlan_requirements: - get_input: port_pd01_port_vlan_requirements + get_input: port_pd_server_mgmt_port_0_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_pd01_port_ip_requirements + get_input: port_pd_server_mgmt_port_0_ip_requirements related_networks: - get_input: port_pd01_port_related_networks + get_input: port_pd_server_mgmt_port_0_related_networks network_role_tag: - get_input: port_pd01_port_network_role_tag + get_input: port_pd_server_mgmt_port_0_network_role_tag network_role: - get_input: port_pd01_port_network_role + get_input: port_pd_server_mgmt_port_0_network_role subnetpoolid: - get_input: port_pd01_port_subnetpoolid + get_input: port_pd_server_mgmt_port_0_subnetpoolid network: get_input: - - port_pd01_port_network + - port_pd_server_mgmt_port_0_network - index_value requirements: - binding: @@ -150,11 +150,11 @@ topology_template: get_attribute: - pd_server - accessIPv4 - pd_server_pd01_port_device_id: + pd_server_pd_server_mgmt_port_0_device_id: type: string value: get_attribute: - - pd_server_pd01_port + - pd_server_pd_server_mgmt_port_0 - device_id substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server @@ -174,24 +174,27 @@ topology_template: disk.device.usage_pd_server: - pd_server - disk.device.usage - network.outgoing.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.packets.rate + network.incoming.bytes.rate_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.incoming.bytes.rate os_pd_server: - pd_server - os disk.write.bytes.rate_pd_server: - pd_server - disk.write.bytes.rate - network.incoming.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes cpu_pd_server: - pd_server - cpu cpu_util_pd_server: - pd_server - cpu_util + attachment_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - attachment + network.incoming.packets_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.incoming.packets disk.device.write.requests.rate_pd_server: - pd_server - disk.device.write.requests.rate @@ -201,24 +204,27 @@ topology_template: disk.device.read.bytes.rate_pd_server: - pd_server - disk.device.read.bytes.rate - network.outgoing.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes disk.iops_pd_server: - pd_server - disk.iops + network.outgoing.bytes.rate_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.outgoing.bytes.rate memory.resident_pd_server: - pd_server - memory.resident cpu.delta_pd_server: - pd_server - cpu.delta - network.incoming.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets.rate + network.outpoing.packets_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.outpoing.packets vcpus_pd_server: - pd_server - vcpus + network.outgoing.packets.rate_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.outgoing.packets.rate disk.device.write.bytes.rate_pd_server: - pd_server - disk.device.write.bytes.rate @@ -228,9 +234,6 @@ topology_template: endpoint_pd_server: - pd_server - endpoint - attachment_pd_server_pd01_port: - - pd_server_pd01_port - - attachment disk.capacity_pd_server: - pd_server - disk.capacity @@ -240,30 +243,33 @@ topology_template: disk.allocation_pd_server: - pd_server - disk.allocation + forwarder_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - forwarder binding_pd_server: - pd_server - binding disk.read.requests_pd_server: - pd_server - disk.read.requests + network.incoming.bytes_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.incoming.bytes feature_pd_server: - pd_server - feature disk.usage_pd_server: - pd_server - disk.usage - binding_pd_server_pd01_port: - - pd_server_pd01_port - - binding + network.incoming.packets.rate_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.incoming.packets.rate disk.write.bytes_pd_server: - pd_server - disk.write.bytes - network.incoming.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes.rate - network.incoming.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets + binding_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - binding disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -285,12 +291,12 @@ topology_template: host_pd_server: - pd_server - host - network.outpoing.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.outpoing.packets - forwarder_pd_server_pd01_port: - - pd_server_pd01_port - - forwarder + feature_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - feature + network.outgoing.bytes_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.outgoing.bytes disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate @@ -300,9 +306,6 @@ topology_template: disk.write.requests_pd_server: - pd_server - disk.write.requests - feature_pd_server_pd01_port: - - pd_server_pd01_port - - feature disk.device.latency_pd_server: - pd_server - disk.device.latency @@ -312,9 +315,6 @@ topology_template: disk.device.capacity_pd_server: - pd_server - disk.device.capacity - network.outgoing.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes.rate disk.device.iops_pd_server: - pd_server - disk.device.iops @@ -322,12 +322,12 @@ topology_template: local_storage_pd_server: - pd_server - local_storage - link_pd_server_pd01_port: - - pd_server_pd01_port + link_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 - link - dependency_pd_server_pd01_port: - - pd_server_pd01_port - - dependency dependency_pd_server: - pd_server - - dependency \ No newline at end of file + - dependency + dependency_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/in/hot-mog-0108-bs1271.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/in/hot-mog-0108-bs1271.yml index 8d21459478..6133829189 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/in/hot-mog-0108-bs1271.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/in/hot-mog-0108-bs1271.yml @@ -42,7 +42,7 @@ resources: flavor: {get_param: pd_flavor_name} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: pd01_port_0} + - port: {get_resource: pd_server_0_mgmt_port_0} user_data_format: RAW server_pd_02: type: OS::Nova::Server @@ -52,7 +52,7 @@ resources: flavor: {get_param: pd_flavor_name} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: pd01_port_1} + - port: {get_resource: pd_server_1_mgmt_port_0} server_ps_01: type: OS::Nova::Server properties: @@ -61,7 +61,7 @@ resources: flavor: {get_param: ps_flavor_name} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: ps01_port_0} + - port: {get_resource: ps_server_0_mgmt_port_0} server_ps_02: type: OS::Nova::Server properties: @@ -70,24 +70,24 @@ resources: flavor: {get_param: ps_flavor_name} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: ps01_port_1} + - port: {get_resource: ps_server_1_mgmt_port_0} user_data_format: RAW - pd01_port_0: + pd_server_0_mgmt_port_0: type: OS::Neutron::Port properties: network: Network-PD-0 replacement_policy: AUTO - pd01_port_1: + pd_server_1_mgmt_port_0: type: OS::Neutron::Port properties: network: Network-PD-1 replacement_policy: AUTO - ps01_port_0: + ps_server_0_mgmt_port_0: type: OS::Neutron::Port properties: network: Network-PS-0 replacement_policy: AUTO - ps01_port_1: + ps_server_1_mgmt_port_0: type: OS::Neutron::Port properties: network: Network-PS-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/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/GlobalSubstitutionTypesServiceTemplate.yaml index bf6c64994a..51118f5860 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,6 +8,16 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_pd_server_mgmt_port_0_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd_server_mgmt_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED index_value: type: integer description: Index value of this substitution service template runtime instance @@ -28,68 +38,58 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_replacement_policy: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_mgmt_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_pd01_port_related_networks: - type: list + port_pd_server_mgmt_port_0_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true status: SUPPORTED - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - vm_image_name: - type: string + port_pd_server_mgmt_port_0_order: + type: integer required: true status: SUPPORTED - port_pd01_port_ip_requirements: + port_pd_server_mgmt_port_0_replacement_policy: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + type: string + port_pd_server_mgmt_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd01_port_order: - type: integer + type: org.openecomp.datatypes.network.VlanRequirements + vm_image_name: + type: string required: true status: SUPPORTED - port_pd01_port_subnetpoolid: - type: string + port_pd_server_mgmt_port_0_network: + type: list required: true status: SUPPORTED - port_pd01_port_network_role: + entry_schema: + type: string + port_pd_server_mgmt_port_0_network_role: type: string required: true status: SUPPORTED - port_pd01_port_network_role_tag: + port_pd_server_mgmt_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_pd01_port_vlan_requirements: + port_pd_server_mgmt_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.IpRequirements compute_pd_server_user_data_format: type: list required: true @@ -111,14 +111,14 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pd01_port: + - dependency_pd_server_pd_server_mgmt_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd01_port: + - link_pd_server_pd_server_mgmt_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -154,7 +154,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pd01_port: + network.incoming.bytes.rate_pd_server_pd_server_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -171,19 +171,24 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd01_port: + cpu_pd_server: 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_pd_server: + cpu_util_pd_server: 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_pd_server: + attachment_pd_server_pd_server_mgmt_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets_pd_server_pd_server_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -207,13 +212,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd01_port: + disk.iops_pd_server: 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.iops_pd_server: + network.outgoing.bytes.rate_pd_server_pd_server_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -231,7 +236,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pd01_port: + network.outpoing.packets_pd_server_pd_server_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -243,6 +248,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.packets.rate_pd_server_pd_server_mgmt_port_0: + 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_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -260,11 +271,6 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pd01_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED disk.capacity_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -283,6 +289,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pd_server_pd_server_mgmt_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED binding_pd_server: type: tosca.capabilities.network.Bindable occurrences: @@ -294,6 +305,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes_pd_server_pd_server_mgmt_port_0: + 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_pd_server: type: tosca.capabilities.Node occurrences: @@ -305,31 +322,25 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_pd01_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 - disk.write.bytes_pd_server: + network.incoming.packets.rate_pd_server_pd_server_mgmt_port_0: 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_pd_server_pd01_port: + disk.write.bytes_pd_server: 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_pd_server_pd01_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_pd_server_pd_server_mgmt_port_0: + 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: - - 1 + - 0 - UNBOUNDED disk.device.read.requests.rate_pd_server: type: org.openecomp.capabilities.metric.Ceilometer @@ -374,14 +385,14 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pd01_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_pd_server_pd_server_mgmt_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - forwarder_pd_server_pd01_port: - type: org.openecomp.capabilities.Forwarder + network.outgoing.bytes_pd_server_pd_server_mgmt_port_0: + 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 @@ -403,11 +414,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_pd01_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.device.latency_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -426,12 +432,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pd01_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.device.iops_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -447,10 +447,6 @@ node_types: status: SUPPORTED entry_schema: type: string - port_ps01_port_subnetpoolid: - type: string - required: true - status: SUPPORTED compute_ps_server_availability_zone: type: list required: true @@ -471,7 +467,17 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_ps01_port_vlan_requirements: + port_ps_server_mgmt_port_0_network: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_ps_server_mgmt_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_ps_server_mgmt_port_0_vlan_requirements: type: list required: true status: SUPPORTED @@ -481,52 +487,46 @@ node_types: type: string required: true status: SUPPORTED - port_ps01_port_related_networks: + port_ps_server_mgmt_port_0_replacement_policy: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_ps01_port_order: - type: integer + type: string + port_ps_server_mgmt_port_0_related_networks: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_image_name: type: string required: true status: SUPPORTED - port_ps01_port_network_role: + port_ps_server_mgmt_port_0_network_role: type: string required: true status: SUPPORTED - port_ps01_port_replacement_policy: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_ps01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_ps_server_mgmt_port_0_order: + type: integer required: true status: SUPPORTED - port_ps01_port_network: + port_ps_server_mgmt_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_ps01_port_ip_requirements: - type: list + type: org.openecomp.datatypes.network.IpRequirements + port_ps_server_mgmt_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_ps01_port_network_role_tag: + port_ps_server_mgmt_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_ps01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_ps_server_mgmt_port_0_network_role_tag: + type: string required: true status: SUPPORTED requirements: @@ -544,38 +544,26 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_ps_server_ps01_port: + - dependency_ps_server_ps_server_mgmt_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_ps_server_ps01_port: + - link_ps_server_ps_server_mgmt_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: - network.incoming.packets.rate_ps_server_ps01_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 instance_ps_server: 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_ps_server_ps01_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 host_ps_server: type: tosca.capabilities.Container valid_source_types: @@ -583,12 +571,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_ps_server_ps01_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_ps_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -601,8 +583,9 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_ps_server_ps01_port: - type: tosca.capabilities.Node + network.incoming.packets.rate_ps_server_ps_server_mgmt_port_0: + 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 @@ -623,6 +606,11 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_ps_server_ps_server_mgmt_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED cpu_ps_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -635,6 +623,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes_ps_server_ps_server_mgmt_port_0: + 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_ps_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -653,7 +647,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_ps_server_ps01_port: + network.outgoing.bytes.rate_ps_server_ps_server_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -665,12 +659,26 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_ps_server_ps_server_mgmt_port_0: + 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_ps_server: 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_ps_server_ps_server_mgmt_port_0: + 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 memory_ps_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -694,6 +702,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_ps_server_ps_server_mgmt_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.latency_ps_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -730,13 +743,13 @@ node_types: occurrences: - 1 - UNBOUNDED - memory.resident_ps_server: + network.outgoing.packets.rate_ps_server_ps_server_mgmt_port_0: 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_ps_server_ps01_port: + memory.resident_ps_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -754,7 +767,18 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_ps_server_ps01_port: + network.incoming.packets_ps_server_ps_server_mgmt_port_0: + 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 + attachment_ps_server_ps_server_mgmt_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes.rate_ps_server_ps_server_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -789,11 +813,6 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_ps_server_ps01_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED os_ps_server: type: tosca.capabilities.OperatingSystem occurrences: @@ -805,19 +824,6 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_ps_server_ps01_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 - forwarder_ps_server_ps01_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED disk.device.write.bytes.rate_ps_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -842,32 +848,26 @@ node_types: occurrences: - 1 - UNBOUNDED - endpoint_ps_server: - type: tosca.capabilities.Endpoint.Admin - occurrences: - - 1 - - UNBOUNDED - disk.capacity_ps_server: + network.outgoing.bytes_ps_server_ps_server_mgmt_port_0: 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_ps_server_ps01_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + endpoint_ps_server: + type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED - disk.device.allocation_ps_server: + disk.capacity_ps_server: 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_ps_server_ps01_port: + disk.device.allocation_ps_server: 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 + - UNBOUNDED 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 95d4c73702..68cf463a7e 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 @@ -139,25 +139,25 @@ topology_template: - get_input: - pd_server_names - 0 - port_pd01_port_replacement_policy: - - AUTO - - AUTO - vm_flavor_name: - get_input: pd_flavor_name - port_pd01_port_mac_requirements: + port_pd_server_mgmt_port_0_mac_requirements: mac_count_required: is_required: false + vm_flavor_name: + get_input: pd_flavor_name + port_pd_server_mgmt_port_0_replacement_policy: + - AUTO + - AUTO vm_image_name: get_input: pd_image_name - port_pd01_port_ip_requirements: + port_pd_server_mgmt_port_0_network: + - Network-PD-1 + - Network-PD-0 + port_pd_server_mgmt_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_network: - - Network-PD-1 - - Network-PD-0 compute_pd_server_user_data_format: - null - RAW @@ -187,20 +187,20 @@ topology_template: compute_ps_server_user_data_format: - null - RAW + port_ps_server_mgmt_port_0_network: + - Network-PS-0 + - Network-PS-1 + port_ps_server_mgmt_port_0_mac_requirements: + mac_count_required: + is_required: false vm_flavor_name: get_input: ps_flavor_name - vm_image_name: - get_input: ps_image_name - port_ps01_port_replacement_policy: + port_ps_server_mgmt_port_0_replacement_policy: - AUTO - AUTO - port_ps01_port_mac_requirements: - mac_count_required: - is_required: false - port_ps01_port_network: - - Network-PS-0 - - Network-PS-1 - port_ps01_port_ip_requirements: + vm_image_name: + get_input: ps_image_name + port_ps_server_mgmt_port_0_ip_requirements: - ip_version: 4 ip_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/scalingInstances/twoComputeTypesOnePort/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/Nested_pd_serverServiceTemplate.yaml index 7f4ab4aa0f..2812df418b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/Nested_pd_serverServiceTemplate.yaml @@ -11,6 +11,14 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pd_server_mgmt_port_0_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd_server_mgmt_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -28,55 +36,47 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_replacement_policy: - type: list - required: true - entry_schema: - type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_mgmt_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_pd01_port_related_networks: - type: list + port_pd_server_mgmt_port_0_subnetpoolid: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - vm_image_name: - type: string + port_pd_server_mgmt_port_0_order: + type: integer required: true - port_pd01_port_ip_requirements: + port_pd_server_mgmt_port_0_replacement_policy: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + type: string + port_pd_server_mgmt_port_0_vlan_requirements: type: list required: true entry_schema: - type: string - port_pd01_port_order: - type: integer - required: true - port_pd01_port_subnetpoolid: + type: org.openecomp.datatypes.network.VlanRequirements + vm_image_name: type: string required: true - port_pd01_port_network_role: + port_pd_server_mgmt_port_0_network: + type: list + required: true + entry_schema: + type: string + port_pd_server_mgmt_port_0_network_role: type: string required: true - port_pd01_port_network_role_tag: + port_pd_server_mgmt_port_0_network_role_tag: type: string required: true - port_pd01_port_vlan_requirements: + port_pd_server_mgmt_port_0_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.IpRequirements compute_pd_server_user_data_format: type: list required: true @@ -102,35 +102,35 @@ topology_template: get_input: - compute_pd_server_user_data_format - index_value - pd_server_pd01_port: + pd_server_pd_server_mgmt_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_pd01_port_replacement_policy + - port_pd_server_mgmt_port_0_replacement_policy - index_value mac_requirements: - get_input: port_pd01_port_mac_requirements + get_input: port_pd_server_mgmt_port_0_mac_requirements order: - get_input: port_pd01_port_order + get_input: port_pd_server_mgmt_port_0_order exCP_naming: - get_input: port_pd01_port_exCP_naming + get_input: port_pd_server_mgmt_port_0_exCP_naming vlan_requirements: - get_input: port_pd01_port_vlan_requirements + get_input: port_pd_server_mgmt_port_0_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_pd01_port_ip_requirements + get_input: port_pd_server_mgmt_port_0_ip_requirements related_networks: - get_input: port_pd01_port_related_networks + get_input: port_pd_server_mgmt_port_0_related_networks network_role_tag: - get_input: port_pd01_port_network_role_tag + get_input: port_pd_server_mgmt_port_0_network_role_tag network_role: - get_input: port_pd01_port_network_role + get_input: port_pd_server_mgmt_port_0_network_role subnetpoolid: - get_input: port_pd01_port_subnetpoolid + get_input: port_pd_server_mgmt_port_0_subnetpoolid network: get_input: - - port_pd01_port_network + - port_pd_server_mgmt_port_0_network - index_value requirements: - binding: @@ -155,24 +155,27 @@ topology_template: disk.device.usage_pd_server: - pd_server - disk.device.usage - network.outgoing.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.packets.rate + network.incoming.bytes.rate_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.incoming.bytes.rate os_pd_server: - pd_server - os disk.write.bytes.rate_pd_server: - pd_server - disk.write.bytes.rate - network.incoming.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes cpu_pd_server: - pd_server - cpu cpu_util_pd_server: - pd_server - cpu_util + attachment_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - attachment + network.incoming.packets_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.incoming.packets disk.device.write.requests.rate_pd_server: - pd_server - disk.device.write.requests.rate @@ -182,24 +185,27 @@ topology_template: disk.device.read.bytes.rate_pd_server: - pd_server - disk.device.read.bytes.rate - network.outgoing.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes disk.iops_pd_server: - pd_server - disk.iops + network.outgoing.bytes.rate_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.outgoing.bytes.rate memory.resident_pd_server: - pd_server - memory.resident cpu.delta_pd_server: - pd_server - cpu.delta - network.incoming.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets.rate + network.outpoing.packets_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.outpoing.packets vcpus_pd_server: - pd_server - vcpus + network.outgoing.packets.rate_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.outgoing.packets.rate disk.device.write.bytes.rate_pd_server: - pd_server - disk.device.write.bytes.rate @@ -209,9 +215,6 @@ topology_template: endpoint_pd_server: - pd_server - endpoint - attachment_pd_server_pd01_port: - - pd_server_pd01_port - - attachment disk.capacity_pd_server: - pd_server - disk.capacity @@ -221,30 +224,33 @@ topology_template: disk.allocation_pd_server: - pd_server - disk.allocation + forwarder_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - forwarder binding_pd_server: - pd_server - binding disk.read.requests_pd_server: - pd_server - disk.read.requests + network.incoming.bytes_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.incoming.bytes feature_pd_server: - pd_server - feature disk.usage_pd_server: - pd_server - disk.usage - binding_pd_server_pd01_port: - - pd_server_pd01_port - - binding + network.incoming.packets.rate_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.incoming.packets.rate disk.write.bytes_pd_server: - pd_server - disk.write.bytes - network.incoming.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes.rate - network.incoming.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets + binding_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - binding disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -266,12 +272,12 @@ topology_template: host_pd_server: - pd_server - host - network.outpoing.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.outpoing.packets - forwarder_pd_server_pd01_port: - - pd_server_pd01_port - - forwarder + feature_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - feature + network.outgoing.bytes_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.outgoing.bytes disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate @@ -281,9 +287,6 @@ topology_template: disk.write.requests_pd_server: - pd_server - disk.write.requests - feature_pd_server_pd01_port: - - pd_server_pd01_port - - feature disk.device.latency_pd_server: - pd_server - disk.device.latency @@ -293,9 +296,6 @@ topology_template: disk.device.capacity_pd_server: - pd_server - disk.device.capacity - network.outgoing.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes.rate disk.device.iops_pd_server: - pd_server - disk.device.iops @@ -303,12 +303,12 @@ topology_template: local_storage_pd_server: - pd_server - local_storage - link_pd_server_pd01_port: - - pd_server_pd01_port + link_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 - link - dependency_pd_server_pd01_port: - - pd_server_pd01_port - - dependency dependency_pd_server: - pd_server - - dependency \ No newline at end of file + - dependency + dependency_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/Nested_ps_serverServiceTemplate.yaml index adb7631cbf..acf65cf0ba 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/Nested_ps_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/Nested_ps_serverServiceTemplate.yaml @@ -16,9 +16,6 @@ topology_template: required: true entry_schema: type: string - port_ps01_port_subnetpoolid: - type: string - required: true compute_ps_server_availability_zone: type: list required: true @@ -36,7 +33,15 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_ps01_port_vlan_requirements: + port_ps_server_mgmt_port_0_network: + type: list + required: true + entry_schema: + type: string + port_ps_server_mgmt_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_ps_server_mgmt_port_0_vlan_requirements: type: list required: true entry_schema: @@ -44,43 +49,38 @@ topology_template: vm_flavor_name: type: string required: true - port_ps01_port_related_networks: + port_ps_server_mgmt_port_0_replacement_policy: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_ps01_port_order: - type: integer + type: string + port_ps_server_mgmt_port_0_related_networks: + type: list required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_image_name: type: string required: true - port_ps01_port_network_role: + port_ps_server_mgmt_port_0_network_role: type: string required: true - port_ps01_port_replacement_policy: - type: list - required: true - entry_schema: - type: string - port_ps01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_ps01_port_network: - type: list + port_ps_server_mgmt_port_0_order: + type: integer required: true - entry_schema: - type: string - port_ps01_port_ip_requirements: + port_ps_server_mgmt_port_0_ip_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_ps01_port_network_role_tag: + port_ps_server_mgmt_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_ps_server_mgmt_port_0_subnetpoolid: type: string required: true - port_ps01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_ps_server_mgmt_port_0_network_role_tag: + type: string required: true node_templates: ps_server: @@ -102,35 +102,35 @@ topology_template: get_input: - compute_ps_server_user_data_format - index_value - ps_server_ps01_port: + ps_server_ps_server_mgmt_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_ps01_port_replacement_policy + - port_ps_server_mgmt_port_0_replacement_policy - index_value mac_requirements: - get_input: port_ps01_port_mac_requirements + get_input: port_ps_server_mgmt_port_0_mac_requirements order: - get_input: port_ps01_port_order + get_input: port_ps_server_mgmt_port_0_order exCP_naming: - get_input: port_ps01_port_exCP_naming + get_input: port_ps_server_mgmt_port_0_exCP_naming vlan_requirements: - get_input: port_ps01_port_vlan_requirements + get_input: port_ps_server_mgmt_port_0_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_ps01_port_ip_requirements + get_input: port_ps_server_mgmt_port_0_ip_requirements related_networks: - get_input: port_ps01_port_related_networks + get_input: port_ps_server_mgmt_port_0_related_networks network_role_tag: - get_input: port_ps01_port_network_role_tag + get_input: port_ps_server_mgmt_port_0_network_role_tag network_role: - get_input: port_ps01_port_network_role + get_input: port_ps_server_mgmt_port_0_network_role subnetpoolid: - get_input: port_ps01_port_subnetpoolid + get_input: port_ps_server_mgmt_port_0_subnetpoolid network: get_input: - - port_ps01_port_network + - port_ps_server_mgmt_port_0_network - index_value requirements: - binding: @@ -140,30 +140,21 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.ps_server capabilities: - network.incoming.packets.rate_ps_server_ps01_port: - - ps_server_ps01_port - - network.incoming.packets.rate instance_ps_server: - ps_server - instance - network.outpoing.packets_ps_server_ps01_port: - - ps_server_ps01_port - - network.outpoing.packets host_ps_server: - ps_server - host - network.incoming.packets_ps_server_ps01_port: - - ps_server_ps01_port - - network.incoming.packets cpu.delta_ps_server: - ps_server - cpu.delta disk.write.bytes.rate_ps_server: - ps_server - disk.write.bytes.rate - feature_ps_server_ps01_port: - - ps_server_ps01_port - - feature + network.incoming.packets.rate_ps_server_ps_server_mgmt_port_0: + - ps_server_ps_server_mgmt_port_0 + - network.incoming.packets.rate feature_ps_server: - ps_server - feature @@ -173,12 +164,18 @@ topology_template: disk.device.read.requests.rate_ps_server: - ps_server - disk.device.read.requests.rate + feature_ps_server_ps_server_mgmt_port_0: + - ps_server_ps_server_mgmt_port_0 + - feature cpu_ps_server: - ps_server - cpu disk.device.write.bytes_ps_server: - ps_server - disk.device.write.bytes + network.incoming.bytes_ps_server_ps_server_mgmt_port_0: + - ps_server_ps_server_mgmt_port_0 + - network.incoming.bytes disk.device.read.bytes_ps_server: - ps_server - disk.device.read.bytes @@ -188,15 +185,21 @@ topology_template: disk.device.iops_ps_server: - ps_server - disk.device.iops - network.outgoing.packets.rate_ps_server_ps01_port: - - ps_server_ps01_port - - network.outgoing.packets.rate + network.outgoing.bytes.rate_ps_server_ps_server_mgmt_port_0: + - ps_server_ps_server_mgmt_port_0 + - network.outgoing.bytes.rate disk.device.latency_ps_server: - ps_server - disk.device.latency + network.outpoing.packets_ps_server_ps_server_mgmt_port_0: + - ps_server_ps_server_mgmt_port_0 + - network.outpoing.packets disk.read.bytes.rate_ps_server: - ps_server - disk.read.bytes.rate + binding_ps_server_ps_server_mgmt_port_0: + - ps_server_ps_server_mgmt_port_0 + - binding memory_ps_server: - ps_server - memory @@ -209,6 +212,9 @@ topology_template: disk.write.requests_ps_server: - ps_server - disk.write.requests + forwarder_ps_server_ps_server_mgmt_port_0: + - ps_server_ps_server_mgmt_port_0 + - forwarder disk.latency_ps_server: - ps_server - disk.latency @@ -227,21 +233,27 @@ topology_template: cpu_util_ps_server: - ps_server - cpu_util + network.outgoing.packets.rate_ps_server_ps_server_mgmt_port_0: + - ps_server_ps_server_mgmt_port_0 + - network.outgoing.packets.rate memory.resident_ps_server: - ps_server - memory.resident - network.incoming.bytes_ps_server_ps01_port: - - ps_server_ps01_port - - network.incoming.bytes disk.device.read.requests_ps_server: - ps_server - disk.device.read.requests disk.write.bytes_ps_server: - ps_server - disk.write.bytes - network.outgoing.bytes.rate_ps_server_ps01_port: - - ps_server_ps01_port - - network.outgoing.bytes.rate + network.incoming.packets_ps_server_ps_server_mgmt_port_0: + - ps_server_ps_server_mgmt_port_0 + - network.incoming.packets + attachment_ps_server_ps_server_mgmt_port_0: + - ps_server_ps_server_mgmt_port_0 + - attachment + network.incoming.bytes.rate_ps_server_ps_server_mgmt_port_0: + - ps_server_ps_server_mgmt_port_0 + - network.incoming.bytes.rate disk.device.write.requests.rate_ps_server: - ps_server - disk.device.write.requests.rate @@ -257,21 +269,12 @@ topology_template: binding_ps_server: - ps_server - binding - attachment_ps_server_ps01_port: - - ps_server_ps01_port - - attachment os_ps_server: - ps_server - os disk.device.usage_ps_server: - ps_server - disk.device.usage - binding_ps_server_ps01_port: - - ps_server_ps01_port - - binding - forwarder_ps_server_ps01_port: - - ps_server_ps01_port - - forwarder disk.device.write.bytes.rate_ps_server: - ps_server - disk.device.write.bytes.rate @@ -284,31 +287,28 @@ topology_template: disk.device.write.requests_ps_server: - ps_server - disk.device.write.requests + network.outgoing.bytes_ps_server_ps_server_mgmt_port_0: + - ps_server_ps_server_mgmt_port_0 + - network.outgoing.bytes endpoint_ps_server: - ps_server - endpoint disk.capacity_ps_server: - ps_server - disk.capacity - network.incoming.bytes.rate_ps_server_ps01_port: - - ps_server_ps01_port - - network.incoming.bytes.rate disk.device.allocation_ps_server: - ps_server - disk.device.allocation - network.outgoing.bytes_ps_server_ps01_port: - - ps_server_ps01_port - - network.outgoing.bytes requirements: dependency_ps_server: - ps_server - dependency - link_ps_server_ps01_port: - - ps_server_ps01_port - - link - dependency_ps_server_ps01_port: - - ps_server_ps01_port + dependency_ps_server_ps_server_mgmt_port_0: + - ps_server_ps_server_mgmt_port_0 - dependency + link_ps_server_ps_server_mgmt_port_0: + - ps_server_ps_server_mgmt_port_0 + - link local_storage_ps_server: - ps_server - - local_storage \ No newline at end of file + - local_storage diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/in/hot-mog-0108-bs1271.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/in/hot-mog-0108-bs1271.yml index 79db7ad66b..e0ff94b820 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/in/hot-mog-0108-bs1271.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/in/hot-mog-0108-bs1271.yml @@ -42,7 +42,7 @@ resources: flavor: {get_param: pd_flavor_name} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: pd01_port_0} + - port: {get_resource: pd_server_0_mgmt_port_0} user_data_format: {get_attr: [server_ps_01, accessIPv4]} server_pd_02: type: OS::Nova::Server @@ -52,7 +52,7 @@ resources: flavor: {get_param: pd_flavor_name} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: pd01_port_1} + - port: {get_resource: pd_server_1_mgmt_port_0} server_ps_01: type: OS::Nova::Server properties: @@ -61,7 +61,7 @@ resources: flavor: {get_param: ps_flavor_name} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: ps01_port_0} + - port: {get_resource: ps_server_0_mgmt_port_0} user_data_format: {get_attr: [server_pd_01, accessIPv4]} server_ps_02: type: OS::Nova::Server @@ -71,23 +71,23 @@ resources: flavor: {get_param: ps_flavor_name} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: ps01_port_1} - pd01_port_0: + - port: {get_resource: ps_server_1_mgmt_port_0} + pd_server_0_mgmt_port_0: type: OS::Neutron::Port properties: network: Network-PD-0 replacement_policy: AUTO - pd01_port_1: + pd_server_1_mgmt_port_0: type: OS::Neutron::Port properties: network: Network-PD-1 replacement_policy: AUTO - ps01_port_0: + ps_server_0_mgmt_port_0: type: OS::Neutron::Port properties: network: Network-PS-0 replacement_policy: AUTO - ps01_port_1: + ps_server_1_mgmt_port_0: type: OS::Neutron::Port properties: network: Network-PS-1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/GlobalSubstitutionTypesServiceTemplate.yaml index 2fb8dca3c6..ee5b626d47 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,6 +8,16 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_pd_server_mgmt_port_0_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd_server_mgmt_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED index_value: type: integer description: Index value of this substitution service template runtime instance @@ -28,68 +38,58 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_replacement_policy: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_mgmt_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_pd01_port_related_networks: - type: list + port_pd_server_mgmt_port_0_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true status: SUPPORTED - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - vm_image_name: - type: string + port_pd_server_mgmt_port_0_order: + type: integer required: true status: SUPPORTED - port_pd01_port_ip_requirements: + port_pd_server_mgmt_port_0_replacement_policy: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + type: string + port_pd_server_mgmt_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd01_port_order: - type: integer + type: org.openecomp.datatypes.network.VlanRequirements + vm_image_name: + type: string required: true status: SUPPORTED - port_pd01_port_subnetpoolid: - type: string + port_pd_server_mgmt_port_0_network: + type: list required: true status: SUPPORTED - port_pd01_port_network_role: + entry_schema: + type: string + port_pd_server_mgmt_port_0_network_role: type: string required: true status: SUPPORTED - port_pd01_port_network_role_tag: + port_pd_server_mgmt_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_pd01_port_vlan_requirements: + port_pd_server_mgmt_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.IpRequirements compute_pd_server_user_data_format: type: list required: true @@ -115,14 +115,14 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pd01_port: + - dependency_pd_server_pd_server_mgmt_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd01_port: + - link_pd_server_pd_server_mgmt_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -158,7 +158,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pd01_port: + network.incoming.bytes.rate_pd_server_pd_server_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -175,19 +175,24 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd01_port: + cpu_pd_server: 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_pd_server: + cpu_util_pd_server: 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_pd_server: + attachment_pd_server_pd_server_mgmt_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets_pd_server_pd_server_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -211,13 +216,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd01_port: + disk.iops_pd_server: 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.iops_pd_server: + network.outgoing.bytes.rate_pd_server_pd_server_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -235,7 +240,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pd01_port: + network.outpoing.packets_pd_server_pd_server_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -247,6 +252,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.packets.rate_pd_server_pd_server_mgmt_port_0: + 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_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -264,11 +275,6 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pd01_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED disk.capacity_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -287,6 +293,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pd_server_pd_server_mgmt_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED binding_pd_server: type: tosca.capabilities.network.Bindable occurrences: @@ -298,6 +309,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes_pd_server_pd_server_mgmt_port_0: + 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_pd_server: type: tosca.capabilities.Node occurrences: @@ -309,31 +326,25 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_pd01_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 - disk.write.bytes_pd_server: + network.incoming.packets.rate_pd_server_pd_server_mgmt_port_0: 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_pd_server_pd01_port: + disk.write.bytes_pd_server: 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_pd_server_pd01_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_pd_server_pd_server_mgmt_port_0: + 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: - - 1 + - 0 - UNBOUNDED disk.device.read.requests.rate_pd_server: type: org.openecomp.capabilities.metric.Ceilometer @@ -378,14 +389,14 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pd01_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_pd_server_pd_server_mgmt_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - forwarder_pd_server_pd01_port: - type: org.openecomp.capabilities.Forwarder + network.outgoing.bytes_pd_server_pd_server_mgmt_port_0: + 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 @@ -407,11 +418,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_pd01_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.device.latency_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -430,12 +436,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pd01_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.device.iops_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -451,10 +451,6 @@ node_types: status: SUPPORTED entry_schema: type: string - port_ps01_port_subnetpoolid: - type: string - required: true - status: SUPPORTED compute_ps_server_availability_zone: type: list required: true @@ -475,7 +471,17 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_ps01_port_vlan_requirements: + port_ps_server_mgmt_port_0_network: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_ps_server_mgmt_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_ps_server_mgmt_port_0_vlan_requirements: type: list required: true status: SUPPORTED @@ -485,52 +491,46 @@ node_types: type: string required: true status: SUPPORTED - port_ps01_port_related_networks: + port_ps_server_mgmt_port_0_replacement_policy: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_ps01_port_order: - type: integer + type: string + port_ps_server_mgmt_port_0_related_networks: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_image_name: type: string required: true status: SUPPORTED - port_ps01_port_network_role: + port_ps_server_mgmt_port_0_network_role: type: string required: true status: SUPPORTED - port_ps01_port_replacement_policy: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_ps01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_ps_server_mgmt_port_0_order: + type: integer required: true status: SUPPORTED - port_ps01_port_network: + port_ps_server_mgmt_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_ps01_port_ip_requirements: - type: list + type: org.openecomp.datatypes.network.IpRequirements + port_ps_server_mgmt_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_ps01_port_network_role_tag: + port_ps_server_mgmt_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_ps01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_ps_server_mgmt_port_0_network_role_tag: + type: string required: true status: SUPPORTED attributes: @@ -552,38 +552,26 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_ps_server_ps01_port: + - dependency_ps_server_ps_server_mgmt_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_ps_server_ps01_port: + - link_ps_server_ps_server_mgmt_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: - network.incoming.packets.rate_ps_server_ps01_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 instance_ps_server: 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_ps_server_ps01_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 host_ps_server: type: tosca.capabilities.Container valid_source_types: @@ -591,12 +579,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_ps_server_ps01_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_ps_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -609,8 +591,9 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_ps_server_ps01_port: - type: tosca.capabilities.Node + network.incoming.packets.rate_ps_server_ps_server_mgmt_port_0: + 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 @@ -631,6 +614,11 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_ps_server_ps_server_mgmt_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED cpu_ps_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -643,6 +631,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes_ps_server_ps_server_mgmt_port_0: + 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_ps_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -661,7 +655,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_ps_server_ps01_port: + network.outgoing.bytes.rate_ps_server_ps_server_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -673,12 +667,26 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_ps_server_ps_server_mgmt_port_0: + 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_ps_server: 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_ps_server_ps_server_mgmt_port_0: + 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 memory_ps_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -702,6 +710,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_ps_server_ps_server_mgmt_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.latency_ps_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -738,13 +751,13 @@ node_types: occurrences: - 1 - UNBOUNDED - memory.resident_ps_server: + network.outgoing.packets.rate_ps_server_ps_server_mgmt_port_0: 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_ps_server_ps01_port: + memory.resident_ps_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -762,7 +775,18 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_ps_server_ps01_port: + network.incoming.packets_ps_server_ps_server_mgmt_port_0: + 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 + attachment_ps_server_ps_server_mgmt_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes.rate_ps_server_ps_server_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -797,11 +821,6 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_ps_server_ps01_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED os_ps_server: type: tosca.capabilities.OperatingSystem occurrences: @@ -813,19 +832,6 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_ps_server_ps01_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 - forwarder_ps_server_ps01_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED disk.device.write.bytes.rate_ps_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -850,32 +856,26 @@ node_types: occurrences: - 1 - UNBOUNDED - endpoint_ps_server: - type: tosca.capabilities.Endpoint.Admin - occurrences: - - 1 - - UNBOUNDED - disk.capacity_ps_server: + network.outgoing.bytes_ps_server_ps_server_mgmt_port_0: 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_ps_server_ps01_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + endpoint_ps_server: + type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED - disk.device.allocation_ps_server: + disk.capacity_ps_server: 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_ps_server_ps01_port: + disk.device.allocation_ps_server: 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 + - UNBOUNDED 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 78b4cc40d4..53045684e7 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 @@ -139,25 +139,25 @@ topology_template: - get_input: - pd_server_names - 0 - port_pd01_port_replacement_policy: - - AUTO - - AUTO - vm_flavor_name: - get_input: pd_flavor_name - port_pd01_port_mac_requirements: + port_pd_server_mgmt_port_0_mac_requirements: mac_count_required: is_required: false + vm_flavor_name: + get_input: pd_flavor_name + port_pd_server_mgmt_port_0_replacement_policy: + - AUTO + - AUTO vm_image_name: get_input: pd_image_name - port_pd01_port_ip_requirements: + port_pd_server_mgmt_port_0_network: + - Network-PD-1 + - Network-PD-0 + port_pd_server_mgmt_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_network: - - Network-PD-1 - - Network-PD-0 compute_pd_server_user_data_format: - null - get_attribute: @@ -191,20 +191,20 @@ topology_template: - abstract_pd_server - pd_server_accessIPv4 - null + port_ps_server_mgmt_port_0_network: + - Network-PS-0 + - Network-PS-1 + port_ps_server_mgmt_port_0_mac_requirements: + mac_count_required: + is_required: false vm_flavor_name: get_input: ps_flavor_name - vm_image_name: - get_input: ps_image_name - port_ps01_port_replacement_policy: + port_ps_server_mgmt_port_0_replacement_policy: - AUTO - AUTO - port_ps01_port_mac_requirements: - mac_count_required: - is_required: false - port_ps01_port_network: - - Network-PS-0 - - Network-PS-1 - port_ps01_port_ip_requirements: + vm_image_name: + get_input: ps_image_name + port_ps_server_mgmt_port_0_ip_requirements: - ip_version: 4 ip_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/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/Nested_pd_serverServiceTemplate.yaml index 520dd11d47..453cef9980 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/Nested_pd_serverServiceTemplate.yaml @@ -11,6 +11,14 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pd_server_mgmt_port_0_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd_server_mgmt_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -28,55 +36,47 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_replacement_policy: - type: list - required: true - entry_schema: - type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_mgmt_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_pd01_port_related_networks: - type: list + port_pd_server_mgmt_port_0_subnetpoolid: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - vm_image_name: - type: string + port_pd_server_mgmt_port_0_order: + type: integer required: true - port_pd01_port_ip_requirements: + port_pd_server_mgmt_port_0_replacement_policy: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + type: string + port_pd_server_mgmt_port_0_vlan_requirements: type: list required: true entry_schema: - type: string - port_pd01_port_order: - type: integer - required: true - port_pd01_port_subnetpoolid: + type: org.openecomp.datatypes.network.VlanRequirements + vm_image_name: type: string required: true - port_pd01_port_network_role: + port_pd_server_mgmt_port_0_network: + type: list + required: true + entry_schema: + type: string + port_pd_server_mgmt_port_0_network_role: type: string required: true - port_pd01_port_network_role_tag: + port_pd_server_mgmt_port_0_network_role_tag: type: string required: true - port_pd01_port_vlan_requirements: + port_pd_server_mgmt_port_0_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.IpRequirements compute_pd_server_user_data_format: type: list required: true @@ -102,35 +102,35 @@ topology_template: get_input: - compute_pd_server_user_data_format - index_value - pd_server_pd01_port: + pd_server_pd_server_mgmt_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_pd01_port_replacement_policy + - port_pd_server_mgmt_port_0_replacement_policy - index_value mac_requirements: - get_input: port_pd01_port_mac_requirements + get_input: port_pd_server_mgmt_port_0_mac_requirements order: - get_input: port_pd01_port_order + get_input: port_pd_server_mgmt_port_0_order exCP_naming: - get_input: port_pd01_port_exCP_naming + get_input: port_pd_server_mgmt_port_0_exCP_naming vlan_requirements: - get_input: port_pd01_port_vlan_requirements + get_input: port_pd_server_mgmt_port_0_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_pd01_port_ip_requirements + get_input: port_pd_server_mgmt_port_0_ip_requirements related_networks: - get_input: port_pd01_port_related_networks + get_input: port_pd_server_mgmt_port_0_related_networks network_role_tag: - get_input: port_pd01_port_network_role_tag + get_input: port_pd_server_mgmt_port_0_network_role_tag network_role: - get_input: port_pd01_port_network_role + get_input: port_pd_server_mgmt_port_0_network_role subnetpoolid: - get_input: port_pd01_port_subnetpoolid + get_input: port_pd_server_mgmt_port_0_subnetpoolid network: get_input: - - port_pd01_port_network + - port_pd_server_mgmt_port_0_network - index_value requirements: - binding: @@ -162,24 +162,27 @@ topology_template: disk.device.usage_pd_server: - pd_server - disk.device.usage - network.outgoing.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.packets.rate + network.incoming.bytes.rate_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.incoming.bytes.rate os_pd_server: - pd_server - os disk.write.bytes.rate_pd_server: - pd_server - disk.write.bytes.rate - network.incoming.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes cpu_pd_server: - pd_server - cpu cpu_util_pd_server: - pd_server - cpu_util + attachment_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - attachment + network.incoming.packets_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.incoming.packets disk.device.write.requests.rate_pd_server: - pd_server - disk.device.write.requests.rate @@ -189,24 +192,27 @@ topology_template: disk.device.read.bytes.rate_pd_server: - pd_server - disk.device.read.bytes.rate - network.outgoing.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes disk.iops_pd_server: - pd_server - disk.iops + network.outgoing.bytes.rate_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.outgoing.bytes.rate memory.resident_pd_server: - pd_server - memory.resident cpu.delta_pd_server: - pd_server - cpu.delta - network.incoming.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets.rate + network.outpoing.packets_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.outpoing.packets vcpus_pd_server: - pd_server - vcpus + network.outgoing.packets.rate_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.outgoing.packets.rate disk.device.write.bytes.rate_pd_server: - pd_server - disk.device.write.bytes.rate @@ -216,9 +222,6 @@ topology_template: endpoint_pd_server: - pd_server - endpoint - attachment_pd_server_pd01_port: - - pd_server_pd01_port - - attachment disk.capacity_pd_server: - pd_server - disk.capacity @@ -228,30 +231,33 @@ topology_template: disk.allocation_pd_server: - pd_server - disk.allocation + forwarder_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - forwarder binding_pd_server: - pd_server - binding disk.read.requests_pd_server: - pd_server - disk.read.requests + network.incoming.bytes_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.incoming.bytes feature_pd_server: - pd_server - feature disk.usage_pd_server: - pd_server - disk.usage - binding_pd_server_pd01_port: - - pd_server_pd01_port - - binding + network.incoming.packets.rate_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.incoming.packets.rate disk.write.bytes_pd_server: - pd_server - disk.write.bytes - network.incoming.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes.rate - network.incoming.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets + binding_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - binding disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -273,12 +279,12 @@ topology_template: host_pd_server: - pd_server - host - network.outpoing.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.outpoing.packets - forwarder_pd_server_pd01_port: - - pd_server_pd01_port - - forwarder + feature_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - feature + network.outgoing.bytes_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.outgoing.bytes disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate @@ -288,9 +294,6 @@ topology_template: disk.write.requests_pd_server: - pd_server - disk.write.requests - feature_pd_server_pd01_port: - - pd_server_pd01_port - - feature disk.device.latency_pd_server: - pd_server - disk.device.latency @@ -300,9 +303,6 @@ topology_template: disk.device.capacity_pd_server: - pd_server - disk.device.capacity - network.outgoing.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes.rate disk.device.iops_pd_server: - pd_server - disk.device.iops @@ -310,12 +310,12 @@ topology_template: local_storage_pd_server: - pd_server - local_storage - link_pd_server_pd01_port: - - pd_server_pd01_port + link_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 - link - dependency_pd_server_pd01_port: - - pd_server_pd01_port - - dependency dependency_pd_server: - pd_server - - dependency \ No newline at end of file + - dependency + dependency_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/Nested_ps_serverServiceTemplate.yaml index 1a9e52500e..31c2a274c4 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/Nested_ps_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/Nested_ps_serverServiceTemplate.yaml @@ -16,9 +16,6 @@ topology_template: required: true entry_schema: type: string - port_ps01_port_subnetpoolid: - type: string - required: true compute_ps_server_availability_zone: type: list required: true @@ -36,7 +33,15 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_ps01_port_vlan_requirements: + port_ps_server_mgmt_port_0_network: + type: list + required: true + entry_schema: + type: string + port_ps_server_mgmt_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_ps_server_mgmt_port_0_vlan_requirements: type: list required: true entry_schema: @@ -44,43 +49,38 @@ topology_template: vm_flavor_name: type: string required: true - port_ps01_port_related_networks: + port_ps_server_mgmt_port_0_replacement_policy: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_ps01_port_order: - type: integer + type: string + port_ps_server_mgmt_port_0_related_networks: + type: list required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_image_name: type: string required: true - port_ps01_port_network_role: + port_ps_server_mgmt_port_0_network_role: type: string required: true - port_ps01_port_replacement_policy: - type: list - required: true - entry_schema: - type: string - port_ps01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_ps01_port_network: - type: list + port_ps_server_mgmt_port_0_order: + type: integer required: true - entry_schema: - type: string - port_ps01_port_ip_requirements: + port_ps_server_mgmt_port_0_ip_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_ps01_port_network_role_tag: + port_ps_server_mgmt_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_ps_server_mgmt_port_0_subnetpoolid: type: string required: true - port_ps01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_ps_server_mgmt_port_0_network_role_tag: + type: string required: true node_templates: ps_server: @@ -102,35 +102,35 @@ topology_template: get_input: - compute_ps_server_user_data_format - index_value - ps_server_ps01_port: + ps_server_ps_server_mgmt_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_ps01_port_replacement_policy + - port_ps_server_mgmt_port_0_replacement_policy - index_value mac_requirements: - get_input: port_ps01_port_mac_requirements + get_input: port_ps_server_mgmt_port_0_mac_requirements order: - get_input: port_ps01_port_order + get_input: port_ps_server_mgmt_port_0_order exCP_naming: - get_input: port_ps01_port_exCP_naming + get_input: port_ps_server_mgmt_port_0_exCP_naming vlan_requirements: - get_input: port_ps01_port_vlan_requirements + get_input: port_ps_server_mgmt_port_0_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_ps01_port_ip_requirements + get_input: port_ps_server_mgmt_port_0_ip_requirements related_networks: - get_input: port_ps01_port_related_networks + get_input: port_ps_server_mgmt_port_0_related_networks network_role_tag: - get_input: port_ps01_port_network_role_tag + get_input: port_ps_server_mgmt_port_0_network_role_tag network_role: - get_input: port_ps01_port_network_role + get_input: port_ps_server_mgmt_port_0_network_role subnetpoolid: - get_input: port_ps01_port_subnetpoolid + get_input: port_ps_server_mgmt_port_0_subnetpoolid network: get_input: - - port_ps01_port_network + - port_ps_server_mgmt_port_0_network - index_value requirements: - binding: @@ -147,30 +147,21 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.ps_server capabilities: - network.incoming.packets.rate_ps_server_ps01_port: - - ps_server_ps01_port - - network.incoming.packets.rate instance_ps_server: - ps_server - instance - network.outpoing.packets_ps_server_ps01_port: - - ps_server_ps01_port - - network.outpoing.packets host_ps_server: - ps_server - host - network.incoming.packets_ps_server_ps01_port: - - ps_server_ps01_port - - network.incoming.packets cpu.delta_ps_server: - ps_server - cpu.delta disk.write.bytes.rate_ps_server: - ps_server - disk.write.bytes.rate - feature_ps_server_ps01_port: - - ps_server_ps01_port - - feature + network.incoming.packets.rate_ps_server_ps_server_mgmt_port_0: + - ps_server_ps_server_mgmt_port_0 + - network.incoming.packets.rate feature_ps_server: - ps_server - feature @@ -180,12 +171,18 @@ topology_template: disk.device.read.requests.rate_ps_server: - ps_server - disk.device.read.requests.rate + feature_ps_server_ps_server_mgmt_port_0: + - ps_server_ps_server_mgmt_port_0 + - feature cpu_ps_server: - ps_server - cpu disk.device.write.bytes_ps_server: - ps_server - disk.device.write.bytes + network.incoming.bytes_ps_server_ps_server_mgmt_port_0: + - ps_server_ps_server_mgmt_port_0 + - network.incoming.bytes disk.device.read.bytes_ps_server: - ps_server - disk.device.read.bytes @@ -195,15 +192,21 @@ topology_template: disk.device.iops_ps_server: - ps_server - disk.device.iops - network.outgoing.packets.rate_ps_server_ps01_port: - - ps_server_ps01_port - - network.outgoing.packets.rate + network.outgoing.bytes.rate_ps_server_ps_server_mgmt_port_0: + - ps_server_ps_server_mgmt_port_0 + - network.outgoing.bytes.rate disk.device.latency_ps_server: - ps_server - disk.device.latency + network.outpoing.packets_ps_server_ps_server_mgmt_port_0: + - ps_server_ps_server_mgmt_port_0 + - network.outpoing.packets disk.read.bytes.rate_ps_server: - ps_server - disk.read.bytes.rate + binding_ps_server_ps_server_mgmt_port_0: + - ps_server_ps_server_mgmt_port_0 + - binding memory_ps_server: - ps_server - memory @@ -216,6 +219,9 @@ topology_template: disk.write.requests_ps_server: - ps_server - disk.write.requests + forwarder_ps_server_ps_server_mgmt_port_0: + - ps_server_ps_server_mgmt_port_0 + - forwarder disk.latency_ps_server: - ps_server - disk.latency @@ -234,21 +240,27 @@ topology_template: cpu_util_ps_server: - ps_server - cpu_util + network.outgoing.packets.rate_ps_server_ps_server_mgmt_port_0: + - ps_server_ps_server_mgmt_port_0 + - network.outgoing.packets.rate memory.resident_ps_server: - ps_server - memory.resident - network.incoming.bytes_ps_server_ps01_port: - - ps_server_ps01_port - - network.incoming.bytes disk.device.read.requests_ps_server: - ps_server - disk.device.read.requests disk.write.bytes_ps_server: - ps_server - disk.write.bytes - network.outgoing.bytes.rate_ps_server_ps01_port: - - ps_server_ps01_port - - network.outgoing.bytes.rate + network.incoming.packets_ps_server_ps_server_mgmt_port_0: + - ps_server_ps_server_mgmt_port_0 + - network.incoming.packets + attachment_ps_server_ps_server_mgmt_port_0: + - ps_server_ps_server_mgmt_port_0 + - attachment + network.incoming.bytes.rate_ps_server_ps_server_mgmt_port_0: + - ps_server_ps_server_mgmt_port_0 + - network.incoming.bytes.rate disk.device.write.requests.rate_ps_server: - ps_server - disk.device.write.requests.rate @@ -264,21 +276,12 @@ topology_template: binding_ps_server: - ps_server - binding - attachment_ps_server_ps01_port: - - ps_server_ps01_port - - attachment os_ps_server: - ps_server - os disk.device.usage_ps_server: - ps_server - disk.device.usage - binding_ps_server_ps01_port: - - ps_server_ps01_port - - binding - forwarder_ps_server_ps01_port: - - ps_server_ps01_port - - forwarder disk.device.write.bytes.rate_ps_server: - ps_server - disk.device.write.bytes.rate @@ -291,31 +294,28 @@ topology_template: disk.device.write.requests_ps_server: - ps_server - disk.device.write.requests + network.outgoing.bytes_ps_server_ps_server_mgmt_port_0: + - ps_server_ps_server_mgmt_port_0 + - network.outgoing.bytes endpoint_ps_server: - ps_server - endpoint disk.capacity_ps_server: - ps_server - disk.capacity - network.incoming.bytes.rate_ps_server_ps01_port: - - ps_server_ps01_port - - network.incoming.bytes.rate disk.device.allocation_ps_server: - ps_server - disk.device.allocation - network.outgoing.bytes_ps_server_ps01_port: - - ps_server_ps01_port - - network.outgoing.bytes requirements: dependency_ps_server: - ps_server - dependency - link_ps_server_ps01_port: - - ps_server_ps01_port - - link - dependency_ps_server_ps01_port: - - ps_server_ps01_port + dependency_ps_server_ps_server_mgmt_port_0: + - ps_server_ps_server_mgmt_port_0 - dependency + link_ps_server_ps_server_mgmt_port_0: + - ps_server_ps_server_mgmt_port_0 + - link local_storage_ps_server: - ps_server - - local_storage \ No newline at end of file + - local_storage diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/GlobalSubstitutionTypesServiceTemplate.yaml index 7055e47c27..d4d9603c71 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,6 +8,26 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_pd01_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_pd01_port_0_network: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_pd01_port_0_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role: + type: string + required: true + status: SUPPORTED compute_pd_server_availability_zone: type: list required: true @@ -24,41 +44,45 @@ node_types: type: string required: true status: SUPPORTED - port_pd02_port_network_role_tag: - type: string + port_pd02_port_0_network: + type: list required: true status: SUPPORTED - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + entry_schema: + type: string + port_pd01_port_0_order: + type: integer required: true status: SUPPORTED vm_image_name: type: string required: true status: SUPPORTED - port_pd01_port_ip_requirements: - type: list + port_pd02_port_0_network_role_tag: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd02_port_network_role: + port_pd01_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_pd01_port_vlan_requirements: + compute_pd_server_user_data_format: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - compute_pd_server_user_data_format: + type: string + port_pd02_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd02_port_related_networks: + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role_tag: + type: string + required: true + status: SUPPORTED + port_pd01_port_0_related_networks: type: list required: true status: SUPPORTED @@ -72,72 +96,48 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_pd02_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_pd01_port_exCP_naming: + port_pd02_port_0_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_pd01_port_related_networks: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd02_port_order: - type: integer + port_pd01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_pd02_port_subnetpoolid: + port_pd02_port_0_network_role: type: string required: true status: SUPPORTED - port_pd02_port_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd01_port_network: - type: list + port_pd02_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: string - port_pd01_port_order: + port_pd02_port_0_order: type: integer required: true status: SUPPORTED - port_pd01_port_subnetpoolid: - type: string - required: true - status: SUPPORTED - port_pd02_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd02_port_0_related_networks: + type: list required: true status: SUPPORTED - port_pd01_port_network_role: + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd02_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_pd02_port_ip_requirements: + port_pd02_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network_role_tag: - type: string - required: true - status: SUPPORTED - port_pd02_port_network: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string + type: org.openecomp.datatypes.network.VlanRequirements requirements: - dependency_pd_server: capability: tosca.capabilities.Node @@ -153,33 +153,49 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pd01_port: + - dependency_pd_server_pd02_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd01_port: + - link_pd_server_pd02_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_pd_server_pd02_port: + - dependency_pd_server_pd01_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd02_port: + - link_pd_server_pd01_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: + binding_pd_server_pd02_port_0: + 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 + binding_pd_server_pd01_port_0: + 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 scalable_pd_server: type: tosca.capabilities.Scalable occurrences: @@ -209,12 +225,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pd01_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 os_pd_server: type: tosca.capabilities.OperatingSystem occurrences: @@ -226,7 +236,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd01_port: + network.outgoing.packets.rate_pd_server_pd02_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -262,21 +272,13 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_pd02_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 - network.outgoing.bytes_pd_server_pd01_port: + network.outpoing.packets_pd_server_pd02_port_0: 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.packets.rate_pd_server_pd02_port: + network.incoming.packets_pd_server_pd01_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -300,30 +302,24 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pd01_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_pd_server_pd02_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd02_port: + network.incoming.packets.rate_pd_server_pd01_port_0: 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_pd_server_pd02_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - network.incoming.bytes.rate_pd_server_pd02_port: + network.incoming.bytes.rate_pd_server_pd01_port_0: 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_pd_server_pd02_port: + network.outgoing.packets.rate_pd_server_pd01_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -341,6 +337,11 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_pd_server_pd01_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED disk.device.write.requests_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -352,35 +353,24 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pd01_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - forwarder_pd_server_pd02_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED disk.capacity_pd_server: 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_pd_server: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_pd_server_pd01_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - disk.allocation_pd_server: + disk.device.allocation_pd_server: 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_pd_server_pd02_port: + disk.allocation_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -397,6 +387,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes.rate_pd_server_pd01_port_0: + 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_pd_server: type: tosca.capabilities.Node occurrences: @@ -408,33 +404,37 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pd02_port: + network.outgoing.bytes.rate_pd_server_pd02_port_0: 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_pd_server_pd01_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 + disk.write.bytes_pd_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - - 0 + - 1 - UNBOUNDED - disk.write.bytes_pd_server: + network.outgoing.bytes_pd_server_pd02_port_0: 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_pd_server_pd01_port: + network.outgoing.bytes_pd_server_pd01_port_0: 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_pd_server_pd01_port: + network.incoming.bytes_pd_server_pd02_port_0: + 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_pd_server_pd01_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -464,6 +464,18 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets_pd_server_pd02_port_0: + 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_pd_server_pd01_port_0: + 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_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -483,19 +495,20 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pd01_port: + network.incoming.packets.rate_pd_server_pd02_port_0: 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 - attachment_pd_server_pd02_port: - type: tosca.capabilities.Attachment + network.incoming.bytes.rate_pd_server_pd02_port_0: + 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_pd_server_pd01_port: - type: org.openecomp.capabilities.Forwarder + feature_pd_server_pd01_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -511,24 +524,18 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.write.requests_pd_server: - 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_pd_server_pd01_port: - type: tosca.capabilities.Node + attachment_pd_server_pd02_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - disk.device.latency_pd_server: + disk.write.requests_pd_server: 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_pd_server_pd02_port: + disk.device.latency_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -546,21 +553,14 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pd01_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.device.iops_pd_server: 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_pd_server_pd02_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_pd_server_pd02_port_0: + type: org.openecomp.capabilities.Forwarder 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/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 f6acc07dc4..9bc9edec91 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 @@ -832,6 +832,17 @@ topology_template: directives: - substitutable properties: + port_pd01_port_0_mac_requirements: + mac_count_required: + is_required: false + port_pd01_port_0_network: + - get_input: oam_net_name + port_pd01_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: @@ -840,34 +851,23 @@ topology_template: - 0 vm_flavor_name: get_input: pd_flavor_name - port_pd02_port_network_role_tag: oam - port_pd01_port_mac_requirements: - mac_count_required: - is_required: false + port_pd02_port_0_network: + - get_input: oam_net_name vm_image_name: get_input: pd_image_name - port_pd01_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false + port_pd02_port_0_network_role_tag: oam compute_pd_server_user_data_format: - RAW - port_pd02_port_mac_requirements: - mac_count_required: - is_required: false - port_pd01_port_network: - - get_input: oam_net_name - port_pd02_port_ip_requirements: + port_pd02_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_network_role_tag: oam - port_pd02_port_network: - - get_input: oam_net_name + port_pd01_port_0_network_role_tag: oam + port_pd02_port_0_mac_requirements: + mac_count_required: + is_required: 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/computeWithDiffPortType/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/Nested_pd_serverServiceTemplate.yaml index e894e5c65f..36787625a8 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/Nested_pd_serverServiceTemplate.yaml @@ -11,6 +11,22 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pd01_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_pd01_port_0_network: + type: list + required: true + entry_schema: + type: string + port_pd01_port_0_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role: + type: string + required: true compute_pd_server_availability_zone: type: list required: true @@ -24,34 +40,37 @@ topology_template: vm_flavor_name: type: string required: true - port_pd02_port_network_role_tag: - type: string + port_pd02_port_0_network: + type: list required: true - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + entry_schema: + type: string + port_pd01_port_0_order: + type: integer required: true vm_image_name: type: string required: true - port_pd01_port_ip_requirements: - type: list + port_pd02_port_0_network_role_tag: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd02_port_network_role: + port_pd01_port_0_subnetpoolid: type: string required: true - port_pd01_port_vlan_requirements: + compute_pd_server_user_data_format: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - compute_pd_server_user_data_format: + type: string + port_pd02_port_0_ip_requirements: type: list required: true entry_schema: - type: string - port_pd02_port_related_networks: + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role_tag: + type: string + required: true + port_pd01_port_0_related_networks: type: list required: true entry_schema: @@ -63,58 +82,39 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_pd02_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_pd01_port_exCP_naming: + port_pd02_port_0_exCP_naming: type: org.openecomp.datatypes.Naming required: true - port_pd01_port_related_networks: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd02_port_order: - type: integer + port_pd01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - port_pd02_port_subnetpoolid: + port_pd02_port_0_network_role: type: string required: true - port_pd02_port_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd01_port_network: - type: list + port_pd02_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: string - port_pd01_port_order: + port_pd02_port_0_order: type: integer required: true - port_pd01_port_subnetpoolid: - type: string - required: true - port_pd02_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd02_port_0_related_networks: + type: list required: true - port_pd01_port_network_role: + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd02_port_0_subnetpoolid: type: string required: true - port_pd02_port_ip_requirements: + port_pd02_port_0_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network_role_tag: - type: string - required: true - port_pd02_port_network: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_0_vlan_requirements: type: list required: true entry_schema: - type: string + type: org.openecomp.datatypes.network.VlanRequirements node_templates: pd_server: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server @@ -135,62 +135,62 @@ topology_template: get_input: - compute_pd_server_user_data_format - index_value - pd_server_pd01_port: + pd_server_pd02_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd01_port_exCP_naming + get_input: port_pd02_port_0_exCP_naming vlan_requirements: - get_input: port_pd01_port_vlan_requirements + get_input: port_pd02_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_pd01_port_related_networks + get_input: port_pd02_port_0_related_networks ip_requirements: - get_input: port_pd01_port_ip_requirements + get_input: port_pd02_port_0_ip_requirements network_role_tag: - get_input: port_pd01_port_network_role_tag + get_input: port_pd02_port_0_network_role_tag mac_requirements: - get_input: port_pd01_port_mac_requirements + get_input: port_pd02_port_0_mac_requirements order: - get_input: port_pd01_port_order + get_input: port_pd02_port_0_order network_role: - get_input: port_pd01_port_network_role + get_input: port_pd02_port_0_network_role subnetpoolid: - get_input: port_pd01_port_subnetpoolid + get_input: port_pd02_port_0_subnetpoolid network: get_input: - - port_pd01_port_network + - port_pd02_port_0_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: pd_server relationship: tosca.relationships.network.BindsTo - pd_server_pd02_port: + pd_server_pd01_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd02_port_exCP_naming + get_input: port_pd01_port_0_exCP_naming vlan_requirements: - get_input: port_pd02_port_vlan_requirements + get_input: port_pd01_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_pd02_port_related_networks + get_input: port_pd01_port_0_related_networks ip_requirements: - get_input: port_pd02_port_ip_requirements + get_input: port_pd01_port_0_ip_requirements network_role_tag: - get_input: port_pd02_port_network_role_tag + get_input: port_pd01_port_0_network_role_tag mac_requirements: - get_input: port_pd02_port_mac_requirements + get_input: port_pd01_port_0_mac_requirements order: - get_input: port_pd02_port_order + get_input: port_pd01_port_0_order network_role: - get_input: port_pd02_port_network_role + get_input: port_pd01_port_0_network_role subnetpoolid: - get_input: port_pd02_port_subnetpoolid + get_input: port_pd01_port_0_subnetpoolid network: get_input: - - port_pd02_port_network + - port_pd01_port_0_network - index_value requirements: - binding: @@ -200,6 +200,12 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server capabilities: + binding_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - binding + binding_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - binding scalable_pd_server: - pd_server - scalable @@ -215,18 +221,15 @@ topology_template: disk.device.usage_pd_server: - pd_server - disk.device.usage - network.outgoing.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.packets.rate os_pd_server: - pd_server - os disk.write.bytes.rate_pd_server: - pd_server - disk.write.bytes.rate - network.incoming.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes + network.outgoing.packets.rate_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.outgoing.packets.rate cpu_pd_server: - pd_server - cpu @@ -242,15 +245,12 @@ topology_template: disk.device.read.bytes.rate_pd_server: - pd_server - disk.device.read.bytes.rate - binding_pd_server_pd02_port: - - pd_server_pd02_port - - binding - network.outgoing.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes - network.outgoing.packets.rate_pd_server_pd02_port: - - pd_server_pd02_port - - network.outgoing.packets.rate + network.outpoing.packets_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.outpoing.packets + network.incoming.packets_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.packets disk.iops_pd_server: - pd_server - disk.iops @@ -260,78 +260,78 @@ topology_template: cpu.delta_pd_server: - pd_server - cpu.delta - network.incoming.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets.rate - network.outgoing.bytes_pd_server_pd02_port: - - pd_server_pd02_port - - network.outgoing.bytes - feature_pd_server_pd02_port: - - pd_server_pd02_port + feature_pd_server_pd02_port_0: + - pd_server_pd02_port_0 - feature - network.incoming.bytes.rate_pd_server_pd02_port: - - pd_server_pd02_port + network.incoming.packets.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.packets.rate + network.incoming.bytes.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 - network.incoming.bytes.rate - network.outgoing.bytes.rate_pd_server_pd02_port: - - pd_server_pd02_port - - network.outgoing.bytes.rate + network.outgoing.packets.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.packets.rate vcpus_pd_server: - pd_server - vcpus disk.device.write.bytes.rate_pd_server: - pd_server - disk.device.write.bytes.rate + attachment_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - attachment disk.device.write.requests_pd_server: - pd_server - disk.device.write.requests endpoint_pd_server: - pd_server - endpoint - attachment_pd_server_pd01_port: - - pd_server_pd01_port - - attachment - forwarder_pd_server_pd02_port: - - pd_server_pd02_port - - forwarder disk.capacity_pd_server: - pd_server - disk.capacity + forwarder_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - forwarder disk.device.allocation_pd_server: - pd_server - disk.device.allocation disk.allocation_pd_server: - pd_server - disk.allocation - network.incoming.packets_pd_server_pd02_port: - - pd_server_pd02_port - - network.incoming.packets binding_pd_server: - pd_server - binding disk.read.requests_pd_server: - pd_server - disk.read.requests + network.outgoing.bytes.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.bytes.rate feature_pd_server: - pd_server - feature disk.usage_pd_server: - pd_server - disk.usage - network.outpoing.packets_pd_server_pd02_port: - - pd_server_pd02_port - - network.outpoing.packets - binding_pd_server_pd01_port: - - pd_server_pd01_port - - binding + network.outgoing.bytes.rate_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.outgoing.bytes.rate disk.write.bytes_pd_server: - pd_server - disk.write.bytes - network.incoming.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes.rate - network.incoming.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets + network.outgoing.bytes_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.outgoing.bytes + network.outgoing.bytes_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.bytes + network.incoming.bytes_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.incoming.bytes + network.incoming.bytes_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.bytes disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -344,6 +344,12 @@ topology_template: disk.device.write.bytes_pd_server: - pd_server - disk.device.write.bytes + network.incoming.packets_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.incoming.packets + network.outpoing.packets_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outpoing.packets disk.device.read.requests_pd_server: - pd_server - disk.device.read.requests @@ -353,64 +359,58 @@ topology_template: host_pd_server: - pd_server - host - network.outpoing.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.outpoing.packets - attachment_pd_server_pd02_port: - - pd_server_pd02_port - - attachment - forwarder_pd_server_pd01_port: - - pd_server_pd01_port - - forwarder + network.incoming.packets.rate_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.incoming.packets.rate + network.incoming.bytes.rate_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.incoming.bytes.rate + feature_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - feature disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate disk.ephemeral.size_pd_server: - pd_server - disk.ephemeral.size + attachment_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - attachment disk.write.requests_pd_server: - pd_server - disk.write.requests - feature_pd_server_pd01_port: - - pd_server_pd01_port - - feature disk.device.latency_pd_server: - pd_server - disk.device.latency - network.incoming.packets.rate_pd_server_pd02_port: - - pd_server_pd02_port - - network.incoming.packets.rate disk.latency_pd_server: - pd_server - disk.latency disk.device.capacity_pd_server: - pd_server - disk.device.capacity - network.outgoing.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes.rate disk.device.iops_pd_server: - pd_server - disk.device.iops - network.incoming.bytes_pd_server_pd02_port: - - pd_server_pd02_port - - network.incoming.bytes + forwarder_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - forwarder requirements: local_storage_pd_server: - pd_server - local_storage - link_pd_server_pd02_port: - - pd_server_pd02_port - - link - link_pd_server_pd01_port: - - pd_server_pd01_port - - link - dependency_pd_server_pd01_port: - - pd_server_pd01_port - - dependency dependency_pd_server: - pd_server - dependency - dependency_pd_server_pd02_port: - - pd_server_pd02_port - - dependency \ No newline at end of file + link_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - link + dependency_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - dependency + dependency_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - dependency + link_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - link \ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml index 687aafc255..2321b10d51 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,6 +8,26 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_pd01_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_pd01_port_0_network: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_pd01_port_0_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role: + type: string + required: true + status: SUPPORTED compute_pd_server_availability_zone: type: list required: true @@ -20,7 +40,7 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_replacement_policy: + port_pd01_port_0_replacement_policy: type: list required: true status: SUPPORTED @@ -30,53 +50,57 @@ node_types: type: string required: true status: SUPPORTED - port_pd01_port_security_groups: + port_pd02_port_0_network: type: list required: true status: SUPPORTED entry_schema: - type: json - port_pd02_port_network_role_tag: - type: string + type: string + port_pd01_port_0_order: + type: integer required: true status: SUPPORTED - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + vm_image_name: + type: string required: true status: SUPPORTED - vm_image_name: + port_pd02_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_pd02_port_replacement_policy: + port_pd02_port_0_replacement_policy: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd01_port_ip_requirements: - type: list + port_pd01_port_0_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd02_port_network_role: - type: string + compute_pd_server_user_data_format: + type: list required: true status: SUPPORTED - port_pd01_port_vlan_requirements: + entry_schema: + type: string + port_pd02_port_0_security_groups: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - compute_pd_server_user_data_format: + type: json + port_pd02_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd02_port_related_networks: + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role_tag: + type: string + required: true + status: SUPPORTED + port_pd01_port_0_related_networks: type: list required: true status: SUPPORTED @@ -90,78 +114,54 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_pd02_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_pd01_port_exCP_naming: + port_pd02_port_0_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_pd01_port_related_networks: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd02_port_order: - type: integer + port_pd01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_pd02_port_subnetpoolid: + port_pd02_port_0_network_role: type: string required: true status: SUPPORTED - port_pd02_port_vlan_requirements: - type: list + port_pd02_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd02_port_security_groups: - type: list + port_pd02_port_0_order: + type: integer required: true status: SUPPORTED - entry_schema: - type: json - port_pd01_port_network: + port_pd02_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd01_port_order: - type: integer - required: true - status: SUPPORTED - port_pd01_port_subnetpoolid: - type: string - required: true - status: SUPPORTED - port_pd02_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_pd01_port_network_role: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd02_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_pd02_port_ip_requirements: + port_pd02_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network_role_tag: - type: string + type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_0_vlan_requirements: + type: list required: true status: SUPPORTED - port_pd02_port_network: + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_0_security_groups: type: list required: true status: SUPPORTED entry_schema: - type: string + type: json requirements: - dependency_pd_server: capability: tosca.capabilities.Node @@ -177,33 +177,49 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pd01_port: + - dependency_pd_server_pd02_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd01_port: + - link_pd_server_pd02_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_pd_server_pd02_port: + - dependency_pd_server_pd01_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd02_port: + - link_pd_server_pd01_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: + binding_pd_server_pd02_port_0: + 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 + binding_pd_server_pd01_port_0: + 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 scalable_pd_server: type: tosca.capabilities.Scalable occurrences: @@ -233,12 +249,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pd01_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 os_pd_server: type: tosca.capabilities.OperatingSystem occurrences: @@ -250,7 +260,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd01_port: + network.outgoing.packets.rate_pd_server_pd02_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -286,21 +296,13 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_pd02_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 - network.outgoing.bytes_pd_server_pd01_port: + network.outpoing.packets_pd_server_pd02_port_0: 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.packets.rate_pd_server_pd02_port: + network.incoming.packets_pd_server_pd01_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -324,30 +326,24 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pd01_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_pd_server_pd02_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd02_port: + network.incoming.packets.rate_pd_server_pd01_port_0: 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_pd_server_pd02_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - network.incoming.bytes.rate_pd_server_pd02_port: + network.incoming.bytes.rate_pd_server_pd01_port_0: 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_pd_server_pd02_port: + network.outgoing.packets.rate_pd_server_pd01_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -365,6 +361,11 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_pd_server_pd01_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED disk.device.write.requests_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -376,35 +377,24 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pd01_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - forwarder_pd_server_pd02_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED disk.capacity_pd_server: 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_pd_server: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_pd_server_pd01_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - disk.allocation_pd_server: + disk.device.allocation_pd_server: 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_pd_server_pd02_port: + disk.allocation_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -421,6 +411,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes.rate_pd_server_pd01_port_0: + 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_pd_server: type: tosca.capabilities.Node occurrences: @@ -432,33 +428,37 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pd02_port: + network.outgoing.bytes.rate_pd_server_pd02_port_0: 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_pd_server_pd01_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 + disk.write.bytes_pd_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - - 0 + - 1 - UNBOUNDED - disk.write.bytes_pd_server: + network.outgoing.bytes_pd_server_pd02_port_0: + 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_pd_server_pd01_port_0: 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_pd_server_pd01_port: + network.incoming.bytes_pd_server_pd02_port_0: 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_pd_server_pd01_port: + network.incoming.bytes_pd_server_pd01_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -488,6 +488,18 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets_pd_server_pd02_port_0: + 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_pd_server_pd01_port_0: + 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_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -507,19 +519,20 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pd01_port: + network.incoming.packets.rate_pd_server_pd02_port_0: 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 - attachment_pd_server_pd02_port: - type: tosca.capabilities.Attachment + network.incoming.bytes.rate_pd_server_pd02_port_0: + 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_pd_server_pd01_port: - type: org.openecomp.capabilities.Forwarder + feature_pd_server_pd01_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -535,24 +548,18 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.write.requests_pd_server: - 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_pd_server_pd01_port: - type: tosca.capabilities.Node + attachment_pd_server_pd02_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - disk.device.latency_pd_server: + disk.write.requests_pd_server: 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_pd_server_pd02_port: + disk.device.latency_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -570,21 +577,14 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pd01_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.device.iops_pd_server: 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_pd_server_pd02_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_pd_server_pd02_port_0: + type: org.openecomp.capabilities.Forwarder 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/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 424fcd66ab..9ab904ed53 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 @@ -140,11 +140,11 @@ topology_template: direction: ingress requirements: - port: - capability: attachment_pd_server_pd01_port + capability: attachment_pd_server_pd01_port_0 node: abstract_pd_server relationship: org.openecomp.relationships.AttachesTo - port: - capability: attachment_pd_server_pd02_port + capability: attachment_pd_server_pd02_port_0 node: abstract_pd_server relationship: org.openecomp.relationships.AttachesTo abstract_pd_server: @@ -152,50 +152,50 @@ topology_template: directives: - substitutable properties: + port_pd01_port_0_mac_requirements: + mac_count_required: + is_required: false + port_pd01_port_0_network: + - get_input: oam_net_name + port_pd01_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: - get_input: - pd_server_names - 0 - port_pd01_port_replacement_policy: + port_pd01_port_0_replacement_policy: - AUTO vm_flavor_name: get_input: pd_flavor_name - port_pd01_port_security_groups: - - - jsa_security_group - port_pd02_port_network_role_tag: oam - port_pd01_port_mac_requirements: - mac_count_required: - is_required: false + port_pd02_port_0_network: + - get_input: oam_net_name vm_image_name: get_input: pd_image_name - port_pd02_port_replacement_policy: + port_pd02_port_0_network_role_tag: oam + port_pd02_port_0_replacement_policy: - AUTO - port_pd01_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false compute_pd_server_user_data_format: - RAW - port_pd02_port_mac_requirements: - mac_count_required: - is_required: false - port_pd02_port_security_groups: + port_pd02_port_0_security_groups: - - jsa_security_group - port_pd01_port_network: - - get_input: oam_net_name - port_pd02_port_ip_requirements: + port_pd02_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_network_role_tag: oam - port_pd02_port_network: - - get_input: oam_net_name + port_pd01_port_0_network_role_tag: oam + port_pd02_port_0_mac_requirements: + mac_count_required: + is_required: false + port_pd01_port_0_security_groups: + - - jsa_security_group service_template_filter: substitute_service_template: Nested_pd_serverServiceTemplate.yaml count: 1 @@ -213,4 +213,4 @@ topology_template: members: - resources_with_dependOn - jsa_security_group - - 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/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml index e0cd25ba18..9219f62902 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml @@ -11,6 +11,22 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pd01_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_pd01_port_0_network: + type: list + required: true + entry_schema: + type: string + port_pd01_port_0_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role: + type: string + required: true compute_pd_server_availability_zone: type: list required: true @@ -21,7 +37,7 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_replacement_policy: + port_pd01_port_0_replacement_policy: type: list required: true entry_schema: @@ -29,44 +45,47 @@ topology_template: vm_flavor_name: type: string required: true - port_pd01_port_security_groups: + port_pd02_port_0_network: type: list required: true entry_schema: - type: json - port_pd02_port_network_role_tag: - type: string - required: true - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + type: string + port_pd01_port_0_order: + type: integer required: true vm_image_name: type: string required: true - port_pd02_port_replacement_policy: + port_pd02_port_0_network_role_tag: + type: string + required: true + port_pd02_port_0_replacement_policy: type: list required: true entry_schema: type: string - port_pd01_port_ip_requirements: + port_pd01_port_0_subnetpoolid: + type: string + required: true + compute_pd_server_user_data_format: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd02_port_network_role: - type: string - required: true - port_pd01_port_vlan_requirements: + type: string + port_pd02_port_0_security_groups: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - compute_pd_server_user_data_format: + type: json + port_pd02_port_0_ip_requirements: type: list required: true entry_schema: - type: string - port_pd02_port_related_networks: + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role_tag: + type: string + required: true + port_pd01_port_0_related_networks: type: list required: true entry_schema: @@ -78,63 +97,44 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_pd02_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_pd01_port_exCP_naming: + port_pd02_port_0_exCP_naming: type: org.openecomp.datatypes.Naming required: true - port_pd01_port_related_networks: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd02_port_order: - type: integer + port_pd01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - port_pd02_port_subnetpoolid: + port_pd02_port_0_network_role: type: string required: true - port_pd02_port_vlan_requirements: - type: list + port_pd02_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd02_port_security_groups: - type: list + port_pd02_port_0_order: + type: integer required: true - entry_schema: - type: json - port_pd01_port_network: + port_pd02_port_0_related_networks: type: list required: true entry_schema: - type: string - port_pd01_port_order: - type: integer - required: true - port_pd01_port_subnetpoolid: - type: string - required: true - port_pd02_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_pd01_port_network_role: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd02_port_0_subnetpoolid: type: string required: true - port_pd02_port_ip_requirements: + port_pd02_port_0_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network_role_tag: - type: string + type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_0_vlan_requirements: + type: list required: true - port_pd02_port_network: + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_0_security_groups: type: list required: true entry_schema: - type: string + type: json node_templates: pd_server: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server @@ -155,78 +155,78 @@ topology_template: get_input: - compute_pd_server_user_data_format - index_value - pd_server_pd01_port: + pd_server_pd02_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_pd01_port_replacement_policy + - port_pd02_port_0_replacement_policy - index_value mac_requirements: - get_input: port_pd01_port_mac_requirements + get_input: port_pd02_port_0_mac_requirements order: - get_input: port_pd01_port_order + get_input: port_pd02_port_0_order security_groups: get_input: - - port_pd01_port_security_groups + - port_pd02_port_0_security_groups - index_value exCP_naming: - get_input: port_pd01_port_exCP_naming + get_input: port_pd02_port_0_exCP_naming vlan_requirements: - get_input: port_pd01_port_vlan_requirements + get_input: port_pd02_port_0_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_pd01_port_ip_requirements + get_input: port_pd02_port_0_ip_requirements related_networks: - get_input: port_pd01_port_related_networks + get_input: port_pd02_port_0_related_networks network_role_tag: - get_input: port_pd01_port_network_role_tag + get_input: port_pd02_port_0_network_role_tag network_role: - get_input: port_pd01_port_network_role + get_input: port_pd02_port_0_network_role subnetpoolid: - get_input: port_pd01_port_subnetpoolid + get_input: port_pd02_port_0_subnetpoolid network: get_input: - - port_pd01_port_network + - port_pd02_port_0_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: pd_server relationship: tosca.relationships.network.BindsTo - pd_server_pd02_port: + pd_server_pd01_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_pd02_port_replacement_policy + - port_pd01_port_0_replacement_policy - index_value mac_requirements: - get_input: port_pd02_port_mac_requirements + get_input: port_pd01_port_0_mac_requirements order: - get_input: port_pd02_port_order + get_input: port_pd01_port_0_order security_groups: get_input: - - port_pd02_port_security_groups + - port_pd01_port_0_security_groups - index_value exCP_naming: - get_input: port_pd02_port_exCP_naming + get_input: port_pd01_port_0_exCP_naming vlan_requirements: - get_input: port_pd02_port_vlan_requirements + get_input: port_pd01_port_0_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_pd02_port_ip_requirements + get_input: port_pd01_port_0_ip_requirements related_networks: - get_input: port_pd02_port_related_networks + get_input: port_pd01_port_0_related_networks network_role_tag: - get_input: port_pd02_port_network_role_tag + get_input: port_pd01_port_0_network_role_tag network_role: - get_input: port_pd02_port_network_role + get_input: port_pd01_port_0_network_role subnetpoolid: - get_input: port_pd02_port_subnetpoolid + get_input: port_pd01_port_0_subnetpoolid network: get_input: - - port_pd02_port_network + - port_pd01_port_0_network - index_value requirements: - binding: @@ -236,6 +236,12 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server capabilities: + binding_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - binding + binding_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - binding scalable_pd_server: - pd_server - scalable @@ -251,18 +257,15 @@ topology_template: disk.device.usage_pd_server: - pd_server - disk.device.usage - network.outgoing.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.packets.rate os_pd_server: - pd_server - os disk.write.bytes.rate_pd_server: - pd_server - disk.write.bytes.rate - network.incoming.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes + network.outgoing.packets.rate_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.outgoing.packets.rate cpu_pd_server: - pd_server - cpu @@ -278,15 +281,12 @@ topology_template: disk.device.read.bytes.rate_pd_server: - pd_server - disk.device.read.bytes.rate - binding_pd_server_pd02_port: - - pd_server_pd02_port - - binding - network.outgoing.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes - network.outgoing.packets.rate_pd_server_pd02_port: - - pd_server_pd02_port - - network.outgoing.packets.rate + network.outpoing.packets_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.outpoing.packets + network.incoming.packets_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.packets disk.iops_pd_server: - pd_server - disk.iops @@ -296,78 +296,78 @@ topology_template: cpu.delta_pd_server: - pd_server - cpu.delta - network.incoming.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets.rate - network.outgoing.bytes_pd_server_pd02_port: - - pd_server_pd02_port - - network.outgoing.bytes - feature_pd_server_pd02_port: - - pd_server_pd02_port + feature_pd_server_pd02_port_0: + - pd_server_pd02_port_0 - feature - network.incoming.bytes.rate_pd_server_pd02_port: - - pd_server_pd02_port + network.incoming.packets.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.packets.rate + network.incoming.bytes.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 - network.incoming.bytes.rate - network.outgoing.bytes.rate_pd_server_pd02_port: - - pd_server_pd02_port - - network.outgoing.bytes.rate + network.outgoing.packets.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.packets.rate vcpus_pd_server: - pd_server - vcpus disk.device.write.bytes.rate_pd_server: - pd_server - disk.device.write.bytes.rate + attachment_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - attachment disk.device.write.requests_pd_server: - pd_server - disk.device.write.requests endpoint_pd_server: - pd_server - endpoint - attachment_pd_server_pd01_port: - - pd_server_pd01_port - - attachment - forwarder_pd_server_pd02_port: - - pd_server_pd02_port - - forwarder disk.capacity_pd_server: - pd_server - disk.capacity + forwarder_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - forwarder disk.device.allocation_pd_server: - pd_server - disk.device.allocation disk.allocation_pd_server: - pd_server - disk.allocation - network.incoming.packets_pd_server_pd02_port: - - pd_server_pd02_port - - network.incoming.packets binding_pd_server: - pd_server - binding disk.read.requests_pd_server: - pd_server - disk.read.requests + network.outgoing.bytes.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.bytes.rate feature_pd_server: - pd_server - feature disk.usage_pd_server: - pd_server - disk.usage - network.outpoing.packets_pd_server_pd02_port: - - pd_server_pd02_port - - network.outpoing.packets - binding_pd_server_pd01_port: - - pd_server_pd01_port - - binding + network.outgoing.bytes.rate_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.outgoing.bytes.rate disk.write.bytes_pd_server: - pd_server - disk.write.bytes - network.incoming.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes.rate - network.incoming.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets + network.outgoing.bytes_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.outgoing.bytes + network.outgoing.bytes_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.bytes + network.incoming.bytes_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.incoming.bytes + network.incoming.bytes_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.bytes disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -380,6 +380,12 @@ topology_template: disk.device.write.bytes_pd_server: - pd_server - disk.device.write.bytes + network.incoming.packets_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.incoming.packets + network.outpoing.packets_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outpoing.packets disk.device.read.requests_pd_server: - pd_server - disk.device.read.requests @@ -389,64 +395,58 @@ topology_template: host_pd_server: - pd_server - host - network.outpoing.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.outpoing.packets - attachment_pd_server_pd02_port: - - pd_server_pd02_port - - attachment - forwarder_pd_server_pd01_port: - - pd_server_pd01_port - - forwarder + network.incoming.packets.rate_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.incoming.packets.rate + network.incoming.bytes.rate_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.incoming.bytes.rate + feature_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - feature disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate disk.ephemeral.size_pd_server: - pd_server - disk.ephemeral.size + attachment_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - attachment disk.write.requests_pd_server: - pd_server - disk.write.requests - feature_pd_server_pd01_port: - - pd_server_pd01_port - - feature disk.device.latency_pd_server: - pd_server - disk.device.latency - network.incoming.packets.rate_pd_server_pd02_port: - - pd_server_pd02_port - - network.incoming.packets.rate disk.latency_pd_server: - pd_server - disk.latency disk.device.capacity_pd_server: - pd_server - disk.device.capacity - network.outgoing.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes.rate disk.device.iops_pd_server: - pd_server - disk.device.iops - network.incoming.bytes_pd_server_pd02_port: - - pd_server_pd02_port - - network.incoming.bytes + forwarder_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - forwarder requirements: local_storage_pd_server: - pd_server - local_storage - link_pd_server_pd02_port: - - pd_server_pd02_port - - link - link_pd_server_pd01_port: - - pd_server_pd01_port - - link - dependency_pd_server_pd01_port: - - pd_server_pd01_port - - dependency dependency_pd_server: - pd_server - dependency - dependency_pd_server_pd02_port: - - pd_server_pd02_port - - dependency \ No newline at end of file + link_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - link + dependency_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - dependency + dependency_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - dependency + link_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - link \ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml index c2489543e8..1a8c8aba68 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,6 +8,26 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_pd01_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_pd01_port_0_network: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_pd01_port_0_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role: + type: string + required: true + status: SUPPORTED compute_pd_server_availability_zone: type: list required: true @@ -20,7 +40,7 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_replacement_policy: + port_pd01_port_0_replacement_policy: type: list required: true status: SUPPORTED @@ -30,47 +50,51 @@ node_types: type: string required: true status: SUPPORTED - port_pd02_port_network_role_tag: - type: string + port_pd02_port_0_network: + type: list required: true status: SUPPORTED - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + entry_schema: + type: string + port_pd01_port_0_order: + type: integer required: true status: SUPPORTED vm_image_name: type: string required: true status: SUPPORTED - port_pd02_port_replacement_policy: - type: list + port_pd02_port_0_network_role_tag: + type: string required: true status: SUPPORTED - entry_schema: - type: string - port_pd01_port_ip_requirements: + port_pd02_port_0_replacement_policy: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd02_port_network_role: + type: string + port_pd01_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_pd01_port_vlan_requirements: + compute_pd_server_user_data_format: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - compute_pd_server_user_data_format: + type: string + port_pd02_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd02_port_related_networks: + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role_tag: + type: string + required: true + status: SUPPORTED + port_pd01_port_0_related_networks: type: list required: true status: SUPPORTED @@ -84,72 +108,48 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_pd02_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_pd01_port_exCP_naming: + port_pd02_port_0_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_pd01_port_related_networks: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd02_port_order: - type: integer + port_pd01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_pd02_port_subnetpoolid: + port_pd02_port_0_network_role: type: string required: true status: SUPPORTED - port_pd02_port_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd01_port_network: - type: list + port_pd02_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: string - port_pd01_port_order: + port_pd02_port_0_order: type: integer required: true status: SUPPORTED - port_pd01_port_subnetpoolid: - type: string - required: true - status: SUPPORTED - port_pd02_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd02_port_0_related_networks: + type: list required: true status: SUPPORTED - port_pd01_port_network_role: + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd02_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_pd02_port_ip_requirements: + port_pd02_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network_role_tag: - type: string - required: true - status: SUPPORTED - port_pd02_port_network: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string + type: org.openecomp.datatypes.network.VlanRequirements requirements: - dependency_pd_server: capability: tosca.capabilities.Node @@ -165,33 +165,49 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pd01_port: + - dependency_pd_server_pd02_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd01_port: + - link_pd_server_pd02_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_pd_server_pd02_port: + - dependency_pd_server_pd01_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd02_port: + - link_pd_server_pd01_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: + binding_pd_server_pd02_port_0: + 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 + binding_pd_server_pd01_port_0: + 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 scalable_pd_server: type: tosca.capabilities.Scalable occurrences: @@ -221,12 +237,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pd01_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 os_pd_server: type: tosca.capabilities.OperatingSystem occurrences: @@ -238,7 +248,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd01_port: + network.outgoing.packets.rate_pd_server_pd02_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -274,21 +284,13 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_pd02_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 - network.outgoing.bytes_pd_server_pd01_port: + network.outpoing.packets_pd_server_pd02_port_0: 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.packets.rate_pd_server_pd02_port: + network.incoming.packets_pd_server_pd01_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -312,30 +314,24 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pd01_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_pd_server_pd02_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd02_port: + network.incoming.packets.rate_pd_server_pd01_port_0: 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_pd_server_pd02_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - network.incoming.bytes.rate_pd_server_pd02_port: + network.incoming.bytes.rate_pd_server_pd01_port_0: 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_pd_server_pd02_port: + network.outgoing.packets.rate_pd_server_pd01_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -353,6 +349,11 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_pd_server_pd01_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED disk.device.write.requests_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -364,35 +365,24 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pd01_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - forwarder_pd_server_pd02_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED disk.capacity_pd_server: 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_pd_server: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_pd_server_pd01_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - disk.allocation_pd_server: + disk.device.allocation_pd_server: 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_pd_server_pd02_port: + disk.allocation_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -409,6 +399,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes.rate_pd_server_pd01_port_0: + 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_pd_server: type: tosca.capabilities.Node occurrences: @@ -420,33 +416,37 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pd02_port: + network.outgoing.bytes.rate_pd_server_pd02_port_0: 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_pd_server_pd01_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 + disk.write.bytes_pd_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - - 0 + - 1 - UNBOUNDED - disk.write.bytes_pd_server: + network.outgoing.bytes_pd_server_pd02_port_0: 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_pd_server_pd01_port: + network.outgoing.bytes_pd_server_pd01_port_0: 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_pd_server_pd01_port: + network.incoming.bytes_pd_server_pd02_port_0: + 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_pd_server_pd01_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -476,6 +476,18 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets_pd_server_pd02_port_0: + 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_pd_server_pd01_port_0: + 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_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -495,19 +507,20 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pd01_port: + network.incoming.packets.rate_pd_server_pd02_port_0: 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 - attachment_pd_server_pd02_port: - type: tosca.capabilities.Attachment + network.incoming.bytes.rate_pd_server_pd02_port_0: + 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_pd_server_pd01_port: - type: org.openecomp.capabilities.Forwarder + feature_pd_server_pd01_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -523,24 +536,18 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.write.requests_pd_server: - 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_pd_server_pd01_port: - type: tosca.capabilities.Node + attachment_pd_server_pd02_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - disk.device.latency_pd_server: + disk.write.requests_pd_server: 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_pd_server_pd02_port: + disk.device.latency_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -558,21 +565,14 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pd01_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.device.iops_pd_server: 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_pd_server_pd02_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_pd_server_pd02_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - - UNBOUNDED \ No newline at end of file + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/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 0ad20baa65..db272f1db9 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 @@ -164,44 +164,44 @@ topology_template: directives: - substitutable properties: + port_pd01_port_0_mac_requirements: + mac_count_required: + is_required: false + port_pd01_port_0_network: + - packet_mirror_network + port_pd01_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: - get_input: - pd_server_names - 0 - port_pd01_port_replacement_policy: + port_pd01_port_0_replacement_policy: - AUTO vm_flavor_name: get_input: pd_flavor_name - port_pd01_port_mac_requirements: - mac_count_required: - is_required: false + port_pd02_port_0_network: + - packet_mirror_network vm_image_name: get_input: pd_image_name - port_pd02_port_replacement_policy: + port_pd02_port_0_replacement_policy: - AUTO - port_pd01_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false compute_pd_server_user_data_format: - RAW - port_pd02_port_mac_requirements: - mac_count_required: - is_required: false - port_pd01_port_network: - - packet_mirror_network - port_pd02_port_ip_requirements: + port_pd02_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_pd02_port_network: - - packet_mirror_network + port_pd02_port_0_mac_requirements: + mac_count_required: + is_required: false service_template_filter: substitute_service_template: Nested_pd_serverServiceTemplate.yaml count: 1 @@ -215,11 +215,11 @@ topology_template: capability: tosca.capabilities.Node node: packet_mirror_network relationship: tosca.relationships.DependsOn - - link_pd_server_pd01_port: + - link_pd_server_pd01_port_0: capability: tosca.capabilities.network.Linkable node: packet_mirror_network relationship: tosca.relationships.network.LinksTo - - link_pd_server_pd02_port: + - link_pd_server_pd02_port_0: capability: tosca.capabilities.network.Linkable node: packet_mirror_network relationship: tosca.relationships.network.LinksTo diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml index ad02c9e146..4a66e6d072 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml @@ -11,6 +11,22 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pd01_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_pd01_port_0_network: + type: list + required: true + entry_schema: + type: string + port_pd01_port_0_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role: + type: string + required: true compute_pd_server_availability_zone: type: list required: true @@ -21,7 +37,7 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_replacement_policy: + port_pd01_port_0_replacement_policy: type: list required: true entry_schema: @@ -29,39 +45,42 @@ topology_template: vm_flavor_name: type: string required: true - port_pd02_port_network_role_tag: - type: string + port_pd02_port_0_network: + type: list required: true - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + entry_schema: + type: string + port_pd01_port_0_order: + type: integer required: true vm_image_name: type: string required: true - port_pd02_port_replacement_policy: - type: list + port_pd02_port_0_network_role_tag: + type: string required: true - entry_schema: - type: string - port_pd01_port_ip_requirements: + port_pd02_port_0_replacement_policy: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd02_port_network_role: + type: string + port_pd01_port_0_subnetpoolid: type: string required: true - port_pd01_port_vlan_requirements: + compute_pd_server_user_data_format: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - compute_pd_server_user_data_format: + type: string + port_pd02_port_0_ip_requirements: type: list required: true entry_schema: - type: string - port_pd02_port_related_networks: + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role_tag: + type: string + required: true + port_pd01_port_0_related_networks: type: list required: true entry_schema: @@ -73,58 +92,39 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_pd02_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_pd01_port_exCP_naming: + port_pd02_port_0_exCP_naming: type: org.openecomp.datatypes.Naming required: true - port_pd01_port_related_networks: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd02_port_order: - type: integer + port_pd01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - port_pd02_port_subnetpoolid: + port_pd02_port_0_network_role: type: string required: true - port_pd02_port_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd01_port_network: - type: list + port_pd02_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: string - port_pd01_port_order: + port_pd02_port_0_order: type: integer required: true - port_pd01_port_subnetpoolid: - type: string - required: true - port_pd02_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd02_port_0_related_networks: + type: list required: true - port_pd01_port_network_role: + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd02_port_0_subnetpoolid: type: string required: true - port_pd02_port_ip_requirements: + port_pd02_port_0_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network_role_tag: - type: string - required: true - port_pd02_port_network: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_0_vlan_requirements: type: list required: true entry_schema: - type: string + type: org.openecomp.datatypes.network.VlanRequirements node_templates: pd_server: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server @@ -145,70 +145,70 @@ topology_template: get_input: - compute_pd_server_user_data_format - index_value - pd_server_pd01_port: + pd_server_pd02_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_pd01_port_replacement_policy + - port_pd02_port_0_replacement_policy - index_value mac_requirements: - get_input: port_pd01_port_mac_requirements + get_input: port_pd02_port_0_mac_requirements order: - get_input: port_pd01_port_order + get_input: port_pd02_port_0_order exCP_naming: - get_input: port_pd01_port_exCP_naming + get_input: port_pd02_port_0_exCP_naming vlan_requirements: - get_input: port_pd01_port_vlan_requirements + get_input: port_pd02_port_0_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_pd01_port_ip_requirements + get_input: port_pd02_port_0_ip_requirements related_networks: - get_input: port_pd01_port_related_networks + get_input: port_pd02_port_0_related_networks network_role_tag: - get_input: port_pd01_port_network_role_tag + get_input: port_pd02_port_0_network_role_tag network_role: - get_input: port_pd01_port_network_role + get_input: port_pd02_port_0_network_role subnetpoolid: - get_input: port_pd01_port_subnetpoolid + get_input: port_pd02_port_0_subnetpoolid network: get_input: - - port_pd01_port_network + - port_pd02_port_0_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: pd_server relationship: tosca.relationships.network.BindsTo - pd_server_pd02_port: + pd_server_pd01_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_pd02_port_replacement_policy + - port_pd01_port_0_replacement_policy - index_value mac_requirements: - get_input: port_pd02_port_mac_requirements + get_input: port_pd01_port_0_mac_requirements order: - get_input: port_pd02_port_order + get_input: port_pd01_port_0_order exCP_naming: - get_input: port_pd02_port_exCP_naming + get_input: port_pd01_port_0_exCP_naming vlan_requirements: - get_input: port_pd02_port_vlan_requirements + get_input: port_pd01_port_0_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_pd02_port_ip_requirements + get_input: port_pd01_port_0_ip_requirements related_networks: - get_input: port_pd02_port_related_networks + get_input: port_pd01_port_0_related_networks network_role_tag: - get_input: port_pd02_port_network_role_tag + get_input: port_pd01_port_0_network_role_tag network_role: - get_input: port_pd02_port_network_role + get_input: port_pd01_port_0_network_role subnetpoolid: - get_input: port_pd02_port_subnetpoolid + get_input: port_pd01_port_0_subnetpoolid network: get_input: - - port_pd02_port_network + - port_pd01_port_0_network - index_value requirements: - binding: @@ -218,6 +218,12 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server capabilities: + binding_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - binding + binding_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - binding scalable_pd_server: - pd_server - scalable @@ -233,18 +239,15 @@ topology_template: disk.device.usage_pd_server: - pd_server - disk.device.usage - network.outgoing.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.packets.rate os_pd_server: - pd_server - os disk.write.bytes.rate_pd_server: - pd_server - disk.write.bytes.rate - network.incoming.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes + network.outgoing.packets.rate_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.outgoing.packets.rate cpu_pd_server: - pd_server - cpu @@ -260,15 +263,12 @@ topology_template: disk.device.read.bytes.rate_pd_server: - pd_server - disk.device.read.bytes.rate - binding_pd_server_pd02_port: - - pd_server_pd02_port - - binding - network.outgoing.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes - network.outgoing.packets.rate_pd_server_pd02_port: - - pd_server_pd02_port - - network.outgoing.packets.rate + network.outpoing.packets_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.outpoing.packets + network.incoming.packets_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.packets disk.iops_pd_server: - pd_server - disk.iops @@ -278,78 +278,78 @@ topology_template: cpu.delta_pd_server: - pd_server - cpu.delta - network.incoming.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets.rate - network.outgoing.bytes_pd_server_pd02_port: - - pd_server_pd02_port - - network.outgoing.bytes - feature_pd_server_pd02_port: - - pd_server_pd02_port + feature_pd_server_pd02_port_0: + - pd_server_pd02_port_0 - feature - network.incoming.bytes.rate_pd_server_pd02_port: - - pd_server_pd02_port + network.incoming.packets.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.packets.rate + network.incoming.bytes.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 - network.incoming.bytes.rate - network.outgoing.bytes.rate_pd_server_pd02_port: - - pd_server_pd02_port - - network.outgoing.bytes.rate + network.outgoing.packets.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.packets.rate vcpus_pd_server: - pd_server - vcpus disk.device.write.bytes.rate_pd_server: - pd_server - disk.device.write.bytes.rate + attachment_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - attachment disk.device.write.requests_pd_server: - pd_server - disk.device.write.requests endpoint_pd_server: - pd_server - endpoint - attachment_pd_server_pd01_port: - - pd_server_pd01_port - - attachment - forwarder_pd_server_pd02_port: - - pd_server_pd02_port - - forwarder disk.capacity_pd_server: - pd_server - disk.capacity + forwarder_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - forwarder disk.device.allocation_pd_server: - pd_server - disk.device.allocation disk.allocation_pd_server: - pd_server - disk.allocation - network.incoming.packets_pd_server_pd02_port: - - pd_server_pd02_port - - network.incoming.packets binding_pd_server: - pd_server - binding disk.read.requests_pd_server: - pd_server - disk.read.requests + network.outgoing.bytes.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.bytes.rate feature_pd_server: - pd_server - feature disk.usage_pd_server: - pd_server - disk.usage - network.outpoing.packets_pd_server_pd02_port: - - pd_server_pd02_port - - network.outpoing.packets - binding_pd_server_pd01_port: - - pd_server_pd01_port - - binding + network.outgoing.bytes.rate_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.outgoing.bytes.rate disk.write.bytes_pd_server: - pd_server - disk.write.bytes - network.incoming.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes.rate - network.incoming.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets + network.outgoing.bytes_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.outgoing.bytes + network.outgoing.bytes_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.bytes + network.incoming.bytes_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.incoming.bytes + network.incoming.bytes_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.bytes disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -362,6 +362,12 @@ topology_template: disk.device.write.bytes_pd_server: - pd_server - disk.device.write.bytes + network.incoming.packets_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.incoming.packets + network.outpoing.packets_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outpoing.packets disk.device.read.requests_pd_server: - pd_server - disk.device.read.requests @@ -371,64 +377,58 @@ topology_template: host_pd_server: - pd_server - host - network.outpoing.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.outpoing.packets - attachment_pd_server_pd02_port: - - pd_server_pd02_port - - attachment - forwarder_pd_server_pd01_port: - - pd_server_pd01_port - - forwarder + network.incoming.packets.rate_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.incoming.packets.rate + network.incoming.bytes.rate_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.incoming.bytes.rate + feature_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - feature disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate disk.ephemeral.size_pd_server: - pd_server - disk.ephemeral.size + attachment_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - attachment disk.write.requests_pd_server: - pd_server - disk.write.requests - feature_pd_server_pd01_port: - - pd_server_pd01_port - - feature disk.device.latency_pd_server: - pd_server - disk.device.latency - network.incoming.packets.rate_pd_server_pd02_port: - - pd_server_pd02_port - - network.incoming.packets.rate disk.latency_pd_server: - pd_server - disk.latency disk.device.capacity_pd_server: - pd_server - disk.device.capacity - network.outgoing.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes.rate disk.device.iops_pd_server: - pd_server - disk.device.iops - network.incoming.bytes_pd_server_pd02_port: - - pd_server_pd02_port - - network.incoming.bytes + forwarder_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - forwarder requirements: local_storage_pd_server: - pd_server - local_storage - link_pd_server_pd02_port: - - pd_server_pd02_port - - link - link_pd_server_pd01_port: - - pd_server_pd01_port - - link - dependency_pd_server_pd01_port: - - pd_server_pd01_port - - dependency dependency_pd_server: - pd_server - dependency - dependency_pd_server_pd02_port: - - pd_server_pd02_port - - dependency \ No newline at end of file + link_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - link + dependency_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - dependency + dependency_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - dependency + link_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - link diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml index 76400dd289..f19d7cf6e8 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -18,18 +18,18 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_0_ip_requirements: + port_pd01_port_1_security_groups: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_1_security_groups: + type: json + port_pd01_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_0_network_role: type: string required: true @@ -76,22 +76,28 @@ node_types: type: string required: true status: SUPPORTED + port_pd01_port_1_network: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string port_pd01_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_pd01_port_1_network: + compute_pd_server_user_data_format: type: list required: true status: SUPPORTED entry_schema: type: string - compute_pd_server_user_data_format: + port_pd01_port_1_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string + type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_0_network_role_tag: type: string required: true @@ -102,12 +108,6 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd01_port_1_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements index_value: type: integer description: Index value of this substitution service template runtime instance 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 3529fedc3a..646e15fffc 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 @@ -157,14 +157,14 @@ topology_template: is_required: false port_pd01_port_0_network: - get_input: oam_net_name + port_pd01_port_1_security_groups: + - - jsa_security_group port_pd01_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_1_security_groups: - - - jsa_security_group compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: @@ -182,13 +182,13 @@ topology_template: - get_input: oam_net_name compute_pd_server_user_data_format: - RAW - port_pd01_port_0_network_role_tag: oam port_pd01_port_1_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false + port_pd01_port_0_network_role_tag: oam port_pd01_port_1_mac_requirements: mac_count_required: is_required: false @@ -213,4 +213,4 @@ topology_template: members: - resources_with_dependOn - jsa_security_group - - 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/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml index a67096d3d6..cd07a7447d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml @@ -19,16 +19,16 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_0_ip_requirements: + port_pd01_port_1_security_groups: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_1_security_groups: + type: json + port_pd01_port_0_ip_requirements: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_0_network_role: type: string required: true @@ -65,19 +65,24 @@ topology_template: port_pd01_port_1_network_role_tag: type: string required: true - port_pd01_port_0_subnetpoolid: - type: string - required: true port_pd01_port_1_network: type: list required: true entry_schema: type: string + port_pd01_port_0_subnetpoolid: + type: string + required: true compute_pd_server_user_data_format: type: list required: true entry_schema: type: string + port_pd01_port_1_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_0_network_role_tag: type: string required: true @@ -86,11 +91,6 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd01_port_1_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements index_value: type: integer description: Index value of this substitution service template runtime instance diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/in/hot-mog-0108-bs1271.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/in/hot-mog-0108-bs1271.yml index ec4bb05ba4..fa07863c2f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/in/hot-mog-0108-bs1271.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/in/hot-mog-0108-bs1271.yml @@ -55,8 +55,8 @@ resources: flavor: {get_param: pd_flavor_name} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: pd01_port_0} - - port: {get_resource: pd01_port_1} + - port: {get_resource: pd_server_0_oam_port_0} + - port: {get_resource: pd_server_1_oam_port_0} user_data_format: RAW packet_mirror_network: type: OS::Neutron::Net @@ -68,12 +68,12 @@ resources: properties: name: get_param: packet_internal_network_name - pd01_port_0: + pd_server_0_oam_port_0: type: OS::Neutron::Port properties: network: { get_resource: packet_mirror_network } replacement_policy: AUTO - pd01_port_1: + pd_server_1_oam_port_0: type: OS::Neutron::Port properties: network: { get_resource: packet_internal_network } diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml index dae69366c8..ab0d206d17 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,24 +8,8 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_pd01_port_0_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_pd01_port_0_network: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_pd01_port_0_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_0_network_role: - type: string + port_pd_server_0_oam_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED compute_pd_server_availability_zone: @@ -40,7 +24,7 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_0_replacement_policy: + port_pd_server_0_oam_port_0_replacement_policy: type: list required: true status: SUPPORTED @@ -50,58 +34,66 @@ node_types: type: string required: true status: SUPPORTED - port_pd01_port_1_network_role: - type: string + port_pd_server_1_oam_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_pd01_port_0_order: - type: integer + vm_image_name: + type: string required: true status: SUPPORTED - port_pd01_port_1_subnetpoolid: + port_pd_server_0_oam_port_0_network_role_tag: type: string required: true status: SUPPORTED - vm_image_name: - type: string + port_pd_server_0_oam_port_0_related_networks: + type: list required: true status: SUPPORTED - port_pd01_port_1_network_role_tag: + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd_server_1_oam_port_0_order: + type: integer + required: true + status: SUPPORTED + port_pd_server_0_oam_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_pd01_port_0_subnetpoolid: + port_pd_server_1_oam_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_pd01_port_1_network: + compute_pd_server_user_data_format: type: list required: true status: SUPPORTED entry_schema: type: string - compute_pd_server_user_data_format: + port_pd_server_0_oam_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd01_port_0_network_role_tag: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_0_oam_port_0_network_role: type: string required: true status: SUPPORTED - port_pd01_port_0_related_networks: - type: list + port_pd_server_1_oam_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd01_port_1_ip_requirements: + port_pd_server_0_oam_port_0_order: + type: integer + required: true + status: SUPPORTED + port_pd_server_1_oam_port_0_replacement_policy: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: string index_value: type: integer description: Index value of this substitution service template runtime instance @@ -110,46 +102,54 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_pd01_port_1_order: - type: integer + port_pd_server_1_oam_port_0_network_role_tag: + type: string required: true status: SUPPORTED - port_pd01_port_1_related_networks: + port_pd_server_1_oam_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd01_port_0_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_1_oam_port_0_vlan_requirements: + type: list required: true status: SUPPORTED - port_pd01_port_1_vlan_requirements: + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_0_oam_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd01_port_1_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + type: org.openecomp.datatypes.network.IpRequirements + port_pd_server_1_oam_port_0_network_role: + type: string required: true status: SUPPORTED - port_pd01_port_1_replacement_policy: + port_pd_server_1_oam_port_0_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd01_port_1_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_0_oam_port_0_network: + type: list required: true status: SUPPORTED - port_pd01_port_0_vlan_requirements: + entry_schema: + type: string + port_pd_server_1_oam_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.IpRequirements + port_pd_server_0_oam_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED requirements: - dependency_pd_server: capability: tosca.capabilities.Node @@ -165,41 +165,33 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pd01_port_1: + - dependency_pd_server_pd_server_1_oam_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd01_port_1: + - link_pd_server_pd_server_1_oam_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_pd_server_pd01_port_0: + - dependency_pd_server_pd_server_0_oam_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd01_port_0: + - link_pd_server_pd_server_0_oam_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: - binding_pd_server_pd01_port_0: - 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 scalable_pd_server: type: tosca.capabilities.Scalable occurrences: @@ -211,133 +203,114 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_pd01_port_1: - 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 - memory.usage_pd_server: + network.outgoing.bytes_pd_server_pd_server_1_oam_port_0: 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_pd_server: + memory.usage_pd_server: 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_pd_server: + memory_pd_server: 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_pd_server: - type: tosca.capabilities.OperatingSystem - occurrences: - - 1 - - UNBOUNDED - disk.write.bytes.rate_pd_server: + disk.device.usage_pd_server: 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_pd_server: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_pd_server_pd_server_0_oam_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - cpu_util_pd_server: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + os_pd_server: + type: tosca.capabilities.OperatingSystem occurrences: - 1 - UNBOUNDED - disk.device.write.requests.rate_pd_server: + disk.write.bytes.rate_pd_server: 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_pd_server: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_pd_server_pd_server_0_oam_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.device.read.bytes.rate_pd_server: + network.incoming.bytes_pd_server_pd_server_1_oam_port_0: 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_pd_server_pd01_port_0: + cpu_pd_server: 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.iops_pd_server: + cpu_util_pd_server: 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_pd_server_pd01_port_1: + disk.device.write.requests.rate_pd_server: 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_pd_server_pd01_port_1: + disk.read.bytes_pd_server: 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_pd_server: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_pd_server_pd_server_1_oam_port_0: + 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: - - 1 + - 0 - UNBOUNDED - cpu.delta_pd_server: + disk.device.read.bytes.rate_pd_server: 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_pd_server_pd01_port_0: + network.outgoing.packets.rate_pd_server_pd_server_0_oam_port_0: 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_pd_server_pd01_port_0: + disk.iops_pd_server: 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 - attachment_pd_server_pd01_port_1: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - network.outgoing.packets.rate_pd_server_pd01_port_1: + memory.resident_pd_server: 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.packets.rate_pd_server_pd01_port_0: + cpu.delta_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -355,11 +328,6 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pd01_port_0: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED disk.device.write.requests_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -371,23 +339,24 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.capacity_pd_server: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_pd_server_pd_server_1_oam_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - forwarder_pd_server_pd01_port_0: - type: org.openecomp.capabilities.Forwarder + disk.capacity_pd_server: + 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_pd_server_pd01_port_1: - type: org.openecomp.capabilities.Forwarder + network.incoming.bytes_pd_server_pd_server_0_oam_port_0: + 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_pd_server_pd01_port_1: + network.outgoing.bytes.rate_pd_server_pd_server_0_oam_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -416,17 +385,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pd01_port_1: - 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_pd_server_pd01_port_0: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_pd_server_pd_server_0_oam_port_0: + 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: - - 1 + - 0 - UNBOUNDED feature_pd_server: type: tosca.capabilities.Node @@ -439,7 +404,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd01_port_1: + network.outgoing.bytes.rate_pd_server_pd_server_1_oam_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -451,21 +416,20 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd01_port_0: + network.incoming.packets_pd_server_pd_server_0_oam_port_0: 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_pd_server_pd01_port_1: + network.outgoing.bytes_pd_server_pd_server_0_oam_port_0: 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_pd_server_pd01_port_0: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_pd_server_pd_server_0_oam_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED @@ -487,19 +451,24 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.write.bytes_pd_server: + feature_pd_server_pd_server_1_oam_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes.rate_pd_server_pd_server_1_oam_port_0: 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_pd_server_pd01_port_0: + disk.device.write.bytes_pd_server: 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_pd_server_pd01_port_1: + network.incoming.packets_pd_server_pd_server_1_oam_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -524,13 +493,20 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_pd01_port_1: - type: tosca.capabilities.Node + attachment_pd_server_pd_server_1_oam_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - feature_pd_server_pd01_port_0: - type: tosca.capabilities.Node + network.incoming.packets.rate_pd_server_pd_server_1_oam_port_0: + 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_pd_server_pd_server_1_oam_port_0: + 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 @@ -546,12 +522,30 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.packets.rate_pd_server_pd_server_1_oam_port_0: + 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_pd_server_pd_server_0_oam_port_0: + 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_pd_server: 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_pd_server_pd_server_0_oam_port_0: + 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_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -575,4 +569,10 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - - UNBOUNDED \ No newline at end of file + - UNBOUNDED + network.outpoing.packets_pd_server_pd_server_0_oam_port_0: + 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 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 3f3e490da9..3fe0da473a 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 @@ -183,44 +183,44 @@ topology_template: directives: - substitutable properties: - port_pd01_port_0_mac_requirements: - mac_count_required: - is_required: false - port_pd01_port_0_network: - - packet_mirror_network - port_pd01_port_0_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: - get_input: - pd_server_names - 0 - port_pd01_port_0_replacement_policy: + port_pd_server_0_oam_port_0_replacement_policy: - AUTO vm_flavor_name: get_input: pd_flavor_name + port_pd_server_1_oam_port_0_mac_requirements: + mac_count_required: + is_required: false vm_image_name: get_input: pd_image_name - port_pd01_port_1_network: - - packet_internal_network compute_pd_server_user_data_format: - RAW - port_pd01_port_1_ip_requirements: + port_pd_server_1_oam_port_0_replacement_policy: + - AUTO + port_pd_server_0_oam_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_pd_server_1_oam_port_0_network: + - packet_internal_network + port_pd_server_0_oam_port_0_network: + - packet_mirror_network + port_pd_server_1_oam_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_1_mac_requirements: + port_pd_server_0_oam_port_0_mac_requirements: mac_count_required: is_required: false - port_pd01_port_1_replacement_policy: - - AUTO service_template_filter: substitute_service_template: Nested_pd_serverServiceTemplate.yaml count: 1 @@ -234,11 +234,11 @@ topology_template: capability: tosca.capabilities.Node node: packet_mirror_network relationship: tosca.relationships.DependsOn - - link_pd_server_pd01_port_0: + - link_pd_server_pd_server_0_oam_port_0: capability: tosca.capabilities.network.Linkable node: packet_mirror_network relationship: tosca.relationships.network.LinksTo - - link_pd_server_pd01_port_1: + - link_pd_server_pd_server_1_oam_port_0: capability: tosca.capabilities.network.Linkable node: packet_internal_network relationship: tosca.relationships.network.LinksTo diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml index c2e283a51c..6dae9d7082 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml @@ -11,21 +11,8 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_pd01_port_0_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_pd01_port_0_network: - type: list - required: true - entry_schema: - type: string - port_pd01_port_0_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_0_network_role: - type: string + port_pd_server_0_oam_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true compute_pd_server_availability_zone: type: list @@ -37,7 +24,7 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_0_replacement_policy: + port_pd_server_0_oam_port_0_replacement_policy: type: list required: true entry_schema: @@ -45,47 +32,53 @@ topology_template: vm_flavor_name: type: string required: true - port_pd01_port_1_network_role: - type: string - required: true - port_pd01_port_0_order: - type: integer + port_pd_server_1_oam_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_pd01_port_1_subnetpoolid: + vm_image_name: type: string required: true - vm_image_name: + port_pd_server_0_oam_port_0_network_role_tag: type: string required: true - port_pd01_port_1_network_role_tag: + port_pd_server_0_oam_port_0_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd_server_1_oam_port_0_order: + type: integer + required: true + port_pd_server_0_oam_port_0_subnetpoolid: type: string required: true - port_pd01_port_0_subnetpoolid: + port_pd_server_1_oam_port_0_subnetpoolid: type: string required: true - port_pd01_port_1_network: + compute_pd_server_user_data_format: type: list required: true entry_schema: type: string - compute_pd_server_user_data_format: + port_pd_server_0_oam_port_0_vlan_requirements: type: list required: true entry_schema: - type: string - port_pd01_port_0_network_role_tag: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_0_oam_port_0_network_role: type: string required: true - port_pd01_port_0_related_networks: - type: list + port_pd_server_1_oam_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd01_port_1_ip_requirements: + port_pd_server_0_oam_port_0_order: + type: integer + required: true + port_pd_server_1_oam_port_0_replacement_policy: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: string index_value: type: integer description: Index value of this substitution service template runtime instance @@ -93,38 +86,45 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_pd01_port_1_order: - type: integer + port_pd_server_1_oam_port_0_network_role_tag: + type: string required: true - port_pd01_port_1_related_networks: + port_pd_server_1_oam_port_0_related_networks: type: list required: true entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd01_port_0_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_pd01_port_1_vlan_requirements: + port_pd_server_1_oam_port_0_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_pd01_port_1_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pd_server_0_oam_port_0_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd_server_1_oam_port_0_network_role: + type: string required: true - port_pd01_port_1_replacement_policy: + port_pd_server_1_oam_port_0_network: type: list required: true entry_schema: type: string - port_pd01_port_1_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_0_oam_port_0_network: + type: list required: true - port_pd01_port_0_vlan_requirements: + entry_schema: + type: string + port_pd_server_1_oam_port_0_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.IpRequirements + port_pd_server_0_oam_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true node_templates: pd_server: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server @@ -145,70 +145,70 @@ topology_template: get_input: - compute_pd_server_user_data_format - index_value - pd_server_pd01_port_1: + pd_server_pd_server_1_oam_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_pd01_port_1_replacement_policy + - port_pd_server_1_oam_port_0_replacement_policy - index_value mac_requirements: - get_input: port_pd01_port_1_mac_requirements + get_input: port_pd_server_1_oam_port_0_mac_requirements order: - get_input: port_pd01_port_1_order + get_input: port_pd_server_1_oam_port_0_order exCP_naming: - get_input: port_pd01_port_1_exCP_naming + get_input: port_pd_server_1_oam_port_0_exCP_naming vlan_requirements: - get_input: port_pd01_port_1_vlan_requirements + get_input: port_pd_server_1_oam_port_0_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_pd01_port_1_ip_requirements + get_input: port_pd_server_1_oam_port_0_ip_requirements related_networks: - get_input: port_pd01_port_1_related_networks + get_input: port_pd_server_1_oam_port_0_related_networks network_role_tag: - get_input: port_pd01_port_1_network_role_tag + get_input: port_pd_server_1_oam_port_0_network_role_tag network_role: - get_input: port_pd01_port_1_network_role + get_input: port_pd_server_1_oam_port_0_network_role subnetpoolid: - get_input: port_pd01_port_1_subnetpoolid + get_input: port_pd_server_1_oam_port_0_subnetpoolid network: get_input: - - port_pd01_port_1_network + - port_pd_server_1_oam_port_0_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: pd_server relationship: tosca.relationships.network.BindsTo - pd_server_pd01_port_0: + pd_server_pd_server_0_oam_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_pd01_port_0_replacement_policy + - port_pd_server_0_oam_port_0_replacement_policy - index_value mac_requirements: - get_input: port_pd01_port_0_mac_requirements + get_input: port_pd_server_0_oam_port_0_mac_requirements order: - get_input: port_pd01_port_0_order + get_input: port_pd_server_0_oam_port_0_order exCP_naming: - get_input: port_pd01_port_0_exCP_naming + get_input: port_pd_server_0_oam_port_0_exCP_naming vlan_requirements: - get_input: port_pd01_port_0_vlan_requirements + get_input: port_pd_server_0_oam_port_0_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_pd01_port_0_ip_requirements + get_input: port_pd_server_0_oam_port_0_ip_requirements related_networks: - get_input: port_pd01_port_0_related_networks + get_input: port_pd_server_0_oam_port_0_related_networks network_role_tag: - get_input: port_pd01_port_0_network_role_tag + get_input: port_pd_server_0_oam_port_0_network_role_tag network_role: - get_input: port_pd01_port_0_network_role + get_input: port_pd_server_0_oam_port_0_network_role subnetpoolid: - get_input: port_pd01_port_0_subnetpoolid + get_input: port_pd_server_0_oam_port_0_subnetpoolid network: get_input: - - port_pd01_port_0_network + - port_pd_server_0_oam_port_0_network - index_value requirements: - binding: @@ -218,18 +218,15 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server capabilities: - binding_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - binding scalable_pd_server: - pd_server - scalable disk.read.bytes.rate_pd_server: - pd_server - disk.read.bytes.rate - binding_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - binding + network.outgoing.bytes_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 + - network.outgoing.bytes memory.usage_pd_server: - pd_server - memory.usage @@ -239,12 +236,21 @@ topology_template: disk.device.usage_pd_server: - pd_server - disk.device.usage + forwarder_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - forwarder os_pd_server: - pd_server - os disk.write.bytes.rate_pd_server: - pd_server - disk.write.bytes.rate + feature_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - feature + network.incoming.bytes_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 + - network.incoming.bytes cpu_pd_server: - pd_server - cpu @@ -257,69 +263,48 @@ topology_template: disk.read.bytes_pd_server: - pd_server - disk.read.bytes + binding_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 + - binding disk.device.read.bytes.rate_pd_server: - pd_server - disk.device.read.bytes.rate - network.incoming.packets_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - network.incoming.packets + network.outgoing.packets.rate_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - network.outgoing.packets.rate disk.iops_pd_server: - pd_server - disk.iops - network.incoming.packets.rate_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - network.incoming.packets.rate - network.incoming.bytes.rate_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - network.incoming.bytes.rate memory.resident_pd_server: - pd_server - memory.resident cpu.delta_pd_server: - pd_server - cpu.delta - network.incoming.packets.rate_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - network.incoming.packets.rate - network.incoming.bytes.rate_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - network.incoming.bytes.rate - attachment_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - attachment - network.outgoing.packets.rate_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - network.outgoing.packets.rate - network.outgoing.packets.rate_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - network.outgoing.packets.rate vcpus_pd_server: - pd_server - vcpus disk.device.write.bytes.rate_pd_server: - pd_server - disk.device.write.bytes.rate - attachment_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - attachment disk.device.write.requests_pd_server: - pd_server - disk.device.write.requests endpoint_pd_server: - pd_server - endpoint + forwarder_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 + - forwarder disk.capacity_pd_server: - pd_server - disk.capacity - forwarder_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - forwarder - forwarder_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - forwarder - network.incoming.packets_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - network.incoming.packets + network.incoming.bytes_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - network.incoming.bytes + network.outgoing.bytes.rate_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - network.outgoing.bytes.rate disk.device.allocation_pd_server: - pd_server - disk.device.allocation @@ -332,33 +317,30 @@ topology_template: disk.read.requests_pd_server: - pd_server - disk.read.requests - network.outgoing.bytes.rate_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - network.outgoing.bytes.rate - network.outgoing.bytes.rate_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - network.outgoing.bytes.rate + binding_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - binding feature_pd_server: - pd_server - feature disk.usage_pd_server: - pd_server - disk.usage - network.incoming.bytes_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - network.incoming.bytes + network.outgoing.bytes.rate_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 + - network.outgoing.bytes.rate disk.write.bytes_pd_server: - pd_server - disk.write.bytes - network.outgoing.bytes_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - network.outgoing.bytes - network.outgoing.bytes_pd_server_pd01_port_1: - - pd_server_pd01_port_1 + network.incoming.packets_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - network.incoming.packets + network.outgoing.bytes_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 - network.outgoing.bytes - network.incoming.bytes_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - network.incoming.bytes + attachment_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - attachment disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -368,15 +350,18 @@ topology_template: disk.device.read.bytes_pd_server: - pd_server - disk.device.read.bytes + feature_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 + - feature + network.incoming.bytes.rate_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 + - network.incoming.bytes.rate disk.device.write.bytes_pd_server: - pd_server - disk.device.write.bytes - network.outpoing.packets_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - network.outpoing.packets - network.outpoing.packets_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - network.outpoing.packets + network.incoming.packets_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 + - network.incoming.packets disk.device.read.requests_pd_server: - pd_server - disk.device.read.requests @@ -386,21 +371,33 @@ topology_template: host_pd_server: - pd_server - host - feature_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - feature - feature_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - feature + attachment_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 + - attachment + network.incoming.packets.rate_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 + - network.incoming.packets.rate + network.outpoing.packets_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 + - network.outpoing.packets disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate disk.ephemeral.size_pd_server: - pd_server - disk.ephemeral.size + network.outgoing.packets.rate_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 + - network.outgoing.packets.rate + network.incoming.bytes.rate_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - network.incoming.bytes.rate disk.write.requests_pd_server: - pd_server - disk.write.requests + network.incoming.packets.rate_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - network.incoming.packets.rate disk.device.latency_pd_server: - pd_server - disk.device.latency @@ -413,22 +410,25 @@ topology_template: disk.device.iops_pd_server: - pd_server - disk.device.iops + network.outpoing.packets_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - network.outpoing.packets requirements: local_storage_pd_server: - pd_server - local_storage - dependency_pd_server_pd01_port_1: - - pd_server_pd01_port_1 + link_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - link + dependency_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 - dependency dependency_pd_server: - pd_server - dependency - dependency_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - dependency - link_pd_server_pd01_port_0: - - pd_server_pd01_port_0 + link_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 - link - link_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - link \ No newline at end of file + dependency_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/GlobalSubstitutionTypesServiceTemplate.yaml index dff3ddaa23..296881d7c1 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,6 +8,26 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_pd01_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_pd01_port_0_network: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_pd01_port_0_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role: + type: string + required: true + status: SUPPORTED compute_pd_server_availability_zone: type: list required: true @@ -24,41 +44,45 @@ node_types: type: string required: true status: SUPPORTED - port_pd02_port_network_role_tag: - type: string + port_pd02_port_0_network: + type: list required: true status: SUPPORTED - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + entry_schema: + type: string + port_pd01_port_0_order: + type: integer required: true status: SUPPORTED vm_image_name: type: string required: true status: SUPPORTED - port_pd01_port_ip_requirements: - type: list + port_pd02_port_0_network_role_tag: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd02_port_network_role: + port_pd01_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_pd01_port_vlan_requirements: + compute_pd_server_user_data_format: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - compute_pd_server_user_data_format: + type: string + port_pd02_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd02_port_related_networks: + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role_tag: + type: string + required: true + status: SUPPORTED + port_pd01_port_0_related_networks: type: list required: true status: SUPPORTED @@ -72,72 +96,48 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_pd02_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_pd01_port_exCP_naming: + port_pd02_port_0_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_pd01_port_related_networks: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd02_port_order: - type: integer + port_pd01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_pd02_port_subnetpoolid: + port_pd02_port_0_network_role: type: string required: true status: SUPPORTED - port_pd02_port_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd01_port_network: - type: list + port_pd02_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: string - port_pd01_port_order: + port_pd02_port_0_order: type: integer required: true status: SUPPORTED - port_pd01_port_subnetpoolid: - type: string - required: true - status: SUPPORTED - port_pd02_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd02_port_0_related_networks: + type: list required: true status: SUPPORTED - port_pd01_port_network_role: + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd02_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_pd02_port_ip_requirements: + port_pd02_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network_role_tag: - type: string - required: true - status: SUPPORTED - port_pd02_port_network: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string + type: org.openecomp.datatypes.network.VlanRequirements requirements: - dependency_pd_server: capability: tosca.capabilities.Node @@ -153,33 +153,49 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pd01_port: + - dependency_pd_server_pd02_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd01_port: + - link_pd_server_pd02_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_pd_server_pd02_port: + - dependency_pd_server_pd01_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd02_port: + - link_pd_server_pd01_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: + binding_pd_server_pd02_port_0: + 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 + binding_pd_server_pd01_port_0: + 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 scalable_pd_server: type: tosca.capabilities.Scalable occurrences: @@ -209,12 +225,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pd01_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 os_pd_server: type: tosca.capabilities.OperatingSystem occurrences: @@ -226,7 +236,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd01_port: + network.outgoing.packets.rate_pd_server_pd02_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -262,21 +272,13 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_pd02_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 - network.outgoing.bytes_pd_server_pd01_port: + network.outpoing.packets_pd_server_pd02_port_0: 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.packets.rate_pd_server_pd02_port: + network.incoming.packets_pd_server_pd01_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -300,30 +302,24 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pd01_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_pd_server_pd02_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd02_port: + network.incoming.packets.rate_pd_server_pd01_port_0: 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_pd_server_pd02_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - network.incoming.bytes.rate_pd_server_pd02_port: + network.incoming.bytes.rate_pd_server_pd01_port_0: 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_pd_server_pd02_port: + network.outgoing.packets.rate_pd_server_pd01_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -341,6 +337,11 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_pd_server_pd01_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED disk.device.write.requests_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -352,35 +353,24 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pd01_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - forwarder_pd_server_pd02_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED disk.capacity_pd_server: 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_pd_server: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_pd_server_pd01_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - disk.allocation_pd_server: + disk.device.allocation_pd_server: 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_pd_server_pd02_port: + disk.allocation_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -397,6 +387,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes.rate_pd_server_pd01_port_0: + 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_pd_server: type: tosca.capabilities.Node occurrences: @@ -408,33 +404,37 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pd02_port: + network.outgoing.bytes.rate_pd_server_pd02_port_0: 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_pd_server_pd01_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 + disk.write.bytes_pd_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - - 0 + - 1 - UNBOUNDED - disk.write.bytes_pd_server: + network.outgoing.bytes_pd_server_pd02_port_0: 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_pd_server_pd01_port: + network.outgoing.bytes_pd_server_pd01_port_0: 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_pd_server_pd01_port: + network.incoming.bytes_pd_server_pd02_port_0: + 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_pd_server_pd01_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -464,6 +464,18 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets_pd_server_pd02_port_0: + 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_pd_server_pd01_port_0: + 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_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -483,19 +495,20 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pd01_port: + network.incoming.packets.rate_pd_server_pd02_port_0: 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 - attachment_pd_server_pd02_port: - type: tosca.capabilities.Attachment + network.incoming.bytes.rate_pd_server_pd02_port_0: + 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_pd_server_pd01_port: - type: org.openecomp.capabilities.Forwarder + feature_pd_server_pd01_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -511,24 +524,18 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.write.requests_pd_server: - 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_pd_server_pd01_port: - type: tosca.capabilities.Node + attachment_pd_server_pd02_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - disk.device.latency_pd_server: + disk.write.requests_pd_server: 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_pd_server_pd02_port: + disk.device.latency_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -546,21 +553,14 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pd01_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.device.iops_pd_server: 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_pd_server_pd02_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_pd_server_pd02_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED @@ -1183,4 +1183,4 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - - UNBOUNDED \ No newline at end of file + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/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 e615ef760e..e79660adfa 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 @@ -863,6 +863,17 @@ topology_template: directives: - substitutable properties: + port_pd01_port_0_mac_requirements: + mac_count_required: + is_required: false + port_pd01_port_0_network: + - get_input: oam_net_name + port_pd01_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: @@ -871,34 +882,23 @@ topology_template: - 0 vm_flavor_name: get_input: pd_flavor_name - port_pd02_port_network_role_tag: oam - port_pd01_port_mac_requirements: - mac_count_required: - is_required: false + port_pd02_port_0_network: + - get_input: oam_net_name vm_image_name: get_input: pd_image_name - port_pd01_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false + port_pd02_port_0_network_role_tag: oam compute_pd_server_user_data_format: - RAW - port_pd02_port_mac_requirements: - mac_count_required: - is_required: false - port_pd01_port_network: - - get_input: oam_net_name - port_pd02_port_ip_requirements: + port_pd02_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_network_role_tag: oam - port_pd02_port_network: - - get_input: oam_net_name + port_pd01_port_0_network_role_tag: oam + port_pd02_port_0_mac_requirements: + mac_count_required: + is_required: false service_template_filter: substitute_service_template: Nested_pd_serverServiceTemplate.yaml count: 1 @@ -915,4 +915,4 @@ topology_template: description: heat template that creates MOG stack members: - server_pcm_003 - - abstract_pd_server \ No newline at end of file + - 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/computewithtwodiffporttypesandnested/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/Nested_pd_serverServiceTemplate.yaml index e894e5c65f..4eb94fbdaa 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/Nested_pd_serverServiceTemplate.yaml @@ -11,6 +11,22 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pd01_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_pd01_port_0_network: + type: list + required: true + entry_schema: + type: string + port_pd01_port_0_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role: + type: string + required: true compute_pd_server_availability_zone: type: list required: true @@ -24,34 +40,37 @@ topology_template: vm_flavor_name: type: string required: true - port_pd02_port_network_role_tag: - type: string + port_pd02_port_0_network: + type: list required: true - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + entry_schema: + type: string + port_pd01_port_0_order: + type: integer required: true vm_image_name: type: string required: true - port_pd01_port_ip_requirements: - type: list + port_pd02_port_0_network_role_tag: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd02_port_network_role: + port_pd01_port_0_subnetpoolid: type: string required: true - port_pd01_port_vlan_requirements: + compute_pd_server_user_data_format: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - compute_pd_server_user_data_format: + type: string + port_pd02_port_0_ip_requirements: type: list required: true entry_schema: - type: string - port_pd02_port_related_networks: + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role_tag: + type: string + required: true + port_pd01_port_0_related_networks: type: list required: true entry_schema: @@ -63,58 +82,39 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_pd02_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_pd01_port_exCP_naming: + port_pd02_port_0_exCP_naming: type: org.openecomp.datatypes.Naming required: true - port_pd01_port_related_networks: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd02_port_order: - type: integer + port_pd01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - port_pd02_port_subnetpoolid: + port_pd02_port_0_network_role: type: string required: true - port_pd02_port_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd01_port_network: - type: list + port_pd02_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: string - port_pd01_port_order: + port_pd02_port_0_order: type: integer required: true - port_pd01_port_subnetpoolid: - type: string - required: true - port_pd02_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd02_port_0_related_networks: + type: list required: true - port_pd01_port_network_role: + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd02_port_0_subnetpoolid: type: string required: true - port_pd02_port_ip_requirements: + port_pd02_port_0_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network_role_tag: - type: string - required: true - port_pd02_port_network: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_0_vlan_requirements: type: list required: true entry_schema: - type: string + type: org.openecomp.datatypes.network.VlanRequirements node_templates: pd_server: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server @@ -135,62 +135,62 @@ topology_template: get_input: - compute_pd_server_user_data_format - index_value - pd_server_pd01_port: + pd_server_pd02_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd01_port_exCP_naming + get_input: port_pd02_port_0_exCP_naming vlan_requirements: - get_input: port_pd01_port_vlan_requirements + get_input: port_pd02_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_pd01_port_related_networks + get_input: port_pd02_port_0_related_networks ip_requirements: - get_input: port_pd01_port_ip_requirements + get_input: port_pd02_port_0_ip_requirements network_role_tag: - get_input: port_pd01_port_network_role_tag + get_input: port_pd02_port_0_network_role_tag mac_requirements: - get_input: port_pd01_port_mac_requirements + get_input: port_pd02_port_0_mac_requirements order: - get_input: port_pd01_port_order + get_input: port_pd02_port_0_order network_role: - get_input: port_pd01_port_network_role + get_input: port_pd02_port_0_network_role subnetpoolid: - get_input: port_pd01_port_subnetpoolid + get_input: port_pd02_port_0_subnetpoolid network: get_input: - - port_pd01_port_network + - port_pd02_port_0_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: pd_server relationship: tosca.relationships.network.BindsTo - pd_server_pd02_port: + pd_server_pd01_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd02_port_exCP_naming + get_input: port_pd01_port_0_exCP_naming vlan_requirements: - get_input: port_pd02_port_vlan_requirements + get_input: port_pd01_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_pd02_port_related_networks + get_input: port_pd01_port_0_related_networks ip_requirements: - get_input: port_pd02_port_ip_requirements + get_input: port_pd01_port_0_ip_requirements network_role_tag: - get_input: port_pd02_port_network_role_tag + get_input: port_pd01_port_0_network_role_tag mac_requirements: - get_input: port_pd02_port_mac_requirements + get_input: port_pd01_port_0_mac_requirements order: - get_input: port_pd02_port_order + get_input: port_pd01_port_0_order network_role: - get_input: port_pd02_port_network_role + get_input: port_pd01_port_0_network_role subnetpoolid: - get_input: port_pd02_port_subnetpoolid + get_input: port_pd01_port_0_subnetpoolid network: get_input: - - port_pd02_port_network + - port_pd01_port_0_network - index_value requirements: - binding: @@ -200,6 +200,12 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server capabilities: + binding_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - binding + binding_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - binding scalable_pd_server: - pd_server - scalable @@ -215,18 +221,15 @@ topology_template: disk.device.usage_pd_server: - pd_server - disk.device.usage - network.outgoing.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.packets.rate os_pd_server: - pd_server - os disk.write.bytes.rate_pd_server: - pd_server - disk.write.bytes.rate - network.incoming.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes + network.outgoing.packets.rate_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.outgoing.packets.rate cpu_pd_server: - pd_server - cpu @@ -242,15 +245,12 @@ topology_template: disk.device.read.bytes.rate_pd_server: - pd_server - disk.device.read.bytes.rate - binding_pd_server_pd02_port: - - pd_server_pd02_port - - binding - network.outgoing.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes - network.outgoing.packets.rate_pd_server_pd02_port: - - pd_server_pd02_port - - network.outgoing.packets.rate + network.outpoing.packets_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.outpoing.packets + network.incoming.packets_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.packets disk.iops_pd_server: - pd_server - disk.iops @@ -260,78 +260,78 @@ topology_template: cpu.delta_pd_server: - pd_server - cpu.delta - network.incoming.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets.rate - network.outgoing.bytes_pd_server_pd02_port: - - pd_server_pd02_port - - network.outgoing.bytes - feature_pd_server_pd02_port: - - pd_server_pd02_port + feature_pd_server_pd02_port_0: + - pd_server_pd02_port_0 - feature - network.incoming.bytes.rate_pd_server_pd02_port: - - pd_server_pd02_port + network.incoming.packets.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.packets.rate + network.incoming.bytes.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 - network.incoming.bytes.rate - network.outgoing.bytes.rate_pd_server_pd02_port: - - pd_server_pd02_port - - network.outgoing.bytes.rate + network.outgoing.packets.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.packets.rate vcpus_pd_server: - pd_server - vcpus disk.device.write.bytes.rate_pd_server: - pd_server - disk.device.write.bytes.rate + attachment_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - attachment disk.device.write.requests_pd_server: - pd_server - disk.device.write.requests endpoint_pd_server: - pd_server - endpoint - attachment_pd_server_pd01_port: - - pd_server_pd01_port - - attachment - forwarder_pd_server_pd02_port: - - pd_server_pd02_port - - forwarder disk.capacity_pd_server: - pd_server - disk.capacity + forwarder_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - forwarder disk.device.allocation_pd_server: - pd_server - disk.device.allocation disk.allocation_pd_server: - pd_server - disk.allocation - network.incoming.packets_pd_server_pd02_port: - - pd_server_pd02_port - - network.incoming.packets binding_pd_server: - pd_server - binding disk.read.requests_pd_server: - pd_server - disk.read.requests + network.outgoing.bytes.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.bytes.rate feature_pd_server: - pd_server - feature disk.usage_pd_server: - pd_server - disk.usage - network.outpoing.packets_pd_server_pd02_port: - - pd_server_pd02_port - - network.outpoing.packets - binding_pd_server_pd01_port: - - pd_server_pd01_port - - binding + network.outgoing.bytes.rate_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.outgoing.bytes.rate disk.write.bytes_pd_server: - pd_server - disk.write.bytes - network.incoming.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes.rate - network.incoming.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets + network.outgoing.bytes_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.outgoing.bytes + network.outgoing.bytes_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.bytes + network.incoming.bytes_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.incoming.bytes + network.incoming.bytes_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.bytes disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -344,6 +344,12 @@ topology_template: disk.device.write.bytes_pd_server: - pd_server - disk.device.write.bytes + network.incoming.packets_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.incoming.packets + network.outpoing.packets_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outpoing.packets disk.device.read.requests_pd_server: - pd_server - disk.device.read.requests @@ -353,64 +359,58 @@ topology_template: host_pd_server: - pd_server - host - network.outpoing.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.outpoing.packets - attachment_pd_server_pd02_port: - - pd_server_pd02_port - - attachment - forwarder_pd_server_pd01_port: - - pd_server_pd01_port - - forwarder + network.incoming.packets.rate_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.incoming.packets.rate + network.incoming.bytes.rate_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.incoming.bytes.rate + feature_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - feature disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate disk.ephemeral.size_pd_server: - pd_server - disk.ephemeral.size + attachment_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - attachment disk.write.requests_pd_server: - pd_server - disk.write.requests - feature_pd_server_pd01_port: - - pd_server_pd01_port - - feature disk.device.latency_pd_server: - pd_server - disk.device.latency - network.incoming.packets.rate_pd_server_pd02_port: - - pd_server_pd02_port - - network.incoming.packets.rate disk.latency_pd_server: - pd_server - disk.latency disk.device.capacity_pd_server: - pd_server - disk.device.capacity - network.outgoing.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes.rate disk.device.iops_pd_server: - pd_server - disk.device.iops - network.incoming.bytes_pd_server_pd02_port: - - pd_server_pd02_port - - network.incoming.bytes + forwarder_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - forwarder requirements: local_storage_pd_server: - pd_server - local_storage - link_pd_server_pd02_port: - - pd_server_pd02_port - - link - link_pd_server_pd01_port: - - pd_server_pd01_port - - link - dependency_pd_server_pd01_port: - - pd_server_pd01_port - - dependency dependency_pd_server: - pd_server - dependency - dependency_pd_server_pd02_port: - - pd_server_pd02_port - - dependency \ No newline at end of file + link_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - link + dependency_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - dependency + dependency_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - dependency + link_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - link diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/in/hot-mog-0108-bs1271.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/in/hot-mog-0108-bs1271.yml index 57479ff130..2ed32a389d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/in/hot-mog-0108-bs1271.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/in/hot-mog-0108-bs1271.yml @@ -215,15 +215,15 @@ resources: flavor: {get_param: pd_flavor_name} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: pd01_port_0} - - port: {get_resource: pd01_port_1} + - port: {get_resource: pd_server_0_oam_port_0} + - port: {get_resource: pd_server_1_oam_port_0} user_data_format: RAW - pd01_port_0: + pd_server_0_oam_port_0: type: OS::Neutron::Port properties: network: {get_param: oam_net_name} - pd01_port_1: + pd_server_1_oam_port_0: type: OS::Neutron::Port properties: network: {get_param: oam_net_name} diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/GlobalSubstitutionTypesServiceTemplate.yaml index dd9ab9af97..2e4b2ff854 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,24 +8,8 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_pd01_port_0_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_pd01_port_0_network: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_pd01_port_0_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_0_network_role: - type: string + port_pd_server_0_oam_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED compute_pd_server_availability_zone: @@ -44,58 +28,60 @@ node_types: type: string required: true status: SUPPORTED - port_pd01_port_1_network_role: - type: string + port_pd_server_1_oam_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_pd01_port_0_order: - type: integer + vm_image_name: + type: string required: true status: SUPPORTED - port_pd01_port_1_subnetpoolid: + port_pd_server_0_oam_port_0_network_role_tag: type: string required: true status: SUPPORTED - vm_image_name: - type: string + port_pd_server_0_oam_port_0_related_networks: + type: list required: true status: SUPPORTED - port_pd01_port_1_network_role_tag: + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd_server_1_oam_port_0_order: + type: integer + required: true + status: SUPPORTED + port_pd_server_0_oam_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_pd01_port_0_subnetpoolid: + port_pd_server_1_oam_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_pd01_port_1_network: + compute_pd_server_user_data_format: type: list required: true status: SUPPORTED entry_schema: type: string - compute_pd_server_user_data_format: + port_pd_server_0_oam_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd01_port_0_network_role_tag: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_0_oam_port_0_network_role: type: string required: true status: SUPPORTED - port_pd01_port_0_related_networks: - type: list + port_pd_server_1_oam_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd01_port_1_ip_requirements: - type: list + port_pd_server_0_oam_port_0_order: + type: integer required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements index_value: type: integer description: Index value of this substitution service template runtime instance @@ -104,40 +90,54 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_pd01_port_1_order: - type: integer + port_pd_server_1_oam_port_0_network_role_tag: + type: string required: true status: SUPPORTED - port_pd01_port_1_related_networks: + port_pd_server_1_oam_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd01_port_0_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_1_oam_port_0_vlan_requirements: + type: list required: true status: SUPPORTED - port_pd01_port_1_vlan_requirements: + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_0_oam_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd01_port_1_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + type: org.openecomp.datatypes.network.IpRequirements + port_pd_server_1_oam_port_0_network_role: + type: string required: true status: SUPPORTED - port_pd01_port_1_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_1_oam_port_0_network: + type: list required: true status: SUPPORTED - port_pd01_port_0_vlan_requirements: + entry_schema: + type: string + port_pd_server_0_oam_port_0_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: string + port_pd_server_1_oam_port_0_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd_server_0_oam_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED requirements: - dependency_pd_server: capability: tosca.capabilities.Node @@ -153,41 +153,33 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pd01_port_1: + - dependency_pd_server_pd_server_1_oam_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd01_port_1: + - link_pd_server_pd_server_1_oam_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_pd_server_pd01_port_0: + - dependency_pd_server_pd_server_0_oam_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd01_port_0: + - link_pd_server_pd_server_0_oam_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: - binding_pd_server_pd01_port_0: - 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 scalable_pd_server: type: tosca.capabilities.Scalable occurrences: @@ -199,133 +191,114 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_pd01_port_1: - 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 - memory.usage_pd_server: + network.outgoing.bytes_pd_server_pd_server_1_oam_port_0: 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_pd_server: + memory.usage_pd_server: 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_pd_server: + memory_pd_server: 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_pd_server: - type: tosca.capabilities.OperatingSystem - occurrences: - - 1 - - UNBOUNDED - disk.write.bytes.rate_pd_server: + disk.device.usage_pd_server: 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_pd_server: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_pd_server_pd_server_0_oam_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - cpu_util_pd_server: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + os_pd_server: + type: tosca.capabilities.OperatingSystem occurrences: - 1 - UNBOUNDED - disk.device.write.requests.rate_pd_server: + disk.write.bytes.rate_pd_server: 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_pd_server: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_pd_server_pd_server_0_oam_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.device.read.bytes.rate_pd_server: + network.incoming.bytes_pd_server_pd_server_1_oam_port_0: 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_pd_server_pd01_port_0: + cpu_pd_server: 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.iops_pd_server: + cpu_util_pd_server: 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_pd_server_pd01_port_1: + disk.device.write.requests.rate_pd_server: 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_pd_server_pd01_port_1: + disk.read.bytes_pd_server: 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_pd_server: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_pd_server_pd_server_1_oam_port_0: + 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: - - 1 + - 0 - UNBOUNDED - cpu.delta_pd_server: + disk.device.read.bytes.rate_pd_server: 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_pd_server_pd01_port_0: + network.outgoing.packets.rate_pd_server_pd_server_0_oam_port_0: 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_pd_server_pd01_port_0: + disk.iops_pd_server: 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 - attachment_pd_server_pd01_port_1: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - network.outgoing.packets.rate_pd_server_pd01_port_1: + memory.resident_pd_server: 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.packets.rate_pd_server_pd01_port_0: + cpu.delta_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -343,11 +316,6 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pd01_port_0: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED disk.device.write.requests_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -359,23 +327,24 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.capacity_pd_server: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_pd_server_pd_server_1_oam_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - forwarder_pd_server_pd01_port_0: - type: org.openecomp.capabilities.Forwarder + disk.capacity_pd_server: + 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_pd_server_pd01_port_1: - type: org.openecomp.capabilities.Forwarder + network.incoming.bytes_pd_server_pd_server_0_oam_port_0: + 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_pd_server_pd01_port_1: + network.outgoing.bytes.rate_pd_server_pd_server_0_oam_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -404,17 +373,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pd01_port_1: - 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_pd_server_pd01_port_0: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_pd_server_pd_server_0_oam_port_0: + 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: - - 1 + - 0 - UNBOUNDED feature_pd_server: type: tosca.capabilities.Node @@ -427,7 +392,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd01_port_1: + network.outgoing.bytes.rate_pd_server_pd_server_1_oam_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -439,21 +404,20 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd01_port_0: + network.incoming.packets_pd_server_pd_server_0_oam_port_0: 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_pd_server_pd01_port_1: + network.outgoing.bytes_pd_server_pd_server_0_oam_port_0: 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_pd_server_pd01_port_0: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_pd_server_pd_server_0_oam_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED @@ -475,19 +439,24 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.write.bytes_pd_server: + feature_pd_server_pd_server_1_oam_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes.rate_pd_server_pd_server_1_oam_port_0: 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_pd_server_pd01_port_0: + disk.device.write.bytes_pd_server: 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_pd_server_pd01_port_1: + network.incoming.packets_pd_server_pd_server_1_oam_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -512,13 +481,20 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_pd01_port_1: - type: tosca.capabilities.Node + attachment_pd_server_pd_server_1_oam_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - feature_pd_server_pd01_port_0: - type: tosca.capabilities.Node + network.incoming.packets.rate_pd_server_pd_server_1_oam_port_0: + 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_pd_server_pd_server_1_oam_port_0: + 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 @@ -534,12 +510,30 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.packets.rate_pd_server_pd_server_1_oam_port_0: + 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_pd_server_pd_server_0_oam_port_0: + 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_pd_server: 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_pd_server_pd_server_0_oam_port_0: + 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_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -559,6 +553,12 @@ node_types: - 1 - UNBOUNDED disk.device.iops_pd_server: + 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_pd_server_pd_server_0_oam_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: 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 585eb1e4cb..60a5fd2eb1 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 @@ -832,17 +832,6 @@ topology_template: directives: - substitutable properties: - port_pd01_port_0_mac_requirements: - mac_count_required: - is_required: false - port_pd01_port_0_network: - - get_input: oam_net_name - port_pd01_port_0_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: @@ -851,21 +840,32 @@ topology_template: - 0 vm_flavor_name: get_input: pd_flavor_name + port_pd_server_1_oam_port_0_mac_requirements: + mac_count_required: + is_required: false vm_image_name: get_input: pd_image_name - port_pd01_port_1_network_role_tag: oam - port_pd01_port_1_network: - - get_input: oam_net_name + port_pd_server_0_oam_port_0_network_role_tag: oam compute_pd_server_user_data_format: - RAW - port_pd01_port_0_network_role_tag: oam - port_pd01_port_1_ip_requirements: + port_pd_server_1_oam_port_0_network_role_tag: oam + port_pd_server_0_oam_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_pd_server_1_oam_port_0_network: + - get_input: oam_net_name + port_pd_server_0_oam_port_0_network: + - get_input: oam_net_name + port_pd_server_1_oam_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_1_mac_requirements: + port_pd_server_0_oam_port_0_mac_requirements: mac_count_required: is_required: false 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/computewithtwosameporttypes/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/Nested_pd_serverServiceTemplate.yaml index bdf0a31df8..315836c88c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/Nested_pd_serverServiceTemplate.yaml @@ -11,21 +11,8 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_pd01_port_0_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_pd01_port_0_network: - type: list - required: true - entry_schema: - type: string - port_pd01_port_0_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_0_network_role: - type: string + port_pd_server_0_oam_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true compute_pd_server_availability_zone: type: list @@ -40,47 +27,48 @@ topology_template: vm_flavor_name: type: string required: true - port_pd01_port_1_network_role: - type: string - required: true - port_pd01_port_0_order: - type: integer + port_pd_server_1_oam_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_pd01_port_1_subnetpoolid: + vm_image_name: type: string required: true - vm_image_name: + port_pd_server_0_oam_port_0_network_role_tag: type: string required: true - port_pd01_port_1_network_role_tag: + port_pd_server_0_oam_port_0_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd_server_1_oam_port_0_order: + type: integer + required: true + port_pd_server_0_oam_port_0_subnetpoolid: type: string required: true - port_pd01_port_0_subnetpoolid: + port_pd_server_1_oam_port_0_subnetpoolid: type: string required: true - port_pd01_port_1_network: + compute_pd_server_user_data_format: type: list required: true entry_schema: type: string - compute_pd_server_user_data_format: + port_pd_server_0_oam_port_0_vlan_requirements: type: list required: true entry_schema: - type: string - port_pd01_port_0_network_role_tag: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_0_oam_port_0_network_role: type: string required: true - port_pd01_port_0_related_networks: - type: list + port_pd_server_1_oam_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd01_port_1_ip_requirements: - type: list + port_pd_server_0_oam_port_0_order: + type: integer required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements index_value: type: integer description: Index value of this substitution service template runtime instance @@ -88,33 +76,45 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_pd01_port_1_order: - type: integer + port_pd_server_1_oam_port_0_network_role_tag: + type: string required: true - port_pd01_port_1_related_networks: + port_pd_server_1_oam_port_0_related_networks: type: list required: true entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd01_port_0_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_pd01_port_1_vlan_requirements: + port_pd_server_1_oam_port_0_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_pd01_port_1_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pd_server_0_oam_port_0_ip_requirements: + type: list required: true - port_pd01_port_1_exCP_naming: - type: org.openecomp.datatypes.Naming + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd_server_1_oam_port_0_network_role: + type: string required: true - port_pd01_port_0_vlan_requirements: + port_pd_server_1_oam_port_0_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: string + port_pd_server_0_oam_port_0_network: + type: list + required: true + entry_schema: + type: string + port_pd_server_1_oam_port_0_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd_server_0_oam_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true node_templates: pd_server: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server @@ -135,62 +135,62 @@ topology_template: get_input: - compute_pd_server_user_data_format - index_value - pd_server_pd01_port_1: + pd_server_pd_server_1_oam_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd01_port_1_exCP_naming + get_input: port_pd_server_1_oam_port_0_exCP_naming vlan_requirements: - get_input: port_pd01_port_1_vlan_requirements + get_input: port_pd_server_1_oam_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_pd01_port_1_related_networks + get_input: port_pd_server_1_oam_port_0_related_networks ip_requirements: - get_input: port_pd01_port_1_ip_requirements + get_input: port_pd_server_1_oam_port_0_ip_requirements network_role_tag: - get_input: port_pd01_port_1_network_role_tag + get_input: port_pd_server_1_oam_port_0_network_role_tag mac_requirements: - get_input: port_pd01_port_1_mac_requirements + get_input: port_pd_server_1_oam_port_0_mac_requirements order: - get_input: port_pd01_port_1_order + get_input: port_pd_server_1_oam_port_0_order network_role: - get_input: port_pd01_port_1_network_role + get_input: port_pd_server_1_oam_port_0_network_role subnetpoolid: - get_input: port_pd01_port_1_subnetpoolid + get_input: port_pd_server_1_oam_port_0_subnetpoolid network: get_input: - - port_pd01_port_1_network + - port_pd_server_1_oam_port_0_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: pd_server relationship: tosca.relationships.network.BindsTo - pd_server_pd01_port_0: + pd_server_pd_server_0_oam_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd01_port_0_exCP_naming + get_input: port_pd_server_0_oam_port_0_exCP_naming vlan_requirements: - get_input: port_pd01_port_0_vlan_requirements + get_input: port_pd_server_0_oam_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_pd01_port_0_related_networks + get_input: port_pd_server_0_oam_port_0_related_networks ip_requirements: - get_input: port_pd01_port_0_ip_requirements + get_input: port_pd_server_0_oam_port_0_ip_requirements network_role_tag: - get_input: port_pd01_port_0_network_role_tag + get_input: port_pd_server_0_oam_port_0_network_role_tag mac_requirements: - get_input: port_pd01_port_0_mac_requirements + get_input: port_pd_server_0_oam_port_0_mac_requirements order: - get_input: port_pd01_port_0_order + get_input: port_pd_server_0_oam_port_0_order network_role: - get_input: port_pd01_port_0_network_role + get_input: port_pd_server_0_oam_port_0_network_role subnetpoolid: - get_input: port_pd01_port_0_subnetpoolid + get_input: port_pd_server_0_oam_port_0_subnetpoolid network: get_input: - - port_pd01_port_0_network + - port_pd_server_0_oam_port_0_network - index_value requirements: - binding: @@ -200,18 +200,15 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server capabilities: - binding_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - binding scalable_pd_server: - pd_server - scalable disk.read.bytes.rate_pd_server: - pd_server - disk.read.bytes.rate - binding_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - binding + network.outgoing.bytes_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 + - network.outgoing.bytes memory.usage_pd_server: - pd_server - memory.usage @@ -221,12 +218,21 @@ topology_template: disk.device.usage_pd_server: - pd_server - disk.device.usage + forwarder_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - forwarder os_pd_server: - pd_server - os disk.write.bytes.rate_pd_server: - pd_server - disk.write.bytes.rate + feature_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - feature + network.incoming.bytes_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 + - network.incoming.bytes cpu_pd_server: - pd_server - cpu @@ -239,69 +245,48 @@ topology_template: disk.read.bytes_pd_server: - pd_server - disk.read.bytes + binding_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 + - binding disk.device.read.bytes.rate_pd_server: - pd_server - disk.device.read.bytes.rate - network.incoming.packets_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - network.incoming.packets + network.outgoing.packets.rate_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - network.outgoing.packets.rate disk.iops_pd_server: - pd_server - disk.iops - network.incoming.packets.rate_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - network.incoming.packets.rate - network.incoming.bytes.rate_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - network.incoming.bytes.rate memory.resident_pd_server: - pd_server - memory.resident cpu.delta_pd_server: - pd_server - cpu.delta - network.incoming.packets.rate_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - network.incoming.packets.rate - network.incoming.bytes.rate_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - network.incoming.bytes.rate - attachment_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - attachment - network.outgoing.packets.rate_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - network.outgoing.packets.rate - network.outgoing.packets.rate_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - network.outgoing.packets.rate vcpus_pd_server: - pd_server - vcpus disk.device.write.bytes.rate_pd_server: - pd_server - disk.device.write.bytes.rate - attachment_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - attachment disk.device.write.requests_pd_server: - pd_server - disk.device.write.requests endpoint_pd_server: - pd_server - endpoint + forwarder_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 + - forwarder disk.capacity_pd_server: - pd_server - disk.capacity - forwarder_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - forwarder - forwarder_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - forwarder - network.incoming.packets_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - network.incoming.packets + network.incoming.bytes_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - network.incoming.bytes + network.outgoing.bytes.rate_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - network.outgoing.bytes.rate disk.device.allocation_pd_server: - pd_server - disk.device.allocation @@ -314,33 +299,30 @@ topology_template: disk.read.requests_pd_server: - pd_server - disk.read.requests - network.outgoing.bytes.rate_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - network.outgoing.bytes.rate - network.outgoing.bytes.rate_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - network.outgoing.bytes.rate + binding_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - binding feature_pd_server: - pd_server - feature disk.usage_pd_server: - pd_server - disk.usage - network.incoming.bytes_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - network.incoming.bytes + network.outgoing.bytes.rate_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 + - network.outgoing.bytes.rate disk.write.bytes_pd_server: - pd_server - disk.write.bytes - network.outgoing.bytes_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - network.outgoing.bytes - network.outgoing.bytes_pd_server_pd01_port_1: - - pd_server_pd01_port_1 + network.incoming.packets_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - network.incoming.packets + network.outgoing.bytes_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 - network.outgoing.bytes - network.incoming.bytes_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - network.incoming.bytes + attachment_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - attachment disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -350,15 +332,18 @@ topology_template: disk.device.read.bytes_pd_server: - pd_server - disk.device.read.bytes + feature_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 + - feature + network.incoming.bytes.rate_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 + - network.incoming.bytes.rate disk.device.write.bytes_pd_server: - pd_server - disk.device.write.bytes - network.outpoing.packets_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - network.outpoing.packets - network.outpoing.packets_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - network.outpoing.packets + network.incoming.packets_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 + - network.incoming.packets disk.device.read.requests_pd_server: - pd_server - disk.device.read.requests @@ -368,21 +353,33 @@ topology_template: host_pd_server: - pd_server - host - feature_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - feature - feature_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - feature + attachment_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 + - attachment + network.incoming.packets.rate_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 + - network.incoming.packets.rate + network.outpoing.packets_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 + - network.outpoing.packets disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate disk.ephemeral.size_pd_server: - pd_server - disk.ephemeral.size + network.outgoing.packets.rate_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 + - network.outgoing.packets.rate + network.incoming.bytes.rate_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - network.incoming.bytes.rate disk.write.requests_pd_server: - pd_server - disk.write.requests + network.incoming.packets.rate_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - network.incoming.packets.rate disk.device.latency_pd_server: - pd_server - disk.device.latency @@ -395,22 +392,25 @@ topology_template: disk.device.iops_pd_server: - pd_server - disk.device.iops + network.outpoing.packets_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - network.outpoing.packets requirements: local_storage_pd_server: - pd_server - local_storage - dependency_pd_server_pd01_port_1: - - pd_server_pd01_port_1 + link_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - link + dependency_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 - dependency dependency_pd_server: - pd_server - dependency - dependency_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - dependency - link_pd_server_pd01_port_0: - - pd_server_pd01_port_0 + link_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 - link - link_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - link \ No newline at end of file + dependency_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - 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/singleSubstitution/computewithtwosameporttypes3/in/hot-mog-0108-bs1271.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes3/in/hot-mog-0108-bs1271.yml index a63128c832..2ed32a389d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes3/in/hot-mog-0108-bs1271.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes3/in/hot-mog-0108-bs1271.yml @@ -215,15 +215,15 @@ resources: flavor: {get_param: pd_flavor_name} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: pd_oam1_port_0} - - port: {get_resource: pd_oam1_port_1} + - port: {get_resource: pd_server_0_oam_port_0} + - port: {get_resource: pd_server_1_oam_port_0} user_data_format: RAW - pd_oam1_port_0: + pd_server_0_oam_port_0: type: OS::Neutron::Port properties: network: {get_param: oam_net_name} - pd_oam1_port_1: + pd_server_1_oam_port_0: type: OS::Neutron::Port properties: network: {get_param: oam_net_name} diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes3/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes3/out/GlobalSubstitutionTypesServiceTemplate.yaml index eb1d96a9b3..d817b21500 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes3/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes3/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,26 +8,10 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_pd_oam1_port_0_network_role_tag: - type: string - required: true - status: SUPPORTED - port_pd_oam1_port_0_related_networks: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd_oam1_port_0_network_role: - type: string - required: true - status: SUPPORTED - port_pd_oam1_port_1_ip_requirements: - type: list + port_pd_server_0_oam_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements compute_pd_server_availability_zone: type: list required: true @@ -44,23 +28,33 @@ node_types: type: string required: true status: SUPPORTED - port_pd_oam1_port_1_order: - type: integer + port_pd_server_1_oam_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_pd_oam1_port_1_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + vm_image_name: + type: string required: true status: SUPPORTED - port_pd_oam1_port_1_network_role: + port_pd_server_0_oam_port_0_network_role_tag: type: string required: true status: SUPPORTED - vm_image_name: + port_pd_server_0_oam_port_0_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd_server_1_oam_port_0_order: + type: integer + required: true + status: SUPPORTED + port_pd_server_0_oam_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_pd_oam1_port_1_network_role_tag: + port_pd_server_1_oam_port_0_subnetpoolid: type: string required: true status: SUPPORTED @@ -70,6 +64,24 @@ node_types: status: SUPPORTED entry_schema: type: string + port_pd_server_0_oam_port_0_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_0_oam_port_0_network_role: + type: string + required: true + status: SUPPORTED + port_pd_server_1_oam_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_pd_server_0_oam_port_0_order: + type: integer + required: true + status: SUPPORTED index_value: type: integer description: Index value of this substitution service template runtime instance @@ -78,63 +90,51 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_pd_oam1_port_0_ip_requirements: + port_pd_server_1_oam_port_0_network_role_tag: + type: string + required: true + status: SUPPORTED + port_pd_server_1_oam_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd_oam1_port_0_vlan_requirements: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd_server_1_oam_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_pd_oam1_port_1_network: + port_pd_server_0_oam_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd_oam1_port_1_subnetpoolid: + type: org.openecomp.datatypes.network.IpRequirements + port_pd_server_1_oam_port_0_network_role: type: string required: true status: SUPPORTED - port_pd_oam1_port_0_order: - type: integer - required: true - status: SUPPORTED - port_pd_oam1_port_1_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_pd_oam1_port_0_network: + port_pd_server_1_oam_port_0_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd_oam1_port_0_subnetpoolid: - type: string - required: true - status: SUPPORTED - port_pd_oam1_port_1_related_networks: + port_pd_server_0_oam_port_0_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd_oam1_port_0_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_pd_oam1_port_1_vlan_requirements: + type: string + port_pd_server_1_oam_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd_oam1_port_0_mac_requirements: + type: org.openecomp.datatypes.network.IpRequirements + port_pd_server_0_oam_port_0_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED @@ -153,27 +153,27 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pd_oam1_port_1: + - dependency_pd_server_pd_server_1_oam_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd_oam1_port_1: + - link_pd_server_pd_server_1_oam_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_pd_server_pd_oam1_port_0: + - dependency_pd_server_pd_server_0_oam_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd_oam1_port_0: + - link_pd_server_pd_server_0_oam_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -191,6 +191,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes_pd_server_pd_server_1_oam_port_0: + 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_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -209,6 +215,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pd_server_pd_server_0_oam_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED os_pd_server: type: tosca.capabilities.OperatingSystem occurrences: @@ -220,50 +231,29 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_pd_server_pd_oam1_port_1: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_pd_server_pd_server_0_oam_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.incoming.packets_pd_server_pd_oam1_port_0: + network.incoming.bytes_pd_server_pd_server_1_oam_port_0: 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_pd_server_pd_oam1_port_0: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED cpu_pd_server: 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_pd_server_pd_oam1_port_1: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - feature_pd_server_pd_oam1_port_1: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED cpu_util_pd_server: 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_pd_server_pd_oam1_port_0: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.device.write.requests.rate_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -276,25 +266,27 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.read.bytes.rate_pd_server: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_pd_server_pd_server_1_oam_port_0: + 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: - - 1 + - 0 - UNBOUNDED - disk.iops_pd_server: + disk.device.read.bytes.rate_pd_server: 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_pd_server_pd_oam1_port_1: + network.outgoing.packets.rate_pd_server_pd_server_0_oam_port_0: 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_pd_server_pd_oam1_port_0: + disk.iops_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -312,16 +304,6 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pd_oam1_port_0: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - attachment_pd_server_pd_oam1_port_1: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED vcpus_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -345,31 +327,36 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pd_server_pd_server_1_oam_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.capacity_pd_server: 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_pd_server_pd_oam1_port_0: + network.incoming.bytes_pd_server_pd_server_0_oam_port_0: 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_pd_server: + network.outgoing.bytes.rate_pd_server_pd_server_0_oam_port_0: 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.allocation_pd_server: + disk.device.allocation_pd_server: 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_pd_server_pd_oam1_port_1: + disk.allocation_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -386,6 +373,14 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_pd_server_pd_server_0_oam_port_0: + 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 feature_pd_server: type: tosca.capabilities.Node occurrences: @@ -397,67 +392,71 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.write.bytes_pd_server: + network.outgoing.bytes.rate_pd_server_pd_server_1_oam_port_0: 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_pd_server_pd_oam1_port_1: + disk.write.bytes_pd_server: 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.packets.rate_pd_server_pd_oam1_port_1: + network.incoming.packets_pd_server_pd_server_0_oam_port_0: 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_pd_server_pd_oam1_port_1: + network.outgoing.bytes_pd_server_pd_server_0_oam_port_0: 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_pd_server_pd_oam1_port_0: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_pd_server_pd_server_0_oam_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pd_oam1_port_0: + disk.device.read.requests.rate_pd_server: 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.packets.rate_pd_server_pd_oam1_port_0: + disk.root.size_pd_server: 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_pd_server: + disk.device.read.bytes_pd_server: 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_pd_server: + feature_pd_server_pd_server_1_oam_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes.rate_pd_server_pd_server_1_oam_port_0: 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_pd_server: + disk.device.write.bytes_pd_server: 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_pd_server: + network.incoming.packets_pd_server_pd_server_1_oam_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -482,85 +481,86 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.write.requests.rate_pd_server: + attachment_pd_server_pd_server_1_oam_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets.rate_pd_server_pd_server_1_oam_port_0: 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.ephemeral.size_pd_server: + network.outpoing.packets_pd_server_pd_server_1_oam_port_0: 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_pd_server: + disk.write.requests.rate_pd_server: 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_pd_server_pd_oam1_port_0: + disk.ephemeral.size_pd_server: 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_pd_server_pd_oam1_port_1: + network.outgoing.packets.rate_pd_server_pd_server_1_oam_port_0: 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_pd_server: + network.incoming.bytes.rate_pd_server_pd_server_0_oam_port_0: 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_pd_server_pd_oam1_port_0: + disk.write.requests_pd_server: 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_pd_server: + network.incoming.packets.rate_pd_server_pd_server_0_oam_port_0: 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_pd_server: + disk.device.latency_pd_server: 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_pd_server_pd_oam1_port_1: + disk.latency_pd_server: 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_pd_server_pd_oam1_port_1: - 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 + disk.device.capacity_pd_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - - 0 + - 1 - UNBOUNDED - binding_pd_server_pd_oam1_port_0: - 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 + disk.device.iops_pd_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - - 0 + - 1 - UNBOUNDED - disk.device.iops_pd_server: + network.outpoing.packets_pd_server_pd_server_0_oam_port_0: 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 + - UNBOUNDED 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 b64ee2fea5..f0a84c9283 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 @@ -832,13 +832,6 @@ topology_template: directives: - substitutable properties: - port_pd_oam1_port_0_network_role_tag: oam - port_pd_oam1_port_1_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: @@ -847,25 +840,32 @@ topology_template: - 0 vm_flavor_name: get_input: pd_flavor_name - port_pd_oam1_port_1_mac_requirements: + port_pd_server_1_oam_port_0_mac_requirements: mac_count_required: is_required: false vm_image_name: get_input: pd_image_name - port_pd_oam1_port_1_network_role_tag: oam + port_pd_server_0_oam_port_0_network_role_tag: oam compute_pd_server_user_data_format: - RAW - port_pd_oam1_port_0_ip_requirements: + port_pd_server_1_oam_port_0_network_role_tag: oam + port_pd_server_0_oam_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_pd_oam1_port_1_network: + port_pd_server_1_oam_port_0_network: - get_input: oam_net_name - port_pd_oam1_port_0_network: + port_pd_server_0_oam_port_0_network: - get_input: oam_net_name - port_pd_oam1_port_0_mac_requirements: + port_pd_server_1_oam_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_pd_server_0_oam_port_0_mac_requirements: mac_count_required: is_required: false service_template_filter: @@ -883,4 +883,4 @@ topology_template: heat_file: ../Artifacts/hot-mog-0108-bs1271.yml description: heat template that creates MOG stack members: - - abstract_pd_server \ No newline at end of file + - 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/computewithtwosameporttypes3/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes3/out/Nested_pd_serverServiceTemplate.yaml index b66be45d5e..b9772f3db6 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes3/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes3/out/Nested_pd_serverServiceTemplate.yaml @@ -11,22 +11,9 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_pd_oam1_port_0_network_role_tag: - type: string - required: true - port_pd_oam1_port_0_related_networks: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd_oam1_port_0_network_role: - type: string - required: true - port_pd_oam1_port_1_ip_requirements: - type: list + port_pd_server_0_oam_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements compute_pd_server_availability_zone: type: list required: true @@ -40,19 +27,27 @@ topology_template: vm_flavor_name: type: string required: true - port_pd_oam1_port_1_order: - type: integer - required: true - port_pd_oam1_port_1_mac_requirements: + port_pd_server_1_oam_port_0_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true - port_pd_oam1_port_1_network_role: + vm_image_name: type: string required: true - vm_image_name: + port_pd_server_0_oam_port_0_network_role_tag: type: string required: true - port_pd_oam1_port_1_network_role_tag: + port_pd_server_0_oam_port_0_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd_server_1_oam_port_0_order: + type: integer + required: true + port_pd_server_0_oam_port_0_subnetpoolid: + type: string + required: true + port_pd_server_1_oam_port_0_subnetpoolid: type: string required: true compute_pd_server_user_data_format: @@ -60,6 +55,20 @@ topology_template: required: true entry_schema: type: string + port_pd_server_0_oam_port_0_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_0_oam_port_0_network_role: + type: string + required: true + port_pd_server_1_oam_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_pd_server_0_oam_port_0_order: + type: integer + required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -67,52 +76,43 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_pd_oam1_port_0_ip_requirements: + port_pd_server_1_oam_port_0_network_role_tag: + type: string + required: true + port_pd_server_1_oam_port_0_related_networks: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd_oam1_port_0_vlan_requirements: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd_server_1_oam_port_0_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_pd_oam1_port_1_network: + port_pd_server_0_oam_port_0_ip_requirements: type: list required: true entry_schema: - type: string - port_pd_oam1_port_1_subnetpoolid: + type: org.openecomp.datatypes.network.IpRequirements + port_pd_server_1_oam_port_0_network_role: type: string required: true - port_pd_oam1_port_0_order: - type: integer - required: true - port_pd_oam1_port_1_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_pd_oam1_port_0_network: + port_pd_server_1_oam_port_0_network: type: list required: true entry_schema: type: string - port_pd_oam1_port_0_subnetpoolid: - type: string - required: true - port_pd_oam1_port_1_related_networks: + port_pd_server_0_oam_port_0_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd_oam1_port_0_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_pd_oam1_port_1_vlan_requirements: + type: string + port_pd_server_1_oam_port_0_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd_oam1_port_0_mac_requirements: + type: org.openecomp.datatypes.network.IpRequirements + port_pd_server_0_oam_port_0_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true node_templates: @@ -135,62 +135,62 @@ topology_template: get_input: - compute_pd_server_user_data_format - index_value - pd_server_pd_oam1_port_1: + pd_server_pd_server_1_oam_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd_oam1_port_1_exCP_naming + get_input: port_pd_server_1_oam_port_0_exCP_naming vlan_requirements: - get_input: port_pd_oam1_port_1_vlan_requirements + get_input: port_pd_server_1_oam_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_pd_oam1_port_1_related_networks + get_input: port_pd_server_1_oam_port_0_related_networks ip_requirements: - get_input: port_pd_oam1_port_1_ip_requirements + get_input: port_pd_server_1_oam_port_0_ip_requirements network_role_tag: - get_input: port_pd_oam1_port_1_network_role_tag + get_input: port_pd_server_1_oam_port_0_network_role_tag mac_requirements: - get_input: port_pd_oam1_port_1_mac_requirements + get_input: port_pd_server_1_oam_port_0_mac_requirements order: - get_input: port_pd_oam1_port_1_order + get_input: port_pd_server_1_oam_port_0_order network_role: - get_input: port_pd_oam1_port_1_network_role + get_input: port_pd_server_1_oam_port_0_network_role subnetpoolid: - get_input: port_pd_oam1_port_1_subnetpoolid + get_input: port_pd_server_1_oam_port_0_subnetpoolid network: get_input: - - port_pd_oam1_port_1_network + - port_pd_server_1_oam_port_0_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: pd_server relationship: tosca.relationships.network.BindsTo - pd_server_pd_oam1_port_0: + pd_server_pd_server_0_oam_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd_oam1_port_0_exCP_naming + get_input: port_pd_server_0_oam_port_0_exCP_naming vlan_requirements: - get_input: port_pd_oam1_port_0_vlan_requirements + get_input: port_pd_server_0_oam_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_pd_oam1_port_0_related_networks + get_input: port_pd_server_0_oam_port_0_related_networks ip_requirements: - get_input: port_pd_oam1_port_0_ip_requirements + get_input: port_pd_server_0_oam_port_0_ip_requirements network_role_tag: - get_input: port_pd_oam1_port_0_network_role_tag + get_input: port_pd_server_0_oam_port_0_network_role_tag mac_requirements: - get_input: port_pd_oam1_port_0_mac_requirements + get_input: port_pd_server_0_oam_port_0_mac_requirements order: - get_input: port_pd_oam1_port_0_order + get_input: port_pd_server_0_oam_port_0_order network_role: - get_input: port_pd_oam1_port_0_network_role + get_input: port_pd_server_0_oam_port_0_network_role subnetpoolid: - get_input: port_pd_oam1_port_0_subnetpoolid + get_input: port_pd_server_0_oam_port_0_subnetpoolid network: get_input: - - port_pd_oam1_port_0_network + - port_pd_server_0_oam_port_0_network - index_value requirements: - binding: @@ -206,6 +206,9 @@ topology_template: disk.read.bytes.rate_pd_server: - pd_server - disk.read.bytes.rate + network.outgoing.bytes_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 + - network.outgoing.bytes memory.usage_pd_server: - pd_server - memory.usage @@ -215,66 +218,51 @@ topology_template: disk.device.usage_pd_server: - pd_server - disk.device.usage + forwarder_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - forwarder os_pd_server: - pd_server - os disk.write.bytes.rate_pd_server: - pd_server - disk.write.bytes.rate - network.incoming.packets_pd_server_pd_oam1_port_1: - - pd_server_pd_oam1_port_1 - - network.incoming.packets - network.incoming.packets_pd_server_pd_oam1_port_0: - - pd_server_pd_oam1_port_0 - - network.incoming.packets - forwarder_pd_server_pd_oam1_port_0: - - pd_server_pd_oam1_port_0 - - forwarder + feature_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - feature + network.incoming.bytes_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 + - network.incoming.bytes cpu_pd_server: - pd_server - cpu - forwarder_pd_server_pd_oam1_port_1: - - pd_server_pd_oam1_port_1 - - forwarder - feature_pd_server_pd_oam1_port_1: - - pd_server_pd_oam1_port_1 - - feature cpu_util_pd_server: - pd_server - cpu_util - feature_pd_server_pd_oam1_port_0: - - pd_server_pd_oam1_port_0 - - feature disk.device.write.requests.rate_pd_server: - pd_server - disk.device.write.requests.rate disk.read.bytes_pd_server: - pd_server - disk.read.bytes + binding_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 + - binding disk.device.read.bytes.rate_pd_server: - pd_server - disk.device.read.bytes.rate + network.outgoing.packets.rate_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - network.outgoing.packets.rate disk.iops_pd_server: - pd_server - disk.iops - network.incoming.bytes_pd_server_pd_oam1_port_1: - - pd_server_pd_oam1_port_1 - - network.incoming.bytes - network.incoming.bytes_pd_server_pd_oam1_port_0: - - pd_server_pd_oam1_port_0 - - network.incoming.bytes memory.resident_pd_server: - pd_server - memory.resident cpu.delta_pd_server: - pd_server - cpu.delta - attachment_pd_server_pd_oam1_port_0: - - pd_server_pd_oam1_port_0 - - attachment - attachment_pd_server_pd_oam1_port_1: - - pd_server_pd_oam1_port_1 - - attachment vcpus_pd_server: - pd_server - vcpus @@ -287,54 +275,54 @@ topology_template: endpoint_pd_server: - pd_server - endpoint + forwarder_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 + - forwarder disk.capacity_pd_server: - pd_server - disk.capacity - network.incoming.packets.rate_pd_server_pd_oam1_port_0: - - pd_server_pd_oam1_port_0 - - network.incoming.packets.rate + network.incoming.bytes_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - network.incoming.bytes + network.outgoing.bytes.rate_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - network.outgoing.bytes.rate disk.device.allocation_pd_server: - pd_server - disk.device.allocation disk.allocation_pd_server: - pd_server - disk.allocation - network.incoming.packets.rate_pd_server_pd_oam1_port_1: - - pd_server_pd_oam1_port_1 - - network.incoming.packets.rate binding_pd_server: - pd_server - binding disk.read.requests_pd_server: - pd_server - disk.read.requests + binding_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - binding feature_pd_server: - pd_server - feature disk.usage_pd_server: - pd_server - disk.usage + network.outgoing.bytes.rate_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 + - network.outgoing.bytes.rate disk.write.bytes_pd_server: - pd_server - disk.write.bytes - network.incoming.bytes.rate_pd_server_pd_oam1_port_1: - - pd_server_pd_oam1_port_1 - - network.incoming.bytes.rate - network.outgoing.packets.rate_pd_server_pd_oam1_port_1: - - pd_server_pd_oam1_port_1 - - network.outgoing.packets.rate - network.outgoing.bytes.rate_pd_server_pd_oam1_port_1: - - pd_server_pd_oam1_port_1 - - network.outgoing.bytes.rate - network.incoming.bytes.rate_pd_server_pd_oam1_port_0: - - pd_server_pd_oam1_port_0 - - network.incoming.bytes.rate - network.outgoing.bytes.rate_pd_server_pd_oam1_port_0: - - pd_server_pd_oam1_port_0 - - network.outgoing.bytes.rate - network.outgoing.packets.rate_pd_server_pd_oam1_port_0: - - pd_server_pd_oam1_port_0 - - network.outgoing.packets.rate + network.incoming.packets_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - network.incoming.packets + network.outgoing.bytes_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - network.outgoing.bytes + attachment_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - attachment disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -344,9 +332,18 @@ topology_template: disk.device.read.bytes_pd_server: - pd_server - disk.device.read.bytes + feature_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 + - feature + network.incoming.bytes.rate_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 + - network.incoming.bytes.rate disk.device.write.bytes_pd_server: - pd_server - disk.device.write.bytes + network.incoming.packets_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 + - network.incoming.packets disk.device.read.requests_pd_server: - pd_server - disk.device.read.requests @@ -356,61 +353,64 @@ topology_template: host_pd_server: - pd_server - host + attachment_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 + - attachment + network.incoming.packets.rate_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 + - network.incoming.packets.rate + network.outpoing.packets_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 + - network.outpoing.packets disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate disk.ephemeral.size_pd_server: - pd_server - disk.ephemeral.size + network.outgoing.packets.rate_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 + - network.outgoing.packets.rate + network.incoming.bytes.rate_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - network.incoming.bytes.rate disk.write.requests_pd_server: - pd_server - disk.write.requests - network.outgoing.bytes_pd_server_pd_oam1_port_0: - - pd_server_pd_oam1_port_0 - - network.outgoing.bytes - network.outgoing.bytes_pd_server_pd_oam1_port_1: - - pd_server_pd_oam1_port_1 - - network.outgoing.bytes + network.incoming.packets.rate_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - network.incoming.packets.rate disk.device.latency_pd_server: - pd_server - disk.device.latency - network.outpoing.packets_pd_server_pd_oam1_port_0: - - pd_server_pd_oam1_port_0 - - network.outpoing.packets disk.latency_pd_server: - pd_server - disk.latency disk.device.capacity_pd_server: - pd_server - disk.device.capacity - network.outpoing.packets_pd_server_pd_oam1_port_1: - - pd_server_pd_oam1_port_1 - - network.outpoing.packets - binding_pd_server_pd_oam1_port_1: - - pd_server_pd_oam1_port_1 - - binding - binding_pd_server_pd_oam1_port_0: - - pd_server_pd_oam1_port_0 - - binding disk.device.iops_pd_server: - pd_server - disk.device.iops + network.outpoing.packets_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - network.outpoing.packets requirements: local_storage_pd_server: - pd_server - local_storage - link_pd_server_pd_oam1_port_1: - - pd_server_pd_oam1_port_1 - - link - link_pd_server_pd_oam1_port_0: - - pd_server_pd_oam1_port_0 + link_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 - link + dependency_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 + - dependency dependency_pd_server: - pd_server - dependency - dependency_pd_server_pd_oam1_port_0: - - pd_server_pd_oam1_port_0 + link_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 + - link + dependency_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 - dependency - dependency_pd_server_pd_oam1_port_1: - - pd_server_pd_oam1_port_1 - - 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/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml index a8909d0fcc..bef997b5b3 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,6 +8,26 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_pd01_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_pd01_port_0_network: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_pd01_port_0_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role: + type: string + required: true + status: SUPPORTED compute_pd_server_availability_zone: type: list required: true @@ -24,41 +44,45 @@ node_types: type: string required: true status: SUPPORTED - port_pd02_port_network_role_tag: - type: string + port_pd02_port_0_network: + type: list required: true status: SUPPORTED - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + entry_schema: + type: string + port_pd01_port_0_order: + type: integer required: true status: SUPPORTED vm_image_name: type: string required: true status: SUPPORTED - port_pd01_port_ip_requirements: - type: list + port_pd02_port_0_network_role_tag: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd02_port_network_role: + port_pd01_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_pd01_port_vlan_requirements: + compute_pd_server_user_data_format: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - compute_pd_server_user_data_format: + type: string + port_pd02_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd02_port_related_networks: + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role_tag: + type: string + required: true + status: SUPPORTED + port_pd01_port_0_related_networks: type: list required: true status: SUPPORTED @@ -72,80 +96,56 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_pd02_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_pd01_port_exCP_naming: + port_pd02_port_0_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_pd01_port_related_networks: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd02_port_order: - type: integer + port_pd01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_pd02_port_subnetpoolid: + port_pd02_port_0_network_role: type: string required: true status: SUPPORTED - port_pd02_port_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd01_port_network: - type: list + port_pd02_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: string - port_pd01_port_order: + port_pd02_port_0_order: type: integer required: true status: SUPPORTED - port_pd01_port_subnetpoolid: - type: string - required: true - status: SUPPORTED - port_pd02_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd02_port_0_related_networks: + type: list required: true status: SUPPORTED - port_pd01_port_network_role: + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd02_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_pd02_port_ip_requirements: + port_pd02_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network_role_tag: - type: string - required: true - status: SUPPORTED - port_pd02_port_network: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string + type: org.openecomp.datatypes.network.VlanRequirements attributes: - pd_server_accessIPv4: + pd_server_pd01_port_0_device_id: type: string status: SUPPORTED - pd_server_pd02_port_device_owner: + pd_server_accessIPv4: type: string status: SUPPORTED - pd_server_pd01_port_device_id: + pd_server_pd02_port_0_device_owner: type: string status: SUPPORTED requirements: @@ -163,33 +163,49 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pd01_port: + - dependency_pd_server_pd02_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd01_port: + - link_pd_server_pd02_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_pd_server_pd02_port: + - dependency_pd_server_pd01_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd02_port: + - link_pd_server_pd01_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: + binding_pd_server_pd02_port_0: + 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 + binding_pd_server_pd01_port_0: + 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 scalable_pd_server: type: tosca.capabilities.Scalable occurrences: @@ -219,12 +235,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pd01_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 os_pd_server: type: tosca.capabilities.OperatingSystem occurrences: @@ -236,7 +246,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd01_port: + network.outgoing.packets.rate_pd_server_pd02_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -272,21 +282,13 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_pd02_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 - network.outgoing.bytes_pd_server_pd01_port: + network.outpoing.packets_pd_server_pd02_port_0: 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.packets.rate_pd_server_pd02_port: + network.incoming.packets_pd_server_pd01_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -310,30 +312,24 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pd01_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_pd_server_pd02_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd02_port: + network.incoming.packets.rate_pd_server_pd01_port_0: 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_pd_server_pd02_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - network.incoming.bytes.rate_pd_server_pd02_port: + network.incoming.bytes.rate_pd_server_pd01_port_0: 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_pd_server_pd02_port: + network.outgoing.packets.rate_pd_server_pd01_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -351,6 +347,11 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_pd_server_pd01_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED disk.device.write.requests_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -362,35 +363,24 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pd01_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - forwarder_pd_server_pd02_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED disk.capacity_pd_server: 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_pd_server: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_pd_server_pd01_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - disk.allocation_pd_server: + disk.device.allocation_pd_server: 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_pd_server_pd02_port: + disk.allocation_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -407,6 +397,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes.rate_pd_server_pd01_port_0: + 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_pd_server: type: tosca.capabilities.Node occurrences: @@ -418,33 +414,37 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pd02_port: + network.outgoing.bytes.rate_pd_server_pd02_port_0: 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_pd_server_pd01_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 + disk.write.bytes_pd_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - - 0 + - 1 - UNBOUNDED - disk.write.bytes_pd_server: + network.outgoing.bytes_pd_server_pd02_port_0: 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_pd_server_pd01_port: + network.outgoing.bytes_pd_server_pd01_port_0: 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_pd_server_pd01_port: + network.incoming.bytes_pd_server_pd02_port_0: + 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_pd_server_pd01_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -474,6 +474,18 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets_pd_server_pd02_port_0: + 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_pd_server_pd01_port_0: + 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_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -493,19 +505,20 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pd01_port: + network.incoming.packets.rate_pd_server_pd02_port_0: 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 - attachment_pd_server_pd02_port: - type: tosca.capabilities.Attachment + network.incoming.bytes.rate_pd_server_pd02_port_0: + 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_pd_server_pd01_port: - type: org.openecomp.capabilities.Forwarder + feature_pd_server_pd01_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -521,24 +534,18 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.write.requests_pd_server: - 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_pd_server_pd01_port: - type: tosca.capabilities.Node + attachment_pd_server_pd02_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - disk.device.latency_pd_server: + disk.write.requests_pd_server: 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_pd_server_pd02_port: + disk.device.latency_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -556,21 +563,14 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pd01_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.device.iops_pd_server: 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_pd_server_pd02_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_pd_server_pd02_port_0: + type: org.openecomp.capabilities.Forwarder 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/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 c07b4fffca..5c85dd2bea 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 @@ -832,6 +832,17 @@ topology_template: directives: - substitutable properties: + port_pd01_port_0_mac_requirements: + mac_count_required: + is_required: false + port_pd01_port_0_network: + - get_input: oam_net_name + port_pd01_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: @@ -840,34 +851,23 @@ topology_template: - 0 vm_flavor_name: get_input: pd_flavor_name - port_pd02_port_network_role_tag: oam - port_pd01_port_mac_requirements: - mac_count_required: - is_required: false + port_pd02_port_0_network: + - get_input: oam_net_name vm_image_name: get_input: pd_image_name - port_pd01_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false + port_pd02_port_0_network_role_tag: oam compute_pd_server_user_data_format: - RAW - port_pd02_port_mac_requirements: - mac_count_required: - is_required: false - port_pd01_port_network: - - get_input: oam_net_name - port_pd02_port_ip_requirements: + port_pd02_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_network_role_tag: oam - port_pd02_port_network: - - get_input: oam_net_name + port_pd01_port_0_network_role_tag: oam + port_pd02_port_0_mac_requirements: + mac_count_required: + is_required: false service_template_filter: substitute_service_template: Nested_pd_serverServiceTemplate.yaml count: 1 @@ -890,13 +890,13 @@ topology_template: value: get_attribute: - abstract_pd_server - - pd_server_pd02_port_device_owner + - pd_server_pd02_port_0_device_owner out3: description: output_regula value: get_attribute: - abstract_pd_server - - pd_server_pd01_port_device_id + - pd_server_pd01_port_0_device_id out1: description: output_regula value: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml index 2703eb2e77..3655e81659 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml @@ -11,6 +11,22 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pd01_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_pd01_port_0_network: + type: list + required: true + entry_schema: + type: string + port_pd01_port_0_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role: + type: string + required: true compute_pd_server_availability_zone: type: list required: true @@ -24,34 +40,37 @@ topology_template: vm_flavor_name: type: string required: true - port_pd02_port_network_role_tag: - type: string + port_pd02_port_0_network: + type: list required: true - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + entry_schema: + type: string + port_pd01_port_0_order: + type: integer required: true vm_image_name: type: string required: true - port_pd01_port_ip_requirements: - type: list + port_pd02_port_0_network_role_tag: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd02_port_network_role: + port_pd01_port_0_subnetpoolid: type: string required: true - port_pd01_port_vlan_requirements: + compute_pd_server_user_data_format: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - compute_pd_server_user_data_format: + type: string + port_pd02_port_0_ip_requirements: type: list required: true entry_schema: - type: string - port_pd02_port_related_networks: + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role_tag: + type: string + required: true + port_pd01_port_0_related_networks: type: list required: true entry_schema: @@ -63,58 +82,39 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_pd02_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_pd01_port_exCP_naming: + port_pd02_port_0_exCP_naming: type: org.openecomp.datatypes.Naming required: true - port_pd01_port_related_networks: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd02_port_order: - type: integer + port_pd01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - port_pd02_port_subnetpoolid: + port_pd02_port_0_network_role: type: string required: true - port_pd02_port_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd01_port_network: - type: list + port_pd02_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: string - port_pd01_port_order: + port_pd02_port_0_order: type: integer required: true - port_pd01_port_subnetpoolid: - type: string - required: true - port_pd02_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd02_port_0_related_networks: + type: list required: true - port_pd01_port_network_role: + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd02_port_0_subnetpoolid: type: string required: true - port_pd02_port_ip_requirements: + port_pd02_port_0_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network_role_tag: - type: string - required: true - port_pd02_port_network: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_0_vlan_requirements: type: list required: true entry_schema: - type: string + type: org.openecomp.datatypes.network.VlanRequirements node_templates: pd_server: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server @@ -135,62 +135,62 @@ topology_template: get_input: - compute_pd_server_user_data_format - index_value - pd_server_pd01_port: + pd_server_pd02_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd01_port_exCP_naming + get_input: port_pd02_port_0_exCP_naming vlan_requirements: - get_input: port_pd01_port_vlan_requirements + get_input: port_pd02_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_pd01_port_related_networks + get_input: port_pd02_port_0_related_networks ip_requirements: - get_input: port_pd01_port_ip_requirements + get_input: port_pd02_port_0_ip_requirements network_role_tag: - get_input: port_pd01_port_network_role_tag + get_input: port_pd02_port_0_network_role_tag mac_requirements: - get_input: port_pd01_port_mac_requirements + get_input: port_pd02_port_0_mac_requirements order: - get_input: port_pd01_port_order + get_input: port_pd02_port_0_order network_role: - get_input: port_pd01_port_network_role + get_input: port_pd02_port_0_network_role subnetpoolid: - get_input: port_pd01_port_subnetpoolid + get_input: port_pd02_port_0_subnetpoolid network: get_input: - - port_pd01_port_network + - port_pd02_port_0_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: pd_server relationship: tosca.relationships.network.BindsTo - pd_server_pd02_port: + pd_server_pd01_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd02_port_exCP_naming + get_input: port_pd01_port_0_exCP_naming vlan_requirements: - get_input: port_pd02_port_vlan_requirements + get_input: port_pd01_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_pd02_port_related_networks + get_input: port_pd01_port_0_related_networks ip_requirements: - get_input: port_pd02_port_ip_requirements + get_input: port_pd01_port_0_ip_requirements network_role_tag: - get_input: port_pd02_port_network_role_tag + get_input: port_pd01_port_0_network_role_tag mac_requirements: - get_input: port_pd02_port_mac_requirements + get_input: port_pd01_port_0_mac_requirements order: - get_input: port_pd02_port_order + get_input: port_pd01_port_0_order network_role: - get_input: port_pd02_port_network_role + get_input: port_pd01_port_0_network_role subnetpoolid: - get_input: port_pd02_port_subnetpoolid + get_input: port_pd01_port_0_subnetpoolid network: get_input: - - port_pd02_port_network + - port_pd01_port_0_network - index_value requirements: - binding: @@ -198,27 +198,33 @@ topology_template: node: pd_server relationship: tosca.relationships.network.BindsTo outputs: + pd_server_pd01_port_0_device_id: + type: string + value: + get_attribute: + - pd_server_pd01_port_0 + - device_id pd_server_accessIPv4: type: string value: get_attribute: - pd_server - accessIPv4 - pd_server_pd02_port_device_owner: + pd_server_pd02_port_0_device_owner: type: string value: get_attribute: - - pd_server_pd02_port + - pd_server_pd02_port_0 - device_owner - pd_server_pd01_port_device_id: - type: string - value: - get_attribute: - - pd_server_pd01_port - - device_id substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server capabilities: + binding_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - binding + binding_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - binding scalable_pd_server: - pd_server - scalable @@ -234,18 +240,15 @@ topology_template: disk.device.usage_pd_server: - pd_server - disk.device.usage - network.outgoing.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.packets.rate os_pd_server: - pd_server - os disk.write.bytes.rate_pd_server: - pd_server - disk.write.bytes.rate - network.incoming.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes + network.outgoing.packets.rate_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.outgoing.packets.rate cpu_pd_server: - pd_server - cpu @@ -261,15 +264,12 @@ topology_template: disk.device.read.bytes.rate_pd_server: - pd_server - disk.device.read.bytes.rate - binding_pd_server_pd02_port: - - pd_server_pd02_port - - binding - network.outgoing.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes - network.outgoing.packets.rate_pd_server_pd02_port: - - pd_server_pd02_port - - network.outgoing.packets.rate + network.outpoing.packets_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.outpoing.packets + network.incoming.packets_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.packets disk.iops_pd_server: - pd_server - disk.iops @@ -279,78 +279,78 @@ topology_template: cpu.delta_pd_server: - pd_server - cpu.delta - network.incoming.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets.rate - network.outgoing.bytes_pd_server_pd02_port: - - pd_server_pd02_port - - network.outgoing.bytes - feature_pd_server_pd02_port: - - pd_server_pd02_port + feature_pd_server_pd02_port_0: + - pd_server_pd02_port_0 - feature - network.incoming.bytes.rate_pd_server_pd02_port: - - pd_server_pd02_port + network.incoming.packets.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.packets.rate + network.incoming.bytes.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 - network.incoming.bytes.rate - network.outgoing.bytes.rate_pd_server_pd02_port: - - pd_server_pd02_port - - network.outgoing.bytes.rate + network.outgoing.packets.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.packets.rate vcpus_pd_server: - pd_server - vcpus disk.device.write.bytes.rate_pd_server: - pd_server - disk.device.write.bytes.rate + attachment_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - attachment disk.device.write.requests_pd_server: - pd_server - disk.device.write.requests endpoint_pd_server: - pd_server - endpoint - attachment_pd_server_pd01_port: - - pd_server_pd01_port - - attachment - forwarder_pd_server_pd02_port: - - pd_server_pd02_port - - forwarder disk.capacity_pd_server: - pd_server - disk.capacity + forwarder_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - forwarder disk.device.allocation_pd_server: - pd_server - disk.device.allocation disk.allocation_pd_server: - pd_server - disk.allocation - network.incoming.packets_pd_server_pd02_port: - - pd_server_pd02_port - - network.incoming.packets binding_pd_server: - pd_server - binding disk.read.requests_pd_server: - pd_server - disk.read.requests + network.outgoing.bytes.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.bytes.rate feature_pd_server: - pd_server - feature disk.usage_pd_server: - pd_server - disk.usage - network.outpoing.packets_pd_server_pd02_port: - - pd_server_pd02_port - - network.outpoing.packets - binding_pd_server_pd01_port: - - pd_server_pd01_port - - binding + network.outgoing.bytes.rate_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.outgoing.bytes.rate disk.write.bytes_pd_server: - pd_server - disk.write.bytes - network.incoming.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes.rate - network.incoming.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets + network.outgoing.bytes_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.outgoing.bytes + network.outgoing.bytes_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.bytes + network.incoming.bytes_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.incoming.bytes + network.incoming.bytes_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.bytes disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -363,6 +363,12 @@ topology_template: disk.device.write.bytes_pd_server: - pd_server - disk.device.write.bytes + network.incoming.packets_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.incoming.packets + network.outpoing.packets_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outpoing.packets disk.device.read.requests_pd_server: - pd_server - disk.device.read.requests @@ -372,64 +378,58 @@ topology_template: host_pd_server: - pd_server - host - network.outpoing.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.outpoing.packets - attachment_pd_server_pd02_port: - - pd_server_pd02_port - - attachment - forwarder_pd_server_pd01_port: - - pd_server_pd01_port - - forwarder + network.incoming.packets.rate_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.incoming.packets.rate + network.incoming.bytes.rate_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.incoming.bytes.rate + feature_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - feature disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate disk.ephemeral.size_pd_server: - pd_server - disk.ephemeral.size + attachment_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - attachment disk.write.requests_pd_server: - pd_server - disk.write.requests - feature_pd_server_pd01_port: - - pd_server_pd01_port - - feature disk.device.latency_pd_server: - pd_server - disk.device.latency - network.incoming.packets.rate_pd_server_pd02_port: - - pd_server_pd02_port - - network.incoming.packets.rate disk.latency_pd_server: - pd_server - disk.latency disk.device.capacity_pd_server: - pd_server - disk.device.capacity - network.outgoing.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes.rate disk.device.iops_pd_server: - pd_server - disk.device.iops - network.incoming.bytes_pd_server_pd02_port: - - pd_server_pd02_port - - network.incoming.bytes + forwarder_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - forwarder requirements: local_storage_pd_server: - pd_server - local_storage - link_pd_server_pd02_port: - - pd_server_pd02_port - - link - link_pd_server_pd01_port: - - pd_server_pd01_port - - link - dependency_pd_server_pd01_port: - - pd_server_pd01_port - - dependency dependency_pd_server: - pd_server - dependency - dependency_pd_server_pd02_port: - - pd_server_pd02_port - - dependency \ No newline at end of file + link_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - link + dependency_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - dependency + dependency_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - dependency + link_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - link \ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/GlobalSubstitutionTypesServiceTemplate.yaml index ddd2d22fa3..1b612b79fa 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,110 +8,120 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_template_VMInt_OAM_lb_4_network_role: + type: string + required: true + status: SUPPORTED compute_pd_server_key_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd01_port_replacement_policy: + port_pd01_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_pd01_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string + type: org.openecomp.datatypes.network.IpRequirements compute_pd_server_personality: type: list required: true status: SUPPORTED entry_schema: type: json + port_pd01_port_0_replacement_policy: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string compute_pd_server_image_update_policy: type: list required: true status: SUPPORTED entry_schema: type: string + port_pd01_port_0_name: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string vm_flavor_name: type: string required: true status: SUPPORTED - port_pd01_port_security_groups: + port_pd01_port_0_binding:vnic_type: type: list required: true status: SUPPORTED entry_schema: - type: json - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + type: string + port_pd01_port_0_order: + type: integer required: true status: SUPPORTED - vm_image_name: - type: string + port_template_VMInt_OAM_lb_4_virtual_machine_interface_allowed_address_pairs: + type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs required: true status: SUPPORTED - port_template_VMInt_OAM_lb_virtual_machine_interface_properties: - type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.interface.Properties + vm_image_name: + type: string required: true status: SUPPORTED - port_template_VMInt_OAM_lb_related_networks: + port_pd01_port_0_port_security_enabled: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd01_port_device_id: + type: boolean + port_pd01_port_0_value_specs: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd01_port_admin_state_up: + type: json + port_pd01_port_0_admin_state_up: type: list required: true status: SUPPORTED entry_schema: type: boolean - port_pd01_port_vlan_requirements: + port_pd01_port_0_subnetpoolid: + type: string + required: true + status: SUPPORTED + port_template_VMInt_OAM_lb_4_virtual_network_refs: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: json compute_pd_server_metadata: type: list required: true status: SUPPORTED entry_schema: type: json - port_template_VMInt_OAM_lb_subnetpoolid: - type: string - required: true - status: SUPPORTED compute_pd_server_diskConfig: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd01_port_mac_address: + port_pd01_port_0_mac_address: type: string required: true status: SUPPORTED - port_template_VMInt_OAM_lb_network_role: + port_pd01_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_pd01_port_allowed_address_pairs: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.network.AddressPair - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED compute_pd_server_admin_pass: type: list required: true @@ -124,39 +134,39 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_related_networks: + port_pd01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_template_VMInt_OAM_lb_4_security_group_refs: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_template_VMInt_OAM_lb_ip_requirements: + type: json + port_template_VMInt_OAM_lb_4_virtual_machine_interface_mac_addresses: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_template_VMInt_OAM_lb_exCP_naming: + type: json + port_template_VMInt_OAM_lb_4_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_template_VMInt_OAM_lb_virtual_machine_interface_allowed_address_pairs: - type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs - required: true - status: SUPPORTED - port_pd01_port_value_specs: + port_template_VMInt_OAM_lb_4_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: json - compute_pd_server_security_groups: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd01_port_0_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: json - port_template_VMInt_OAM_lb_port_tuple_refs: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + compute_pd_server_security_groups: type: list required: true status: SUPPORTED @@ -168,74 +178,70 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_network_role_tag: - type: string - required: true - status: SUPPORTED - compute_pd_server_scheduler_hints: + port_pd01_port_0_security_groups: type: list required: true status: SUPPORTED entry_schema: type: json - port_pd01_port_name: + compute_pd_server_scheduler_hints: type: list required: true status: SUPPORTED entry_schema: - type: string + type: json compute_pd_server_contrail_service_instance_ind: type: list required: true status: SUPPORTED entry_schema: type: boolean - compute_pd_server_availability_zone: + port_template_VMInt_OAM_lb_4_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - compute_pd_server_name: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_0_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_template_VMInt_OAM_lb_network_role_tag: + port_pd01_port_0_network_role: type: string required: true status: SUPPORTED - port_pd01_port_binding:vnic_type: + compute_pd_server_availability_zone: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd01_port_device_owner: + compute_pd_server_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd01_port_fixed_ips: - type: list + port_template_VMInt_OAM_lb_4_virtual_machine_interface_properties: + type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.interface.Properties required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_pd01_port_ip_requirements: + port_template_VMInt_OAM_lb_4_ip_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_qos_policy: - type: list + port_template_VMInt_OAM_lb_4_subnetpoolid: + type: string + required: true + status: SUPPORTED + port_template_VMInt_OAM_lb_4_network_role_tag: + type: string required: true status: SUPPORTED - entry_schema: - type: string compute_pd_server_config_drive: type: list required: true @@ -248,192 +254,186 @@ node_types: status: SUPPORTED entry_schema: type: string - port_template_VMInt_OAM_lb_virtual_network_refs: + port_pd01_port_0_allowed_address_pairs: type: list required: true status: SUPPORTED entry_schema: - type: json - 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_template_VMInt_OAM_lb_order: - type: integer - required: true - status: SUPPORTED - port_template_VMInt_OAM_lb_virtual_machine_interface_mac_addresses: + type: org.openecomp.datatypes.heat.network.AddressPair + port_pd01_port_0_device_id: type: list required: true status: SUPPORTED entry_schema: - type: json - port_template_VMInt_OAM_lb_name: + type: string + port_pd01_port_0_qos_policy: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd01_port_port_security_enabled: + port_pd01_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: boolean - port_template_VMInt_OAM_lb_vlan_requirements: - type: list - required: true + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - compute_pd_server_user_data_update_policy: + constraints: + - greater_or_equal: 0 + port_template_VMInt_OAM_lb_4_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd01_port_network: + port_template_VMInt_OAM_lb_4_order: + type: integer + required: true + status: SUPPORTED + compute_pd_server_user_data_update_policy: type: list required: true status: SUPPORTED entry_schema: type: string - compute_pd_server_reservation_id: + port_pd01_port_0_device_owner: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd01_port_order: - type: integer - required: true - status: SUPPORTED - port_pd01_port_subnetpoolid: - type: string - required: true - status: SUPPORTED - port_template_VMInt_OAM_lb_mac_requirements: + port_template_VMInt_OAM_lb_4_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_pd01_port_network_role: - type: string - required: true - status: SUPPORTED - port_template_VMInt_OAM_lb_security_group_refs: + compute_pd_server_reservation_id: type: list required: true status: SUPPORTED entry_schema: - type: json - attributes: - pd_server_pd01_port_allowed_address_pairs: + type: string + port_template_VMInt_OAM_lb_4_port_tuple_refs: type: list + required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.network.AddressPair - pd_server_template_VMInt_OAM_lb_virtual_machine_interface_mac_addresses: + type: json + port_pd01_port_0_vlan_requirements: type: list + required: true status: SUPPORTED entry_schema: - type: string - pd_server_template_VMInt_OAM_lb_virtual_network_refs: - type: list + type: org.openecomp.datatypes.network.VlanRequirements + attributes: + pd_server_pd01_port_0_port_security_enabled: + type: boolean status: SUPPORTED - entry_schema: - type: string - pd_server_template_VMInt_OAM_lb_fq_name: + pd_server_show: type: string status: SUPPORTED - pd_server_show: + pd_server_template_VMInt_OAM_lb_4_name: type: string status: SUPPORTED + pd_server_pd01_port_0_allowed_address_pairs: + type: list + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.heat.network.AddressPair pd_server_console_urls: type: string status: SUPPORTED - pd_server_template_VMInt_OAM_lb_virtual_machine_interface_allowed_address_pairs: - type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs - status: SUPPORTED - pd_server_pd01_port_security_groups: + pd_server_pd01_port_0_security_groups: type: list status: SUPPORTED entry_schema: type: string - pd_server_pd01_port_port_security_enabled: - type: boolean - status: SUPPORTED - pd_server_pd01_port_status: + pd_server_pd01_port_0_tenant_id: type: string status: SUPPORTED - pd_server_template_VMInt_OAM_lb_port_tuple_refs: + pd_server_template_VMInt_OAM_lb_4_virtual_machine_interface_mac_addresses: type: list status: SUPPORTED entry_schema: type: string - pd_server_pd01_port_fixed_ips: - type: list + pd_server_template_VMInt_OAM_lb_4_fq_name: + type: string status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - pd_server_accessIPv6: + pd_server_pd01_port_0_name: type: string status: SUPPORTED - pd_server_pd01_port_admin_state_up: - type: boolean + pd_server_template_VMInt_OAM_lb_4_virtual_machine_interface_properties: + type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.interface.Properties status: SUPPORTED - pd_server_instance_name: - type: string + pd_server_pd01_port_0_subnets: + type: list status: SUPPORTED - pd_server_template_VMInt_OAM_lb_name: + entry_schema: + type: string + pd_server_pd01_port_0_show: type: string status: SUPPORTED - pd_server_accessIPv4: + pd_server_pd01_port_0_status: type: string status: SUPPORTED - pd_server_pd01_port_device_owner: + pd_server_pd01_port_0_qos_policy: type: string status: SUPPORTED - pd_server_pd01_port_show: + pd_server_accessIPv6: type: string status: SUPPORTED - pd_server_pd01_port_network: + pd_server_instance_name: type: string status: SUPPORTED - pd_server_pd01_port_qos_policy: + pd_server_accessIPv4: type: string status: SUPPORTED - pd_server_pd01_port_mac_address: - type: string + pd_server_pd01_port_0_admin_state_up: + type: boolean status: SUPPORTED + pd_server_template_VMInt_OAM_lb_4_virtual_network_refs: + type: list + status: SUPPORTED + entry_schema: + type: string pd_server_addresses: type: map status: SUPPORTED entry_schema: type: org.openecomp.datatypes.heat.novaServer.network.AddressInfo - pd_server_pd01_port_tenant_id: + pd_server_pd01_port_0_device_id: type: string status: SUPPORTED - pd_server_template_VMInt_OAM_lb_virtual_machine_interface_properties: - type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.interface.Properties - status: SUPPORTED - pd_server_pd01_port_device_id: + pd_server_pd01_port_0_network: type: string status: SUPPORTED - pd_server_pd01_port_name: + pd_server_pd01_port_0_mac_address: type: string status: SUPPORTED - pd_server_template_VMInt_OAM_lb_show: + pd_server_pd01_port_0_device_owner: type: string status: SUPPORTED - pd_server_pd01_port_subnets: + pd_server_pd01_port_0_fixed_ips: + type: list + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + pd_server_template_VMInt_OAM_lb_4_port_tuple_refs: type: list status: SUPPORTED entry_schema: type: string + pd_server_template_VMInt_OAM_lb_4_show: + type: string + status: SUPPORTED + pd_server_template_VMInt_OAM_lb_4_virtual_machine_interface_allowed_address_pairs: + type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs + status: SUPPORTED requirements: - dependency_pd_server: capability: tosca.capabilities.Node @@ -449,33 +449,41 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_template_VMInt_OAM_lb: + - dependency_pd_server_template_VMInt_OAM_lb_4: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_template_VMInt_OAM_lb: + - link_pd_server_template_VMInt_OAM_lb_4: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_pd_server_pd01_port: + - dependency_pd_server_pd01_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd01_port: + - link_pd_server_pd01_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: + binding_pd_server_pd01_port_0: + 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 scalable_pd_server: type: tosca.capabilities.Scalable occurrences: @@ -487,31 +495,31 @@ node_types: occurrences: - 1 - UNBOUNDED - memory.usage_pd_server: + network.outpoing.packets_pd_server_template_VMInt_OAM_lb_4: 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_pd_server: + memory.usage_pd_server: 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_pd_server: + memory_pd_server: 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.packets.rate_pd_server_pd01_port: + disk.device.usage_pd_server: 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.packets.rate_pd_server_template_VMInt_OAM_lb: + network.incoming.packets_pd_server_template_VMInt_OAM_lb_4: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -528,7 +536,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd01_port: + network.outgoing.bytes.rate_pd_server_template_VMInt_OAM_lb_4: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -540,12 +548,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_template_VMInt_OAM_lb: - 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_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -570,7 +572,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd01_port: + network.incoming.packets_pd_server_pd01_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -582,70 +584,80 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_template_VMInt_OAM_lb: + memory.resident_pd_server: 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_pd_server: + cpu.delta_pd_server: 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_pd_server: + network.incoming.packets.rate_pd_server_pd01_port_0: 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_pd_server_pd01_port: + network.incoming.bytes.rate_pd_server_pd01_port_0: 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_pd_server: + network.outgoing.packets.rate_pd_server_pd01_port_0: 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_pd_server: + vcpus_pd_server: 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_pd_server: + disk.device.write.bytes.rate_pd_server: 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_pd_server: - type: tosca.capabilities.Endpoint.Admin + forwarder_pd_server_template_VMInt_OAM_lb_4: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - attachment_pd_server_pd01_port: + attachment_pd_server_pd01_port_0: type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_template_VMInt_OAM_lb: + disk.device.write.requests_pd_server: 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_pd_server: + type: tosca.capabilities.Endpoint.Admin + occurrences: + - 1 + - UNBOUNDED disk.capacity_pd_server: 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_pd_server_pd01_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.allocation_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -669,62 +681,60 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server: - type: tosca.capabilities.Node + network.incoming.bytes_pd_server_template_VMInt_OAM_lb_4: + 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_pd_server: + network.outgoing.bytes.rate_pd_server_pd01_port_0: 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_pd_server_pd01_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 + feature_pd_server: + type: tosca.capabilities.Node occurrences: - - 0 + - 1 - UNBOUNDED - disk.write.bytes_pd_server: + disk.usage_pd_server: 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_pd_server_pd01_port: + disk.write.bytes_pd_server: 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_pd_server_pd01_port: + network.outgoing.bytes_pd_server_pd01_port_0: 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_pd_server: + network.incoming.bytes_pd_server_pd01_port_0: 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_pd_server: + disk.device.read.requests.rate_pd_server: 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_pd_server: + disk.root.size_pd_server: 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_pd_server_template_VMInt_OAM_lb: + disk.device.read.bytes_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -736,24 +746,19 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_template_VMInt_OAM_lb: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - disk.device.read.requests_pd_server: + network.outpoing.packets_pd_server_pd01_port_0: 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_pd_server_template_VMInt_OAM_lb: + network.incoming.bytes.rate_pd_server_template_VMInt_OAM_lb_4: 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_pd_server_template_VMInt_OAM_lb: + disk.device.read.requests_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -772,27 +777,14 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pd01_port: + network.incoming.packets.rate_pd_server_template_VMInt_OAM_lb_4: 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_pd_server_template_VMInt_OAM_lb: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - binding_pd_server_template_VMInt_OAM_lb: - 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 - forwarder_pd_server_pd01_port: - type: org.openecomp.capabilities.Forwarder + feature_pd_server_pd01_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -808,20 +800,21 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.write.requests_pd_server: + network.outgoing.packets.rate_pd_server_template_VMInt_OAM_lb_4: 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_pd_server_template_VMInt_OAM_lb: + disk.write.requests_pd_server: 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_pd_server_pd01_port: - type: tosca.capabilities.Node + network.outgoing.bytes_pd_server_template_VMInt_OAM_lb_4: + 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 @@ -843,12 +836,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pd01_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_pd_server_template_VMInt_OAM_lb_4: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED + binding_pd_server_template_VMInt_OAM_lb_4: + 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 disk.device.iops_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. 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 4712348457..efc5e3cf12 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 @@ -264,20 +264,20 @@ topology_template: availability_zone: get_attribute: - abstract_pd_server - - pd_server_template_VMInt_OAM_lb_virtual_machine_interface_mac_addresses + - pd_server_template_VMInt_OAM_lb_4_virtual_machine_interface_mac_addresses - mac_address image: get_attribute: - abstract_pd_server - - pd_server_template_VMInt_OAM_lb_port_tuple_refs + - pd_server_template_VMInt_OAM_lb_4_port_tuple_refs metadata: get_attribute: - abstract_pd_server - - pd_server_template_VMInt_OAM_lb_virtual_machine_interface_mac_addresses + - pd_server_template_VMInt_OAM_lb_4_virtual_machine_interface_mac_addresses volume_type: get_attribute: - abstract_pd_server - - pd_server_template_VMInt_OAM_lb_virtual_machine_interface_allowed_address_pairs + - pd_server_template_VMInt_OAM_lb_4_virtual_machine_interface_allowed_address_pairs - allowed_address_pair - 0 - ip @@ -285,7 +285,7 @@ topology_template: volume_id: get_attribute: - abstract_pd_server - - pd_server_template_VMInt_OAM_lb_virtual_machine_interface_allowed_address_pairs + - pd_server_template_VMInt_OAM_lb_4_virtual_machine_interface_allowed_address_pairs - allowed_address_pair - 0 - ip @@ -293,30 +293,30 @@ topology_template: snapshot_id: get_attribute: - abstract_pd_server - - pd_server_template_VMInt_OAM_lb_virtual_machine_interface_allowed_address_pairs + - pd_server_template_VMInt_OAM_lb_4_virtual_machine_interface_allowed_address_pairs - allowed_address_pair - 0 - address_mode description: get_attribute: - abstract_pd_server - - pd_server_template_VMInt_OAM_lb_virtual_network_refs + - pd_server_template_VMInt_OAM_lb_4_virtual_network_refs device_type: get_attribute: - abstract_pd_server - - pd_server_template_VMInt_OAM_lb_virtual_machine_interface_properties + - pd_server_template_VMInt_OAM_lb_4_virtual_machine_interface_properties - virtual_machine_interface_properties_service_interface_type disk_bus: get_attribute: - abstract_pd_server - - pd_server_template_VMInt_OAM_lb_virtual_machine_interface_allowed_address_pairs + - pd_server_template_VMInt_OAM_lb_4_virtual_machine_interface_allowed_address_pairs - allowed_address_pair - 0 - ip source_volid: get_attribute: - abstract_pd_server - - pd_server_template_VMInt_OAM_lb_virtual_machine_interface_allowed_address_pairs + - pd_server_template_VMInt_OAM_lb_4_virtual_machine_interface_allowed_address_pairs - allowed_address_pair - 0 - mac @@ -324,79 +324,79 @@ topology_template: name: get_attribute: - abstract_pd_server - - pd_server_template_VMInt_OAM_lb_name + - pd_server_template_VMInt_OAM_lb_4_name swap_size: get_attribute: - abstract_pd_server - - pd_server_template_VMInt_OAM_lb_show + - pd_server_template_VMInt_OAM_lb_4_show delete_on_termination: get_attribute: - abstract_pd_server - - pd_server_template_VMInt_OAM_lb_fq_name + - pd_server_template_VMInt_OAM_lb_4_fq_name multiattach: get_attribute: - abstract_pd_server - - pd_server_template_VMInt_OAM_lb_virtual_machine_interface_properties + - pd_server_template_VMInt_OAM_lb_4_virtual_machine_interface_properties cmaui_volume_test_neutron_port_properties: type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume properties: image: get_attribute: - abstract_pd_server - - pd_server_pd01_port_admin_state_up + - pd_server_pd01_port_0_admin_state_up metadata: get_attribute: - abstract_pd_server - - pd_server_pd01_port_allowed_address_pairs + - pd_server_pd01_port_0_allowed_address_pairs volume_type: get_attribute: - abstract_pd_server - - pd_server_pd01_port_security_groups + - pd_server_pd01_port_0_security_groups volume_id: get_attribute: - abstract_pd_server - - pd_server_pd01_port_qos_policy + - pd_server_pd01_port_0_qos_policy snapshot_id: get_attribute: - abstract_pd_server - - pd_server_pd01_port_name + - pd_server_pd01_port_0_name device_type: get_attribute: - abstract_pd_server - - pd_server_pd01_port_show + - pd_server_pd01_port_0_show disk_bus: get_attribute: - abstract_pd_server - - pd_server_pd01_port_subnets + - pd_server_pd01_port_0_subnets backup_id: get_attribute: - abstract_pd_server - - pd_server_pd01_port_network + - pd_server_pd01_port_0_network source_volid: get_attribute: - abstract_pd_server - - pd_server_pd01_port_port_security_enabled + - pd_server_pd01_port_0_port_security_enabled size: '(get_attribute : [pd01_port_0, network]) * 1024' read_only: get_attribute: - abstract_pd_server - - pd_server_pd01_port_device_owner + - pd_server_pd01_port_0_device_owner name: get_attribute: - abstract_pd_server - - pd_server_pd01_port_device_id + - pd_server_pd01_port_0_device_id scheduler_hints: get_attribute: - abstract_pd_server - - pd_server_pd01_port_fixed_ips + - pd_server_pd01_port_0_fixed_ips swap_size: get_attribute: - abstract_pd_server - - pd_server_pd01_port_tenant_id + - pd_server_pd01_port_0_tenant_id delete_on_termination: get_attribute: - abstract_pd_server - - pd_server_pd01_port_status + - pd_server_pd01_port_0_status jsa_net4: type: org.openecomp.resource.vl.nodes.heat.network.contrail.VirtualNetwork properties: @@ -409,98 +409,98 @@ topology_template: properties: compute_pd_server_key_name: - SERVER_PD_KEY_NAME - port_pd01_port_replacement_policy: - - AUTO + port_pd01_port_0_mac_requirements: + mac_count_required: + is_required: true + port_pd01_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false compute_pd_server_personality: - value: SERVER_PD_PERSONALITY + port_pd01_port_0_replacement_policy: + - AUTO compute_pd_server_image_update_policy: - REBUILD_PRESERVE_EPHEMERAL + port_pd01_port_0_name: + - PORT_PD_NAME vm_flavor_name: get_input: pd_flavor_name - port_pd01_port_security_groups: - - - DB_Affinity_group - port_pd01_port_mac_requirements: - mac_count_required: - is_required: true + port_pd01_port_0_binding:vnic_type: + - direct-physical vm_image_name: get_input: pd_image_name - port_pd01_port_device_id: - - PORT_PD_DEVICE_ID - port_pd01_port_admin_state_up: + port_pd01_port_0_port_security_enabled: + - false + port_pd01_port_0_value_specs: + - value: PORT_PD_VALUE_SPECS + port_pd01_port_0_admin_state_up: - true + port_template_VMInt_OAM_lb_4_virtual_network_refs: + - - get_attribute: + - jsa_net4 + - fq_name compute_pd_server_metadata: - value: SERVER_PD_METADATA compute_pd_server_diskConfig: - AUTO - port_pd01_port_mac_address: 00-13-24-01-44-35 - port_pd01_port_allowed_address_pairs: - - mac_address: 00-14-22-01-23-45 - ip_address: 10.12.13.134 - - mac_address: 00-13-24-01-44-35 - ip_address: 127.0.13.134 + port_pd01_port_0_mac_address: 00-13-24-01-44-35 compute_pd_server_admin_pass: - SERVER_PD_ADMIN_PASS compute_pd_server_flavor_update_policy: - REPLACE - port_pd01_port_value_specs: - - value: PORT_PD_VALUE_SPECS + port_template_VMInt_OAM_lb_4_security_group_refs: + - - get_input: oam_sec_group_name + port_template_VMInt_OAM_lb_4_virtual_machine_interface_mac_addresses: + - - get_input: mac_address + port_pd01_port_0_fixed_ips: + - ip_address: + get_input: pd_port_fixed_ips_address + - subnet: + get_input: pd_port_fixed_ips_subnet compute_pd_server_security_groups: - - get_input: pd_security_group_name - port_template_VMInt_OAM_lb_port_tuple_refs: - - - get_input: template_PortTuple_LB1 compute_pd_server_software_config_transport: - POLL_SERVER_HEAT + port_pd01_port_0_security_groups: + - - DB_Affinity_group compute_pd_server_scheduler_hints: - group: DB_Affinity_group - port_pd01_port_name: - - PORT_PD_NAME compute_pd_server_contrail_service_instance_ind: - true + port_pd01_port_0_network: + - PORT_PD_NETWORK_ID compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: - get_input: - pd_server_names - 0 - port_pd01_port_binding:vnic_type: - - direct-physical - port_pd01_port_device_owner: - - PORT_PD_DEVICE_OWNER - port_pd01_port_fixed_ips: - - ip_address: - get_input: pd_port_fixed_ips_address - - subnet: - get_input: pd_port_fixed_ips_subnet - port_pd01_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false - port_pd01_port_qos_policy: - - PORT_PD_QOS_POLICY compute_pd_server_config_drive: - true compute_pd_server_user_data_format: - RAW - port_template_VMInt_OAM_lb_virtual_network_refs: - - - get_attribute: - - jsa_net4 - - fq_name - port_template_VMInt_OAM_lb_virtual_machine_interface_mac_addresses: - - - get_input: mac_address - port_template_VMInt_OAM_lb_name: + port_pd01_port_0_allowed_address_pairs: + - mac_address: 00-14-22-01-23-45 + ip_address: 10.12.13.134 + - mac_address: 00-13-24-01-44-35 + ip_address: 127.0.13.134 + port_pd01_port_0_device_id: + - PORT_PD_DEVICE_ID + port_pd01_port_0_qos_policy: + - PORT_PD_QOS_POLICY + port_template_VMInt_OAM_lb_4_name: - template_VMInt_OAM_lb_NAME - port_pd01_port_port_security_enabled: - - false compute_pd_server_user_data_update_policy: - IGNORE - port_pd01_port_network: - - PORT_PD_NETWORK_ID + port_pd01_port_0_device_owner: + - PORT_PD_DEVICE_OWNER compute_pd_server_reservation_id: - SERVER_PD_RESERVATION_ID - port_template_VMInt_OAM_lb_security_group_refs: - - - get_input: oam_sec_group_name + port_template_VMInt_OAM_lb_4_port_tuple_refs: + - - get_input: template_PortTuple_LB1 service_template_filter: substitute_service_template: Nested_pd_serverServiceTemplate.yaml count: 1 @@ -558,4 +558,4 @@ topology_template: properties: container_type: host targets: - - DB_Affinity_group + - DB_Affinity_group \ 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/singleSubstitution/inputOutputParamType/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/Nested_pd_serverServiceTemplate.yaml index d3a355c174..20ce70c20b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/Nested_pd_serverServiceTemplate.yaml @@ -11,90 +11,98 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_template_VMInt_OAM_lb_4_network_role: + type: string + required: true compute_pd_server_key_name: type: list required: true entry_schema: type: string - port_pd01_port_replacement_policy: + port_pd01_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_pd01_port_0_ip_requirements: type: list required: true entry_schema: - type: string + type: org.openecomp.datatypes.network.IpRequirements compute_pd_server_personality: type: list required: true entry_schema: type: json + port_pd01_port_0_replacement_policy: + type: list + required: true + entry_schema: + type: string compute_pd_server_image_update_policy: type: list required: true entry_schema: type: string + port_pd01_port_0_name: + type: list + required: true + entry_schema: + type: string vm_flavor_name: type: string required: true - port_pd01_port_security_groups: + port_pd01_port_0_binding:vnic_type: type: list required: true entry_schema: - type: json - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + type: string + port_pd01_port_0_order: + type: integer + required: true + port_template_VMInt_OAM_lb_4_virtual_machine_interface_allowed_address_pairs: + type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs required: true vm_image_name: type: string required: true - port_template_VMInt_OAM_lb_virtual_machine_interface_properties: - type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.interface.Properties - required: true - port_template_VMInt_OAM_lb_related_networks: + port_pd01_port_0_port_security_enabled: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd01_port_device_id: + type: boolean + port_pd01_port_0_value_specs: type: list required: true entry_schema: - type: string - port_pd01_port_admin_state_up: + type: json + port_pd01_port_0_admin_state_up: type: list required: true entry_schema: type: boolean - port_pd01_port_vlan_requirements: + port_pd01_port_0_subnetpoolid: + type: string + required: true + port_template_VMInt_OAM_lb_4_virtual_network_refs: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: json compute_pd_server_metadata: type: list required: true entry_schema: type: json - port_template_VMInt_OAM_lb_subnetpoolid: - type: string - required: true compute_pd_server_diskConfig: type: list required: true entry_schema: type: string - port_pd01_port_mac_address: + port_pd01_port_0_mac_address: type: string required: true - port_template_VMInt_OAM_lb_network_role: + port_pd01_port_0_network_role_tag: type: string required: true - port_pd01_port_allowed_address_pairs: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.heat.network.AddressPair - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true compute_pd_server_admin_pass: type: list required: true @@ -105,33 +113,33 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_related_networks: + port_pd01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_template_VMInt_OAM_lb_4_security_group_refs: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_template_VMInt_OAM_lb_ip_requirements: + type: json + port_template_VMInt_OAM_lb_4_virtual_machine_interface_mac_addresses: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_template_VMInt_OAM_lb_exCP_naming: + type: json + port_template_VMInt_OAM_lb_4_exCP_naming: type: org.openecomp.datatypes.Naming required: true - port_template_VMInt_OAM_lb_virtual_machine_interface_allowed_address_pairs: - type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs - required: true - port_pd01_port_value_specs: + port_template_VMInt_OAM_lb_4_related_networks: type: list required: true entry_schema: - type: json - compute_pd_server_security_groups: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd01_port_0_fixed_ips: type: list required: true entry_schema: - type: json - port_template_VMInt_OAM_lb_port_tuple_refs: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + compute_pd_server_security_groups: type: list required: true entry_schema: @@ -141,62 +149,58 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_network_role_tag: - type: string - required: true - compute_pd_server_scheduler_hints: + port_pd01_port_0_security_groups: type: list required: true entry_schema: type: json - port_pd01_port_name: + compute_pd_server_scheduler_hints: type: list required: true entry_schema: - type: string + type: json compute_pd_server_contrail_service_instance_ind: type: list required: true entry_schema: type: boolean - compute_pd_server_availability_zone: + port_template_VMInt_OAM_lb_4_vlan_requirements: type: list required: true entry_schema: - type: string - compute_pd_server_name: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_0_network: type: list required: true entry_schema: type: string - port_template_VMInt_OAM_lb_network_role_tag: + port_pd01_port_0_network_role: type: string required: true - port_pd01_port_binding:vnic_type: + compute_pd_server_availability_zone: type: list required: true entry_schema: type: string - port_pd01_port_device_owner: + compute_pd_server_name: type: list required: true entry_schema: type: string - port_pd01_port_fixed_ips: - type: list + port_template_VMInt_OAM_lb_4_virtual_machine_interface_properties: + type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.interface.Properties required: true - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_pd01_port_ip_requirements: + port_template_VMInt_OAM_lb_4_ip_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_qos_policy: - type: list + port_template_VMInt_OAM_lb_4_subnetpoolid: + type: string + required: true + port_template_VMInt_OAM_lb_4_network_role_tag: + type: string required: true - entry_schema: - type: string compute_pd_server_config_drive: type: list required: true @@ -207,73 +211,69 @@ topology_template: required: true entry_schema: type: string - port_template_VMInt_OAM_lb_virtual_network_refs: + port_pd01_port_0_allowed_address_pairs: type: list required: true entry_schema: - type: json - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - constraints: - - greater_or_equal: 0 - port_template_VMInt_OAM_lb_order: - type: integer - required: true - port_template_VMInt_OAM_lb_virtual_machine_interface_mac_addresses: + type: org.openecomp.datatypes.heat.network.AddressPair + port_pd01_port_0_device_id: type: list required: true entry_schema: - type: json - port_template_VMInt_OAM_lb_name: + type: string + port_pd01_port_0_qos_policy: type: list required: true entry_schema: type: string - port_pd01_port_port_security_enabled: + port_pd01_port_0_related_networks: type: list required: true entry_schema: - type: boolean - port_template_VMInt_OAM_lb_vlan_requirements: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + constraints: + - greater_or_equal: 0 + port_template_VMInt_OAM_lb_4_name: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: string + port_template_VMInt_OAM_lb_4_order: + type: integer + required: true compute_pd_server_user_data_update_policy: type: list required: true entry_schema: type: string - port_pd01_port_network: + port_pd01_port_0_device_owner: type: list required: true entry_schema: type: string + port_template_VMInt_OAM_lb_4_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true compute_pd_server_reservation_id: type: list required: true entry_schema: type: string - port_pd01_port_order: - type: integer - required: true - port_pd01_port_subnetpoolid: - type: string - required: true - port_template_VMInt_OAM_lb_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_pd01_port_network_role: - type: string - required: true - port_template_VMInt_OAM_lb_security_group_refs: + port_template_VMInt_OAM_lb_4_port_tuple_refs: type: list required: true entry_schema: type: json + port_pd01_port_0_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements node_templates: pd_server: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server @@ -350,134 +350,134 @@ topology_template: get_input: - compute_pd_server_flavor_update_policy - index_value - pd_server_template_VMInt_OAM_lb: + pd_server_template_VMInt_OAM_lb_4: type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface properties: mac_requirements: - get_input: port_template_VMInt_OAM_lb_mac_requirements + get_input: port_template_VMInt_OAM_lb_4_mac_requirements order: - get_input: port_template_VMInt_OAM_lb_order + get_input: port_template_VMInt_OAM_lb_4_order exCP_naming: - get_input: port_template_VMInt_OAM_lb_exCP_naming + get_input: port_template_VMInt_OAM_lb_4_exCP_naming virtual_machine_interface_allowed_address_pairs: get_input: - - port_template_VMInt_OAM_lb_virtual_machine_interface_allowed_address_pairs + - port_template_VMInt_OAM_lb_4_virtual_machine_interface_allowed_address_pairs - index_value vlan_requirements: - get_input: port_template_VMInt_OAM_lb_vlan_requirements + get_input: port_template_VMInt_OAM_lb_4_vlan_requirements virtual_machine_interface_properties: get_input: - - port_template_VMInt_OAM_lb_virtual_machine_interface_properties + - port_template_VMInt_OAM_lb_4_virtual_machine_interface_properties - index_value subinterface_indicator: false related_networks: - get_input: port_template_VMInt_OAM_lb_related_networks + get_input: port_template_VMInt_OAM_lb_4_related_networks security_group_refs: get_input: - - port_template_VMInt_OAM_lb_security_group_refs + - port_template_VMInt_OAM_lb_4_security_group_refs - index_value virtual_network_refs: get_input: - - port_template_VMInt_OAM_lb_virtual_network_refs + - port_template_VMInt_OAM_lb_4_virtual_network_refs - index_value ip_requirements: - get_input: port_template_VMInt_OAM_lb_ip_requirements + get_input: port_template_VMInt_OAM_lb_4_ip_requirements network_role_tag: - get_input: port_template_VMInt_OAM_lb_network_role_tag + get_input: port_template_VMInt_OAM_lb_4_network_role_tag virtual_machine_interface_mac_addresses: get_input: - - port_template_VMInt_OAM_lb_virtual_machine_interface_mac_addresses + - port_template_VMInt_OAM_lb_4_virtual_machine_interface_mac_addresses - index_value port_tuple_refs: get_input: - - port_template_VMInt_OAM_lb_port_tuple_refs + - port_template_VMInt_OAM_lb_4_port_tuple_refs - index_value network_role: - get_input: port_template_VMInt_OAM_lb_network_role + get_input: port_template_VMInt_OAM_lb_4_network_role subnetpoolid: - get_input: port_template_VMInt_OAM_lb_subnetpoolid + get_input: port_template_VMInt_OAM_lb_4_subnetpoolid name: get_input: - - port_template_VMInt_OAM_lb_name + - port_template_VMInt_OAM_lb_4_name - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: pd_server relationship: tosca.relationships.network.BindsTo - pd_server_pd01_port: + pd_server_pd01_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: allowed_address_pairs: - get_input: port_pd01_port_allowed_address_pairs + get_input: port_pd01_port_0_allowed_address_pairs binding:vnic_type: get_input: - - port_pd01_port_binding:vnic_type + - port_pd01_port_0_binding:vnic_type - index_value value_specs: get_input: - - port_pd01_port_value_specs + - port_pd01_port_0_value_specs - index_value network_role_tag: - get_input: port_pd01_port_network_role_tag + get_input: port_pd01_port_0_network_role_tag fixed_ips: get_input: - - port_pd01_port_fixed_ips + - port_pd01_port_0_fixed_ips - index_value subnetpoolid: - get_input: port_pd01_port_subnetpoolid + get_input: port_pd01_port_0_subnetpoolid name: get_input: - - port_pd01_port_name + - port_pd01_port_0_name - index_value network: get_input: - - port_pd01_port_network + - port_pd01_port_0_network - index_value replacement_policy: get_input: - - port_pd01_port_replacement_policy + - port_pd01_port_0_replacement_policy - index_value mac_requirements: - get_input: port_pd01_port_mac_requirements + get_input: port_pd01_port_0_mac_requirements order: - get_input: port_pd01_port_order + get_input: port_pd01_port_0_order device_owner: get_input: - - port_pd01_port_device_owner + - port_pd01_port_0_device_owner - index_value mac_address: - get_input: port_pd01_port_mac_address + get_input: port_pd01_port_0_mac_address security_groups: get_input: - - port_pd01_port_security_groups + - port_pd01_port_0_security_groups - index_value exCP_naming: - get_input: port_pd01_port_exCP_naming + get_input: port_pd01_port_0_exCP_naming vlan_requirements: - get_input: port_pd01_port_vlan_requirements + get_input: port_pd01_port_0_vlan_requirements qos_policy: get_input: - - port_pd01_port_qos_policy + - port_pd01_port_0_qos_policy - index_value subinterface_indicator: false ip_requirements: - get_input: port_pd01_port_ip_requirements + get_input: port_pd01_port_0_ip_requirements related_networks: - get_input: port_pd01_port_related_networks + get_input: port_pd01_port_0_related_networks port_security_enabled: get_input: - - port_pd01_port_port_security_enabled + - port_pd01_port_0_port_security_enabled - index_value admin_state_up: get_input: - - port_pd01_port_admin_state_up + - port_pd01_port_0_admin_state_up - index_value network_role: - get_input: port_pd01_port_network_role + get_input: port_pd01_port_0_network_role device_id: get_input: - - port_pd01_port_device_id + - port_pd01_port_0_device_id - index_value requirements: - binding: @@ -485,150 +485,136 @@ topology_template: node: pd_server relationship: tosca.relationships.network.BindsTo outputs: - pd_server_pd01_port_allowed_address_pairs: + pd_server_pd01_port_0_port_security_enabled: + type: boolean + value: + get_attribute: + - pd_server_pd01_port_0 + - port_security_enabled + pd_server_show: + type: string + value: + get_attribute: + - pd_server + - show + pd_server_template_VMInt_OAM_lb_4_name: + type: string + value: + get_attribute: + - pd_server_template_VMInt_OAM_lb_4 + - name + pd_server_pd01_port_0_allowed_address_pairs: type: list value: get_attribute: - - pd_server_pd01_port + - pd_server_pd01_port_0 - allowed_address_pairs entry_schema: type: org.openecomp.datatypes.heat.network.AddressPair - pd_server_template_VMInt_OAM_lb_virtual_machine_interface_mac_addresses: + pd_server_console_urls: + type: string + value: + get_attribute: + - pd_server + - console_urls + pd_server_pd01_port_0_security_groups: type: list value: get_attribute: - - pd_server_template_VMInt_OAM_lb - - virtual_machine_interface_mac_addresses + - pd_server_pd01_port_0 + - security_groups entry_schema: type: string - pd_server_template_VMInt_OAM_lb_virtual_network_refs: + pd_server_pd01_port_0_tenant_id: + type: string + value: + get_attribute: + - pd_server_pd01_port_0 + - tenant_id + pd_server_template_VMInt_OAM_lb_4_virtual_machine_interface_mac_addresses: type: list value: get_attribute: - - pd_server_template_VMInt_OAM_lb - - virtual_network_refs + - pd_server_template_VMInt_OAM_lb_4 + - virtual_machine_interface_mac_addresses entry_schema: type: string - pd_server_template_VMInt_OAM_lb_fq_name: + pd_server_template_VMInt_OAM_lb_4_fq_name: type: string value: get_attribute: - - pd_server_template_VMInt_OAM_lb + - pd_server_template_VMInt_OAM_lb_4 - fq_name - pd_server_show: - type: string - value: - get_attribute: - - pd_server - - show - pd_server_console_urls: + pd_server_pd01_port_0_name: type: string value: get_attribute: - - pd_server - - console_urls - pd_server_template_VMInt_OAM_lb_virtual_machine_interface_allowed_address_pairs: - type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs + - pd_server_pd01_port_0 + - name + pd_server_template_VMInt_OAM_lb_4_virtual_machine_interface_properties: + type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.interface.Properties value: get_attribute: - - pd_server_template_VMInt_OAM_lb - - virtual_machine_interface_allowed_address_pairs - pd_server_pd01_port_security_groups: + - pd_server_template_VMInt_OAM_lb_4 + - virtual_machine_interface_properties + pd_server_pd01_port_0_subnets: type: list value: get_attribute: - - pd_server_pd01_port - - security_groups + - pd_server_pd01_port_0 + - subnets entry_schema: type: string - pd_server_pd01_port_port_security_enabled: - type: boolean + pd_server_pd01_port_0_show: + type: string value: get_attribute: - - pd_server_pd01_port - - port_security_enabled - pd_server_pd01_port_status: + - pd_server_pd01_port_0 + - show + pd_server_pd01_port_0_status: type: string value: get_attribute: - - pd_server_pd01_port + - pd_server_pd01_port_0 - status - pd_server_template_VMInt_OAM_lb_port_tuple_refs: - type: list - value: - get_attribute: - - pd_server_template_VMInt_OAM_lb - - port_tuple_refs - entry_schema: - type: string - pd_server_pd01_port_fixed_ips: - type: list + pd_server_pd01_port_0_qos_policy: + type: string value: get_attribute: - - pd_server_pd01_port - - fixed_ips - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps + - pd_server_pd01_port_0 + - qos_policy pd_server_accessIPv6: type: string value: get_attribute: - pd_server - accessIPv6 - pd_server_pd01_port_admin_state_up: - type: boolean - value: - get_attribute: - - pd_server_pd01_port - - admin_state_up pd_server_instance_name: type: string value: get_attribute: - pd_server - instance_name - pd_server_template_VMInt_OAM_lb_name: - type: string - value: - get_attribute: - - pd_server_template_VMInt_OAM_lb - - name pd_server_accessIPv4: type: string value: get_attribute: - pd_server - accessIPv4 - pd_server_pd01_port_device_owner: - type: string - value: - get_attribute: - - pd_server_pd01_port - - device_owner - pd_server_pd01_port_show: - type: string - value: - get_attribute: - - pd_server_pd01_port - - show - pd_server_pd01_port_network: - type: string - value: - get_attribute: - - pd_server_pd01_port - - network - pd_server_pd01_port_qos_policy: - type: string + pd_server_pd01_port_0_admin_state_up: + type: boolean value: get_attribute: - - pd_server_pd01_port - - qos_policy - pd_server_pd01_port_mac_address: - type: string + - pd_server_pd01_port_0 + - admin_state_up + pd_server_template_VMInt_OAM_lb_4_virtual_network_refs: + type: list value: get_attribute: - - pd_server_pd01_port - - mac_address + - pd_server_template_VMInt_OAM_lb_4 + - virtual_network_refs + entry_schema: + type: string pd_server_addresses: type: map value: @@ -637,53 +623,73 @@ topology_template: - addresses entry_schema: type: org.openecomp.datatypes.heat.novaServer.network.AddressInfo - pd_server_pd01_port_tenant_id: + pd_server_pd01_port_0_device_id: type: string value: get_attribute: - - pd_server_pd01_port - - tenant_id - pd_server_template_VMInt_OAM_lb_virtual_machine_interface_properties: - type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.interface.Properties + - pd_server_pd01_port_0 + - device_id + pd_server_pd01_port_0_network: + type: string value: get_attribute: - - pd_server_template_VMInt_OAM_lb - - virtual_machine_interface_properties - pd_server_pd01_port_device_id: + - pd_server_pd01_port_0 + - network + pd_server_pd01_port_0_mac_address: type: string value: get_attribute: - - pd_server_pd01_port - - device_id - pd_server_pd01_port_name: + - pd_server_pd01_port_0 + - mac_address + pd_server_pd01_port_0_device_owner: type: string value: get_attribute: - - pd_server_pd01_port - - name - pd_server_template_VMInt_OAM_lb_show: - type: string + - pd_server_pd01_port_0 + - device_owner + pd_server_pd01_port_0_fixed_ips: + type: list value: get_attribute: - - pd_server_template_VMInt_OAM_lb - - show - pd_server_pd01_port_subnets: + - pd_server_pd01_port_0 + - fixed_ips + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + pd_server_template_VMInt_OAM_lb_4_port_tuple_refs: type: list value: get_attribute: - - pd_server_pd01_port - - subnets + - pd_server_template_VMInt_OAM_lb_4 + - port_tuple_refs entry_schema: type: string + pd_server_template_VMInt_OAM_lb_4_show: + type: string + value: + get_attribute: + - pd_server_template_VMInt_OAM_lb_4 + - show + pd_server_template_VMInt_OAM_lb_4_virtual_machine_interface_allowed_address_pairs: + type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs + value: + get_attribute: + - pd_server_template_VMInt_OAM_lb_4 + - virtual_machine_interface_allowed_address_pairs substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server capabilities: + binding_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - binding scalable_pd_server: - pd_server - scalable disk.read.bytes.rate_pd_server: - pd_server - disk.read.bytes.rate + network.outpoing.packets_pd_server_template_VMInt_OAM_lb_4: + - pd_server_template_VMInt_OAM_lb_4 + - network.outpoing.packets memory.usage_pd_server: - pd_server - memory.usage @@ -693,27 +699,21 @@ topology_template: disk.device.usage_pd_server: - pd_server - disk.device.usage - network.outgoing.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.packets.rate - network.outgoing.packets.rate_pd_server_template_VMInt_OAM_lb: - - pd_server_template_VMInt_OAM_lb - - network.outgoing.packets.rate + network.incoming.packets_pd_server_template_VMInt_OAM_lb_4: + - pd_server_template_VMInt_OAM_lb_4 + - network.incoming.packets os_pd_server: - pd_server - os disk.write.bytes.rate_pd_server: - pd_server - disk.write.bytes.rate - network.incoming.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes + network.outgoing.bytes.rate_pd_server_template_VMInt_OAM_lb_4: + - pd_server_template_VMInt_OAM_lb_4 + - network.outgoing.bytes.rate cpu_pd_server: - pd_server - cpu - network.outpoing.packets_pd_server_template_VMInt_OAM_lb: - - pd_server_template_VMInt_OAM_lb - - network.outpoing.packets cpu_util_pd_server: - pd_server - cpu_util @@ -726,45 +726,51 @@ topology_template: disk.device.read.bytes.rate_pd_server: - pd_server - disk.device.read.bytes.rate - network.outgoing.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes + network.incoming.packets_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.packets disk.iops_pd_server: - pd_server - disk.iops - network.incoming.packets.rate_pd_server_template_VMInt_OAM_lb: - - pd_server_template_VMInt_OAM_lb - - network.incoming.packets.rate memory.resident_pd_server: - pd_server - memory.resident cpu.delta_pd_server: - pd_server - cpu.delta - network.incoming.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port + network.incoming.packets.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 - network.incoming.packets.rate + network.incoming.bytes.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.bytes.rate + network.outgoing.packets.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.packets.rate vcpus_pd_server: - pd_server - vcpus disk.device.write.bytes.rate_pd_server: - pd_server - disk.device.write.bytes.rate + forwarder_pd_server_template_VMInt_OAM_lb_4: + - pd_server_template_VMInt_OAM_lb_4 + - forwarder + attachment_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - attachment disk.device.write.requests_pd_server: - pd_server - disk.device.write.requests endpoint_pd_server: - pd_server - endpoint - attachment_pd_server_pd01_port: - - pd_server_pd01_port - - attachment - network.outgoing.bytes_pd_server_template_VMInt_OAM_lb: - - pd_server_template_VMInt_OAM_lb - - network.outgoing.bytes disk.capacity_pd_server: - pd_server - disk.capacity + forwarder_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - forwarder disk.device.allocation_pd_server: - pd_server - disk.device.allocation @@ -777,24 +783,27 @@ topology_template: disk.read.requests_pd_server: - pd_server - disk.read.requests + network.incoming.bytes_pd_server_template_VMInt_OAM_lb_4: + - pd_server_template_VMInt_OAM_lb_4 + - network.incoming.bytes + network.outgoing.bytes.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.bytes.rate feature_pd_server: - pd_server - feature disk.usage_pd_server: - pd_server - disk.usage - binding_pd_server_pd01_port: - - pd_server_pd01_port - - binding disk.write.bytes_pd_server: - pd_server - disk.write.bytes - network.incoming.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes.rate - network.incoming.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets + network.outgoing.bytes_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.bytes + network.incoming.bytes_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.bytes disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -804,57 +813,45 @@ topology_template: disk.device.read.bytes_pd_server: - pd_server - disk.device.read.bytes - network.incoming.bytes_pd_server_template_VMInt_OAM_lb: - - pd_server_template_VMInt_OAM_lb - - network.incoming.bytes disk.device.write.bytes_pd_server: - pd_server - disk.device.write.bytes - feature_pd_server_template_VMInt_OAM_lb: - - pd_server_template_VMInt_OAM_lb - - feature + network.outpoing.packets_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outpoing.packets + network.incoming.bytes.rate_pd_server_template_VMInt_OAM_lb_4: + - pd_server_template_VMInt_OAM_lb_4 + - network.incoming.bytes.rate disk.device.read.requests_pd_server: - pd_server - disk.device.read.requests - network.incoming.bytes.rate_pd_server_template_VMInt_OAM_lb: - - pd_server_template_VMInt_OAM_lb - - network.incoming.bytes.rate - network.incoming.packets_pd_server_template_VMInt_OAM_lb: - - pd_server_template_VMInt_OAM_lb - - network.incoming.packets instance_pd_server: - pd_server - instance host_pd_server: - pd_server - host - network.outpoing.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.outpoing.packets - forwarder_pd_server_template_VMInt_OAM_lb: - - pd_server_template_VMInt_OAM_lb - - forwarder - binding_pd_server_template_VMInt_OAM_lb: - - pd_server_template_VMInt_OAM_lb - - binding - forwarder_pd_server_pd01_port: - - pd_server_pd01_port - - forwarder + network.incoming.packets.rate_pd_server_template_VMInt_OAM_lb_4: + - pd_server_template_VMInt_OAM_lb_4 + - network.incoming.packets.rate + feature_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - feature disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate disk.ephemeral.size_pd_server: - pd_server - disk.ephemeral.size + network.outgoing.packets.rate_pd_server_template_VMInt_OAM_lb_4: + - pd_server_template_VMInt_OAM_lb_4 + - network.outgoing.packets.rate disk.write.requests_pd_server: - pd_server - disk.write.requests - network.outgoing.bytes.rate_pd_server_template_VMInt_OAM_lb: - - pd_server_template_VMInt_OAM_lb - - network.outgoing.bytes.rate - feature_pd_server_pd01_port: - - pd_server_pd01_port - - feature + network.outgoing.bytes_pd_server_template_VMInt_OAM_lb_4: + - pd_server_template_VMInt_OAM_lb_4 + - network.outgoing.bytes disk.device.latency_pd_server: - pd_server - disk.device.latency @@ -864,9 +861,12 @@ topology_template: disk.device.capacity_pd_server: - pd_server - disk.device.capacity - network.outgoing.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes.rate + feature_pd_server_template_VMInt_OAM_lb_4: + - pd_server_template_VMInt_OAM_lb_4 + - feature + binding_pd_server_template_VMInt_OAM_lb_4: + - pd_server_template_VMInt_OAM_lb_4 + - binding disk.device.iops_pd_server: - pd_server - disk.device.iops @@ -874,18 +874,18 @@ topology_template: local_storage_pd_server: - pd_server - local_storage - dependency_pd_server_template_VMInt_OAM_lb: - - pd_server_template_VMInt_OAM_lb - - dependency - link_pd_server_pd01_port: - - pd_server_pd01_port - - link - dependency_pd_server_pd01_port: - - pd_server_pd01_port - - dependency dependency_pd_server: - pd_server - dependency - link_pd_server_template_VMInt_OAM_lb: - - pd_server_template_VMInt_OAM_lb - - link \ No newline at end of file + link_pd_server_template_VMInt_OAM_lb_4: + - pd_server_template_VMInt_OAM_lb_4 + - link + dependency_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - dependency + link_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - link + dependency_pd_server_template_VMInt_OAM_lb_4: + - pd_server_template_VMInt_OAM_lb_4 + - 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/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/GlobalSubstitutionTypesServiceTemplate.yaml index bef66244d3..14892d8ec9 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,6 +8,26 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_pd01_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_pd01_port_0_network: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_pd01_port_0_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role: + type: string + required: true + status: SUPPORTED compute_pd_server_availability_zone: type: list required: true @@ -24,41 +44,45 @@ node_types: type: string required: true status: SUPPORTED - port_pd02_port_network_role_tag: - type: string + port_pd02_port_0_network: + type: list required: true status: SUPPORTED - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + entry_schema: + type: string + port_pd01_port_0_order: + type: integer required: true status: SUPPORTED vm_image_name: type: string required: true status: SUPPORTED - port_pd01_port_ip_requirements: - type: list + port_pd02_port_0_network_role_tag: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd02_port_network_role: + port_pd01_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_pd01_port_vlan_requirements: + compute_pd_server_user_data_format: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - compute_pd_server_user_data_format: + type: string + port_pd02_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd02_port_related_networks: + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role_tag: + type: string + required: true + status: SUPPORTED + port_pd01_port_0_related_networks: type: list required: true status: SUPPORTED @@ -72,77 +96,53 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_pd02_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_pd01_port_exCP_naming: + port_pd02_port_0_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_pd01_port_related_networks: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd02_port_order: - type: integer + port_pd01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_pd02_port_subnetpoolid: + port_pd02_port_0_network_role: type: string required: true status: SUPPORTED - port_pd02_port_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd01_port_network: - type: list + port_pd02_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: string - port_pd01_port_order: + port_pd02_port_0_order: type: integer required: true status: SUPPORTED - port_pd01_port_subnetpoolid: - type: string - required: true - status: SUPPORTED - port_pd02_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd02_port_0_related_networks: + type: list required: true status: SUPPORTED - port_pd01_port_network_role: + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd02_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_pd02_port_ip_requirements: + port_pd02_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network_role_tag: - type: string - required: true - status: SUPPORTED - port_pd02_port_network: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string + type: org.openecomp.datatypes.network.VlanRequirements attributes: pd_server_accessIPv4: type: string status: SUPPORTED - pd_server_pd01_port_device_owner: + pd_server_pd01_port_0_device_owner: type: string status: SUPPORTED requirements: @@ -160,33 +160,49 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pd01_port: + - dependency_pd_server_pd02_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd01_port: + - link_pd_server_pd02_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_pd_server_pd02_port: + - dependency_pd_server_pd01_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd02_port: + - link_pd_server_pd01_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: + binding_pd_server_pd02_port_0: + 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 + binding_pd_server_pd01_port_0: + 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 scalable_pd_server: type: tosca.capabilities.Scalable occurrences: @@ -216,12 +232,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pd01_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 os_pd_server: type: tosca.capabilities.OperatingSystem occurrences: @@ -233,7 +243,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd01_port: + network.outgoing.packets.rate_pd_server_pd02_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -269,21 +279,13 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_pd02_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 - network.outgoing.bytes_pd_server_pd01_port: + network.outpoing.packets_pd_server_pd02_port_0: 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.packets.rate_pd_server_pd02_port: + network.incoming.packets_pd_server_pd01_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -307,30 +309,24 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pd01_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_pd_server_pd02_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd02_port: + network.incoming.packets.rate_pd_server_pd01_port_0: 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_pd_server_pd02_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - network.incoming.bytes.rate_pd_server_pd02_port: + network.incoming.bytes.rate_pd_server_pd01_port_0: 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_pd_server_pd02_port: + network.outgoing.packets.rate_pd_server_pd01_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -348,6 +344,11 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_pd_server_pd01_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED disk.device.write.requests_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -359,35 +360,24 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pd01_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - forwarder_pd_server_pd02_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED disk.capacity_pd_server: 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_pd_server: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_pd_server_pd01_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - disk.allocation_pd_server: + disk.device.allocation_pd_server: 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_pd_server_pd02_port: + disk.allocation_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -404,6 +394,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes.rate_pd_server_pd01_port_0: + 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_pd_server: type: tosca.capabilities.Node occurrences: @@ -415,33 +411,37 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pd02_port: + network.outgoing.bytes.rate_pd_server_pd02_port_0: 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_pd_server_pd01_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 + disk.write.bytes_pd_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - - 0 + - 1 - UNBOUNDED - disk.write.bytes_pd_server: + network.outgoing.bytes_pd_server_pd02_port_0: 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_pd_server_pd01_port: + network.outgoing.bytes_pd_server_pd01_port_0: 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_pd_server_pd01_port: + network.incoming.bytes_pd_server_pd02_port_0: + 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_pd_server_pd01_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -471,6 +471,18 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets_pd_server_pd02_port_0: + 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_pd_server_pd01_port_0: + 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_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -490,19 +502,20 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pd01_port: + network.incoming.packets.rate_pd_server_pd02_port_0: 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 - attachment_pd_server_pd02_port: - type: tosca.capabilities.Attachment + network.incoming.bytes.rate_pd_server_pd02_port_0: + 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_pd_server_pd01_port: - type: org.openecomp.capabilities.Forwarder + feature_pd_server_pd01_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -518,24 +531,18 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.write.requests_pd_server: - 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_pd_server_pd01_port: - type: tosca.capabilities.Node + attachment_pd_server_pd02_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - disk.device.latency_pd_server: + disk.write.requests_pd_server: 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_pd_server_pd02_port: + disk.device.latency_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -553,21 +560,14 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pd01_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.device.iops_pd_server: 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_pd_server_pd02_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_pd_server_pd02_port_0: + type: org.openecomp.capabilities.Forwarder 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/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 cb35f4e324..b1d498c69f 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 @@ -832,6 +832,17 @@ topology_template: directives: - substitutable properties: + port_pd01_port_0_mac_requirements: + mac_count_required: + is_required: false + port_pd01_port_0_network: + - get_input: oam_net_name + port_pd01_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: @@ -840,34 +851,23 @@ topology_template: - 0 vm_flavor_name: get_input: pd_flavor_name - port_pd02_port_network_role_tag: oam - port_pd01_port_mac_requirements: - mac_count_required: - is_required: false + port_pd02_port_0_network: + - get_input: oam_net_name vm_image_name: get_input: pd_image_name - port_pd01_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false + port_pd02_port_0_network_role_tag: oam compute_pd_server_user_data_format: - RAW - port_pd02_port_mac_requirements: - mac_count_required: - is_required: false - port_pd01_port_network: - - get_input: oam_net_name - port_pd02_port_ip_requirements: + port_pd02_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_network_role_tag: oam - port_pd02_port_network: - - get_input: oam_net_name + port_pd01_port_0_network_role_tag: oam + port_pd02_port_0_mac_requirements: + mac_count_required: + is_required: false service_template_filter: substitute_service_template: Nested_pd_serverServiceTemplate.yaml count: 1 @@ -882,7 +882,7 @@ topology_template: entries: get_attribute: - abstract_pd_server - - pd_server_pd01_port_device_owner + - pd_server_pd01_port_0_device_owner network_policy_server: type: org.openecomp.resource.vfc.rules.nodes.heat.network.contrail.NetworkRules properties: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/Nested_pd_serverServiceTemplate.yaml index c987c415ce..192479bbe2 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/Nested_pd_serverServiceTemplate.yaml @@ -11,6 +11,22 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pd01_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_pd01_port_0_network: + type: list + required: true + entry_schema: + type: string + port_pd01_port_0_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role: + type: string + required: true compute_pd_server_availability_zone: type: list required: true @@ -24,34 +40,37 @@ topology_template: vm_flavor_name: type: string required: true - port_pd02_port_network_role_tag: - type: string + port_pd02_port_0_network: + type: list required: true - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + entry_schema: + type: string + port_pd01_port_0_order: + type: integer required: true vm_image_name: type: string required: true - port_pd01_port_ip_requirements: - type: list + port_pd02_port_0_network_role_tag: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd02_port_network_role: + port_pd01_port_0_subnetpoolid: type: string required: true - port_pd01_port_vlan_requirements: + compute_pd_server_user_data_format: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - compute_pd_server_user_data_format: + type: string + port_pd02_port_0_ip_requirements: type: list required: true entry_schema: - type: string - port_pd02_port_related_networks: + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role_tag: + type: string + required: true + port_pd01_port_0_related_networks: type: list required: true entry_schema: @@ -63,58 +82,39 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_pd02_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_pd01_port_exCP_naming: + port_pd02_port_0_exCP_naming: type: org.openecomp.datatypes.Naming required: true - port_pd01_port_related_networks: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd02_port_order: - type: integer + port_pd01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - port_pd02_port_subnetpoolid: + port_pd02_port_0_network_role: type: string required: true - port_pd02_port_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd01_port_network: - type: list + port_pd02_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: string - port_pd01_port_order: + port_pd02_port_0_order: type: integer required: true - port_pd01_port_subnetpoolid: - type: string - required: true - port_pd02_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd02_port_0_related_networks: + type: list required: true - port_pd01_port_network_role: + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd02_port_0_subnetpoolid: type: string required: true - port_pd02_port_ip_requirements: + port_pd02_port_0_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network_role_tag: - type: string - required: true - port_pd02_port_network: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_0_vlan_requirements: type: list required: true entry_schema: - type: string + type: org.openecomp.datatypes.network.VlanRequirements node_templates: pd_server: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server @@ -135,62 +135,62 @@ topology_template: get_input: - compute_pd_server_user_data_format - index_value - pd_server_pd01_port: + pd_server_pd02_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd01_port_exCP_naming + get_input: port_pd02_port_0_exCP_naming vlan_requirements: - get_input: port_pd01_port_vlan_requirements + get_input: port_pd02_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_pd01_port_related_networks + get_input: port_pd02_port_0_related_networks ip_requirements: - get_input: port_pd01_port_ip_requirements + get_input: port_pd02_port_0_ip_requirements network_role_tag: - get_input: port_pd01_port_network_role_tag + get_input: port_pd02_port_0_network_role_tag mac_requirements: - get_input: port_pd01_port_mac_requirements + get_input: port_pd02_port_0_mac_requirements order: - get_input: port_pd01_port_order + get_input: port_pd02_port_0_order network_role: - get_input: port_pd01_port_network_role + get_input: port_pd02_port_0_network_role subnetpoolid: - get_input: port_pd01_port_subnetpoolid + get_input: port_pd02_port_0_subnetpoolid network: get_input: - - port_pd01_port_network + - port_pd02_port_0_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: pd_server relationship: tosca.relationships.network.BindsTo - pd_server_pd02_port: + pd_server_pd01_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd02_port_exCP_naming + get_input: port_pd01_port_0_exCP_naming vlan_requirements: - get_input: port_pd02_port_vlan_requirements + get_input: port_pd01_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_pd02_port_related_networks + get_input: port_pd01_port_0_related_networks ip_requirements: - get_input: port_pd02_port_ip_requirements + get_input: port_pd01_port_0_ip_requirements network_role_tag: - get_input: port_pd02_port_network_role_tag + get_input: port_pd01_port_0_network_role_tag mac_requirements: - get_input: port_pd02_port_mac_requirements + get_input: port_pd01_port_0_mac_requirements order: - get_input: port_pd02_port_order + get_input: port_pd01_port_0_order network_role: - get_input: port_pd02_port_network_role + get_input: port_pd01_port_0_network_role subnetpoolid: - get_input: port_pd02_port_subnetpoolid + get_input: port_pd01_port_0_subnetpoolid network: get_input: - - port_pd02_port_network + - port_pd01_port_0_network - index_value requirements: - binding: @@ -204,15 +204,21 @@ topology_template: get_attribute: - pd_server - accessIPv4 - pd_server_pd01_port_device_owner: + pd_server_pd01_port_0_device_owner: type: string value: get_attribute: - - pd_server_pd01_port + - pd_server_pd01_port_0 - device_owner substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server capabilities: + binding_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - binding + binding_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - binding scalable_pd_server: - pd_server - scalable @@ -228,18 +234,15 @@ topology_template: disk.device.usage_pd_server: - pd_server - disk.device.usage - network.outgoing.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.packets.rate os_pd_server: - pd_server - os disk.write.bytes.rate_pd_server: - pd_server - disk.write.bytes.rate - network.incoming.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes + network.outgoing.packets.rate_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.outgoing.packets.rate cpu_pd_server: - pd_server - cpu @@ -255,15 +258,12 @@ topology_template: disk.device.read.bytes.rate_pd_server: - pd_server - disk.device.read.bytes.rate - binding_pd_server_pd02_port: - - pd_server_pd02_port - - binding - network.outgoing.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes - network.outgoing.packets.rate_pd_server_pd02_port: - - pd_server_pd02_port - - network.outgoing.packets.rate + network.outpoing.packets_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.outpoing.packets + network.incoming.packets_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.packets disk.iops_pd_server: - pd_server - disk.iops @@ -273,78 +273,78 @@ topology_template: cpu.delta_pd_server: - pd_server - cpu.delta - network.incoming.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets.rate - network.outgoing.bytes_pd_server_pd02_port: - - pd_server_pd02_port - - network.outgoing.bytes - feature_pd_server_pd02_port: - - pd_server_pd02_port + feature_pd_server_pd02_port_0: + - pd_server_pd02_port_0 - feature - network.incoming.bytes.rate_pd_server_pd02_port: - - pd_server_pd02_port + network.incoming.packets.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.packets.rate + network.incoming.bytes.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 - network.incoming.bytes.rate - network.outgoing.bytes.rate_pd_server_pd02_port: - - pd_server_pd02_port - - network.outgoing.bytes.rate + network.outgoing.packets.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.packets.rate vcpus_pd_server: - pd_server - vcpus disk.device.write.bytes.rate_pd_server: - pd_server - disk.device.write.bytes.rate + attachment_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - attachment disk.device.write.requests_pd_server: - pd_server - disk.device.write.requests endpoint_pd_server: - pd_server - endpoint - attachment_pd_server_pd01_port: - - pd_server_pd01_port - - attachment - forwarder_pd_server_pd02_port: - - pd_server_pd02_port - - forwarder disk.capacity_pd_server: - pd_server - disk.capacity + forwarder_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - forwarder disk.device.allocation_pd_server: - pd_server - disk.device.allocation disk.allocation_pd_server: - pd_server - disk.allocation - network.incoming.packets_pd_server_pd02_port: - - pd_server_pd02_port - - network.incoming.packets binding_pd_server: - pd_server - binding disk.read.requests_pd_server: - pd_server - disk.read.requests + network.outgoing.bytes.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.bytes.rate feature_pd_server: - pd_server - feature disk.usage_pd_server: - pd_server - disk.usage - network.outpoing.packets_pd_server_pd02_port: - - pd_server_pd02_port - - network.outpoing.packets - binding_pd_server_pd01_port: - - pd_server_pd01_port - - binding + network.outgoing.bytes.rate_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.outgoing.bytes.rate disk.write.bytes_pd_server: - pd_server - disk.write.bytes - network.incoming.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes.rate - network.incoming.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets + network.outgoing.bytes_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.outgoing.bytes + network.outgoing.bytes_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.bytes + network.incoming.bytes_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.incoming.bytes + network.incoming.bytes_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.bytes disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -357,6 +357,12 @@ topology_template: disk.device.write.bytes_pd_server: - pd_server - disk.device.write.bytes + network.incoming.packets_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.incoming.packets + network.outpoing.packets_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outpoing.packets disk.device.read.requests_pd_server: - pd_server - disk.device.read.requests @@ -366,64 +372,58 @@ topology_template: host_pd_server: - pd_server - host - network.outpoing.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.outpoing.packets - attachment_pd_server_pd02_port: - - pd_server_pd02_port - - attachment - forwarder_pd_server_pd01_port: - - pd_server_pd01_port - - forwarder + network.incoming.packets.rate_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.incoming.packets.rate + network.incoming.bytes.rate_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.incoming.bytes.rate + feature_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - feature disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate disk.ephemeral.size_pd_server: - pd_server - disk.ephemeral.size + attachment_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - attachment disk.write.requests_pd_server: - pd_server - disk.write.requests - feature_pd_server_pd01_port: - - pd_server_pd01_port - - feature disk.device.latency_pd_server: - pd_server - disk.device.latency - network.incoming.packets.rate_pd_server_pd02_port: - - pd_server_pd02_port - - network.incoming.packets.rate disk.latency_pd_server: - pd_server - disk.latency disk.device.capacity_pd_server: - pd_server - disk.device.capacity - network.outgoing.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes.rate disk.device.iops_pd_server: - pd_server - disk.device.iops - network.incoming.bytes_pd_server_pd02_port: - - pd_server_pd02_port - - network.incoming.bytes + forwarder_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - forwarder requirements: local_storage_pd_server: - pd_server - local_storage - link_pd_server_pd02_port: - - pd_server_pd02_port - - link - link_pd_server_pd01_port: - - pd_server_pd01_port - - link - dependency_pd_server_pd01_port: - - pd_server_pd01_port - - dependency dependency_pd_server: - pd_server - dependency - dependency_pd_server_pd02_port: - - pd_server_pd02_port - - dependency \ No newline at end of file + link_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - link + dependency_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - dependency + dependency_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - dependency + link_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - link \ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/GlobalSubstitutionTypesServiceTemplate.yaml index 7055e47c27..d4d9603c71 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,6 +8,26 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_pd01_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_pd01_port_0_network: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_pd01_port_0_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role: + type: string + required: true + status: SUPPORTED compute_pd_server_availability_zone: type: list required: true @@ -24,41 +44,45 @@ node_types: type: string required: true status: SUPPORTED - port_pd02_port_network_role_tag: - type: string + port_pd02_port_0_network: + type: list required: true status: SUPPORTED - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + entry_schema: + type: string + port_pd01_port_0_order: + type: integer required: true status: SUPPORTED vm_image_name: type: string required: true status: SUPPORTED - port_pd01_port_ip_requirements: - type: list + port_pd02_port_0_network_role_tag: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd02_port_network_role: + port_pd01_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_pd01_port_vlan_requirements: + compute_pd_server_user_data_format: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - compute_pd_server_user_data_format: + type: string + port_pd02_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd02_port_related_networks: + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role_tag: + type: string + required: true + status: SUPPORTED + port_pd01_port_0_related_networks: type: list required: true status: SUPPORTED @@ -72,72 +96,48 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_pd02_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_pd01_port_exCP_naming: + port_pd02_port_0_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_pd01_port_related_networks: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd02_port_order: - type: integer + port_pd01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_pd02_port_subnetpoolid: + port_pd02_port_0_network_role: type: string required: true status: SUPPORTED - port_pd02_port_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd01_port_network: - type: list + port_pd02_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: string - port_pd01_port_order: + port_pd02_port_0_order: type: integer required: true status: SUPPORTED - port_pd01_port_subnetpoolid: - type: string - required: true - status: SUPPORTED - port_pd02_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd02_port_0_related_networks: + type: list required: true status: SUPPORTED - port_pd01_port_network_role: + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd02_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_pd02_port_ip_requirements: + port_pd02_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network_role_tag: - type: string - required: true - status: SUPPORTED - port_pd02_port_network: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string + type: org.openecomp.datatypes.network.VlanRequirements requirements: - dependency_pd_server: capability: tosca.capabilities.Node @@ -153,33 +153,49 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pd01_port: + - dependency_pd_server_pd02_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd01_port: + - link_pd_server_pd02_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_pd_server_pd02_port: + - dependency_pd_server_pd01_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd02_port: + - link_pd_server_pd01_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: + binding_pd_server_pd02_port_0: + 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 + binding_pd_server_pd01_port_0: + 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 scalable_pd_server: type: tosca.capabilities.Scalable occurrences: @@ -209,12 +225,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pd01_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 os_pd_server: type: tosca.capabilities.OperatingSystem occurrences: @@ -226,7 +236,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd01_port: + network.outgoing.packets.rate_pd_server_pd02_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -262,21 +272,13 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_pd02_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 - network.outgoing.bytes_pd_server_pd01_port: + network.outpoing.packets_pd_server_pd02_port_0: 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.packets.rate_pd_server_pd02_port: + network.incoming.packets_pd_server_pd01_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -300,30 +302,24 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pd01_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_pd_server_pd02_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd02_port: + network.incoming.packets.rate_pd_server_pd01_port_0: 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_pd_server_pd02_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - network.incoming.bytes.rate_pd_server_pd02_port: + network.incoming.bytes.rate_pd_server_pd01_port_0: 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_pd_server_pd02_port: + network.outgoing.packets.rate_pd_server_pd01_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -341,6 +337,11 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_pd_server_pd01_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED disk.device.write.requests_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -352,35 +353,24 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pd01_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - forwarder_pd_server_pd02_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED disk.capacity_pd_server: 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_pd_server: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_pd_server_pd01_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - disk.allocation_pd_server: + disk.device.allocation_pd_server: 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_pd_server_pd02_port: + disk.allocation_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -397,6 +387,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes.rate_pd_server_pd01_port_0: + 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_pd_server: type: tosca.capabilities.Node occurrences: @@ -408,33 +404,37 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pd02_port: + network.outgoing.bytes.rate_pd_server_pd02_port_0: 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_pd_server_pd01_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 + disk.write.bytes_pd_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - - 0 + - 1 - UNBOUNDED - disk.write.bytes_pd_server: + network.outgoing.bytes_pd_server_pd02_port_0: 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_pd_server_pd01_port: + network.outgoing.bytes_pd_server_pd01_port_0: 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_pd_server_pd01_port: + network.incoming.bytes_pd_server_pd02_port_0: + 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_pd_server_pd01_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -464,6 +464,18 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets_pd_server_pd02_port_0: + 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_pd_server_pd01_port_0: + 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_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -483,19 +495,20 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pd01_port: + network.incoming.packets.rate_pd_server_pd02_port_0: 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 - attachment_pd_server_pd02_port: - type: tosca.capabilities.Attachment + network.incoming.bytes.rate_pd_server_pd02_port_0: + 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_pd_server_pd01_port: - type: org.openecomp.capabilities.Forwarder + feature_pd_server_pd01_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -511,24 +524,18 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.write.requests_pd_server: - 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_pd_server_pd01_port: - type: tosca.capabilities.Node + attachment_pd_server_pd02_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - disk.device.latency_pd_server: + disk.write.requests_pd_server: 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_pd_server_pd02_port: + disk.device.latency_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -546,21 +553,14 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pd01_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.device.iops_pd_server: 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_pd_server_pd02_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_pd_server_pd02_port_0: + type: org.openecomp.capabilities.Forwarder 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/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 acaaee9ca4..207a2308af 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 @@ -832,6 +832,19 @@ topology_template: directives: - substitutable properties: + port_pd01_port_0_mac_requirements: + mac_count_required: + is_required: false + port_pd01_port_0_network: + - get_attribute: + - network_policy_server + - name + port_pd01_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: @@ -842,35 +855,22 @@ topology_template: get_attribute: - network_policy_server - name - port_pd02_port_network_role_tag: oam - port_pd01_port_mac_requirements: - mac_count_required: - is_required: false + port_pd02_port_0_network: + - get_input: oam_net_name vm_image_name: get_input: pd_image_name - port_pd01_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false + port_pd02_port_0_network_role_tag: oam compute_pd_server_user_data_format: - RAW - port_pd02_port_mac_requirements: - mac_count_required: - is_required: false - port_pd01_port_network: - - get_attribute: - - network_policy_server - - name - port_pd02_port_ip_requirements: + port_pd02_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_pd02_port_network: - - get_input: oam_net_name + port_pd02_port_0_mac_requirements: + mac_count_required: + is_required: 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/oneComputeDiffPortTypesAndGetAttOut/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/Nested_pd_serverServiceTemplate.yaml index e894e5c65f..36787625a8 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/Nested_pd_serverServiceTemplate.yaml @@ -11,6 +11,22 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pd01_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_pd01_port_0_network: + type: list + required: true + entry_schema: + type: string + port_pd01_port_0_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role: + type: string + required: true compute_pd_server_availability_zone: type: list required: true @@ -24,34 +40,37 @@ topology_template: vm_flavor_name: type: string required: true - port_pd02_port_network_role_tag: - type: string + port_pd02_port_0_network: + type: list required: true - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + entry_schema: + type: string + port_pd01_port_0_order: + type: integer required: true vm_image_name: type: string required: true - port_pd01_port_ip_requirements: - type: list + port_pd02_port_0_network_role_tag: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd02_port_network_role: + port_pd01_port_0_subnetpoolid: type: string required: true - port_pd01_port_vlan_requirements: + compute_pd_server_user_data_format: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - compute_pd_server_user_data_format: + type: string + port_pd02_port_0_ip_requirements: type: list required: true entry_schema: - type: string - port_pd02_port_related_networks: + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role_tag: + type: string + required: true + port_pd01_port_0_related_networks: type: list required: true entry_schema: @@ -63,58 +82,39 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_pd02_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_pd01_port_exCP_naming: + port_pd02_port_0_exCP_naming: type: org.openecomp.datatypes.Naming required: true - port_pd01_port_related_networks: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd02_port_order: - type: integer + port_pd01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - port_pd02_port_subnetpoolid: + port_pd02_port_0_network_role: type: string required: true - port_pd02_port_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd01_port_network: - type: list + port_pd02_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: string - port_pd01_port_order: + port_pd02_port_0_order: type: integer required: true - port_pd01_port_subnetpoolid: - type: string - required: true - port_pd02_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd02_port_0_related_networks: + type: list required: true - port_pd01_port_network_role: + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd02_port_0_subnetpoolid: type: string required: true - port_pd02_port_ip_requirements: + port_pd02_port_0_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network_role_tag: - type: string - required: true - port_pd02_port_network: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_0_vlan_requirements: type: list required: true entry_schema: - type: string + type: org.openecomp.datatypes.network.VlanRequirements node_templates: pd_server: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server @@ -135,62 +135,62 @@ topology_template: get_input: - compute_pd_server_user_data_format - index_value - pd_server_pd01_port: + pd_server_pd02_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd01_port_exCP_naming + get_input: port_pd02_port_0_exCP_naming vlan_requirements: - get_input: port_pd01_port_vlan_requirements + get_input: port_pd02_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_pd01_port_related_networks + get_input: port_pd02_port_0_related_networks ip_requirements: - get_input: port_pd01_port_ip_requirements + get_input: port_pd02_port_0_ip_requirements network_role_tag: - get_input: port_pd01_port_network_role_tag + get_input: port_pd02_port_0_network_role_tag mac_requirements: - get_input: port_pd01_port_mac_requirements + get_input: port_pd02_port_0_mac_requirements order: - get_input: port_pd01_port_order + get_input: port_pd02_port_0_order network_role: - get_input: port_pd01_port_network_role + get_input: port_pd02_port_0_network_role subnetpoolid: - get_input: port_pd01_port_subnetpoolid + get_input: port_pd02_port_0_subnetpoolid network: get_input: - - port_pd01_port_network + - port_pd02_port_0_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: pd_server relationship: tosca.relationships.network.BindsTo - pd_server_pd02_port: + pd_server_pd01_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd02_port_exCP_naming + get_input: port_pd01_port_0_exCP_naming vlan_requirements: - get_input: port_pd02_port_vlan_requirements + get_input: port_pd01_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_pd02_port_related_networks + get_input: port_pd01_port_0_related_networks ip_requirements: - get_input: port_pd02_port_ip_requirements + get_input: port_pd01_port_0_ip_requirements network_role_tag: - get_input: port_pd02_port_network_role_tag + get_input: port_pd01_port_0_network_role_tag mac_requirements: - get_input: port_pd02_port_mac_requirements + get_input: port_pd01_port_0_mac_requirements order: - get_input: port_pd02_port_order + get_input: port_pd01_port_0_order network_role: - get_input: port_pd02_port_network_role + get_input: port_pd01_port_0_network_role subnetpoolid: - get_input: port_pd02_port_subnetpoolid + get_input: port_pd01_port_0_subnetpoolid network: get_input: - - port_pd02_port_network + - port_pd01_port_0_network - index_value requirements: - binding: @@ -200,6 +200,12 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server capabilities: + binding_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - binding + binding_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - binding scalable_pd_server: - pd_server - scalable @@ -215,18 +221,15 @@ topology_template: disk.device.usage_pd_server: - pd_server - disk.device.usage - network.outgoing.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.packets.rate os_pd_server: - pd_server - os disk.write.bytes.rate_pd_server: - pd_server - disk.write.bytes.rate - network.incoming.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes + network.outgoing.packets.rate_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.outgoing.packets.rate cpu_pd_server: - pd_server - cpu @@ -242,15 +245,12 @@ topology_template: disk.device.read.bytes.rate_pd_server: - pd_server - disk.device.read.bytes.rate - binding_pd_server_pd02_port: - - pd_server_pd02_port - - binding - network.outgoing.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes - network.outgoing.packets.rate_pd_server_pd02_port: - - pd_server_pd02_port - - network.outgoing.packets.rate + network.outpoing.packets_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.outpoing.packets + network.incoming.packets_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.packets disk.iops_pd_server: - pd_server - disk.iops @@ -260,78 +260,78 @@ topology_template: cpu.delta_pd_server: - pd_server - cpu.delta - network.incoming.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets.rate - network.outgoing.bytes_pd_server_pd02_port: - - pd_server_pd02_port - - network.outgoing.bytes - feature_pd_server_pd02_port: - - pd_server_pd02_port + feature_pd_server_pd02_port_0: + - pd_server_pd02_port_0 - feature - network.incoming.bytes.rate_pd_server_pd02_port: - - pd_server_pd02_port + network.incoming.packets.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.packets.rate + network.incoming.bytes.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 - network.incoming.bytes.rate - network.outgoing.bytes.rate_pd_server_pd02_port: - - pd_server_pd02_port - - network.outgoing.bytes.rate + network.outgoing.packets.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.packets.rate vcpus_pd_server: - pd_server - vcpus disk.device.write.bytes.rate_pd_server: - pd_server - disk.device.write.bytes.rate + attachment_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - attachment disk.device.write.requests_pd_server: - pd_server - disk.device.write.requests endpoint_pd_server: - pd_server - endpoint - attachment_pd_server_pd01_port: - - pd_server_pd01_port - - attachment - forwarder_pd_server_pd02_port: - - pd_server_pd02_port - - forwarder disk.capacity_pd_server: - pd_server - disk.capacity + forwarder_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - forwarder disk.device.allocation_pd_server: - pd_server - disk.device.allocation disk.allocation_pd_server: - pd_server - disk.allocation - network.incoming.packets_pd_server_pd02_port: - - pd_server_pd02_port - - network.incoming.packets binding_pd_server: - pd_server - binding disk.read.requests_pd_server: - pd_server - disk.read.requests + network.outgoing.bytes.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.bytes.rate feature_pd_server: - pd_server - feature disk.usage_pd_server: - pd_server - disk.usage - network.outpoing.packets_pd_server_pd02_port: - - pd_server_pd02_port - - network.outpoing.packets - binding_pd_server_pd01_port: - - pd_server_pd01_port - - binding + network.outgoing.bytes.rate_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.outgoing.bytes.rate disk.write.bytes_pd_server: - pd_server - disk.write.bytes - network.incoming.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes.rate - network.incoming.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets + network.outgoing.bytes_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.outgoing.bytes + network.outgoing.bytes_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.bytes + network.incoming.bytes_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.incoming.bytes + network.incoming.bytes_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.bytes disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -344,6 +344,12 @@ topology_template: disk.device.write.bytes_pd_server: - pd_server - disk.device.write.bytes + network.incoming.packets_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.incoming.packets + network.outpoing.packets_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outpoing.packets disk.device.read.requests_pd_server: - pd_server - disk.device.read.requests @@ -353,64 +359,58 @@ topology_template: host_pd_server: - pd_server - host - network.outpoing.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.outpoing.packets - attachment_pd_server_pd02_port: - - pd_server_pd02_port - - attachment - forwarder_pd_server_pd01_port: - - pd_server_pd01_port - - forwarder + network.incoming.packets.rate_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.incoming.packets.rate + network.incoming.bytes.rate_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.incoming.bytes.rate + feature_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - feature disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate disk.ephemeral.size_pd_server: - pd_server - disk.ephemeral.size + attachment_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - attachment disk.write.requests_pd_server: - pd_server - disk.write.requests - feature_pd_server_pd01_port: - - pd_server_pd01_port - - feature disk.device.latency_pd_server: - pd_server - disk.device.latency - network.incoming.packets.rate_pd_server_pd02_port: - - pd_server_pd02_port - - network.incoming.packets.rate disk.latency_pd_server: - pd_server - disk.latency disk.device.capacity_pd_server: - pd_server - disk.device.capacity - network.outgoing.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes.rate disk.device.iops_pd_server: - pd_server - disk.device.iops - network.incoming.bytes_pd_server_pd02_port: - - pd_server_pd02_port - - network.incoming.bytes + forwarder_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - forwarder requirements: local_storage_pd_server: - pd_server - local_storage - link_pd_server_pd02_port: - - pd_server_pd02_port - - link - link_pd_server_pd01_port: - - pd_server_pd01_port - - link - dependency_pd_server_pd01_port: - - pd_server_pd01_port - - dependency dependency_pd_server: - pd_server - dependency - dependency_pd_server_pd02_port: - - pd_server_pd02_port - - dependency \ No newline at end of file + link_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - link + dependency_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - dependency + dependency_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - dependency + link_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - link \ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/in/hot-mog-0108-bs1271.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/in/hot-mog-0108-bs1271.yml index 30cdec1506..9b3c49dff6 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/in/hot-mog-0108-bs1271.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/in/hot-mog-0108-bs1271.yml @@ -34,15 +34,15 @@ resources: flavor: {get_attr: [network_policy_server, name]} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: pd01_port_0} - - port: {get_resource: pd01_port_1} + - port: {get_resource: pd_server_0_oam_port_0} + - port: {get_resource: pd_server_1_oam_port_0} user_data_format: RAW - pd01_port_0: + pd_server_0_oam_port_0: type: OS::Neutron::Port properties: network: {get_attr: [network_policy_server, name]} - pd01_port_1: + pd_server_1_oam_port_0: type: OS::Neutron::Port properties: network: {get_param: oam_net_name} diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/GlobalSubstitutionTypesServiceTemplate.yaml index dd9ab9af97..2e4b2ff854 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,24 +8,8 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_pd01_port_0_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_pd01_port_0_network: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_pd01_port_0_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_0_network_role: - type: string + port_pd_server_0_oam_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED compute_pd_server_availability_zone: @@ -44,58 +28,60 @@ node_types: type: string required: true status: SUPPORTED - port_pd01_port_1_network_role: - type: string + port_pd_server_1_oam_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_pd01_port_0_order: - type: integer + vm_image_name: + type: string required: true status: SUPPORTED - port_pd01_port_1_subnetpoolid: + port_pd_server_0_oam_port_0_network_role_tag: type: string required: true status: SUPPORTED - vm_image_name: - type: string + port_pd_server_0_oam_port_0_related_networks: + type: list required: true status: SUPPORTED - port_pd01_port_1_network_role_tag: + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd_server_1_oam_port_0_order: + type: integer + required: true + status: SUPPORTED + port_pd_server_0_oam_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_pd01_port_0_subnetpoolid: + port_pd_server_1_oam_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_pd01_port_1_network: + compute_pd_server_user_data_format: type: list required: true status: SUPPORTED entry_schema: type: string - compute_pd_server_user_data_format: + port_pd_server_0_oam_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd01_port_0_network_role_tag: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_0_oam_port_0_network_role: type: string required: true status: SUPPORTED - port_pd01_port_0_related_networks: - type: list + port_pd_server_1_oam_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd01_port_1_ip_requirements: - type: list + port_pd_server_0_oam_port_0_order: + type: integer required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements index_value: type: integer description: Index value of this substitution service template runtime instance @@ -104,40 +90,54 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_pd01_port_1_order: - type: integer + port_pd_server_1_oam_port_0_network_role_tag: + type: string required: true status: SUPPORTED - port_pd01_port_1_related_networks: + port_pd_server_1_oam_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd01_port_0_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_1_oam_port_0_vlan_requirements: + type: list required: true status: SUPPORTED - port_pd01_port_1_vlan_requirements: + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_0_oam_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd01_port_1_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + type: org.openecomp.datatypes.network.IpRequirements + port_pd_server_1_oam_port_0_network_role: + type: string required: true status: SUPPORTED - port_pd01_port_1_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_1_oam_port_0_network: + type: list required: true status: SUPPORTED - port_pd01_port_0_vlan_requirements: + entry_schema: + type: string + port_pd_server_0_oam_port_0_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: string + port_pd_server_1_oam_port_0_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd_server_0_oam_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED requirements: - dependency_pd_server: capability: tosca.capabilities.Node @@ -153,41 +153,33 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pd01_port_1: + - dependency_pd_server_pd_server_1_oam_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd01_port_1: + - link_pd_server_pd_server_1_oam_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_pd_server_pd01_port_0: + - dependency_pd_server_pd_server_0_oam_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd01_port_0: + - link_pd_server_pd_server_0_oam_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: - binding_pd_server_pd01_port_0: - 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 scalable_pd_server: type: tosca.capabilities.Scalable occurrences: @@ -199,133 +191,114 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_pd01_port_1: - 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 - memory.usage_pd_server: + network.outgoing.bytes_pd_server_pd_server_1_oam_port_0: 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_pd_server: + memory.usage_pd_server: 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_pd_server: + memory_pd_server: 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_pd_server: - type: tosca.capabilities.OperatingSystem - occurrences: - - 1 - - UNBOUNDED - disk.write.bytes.rate_pd_server: + disk.device.usage_pd_server: 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_pd_server: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_pd_server_pd_server_0_oam_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - cpu_util_pd_server: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + os_pd_server: + type: tosca.capabilities.OperatingSystem occurrences: - 1 - UNBOUNDED - disk.device.write.requests.rate_pd_server: + disk.write.bytes.rate_pd_server: 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_pd_server: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_pd_server_pd_server_0_oam_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.device.read.bytes.rate_pd_server: + network.incoming.bytes_pd_server_pd_server_1_oam_port_0: 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_pd_server_pd01_port_0: + cpu_pd_server: 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.iops_pd_server: + cpu_util_pd_server: 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_pd_server_pd01_port_1: + disk.device.write.requests.rate_pd_server: 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_pd_server_pd01_port_1: + disk.read.bytes_pd_server: 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_pd_server: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_pd_server_pd_server_1_oam_port_0: + 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: - - 1 + - 0 - UNBOUNDED - cpu.delta_pd_server: + disk.device.read.bytes.rate_pd_server: 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_pd_server_pd01_port_0: + network.outgoing.packets.rate_pd_server_pd_server_0_oam_port_0: 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_pd_server_pd01_port_0: + disk.iops_pd_server: 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 - attachment_pd_server_pd01_port_1: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - network.outgoing.packets.rate_pd_server_pd01_port_1: + memory.resident_pd_server: 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.packets.rate_pd_server_pd01_port_0: + cpu.delta_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -343,11 +316,6 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pd01_port_0: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED disk.device.write.requests_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -359,23 +327,24 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.capacity_pd_server: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_pd_server_pd_server_1_oam_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - forwarder_pd_server_pd01_port_0: - type: org.openecomp.capabilities.Forwarder + disk.capacity_pd_server: + 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_pd_server_pd01_port_1: - type: org.openecomp.capabilities.Forwarder + network.incoming.bytes_pd_server_pd_server_0_oam_port_0: + 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_pd_server_pd01_port_1: + network.outgoing.bytes.rate_pd_server_pd_server_0_oam_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -404,17 +373,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pd01_port_1: - 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_pd_server_pd01_port_0: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_pd_server_pd_server_0_oam_port_0: + 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: - - 1 + - 0 - UNBOUNDED feature_pd_server: type: tosca.capabilities.Node @@ -427,7 +392,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd01_port_1: + network.outgoing.bytes.rate_pd_server_pd_server_1_oam_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -439,21 +404,20 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd01_port_0: + network.incoming.packets_pd_server_pd_server_0_oam_port_0: 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_pd_server_pd01_port_1: + network.outgoing.bytes_pd_server_pd_server_0_oam_port_0: 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_pd_server_pd01_port_0: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_pd_server_pd_server_0_oam_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED @@ -475,19 +439,24 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.write.bytes_pd_server: + feature_pd_server_pd_server_1_oam_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes.rate_pd_server_pd_server_1_oam_port_0: 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_pd_server_pd01_port_0: + disk.device.write.bytes_pd_server: 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_pd_server_pd01_port_1: + network.incoming.packets_pd_server_pd_server_1_oam_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -512,13 +481,20 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_pd01_port_1: - type: tosca.capabilities.Node + attachment_pd_server_pd_server_1_oam_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - feature_pd_server_pd01_port_0: - type: tosca.capabilities.Node + network.incoming.packets.rate_pd_server_pd_server_1_oam_port_0: + 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_pd_server_pd_server_1_oam_port_0: + 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 @@ -534,12 +510,30 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.packets.rate_pd_server_pd_server_1_oam_port_0: + 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_pd_server_pd_server_0_oam_port_0: + 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_pd_server: 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_pd_server_pd_server_0_oam_port_0: + 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_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -559,6 +553,12 @@ node_types: - 1 - UNBOUNDED disk.device.iops_pd_server: + 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_pd_server_pd_server_0_oam_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: 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 4b300d39b7..f1aee8d60b 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 @@ -93,19 +93,6 @@ topology_template: directives: - substitutable properties: - port_pd01_port_0_mac_requirements: - mac_count_required: - is_required: false - port_pd01_port_0_network: - - get_attribute: - - network_policy_server - - name - port_pd01_port_0_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: @@ -116,20 +103,33 @@ topology_template: get_attribute: - network_policy_server - name + port_pd_server_1_oam_port_0_mac_requirements: + mac_count_required: + is_required: false vm_image_name: get_input: pd_image_name - port_pd01_port_1_network_role_tag: oam - port_pd01_port_1_network: - - get_input: oam_net_name compute_pd_server_user_data_format: - RAW - port_pd01_port_1_ip_requirements: + port_pd_server_1_oam_port_0_network_role_tag: oam + port_pd_server_0_oam_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_pd_server_1_oam_port_0_network: + - get_input: oam_net_name + port_pd_server_0_oam_port_0_network: + - get_attribute: + - network_policy_server + - name + port_pd_server_1_oam_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_1_mac_requirements: + port_pd_server_0_oam_port_0_mac_requirements: mac_count_required: is_required: false 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/oneComputeSamePortTypesAndGetAttOut/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/Nested_pd_serverServiceTemplate.yaml index bdf0a31df8..315836c88c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/Nested_pd_serverServiceTemplate.yaml @@ -11,21 +11,8 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_pd01_port_0_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_pd01_port_0_network: - type: list - required: true - entry_schema: - type: string - port_pd01_port_0_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_0_network_role: - type: string + port_pd_server_0_oam_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true compute_pd_server_availability_zone: type: list @@ -40,47 +27,48 @@ topology_template: vm_flavor_name: type: string required: true - port_pd01_port_1_network_role: - type: string - required: true - port_pd01_port_0_order: - type: integer + port_pd_server_1_oam_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_pd01_port_1_subnetpoolid: + vm_image_name: type: string required: true - vm_image_name: + port_pd_server_0_oam_port_0_network_role_tag: type: string required: true - port_pd01_port_1_network_role_tag: + port_pd_server_0_oam_port_0_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd_server_1_oam_port_0_order: + type: integer + required: true + port_pd_server_0_oam_port_0_subnetpoolid: type: string required: true - port_pd01_port_0_subnetpoolid: + port_pd_server_1_oam_port_0_subnetpoolid: type: string required: true - port_pd01_port_1_network: + compute_pd_server_user_data_format: type: list required: true entry_schema: type: string - compute_pd_server_user_data_format: + port_pd_server_0_oam_port_0_vlan_requirements: type: list required: true entry_schema: - type: string - port_pd01_port_0_network_role_tag: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_0_oam_port_0_network_role: type: string required: true - port_pd01_port_0_related_networks: - type: list + port_pd_server_1_oam_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd01_port_1_ip_requirements: - type: list + port_pd_server_0_oam_port_0_order: + type: integer required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements index_value: type: integer description: Index value of this substitution service template runtime instance @@ -88,33 +76,45 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_pd01_port_1_order: - type: integer + port_pd_server_1_oam_port_0_network_role_tag: + type: string required: true - port_pd01_port_1_related_networks: + port_pd_server_1_oam_port_0_related_networks: type: list required: true entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd01_port_0_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_pd01_port_1_vlan_requirements: + port_pd_server_1_oam_port_0_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_pd01_port_1_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pd_server_0_oam_port_0_ip_requirements: + type: list required: true - port_pd01_port_1_exCP_naming: - type: org.openecomp.datatypes.Naming + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd_server_1_oam_port_0_network_role: + type: string required: true - port_pd01_port_0_vlan_requirements: + port_pd_server_1_oam_port_0_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: string + port_pd_server_0_oam_port_0_network: + type: list + required: true + entry_schema: + type: string + port_pd_server_1_oam_port_0_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd_server_0_oam_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true node_templates: pd_server: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server @@ -135,62 +135,62 @@ topology_template: get_input: - compute_pd_server_user_data_format - index_value - pd_server_pd01_port_1: + pd_server_pd_server_1_oam_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd01_port_1_exCP_naming + get_input: port_pd_server_1_oam_port_0_exCP_naming vlan_requirements: - get_input: port_pd01_port_1_vlan_requirements + get_input: port_pd_server_1_oam_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_pd01_port_1_related_networks + get_input: port_pd_server_1_oam_port_0_related_networks ip_requirements: - get_input: port_pd01_port_1_ip_requirements + get_input: port_pd_server_1_oam_port_0_ip_requirements network_role_tag: - get_input: port_pd01_port_1_network_role_tag + get_input: port_pd_server_1_oam_port_0_network_role_tag mac_requirements: - get_input: port_pd01_port_1_mac_requirements + get_input: port_pd_server_1_oam_port_0_mac_requirements order: - get_input: port_pd01_port_1_order + get_input: port_pd_server_1_oam_port_0_order network_role: - get_input: port_pd01_port_1_network_role + get_input: port_pd_server_1_oam_port_0_network_role subnetpoolid: - get_input: port_pd01_port_1_subnetpoolid + get_input: port_pd_server_1_oam_port_0_subnetpoolid network: get_input: - - port_pd01_port_1_network + - port_pd_server_1_oam_port_0_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: pd_server relationship: tosca.relationships.network.BindsTo - pd_server_pd01_port_0: + pd_server_pd_server_0_oam_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd01_port_0_exCP_naming + get_input: port_pd_server_0_oam_port_0_exCP_naming vlan_requirements: - get_input: port_pd01_port_0_vlan_requirements + get_input: port_pd_server_0_oam_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_pd01_port_0_related_networks + get_input: port_pd_server_0_oam_port_0_related_networks ip_requirements: - get_input: port_pd01_port_0_ip_requirements + get_input: port_pd_server_0_oam_port_0_ip_requirements network_role_tag: - get_input: port_pd01_port_0_network_role_tag + get_input: port_pd_server_0_oam_port_0_network_role_tag mac_requirements: - get_input: port_pd01_port_0_mac_requirements + get_input: port_pd_server_0_oam_port_0_mac_requirements order: - get_input: port_pd01_port_0_order + get_input: port_pd_server_0_oam_port_0_order network_role: - get_input: port_pd01_port_0_network_role + get_input: port_pd_server_0_oam_port_0_network_role subnetpoolid: - get_input: port_pd01_port_0_subnetpoolid + get_input: port_pd_server_0_oam_port_0_subnetpoolid network: get_input: - - port_pd01_port_0_network + - port_pd_server_0_oam_port_0_network - index_value requirements: - binding: @@ -200,18 +200,15 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server capabilities: - binding_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - binding scalable_pd_server: - pd_server - scalable disk.read.bytes.rate_pd_server: - pd_server - disk.read.bytes.rate - binding_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - binding + network.outgoing.bytes_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 + - network.outgoing.bytes memory.usage_pd_server: - pd_server - memory.usage @@ -221,12 +218,21 @@ topology_template: disk.device.usage_pd_server: - pd_server - disk.device.usage + forwarder_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - forwarder os_pd_server: - pd_server - os disk.write.bytes.rate_pd_server: - pd_server - disk.write.bytes.rate + feature_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - feature + network.incoming.bytes_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 + - network.incoming.bytes cpu_pd_server: - pd_server - cpu @@ -239,69 +245,48 @@ topology_template: disk.read.bytes_pd_server: - pd_server - disk.read.bytes + binding_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 + - binding disk.device.read.bytes.rate_pd_server: - pd_server - disk.device.read.bytes.rate - network.incoming.packets_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - network.incoming.packets + network.outgoing.packets.rate_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - network.outgoing.packets.rate disk.iops_pd_server: - pd_server - disk.iops - network.incoming.packets.rate_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - network.incoming.packets.rate - network.incoming.bytes.rate_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - network.incoming.bytes.rate memory.resident_pd_server: - pd_server - memory.resident cpu.delta_pd_server: - pd_server - cpu.delta - network.incoming.packets.rate_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - network.incoming.packets.rate - network.incoming.bytes.rate_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - network.incoming.bytes.rate - attachment_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - attachment - network.outgoing.packets.rate_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - network.outgoing.packets.rate - network.outgoing.packets.rate_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - network.outgoing.packets.rate vcpus_pd_server: - pd_server - vcpus disk.device.write.bytes.rate_pd_server: - pd_server - disk.device.write.bytes.rate - attachment_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - attachment disk.device.write.requests_pd_server: - pd_server - disk.device.write.requests endpoint_pd_server: - pd_server - endpoint + forwarder_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 + - forwarder disk.capacity_pd_server: - pd_server - disk.capacity - forwarder_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - forwarder - forwarder_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - forwarder - network.incoming.packets_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - network.incoming.packets + network.incoming.bytes_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - network.incoming.bytes + network.outgoing.bytes.rate_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - network.outgoing.bytes.rate disk.device.allocation_pd_server: - pd_server - disk.device.allocation @@ -314,33 +299,30 @@ topology_template: disk.read.requests_pd_server: - pd_server - disk.read.requests - network.outgoing.bytes.rate_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - network.outgoing.bytes.rate - network.outgoing.bytes.rate_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - network.outgoing.bytes.rate + binding_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - binding feature_pd_server: - pd_server - feature disk.usage_pd_server: - pd_server - disk.usage - network.incoming.bytes_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - network.incoming.bytes + network.outgoing.bytes.rate_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 + - network.outgoing.bytes.rate disk.write.bytes_pd_server: - pd_server - disk.write.bytes - network.outgoing.bytes_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - network.outgoing.bytes - network.outgoing.bytes_pd_server_pd01_port_1: - - pd_server_pd01_port_1 + network.incoming.packets_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - network.incoming.packets + network.outgoing.bytes_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 - network.outgoing.bytes - network.incoming.bytes_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - network.incoming.bytes + attachment_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - attachment disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -350,15 +332,18 @@ topology_template: disk.device.read.bytes_pd_server: - pd_server - disk.device.read.bytes + feature_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 + - feature + network.incoming.bytes.rate_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 + - network.incoming.bytes.rate disk.device.write.bytes_pd_server: - pd_server - disk.device.write.bytes - network.outpoing.packets_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - network.outpoing.packets - network.outpoing.packets_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - network.outpoing.packets + network.incoming.packets_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 + - network.incoming.packets disk.device.read.requests_pd_server: - pd_server - disk.device.read.requests @@ -368,21 +353,33 @@ topology_template: host_pd_server: - pd_server - host - feature_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - feature - feature_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - feature + attachment_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 + - attachment + network.incoming.packets.rate_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 + - network.incoming.packets.rate + network.outpoing.packets_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 + - network.outpoing.packets disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate disk.ephemeral.size_pd_server: - pd_server - disk.ephemeral.size + network.outgoing.packets.rate_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 + - network.outgoing.packets.rate + network.incoming.bytes.rate_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - network.incoming.bytes.rate disk.write.requests_pd_server: - pd_server - disk.write.requests + network.incoming.packets.rate_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - network.incoming.packets.rate disk.device.latency_pd_server: - pd_server - disk.device.latency @@ -395,22 +392,25 @@ topology_template: disk.device.iops_pd_server: - pd_server - disk.device.iops + network.outpoing.packets_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - network.outpoing.packets requirements: local_storage_pd_server: - pd_server - local_storage - dependency_pd_server_pd01_port_1: - - pd_server_pd01_port_1 + link_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - link + dependency_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 - dependency dependency_pd_server: - pd_server - dependency - dependency_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - dependency - link_pd_server_pd01_port_0: - - pd_server_pd01_port_0 + link_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 - link - link_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - link \ No newline at end of file + dependency_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - 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/singleSubstitution/oneComputeSamePortsAndGetAttrIn/in/hot-mog-0108-bs1271.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/in/hot-mog-0108-bs1271.yml index 3b336e3619..c468e8d40f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/in/hot-mog-0108-bs1271.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/in/hot-mog-0108-bs1271.yml @@ -215,15 +215,15 @@ resources: flavor: {get_param: pd_flavor_name} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: pd01_port_0} - - port: {get_resource: pd01_port_1} + - port: {get_resource: pd_server_0_oam_port_0} + - port: {get_resource: pd_server_1_oam_port_0} user_data_format: RAW - pd01_port_0: + pd_server_0_oam_port_0: type: OS::Neutron::Port properties: network: {get_param: oam_net_name} - pd01_port_1: + pd_server_1_oam_port_0: type: OS::Neutron::Port properties: network: {get_param: oam_net_name} @@ -236,9 +236,9 @@ resources: network_policy_port0: type: OS::Contrail::NetworkPolicy properties: - entries: {get_attr: [pd01_port_0, device_owner]} + entries: {get_attr: [pd_server_0_oam_port_0, device_owner]} network_policy_port1: type: OS::Contrail::NetworkPolicy properties: - entries: {get_attr: [pd01_port_1, device_owner]} + entries: {get_attr: [pd_server_1_oam_port_0, device_owner]} diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml index 0bba951360..a9716b4faa 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,24 +8,8 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_pd01_port_0_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_pd01_port_0_network: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_pd01_port_0_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_0_network_role: - type: string + port_pd_server_0_oam_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED compute_pd_server_availability_zone: @@ -44,58 +28,60 @@ node_types: type: string required: true status: SUPPORTED - port_pd01_port_1_network_role: - type: string + port_pd_server_1_oam_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_pd01_port_0_order: - type: integer + vm_image_name: + type: string required: true status: SUPPORTED - port_pd01_port_1_subnetpoolid: + port_pd_server_0_oam_port_0_network_role_tag: type: string required: true status: SUPPORTED - vm_image_name: - type: string + port_pd_server_0_oam_port_0_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd_server_1_oam_port_0_order: + type: integer required: true status: SUPPORTED - port_pd01_port_1_network_role_tag: + port_pd_server_0_oam_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_pd01_port_0_subnetpoolid: + port_pd_server_1_oam_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_pd01_port_1_network: + compute_pd_server_user_data_format: type: list required: true status: SUPPORTED entry_schema: type: string - compute_pd_server_user_data_format: + port_pd_server_0_oam_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd01_port_0_network_role_tag: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_0_oam_port_0_network_role: type: string required: true status: SUPPORTED - port_pd01_port_0_related_networks: - type: list + port_pd_server_1_oam_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd01_port_1_ip_requirements: - type: list + port_pd_server_0_oam_port_0_order: + type: integer required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements index_value: type: integer description: Index value of this substitution service template runtime instance @@ -104,48 +90,62 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_pd01_port_1_order: - type: integer + port_pd_server_1_oam_port_0_network_role_tag: + type: string required: true status: SUPPORTED - port_pd01_port_1_related_networks: + port_pd_server_1_oam_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd01_port_0_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_1_oam_port_0_vlan_requirements: + type: list required: true status: SUPPORTED - port_pd01_port_1_vlan_requirements: + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_0_oam_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd01_port_1_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + type: org.openecomp.datatypes.network.IpRequirements + port_pd_server_1_oam_port_0_network_role: + type: string required: true status: SUPPORTED - port_pd01_port_1_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_1_oam_port_0_network: + type: list required: true status: SUPPORTED - port_pd01_port_0_vlan_requirements: + entry_schema: + type: string + port_pd_server_0_oam_port_0_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: string + port_pd_server_1_oam_port_0_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd_server_0_oam_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED attributes: pd_server_accessIPv4: type: string status: SUPPORTED - pd_server_pd01_port_1_device_owner: + pd_server_pd_server_1_oam_port_0_device_owner: type: string status: SUPPORTED - pd_server_pd01_port_0_device_owner: + pd_server_pd_server_0_oam_port_0_device_owner: type: string status: SUPPORTED requirements: @@ -163,41 +163,33 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pd01_port_1: + - dependency_pd_server_pd_server_1_oam_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd01_port_1: + - link_pd_server_pd_server_1_oam_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_pd_server_pd01_port_0: + - dependency_pd_server_pd_server_0_oam_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd01_port_0: + - link_pd_server_pd_server_0_oam_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: - binding_pd_server_pd01_port_0: - 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 scalable_pd_server: type: tosca.capabilities.Scalable occurrences: @@ -209,133 +201,114 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_pd01_port_1: - 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 - memory.usage_pd_server: + network.outgoing.bytes_pd_server_pd_server_1_oam_port_0: 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_pd_server: + memory.usage_pd_server: 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_pd_server: + memory_pd_server: 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_pd_server: - type: tosca.capabilities.OperatingSystem - occurrences: - - 1 - - UNBOUNDED - disk.write.bytes.rate_pd_server: + disk.device.usage_pd_server: 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_pd_server: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_pd_server_pd_server_0_oam_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - cpu_util_pd_server: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + os_pd_server: + type: tosca.capabilities.OperatingSystem occurrences: - 1 - UNBOUNDED - disk.device.write.requests.rate_pd_server: + disk.write.bytes.rate_pd_server: 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_pd_server: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_pd_server_pd_server_0_oam_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.device.read.bytes.rate_pd_server: + network.incoming.bytes_pd_server_pd_server_1_oam_port_0: 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_pd_server_pd01_port_0: + cpu_pd_server: 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.iops_pd_server: + cpu_util_pd_server: 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_pd_server_pd01_port_1: + disk.device.write.requests.rate_pd_server: 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_pd_server_pd01_port_1: + disk.read.bytes_pd_server: 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_pd_server: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_pd_server_pd_server_1_oam_port_0: + 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: - - 1 + - 0 - UNBOUNDED - cpu.delta_pd_server: + disk.device.read.bytes.rate_pd_server: 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_pd_server_pd01_port_0: + network.outgoing.packets.rate_pd_server_pd_server_0_oam_port_0: 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_pd_server_pd01_port_0: + disk.iops_pd_server: 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 - attachment_pd_server_pd01_port_1: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - network.outgoing.packets.rate_pd_server_pd01_port_1: + memory.resident_pd_server: 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.packets.rate_pd_server_pd01_port_0: + cpu.delta_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -353,11 +326,6 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pd01_port_0: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED disk.device.write.requests_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -369,23 +337,24 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.capacity_pd_server: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_pd_server_pd_server_1_oam_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - forwarder_pd_server_pd01_port_0: - type: org.openecomp.capabilities.Forwarder + disk.capacity_pd_server: + 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_pd_server_pd01_port_1: - type: org.openecomp.capabilities.Forwarder + network.incoming.bytes_pd_server_pd_server_0_oam_port_0: + 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_pd_server_pd01_port_1: + network.outgoing.bytes.rate_pd_server_pd_server_0_oam_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -414,17 +383,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pd01_port_1: - 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_pd_server_pd01_port_0: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_pd_server_pd_server_0_oam_port_0: + 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: - - 1 + - 0 - UNBOUNDED feature_pd_server: type: tosca.capabilities.Node @@ -437,7 +402,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd01_port_1: + network.outgoing.bytes.rate_pd_server_pd_server_1_oam_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -449,21 +414,20 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd01_port_0: + network.incoming.packets_pd_server_pd_server_0_oam_port_0: 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_pd_server_pd01_port_1: + network.outgoing.bytes_pd_server_pd_server_0_oam_port_0: 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_pd_server_pd01_port_0: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_pd_server_pd_server_0_oam_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED @@ -485,19 +449,24 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.write.bytes_pd_server: + feature_pd_server_pd_server_1_oam_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes.rate_pd_server_pd_server_1_oam_port_0: 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_pd_server_pd01_port_0: + disk.device.write.bytes_pd_server: 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_pd_server_pd01_port_1: + network.incoming.packets_pd_server_pd_server_1_oam_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -522,13 +491,20 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_pd01_port_1: - type: tosca.capabilities.Node + attachment_pd_server_pd_server_1_oam_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - feature_pd_server_pd01_port_0: - type: tosca.capabilities.Node + network.incoming.packets.rate_pd_server_pd_server_1_oam_port_0: + 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_pd_server_pd_server_1_oam_port_0: + 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 @@ -544,12 +520,30 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.packets.rate_pd_server_pd_server_1_oam_port_0: + 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_pd_server_pd_server_0_oam_port_0: + 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_pd_server: 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_pd_server_pd_server_0_oam_port_0: + 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_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -573,4 +567,10 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - - UNBOUNDED \ No newline at end of file + - UNBOUNDED + network.outpoing.packets_pd_server_pd_server_0_oam_port_0: + 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 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 5e52cb5fda..4dc8c7edc1 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 @@ -832,17 +832,6 @@ topology_template: directives: - substitutable properties: - port_pd01_port_0_mac_requirements: - mac_count_required: - is_required: false - port_pd01_port_0_network: - - get_input: oam_net_name - port_pd01_port_0_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: @@ -851,21 +840,32 @@ topology_template: - 0 vm_flavor_name: get_input: pd_flavor_name + port_pd_server_1_oam_port_0_mac_requirements: + mac_count_required: + is_required: false vm_image_name: get_input: pd_image_name - port_pd01_port_1_network_role_tag: oam - port_pd01_port_1_network: - - get_input: oam_net_name + port_pd_server_0_oam_port_0_network_role_tag: oam compute_pd_server_user_data_format: - RAW - port_pd01_port_0_network_role_tag: oam - port_pd01_port_1_ip_requirements: + port_pd_server_1_oam_port_0_network_role_tag: oam + port_pd_server_0_oam_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_pd_server_1_oam_port_0_network: + - get_input: oam_net_name + port_pd_server_0_oam_port_0_network: + - get_input: oam_net_name + port_pd_server_1_oam_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_1_mac_requirements: + port_pd_server_0_oam_port_0_mac_requirements: mac_count_required: is_required: false service_template_filter: @@ -882,7 +882,7 @@ topology_template: entries: get_attribute: - abstract_pd_server - - pd_server_pd01_port_0_device_owner + - pd_server_pd_server_0_oam_port_0_device_owner network_policy_server: type: org.openecomp.resource.vfc.rules.nodes.heat.network.contrail.NetworkRules properties: @@ -896,7 +896,7 @@ topology_template: entries: get_attribute: - abstract_pd_server - - pd_server_pd01_port_1_device_owner + - pd_server_pd_server_1_oam_port_0_device_owner groups: hot-mog-0108-bs1271_group: type: org.openecomp.groups.heat.HeatStack @@ -907,4 +907,4 @@ topology_template: - network_policy_port0 - network_policy_server - network_policy_port1 - - abstract_pd_server \ No newline at end of file + - 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/oneComputeSamePortsAndGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml index 4a4f1998ca..32d83a02af 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml @@ -11,21 +11,8 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_pd01_port_0_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_pd01_port_0_network: - type: list - required: true - entry_schema: - type: string - port_pd01_port_0_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_0_network_role: - type: string + port_pd_server_0_oam_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true compute_pd_server_availability_zone: type: list @@ -40,47 +27,48 @@ topology_template: vm_flavor_name: type: string required: true - port_pd01_port_1_network_role: - type: string - required: true - port_pd01_port_0_order: - type: integer + port_pd_server_1_oam_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_pd01_port_1_subnetpoolid: + vm_image_name: type: string required: true - vm_image_name: + port_pd_server_0_oam_port_0_network_role_tag: type: string required: true - port_pd01_port_1_network_role_tag: + port_pd_server_0_oam_port_0_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd_server_1_oam_port_0_order: + type: integer + required: true + port_pd_server_0_oam_port_0_subnetpoolid: type: string required: true - port_pd01_port_0_subnetpoolid: + port_pd_server_1_oam_port_0_subnetpoolid: type: string required: true - port_pd01_port_1_network: + compute_pd_server_user_data_format: type: list required: true entry_schema: type: string - compute_pd_server_user_data_format: + port_pd_server_0_oam_port_0_vlan_requirements: type: list required: true entry_schema: - type: string - port_pd01_port_0_network_role_tag: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_0_oam_port_0_network_role: type: string required: true - port_pd01_port_0_related_networks: - type: list + port_pd_server_1_oam_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd01_port_1_ip_requirements: - type: list + port_pd_server_0_oam_port_0_order: + type: integer required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements index_value: type: integer description: Index value of this substitution service template runtime instance @@ -88,33 +76,45 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_pd01_port_1_order: - type: integer + port_pd_server_1_oam_port_0_network_role_tag: + type: string required: true - port_pd01_port_1_related_networks: + port_pd_server_1_oam_port_0_related_networks: type: list required: true entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd01_port_0_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_pd01_port_1_vlan_requirements: + port_pd_server_1_oam_port_0_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_pd01_port_1_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pd_server_0_oam_port_0_ip_requirements: + type: list required: true - port_pd01_port_1_exCP_naming: - type: org.openecomp.datatypes.Naming + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd_server_1_oam_port_0_network_role: + type: string required: true - port_pd01_port_0_vlan_requirements: + port_pd_server_1_oam_port_0_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: string + port_pd_server_0_oam_port_0_network: + type: list + required: true + entry_schema: + type: string + port_pd_server_1_oam_port_0_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd_server_0_oam_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true node_templates: pd_server: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server @@ -135,62 +135,62 @@ topology_template: get_input: - compute_pd_server_user_data_format - index_value - pd_server_pd01_port_1: + pd_server_pd_server_1_oam_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd01_port_1_exCP_naming + get_input: port_pd_server_1_oam_port_0_exCP_naming vlan_requirements: - get_input: port_pd01_port_1_vlan_requirements + get_input: port_pd_server_1_oam_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_pd01_port_1_related_networks + get_input: port_pd_server_1_oam_port_0_related_networks ip_requirements: - get_input: port_pd01_port_1_ip_requirements + get_input: port_pd_server_1_oam_port_0_ip_requirements network_role_tag: - get_input: port_pd01_port_1_network_role_tag + get_input: port_pd_server_1_oam_port_0_network_role_tag mac_requirements: - get_input: port_pd01_port_1_mac_requirements + get_input: port_pd_server_1_oam_port_0_mac_requirements order: - get_input: port_pd01_port_1_order + get_input: port_pd_server_1_oam_port_0_order network_role: - get_input: port_pd01_port_1_network_role + get_input: port_pd_server_1_oam_port_0_network_role subnetpoolid: - get_input: port_pd01_port_1_subnetpoolid + get_input: port_pd_server_1_oam_port_0_subnetpoolid network: get_input: - - port_pd01_port_1_network + - port_pd_server_1_oam_port_0_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: pd_server relationship: tosca.relationships.network.BindsTo - pd_server_pd01_port_0: + pd_server_pd_server_0_oam_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd01_port_0_exCP_naming + get_input: port_pd_server_0_oam_port_0_exCP_naming vlan_requirements: - get_input: port_pd01_port_0_vlan_requirements + get_input: port_pd_server_0_oam_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_pd01_port_0_related_networks + get_input: port_pd_server_0_oam_port_0_related_networks ip_requirements: - get_input: port_pd01_port_0_ip_requirements + get_input: port_pd_server_0_oam_port_0_ip_requirements network_role_tag: - get_input: port_pd01_port_0_network_role_tag + get_input: port_pd_server_0_oam_port_0_network_role_tag mac_requirements: - get_input: port_pd01_port_0_mac_requirements + get_input: port_pd_server_0_oam_port_0_mac_requirements order: - get_input: port_pd01_port_0_order + get_input: port_pd_server_0_oam_port_0_order network_role: - get_input: port_pd01_port_0_network_role + get_input: port_pd_server_0_oam_port_0_network_role subnetpoolid: - get_input: port_pd01_port_0_subnetpoolid + get_input: port_pd_server_0_oam_port_0_subnetpoolid network: get_input: - - port_pd01_port_0_network + - port_pd_server_0_oam_port_0_network - index_value requirements: - binding: @@ -204,33 +204,30 @@ topology_template: get_attribute: - pd_server - accessIPv4 - pd_server_pd01_port_1_device_owner: + pd_server_pd_server_1_oam_port_0_device_owner: type: string value: get_attribute: - - pd_server_pd01_port_1 + - pd_server_pd_server_1_oam_port_0 - device_owner - pd_server_pd01_port_0_device_owner: + pd_server_pd_server_0_oam_port_0_device_owner: type: string value: get_attribute: - - pd_server_pd01_port_0 + - pd_server_pd_server_0_oam_port_0 - device_owner substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server capabilities: - binding_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - binding scalable_pd_server: - pd_server - scalable disk.read.bytes.rate_pd_server: - pd_server - disk.read.bytes.rate - binding_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - binding + network.outgoing.bytes_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 + - network.outgoing.bytes memory.usage_pd_server: - pd_server - memory.usage @@ -240,12 +237,21 @@ topology_template: disk.device.usage_pd_server: - pd_server - disk.device.usage + forwarder_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - forwarder os_pd_server: - pd_server - os disk.write.bytes.rate_pd_server: - pd_server - disk.write.bytes.rate + feature_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - feature + network.incoming.bytes_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 + - network.incoming.bytes cpu_pd_server: - pd_server - cpu @@ -258,69 +264,48 @@ topology_template: disk.read.bytes_pd_server: - pd_server - disk.read.bytes + binding_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 + - binding disk.device.read.bytes.rate_pd_server: - pd_server - disk.device.read.bytes.rate - network.incoming.packets_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - network.incoming.packets + network.outgoing.packets.rate_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - network.outgoing.packets.rate disk.iops_pd_server: - pd_server - disk.iops - network.incoming.packets.rate_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - network.incoming.packets.rate - network.incoming.bytes.rate_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - network.incoming.bytes.rate memory.resident_pd_server: - pd_server - memory.resident cpu.delta_pd_server: - pd_server - cpu.delta - network.incoming.packets.rate_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - network.incoming.packets.rate - network.incoming.bytes.rate_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - network.incoming.bytes.rate - attachment_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - attachment - network.outgoing.packets.rate_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - network.outgoing.packets.rate - network.outgoing.packets.rate_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - network.outgoing.packets.rate vcpus_pd_server: - pd_server - vcpus disk.device.write.bytes.rate_pd_server: - pd_server - disk.device.write.bytes.rate - attachment_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - attachment disk.device.write.requests_pd_server: - pd_server - disk.device.write.requests endpoint_pd_server: - pd_server - endpoint + forwarder_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 + - forwarder disk.capacity_pd_server: - pd_server - disk.capacity - forwarder_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - forwarder - forwarder_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - forwarder - network.incoming.packets_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - network.incoming.packets + network.incoming.bytes_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - network.incoming.bytes + network.outgoing.bytes.rate_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - network.outgoing.bytes.rate disk.device.allocation_pd_server: - pd_server - disk.device.allocation @@ -333,33 +318,30 @@ topology_template: disk.read.requests_pd_server: - pd_server - disk.read.requests - network.outgoing.bytes.rate_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - network.outgoing.bytes.rate - network.outgoing.bytes.rate_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - network.outgoing.bytes.rate + binding_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - binding feature_pd_server: - pd_server - feature disk.usage_pd_server: - pd_server - disk.usage - network.incoming.bytes_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - network.incoming.bytes + network.outgoing.bytes.rate_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 + - network.outgoing.bytes.rate disk.write.bytes_pd_server: - pd_server - disk.write.bytes - network.outgoing.bytes_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - network.outgoing.bytes - network.outgoing.bytes_pd_server_pd01_port_1: - - pd_server_pd01_port_1 + network.incoming.packets_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - network.incoming.packets + network.outgoing.bytes_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 - network.outgoing.bytes - network.incoming.bytes_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - network.incoming.bytes + attachment_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - attachment disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -369,15 +351,18 @@ topology_template: disk.device.read.bytes_pd_server: - pd_server - disk.device.read.bytes + feature_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 + - feature + network.incoming.bytes.rate_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 + - network.incoming.bytes.rate disk.device.write.bytes_pd_server: - pd_server - disk.device.write.bytes - network.outpoing.packets_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - network.outpoing.packets - network.outpoing.packets_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - network.outpoing.packets + network.incoming.packets_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 + - network.incoming.packets disk.device.read.requests_pd_server: - pd_server - disk.device.read.requests @@ -387,21 +372,33 @@ topology_template: host_pd_server: - pd_server - host - feature_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - feature - feature_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - feature + attachment_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 + - attachment + network.incoming.packets.rate_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 + - network.incoming.packets.rate + network.outpoing.packets_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 + - network.outpoing.packets disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate disk.ephemeral.size_pd_server: - pd_server - disk.ephemeral.size + network.outgoing.packets.rate_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 + - network.outgoing.packets.rate + network.incoming.bytes.rate_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - network.incoming.bytes.rate disk.write.requests_pd_server: - pd_server - disk.write.requests + network.incoming.packets.rate_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - network.incoming.packets.rate disk.device.latency_pd_server: - pd_server - disk.device.latency @@ -414,22 +411,25 @@ topology_template: disk.device.iops_pd_server: - pd_server - disk.device.iops + network.outpoing.packets_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - network.outpoing.packets requirements: local_storage_pd_server: - pd_server - local_storage - dependency_pd_server_pd01_port_1: - - pd_server_pd01_port_1 + link_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - link + dependency_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 - dependency dependency_pd_server: - pd_server - dependency - dependency_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - dependency - link_pd_server_pd01_port_0: - - pd_server_pd01_port_0 + link_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 - link - link_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - link \ No newline at end of file + dependency_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/in/hot-mog-0108-bs1271.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/in/hot-mog-0108-bs1271.yml index 46b8fc2141..d126130b32 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/in/hot-mog-0108-bs1271.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/in/hot-mog-0108-bs1271.yml @@ -215,15 +215,15 @@ resources: flavor: {get_param: pd_flavor_name} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: pd01_port_0} - - port: {get_resource: pd01_port_1} + - port: {get_resource: pd_server_0_oam_port_0} + - port: {get_resource: pd_server_1_oam_port_0} user_data_format: RAW - pd01_port_0: + pd_server_0_oam_port_0: type: OS::Neutron::Port properties: network: {get_param: oam_net_name} - pd01_port_1: + pd_server_1_oam_port_0: type: OS::Neutron::Port properties: network: {get_param: oam_net_name} @@ -234,8 +234,8 @@ outputs: value: {get_attr: [server_pd_01, accessIPv4]} out2: description: output_regula - value: {get_attr: [pd01_port_1, device_owner]} + value: {get_attr: [pd_server_1_oam_port_0, device_owner]} out3: description: output_regula value: - get_attr: [pd01_port_0, device_id] + get_attr: [pd_server_0_oam_port_0, device_id] diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml index c43947bdf6..b8c1f7aade 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,24 +8,8 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_pd01_port_0_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_pd01_port_0_network: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_pd01_port_0_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_0_network_role: - type: string + port_pd_server_0_oam_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED compute_pd_server_availability_zone: @@ -44,58 +28,60 @@ node_types: type: string required: true status: SUPPORTED - port_pd01_port_1_network_role: - type: string + port_pd_server_1_oam_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_pd01_port_0_order: - type: integer + vm_image_name: + type: string required: true status: SUPPORTED - port_pd01_port_1_subnetpoolid: + port_pd_server_0_oam_port_0_network_role_tag: type: string required: true status: SUPPORTED - vm_image_name: - type: string + port_pd_server_0_oam_port_0_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd_server_1_oam_port_0_order: + type: integer required: true status: SUPPORTED - port_pd01_port_1_network_role_tag: + port_pd_server_0_oam_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_pd01_port_0_subnetpoolid: + port_pd_server_1_oam_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_pd01_port_1_network: + compute_pd_server_user_data_format: type: list required: true status: SUPPORTED entry_schema: type: string - compute_pd_server_user_data_format: + port_pd_server_0_oam_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd01_port_0_network_role_tag: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_0_oam_port_0_network_role: type: string required: true status: SUPPORTED - port_pd01_port_0_related_networks: - type: list + port_pd_server_1_oam_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd01_port_1_ip_requirements: - type: list + port_pd_server_0_oam_port_0_order: + type: integer required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements index_value: type: integer description: Index value of this substitution service template runtime instance @@ -104,48 +90,62 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_pd01_port_1_order: - type: integer + port_pd_server_1_oam_port_0_network_role_tag: + type: string required: true status: SUPPORTED - port_pd01_port_1_related_networks: + port_pd_server_1_oam_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd01_port_0_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_1_oam_port_0_vlan_requirements: + type: list required: true status: SUPPORTED - port_pd01_port_1_vlan_requirements: + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_0_oam_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd01_port_1_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + type: org.openecomp.datatypes.network.IpRequirements + port_pd_server_1_oam_port_0_network_role: + type: string required: true status: SUPPORTED - port_pd01_port_1_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_1_oam_port_0_network: + type: list required: true status: SUPPORTED - port_pd01_port_0_vlan_requirements: + entry_schema: + type: string + port_pd_server_0_oam_port_0_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: string + port_pd_server_1_oam_port_0_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd_server_0_oam_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED attributes: - pd_server_pd01_port_0_device_id: + pd_server_accessIPv4: type: string status: SUPPORTED - pd_server_accessIPv4: + pd_server_pd_server_0_oam_port_0_device_id: type: string status: SUPPORTED - pd_server_pd01_port_1_device_owner: + pd_server_pd_server_1_oam_port_0_device_owner: type: string status: SUPPORTED requirements: @@ -163,41 +163,33 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pd01_port_1: + - dependency_pd_server_pd_server_1_oam_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd01_port_1: + - link_pd_server_pd_server_1_oam_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_pd_server_pd01_port_0: + - dependency_pd_server_pd_server_0_oam_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd01_port_0: + - link_pd_server_pd_server_0_oam_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: - binding_pd_server_pd01_port_0: - 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 scalable_pd_server: type: tosca.capabilities.Scalable occurrences: @@ -209,133 +201,114 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_pd01_port_1: - 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 - memory.usage_pd_server: + network.outgoing.bytes_pd_server_pd_server_1_oam_port_0: 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_pd_server: + memory.usage_pd_server: 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_pd_server: + memory_pd_server: 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_pd_server: - type: tosca.capabilities.OperatingSystem - occurrences: - - 1 - - UNBOUNDED - disk.write.bytes.rate_pd_server: + disk.device.usage_pd_server: 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_pd_server: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_pd_server_pd_server_0_oam_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - cpu_util_pd_server: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + os_pd_server: + type: tosca.capabilities.OperatingSystem occurrences: - 1 - UNBOUNDED - disk.device.write.requests.rate_pd_server: + disk.write.bytes.rate_pd_server: 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_pd_server: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_pd_server_pd_server_0_oam_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.device.read.bytes.rate_pd_server: + network.incoming.bytes_pd_server_pd_server_1_oam_port_0: 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_pd_server_pd01_port_0: + cpu_pd_server: 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.iops_pd_server: + cpu_util_pd_server: 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_pd_server_pd01_port_1: + disk.device.write.requests.rate_pd_server: 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_pd_server_pd01_port_1: + disk.read.bytes_pd_server: 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_pd_server: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_pd_server_pd_server_1_oam_port_0: + 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: - - 1 + - 0 - UNBOUNDED - cpu.delta_pd_server: + disk.device.read.bytes.rate_pd_server: 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_pd_server_pd01_port_0: + network.outgoing.packets.rate_pd_server_pd_server_0_oam_port_0: 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_pd_server_pd01_port_0: + disk.iops_pd_server: 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 - attachment_pd_server_pd01_port_1: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - network.outgoing.packets.rate_pd_server_pd01_port_1: + memory.resident_pd_server: 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.packets.rate_pd_server_pd01_port_0: + cpu.delta_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -353,11 +326,6 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pd01_port_0: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED disk.device.write.requests_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -369,23 +337,24 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.capacity_pd_server: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_pd_server_pd_server_1_oam_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - forwarder_pd_server_pd01_port_0: - type: org.openecomp.capabilities.Forwarder + disk.capacity_pd_server: + 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_pd_server_pd01_port_1: - type: org.openecomp.capabilities.Forwarder + network.incoming.bytes_pd_server_pd_server_0_oam_port_0: + 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_pd_server_pd01_port_1: + network.outgoing.bytes.rate_pd_server_pd_server_0_oam_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -414,17 +383,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pd01_port_1: - 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_pd_server_pd01_port_0: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_pd_server_pd_server_0_oam_port_0: + 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: - - 1 + - 0 - UNBOUNDED feature_pd_server: type: tosca.capabilities.Node @@ -437,7 +402,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd01_port_1: + network.outgoing.bytes.rate_pd_server_pd_server_1_oam_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -449,21 +414,20 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd01_port_0: + network.incoming.packets_pd_server_pd_server_0_oam_port_0: 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_pd_server_pd01_port_1: + network.outgoing.bytes_pd_server_pd_server_0_oam_port_0: 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_pd_server_pd01_port_0: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_pd_server_pd_server_0_oam_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED @@ -485,19 +449,24 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.write.bytes_pd_server: + feature_pd_server_pd_server_1_oam_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes.rate_pd_server_pd_server_1_oam_port_0: 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_pd_server_pd01_port_0: + disk.device.write.bytes_pd_server: 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_pd_server_pd01_port_1: + network.incoming.packets_pd_server_pd_server_1_oam_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -522,13 +491,20 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_pd01_port_1: - type: tosca.capabilities.Node + attachment_pd_server_pd_server_1_oam_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - feature_pd_server_pd01_port_0: - type: tosca.capabilities.Node + network.incoming.packets.rate_pd_server_pd_server_1_oam_port_0: + 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_pd_server_pd_server_1_oam_port_0: + 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 @@ -544,12 +520,30 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.packets.rate_pd_server_pd_server_1_oam_port_0: + 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_pd_server_pd_server_0_oam_port_0: + 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_pd_server: 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_pd_server_pd_server_0_oam_port_0: + 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_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -573,4 +567,10 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - - UNBOUNDED \ No newline at end of file + - UNBOUNDED + network.outpoing.packets_pd_server_pd_server_0_oam_port_0: + 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 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 9e94e9736c..abdd106602 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 @@ -832,17 +832,6 @@ topology_template: directives: - substitutable properties: - port_pd01_port_0_mac_requirements: - mac_count_required: - is_required: false - port_pd01_port_0_network: - - get_input: oam_net_name - port_pd01_port_0_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: @@ -851,21 +840,32 @@ topology_template: - 0 vm_flavor_name: get_input: pd_flavor_name + port_pd_server_1_oam_port_0_mac_requirements: + mac_count_required: + is_required: false vm_image_name: get_input: pd_image_name - port_pd01_port_1_network_role_tag: oam - port_pd01_port_1_network: - - get_input: oam_net_name + port_pd_server_0_oam_port_0_network_role_tag: oam compute_pd_server_user_data_format: - RAW - port_pd01_port_0_network_role_tag: oam - port_pd01_port_1_ip_requirements: + port_pd_server_1_oam_port_0_network_role_tag: oam + port_pd_server_0_oam_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_pd_server_1_oam_port_0_network: + - get_input: oam_net_name + port_pd_server_0_oam_port_0_network: + - get_input: oam_net_name + port_pd_server_1_oam_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_1_mac_requirements: + port_pd_server_0_oam_port_0_mac_requirements: mac_count_required: is_required: false service_template_filter: @@ -890,16 +890,16 @@ topology_template: value: get_attribute: - abstract_pd_server - - pd_server_pd01_port_1_device_owner + - pd_server_pd_server_1_oam_port_0_device_owner out3: description: output_regula value: get_attribute: - abstract_pd_server - - pd_server_pd01_port_0_device_id + - pd_server_pd_server_0_oam_port_0_device_id out1: description: output_regula value: get_attribute: - abstract_pd_server - - pd_server_accessIPv4 \ No newline at end of file + - pd_server_accessIPv4 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml index 72e80d7cc9..861529aeb2 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml @@ -11,21 +11,8 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_pd01_port_0_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_pd01_port_0_network: - type: list - required: true - entry_schema: - type: string - port_pd01_port_0_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_0_network_role: - type: string + port_pd_server_0_oam_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true compute_pd_server_availability_zone: type: list @@ -40,47 +27,48 @@ topology_template: vm_flavor_name: type: string required: true - port_pd01_port_1_network_role: - type: string - required: true - port_pd01_port_0_order: - type: integer + port_pd_server_1_oam_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_pd01_port_1_subnetpoolid: + vm_image_name: type: string required: true - vm_image_name: + port_pd_server_0_oam_port_0_network_role_tag: type: string required: true - port_pd01_port_1_network_role_tag: + port_pd_server_0_oam_port_0_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd_server_1_oam_port_0_order: + type: integer + required: true + port_pd_server_0_oam_port_0_subnetpoolid: type: string required: true - port_pd01_port_0_subnetpoolid: + port_pd_server_1_oam_port_0_subnetpoolid: type: string required: true - port_pd01_port_1_network: + compute_pd_server_user_data_format: type: list required: true entry_schema: type: string - compute_pd_server_user_data_format: + port_pd_server_0_oam_port_0_vlan_requirements: type: list required: true entry_schema: - type: string - port_pd01_port_0_network_role_tag: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_0_oam_port_0_network_role: type: string required: true - port_pd01_port_0_related_networks: - type: list + port_pd_server_1_oam_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd01_port_1_ip_requirements: - type: list + port_pd_server_0_oam_port_0_order: + type: integer required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements index_value: type: integer description: Index value of this substitution service template runtime instance @@ -88,33 +76,45 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_pd01_port_1_order: - type: integer + port_pd_server_1_oam_port_0_network_role_tag: + type: string required: true - port_pd01_port_1_related_networks: + port_pd_server_1_oam_port_0_related_networks: type: list required: true entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd01_port_0_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_pd01_port_1_vlan_requirements: + port_pd_server_1_oam_port_0_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_pd01_port_1_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pd_server_0_oam_port_0_ip_requirements: + type: list required: true - port_pd01_port_1_exCP_naming: - type: org.openecomp.datatypes.Naming + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd_server_1_oam_port_0_network_role: + type: string required: true - port_pd01_port_0_vlan_requirements: + port_pd_server_1_oam_port_0_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: string + port_pd_server_0_oam_port_0_network: + type: list + required: true + entry_schema: + type: string + port_pd_server_1_oam_port_0_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd_server_0_oam_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true node_templates: pd_server: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server @@ -135,62 +135,62 @@ topology_template: get_input: - compute_pd_server_user_data_format - index_value - pd_server_pd01_port_1: + pd_server_pd_server_1_oam_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd01_port_1_exCP_naming + get_input: port_pd_server_1_oam_port_0_exCP_naming vlan_requirements: - get_input: port_pd01_port_1_vlan_requirements + get_input: port_pd_server_1_oam_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_pd01_port_1_related_networks + get_input: port_pd_server_1_oam_port_0_related_networks ip_requirements: - get_input: port_pd01_port_1_ip_requirements + get_input: port_pd_server_1_oam_port_0_ip_requirements network_role_tag: - get_input: port_pd01_port_1_network_role_tag + get_input: port_pd_server_1_oam_port_0_network_role_tag mac_requirements: - get_input: port_pd01_port_1_mac_requirements + get_input: port_pd_server_1_oam_port_0_mac_requirements order: - get_input: port_pd01_port_1_order + get_input: port_pd_server_1_oam_port_0_order network_role: - get_input: port_pd01_port_1_network_role + get_input: port_pd_server_1_oam_port_0_network_role subnetpoolid: - get_input: port_pd01_port_1_subnetpoolid + get_input: port_pd_server_1_oam_port_0_subnetpoolid network: get_input: - - port_pd01_port_1_network + - port_pd_server_1_oam_port_0_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: pd_server relationship: tosca.relationships.network.BindsTo - pd_server_pd01_port_0: + pd_server_pd_server_0_oam_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd01_port_0_exCP_naming + get_input: port_pd_server_0_oam_port_0_exCP_naming vlan_requirements: - get_input: port_pd01_port_0_vlan_requirements + get_input: port_pd_server_0_oam_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_pd01_port_0_related_networks + get_input: port_pd_server_0_oam_port_0_related_networks ip_requirements: - get_input: port_pd01_port_0_ip_requirements + get_input: port_pd_server_0_oam_port_0_ip_requirements network_role_tag: - get_input: port_pd01_port_0_network_role_tag + get_input: port_pd_server_0_oam_port_0_network_role_tag mac_requirements: - get_input: port_pd01_port_0_mac_requirements + get_input: port_pd_server_0_oam_port_0_mac_requirements order: - get_input: port_pd01_port_0_order + get_input: port_pd_server_0_oam_port_0_order network_role: - get_input: port_pd01_port_0_network_role + get_input: port_pd_server_0_oam_port_0_network_role subnetpoolid: - get_input: port_pd01_port_0_subnetpoolid + get_input: port_pd_server_0_oam_port_0_subnetpoolid network: get_input: - - port_pd01_port_0_network + - port_pd_server_0_oam_port_0_network - index_value requirements: - binding: @@ -198,39 +198,36 @@ topology_template: node: pd_server relationship: tosca.relationships.network.BindsTo outputs: - pd_server_pd01_port_0_device_id: - type: string - value: - get_attribute: - - pd_server_pd01_port_0 - - device_id pd_server_accessIPv4: type: string value: get_attribute: - pd_server - accessIPv4 - pd_server_pd01_port_1_device_owner: + pd_server_pd_server_0_oam_port_0_device_id: + type: string + value: + get_attribute: + - pd_server_pd_server_0_oam_port_0 + - device_id + pd_server_pd_server_1_oam_port_0_device_owner: type: string value: get_attribute: - - pd_server_pd01_port_1 + - pd_server_pd_server_1_oam_port_0 - device_owner substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server capabilities: - binding_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - binding scalable_pd_server: - pd_server - scalable disk.read.bytes.rate_pd_server: - pd_server - disk.read.bytes.rate - binding_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - binding + network.outgoing.bytes_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 + - network.outgoing.bytes memory.usage_pd_server: - pd_server - memory.usage @@ -240,12 +237,21 @@ topology_template: disk.device.usage_pd_server: - pd_server - disk.device.usage + forwarder_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - forwarder os_pd_server: - pd_server - os disk.write.bytes.rate_pd_server: - pd_server - disk.write.bytes.rate + feature_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - feature + network.incoming.bytes_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 + - network.incoming.bytes cpu_pd_server: - pd_server - cpu @@ -258,69 +264,48 @@ topology_template: disk.read.bytes_pd_server: - pd_server - disk.read.bytes + binding_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 + - binding disk.device.read.bytes.rate_pd_server: - pd_server - disk.device.read.bytes.rate - network.incoming.packets_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - network.incoming.packets + network.outgoing.packets.rate_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - network.outgoing.packets.rate disk.iops_pd_server: - pd_server - disk.iops - network.incoming.packets.rate_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - network.incoming.packets.rate - network.incoming.bytes.rate_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - network.incoming.bytes.rate memory.resident_pd_server: - pd_server - memory.resident cpu.delta_pd_server: - pd_server - cpu.delta - network.incoming.packets.rate_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - network.incoming.packets.rate - network.incoming.bytes.rate_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - network.incoming.bytes.rate - attachment_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - attachment - network.outgoing.packets.rate_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - network.outgoing.packets.rate - network.outgoing.packets.rate_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - network.outgoing.packets.rate vcpus_pd_server: - pd_server - vcpus disk.device.write.bytes.rate_pd_server: - pd_server - disk.device.write.bytes.rate - attachment_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - attachment disk.device.write.requests_pd_server: - pd_server - disk.device.write.requests endpoint_pd_server: - pd_server - endpoint + forwarder_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 + - forwarder disk.capacity_pd_server: - pd_server - disk.capacity - forwarder_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - forwarder - forwarder_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - forwarder - network.incoming.packets_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - network.incoming.packets + network.incoming.bytes_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - network.incoming.bytes + network.outgoing.bytes.rate_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - network.outgoing.bytes.rate disk.device.allocation_pd_server: - pd_server - disk.device.allocation @@ -333,33 +318,30 @@ topology_template: disk.read.requests_pd_server: - pd_server - disk.read.requests - network.outgoing.bytes.rate_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - network.outgoing.bytes.rate - network.outgoing.bytes.rate_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - network.outgoing.bytes.rate + binding_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - binding feature_pd_server: - pd_server - feature disk.usage_pd_server: - pd_server - disk.usage - network.incoming.bytes_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - network.incoming.bytes + network.outgoing.bytes.rate_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 + - network.outgoing.bytes.rate disk.write.bytes_pd_server: - pd_server - disk.write.bytes - network.outgoing.bytes_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - network.outgoing.bytes - network.outgoing.bytes_pd_server_pd01_port_1: - - pd_server_pd01_port_1 + network.incoming.packets_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - network.incoming.packets + network.outgoing.bytes_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 - network.outgoing.bytes - network.incoming.bytes_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - network.incoming.bytes + attachment_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - attachment disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -369,15 +351,18 @@ topology_template: disk.device.read.bytes_pd_server: - pd_server - disk.device.read.bytes + feature_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 + - feature + network.incoming.bytes.rate_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 + - network.incoming.bytes.rate disk.device.write.bytes_pd_server: - pd_server - disk.device.write.bytes - network.outpoing.packets_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - network.outpoing.packets - network.outpoing.packets_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - network.outpoing.packets + network.incoming.packets_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 + - network.incoming.packets disk.device.read.requests_pd_server: - pd_server - disk.device.read.requests @@ -387,21 +372,33 @@ topology_template: host_pd_server: - pd_server - host - feature_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - feature - feature_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - feature + attachment_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 + - attachment + network.incoming.packets.rate_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 + - network.incoming.packets.rate + network.outpoing.packets_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 + - network.outpoing.packets disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate disk.ephemeral.size_pd_server: - pd_server - disk.ephemeral.size + network.outgoing.packets.rate_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 + - network.outgoing.packets.rate + network.incoming.bytes.rate_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - network.incoming.bytes.rate disk.write.requests_pd_server: - pd_server - disk.write.requests + network.incoming.packets.rate_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - network.incoming.packets.rate disk.device.latency_pd_server: - pd_server - disk.device.latency @@ -414,22 +411,25 @@ topology_template: disk.device.iops_pd_server: - pd_server - disk.device.iops + network.outpoing.packets_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - network.outpoing.packets requirements: local_storage_pd_server: - pd_server - local_storage - dependency_pd_server_pd01_port_1: - - pd_server_pd01_port_1 + link_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - link + dependency_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 - dependency dependency_pd_server: - pd_server - dependency - dependency_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - dependency - link_pd_server_pd01_port_0: - - pd_server_pd01_port_0 + link_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 - link - link_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - link \ No newline at end of file + dependency_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/in/hot-mog-0108-bs1271.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/in/hot-mog-0108-bs1271.yml index ebdece7be3..1f09bbd0cd 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/in/hot-mog-0108-bs1271.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/in/hot-mog-0108-bs1271.yml @@ -104,7 +104,7 @@ resources: scheduler_hints: { group: { get_resource: BE_Affinity }} block_device_mapping: [{device_name: "vda", volume_id : {get_param: VMME_ps_boot_volume }, delete_on_termination: "false" }] networks: - - port: {get_resource: pd01_port_0} + - port: {get_resource: ps_server_0_oam_port_0} user_data_format: RAW server_pd_01: @@ -120,7 +120,7 @@ resources: scheduler_hints: { group: { get_resource: BE_Affinity }} block_device_mapping: [{device_name: "vda", volume_id : {get_param: VMME_pd_boot_volume }, delete_on_termination: "false" }] networks: - - port: {get_resource: pd01_port_1} + - port: {get_resource: pd_server_0_oam_port_0} user_data_format: RAW server_oam_01: @@ -136,22 +136,22 @@ resources: scheduler_hints: { group: { get_resource: BE_Affinity }} block_device_mapping: [{device_name: "vda", volume_id : {get_param: VMME_oam_boot_volume }, delete_on_termination: "false" }] networks: - - port: {get_resource: pd01_port_2} + - port: {get_resource: oam_server_0_oam_port_0} user_data_format: RAW - pd01_port_0: + ps_server_0_oam_port_0: type: OS::Neutron::Port properties: network: {get_attr: [network_policy_server, name]} security_groups: [{get_resource: jsa_security_group}] - pd01_port_1: + pd_server_0_oam_port_0: type: OS::Neutron::Port properties: network: {get_param: oam_net_name} security_groups: [{get_resource: jsa_security_group}] - pd01_port_2: + oam_server_0_oam_port_0: type: OS::Neutron::Port properties: network: {get_param: oam_net_name} @@ -216,9 +216,9 @@ outputs: value: {get_attr: [server_oam_01, accessIPv4]} out4: description: output_regula - value: {get_attr: [pd01_port_1, device_owner]} + value: {get_attr: [pd_server_0_oam_port_0, device_owner]} out5: description: output_regula value: - get_attr: [pd01_port_0, device_id] + get_attr: [ps_server_0_oam_port_0, device_id] diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml index 6892a548bf..7a2d9ce520 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,12 +8,20 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_pd_server_oam_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED compute_pd_server_scheduler_hints: type: list required: true status: SUPPORTED entry_schema: type: json + port_pd_server_oam_port_0_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 @@ -34,79 +42,71 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_oam_port_0_network_role: + type: string required: true status: SUPPORTED - port_pd01_port_related_networks: + vm_flavor_name: + type: string + required: true + status: SUPPORTED + port_pd_server_oam_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - vm_flavor_name: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_oam_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_pd01_port_security_groups: + port_pd_server_oam_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: json - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_image_name: type: string required: true status: SUPPORTED - port_pd01_port_ip_requirements: + port_pd_server_oam_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_pd01_port_order: + port_pd_server_oam_port_0_order: type: integer required: true status: SUPPORTED - port_pd01_port_subnetpoolid: - type: string - required: true - status: SUPPORTED - port_pd01_port_network_role: - type: string - required: true - status: SUPPORTED - port_pd01_port_network_role_tag: + port_pd_server_oam_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_pd01_port_vlan_requirements: + port_pd_server_oam_port_0_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: string compute_pd_server_user_data_format: type: list required: true status: SUPPORTED entry_schema: type: string + port_pd_server_oam_port_0_security_groups: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json attributes: pd_server_accessIPv4: type: string status: SUPPORTED - pd_server_pd01_port_device_owner: + pd_server_pd_server_oam_port_0_device_owner: type: string status: SUPPORTED requirements: @@ -124,20 +124,25 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pd01_port: + - dependency_pd_server_pd_server_oam_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd01_port: + - link_pd_server_pd_server_oam_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: + feature_pd_server_pd_server_oam_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED scalable_pd_server: type: tosca.capabilities.Scalable occurrences: @@ -149,25 +154,25 @@ node_types: occurrences: - 1 - UNBOUNDED - memory.usage_pd_server: + network.outpoing.packets_pd_server_pd_server_oam_port_0: 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_pd_server: + memory.usage_pd_server: 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_pd_server: + memory_pd_server: 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.packets.rate_pd_server_pd01_port: + disk.device.usage_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -184,19 +189,27 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd01_port: + binding_pd_server_pd_server_oam_port_0: + 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 + cpu_pd_server: 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_pd_server: + cpu_util_pd_server: 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_pd_server: + network.incoming.bytes.rate_pd_server_pd_server_oam_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -220,7 +233,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd01_port: + network.incoming.bytes_pd_server_pd_server_oam_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -244,25 +257,30 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pd01_port: + vcpus_pd_server: 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_pd_server: + disk.device.write.bytes.rate_pd_server: 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_pd_server: + forwarder_pd_server_pd_server_oam_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + disk.device.write.requests_pd_server: 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_pd_server: + network.outgoing.packets.rate_pd_server_pd_server_oam_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -273,12 +291,19 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pd01_port: - type: tosca.capabilities.Attachment + disk.capacity_pd_server: + 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_pd_server: + network.outgoing.bytes_pd_server_pd_server_oam_port_0: + 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_pd_server_pd_server_oam_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -318,32 +343,12 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_pd01_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 disk.write.bytes_pd_server: 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_pd_server_pd01_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.incoming.packets_pd_server_pd01_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.device.read.requests.rate_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -387,24 +392,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pd01_port: + disk.write.requests.rate_pd_server: 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_pd_server_pd01_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - disk.write.requests.rate_pd_server: + disk.ephemeral.size_pd_server: 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.ephemeral.size_pd_server: + network.incoming.packets.rate_pd_server_pd_server_oam_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -416,8 +416,9 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_pd01_port: - type: tosca.capabilities.Node + network.outgoing.bytes.rate_pd_server_pd_server_oam_port_0: + 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 @@ -439,21 +440,34 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pd01_port: + disk.device.iops_pd_server: 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.iops_pd_server: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_pd_server_pd_server_oam_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED org.openecomp.resource.abstract.nodes.oam_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_oam_server_oam_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_oam_server_oam_port_0_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_oam_server_oam_port_0_network_role_tag: + type: string + required: true + status: SUPPORTED index_value: type: integer description: Index value of this substitution service template runtime instance @@ -462,11 +476,7 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_pd01_port_related_networks: + port_oam_server_oam_port_0_related_networks: type: list required: true status: SUPPORTED @@ -476,16 +486,26 @@ node_types: type: string required: true status: SUPPORTED - port_pd01_port_security_groups: + port_oam_server_oam_port_0_network_role: + type: string + required: true + status: SUPPORTED + port_oam_server_oam_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_oam_server_oam_port_0_security_groups: type: list required: true status: SUPPORTED entry_schema: type: json - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_oam_server_oam_port_0_network: + type: list required: true status: SUPPORTED + entry_schema: + type: string compute_oam_server_availability_zone: type: list required: true @@ -496,26 +516,16 @@ node_types: type: string required: true status: SUPPORTED - port_pd01_port_ip_requirements: - type: list + port_oam_server_oam_port_0_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + port_oam_server_oam_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd01_port_order: - type: integer - required: true - status: SUPPORTED - port_pd01_port_subnetpoolid: - type: string - required: true - status: SUPPORTED + type: org.openecomp.datatypes.network.IpRequirements compute_oam_server_user_data_format: type: list required: true @@ -528,20 +538,10 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_network_role: - type: string - required: true - status: SUPPORTED - port_pd01_port_network_role_tag: - type: string - required: true - status: SUPPORTED - port_pd01_port_vlan_requirements: - type: list + port_oam_server_oam_port_0_order: + type: integer required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements compute_oam_server_scheduler_hints: type: list required: true @@ -553,14 +553,14 @@ node_types: type: string status: SUPPORTED requirements: - - dependency_oam_server_pd01_port: + - dependency_oam_server_oam_server_oam_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_oam_server_pd01_port: + - link_oam_server_oam_server_oam_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -600,12 +600,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_oam_server_pd01_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_oam_server: type: tosca.capabilities.Node occurrences: @@ -641,14 +635,6 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_oam_server_pd01_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 disk.write.bytes_oam_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -661,7 +647,7 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_oam_server_pd01_port: + forwarder_oam_server_oam_server_oam_port_0: type: org.openecomp.capabilities.Forwarder occurrences: - 1 @@ -678,21 +664,20 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_oam_server_pd01_port: + disk.device.read.requests.rate_oam_server: 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_oam_server: + network.incoming.packets_oam_server_oam_server_oam_port_0: 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_oam_server_pd01_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_oam_server_oam_server_oam_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED @@ -708,12 +693,24 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes.rate_oam_server_oam_server_oam_port_0: + 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_oam_server: 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_oam_server_oam_server_oam_port_0: + 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 instance_oam_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -773,24 +770,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_oam_server_pd01_port: + disk.latency_oam_server: 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 - attachment_oam_server_pd01_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - disk.latency_oam_server: + disk.read.requests_oam_server: 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_oam_server: + network.outgoing.packets.rate_oam_server_oam_server_oam_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -814,8 +806,9 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_oam_server_pd01_port: - type: tosca.capabilities.Node + network.outgoing.bytes_oam_server_oam_server_oam_port_0: + 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 @@ -835,19 +828,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_oam_server_pd01_port: + disk.write.requests.rate_oam_server: 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_oam_server: + network.incoming.packets.rate_oam_server_oam_server_oam_port_0: 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_oam_server_pd01_port: + network.outpoing.packets_oam_server_oam_server_oam_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -876,15 +869,14 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_oam_server_pd01_port: + network.incoming.bytes.rate_oam_server_oam_server_oam_port_0: 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_oam_server_pd01_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_oam_server_oam_server_oam_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -894,6 +886,14 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_oam_server_oam_server_oam_port_0: + 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 org.openecomp.resource.abstract.nodes.ps_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: @@ -929,89 +929,76 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_pd01_port_related_networks: - type: list + port_ps_server_oam_port_0_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true status: SUPPORTED - port_pd01_port_security_groups: + port_ps_server_oam_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: json - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + type: org.openecomp.datatypes.network.IpRequirements + port_ps_server_oam_port_0_network: + type: list required: true status: SUPPORTED - vm_image_name: + entry_schema: + type: string + port_ps_server_oam_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_ps_server_oam_port_0_network_role: type: string required: true status: SUPPORTED - port_pd01_port_ip_requirements: + port_ps_server_oam_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + type: org.openecomp.datatypes.network.VlanRequirements + port_ps_server_oam_port_0_security_groups: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd01_port_order: - type: integer + type: json + vm_image_name: + type: string required: true status: SUPPORTED - port_pd01_port_subnetpoolid: + port_ps_server_oam_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_pd01_port_network_role: - type: string + port_ps_server_oam_port_0_related_networks: + type: list required: true status: SUPPORTED - port_pd01_port_network_role_tag: - type: string + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_ps_server_oam_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_pd01_port_vlan_requirements: - type: list + port_ps_server_oam_port_0_order: + type: integer required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements attributes: ps_server_accessIPv4: type: string status: SUPPORTED - ps_server_pd01_port_device_id: + ps_server_ps_server_oam_port_0_device_id: type: string status: SUPPORTED requirements: - - dependency_ps_server_pd01_port: - capability: tosca.capabilities.Node - node: tosca.nodes.Root - relationship: tosca.relationships.DependsOn - occurrences: - - 0 - - UNBOUNDED - - link_ps_server_pd01_port: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - dependency_ps_server: capability: tosca.capabilities.Node node: tosca.nodes.Root @@ -1026,6 +1013,19 @@ node_types: occurrences: - 0 - UNBOUNDED + - dependency_ps_server_ps_server_oam_port_0: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - link_ps_server_ps_server_oam_port_0: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 capabilities: instance_ps_server: type: org.openecomp.capabilities.metric.Ceilometer @@ -1033,13 +1033,11 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_ps_server_pd01_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 + network.incoming.packets.rate_ps_server_ps_server_oam_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - - 0 + - 1 - UNBOUNDED host_ps_server: type: tosca.capabilities.Container @@ -1101,13 +1099,19 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.iops_ps_server: + network.outgoing.packets.rate_ps_server_ps_server_oam_port_0: + 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_ps_server_ps_server_oam_port_0: 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_ps_server_pd01_port: + disk.device.iops_ps_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1142,38 +1146,26 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_ps_server_pd01_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 - forwarder_ps_server_pd01_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED disk.write.requests_ps_server: 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_ps_server_pd01_port: + network.outgoing.bytes_ps_server_ps_server_oam_port_0: 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_ps_server_pd01_port: + disk.latency_ps_server: 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_ps_server: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_ps_server_ps_server_oam_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -1189,6 +1181,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_ps_server_ps_server_oam_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.iops_ps_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1201,7 +1198,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_ps_server_pd01_port: + network.incoming.bytes_ps_server_ps_server_oam_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1231,21 +1228,25 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_ps_server_pd01_port: - type: tosca.capabilities.Node + network.outpoing.packets_ps_server_ps_server_oam_port_0: + 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_ps_server_pd01_port: + network.incoming.bytes.rate_ps_server_ps_server_oam_port_0: 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 - attachment_ps_server_pd01_port: - type: tosca.capabilities.Attachment + binding_ps_server_ps_server_oam_port_0: + 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: - - 1 + - 0 - UNBOUNDED disk.device.write.requests.rate_ps_server: type: org.openecomp.capabilities.metric.Ceilometer @@ -1253,12 +1254,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_ps_server_pd01_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_ps_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1282,6 +1277,11 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_ps_server_ps_server_oam_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED os_ps_server: type: tosca.capabilities.OperatingSystem occurrences: @@ -1305,12 +1305,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_ps_server_pd01_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.usage_ps_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1339,4 +1333,10 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - - UNBOUNDED \ No newline at end of file + - UNBOUNDED + network.outgoing.bytes.rate_ps_server_ps_server_oam_port_0: + 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 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 8002f73309..c86f14b3d7 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 @@ -388,6 +388,9 @@ topology_template: properties: compute_pd_server_scheduler_hints: - group: BE_Affinity_group + port_pd_server_oam_port_0_mac_requirements: + mac_count_required: + is_required: false compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: @@ -398,24 +401,21 @@ topology_template: get_attribute: - network_policy_server - name - port_pd01_port_security_groups: - - - jsa_security_group - port_pd01_port_mac_requirements: - mac_count_required: - is_required: false vm_image_name: get_input: pd_image_name - port_pd01_port_ip_requirements: + port_pd_server_oam_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_network: + port_pd_server_oam_port_0_network_role_tag: oam + port_pd_server_oam_port_0_network: - get_input: oam_net_name - port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW + port_pd_server_oam_port_0_security_groups: + - - jsa_security_group service_template_filter: substitute_service_template: Nested_pd_serverServiceTemplate.yaml count: 1 @@ -448,23 +448,23 @@ topology_template: get_attribute: - network_policy_server - name - port_pd01_port_security_groups: - - - jsa_security_group - port_pd01_port_mac_requirements: - mac_count_required: - is_required: false - vm_image_name: - get_input: pd_image_name - port_pd01_port_ip_requirements: + port_ps_server_oam_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_network: + port_ps_server_oam_port_0_network: - get_attribute: - network_policy_server - name + port_ps_server_oam_port_0_security_groups: + - - jsa_security_group + vm_image_name: + get_input: pd_image_name + port_ps_server_oam_port_0_mac_requirements: + mac_count_required: + is_required: false service_template_filter: substitute_service_template: Nested_ps_serverServiceTemplate.yaml count: 1 @@ -483,34 +483,34 @@ topology_template: directives: - substitutable properties: + port_oam_server_oam_port_0_mac_requirements: + mac_count_required: + is_required: false + port_oam_server_oam_port_0_network_role_tag: oam vm_flavor_name: get_attribute: - network_policy_server - name - port_pd01_port_security_groups: + port_oam_server_oam_port_0_security_groups: - - jsa_security_group - port_pd01_port_mac_requirements: - mac_count_required: - is_required: false + port_oam_server_oam_port_0_network: + - get_input: oam_net_name compute_oam_server_availability_zone: - get_input: availabilityzone_name vm_image_name: get_input: pd_image_name - port_pd01_port_ip_requirements: + port_oam_server_oam_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_network: - - get_input: oam_net_name compute_oam_server_user_data_format: - RAW compute_oam_server_name: - get_input: - oam_server_names - 0 - port_pd01_port_network_role_tag: oam compute_oam_server_scheduler_hints: - group: BE_Affinity_group service_template_filter: @@ -569,15 +569,15 @@ topology_template: direction: ingress requirements: - port: - capability: attachment_ps_server_pd01_port + capability: attachment_ps_server_ps_server_oam_port_0 node: abstract_ps_server relationship: org.openecomp.relationships.AttachesTo - port: - capability: attachment_pd_server_pd01_port + capability: attachment_pd_server_pd_server_oam_port_0 node: abstract_pd_server relationship: org.openecomp.relationships.AttachesTo - port: - capability: attachment_oam_server_pd01_port + capability: attachment_oam_server_oam_server_oam_port_0 node: abstract_oam_server relationship: org.openecomp.relationships.AttachesTo network_policy_server_pd: @@ -633,13 +633,13 @@ topology_template: value: get_attribute: - abstract_pd_server - - pd_server_pd01_port_device_owner + - pd_server_pd_server_oam_port_0_device_owner out5: description: output_regula value: get_attribute: - abstract_ps_server - - ps_server_pd01_port_device_id + - ps_server_ps_server_oam_port_0_device_id out1: description: output_regula value: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_oam_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_oam_serverServiceTemplate.yaml index 51e1b2117d..9a3b6f93e5 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_oam_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_oam_serverServiceTemplate.yaml @@ -11,6 +11,17 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_oam_server_oam_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_oam_server_oam_port_0_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_oam_server_oam_port_0_network_role_tag: + type: string + required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -18,10 +29,7 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_pd01_port_related_networks: + port_oam_server_oam_port_0_related_networks: type: list required: true entry_schema: @@ -29,14 +37,22 @@ topology_template: vm_flavor_name: type: string required: true - port_pd01_port_security_groups: + port_oam_server_oam_port_0_network_role: + type: string + required: true + port_oam_server_oam_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_oam_server_oam_port_0_security_groups: type: list required: true entry_schema: type: json - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_oam_server_oam_port_0_network: + type: list required: true + entry_schema: + type: string compute_oam_server_availability_zone: type: list required: true @@ -45,22 +61,14 @@ topology_template: vm_image_name: type: string required: true - port_pd01_port_ip_requirements: - type: list + port_oam_server_oam_port_0_subnetpoolid: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + port_oam_server_oam_port_0_ip_requirements: type: list required: true entry_schema: - type: string - port_pd01_port_order: - type: integer - required: true - port_pd01_port_subnetpoolid: - type: string - required: true + type: org.openecomp.datatypes.network.IpRequirements compute_oam_server_user_data_format: type: list required: true @@ -71,52 +79,44 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_network_role: - type: string - required: true - port_pd01_port_network_role_tag: - type: string - required: true - port_pd01_port_vlan_requirements: - type: list + port_oam_server_oam_port_0_order: + type: integer required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements compute_oam_server_scheduler_hints: type: list required: true entry_schema: type: json node_templates: - oam_server_pd01_port: + oam_server_oam_server_oam_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_requirements: - get_input: port_pd01_port_mac_requirements + get_input: port_oam_server_oam_port_0_mac_requirements order: - get_input: port_pd01_port_order + get_input: port_oam_server_oam_port_0_order security_groups: get_input: - - port_pd01_port_security_groups + - port_oam_server_oam_port_0_security_groups - index_value exCP_naming: - get_input: port_pd01_port_exCP_naming + get_input: port_oam_server_oam_port_0_exCP_naming vlan_requirements: - get_input: port_pd01_port_vlan_requirements + get_input: port_oam_server_oam_port_0_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_pd01_port_ip_requirements + get_input: port_oam_server_oam_port_0_ip_requirements related_networks: - get_input: port_pd01_port_related_networks + get_input: port_oam_server_oam_port_0_related_networks network_role_tag: - get_input: port_pd01_port_network_role_tag + get_input: port_oam_server_oam_port_0_network_role_tag network_role: - get_input: port_pd01_port_network_role + get_input: port_oam_server_oam_port_0_network_role subnetpoolid: - get_input: port_pd01_port_subnetpoolid + get_input: port_oam_server_oam_port_0_subnetpoolid network: get_input: - - port_pd01_port_network + - port_oam_server_oam_port_0_network - index_value requirements: - binding: @@ -165,9 +165,6 @@ topology_template: disk.usage_oam_server: - oam_server - disk.usage - network.incoming.bytes.rate_oam_server_pd01_port: - - oam_server_pd01_port - - network.incoming.bytes.rate feature_oam_server: - oam_server - feature @@ -186,17 +183,14 @@ topology_template: disk.read.bytes.rate_oam_server: - oam_server - disk.read.bytes.rate - binding_oam_server_pd01_port: - - oam_server_pd01_port - - binding disk.write.bytes_oam_server: - oam_server - disk.write.bytes disk.write.requests_oam_server: - oam_server - disk.write.requests - forwarder_oam_server_pd01_port: - - oam_server_pd01_port + forwarder_oam_server_oam_server_oam_port_0: + - oam_server_oam_server_oam_port_0 - forwarder cpu_oam_server: - oam_server @@ -204,24 +198,30 @@ topology_template: vcpus_oam_server: - oam_server - vcpus - network.incoming.packets_oam_server_pd01_port: - - oam_server_pd01_port - - network.incoming.packets disk.device.read.requests.rate_oam_server: - oam_server - disk.device.read.requests.rate - network.outpoing.packets_oam_server_pd01_port: - - oam_server_pd01_port - - network.outpoing.packets + network.incoming.packets_oam_server_oam_server_oam_port_0: + - oam_server_oam_server_oam_port_0 + - network.incoming.packets + attachment_oam_server_oam_server_oam_port_0: + - oam_server_oam_server_oam_port_0 + - attachment disk.allocation_oam_server: - oam_server - disk.allocation disk.write.bytes.rate_oam_server: - oam_server - disk.write.bytes.rate + network.outgoing.bytes.rate_oam_server_oam_server_oam_port_0: + - oam_server_oam_server_oam_port_0 + - network.outgoing.bytes.rate disk.device.write.requests.rate_oam_server: - oam_server - disk.device.write.requests.rate + network.incoming.bytes_oam_server_oam_server_oam_port_0: + - oam_server_oam_server_oam_port_0 + - network.incoming.bytes instance_oam_server: - oam_server - instance @@ -252,18 +252,15 @@ topology_template: disk.device.usage_oam_server: - oam_server - disk.device.usage - network.outgoing.packets.rate_oam_server_pd01_port: - - oam_server_pd01_port - - network.outgoing.packets.rate - attachment_oam_server_pd01_port: - - oam_server_pd01_port - - attachment disk.latency_oam_server: - oam_server - disk.latency disk.read.requests_oam_server: - oam_server - disk.read.requests + network.outgoing.packets.rate_oam_server_oam_server_oam_port_0: + - oam_server_oam_server_oam_port_0 + - network.outgoing.packets.rate disk.device.iops_oam_server: - oam_server - disk.device.iops @@ -273,9 +270,9 @@ topology_template: disk.device.latency_oam_server: - oam_server - disk.device.latency - feature_oam_server_pd01_port: - - oam_server_pd01_port - - feature + network.outgoing.bytes_oam_server_oam_server_oam_port_0: + - oam_server_oam_server_oam_port_0 + - network.outgoing.bytes memory.usage_oam_server: - oam_server - memory.usage @@ -285,15 +282,15 @@ topology_template: scalable_oam_server: - oam_server - scalable - network.incoming.bytes_oam_server_pd01_port: - - oam_server_pd01_port - - network.incoming.bytes disk.write.requests.rate_oam_server: - oam_server - disk.write.requests.rate - network.incoming.packets.rate_oam_server_pd01_port: - - oam_server_pd01_port + network.incoming.packets.rate_oam_server_oam_server_oam_port_0: + - oam_server_oam_server_oam_port_0 - network.incoming.packets.rate + network.outpoing.packets_oam_server_oam_server_oam_port_0: + - oam_server_oam_server_oam_port_0 + - network.outpoing.packets disk.device.read.bytes.rate_oam_server: - oam_server - disk.device.read.bytes.rate @@ -306,25 +303,28 @@ topology_template: disk.read.bytes_oam_server: - oam_server - disk.read.bytes - network.outgoing.bytes_oam_server_pd01_port: - - oam_server_pd01_port - - network.outgoing.bytes - network.outgoing.bytes.rate_oam_server_pd01_port: - - oam_server_pd01_port - - network.outgoing.bytes.rate + network.incoming.bytes.rate_oam_server_oam_server_oam_port_0: + - oam_server_oam_server_oam_port_0 + - network.incoming.bytes.rate + feature_oam_server_oam_server_oam_port_0: + - oam_server_oam_server_oam_port_0 + - feature disk.ephemeral.size_oam_server: - oam_server - disk.ephemeral.size + binding_oam_server_oam_server_oam_port_0: + - oam_server_oam_server_oam_port_0 + - binding requirements: - link_oam_server_pd01_port: - - oam_server_pd01_port + link_oam_server_oam_server_oam_port_0: + - oam_server_oam_server_oam_port_0 - link - dependency_oam_server_pd01_port: - - oam_server_pd01_port - - dependency local_storage_oam_server: - oam_server - local_storage + dependency_oam_server_oam_server_oam_port_0: + - oam_server_oam_server_oam_port_0 + - dependency dependency_oam_server: - oam_server - - dependency \ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_pd_serverServiceTemplate.yaml index f80b26c76a..7b21e1e88b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_pd_serverServiceTemplate.yaml @@ -11,11 +11,17 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pd_server_oam_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true compute_pd_server_scheduler_hints: type: list required: true entry_schema: type: json + port_pd_server_oam_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -33,60 +39,54 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_oam_port_0_network_role: + type: string required: true - port_pd01_port_related_networks: + vm_flavor_name: + type: string + required: true + port_pd_server_oam_port_0_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - vm_flavor_name: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_oam_port_0_subnetpoolid: type: string required: true - port_pd01_port_security_groups: + port_pd_server_oam_port_0_related_networks: type: list required: true entry_schema: - type: json - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_image_name: type: string required: true - port_pd01_port_ip_requirements: + port_pd_server_oam_port_0_ip_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: - type: list - required: true - entry_schema: - type: string - port_pd01_port_order: + port_pd_server_oam_port_0_order: type: integer required: true - port_pd01_port_subnetpoolid: - type: string - required: true - port_pd01_port_network_role: + port_pd_server_oam_port_0_network_role_tag: type: string required: true - port_pd01_port_network_role_tag: - type: string - required: true - port_pd01_port_vlan_requirements: + port_pd_server_oam_port_0_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: string compute_pd_server_user_data_format: type: list required: true entry_schema: type: string + port_pd_server_oam_port_0_security_groups: + type: list + required: true + entry_schema: + type: json node_templates: pd_server: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server @@ -111,35 +111,35 @@ topology_template: get_input: - compute_pd_server_user_data_format - index_value - pd_server_pd01_port: + pd_server_pd_server_oam_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_requirements: - get_input: port_pd01_port_mac_requirements + get_input: port_pd_server_oam_port_0_mac_requirements order: - get_input: port_pd01_port_order + get_input: port_pd_server_oam_port_0_order security_groups: get_input: - - port_pd01_port_security_groups + - port_pd_server_oam_port_0_security_groups - index_value exCP_naming: - get_input: port_pd01_port_exCP_naming + get_input: port_pd_server_oam_port_0_exCP_naming vlan_requirements: - get_input: port_pd01_port_vlan_requirements + get_input: port_pd_server_oam_port_0_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_pd01_port_ip_requirements + get_input: port_pd_server_oam_port_0_ip_requirements related_networks: - get_input: port_pd01_port_related_networks + get_input: port_pd_server_oam_port_0_related_networks network_role_tag: - get_input: port_pd01_port_network_role_tag + get_input: port_pd_server_oam_port_0_network_role_tag network_role: - get_input: port_pd01_port_network_role + get_input: port_pd_server_oam_port_0_network_role subnetpoolid: - get_input: port_pd01_port_subnetpoolid + get_input: port_pd_server_oam_port_0_subnetpoolid network: get_input: - - port_pd01_port_network + - port_pd_server_oam_port_0_network - index_value requirements: - binding: @@ -153,21 +153,27 @@ topology_template: get_attribute: - pd_server - accessIPv4 - pd_server_pd01_port_device_owner: + pd_server_pd_server_oam_port_0_device_owner: type: string value: get_attribute: - - pd_server_pd01_port + - pd_server_pd_server_oam_port_0 - device_owner substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server capabilities: + feature_pd_server_pd_server_oam_port_0: + - pd_server_pd_server_oam_port_0 + - feature scalable_pd_server: - pd_server - scalable disk.read.bytes.rate_pd_server: - pd_server - disk.read.bytes.rate + network.outpoing.packets_pd_server_pd_server_oam_port_0: + - pd_server_pd_server_oam_port_0 + - network.outpoing.packets memory.usage_pd_server: - pd_server - memory.usage @@ -177,24 +183,24 @@ topology_template: disk.device.usage_pd_server: - pd_server - disk.device.usage - network.outgoing.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.packets.rate os_pd_server: - pd_server - os disk.write.bytes.rate_pd_server: - pd_server - disk.write.bytes.rate - network.incoming.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes + binding_pd_server_pd_server_oam_port_0: + - pd_server_pd_server_oam_port_0 + - binding cpu_pd_server: - pd_server - cpu cpu_util_pd_server: - pd_server - cpu_util + network.incoming.bytes.rate_pd_server_pd_server_oam_port_0: + - pd_server_pd_server_oam_port_0 + - network.incoming.bytes.rate disk.device.write.requests.rate_pd_server: - pd_server - disk.device.write.requests.rate @@ -204,9 +210,9 @@ topology_template: disk.device.read.bytes.rate_pd_server: - pd_server - disk.device.read.bytes.rate - network.outgoing.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes + network.incoming.bytes_pd_server_pd_server_oam_port_0: + - pd_server_pd_server_oam_port_0 + - network.incoming.bytes disk.iops_pd_server: - pd_server - disk.iops @@ -216,27 +222,33 @@ topology_template: cpu.delta_pd_server: - pd_server - cpu.delta - network.incoming.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets.rate vcpus_pd_server: - pd_server - vcpus disk.device.write.bytes.rate_pd_server: - pd_server - disk.device.write.bytes.rate + forwarder_pd_server_pd_server_oam_port_0: + - pd_server_pd_server_oam_port_0 + - forwarder disk.device.write.requests_pd_server: - pd_server - disk.device.write.requests + network.outgoing.packets.rate_pd_server_pd_server_oam_port_0: + - pd_server_pd_server_oam_port_0 + - network.outgoing.packets.rate endpoint_pd_server: - pd_server - endpoint - attachment_pd_server_pd01_port: - - pd_server_pd01_port - - attachment disk.capacity_pd_server: - pd_server - disk.capacity + network.outgoing.bytes_pd_server_pd_server_oam_port_0: + - pd_server_pd_server_oam_port_0 + - network.outgoing.bytes + network.incoming.packets_pd_server_pd_server_oam_port_0: + - pd_server_pd_server_oam_port_0 + - network.incoming.packets disk.device.allocation_pd_server: - pd_server - disk.device.allocation @@ -255,18 +267,9 @@ topology_template: disk.usage_pd_server: - pd_server - disk.usage - binding_pd_server_pd01_port: - - pd_server_pd01_port - - binding disk.write.bytes_pd_server: - pd_server - disk.write.bytes - network.incoming.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes.rate - network.incoming.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -288,24 +291,21 @@ topology_template: host_pd_server: - pd_server - host - network.outpoing.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.outpoing.packets - forwarder_pd_server_pd01_port: - - pd_server_pd01_port - - forwarder disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate disk.ephemeral.size_pd_server: - pd_server - disk.ephemeral.size + network.incoming.packets.rate_pd_server_pd_server_oam_port_0: + - pd_server_pd_server_oam_port_0 + - network.incoming.packets.rate disk.write.requests_pd_server: - pd_server - disk.write.requests - feature_pd_server_pd01_port: - - pd_server_pd01_port - - feature + network.outgoing.bytes.rate_pd_server_pd_server_oam_port_0: + - pd_server_pd_server_oam_port_0 + - network.outgoing.bytes.rate disk.device.latency_pd_server: - pd_server - disk.device.latency @@ -315,22 +315,22 @@ topology_template: disk.device.capacity_pd_server: - pd_server - disk.device.capacity - network.outgoing.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes.rate disk.device.iops_pd_server: - pd_server - disk.device.iops + attachment_pd_server_pd_server_oam_port_0: + - pd_server_pd_server_oam_port_0 + - attachment requirements: local_storage_pd_server: - pd_server - local_storage - link_pd_server_pd01_port: - - pd_server_pd01_port - - link - dependency_pd_server_pd01_port: - - pd_server_pd01_port + dependency_pd_server_pd_server_oam_port_0: + - pd_server_pd_server_oam_port_0 - dependency dependency_pd_server: - pd_server - - dependency \ No newline at end of file + - dependency + link_pd_server_pd_server_oam_port_0: + - pd_server_pd_server_oam_port_0 + - link diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_ps_serverServiceTemplate.yaml index 72a76e4df7..33bbcb22e2 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_ps_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_ps_serverServiceTemplate.yaml @@ -38,91 +38,56 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_pd01_port_related_networks: - type: list + port_ps_server_oam_port_0_subnetpoolid: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true - port_pd01_port_security_groups: + port_ps_server_oam_port_0_ip_requirements: type: list required: true entry_schema: - type: json - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + type: org.openecomp.datatypes.network.IpRequirements + port_ps_server_oam_port_0_network: + type: list required: true - vm_image_name: + entry_schema: + type: string + port_ps_server_oam_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_ps_server_oam_port_0_network_role: type: string required: true - port_pd01_port_ip_requirements: + port_ps_server_oam_port_0_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + type: org.openecomp.datatypes.network.VlanRequirements + port_ps_server_oam_port_0_security_groups: type: list required: true entry_schema: - type: string - port_pd01_port_order: - type: integer - required: true - port_pd01_port_subnetpoolid: - type: string - required: true - port_pd01_port_network_role: + type: json + vm_image_name: type: string required: true - port_pd01_port_network_role_tag: + port_ps_server_oam_port_0_network_role_tag: type: string required: true - port_pd01_port_vlan_requirements: + port_ps_server_oam_port_0_related_networks: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_ps_server_oam_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_ps_server_oam_port_0_order: + type: integer + required: true node_templates: - ps_server_pd01_port: - type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port - properties: - mac_requirements: - get_input: port_pd01_port_mac_requirements - order: - get_input: port_pd01_port_order - security_groups: - get_input: - - port_pd01_port_security_groups - - index_value - exCP_naming: - get_input: port_pd01_port_exCP_naming - vlan_requirements: - get_input: port_pd01_port_vlan_requirements - subinterface_indicator: false - ip_requirements: - get_input: port_pd01_port_ip_requirements - related_networks: - get_input: port_pd01_port_related_networks - network_role_tag: - get_input: port_pd01_port_network_role_tag - network_role: - get_input: port_pd01_port_network_role - subnetpoolid: - get_input: port_pd01_port_subnetpoolid - network: - get_input: - - port_pd01_port_network - - index_value - requirements: - - binding: - capability: tosca.capabilities.network.Bindable - node: ps_server - relationship: tosca.relationships.network.BindsTo ps_server: type: org.openecomp.resource.vfc.compute.nodes.heat.ps_server properties: @@ -146,6 +111,41 @@ topology_template: get_input: - compute_ps_server_user_data_format - index_value + ps_server_ps_server_oam_port_0: + type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port + properties: + mac_requirements: + get_input: port_ps_server_oam_port_0_mac_requirements + order: + get_input: port_ps_server_oam_port_0_order + security_groups: + get_input: + - port_ps_server_oam_port_0_security_groups + - index_value + exCP_naming: + get_input: port_ps_server_oam_port_0_exCP_naming + vlan_requirements: + get_input: port_ps_server_oam_port_0_vlan_requirements + subinterface_indicator: false + ip_requirements: + get_input: port_ps_server_oam_port_0_ip_requirements + related_networks: + get_input: port_ps_server_oam_port_0_related_networks + network_role_tag: + get_input: port_ps_server_oam_port_0_network_role_tag + network_role: + get_input: port_ps_server_oam_port_0_network_role + subnetpoolid: + get_input: port_ps_server_oam_port_0_subnetpoolid + network: + get_input: + - port_ps_server_oam_port_0_network + - index_value + requirements: + - binding: + capability: tosca.capabilities.network.Bindable + node: ps_server + relationship: tosca.relationships.network.BindsTo outputs: ps_server_accessIPv4: type: string @@ -153,11 +153,11 @@ topology_template: get_attribute: - ps_server - accessIPv4 - ps_server_pd01_port_device_id: + ps_server_ps_server_oam_port_0_device_id: type: string value: get_attribute: - - ps_server_pd01_port + - ps_server_ps_server_oam_port_0 - device_id substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.ps_server @@ -165,9 +165,9 @@ topology_template: instance_ps_server: - ps_server - instance - binding_ps_server_pd01_port: - - ps_server_pd01_port - - binding + network.incoming.packets.rate_ps_server_ps_server_oam_port_0: + - ps_server_ps_server_oam_port_0 + - network.incoming.packets.rate host_ps_server: - ps_server - host @@ -198,12 +198,15 @@ topology_template: disk.read.bytes_ps_server: - ps_server - disk.read.bytes + network.outgoing.packets.rate_ps_server_ps_server_oam_port_0: + - ps_server_ps_server_oam_port_0 + - network.outgoing.packets.rate + network.incoming.packets_ps_server_ps_server_oam_port_0: + - ps_server_ps_server_oam_port_0 + - network.incoming.packets disk.device.iops_ps_server: - ps_server - disk.device.iops - network.outpoing.packets_ps_server_pd01_port: - - ps_server_pd01_port - - network.outpoing.packets disk.device.latency_ps_server: - ps_server - disk.device.latency @@ -219,39 +222,36 @@ topology_template: disk.write.requests.rate_ps_server: - ps_server - disk.write.requests.rate - network.outgoing.bytes_ps_server_pd01_port: - - ps_server_pd01_port - - network.outgoing.bytes - forwarder_ps_server_pd01_port: - - ps_server_pd01_port - - forwarder disk.write.requests_ps_server: - ps_server - disk.write.requests - network.incoming.bytes.rate_ps_server_pd01_port: - - ps_server_pd01_port - - network.incoming.bytes.rate - network.incoming.packets_ps_server_pd01_port: - - ps_server_pd01_port - - network.incoming.packets + network.outgoing.bytes_ps_server_ps_server_oam_port_0: + - ps_server_ps_server_oam_port_0 + - network.outgoing.bytes disk.latency_ps_server: - ps_server - disk.latency + feature_ps_server_ps_server_oam_port_0: + - ps_server_ps_server_oam_port_0 + - feature disk.ephemeral.size_ps_server: - ps_server - disk.ephemeral.size disk.device.capacity_ps_server: - ps_server - disk.device.capacity + forwarder_ps_server_ps_server_oam_port_0: + - ps_server_ps_server_oam_port_0 + - forwarder disk.iops_ps_server: - ps_server - disk.iops disk.device.read.bytes.rate_ps_server: - ps_server - disk.device.read.bytes.rate - network.outgoing.packets.rate_ps_server_pd01_port: - - ps_server_pd01_port - - network.outgoing.packets.rate + network.incoming.bytes_ps_server_ps_server_oam_port_0: + - ps_server_ps_server_oam_port_0 + - network.incoming.bytes cpu_util_ps_server: - ps_server - cpu_util @@ -264,21 +264,18 @@ topology_template: disk.write.bytes_ps_server: - ps_server - disk.write.bytes - feature_ps_server_pd01_port: - - ps_server_pd01_port - - feature - network.outgoing.bytes.rate_ps_server_pd01_port: - - ps_server_pd01_port - - network.outgoing.bytes.rate - attachment_ps_server_pd01_port: - - ps_server_pd01_port - - attachment + network.outpoing.packets_ps_server_ps_server_oam_port_0: + - ps_server_ps_server_oam_port_0 + - network.outpoing.packets + network.incoming.bytes.rate_ps_server_ps_server_oam_port_0: + - ps_server_ps_server_oam_port_0 + - network.incoming.bytes.rate + binding_ps_server_ps_server_oam_port_0: + - ps_server_ps_server_oam_port_0 + - binding disk.device.write.requests.rate_ps_server: - ps_server - disk.device.write.requests.rate - network.incoming.packets.rate_ps_server_pd01_port: - - ps_server_pd01_port - - network.incoming.packets.rate disk.read.requests_ps_server: - ps_server - disk.read.requests @@ -291,6 +288,9 @@ topology_template: binding_ps_server: - ps_server - binding + attachment_ps_server_ps_server_oam_port_0: + - ps_server_ps_server_oam_port_0 + - attachment os_ps_server: - ps_server - os @@ -303,9 +303,6 @@ topology_template: vcpus_ps_server: - ps_server - vcpus - network.incoming.bytes_ps_server_pd01_port: - - ps_server_pd01_port - - network.incoming.bytes disk.usage_ps_server: - ps_server - disk.usage @@ -321,16 +318,19 @@ topology_template: disk.device.allocation_ps_server: - ps_server - disk.device.allocation + network.outgoing.bytes.rate_ps_server_ps_server_oam_port_0: + - ps_server_ps_server_oam_port_0 + - network.outgoing.bytes.rate requirements: + dependency_ps_server_ps_server_oam_port_0: + - ps_server_ps_server_oam_port_0 + - dependency dependency_ps_server: - ps_server - dependency - dependency_ps_server_pd01_port: - - ps_server_pd01_port - - dependency - link_ps_server_pd01_port: - - ps_server_pd01_port + link_ps_server_ps_server_oam_port_0: + - ps_server_ps_server_oam_port_0 - link local_storage_ps_server: - ps_server - - local_storage \ No newline at end of file + - local_storage diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/in/hot-mog-0108-bs1271.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/in/hot-mog-0108-bs1271.yml index 9f4c7475d8..8401b6f3ce 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/in/hot-mog-0108-bs1271.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/in/hot-mog-0108-bs1271.yml @@ -90,7 +90,7 @@ resources: flavor: {get_attr: [network_policy_server, name]} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: pd01_port_0} + - port: {get_resource: ps_server_0_oam_port_0} user_data_format: RAW server_pd_01: @@ -102,7 +102,7 @@ resources: flavor: {get_attr: [network_policy_server, name]} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: pd01_port_1} + - port: {get_resource: pd_server_0_oam_port_0} user_data_format: RAW server_oam_01: @@ -114,18 +114,18 @@ resources: flavor: {get_attr: [network_policy_server, name]} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: pd01_port_2} + - port: {get_resource: oam_server_0_oam_port_0} user_data_format: RAW - pd01_port_0: + ps_server_0_oam_port_0: type: OS::Neutron::Port properties: network: {get_attr: [network_policy_server, name]} - pd01_port_1: + pd_server_0_oam_port_0: type: OS::Neutron::Port properties: network: {get_param: oam_net_name} - pd01_port_2: + oam_server_0_oam_port_0: type: OS::Neutron::Port properties: network: {get_param: oam_net_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/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/GlobalSubstitutionTypesServiceTemplate.yaml index 26ddce2ded..f0fa48a8bd 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,6 +8,14 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_pd_server_oam_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_pd_server_oam_port_0_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 @@ -28,62 +36,54 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_oam_port_0_network_role: + type: string + required: true + status: SUPPORTED + vm_flavor_name: + type: string required: true status: SUPPORTED - port_pd01_port_related_networks: + port_pd_server_oam_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - vm_flavor_name: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_oam_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pd_server_oam_port_0_related_networks: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_image_name: type: string required: true status: SUPPORTED - port_pd01_port_ip_requirements: + port_pd_server_oam_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_pd01_port_order: + port_pd_server_oam_port_0_order: type: integer required: true status: SUPPORTED - port_pd01_port_subnetpoolid: - type: string - required: true - status: SUPPORTED - port_pd01_port_network_role: - type: string - required: true - status: SUPPORTED - port_pd01_port_network_role_tag: + port_pd_server_oam_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_pd01_port_vlan_requirements: + port_pd_server_oam_port_0_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: string compute_pd_server_user_data_format: type: list required: true @@ -105,20 +105,25 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pd01_port: + - dependency_pd_server_pd_server_oam_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd01_port: + - link_pd_server_pd_server_oam_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: + feature_pd_server_pd_server_oam_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED scalable_pd_server: type: tosca.capabilities.Scalable occurrences: @@ -130,25 +135,25 @@ node_types: occurrences: - 1 - UNBOUNDED - memory.usage_pd_server: + network.outpoing.packets_pd_server_pd_server_oam_port_0: 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_pd_server: + memory.usage_pd_server: 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_pd_server: + memory_pd_server: 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.packets.rate_pd_server_pd01_port: + disk.device.usage_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -165,19 +170,27 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd01_port: + binding_pd_server_pd_server_oam_port_0: + 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 + cpu_pd_server: 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_pd_server: + cpu_util_pd_server: 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_pd_server: + network.incoming.bytes.rate_pd_server_pd_server_oam_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -201,7 +214,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd01_port: + network.incoming.bytes_pd_server_pd_server_oam_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -225,25 +238,30 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pd01_port: + vcpus_pd_server: 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_pd_server: + disk.device.write.bytes.rate_pd_server: 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_pd_server: + forwarder_pd_server_pd_server_oam_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + disk.device.write.requests_pd_server: 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_pd_server: + network.outgoing.packets.rate_pd_server_pd_server_oam_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -254,12 +272,19 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pd01_port: - type: tosca.capabilities.Attachment + disk.capacity_pd_server: + 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_pd_server: + network.outgoing.bytes_pd_server_pd_server_oam_port_0: + 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_pd_server_pd_server_oam_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -299,32 +324,12 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_pd01_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 disk.write.bytes_pd_server: 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_pd_server_pd01_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.incoming.packets_pd_server_pd01_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.device.read.requests.rate_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -368,24 +373,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pd01_port: + disk.write.requests.rate_pd_server: 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_pd_server_pd01_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - disk.write.requests.rate_pd_server: + disk.ephemeral.size_pd_server: 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.ephemeral.size_pd_server: + network.incoming.packets.rate_pd_server_pd_server_oam_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -397,8 +397,9 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_pd01_port: - type: tosca.capabilities.Node + network.outgoing.bytes.rate_pd_server_pd_server_oam_port_0: + 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 @@ -420,21 +421,34 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pd01_port: + disk.device.iops_pd_server: 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.iops_pd_server: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_pd_server_pd_server_oam_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED org.openecomp.resource.abstract.nodes.oam_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_oam_server_oam_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_oam_server_oam_port_0_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_oam_server_oam_port_0_network_role_tag: + type: string + required: true + status: SUPPORTED index_value: type: integer description: Index value of this substitution service template runtime instance @@ -443,11 +457,7 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_pd01_port_related_networks: + port_oam_server_oam_port_0_related_networks: type: list required: true status: SUPPORTED @@ -457,40 +467,40 @@ node_types: type: string required: true status: SUPPORTED - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - compute_oam_server_availability_zone: - type: list + port_oam_server_oam_port_0_network_role: + type: string required: true status: SUPPORTED - entry_schema: - type: string - vm_image_name: - type: string + port_oam_server_oam_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_pd01_port_ip_requirements: + port_oam_server_oam_port_0_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + type: string + compute_oam_server_availability_zone: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd01_port_order: - type: integer + vm_image_name: + type: string required: true status: SUPPORTED - port_pd01_port_subnetpoolid: + port_oam_server_oam_port_0_subnetpoolid: type: string required: true status: SUPPORTED + port_oam_server_oam_port_0_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements compute_oam_server_user_data_format: type: list required: true @@ -503,29 +513,19 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_network_role: - type: string - required: true - status: SUPPORTED - port_pd01_port_network_role_tag: - type: string - required: true - status: SUPPORTED - port_pd01_port_vlan_requirements: - type: list + port_oam_server_oam_port_0_order: + type: integer required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements requirements: - - dependency_oam_server_pd01_port: + - dependency_oam_server_oam_server_oam_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_oam_server_pd01_port: + - link_oam_server_oam_server_oam_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -565,12 +565,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_oam_server_pd01_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_oam_server: type: tosca.capabilities.Node occurrences: @@ -606,14 +600,6 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_oam_server_pd01_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 disk.write.bytes_oam_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -626,7 +612,7 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_oam_server_pd01_port: + forwarder_oam_server_oam_server_oam_port_0: type: org.openecomp.capabilities.Forwarder occurrences: - 1 @@ -643,21 +629,20 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_oam_server_pd01_port: + disk.device.read.requests.rate_oam_server: 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_oam_server: + network.incoming.packets_oam_server_oam_server_oam_port_0: 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_oam_server_pd01_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_oam_server_oam_server_oam_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED @@ -673,12 +658,24 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes.rate_oam_server_oam_server_oam_port_0: + 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_oam_server: 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_oam_server_oam_server_oam_port_0: + 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 instance_oam_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -738,24 +735,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_oam_server_pd01_port: + disk.latency_oam_server: 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 - attachment_oam_server_pd01_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - disk.latency_oam_server: + disk.read.requests_oam_server: 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_oam_server: + network.outgoing.packets.rate_oam_server_oam_server_oam_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -779,8 +771,9 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_oam_server_pd01_port: - type: tosca.capabilities.Node + network.outgoing.bytes_oam_server_oam_server_oam_port_0: + 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 @@ -800,19 +793,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_oam_server_pd01_port: + disk.write.requests.rate_oam_server: 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_oam_server: + network.incoming.packets.rate_oam_server_oam_server_oam_port_0: 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_oam_server_pd01_port: + network.outpoing.packets_oam_server_oam_server_oam_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -841,15 +834,14 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_oam_server_pd01_port: + network.incoming.bytes.rate_oam_server_oam_server_oam_port_0: 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_oam_server_pd01_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_oam_server_oam_server_oam_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -859,6 +851,14 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_oam_server_oam_server_oam_port_0: + 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 org.openecomp.resource.abstract.nodes.ps_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: @@ -888,76 +888,63 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_pd01_port_related_networks: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - vm_flavor_name: + port_ps_server_oam_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - vm_image_name: + vm_flavor_name: type: string required: true status: SUPPORTED - port_pd01_port_ip_requirements: + port_ps_server_oam_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + port_ps_server_oam_port_0_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd01_port_order: - type: integer + port_ps_server_oam_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_pd01_port_subnetpoolid: + port_ps_server_oam_port_0_network_role: type: string required: true status: SUPPORTED - port_pd01_port_network_role: + port_ps_server_oam_port_0_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + vm_image_name: type: string required: true status: SUPPORTED - port_pd01_port_network_role_tag: + port_ps_server_oam_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_pd01_port_vlan_requirements: + port_ps_server_oam_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_ps_server_oam_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_ps_server_oam_port_0_order: + type: integer + required: true + status: SUPPORTED requirements: - - dependency_ps_server_pd01_port: - capability: tosca.capabilities.Node - node: tosca.nodes.Root - relationship: tosca.relationships.DependsOn - occurrences: - - 0 - - UNBOUNDED - - link_ps_server_pd01_port: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - dependency_ps_server: capability: tosca.capabilities.Node node: tosca.nodes.Root @@ -972,6 +959,19 @@ node_types: occurrences: - 0 - UNBOUNDED + - dependency_ps_server_ps_server_oam_port_0: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - link_ps_server_ps_server_oam_port_0: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 capabilities: instance_ps_server: type: org.openecomp.capabilities.metric.Ceilometer @@ -979,13 +979,11 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_ps_server_pd01_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 + network.incoming.packets.rate_ps_server_ps_server_oam_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - - 0 + - 1 - UNBOUNDED host_ps_server: type: tosca.capabilities.Container @@ -1047,13 +1045,19 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.iops_ps_server: + network.outgoing.packets.rate_ps_server_ps_server_oam_port_0: + 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_ps_server_ps_server_oam_port_0: 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_ps_server_pd01_port: + disk.device.iops_ps_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1088,38 +1092,26 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_ps_server_pd01_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 - forwarder_ps_server_pd01_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED disk.write.requests_ps_server: 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_ps_server_pd01_port: + network.outgoing.bytes_ps_server_ps_server_oam_port_0: 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_ps_server_pd01_port: + disk.latency_ps_server: 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_ps_server: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_ps_server_ps_server_oam_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -1135,6 +1127,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_ps_server_ps_server_oam_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.iops_ps_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1147,7 +1144,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_ps_server_pd01_port: + network.incoming.bytes_ps_server_ps_server_oam_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1177,21 +1174,25 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_ps_server_pd01_port: - type: tosca.capabilities.Node + network.outpoing.packets_ps_server_ps_server_oam_port_0: + 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_ps_server_pd01_port: + network.incoming.bytes.rate_ps_server_ps_server_oam_port_0: 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 - attachment_ps_server_pd01_port: - type: tosca.capabilities.Attachment + binding_ps_server_ps_server_oam_port_0: + 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: - - 1 + - 0 - UNBOUNDED disk.device.write.requests.rate_ps_server: type: org.openecomp.capabilities.metric.Ceilometer @@ -1199,12 +1200,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_ps_server_pd01_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_ps_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1228,6 +1223,11 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_ps_server_ps_server_oam_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED os_ps_server: type: tosca.capabilities.OperatingSystem occurrences: @@ -1251,12 +1251,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_ps_server_pd01_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.usage_ps_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1285,4 +1279,10 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - - UNBOUNDED \ No newline at end of file + - UNBOUNDED + network.outgoing.bytes.rate_ps_server_ps_server_oam_port_0: + 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 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 0bb61d1682..bf59f34752 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 @@ -327,6 +327,9 @@ topology_template: directives: - substitutable properties: + port_pd_server_oam_port_0_mac_requirements: + mac_count_required: + is_required: false compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: @@ -337,20 +340,17 @@ topology_template: get_attribute: - network_policy_server - name - port_pd01_port_mac_requirements: - mac_count_required: - is_required: false vm_image_name: get_input: pd_image_name - port_pd01_port_ip_requirements: + port_pd_server_oam_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_network: + port_pd_server_oam_port_0_network_role_tag: oam + port_pd_server_oam_port_0_network: - get_input: oam_net_name - port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW service_template_filter: @@ -378,21 +378,21 @@ topology_template: get_attribute: - network_policy_server - name - port_pd01_port_mac_requirements: - mac_count_required: - is_required: false - vm_image_name: - get_input: pd_image_name - port_pd01_port_ip_requirements: + port_ps_server_oam_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_network: + port_ps_server_oam_port_0_network: - get_attribute: - network_policy_server - name + vm_image_name: + get_input: pd_image_name + port_ps_server_oam_port_0_mac_requirements: + mac_count_required: + is_required: false service_template_filter: substitute_service_template: Nested_ps_serverServiceTemplate.yaml count: 1 @@ -406,32 +406,32 @@ topology_template: directives: - substitutable properties: + port_oam_server_oam_port_0_mac_requirements: + mac_count_required: + is_required: false + port_oam_server_oam_port_0_network_role_tag: oam vm_flavor_name: get_attribute: - network_policy_server - name - port_pd01_port_mac_requirements: - mac_count_required: - is_required: false + port_oam_server_oam_port_0_network: + - get_input: oam_net_name compute_oam_server_availability_zone: - get_input: availabilityzone_name vm_image_name: get_input: pd_image_name - port_pd01_port_ip_requirements: + port_oam_server_oam_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_network: - - get_input: oam_net_name compute_oam_server_user_data_format: - RAW compute_oam_server_name: - get_input: - oam_server_names - 0 - port_pd01_port_network_role_tag: oam service_template_filter: substitute_service_template: Nested_oam_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/threeDiffComputesWithPorts/out/Nested_oam_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_oam_serverServiceTemplate.yaml index 2893981349..8c188adb4f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_oam_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_oam_serverServiceTemplate.yaml @@ -11,6 +11,17 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_oam_server_oam_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_oam_server_oam_port_0_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_oam_server_oam_port_0_network_role_tag: + type: string + required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -18,10 +29,7 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_pd01_port_related_networks: + port_oam_server_oam_port_0_related_networks: type: list required: true entry_schema: @@ -29,9 +37,17 @@ topology_template: vm_flavor_name: type: string required: true - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_oam_server_oam_port_0_network_role: + type: string + required: true + port_oam_server_oam_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_oam_server_oam_port_0_network: + type: list required: true + entry_schema: + type: string compute_oam_server_availability_zone: type: list required: true @@ -40,22 +56,14 @@ topology_template: vm_image_name: type: string required: true - port_pd01_port_ip_requirements: - type: list + port_oam_server_oam_port_0_subnetpoolid: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + port_oam_server_oam_port_0_ip_requirements: type: list required: true entry_schema: - type: string - port_pd01_port_order: - type: integer - required: true - port_pd01_port_subnetpoolid: - type: string - required: true + type: org.openecomp.datatypes.network.IpRequirements compute_oam_server_user_data_format: type: list required: true @@ -66,43 +74,35 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_network_role: - type: string - required: true - port_pd01_port_network_role_tag: - type: string - required: true - port_pd01_port_vlan_requirements: - type: list + port_oam_server_oam_port_0_order: + type: integer required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements node_templates: - oam_server_pd01_port: + oam_server_oam_server_oam_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd01_port_exCP_naming + get_input: port_oam_server_oam_port_0_exCP_naming vlan_requirements: - get_input: port_pd01_port_vlan_requirements + get_input: port_oam_server_oam_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_pd01_port_related_networks + get_input: port_oam_server_oam_port_0_related_networks ip_requirements: - get_input: port_pd01_port_ip_requirements + get_input: port_oam_server_oam_port_0_ip_requirements network_role_tag: - get_input: port_pd01_port_network_role_tag + get_input: port_oam_server_oam_port_0_network_role_tag mac_requirements: - get_input: port_pd01_port_mac_requirements + get_input: port_oam_server_oam_port_0_mac_requirements order: - get_input: port_pd01_port_order + get_input: port_oam_server_oam_port_0_order network_role: - get_input: port_pd01_port_network_role + get_input: port_oam_server_oam_port_0_network_role subnetpoolid: - get_input: port_pd01_port_subnetpoolid + get_input: port_oam_server_oam_port_0_subnetpoolid network: get_input: - - port_pd01_port_network + - port_oam_server_oam_port_0_network - index_value requirements: - binding: @@ -140,9 +140,6 @@ topology_template: disk.usage_oam_server: - oam_server - disk.usage - network.incoming.bytes.rate_oam_server_pd01_port: - - oam_server_pd01_port - - network.incoming.bytes.rate feature_oam_server: - oam_server - feature @@ -161,17 +158,14 @@ topology_template: disk.read.bytes.rate_oam_server: - oam_server - disk.read.bytes.rate - binding_oam_server_pd01_port: - - oam_server_pd01_port - - binding disk.write.bytes_oam_server: - oam_server - disk.write.bytes disk.write.requests_oam_server: - oam_server - disk.write.requests - forwarder_oam_server_pd01_port: - - oam_server_pd01_port + forwarder_oam_server_oam_server_oam_port_0: + - oam_server_oam_server_oam_port_0 - forwarder cpu_oam_server: - oam_server @@ -179,24 +173,30 @@ topology_template: vcpus_oam_server: - oam_server - vcpus - network.incoming.packets_oam_server_pd01_port: - - oam_server_pd01_port - - network.incoming.packets disk.device.read.requests.rate_oam_server: - oam_server - disk.device.read.requests.rate - network.outpoing.packets_oam_server_pd01_port: - - oam_server_pd01_port - - network.outpoing.packets + network.incoming.packets_oam_server_oam_server_oam_port_0: + - oam_server_oam_server_oam_port_0 + - network.incoming.packets + attachment_oam_server_oam_server_oam_port_0: + - oam_server_oam_server_oam_port_0 + - attachment disk.allocation_oam_server: - oam_server - disk.allocation disk.write.bytes.rate_oam_server: - oam_server - disk.write.bytes.rate + network.outgoing.bytes.rate_oam_server_oam_server_oam_port_0: + - oam_server_oam_server_oam_port_0 + - network.outgoing.bytes.rate disk.device.write.requests.rate_oam_server: - oam_server - disk.device.write.requests.rate + network.incoming.bytes_oam_server_oam_server_oam_port_0: + - oam_server_oam_server_oam_port_0 + - network.incoming.bytes instance_oam_server: - oam_server - instance @@ -227,18 +227,15 @@ topology_template: disk.device.usage_oam_server: - oam_server - disk.device.usage - network.outgoing.packets.rate_oam_server_pd01_port: - - oam_server_pd01_port - - network.outgoing.packets.rate - attachment_oam_server_pd01_port: - - oam_server_pd01_port - - attachment disk.latency_oam_server: - oam_server - disk.latency disk.read.requests_oam_server: - oam_server - disk.read.requests + network.outgoing.packets.rate_oam_server_oam_server_oam_port_0: + - oam_server_oam_server_oam_port_0 + - network.outgoing.packets.rate disk.device.iops_oam_server: - oam_server - disk.device.iops @@ -248,9 +245,9 @@ topology_template: disk.device.latency_oam_server: - oam_server - disk.device.latency - feature_oam_server_pd01_port: - - oam_server_pd01_port - - feature + network.outgoing.bytes_oam_server_oam_server_oam_port_0: + - oam_server_oam_server_oam_port_0 + - network.outgoing.bytes memory.usage_oam_server: - oam_server - memory.usage @@ -260,15 +257,15 @@ topology_template: scalable_oam_server: - oam_server - scalable - network.incoming.bytes_oam_server_pd01_port: - - oam_server_pd01_port - - network.incoming.bytes disk.write.requests.rate_oam_server: - oam_server - disk.write.requests.rate - network.incoming.packets.rate_oam_server_pd01_port: - - oam_server_pd01_port + network.incoming.packets.rate_oam_server_oam_server_oam_port_0: + - oam_server_oam_server_oam_port_0 - network.incoming.packets.rate + network.outpoing.packets_oam_server_oam_server_oam_port_0: + - oam_server_oam_server_oam_port_0 + - network.outpoing.packets disk.device.read.bytes.rate_oam_server: - oam_server - disk.device.read.bytes.rate @@ -281,25 +278,28 @@ topology_template: disk.read.bytes_oam_server: - oam_server - disk.read.bytes - network.outgoing.bytes_oam_server_pd01_port: - - oam_server_pd01_port - - network.outgoing.bytes - network.outgoing.bytes.rate_oam_server_pd01_port: - - oam_server_pd01_port - - network.outgoing.bytes.rate + network.incoming.bytes.rate_oam_server_oam_server_oam_port_0: + - oam_server_oam_server_oam_port_0 + - network.incoming.bytes.rate + feature_oam_server_oam_server_oam_port_0: + - oam_server_oam_server_oam_port_0 + - feature disk.ephemeral.size_oam_server: - oam_server - disk.ephemeral.size + binding_oam_server_oam_server_oam_port_0: + - oam_server_oam_server_oam_port_0 + - binding requirements: - link_oam_server_pd01_port: - - oam_server_pd01_port + link_oam_server_oam_server_oam_port_0: + - oam_server_oam_server_oam_port_0 - link - dependency_oam_server_pd01_port: - - oam_server_pd01_port - - dependency local_storage_oam_server: - oam_server - local_storage + dependency_oam_server_oam_server_oam_port_0: + - oam_server_oam_server_oam_port_0 + - dependency dependency_oam_server: - oam_server - - dependency \ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_pd_serverServiceTemplate.yaml index 2d01270aaf..689b0bf80a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_pd_serverServiceTemplate.yaml @@ -11,6 +11,12 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pd_server_oam_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_pd_server_oam_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -28,50 +34,44 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_oam_port_0_network_role: + type: string + required: true + vm_flavor_name: + type: string required: true - port_pd01_port_related_networks: + port_pd_server_oam_port_0_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - vm_flavor_name: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_oam_port_0_subnetpoolid: type: string required: true - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pd_server_oam_port_0_related_networks: + type: list required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_image_name: type: string required: true - port_pd01_port_ip_requirements: + port_pd_server_oam_port_0_ip_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: - type: list - required: true - entry_schema: - type: string - port_pd01_port_order: + port_pd_server_oam_port_0_order: type: integer required: true - port_pd01_port_subnetpoolid: + port_pd_server_oam_port_0_network_role_tag: type: string required: true - port_pd01_port_network_role: - type: string - required: true - port_pd01_port_network_role_tag: - type: string - required: true - port_pd01_port_vlan_requirements: + port_pd_server_oam_port_0_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: string compute_pd_server_user_data_format: type: list required: true @@ -97,31 +97,31 @@ topology_template: get_input: - compute_pd_server_user_data_format - index_value - pd_server_pd01_port: + pd_server_pd_server_oam_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd01_port_exCP_naming + get_input: port_pd_server_oam_port_0_exCP_naming vlan_requirements: - get_input: port_pd01_port_vlan_requirements + get_input: port_pd_server_oam_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_pd01_port_related_networks + get_input: port_pd_server_oam_port_0_related_networks ip_requirements: - get_input: port_pd01_port_ip_requirements + get_input: port_pd_server_oam_port_0_ip_requirements network_role_tag: - get_input: port_pd01_port_network_role_tag + get_input: port_pd_server_oam_port_0_network_role_tag mac_requirements: - get_input: port_pd01_port_mac_requirements + get_input: port_pd_server_oam_port_0_mac_requirements order: - get_input: port_pd01_port_order + get_input: port_pd_server_oam_port_0_order network_role: - get_input: port_pd01_port_network_role + get_input: port_pd_server_oam_port_0_network_role subnetpoolid: - get_input: port_pd01_port_subnetpoolid + get_input: port_pd_server_oam_port_0_subnetpoolid network: get_input: - - port_pd01_port_network + - port_pd_server_oam_port_0_network - index_value requirements: - binding: @@ -131,12 +131,18 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server capabilities: + feature_pd_server_pd_server_oam_port_0: + - pd_server_pd_server_oam_port_0 + - feature scalable_pd_server: - pd_server - scalable disk.read.bytes.rate_pd_server: - pd_server - disk.read.bytes.rate + network.outpoing.packets_pd_server_pd_server_oam_port_0: + - pd_server_pd_server_oam_port_0 + - network.outpoing.packets memory.usage_pd_server: - pd_server - memory.usage @@ -146,24 +152,24 @@ topology_template: disk.device.usage_pd_server: - pd_server - disk.device.usage - network.outgoing.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.packets.rate os_pd_server: - pd_server - os disk.write.bytes.rate_pd_server: - pd_server - disk.write.bytes.rate - network.incoming.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes + binding_pd_server_pd_server_oam_port_0: + - pd_server_pd_server_oam_port_0 + - binding cpu_pd_server: - pd_server - cpu cpu_util_pd_server: - pd_server - cpu_util + network.incoming.bytes.rate_pd_server_pd_server_oam_port_0: + - pd_server_pd_server_oam_port_0 + - network.incoming.bytes.rate disk.device.write.requests.rate_pd_server: - pd_server - disk.device.write.requests.rate @@ -173,9 +179,9 @@ topology_template: disk.device.read.bytes.rate_pd_server: - pd_server - disk.device.read.bytes.rate - network.outgoing.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes + network.incoming.bytes_pd_server_pd_server_oam_port_0: + - pd_server_pd_server_oam_port_0 + - network.incoming.bytes disk.iops_pd_server: - pd_server - disk.iops @@ -185,27 +191,33 @@ topology_template: cpu.delta_pd_server: - pd_server - cpu.delta - network.incoming.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets.rate vcpus_pd_server: - pd_server - vcpus disk.device.write.bytes.rate_pd_server: - pd_server - disk.device.write.bytes.rate + forwarder_pd_server_pd_server_oam_port_0: + - pd_server_pd_server_oam_port_0 + - forwarder disk.device.write.requests_pd_server: - pd_server - disk.device.write.requests + network.outgoing.packets.rate_pd_server_pd_server_oam_port_0: + - pd_server_pd_server_oam_port_0 + - network.outgoing.packets.rate endpoint_pd_server: - pd_server - endpoint - attachment_pd_server_pd01_port: - - pd_server_pd01_port - - attachment disk.capacity_pd_server: - pd_server - disk.capacity + network.outgoing.bytes_pd_server_pd_server_oam_port_0: + - pd_server_pd_server_oam_port_0 + - network.outgoing.bytes + network.incoming.packets_pd_server_pd_server_oam_port_0: + - pd_server_pd_server_oam_port_0 + - network.incoming.packets disk.device.allocation_pd_server: - pd_server - disk.device.allocation @@ -224,18 +236,9 @@ topology_template: disk.usage_pd_server: - pd_server - disk.usage - binding_pd_server_pd01_port: - - pd_server_pd01_port - - binding disk.write.bytes_pd_server: - pd_server - disk.write.bytes - network.incoming.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes.rate - network.incoming.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -257,24 +260,21 @@ topology_template: host_pd_server: - pd_server - host - network.outpoing.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.outpoing.packets - forwarder_pd_server_pd01_port: - - pd_server_pd01_port - - forwarder disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate disk.ephemeral.size_pd_server: - pd_server - disk.ephemeral.size + network.incoming.packets.rate_pd_server_pd_server_oam_port_0: + - pd_server_pd_server_oam_port_0 + - network.incoming.packets.rate disk.write.requests_pd_server: - pd_server - disk.write.requests - feature_pd_server_pd01_port: - - pd_server_pd01_port - - feature + network.outgoing.bytes.rate_pd_server_pd_server_oam_port_0: + - pd_server_pd_server_oam_port_0 + - network.outgoing.bytes.rate disk.device.latency_pd_server: - pd_server - disk.device.latency @@ -284,22 +284,22 @@ topology_template: disk.device.capacity_pd_server: - pd_server - disk.device.capacity - network.outgoing.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes.rate disk.device.iops_pd_server: - pd_server - disk.device.iops + attachment_pd_server_pd_server_oam_port_0: + - pd_server_pd_server_oam_port_0 + - attachment requirements: local_storage_pd_server: - pd_server - local_storage - link_pd_server_pd01_port: - - pd_server_pd01_port - - link - dependency_pd_server_pd01_port: - - pd_server_pd01_port + dependency_pd_server_pd_server_oam_port_0: + - pd_server_pd_server_oam_port_0 - dependency dependency_pd_server: - pd_server - - dependency \ No newline at end of file + - dependency + link_pd_server_pd_server_oam_port_0: + - pd_server_pd_server_oam_port_0 + - link diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_ps_serverServiceTemplate.yaml index 158f58ce62..6da2a82323 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_ps_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_ps_serverServiceTemplate.yaml @@ -33,110 +33,110 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_pd01_port_related_networks: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - vm_flavor_name: + port_ps_server_oam_port_0_subnetpoolid: type: string required: true - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - vm_image_name: + vm_flavor_name: type: string required: true - port_pd01_port_ip_requirements: + port_ps_server_oam_port_0_ip_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + port_ps_server_oam_port_0_network: type: list required: true entry_schema: type: string - port_pd01_port_order: - type: integer + port_ps_server_oam_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - port_pd01_port_subnetpoolid: + port_ps_server_oam_port_0_network_role: type: string required: true - port_pd01_port_network_role: + port_ps_server_oam_port_0_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + vm_image_name: type: string required: true - port_pd01_port_network_role_tag: + port_ps_server_oam_port_0_network_role_tag: type: string required: true - port_pd01_port_vlan_requirements: + port_ps_server_oam_port_0_related_networks: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_ps_server_oam_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_ps_server_oam_port_0_order: + type: integer + required: true node_templates: - ps_server_pd01_port: + ps_server: + type: org.openecomp.resource.vfc.compute.nodes.heat.ps_server + properties: + availability_zone: + get_input: + - compute_ps_server_availability_zone + - index_value + flavor: + get_input: vm_flavor_name + image: + get_input: vm_image_name + name: + get_input: + - compute_ps_server_name + - index_value + user_data_format: + get_input: + - compute_ps_server_user_data_format + - index_value + ps_server_ps_server_oam_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd01_port_exCP_naming + get_input: port_ps_server_oam_port_0_exCP_naming vlan_requirements: - get_input: port_pd01_port_vlan_requirements + get_input: port_ps_server_oam_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_pd01_port_related_networks + get_input: port_ps_server_oam_port_0_related_networks ip_requirements: - get_input: port_pd01_port_ip_requirements + get_input: port_ps_server_oam_port_0_ip_requirements network_role_tag: - get_input: port_pd01_port_network_role_tag + get_input: port_ps_server_oam_port_0_network_role_tag mac_requirements: - get_input: port_pd01_port_mac_requirements + get_input: port_ps_server_oam_port_0_mac_requirements order: - get_input: port_pd01_port_order + get_input: port_ps_server_oam_port_0_order network_role: - get_input: port_pd01_port_network_role + get_input: port_ps_server_oam_port_0_network_role subnetpoolid: - get_input: port_pd01_port_subnetpoolid + get_input: port_ps_server_oam_port_0_subnetpoolid network: get_input: - - port_pd01_port_network + - port_ps_server_oam_port_0_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: ps_server relationship: tosca.relationships.network.BindsTo - ps_server: - type: org.openecomp.resource.vfc.compute.nodes.heat.ps_server - properties: - availability_zone: - get_input: - - compute_ps_server_availability_zone - - index_value - flavor: - get_input: vm_flavor_name - image: - get_input: vm_image_name - name: - get_input: - - compute_ps_server_name - - index_value - user_data_format: - get_input: - - compute_ps_server_user_data_format - - index_value substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.ps_server capabilities: instance_ps_server: - ps_server - instance - binding_ps_server_pd01_port: - - ps_server_pd01_port - - binding + network.incoming.packets.rate_ps_server_ps_server_oam_port_0: + - ps_server_ps_server_oam_port_0 + - network.incoming.packets.rate host_ps_server: - ps_server - host @@ -167,12 +167,15 @@ topology_template: disk.read.bytes_ps_server: - ps_server - disk.read.bytes + network.outgoing.packets.rate_ps_server_ps_server_oam_port_0: + - ps_server_ps_server_oam_port_0 + - network.outgoing.packets.rate + network.incoming.packets_ps_server_ps_server_oam_port_0: + - ps_server_ps_server_oam_port_0 + - network.incoming.packets disk.device.iops_ps_server: - ps_server - disk.device.iops - network.outpoing.packets_ps_server_pd01_port: - - ps_server_pd01_port - - network.outpoing.packets disk.device.latency_ps_server: - ps_server - disk.device.latency @@ -188,39 +191,36 @@ topology_template: disk.write.requests.rate_ps_server: - ps_server - disk.write.requests.rate - network.outgoing.bytes_ps_server_pd01_port: - - ps_server_pd01_port - - network.outgoing.bytes - forwarder_ps_server_pd01_port: - - ps_server_pd01_port - - forwarder disk.write.requests_ps_server: - ps_server - disk.write.requests - network.incoming.bytes.rate_ps_server_pd01_port: - - ps_server_pd01_port - - network.incoming.bytes.rate - network.incoming.packets_ps_server_pd01_port: - - ps_server_pd01_port - - network.incoming.packets + network.outgoing.bytes_ps_server_ps_server_oam_port_0: + - ps_server_ps_server_oam_port_0 + - network.outgoing.bytes disk.latency_ps_server: - ps_server - disk.latency + feature_ps_server_ps_server_oam_port_0: + - ps_server_ps_server_oam_port_0 + - feature disk.ephemeral.size_ps_server: - ps_server - disk.ephemeral.size disk.device.capacity_ps_server: - ps_server - disk.device.capacity + forwarder_ps_server_ps_server_oam_port_0: + - ps_server_ps_server_oam_port_0 + - forwarder disk.iops_ps_server: - ps_server - disk.iops disk.device.read.bytes.rate_ps_server: - ps_server - disk.device.read.bytes.rate - network.outgoing.packets.rate_ps_server_pd01_port: - - ps_server_pd01_port - - network.outgoing.packets.rate + network.incoming.bytes_ps_server_ps_server_oam_port_0: + - ps_server_ps_server_oam_port_0 + - network.incoming.bytes cpu_util_ps_server: - ps_server - cpu_util @@ -233,21 +233,18 @@ topology_template: disk.write.bytes_ps_server: - ps_server - disk.write.bytes - feature_ps_server_pd01_port: - - ps_server_pd01_port - - feature - network.outgoing.bytes.rate_ps_server_pd01_port: - - ps_server_pd01_port - - network.outgoing.bytes.rate - attachment_ps_server_pd01_port: - - ps_server_pd01_port - - attachment + network.outpoing.packets_ps_server_ps_server_oam_port_0: + - ps_server_ps_server_oam_port_0 + - network.outpoing.packets + network.incoming.bytes.rate_ps_server_ps_server_oam_port_0: + - ps_server_ps_server_oam_port_0 + - network.incoming.bytes.rate + binding_ps_server_ps_server_oam_port_0: + - ps_server_ps_server_oam_port_0 + - binding disk.device.write.requests.rate_ps_server: - ps_server - disk.device.write.requests.rate - network.incoming.packets.rate_ps_server_pd01_port: - - ps_server_pd01_port - - network.incoming.packets.rate disk.read.requests_ps_server: - ps_server - disk.read.requests @@ -260,6 +257,9 @@ topology_template: binding_ps_server: - ps_server - binding + attachment_ps_server_ps_server_oam_port_0: + - ps_server_ps_server_oam_port_0 + - attachment os_ps_server: - ps_server - os @@ -272,9 +272,6 @@ topology_template: vcpus_ps_server: - ps_server - vcpus - network.incoming.bytes_ps_server_pd01_port: - - ps_server_pd01_port - - network.incoming.bytes disk.usage_ps_server: - ps_server - disk.usage @@ -290,16 +287,19 @@ topology_template: disk.device.allocation_ps_server: - ps_server - disk.device.allocation + network.outgoing.bytes.rate_ps_server_ps_server_oam_port_0: + - ps_server_ps_server_oam_port_0 + - network.outgoing.bytes.rate requirements: + dependency_ps_server_ps_server_oam_port_0: + - ps_server_ps_server_oam_port_0 + - dependency dependency_ps_server: - ps_server - dependency - dependency_ps_server_pd01_port: - - ps_server_pd01_port - - dependency - link_ps_server_pd01_port: - - ps_server_pd01_port + link_ps_server_ps_server_oam_port_0: + - ps_server_ps_server_oam_port_0 - link local_storage_ps_server: - ps_server - - local_storage \ No newline at end of file + - local_storage diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/GlobalSubstitutionTypesServiceTemplate.yaml index 1d40ec29d0..2a5c880508 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,6 +8,12 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_pd01_port_1_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements index_value: type: integer description: Index value of this substitution service template runtime instance @@ -28,11 +34,11 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd01_port_1_order: + type: integer required: true status: SUPPORTED - port_pd01_port_related_networks: + port_pd01_port_1_related_networks: type: list required: true status: SUPPORTED @@ -42,42 +48,36 @@ node_types: type: string required: true status: SUPPORTED - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - vm_image_name: + port_pd01_port_1_network_role: type: string required: true status: SUPPORTED - port_pd01_port_ip_requirements: + port_pd01_port_1_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_order: - type: integer + type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_pd01_port_subnetpoolid: + port_pd01_port_1_subnetpoolid: type: string required: true status: SUPPORTED - port_pd01_port_network_role: + vm_image_name: type: string required: true status: SUPPORTED - port_pd01_port_network_role_tag: - type: string + port_pd01_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_pd01_port_vlan_requirements: - type: list + port_pd01_port_1_network_role_tag: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements compute_pd_server_user_data_format: type: list required: true @@ -99,14 +99,14 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pd01_port: + - dependency_pd_server_pd01_port_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd01_port: + - link_pd_server_pd01_port_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -124,6 +124,14 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_pd_server_pd01_port_1: + 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 memory.usage_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -142,12 +150,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pd01_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 os_pd_server: type: tosca.capabilities.OperatingSystem occurrences: @@ -159,12 +161,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd01_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_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -195,13 +191,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd01_port: + disk.iops_pd_server: 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.iops_pd_server: + network.incoming.packets.rate_pd_server_pd01_port_1: + 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_pd_server_pd01_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -219,7 +221,12 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pd01_port: + attachment_pd_server_pd01_port_1: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + network.outgoing.packets.rate_pd_server_pd01_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -248,12 +255,18 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pd01_port: - type: tosca.capabilities.Attachment + disk.capacity_pd_server: + 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_pd_server: + forwarder_pd_server_pd01_port_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets_pd_server_pd01_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -282,6 +295,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes.rate_pd_server_pd01_port_1: + 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_pd_server: type: tosca.capabilities.Node occurrences: @@ -293,27 +312,19 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_pd01_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 - disk.write.bytes_pd_server: + network.incoming.bytes_pd_server_pd01_port_1: 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_pd_server_pd01_port: + disk.write.bytes_pd_server: 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_pd_server_pd01_port: + network.outgoing.bytes_pd_server_pd01_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -343,6 +354,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_pd_server_pd01_port_1: + 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_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -362,14 +379,8 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pd01_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 - forwarder_pd_server_pd01_port: - type: org.openecomp.capabilities.Forwarder + feature_pd_server_pd01_port_1: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -391,11 +402,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_pd01_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.device.latency_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -414,12 +420,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pd01_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.device.iops_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -429,6 +429,30 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server_1: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_pd01_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_pd01_port_0_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role_tag: + type: string + required: true + status: SUPPORTED + port_pd01_port_0_network_role: + type: string + required: true + status: SUPPORTED + port_pd01_port_0_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments index_value: type: integer description: Index value of this substitution service template runtime instance @@ -449,56 +473,32 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_pd01_port_related_networks: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true status: SUPPORTED - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - vm_image_name: - type: string - required: true - status: SUPPORTED - port_pd01_port_ip_requirements: - type: list + port_pd01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_order: + port_pd01_port_0_order: type: integer required: true status: SUPPORTED - port_pd01_port_subnetpoolid: - type: string - required: true - status: SUPPORTED - port_pd01_port_network_role: - type: string - required: true - status: SUPPORTED - port_pd01_port_network_role_tag: + vm_image_name: type: string required: true status: SUPPORTED - port_pd01_port_vlan_requirements: + port_pd01_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_0_subnetpoolid: + type: string + required: true + status: SUPPORTED compute_pd_server_user_data_format: type: list required: true @@ -520,20 +520,28 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pd01_port: + - dependency_pd_server_pd01_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd01_port: + - link_pd_server_pd01_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: + binding_pd_server_pd01_port_0: + 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 scalable_pd_server: type: tosca.capabilities.Scalable occurrences: @@ -563,12 +571,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pd01_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 os_pd_server: type: tosca.capabilities.OperatingSystem occurrences: @@ -580,12 +582,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd01_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_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -616,7 +612,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd01_port: + network.incoming.packets_pd_server_pd01_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -640,7 +636,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pd01_port: + network.incoming.packets.rate_pd_server_pd01_port_0: + 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_pd_server_pd01_port_0: + 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.packets.rate_pd_server_pd01_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -658,6 +666,11 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_pd_server_pd01_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED disk.device.write.requests_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -669,17 +682,17 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pd01_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED disk.capacity_pd_server: 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_pd_server_pd01_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.allocation_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -703,6 +716,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes.rate_pd_server_pd01_port_0: + 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_pd_server: type: tosca.capabilities.Node occurrences: @@ -714,27 +733,19 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_pd01_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 disk.write.bytes_pd_server: 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_pd_server_pd01_port: + network.outgoing.bytes_pd_server_pd01_port_0: 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_pd_server_pd01_port: + network.incoming.bytes_pd_server_pd01_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -764,6 +775,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_pd_server_pd01_port_0: + 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_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -783,14 +800,8 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pd01_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 - forwarder_pd_server_pd01_port: - type: org.openecomp.capabilities.Forwarder + feature_pd_server_pd01_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -812,11 +823,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_pd01_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.device.latency_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -835,12 +841,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pd01_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.device.iops_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -850,6 +850,10 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server_2: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_pd01_port_2_order: + type: integer + required: true + status: SUPPORTED index_value: type: integer description: Index value of this substitution service template runtime instance @@ -858,6 +862,12 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 + port_pd01_port_2_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements compute_pd_server_availability_zone: type: list required: true @@ -870,68 +880,58 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + vm_flavor_name: + type: string required: true status: SUPPORTED - port_pd01_port_related_networks: - type: list + port_pd01_port_2_network_role_tag: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - vm_flavor_name: + port_pd01_port_2_network_role: type: string required: true status: SUPPORTED - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pd01_port_2_subnetpoolid: + type: string required: true status: SUPPORTED vm_image_name: type: string required: true status: SUPPORTED - port_pd01_port_ip_requirements: + port_pd01_port_2_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + type: string + port_pd01_port_2_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd01_port_order: - type: integer - required: true - status: SUPPORTED - port_pd01_port_subnetpoolid: - type: string - required: true - status: SUPPORTED - port_pd01_port_network_role: - type: string + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd01_port_2_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_pd01_port_network_role_tag: - type: string + port_pd01_port_2_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_pd01_port_vlan_requirements: + compute_pd_server_user_data_format: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - compute_pd_server_user_data_format: + type: string + port_pd01_port_2_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string + type: org.openecomp.datatypes.network.IpRequirements requirements: - dependency_pd_server: capability: tosca.capabilities.Node @@ -947,14 +947,14 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pd01_port: + - dependency_pd_server_pd01_port_2: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd01_port: + - link_pd_server_pd01_port_2: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -972,25 +972,32 @@ node_types: occurrences: - 1 - UNBOUNDED - memory.usage_pd_server: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_pd_server_pd01_port_2: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - memory_pd_server: + binding_pd_server_pd01_port_2: + 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 + memory.usage_pd_server: 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_pd_server: + memory_pd_server: 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.packets.rate_pd_server_pd01_port: + disk.device.usage_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1007,12 +1014,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd01_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_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1043,7 +1044,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd01_port: + network.incoming.packets.rate_pd_server_pd01_port_2: + 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_pd_server_pd01_port_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1067,12 +1074,17 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pd01_port: + network.outgoing.packets.rate_pd_server_pd01_port_2: 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 + attachment_pd_server_pd01_port_2: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED vcpus_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1096,12 +1108,13 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pd01_port: - type: tosca.capabilities.Attachment + disk.capacity_pd_server: + 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_pd_server: + network.incoming.packets_pd_server_pd01_port_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1130,6 +1143,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes.rate_pd_server_pd01_port_2: + 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_pd_server: type: tosca.capabilities.Node occurrences: @@ -1141,27 +1160,19 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_pd01_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 - disk.write.bytes_pd_server: + network.incoming.bytes_pd_server_pd01_port_2: 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_pd_server_pd01_port: + disk.write.bytes_pd_server: 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_pd_server_pd01_port: + network.outgoing.bytes_pd_server_pd01_port_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1191,6 +1202,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_pd_server_pd01_port_2: + 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_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1210,14 +1227,8 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pd01_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 - forwarder_pd_server_pd01_port: - type: org.openecomp.capabilities.Forwarder + feature_pd_server_pd01_port_2: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -1239,11 +1250,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_pd01_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.device.latency_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1262,12 +1268,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pd01_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.device.iops_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. 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 7863e55a5b..c719a090c2 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 @@ -342,6 +342,12 @@ topology_template: directives: - substitutable properties: + port_pd01_port_1_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: @@ -350,17 +356,11 @@ topology_template: - 1 vm_flavor_name: get_input: pd_flavor_name - port_pd01_port_mac_requirements: + port_pd01_port_1_mac_requirements: mac_count_required: is_required: false vm_image_name: get_input: pd_image_name - port_pd01_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false compute_pd_server_user_data_format: - RAW service_template_filter: @@ -384,22 +384,22 @@ topology_template: - 2 vm_flavor_name: get_input: pd_flavor_name - port_pd01_port_mac_requirements: - mac_count_required: - is_required: false + port_pd01_port_2_network_role_tag: oam vm_image_name: get_input: pd_image_name - port_pd01_port_ip_requirements: + port_pd01_port_2_network: + - get_input: oam_net_name + port_pd01_port_2_mac_requirements: + mac_count_required: + is_required: false + compute_pd_server_user_data_format: + - RAW + port_pd01_port_2_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_network: - - get_input: oam_net_name - port_pd01_port_network_role_tag: oam - compute_pd_server_user_data_format: - - RAW service_template_filter: substitute_service_template: Nested_pd_server_2ServiceTemplate.yaml count: 1 @@ -418,6 +418,15 @@ topology_template: directives: - substitutable properties: + port_pd01_port_0_mac_requirements: + mac_count_required: + is_required: false + port_pd01_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: @@ -426,17 +435,8 @@ topology_template: - 0 vm_flavor_name: get_input: pd_flavor_name - port_pd01_port_mac_requirements: - mac_count_required: - is_required: false vm_image_name: get_input: pd_image_name - port_pd01_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false compute_pd_server_user_data_format: - RAW service_template_filter: @@ -458,4 +458,4 @@ topology_template: - network_policy_server - abstract_pd_server - abstract_pd_server_1 - - abstract_pd_server_2 + - abstract_pd_server_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/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_serverServiceTemplate.yaml index 8d7ac38bed..9969c184f4 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_serverServiceTemplate.yaml @@ -11,6 +11,11 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pd01_port_1_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements index_value: type: integer description: Index value of this substitution service template runtime instance @@ -28,10 +33,10 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd01_port_1_order: + type: integer required: true - port_pd01_port_related_networks: + port_pd01_port_1_related_networks: type: list required: true entry_schema: @@ -39,34 +44,29 @@ topology_template: vm_flavor_name: type: string required: true - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - vm_image_name: + port_pd01_port_1_network_role: type: string required: true - port_pd01_port_ip_requirements: + port_pd01_port_1_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_order: - type: integer + type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_pd01_port_subnetpoolid: + port_pd01_port_1_subnetpoolid: type: string required: true - port_pd01_port_network_role: + vm_image_name: type: string required: true - port_pd01_port_network_role_tag: - type: string + port_pd01_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - port_pd01_port_vlan_requirements: - type: list + port_pd01_port_1_network_role_tag: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements compute_pd_server_user_data_format: type: list required: true @@ -92,28 +92,28 @@ topology_template: get_input: - compute_pd_server_user_data_format - index_value - pd_server_pd01_port: + pd_server_pd01_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd01_port_exCP_naming + get_input: port_pd01_port_1_exCP_naming vlan_requirements: - get_input: port_pd01_port_vlan_requirements + get_input: port_pd01_port_1_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_pd01_port_related_networks + get_input: port_pd01_port_1_related_networks ip_requirements: - get_input: port_pd01_port_ip_requirements + get_input: port_pd01_port_1_ip_requirements network_role_tag: - get_input: port_pd01_port_network_role_tag + get_input: port_pd01_port_1_network_role_tag mac_requirements: - get_input: port_pd01_port_mac_requirements + get_input: port_pd01_port_1_mac_requirements order: - get_input: port_pd01_port_order + get_input: port_pd01_port_1_order network_role: - get_input: port_pd01_port_network_role + get_input: port_pd01_port_1_network_role subnetpoolid: - get_input: port_pd01_port_subnetpoolid + get_input: port_pd01_port_1_subnetpoolid network: get_attribute: - pd_server @@ -132,6 +132,9 @@ topology_template: disk.read.bytes.rate_pd_server: - pd_server - disk.read.bytes.rate + binding_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - binding memory.usage_pd_server: - pd_server - memory.usage @@ -141,18 +144,12 @@ topology_template: disk.device.usage_pd_server: - pd_server - disk.device.usage - network.outgoing.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.packets.rate os_pd_server: - pd_server - os disk.write.bytes.rate_pd_server: - pd_server - disk.write.bytes.rate - network.incoming.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes cpu_pd_server: - pd_server - cpu @@ -168,21 +165,27 @@ topology_template: disk.device.read.bytes.rate_pd_server: - pd_server - disk.device.read.bytes.rate - network.outgoing.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes disk.iops_pd_server: - pd_server - disk.iops + network.incoming.packets.rate_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - network.incoming.packets.rate + network.incoming.bytes.rate_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - network.incoming.bytes.rate memory.resident_pd_server: - pd_server - memory.resident cpu.delta_pd_server: - pd_server - cpu.delta - network.incoming.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets.rate + attachment_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - attachment + network.outgoing.packets.rate_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - network.outgoing.packets.rate vcpus_pd_server: - pd_server - vcpus @@ -195,12 +198,15 @@ topology_template: endpoint_pd_server: - pd_server - endpoint - attachment_pd_server_pd01_port: - - pd_server_pd01_port - - attachment disk.capacity_pd_server: - pd_server - disk.capacity + forwarder_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - forwarder + network.incoming.packets_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - network.incoming.packets disk.device.allocation_pd_server: - pd_server - disk.device.allocation @@ -213,24 +219,24 @@ topology_template: disk.read.requests_pd_server: - pd_server - disk.read.requests + network.outgoing.bytes.rate_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - network.outgoing.bytes.rate feature_pd_server: - pd_server - feature disk.usage_pd_server: - pd_server - disk.usage - binding_pd_server_pd01_port: - - pd_server_pd01_port - - binding + network.incoming.bytes_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - network.incoming.bytes disk.write.bytes_pd_server: - pd_server - disk.write.bytes - network.incoming.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes.rate - network.incoming.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets + network.outgoing.bytes_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - network.outgoing.bytes disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -243,6 +249,9 @@ topology_template: disk.device.write.bytes_pd_server: - pd_server - disk.device.write.bytes + network.outpoing.packets_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - network.outpoing.packets disk.device.read.requests_pd_server: - pd_server - disk.device.read.requests @@ -252,12 +261,9 @@ topology_template: host_pd_server: - pd_server - host - network.outpoing.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.outpoing.packets - forwarder_pd_server_pd01_port: - - pd_server_pd01_port - - forwarder + feature_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - feature disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate @@ -267,9 +273,6 @@ topology_template: disk.write.requests_pd_server: - pd_server - disk.write.requests - feature_pd_server_pd01_port: - - pd_server_pd01_port - - feature disk.device.latency_pd_server: - pd_server - disk.device.latency @@ -279,9 +282,6 @@ topology_template: disk.device.capacity_pd_server: - pd_server - disk.device.capacity - network.outgoing.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes.rate disk.device.iops_pd_server: - pd_server - disk.device.iops @@ -289,12 +289,12 @@ topology_template: local_storage_pd_server: - pd_server - local_storage - link_pd_server_pd01_port: - - pd_server_pd01_port - - link - dependency_pd_server_pd01_port: - - pd_server_pd01_port + dependency_pd_server_pd01_port_1: + - pd_server_pd01_port_1 - dependency dependency_pd_server: - pd_server - - dependency \ No newline at end of file + - dependency + link_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - link \ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_server_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_server_1ServiceTemplate.yaml index 402985b20c..10d4a8e75d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_server_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_server_1ServiceTemplate.yaml @@ -11,6 +11,25 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pd01_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_pd01_port_0_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role_tag: + type: string + required: true + port_pd01_port_0_network_role: + type: string + required: true + port_pd01_port_0_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments index_value: type: integer description: Index value of this substitution service template runtime instance @@ -28,45 +47,26 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_pd01_port_related_networks: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - vm_image_name: - type: string - required: true - port_pd01_port_ip_requirements: - type: list + port_pd01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_order: + port_pd01_port_0_order: type: integer required: true - port_pd01_port_subnetpoolid: - type: string - required: true - port_pd01_port_network_role: - type: string - required: true - port_pd01_port_network_role_tag: + vm_image_name: type: string required: true - port_pd01_port_vlan_requirements: + port_pd01_port_0_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_0_subnetpoolid: + type: string + required: true compute_pd_server_user_data_format: type: list required: true @@ -92,28 +92,28 @@ topology_template: get_input: - compute_pd_server_user_data_format - index_value - pd_server_pd01_port: + pd_server_pd01_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd01_port_exCP_naming + get_input: port_pd01_port_0_exCP_naming vlan_requirements: - get_input: port_pd01_port_vlan_requirements + get_input: port_pd01_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_pd01_port_related_networks + get_input: port_pd01_port_0_related_networks ip_requirements: - get_input: port_pd01_port_ip_requirements + get_input: port_pd01_port_0_ip_requirements network_role_tag: - get_input: port_pd01_port_network_role_tag + get_input: port_pd01_port_0_network_role_tag mac_requirements: - get_input: port_pd01_port_mac_requirements + get_input: port_pd01_port_0_mac_requirements order: - get_input: port_pd01_port_order + get_input: port_pd01_port_0_order network_role: - get_input: port_pd01_port_network_role + get_input: port_pd01_port_0_network_role subnetpoolid: - get_input: port_pd01_port_subnetpoolid + get_input: port_pd01_port_0_subnetpoolid network: get_attribute: - pd_server @@ -126,6 +126,9 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server_1 capabilities: + binding_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - binding scalable_pd_server: - pd_server - scalable @@ -141,18 +144,12 @@ topology_template: disk.device.usage_pd_server: - pd_server - disk.device.usage - network.outgoing.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.packets.rate os_pd_server: - pd_server - os disk.write.bytes.rate_pd_server: - pd_server - disk.write.bytes.rate - network.incoming.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes cpu_pd_server: - pd_server - cpu @@ -168,9 +165,9 @@ topology_template: disk.device.read.bytes.rate_pd_server: - pd_server - disk.device.read.bytes.rate - network.outgoing.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes + network.incoming.packets_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.packets disk.iops_pd_server: - pd_server - disk.iops @@ -180,27 +177,36 @@ topology_template: cpu.delta_pd_server: - pd_server - cpu.delta - network.incoming.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port + network.incoming.packets.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 - network.incoming.packets.rate + network.incoming.bytes.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.bytes.rate + network.outgoing.packets.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.packets.rate vcpus_pd_server: - pd_server - vcpus disk.device.write.bytes.rate_pd_server: - pd_server - disk.device.write.bytes.rate + attachment_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - attachment disk.device.write.requests_pd_server: - pd_server - disk.device.write.requests endpoint_pd_server: - pd_server - endpoint - attachment_pd_server_pd01_port: - - pd_server_pd01_port - - attachment disk.capacity_pd_server: - pd_server - disk.capacity + forwarder_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - forwarder disk.device.allocation_pd_server: - pd_server - disk.device.allocation @@ -213,24 +219,24 @@ topology_template: disk.read.requests_pd_server: - pd_server - disk.read.requests + network.outgoing.bytes.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.bytes.rate feature_pd_server: - pd_server - feature disk.usage_pd_server: - pd_server - disk.usage - binding_pd_server_pd01_port: - - pd_server_pd01_port - - binding disk.write.bytes_pd_server: - pd_server - disk.write.bytes - network.incoming.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes.rate - network.incoming.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets + network.outgoing.bytes_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.bytes + network.incoming.bytes_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.bytes disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -243,6 +249,9 @@ topology_template: disk.device.write.bytes_pd_server: - pd_server - disk.device.write.bytes + network.outpoing.packets_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outpoing.packets disk.device.read.requests_pd_server: - pd_server - disk.device.read.requests @@ -252,12 +261,9 @@ topology_template: host_pd_server: - pd_server - host - network.outpoing.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.outpoing.packets - forwarder_pd_server_pd01_port: - - pd_server_pd01_port - - forwarder + feature_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - feature disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate @@ -267,9 +273,6 @@ topology_template: disk.write.requests_pd_server: - pd_server - disk.write.requests - feature_pd_server_pd01_port: - - pd_server_pd01_port - - feature disk.device.latency_pd_server: - pd_server - disk.device.latency @@ -279,9 +282,6 @@ topology_template: disk.device.capacity_pd_server: - pd_server - disk.device.capacity - network.outgoing.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes.rate disk.device.iops_pd_server: - pd_server - disk.device.iops @@ -289,12 +289,12 @@ topology_template: local_storage_pd_server: - pd_server - local_storage - link_pd_server_pd01_port: - - pd_server_pd01_port - - link - dependency_pd_server_pd01_port: - - pd_server_pd01_port - - dependency dependency_pd_server: - pd_server - - dependency \ No newline at end of file + - dependency + dependency_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - dependency + link_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - link \ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_server_2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_server_2ServiceTemplate.yaml index 58900d43db..29363cf60d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_server_2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_server_2ServiceTemplate.yaml @@ -11,6 +11,9 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pd01_port_2_order: + type: integer + required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -18,6 +21,11 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 + port_pd01_port_2_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements compute_pd_server_availability_zone: type: list required: true @@ -28,55 +36,47 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + vm_flavor_name: + type: string required: true - port_pd01_port_related_networks: - type: list + port_pd01_port_2_network_role_tag: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - vm_flavor_name: + port_pd01_port_2_network_role: type: string required: true - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pd01_port_2_subnetpoolid: + type: string required: true vm_image_name: type: string required: true - port_pd01_port_ip_requirements: + port_pd01_port_2_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + type: string + port_pd01_port_2_related_networks: type: list required: true entry_schema: - type: string - port_pd01_port_order: - type: integer - required: true - port_pd01_port_subnetpoolid: - type: string - required: true - port_pd01_port_network_role: - type: string + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd01_port_2_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_pd01_port_network_role_tag: - type: string + port_pd01_port_2_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - port_pd01_port_vlan_requirements: + compute_pd_server_user_data_format: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - compute_pd_server_user_data_format: + type: string + port_pd01_port_2_ip_requirements: type: list required: true entry_schema: - type: string + type: org.openecomp.datatypes.network.IpRequirements node_templates: pd_server: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server @@ -97,31 +97,31 @@ topology_template: get_input: - compute_pd_server_user_data_format - index_value - pd_server_pd01_port: + pd_server_pd01_port_2: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd01_port_exCP_naming + get_input: port_pd01_port_2_exCP_naming vlan_requirements: - get_input: port_pd01_port_vlan_requirements + get_input: port_pd01_port_2_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_pd01_port_related_networks + get_input: port_pd01_port_2_related_networks ip_requirements: - get_input: port_pd01_port_ip_requirements + get_input: port_pd01_port_2_ip_requirements network_role_tag: - get_input: port_pd01_port_network_role_tag + get_input: port_pd01_port_2_network_role_tag mac_requirements: - get_input: port_pd01_port_mac_requirements + get_input: port_pd01_port_2_mac_requirements order: - get_input: port_pd01_port_order + get_input: port_pd01_port_2_order network_role: - get_input: port_pd01_port_network_role + get_input: port_pd01_port_2_network_role subnetpoolid: - get_input: port_pd01_port_subnetpoolid + get_input: port_pd01_port_2_subnetpoolid network: get_input: - - port_pd01_port_network + - port_pd01_port_2_network - index_value requirements: - binding: @@ -137,6 +137,12 @@ topology_template: disk.read.bytes.rate_pd_server: - pd_server - disk.read.bytes.rate + forwarder_pd_server_pd01_port_2: + - pd_server_pd01_port_2 + - forwarder + binding_pd_server_pd01_port_2: + - pd_server_pd01_port_2 + - binding memory.usage_pd_server: - pd_server - memory.usage @@ -146,18 +152,12 @@ topology_template: disk.device.usage_pd_server: - pd_server - disk.device.usage - network.outgoing.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.packets.rate os_pd_server: - pd_server - os disk.write.bytes.rate_pd_server: - pd_server - disk.write.bytes.rate - network.incoming.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes cpu_pd_server: - pd_server - cpu @@ -173,9 +173,12 @@ topology_template: disk.device.read.bytes.rate_pd_server: - pd_server - disk.device.read.bytes.rate - network.outgoing.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes + network.incoming.packets.rate_pd_server_pd01_port_2: + - pd_server_pd01_port_2 + - network.incoming.packets.rate + network.incoming.bytes.rate_pd_server_pd01_port_2: + - pd_server_pd01_port_2 + - network.incoming.bytes.rate disk.iops_pd_server: - pd_server - disk.iops @@ -185,9 +188,12 @@ topology_template: cpu.delta_pd_server: - pd_server - cpu.delta - network.incoming.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets.rate + network.outgoing.packets.rate_pd_server_pd01_port_2: + - pd_server_pd01_port_2 + - network.outgoing.packets.rate + attachment_pd_server_pd01_port_2: + - pd_server_pd01_port_2 + - attachment vcpus_pd_server: - pd_server - vcpus @@ -200,12 +206,12 @@ topology_template: endpoint_pd_server: - pd_server - endpoint - attachment_pd_server_pd01_port: - - pd_server_pd01_port - - attachment disk.capacity_pd_server: - pd_server - disk.capacity + network.incoming.packets_pd_server_pd01_port_2: + - pd_server_pd01_port_2 + - network.incoming.packets disk.device.allocation_pd_server: - pd_server - disk.device.allocation @@ -218,24 +224,24 @@ topology_template: disk.read.requests_pd_server: - pd_server - disk.read.requests + network.outgoing.bytes.rate_pd_server_pd01_port_2: + - pd_server_pd01_port_2 + - network.outgoing.bytes.rate feature_pd_server: - pd_server - feature disk.usage_pd_server: - pd_server - disk.usage - binding_pd_server_pd01_port: - - pd_server_pd01_port - - binding + network.incoming.bytes_pd_server_pd01_port_2: + - pd_server_pd01_port_2 + - network.incoming.bytes disk.write.bytes_pd_server: - pd_server - disk.write.bytes - network.incoming.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes.rate - network.incoming.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets + network.outgoing.bytes_pd_server_pd01_port_2: + - pd_server_pd01_port_2 + - network.outgoing.bytes disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -248,6 +254,9 @@ topology_template: disk.device.write.bytes_pd_server: - pd_server - disk.device.write.bytes + network.outpoing.packets_pd_server_pd01_port_2: + - pd_server_pd01_port_2 + - network.outpoing.packets disk.device.read.requests_pd_server: - pd_server - disk.device.read.requests @@ -257,12 +266,9 @@ topology_template: host_pd_server: - pd_server - host - network.outpoing.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.outpoing.packets - forwarder_pd_server_pd01_port: - - pd_server_pd01_port - - forwarder + feature_pd_server_pd01_port_2: + - pd_server_pd01_port_2 + - feature disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate @@ -272,9 +278,6 @@ topology_template: disk.write.requests_pd_server: - pd_server - disk.write.requests - feature_pd_server_pd01_port: - - pd_server_pd01_port - - feature disk.device.latency_pd_server: - pd_server - disk.device.latency @@ -284,9 +287,6 @@ topology_template: disk.device.capacity_pd_server: - pd_server - disk.device.capacity - network.outgoing.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes.rate disk.device.iops_pd_server: - pd_server - disk.device.iops @@ -294,11 +294,11 @@ topology_template: local_storage_pd_server: - pd_server - local_storage - link_pd_server_pd01_port: - - pd_server_pd01_port + link_pd_server_pd01_port_2: + - pd_server_pd01_port_2 - link - dependency_pd_server_pd01_port: - - pd_server_pd01_port + dependency_pd_server_pd01_port_2: + - pd_server_pd01_port_2 - dependency dependency_pd_server: - pd_server diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/in/hot-mog-0108-bs1271.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/in/hot-mog-0108-bs1271.yml index ac6b046317..1887bb9f93 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/in/hot-mog-0108-bs1271.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/in/hot-mog-0108-bs1271.yml @@ -114,8 +114,8 @@ resources: flavor: {get_attr: [network_policy_server, name]} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: pd01_port_2} - - port: {get_resource: pd01_port_3} + - port: {get_resource: pd_server_2_oam_port_0} + - port: {get_resource: pd_server_0_oam_port_0} user_data_format: RAW pd01_port_0: @@ -126,11 +126,11 @@ resources: type: OS::Neutron::Port properties: network: {get_param: oam_net_name} - pd01_port_2: + pd_server_2_oam_port_0: type: OS::Neutron::Port properties: network: {get_param: oam_net_name} - pd01_port_3: + pd_server_0_oam_port_0: type: OS::Neutron::Port properties: network: {get_param: oam_net_name} diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml index a16a063daa..d3d5fbba28 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,6 +8,12 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_pd01_port_1_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements index_value: type: integer description: Index value of this substitution service template runtime instance @@ -28,11 +34,11 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd01_port_1_order: + type: integer required: true status: SUPPORTED - port_pd01_port_related_networks: + port_pd01_port_1_related_networks: type: list required: true status: SUPPORTED @@ -42,48 +48,42 @@ node_types: type: string required: true status: SUPPORTED - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - vm_image_name: + port_pd01_port_1_network_role: type: string required: true status: SUPPORTED - port_pd01_port_ip_requirements: + port_pd01_port_1_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: - type: list + type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: string - port_pd01_port_order: - type: integer + port_pd01_port_1_subnetpoolid: + type: string required: true status: SUPPORTED - port_pd01_port_subnetpoolid: + vm_image_name: type: string required: true status: SUPPORTED - port_pd01_port_network_role: - type: string + port_pd01_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_pd01_port_network_role_tag: + port_pd01_port_1_network_role_tag: type: string required: true status: SUPPORTED - port_pd01_port_vlan_requirements: + port_pd01_port_1_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: string compute_pd_server_user_data_format: type: list required: true @@ -105,14 +105,14 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pd01_port: + - dependency_pd_server_pd01_port_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd01_port: + - link_pd_server_pd01_port_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -130,6 +130,14 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_pd_server_pd01_port_1: + 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 memory.usage_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -148,12 +156,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pd01_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 os_pd_server: type: tosca.capabilities.OperatingSystem occurrences: @@ -165,12 +167,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd01_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_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -201,13 +197,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd01_port: + disk.iops_pd_server: 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.iops_pd_server: + network.incoming.packets.rate_pd_server_pd01_port_1: + 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_pd_server_pd01_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -225,7 +227,12 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pd01_port: + attachment_pd_server_pd01_port_1: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + network.outgoing.packets.rate_pd_server_pd01_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -254,12 +261,18 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pd01_port: - type: tosca.capabilities.Attachment + disk.capacity_pd_server: + 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_pd_server: + forwarder_pd_server_pd01_port_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets_pd_server_pd01_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -288,6 +301,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes.rate_pd_server_pd01_port_1: + 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_pd_server: type: tosca.capabilities.Node occurrences: @@ -299,27 +318,19 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_pd01_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 - disk.write.bytes_pd_server: + network.incoming.bytes_pd_server_pd01_port_1: 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_pd_server_pd01_port: + disk.write.bytes_pd_server: 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_pd_server_pd01_port: + network.outgoing.bytes_pd_server_pd01_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -349,6 +360,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_pd_server_pd01_port_1: + 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_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -368,14 +385,8 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pd01_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 - forwarder_pd_server_pd01_port: - type: org.openecomp.capabilities.Forwarder + feature_pd_server_pd01_port_1: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -397,11 +408,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_pd01_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.device.latency_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -420,12 +426,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pd01_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.device.iops_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -435,82 +435,82 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server_1: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - status: SUPPORTED - constraints: - - greater_or_equal: 0 - compute_pd_server_availability_zone: - type: list + port_pd01_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: string - compute_pd_server_name: + port_pd01_port_0_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_pd01_port_related_networks: + port_pd01_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - vm_flavor_name: + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - vm_image_name: + port_pd01_port_0_network_role: type: string required: true status: SUPPORTED - port_pd01_port_ip_requirements: + port_pd01_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + status: SUPPORTED + constraints: + - greater_or_equal: 0 + compute_pd_server_availability_zone: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd01_port_order: - type: integer + compute_pd_server_name: + type: list required: true status: SUPPORTED - port_pd01_port_subnetpoolid: + entry_schema: + type: string + vm_flavor_name: type: string required: true status: SUPPORTED - port_pd01_port_network_role: - type: string + port_pd01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_pd01_port_0_order: + type: integer required: true status: SUPPORTED - port_pd01_port_network_role_tag: + vm_image_name: type: string required: true status: SUPPORTED - port_pd01_port_vlan_requirements: + port_pd01_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_0_subnetpoolid: + type: string + required: true + status: SUPPORTED compute_pd_server_user_data_format: type: list required: true @@ -532,20 +532,28 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pd01_port: + - dependency_pd_server_pd01_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd01_port: + - link_pd_server_pd01_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: + binding_pd_server_pd01_port_0: + 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 scalable_pd_server: type: tosca.capabilities.Scalable occurrences: @@ -575,12 +583,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pd01_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 os_pd_server: type: tosca.capabilities.OperatingSystem occurrences: @@ -592,12 +594,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd01_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_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -628,7 +624,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd01_port: + network.incoming.packets_pd_server_pd01_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -652,7 +648,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pd01_port: + network.incoming.packets.rate_pd_server_pd01_port_0: + 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_pd_server_pd01_port_0: + 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.packets.rate_pd_server_pd01_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -670,6 +678,11 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_pd_server_pd01_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED disk.device.write.requests_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -681,17 +694,17 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pd01_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED disk.capacity_pd_server: 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_pd_server_pd01_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.allocation_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -715,6 +728,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes.rate_pd_server_pd01_port_0: + 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_pd_server: type: tosca.capabilities.Node occurrences: @@ -726,27 +745,19 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_pd01_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 disk.write.bytes_pd_server: 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_pd_server_pd01_port: + network.outgoing.bytes_pd_server_pd01_port_0: 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_pd_server_pd01_port: + network.incoming.bytes_pd_server_pd01_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -776,6 +787,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_pd_server_pd01_port_0: + 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_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -795,14 +812,8 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pd01_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 - forwarder_pd_server_pd01_port: - type: org.openecomp.capabilities.Forwarder + feature_pd_server_pd01_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -824,11 +835,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_pd01_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.device.latency_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -847,12 +853,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pd01_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.device.iops_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -862,26 +862,16 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server_2: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_pd01_port_2_order: - type: integer - required: true - status: SUPPORTED - port_pd01_port_3_network_role: - type: string - required: true - status: SUPPORTED - port_pd01_port_3_related_networks: + port_pd_server_2_oam_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd01_port_2_vlan_requirements: - type: list + type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_0_oam_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements compute_pd_server_availability_zone: type: list required: true @@ -894,50 +884,44 @@ node_types: status: SUPPORTED entry_schema: type: string - vm_flavor_name: - type: string - required: true - status: SUPPORTED - port_pd01_port_2_network_role_tag: - type: string + port_pd_server_2_oam_port_0_order: + type: integer required: true status: SUPPORTED - port_pd01_port_3_ip_requirements: - type: list + port_pd_server_2_oam_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_3_network: - type: list + port_pd_server_2_oam_port_0_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: string - port_pd01_port_2_network_role: + vm_flavor_name: type: string required: true status: SUPPORTED - port_pd01_port_2_subnetpoolid: - type: string + port_pd_server_2_oam_port_0_ip_requirements: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements vm_image_name: type: string required: true status: SUPPORTED - port_pd01_port_3_subnetpoolid: + port_pd_server_0_oam_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_pd01_port_2_network: + port_pd_server_0_oam_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd01_port_2_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd_server_0_oam_port_0_subnetpoolid: + type: string required: true status: SUPPORTED compute_pd_server_user_data_format: @@ -946,13 +930,21 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_2_ip_requirements: + port_pd_server_0_oam_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_3_order: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_2_oam_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_pd_server_0_oam_port_0_network_role: + type: string + required: true + status: SUPPORTED + port_pd_server_0_oam_port_0_order: type: integer required: true status: SUPPORTED @@ -964,32 +956,40 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_pd01_port_3_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pd_server_0_oam_port_0_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd_server_2_oam_port_0_network_role_tag: + type: string required: true status: SUPPORTED - port_pd01_port_2_related_networks: + port_pd_server_0_oam_port_0_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd01_port_3_vlan_requirements: + type: string + port_pd_server_2_oam_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd01_port_2_exCP_naming: - type: org.openecomp.datatypes.Naming + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd_server_2_oam_port_0_network: + type: list required: true status: SUPPORTED - port_pd01_port_3_network_role_tag: - type: string + entry_schema: + type: string + port_pd_server_0_oam_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_pd01_port_3_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_2_oam_port_0_network_role: + type: string required: true status: SUPPORTED requirements: @@ -1007,27 +1007,27 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pd01_port_2: + - dependency_pd_server_pd_server_2_oam_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd01_port_2: + - link_pd_server_pd_server_2_oam_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_pd_server_pd01_port_3: + - dependency_pd_server_pd_server_0_oam_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd01_port_3: + - link_pd_server_pd_server_0_oam_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -1045,47 +1045,32 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_pd_server_pd01_port_2: - type: org.openecomp.capabilities.Forwarder + memory.usage_pd_server: + 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_pd_server_pd01_port_2: - 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 - forwarder_pd_server_pd01_port_3: - type: org.openecomp.capabilities.Forwarder + memory_pd_server: + 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_pd_server_pd01_port_3: - 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 - memory.usage_pd_server: + disk.device.usage_pd_server: 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_pd_server: + network.incoming.bytes.rate_pd_server_pd_server_2_oam_port_0: 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_pd_server: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_pd_server_pd_server_0_oam_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED @@ -1100,6 +1085,19 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_pd_server_pd_server_0_oam_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + binding_pd_server_pd_server_2_oam_port_0: + 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 cpu_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1130,31 +1128,25 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pd01_port_2: - 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_pd_server_pd01_port_2: + network.outpoing.packets_pd_server_pd_server_2_oam_port_0: 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.iops_pd_server: + network.outgoing.packets.rate_pd_server_pd_server_0_oam_port_0: 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_pd_server_pd01_port_3: + network.incoming.packets.rate_pd_server_pd_server_2_oam_port_0: 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_pd_server_pd01_port_3: + disk.iops_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1172,25 +1164,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pd01_port_3: - 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.packets.rate_pd_server_pd01_port_2: + network.outgoing.bytes_pd_server_pd_server_2_oam_port_0: 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 - attachment_pd_server_pd01_port_2: - type: tosca.capabilities.Attachment + feature_pd_server_pd_server_2_oam_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - attachment_pd_server_pd01_port_3: - type: tosca.capabilities.Attachment + forwarder_pd_server_pd_server_2_oam_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED @@ -1223,25 +1209,25 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_pd_server_pd01_port_2: + network.incoming.bytes_pd_server_pd_server_0_oam_port_0: 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_pd_server: + network.outgoing.bytes.rate_pd_server_pd_server_0_oam_port_0: 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.allocation_pd_server: + disk.device.allocation_pd_server: 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_pd_server_pd01_port_3: + disk.allocation_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1258,11 +1244,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pd01_port_2: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_pd_server_pd_server_0_oam_port_0: + 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: - - 1 + - 0 - UNBOUNDED feature_pd_server: type: tosca.capabilities.Node @@ -1275,33 +1263,26 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd01_port_2: - 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_pd_server_pd01_port_3: + disk.write.bytes_pd_server: 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_pd_server_pd01_port_3: + network.incoming.packets_pd_server_pd_server_0_oam_port_0: 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_pd_server: + network.outgoing.bytes_pd_server_pd_server_0_oam_port_0: 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_pd_server_pd01_port_2: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_pd_server_pd_server_0_oam_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED @@ -1323,25 +1304,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd01_port_3: - 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_pd_server: 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_pd_server_pd01_port_2: + network.outgoing.bytes.rate_pd_server_pd_server_2_oam_port_0: 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_pd_server_pd01_port_3: + network.incoming.bytes_pd_server_pd_server_2_oam_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1366,23 +1341,25 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_pd01_port_3: - type: tosca.capabilities.Node + disk.write.requests.rate_pd_server: + 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_pd_server_pd01_port_2: - type: tosca.capabilities.Node + disk.ephemeral.size_pd_server: + 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_pd_server: + network.incoming.packets_pd_server_pd_server_2_oam_port_0: 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.ephemeral.size_pd_server: + network.incoming.bytes.rate_pd_server_pd_server_0_oam_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1394,6 +1371,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets.rate_pd_server_pd_server_0_oam_port_0: + 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_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1412,7 +1395,24 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_pd_server_pd_server_2_oam_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + network.outgoing.packets.rate_pd_server_pd_server_2_oam_port_0: + 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.iops_pd_server: + 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_pd_server_pd_server_0_oam_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: 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 f892137ee1..6be1a7887c 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 @@ -327,6 +327,12 @@ topology_template: directives: - substitutable properties: + port_pd01_port_1_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: @@ -337,20 +343,14 @@ topology_template: get_attribute: - network_policy_server - name - port_pd01_port_mac_requirements: + port_pd01_port_1_mac_requirements: mac_count_required: is_required: false vm_image_name: get_input: pd_image_name - port_pd01_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false - port_pd01_port_network: + port_pd01_port_1_network_role_tag: oam + port_pd01_port_1_network: - get_input: oam_net_name - port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW service_template_filter: @@ -376,34 +376,34 @@ topology_template: get_attribute: - network_policy_server - name - port_pd01_port_2_network_role_tag: oam - port_pd01_port_3_ip_requirements: + port_pd_server_2_oam_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_3_network: - - get_input: oam_net_name vm_image_name: get_input: pd_image_name - port_pd01_port_2_network: - - get_input: oam_net_name - port_pd01_port_2_mac_requirements: - mac_count_required: - is_required: false + port_pd_server_0_oam_port_0_network_role_tag: oam compute_pd_server_user_data_format: - RAW - port_pd01_port_2_ip_requirements: + port_pd_server_2_oam_port_0_mac_requirements: + mac_count_required: + is_required: false + port_pd_server_0_oam_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_3_mac_requirements: + port_pd_server_2_oam_port_0_network_role_tag: oam + port_pd_server_0_oam_port_0_network: + - get_input: oam_net_name + port_pd_server_2_oam_port_0_network: + - get_input: oam_net_name + port_pd_server_0_oam_port_0_mac_requirements: mac_count_required: is_required: false - port_pd01_port_3_network_role_tag: oam service_template_filter: substitute_service_template: Nested_pd_server_2ServiceTemplate.yaml count: 1 @@ -422,6 +422,19 @@ topology_template: directives: - substitutable properties: + port_pd01_port_0_mac_requirements: + mac_count_required: + is_required: false + port_pd01_port_0_network: + - get_attribute: + - network_policy_server + - name + port_pd01_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: @@ -432,21 +445,8 @@ topology_template: get_attribute: - network_policy_server - name - port_pd01_port_mac_requirements: - mac_count_required: - is_required: false vm_image_name: get_input: pd_image_name - port_pd01_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false - port_pd01_port_network: - - get_attribute: - - network_policy_server - - name 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/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_serverServiceTemplate.yaml index 2d01270aaf..734675faec 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_serverServiceTemplate.yaml @@ -11,6 +11,11 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pd01_port_1_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements index_value: type: integer description: Index value of this substitution service template runtime instance @@ -28,10 +33,10 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd01_port_1_order: + type: integer required: true - port_pd01_port_related_networks: + port_pd01_port_1_related_networks: type: list required: true entry_schema: @@ -39,39 +44,34 @@ topology_template: vm_flavor_name: type: string required: true - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - vm_image_name: + port_pd01_port_1_network_role: type: string required: true - port_pd01_port_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + port_pd01_port_1_vlan_requirements: type: list required: true entry_schema: - type: string - port_pd01_port_order: - type: integer + type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_pd01_port_subnetpoolid: + port_pd01_port_1_subnetpoolid: type: string required: true - port_pd01_port_network_role: + vm_image_name: type: string required: true - port_pd01_port_network_role_tag: + port_pd01_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_pd01_port_1_network_role_tag: type: string required: true - port_pd01_port_vlan_requirements: + port_pd01_port_1_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: string compute_pd_server_user_data_format: type: list required: true @@ -97,31 +97,31 @@ topology_template: get_input: - compute_pd_server_user_data_format - index_value - pd_server_pd01_port: + pd_server_pd01_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd01_port_exCP_naming + get_input: port_pd01_port_1_exCP_naming vlan_requirements: - get_input: port_pd01_port_vlan_requirements + get_input: port_pd01_port_1_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_pd01_port_related_networks + get_input: port_pd01_port_1_related_networks ip_requirements: - get_input: port_pd01_port_ip_requirements + get_input: port_pd01_port_1_ip_requirements network_role_tag: - get_input: port_pd01_port_network_role_tag + get_input: port_pd01_port_1_network_role_tag mac_requirements: - get_input: port_pd01_port_mac_requirements + get_input: port_pd01_port_1_mac_requirements order: - get_input: port_pd01_port_order + get_input: port_pd01_port_1_order network_role: - get_input: port_pd01_port_network_role + get_input: port_pd01_port_1_network_role subnetpoolid: - get_input: port_pd01_port_subnetpoolid + get_input: port_pd01_port_1_subnetpoolid network: get_input: - - port_pd01_port_network + - port_pd01_port_1_network - index_value requirements: - binding: @@ -137,6 +137,9 @@ topology_template: disk.read.bytes.rate_pd_server: - pd_server - disk.read.bytes.rate + binding_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - binding memory.usage_pd_server: - pd_server - memory.usage @@ -146,18 +149,12 @@ topology_template: disk.device.usage_pd_server: - pd_server - disk.device.usage - network.outgoing.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.packets.rate os_pd_server: - pd_server - os disk.write.bytes.rate_pd_server: - pd_server - disk.write.bytes.rate - network.incoming.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes cpu_pd_server: - pd_server - cpu @@ -173,21 +170,27 @@ topology_template: disk.device.read.bytes.rate_pd_server: - pd_server - disk.device.read.bytes.rate - network.outgoing.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes disk.iops_pd_server: - pd_server - disk.iops + network.incoming.packets.rate_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - network.incoming.packets.rate + network.incoming.bytes.rate_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - network.incoming.bytes.rate memory.resident_pd_server: - pd_server - memory.resident cpu.delta_pd_server: - pd_server - cpu.delta - network.incoming.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets.rate + attachment_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - attachment + network.outgoing.packets.rate_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - network.outgoing.packets.rate vcpus_pd_server: - pd_server - vcpus @@ -200,12 +203,15 @@ topology_template: endpoint_pd_server: - pd_server - endpoint - attachment_pd_server_pd01_port: - - pd_server_pd01_port - - attachment disk.capacity_pd_server: - pd_server - disk.capacity + forwarder_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - forwarder + network.incoming.packets_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - network.incoming.packets disk.device.allocation_pd_server: - pd_server - disk.device.allocation @@ -218,24 +224,24 @@ topology_template: disk.read.requests_pd_server: - pd_server - disk.read.requests + network.outgoing.bytes.rate_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - network.outgoing.bytes.rate feature_pd_server: - pd_server - feature disk.usage_pd_server: - pd_server - disk.usage - binding_pd_server_pd01_port: - - pd_server_pd01_port - - binding + network.incoming.bytes_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - network.incoming.bytes disk.write.bytes_pd_server: - pd_server - disk.write.bytes - network.incoming.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes.rate - network.incoming.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets + network.outgoing.bytes_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - network.outgoing.bytes disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -248,6 +254,9 @@ topology_template: disk.device.write.bytes_pd_server: - pd_server - disk.device.write.bytes + network.outpoing.packets_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - network.outpoing.packets disk.device.read.requests_pd_server: - pd_server - disk.device.read.requests @@ -257,12 +266,9 @@ topology_template: host_pd_server: - pd_server - host - network.outpoing.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.outpoing.packets - forwarder_pd_server_pd01_port: - - pd_server_pd01_port - - forwarder + feature_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - feature disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate @@ -272,9 +278,6 @@ topology_template: disk.write.requests_pd_server: - pd_server - disk.write.requests - feature_pd_server_pd01_port: - - pd_server_pd01_port - - feature disk.device.latency_pd_server: - pd_server - disk.device.latency @@ -284,9 +287,6 @@ topology_template: disk.device.capacity_pd_server: - pd_server - disk.device.capacity - network.outgoing.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes.rate disk.device.iops_pd_server: - pd_server - disk.device.iops @@ -294,12 +294,12 @@ topology_template: local_storage_pd_server: - pd_server - local_storage - link_pd_server_pd01_port: - - pd_server_pd01_port - - link - dependency_pd_server_pd01_port: - - pd_server_pd01_port + dependency_pd_server_pd01_port_1: + - pd_server_pd01_port_1 - dependency dependency_pd_server: - pd_server - - dependency \ No newline at end of file + - dependency + link_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - link \ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_1ServiceTemplate.yaml index 34e182d166..6adf9df5ea 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_1ServiceTemplate.yaml @@ -11,67 +11,67 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - constraints: - - greater_or_equal: 0 - compute_pd_server_availability_zone: - type: list + port_pd01_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: string - compute_pd_server_name: + port_pd01_port_0_network: type: list required: true entry_schema: type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_pd01_port_related_networks: + port_pd01_port_0_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - vm_flavor_name: + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role_tag: type: string required: true - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - vm_image_name: + port_pd01_port_0_network_role: type: string required: true - port_pd01_port_ip_requirements: + port_pd01_port_0_related_networks: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + constraints: + - greater_or_equal: 0 + compute_pd_server_availability_zone: type: list required: true entry_schema: type: string - port_pd01_port_order: - type: integer + compute_pd_server_name: + type: list required: true - port_pd01_port_subnetpoolid: + entry_schema: + type: string + vm_flavor_name: type: string required: true - port_pd01_port_network_role: - type: string + port_pd01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - port_pd01_port_network_role_tag: + port_pd01_port_0_order: + type: integer + required: true + vm_image_name: type: string required: true - port_pd01_port_vlan_requirements: + port_pd01_port_0_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_0_subnetpoolid: + type: string + required: true compute_pd_server_user_data_format: type: list required: true @@ -97,31 +97,31 @@ topology_template: get_input: - compute_pd_server_user_data_format - index_value - pd_server_pd01_port: + pd_server_pd01_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd01_port_exCP_naming + get_input: port_pd01_port_0_exCP_naming vlan_requirements: - get_input: port_pd01_port_vlan_requirements + get_input: port_pd01_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_pd01_port_related_networks + get_input: port_pd01_port_0_related_networks ip_requirements: - get_input: port_pd01_port_ip_requirements + get_input: port_pd01_port_0_ip_requirements network_role_tag: - get_input: port_pd01_port_network_role_tag + get_input: port_pd01_port_0_network_role_tag mac_requirements: - get_input: port_pd01_port_mac_requirements + get_input: port_pd01_port_0_mac_requirements order: - get_input: port_pd01_port_order + get_input: port_pd01_port_0_order network_role: - get_input: port_pd01_port_network_role + get_input: port_pd01_port_0_network_role subnetpoolid: - get_input: port_pd01_port_subnetpoolid + get_input: port_pd01_port_0_subnetpoolid network: get_input: - - port_pd01_port_network + - port_pd01_port_0_network - index_value requirements: - binding: @@ -131,6 +131,9 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server_1 capabilities: + binding_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - binding scalable_pd_server: - pd_server - scalable @@ -146,18 +149,12 @@ topology_template: disk.device.usage_pd_server: - pd_server - disk.device.usage - network.outgoing.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.packets.rate os_pd_server: - pd_server - os disk.write.bytes.rate_pd_server: - pd_server - disk.write.bytes.rate - network.incoming.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes cpu_pd_server: - pd_server - cpu @@ -173,9 +170,9 @@ topology_template: disk.device.read.bytes.rate_pd_server: - pd_server - disk.device.read.bytes.rate - network.outgoing.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes + network.incoming.packets_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.packets disk.iops_pd_server: - pd_server - disk.iops @@ -185,27 +182,36 @@ topology_template: cpu.delta_pd_server: - pd_server - cpu.delta - network.incoming.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port + network.incoming.packets.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 - network.incoming.packets.rate + network.incoming.bytes.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.bytes.rate + network.outgoing.packets.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.packets.rate vcpus_pd_server: - pd_server - vcpus disk.device.write.bytes.rate_pd_server: - pd_server - disk.device.write.bytes.rate + attachment_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - attachment disk.device.write.requests_pd_server: - pd_server - disk.device.write.requests endpoint_pd_server: - pd_server - endpoint - attachment_pd_server_pd01_port: - - pd_server_pd01_port - - attachment disk.capacity_pd_server: - pd_server - disk.capacity + forwarder_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - forwarder disk.device.allocation_pd_server: - pd_server - disk.device.allocation @@ -218,24 +224,24 @@ topology_template: disk.read.requests_pd_server: - pd_server - disk.read.requests + network.outgoing.bytes.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.bytes.rate feature_pd_server: - pd_server - feature disk.usage_pd_server: - pd_server - disk.usage - binding_pd_server_pd01_port: - - pd_server_pd01_port - - binding disk.write.bytes_pd_server: - pd_server - disk.write.bytes - network.incoming.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes.rate - network.incoming.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets + network.outgoing.bytes_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.bytes + network.incoming.bytes_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.bytes disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -248,6 +254,9 @@ topology_template: disk.device.write.bytes_pd_server: - pd_server - disk.device.write.bytes + network.outpoing.packets_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outpoing.packets disk.device.read.requests_pd_server: - pd_server - disk.device.read.requests @@ -257,12 +266,9 @@ topology_template: host_pd_server: - pd_server - host - network.outpoing.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.outpoing.packets - forwarder_pd_server_pd01_port: - - pd_server_pd01_port - - forwarder + feature_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - feature disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate @@ -272,9 +278,6 @@ topology_template: disk.write.requests_pd_server: - pd_server - disk.write.requests - feature_pd_server_pd01_port: - - pd_server_pd01_port - - feature disk.device.latency_pd_server: - pd_server - disk.device.latency @@ -284,9 +287,6 @@ topology_template: disk.device.capacity_pd_server: - pd_server - disk.device.capacity - network.outgoing.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes.rate disk.device.iops_pd_server: - pd_server - disk.device.iops @@ -294,12 +294,12 @@ topology_template: local_storage_pd_server: - pd_server - local_storage - link_pd_server_pd01_port: - - pd_server_pd01_port - - link - dependency_pd_server_pd01_port: - - pd_server_pd01_port - - dependency dependency_pd_server: - pd_server - - dependency \ No newline at end of file + - dependency + dependency_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - dependency + link_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - link \ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_2ServiceTemplate.yaml index 7b93f4a508..f7e37a33ac 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_2ServiceTemplate.yaml @@ -11,22 +11,14 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_pd01_port_2_order: - type: integer - required: true - port_pd01_port_3_network_role: - type: string - required: true - port_pd01_port_3_related_networks: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd01_port_2_vlan_requirements: + port_pd_server_2_oam_port_0_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_0_oam_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true compute_pd_server_availability_zone: type: list required: true @@ -37,53 +29,54 @@ topology_template: required: true entry_schema: type: string - vm_flavor_name: + port_pd_server_2_oam_port_0_order: + type: integer + required: true + port_pd_server_2_oam_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_pd_server_2_oam_port_0_subnetpoolid: type: string required: true - port_pd01_port_2_network_role_tag: + vm_flavor_name: type: string required: true - port_pd01_port_3_ip_requirements: + port_pd_server_2_oam_port_0_ip_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_3_network: - type: list - required: true - entry_schema: - type: string - port_pd01_port_2_network_role: - type: string - required: true - port_pd01_port_2_subnetpoolid: - type: string - required: true vm_image_name: type: string required: true - port_pd01_port_3_subnetpoolid: + port_pd_server_0_oam_port_0_network_role_tag: type: string required: true - port_pd01_port_2_network: + port_pd_server_0_oam_port_0_related_networks: type: list required: true entry_schema: - type: string - port_pd01_port_2_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd_server_0_oam_port_0_subnetpoolid: + type: string required: true compute_pd_server_user_data_format: type: list required: true entry_schema: type: string - port_pd01_port_2_ip_requirements: + port_pd_server_0_oam_port_0_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_3_order: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_2_oam_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_pd_server_0_oam_port_0_network_role: + type: string + required: true + port_pd_server_0_oam_port_0_order: type: integer required: true index_value: @@ -93,28 +86,35 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_pd01_port_3_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pd_server_0_oam_port_0_ip_requirements: + type: list required: true - port_pd01_port_2_related_networks: + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd_server_2_oam_port_0_network_role_tag: + type: string + required: true + port_pd_server_0_oam_port_0_network: + type: list + required: true + entry_schema: + type: string + port_pd_server_2_oam_port_0_related_networks: type: list required: true entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd01_port_3_vlan_requirements: + port_pd_server_2_oam_port_0_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd01_port_2_exCP_naming: - type: org.openecomp.datatypes.Naming + type: string + port_pd_server_0_oam_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_pd01_port_3_network_role_tag: + port_pd_server_2_oam_port_0_network_role: type: string required: true - port_pd01_port_3_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true node_templates: pd_server: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server @@ -135,62 +135,62 @@ topology_template: get_input: - compute_pd_server_user_data_format - index_value - pd_server_pd01_port_2: + pd_server_pd_server_2_oam_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd01_port_2_exCP_naming + get_input: port_pd_server_2_oam_port_0_exCP_naming vlan_requirements: - get_input: port_pd01_port_2_vlan_requirements + get_input: port_pd_server_2_oam_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_pd01_port_2_related_networks + get_input: port_pd_server_2_oam_port_0_related_networks ip_requirements: - get_input: port_pd01_port_2_ip_requirements + get_input: port_pd_server_2_oam_port_0_ip_requirements network_role_tag: - get_input: port_pd01_port_2_network_role_tag + get_input: port_pd_server_2_oam_port_0_network_role_tag mac_requirements: - get_input: port_pd01_port_2_mac_requirements + get_input: port_pd_server_2_oam_port_0_mac_requirements order: - get_input: port_pd01_port_2_order + get_input: port_pd_server_2_oam_port_0_order network_role: - get_input: port_pd01_port_2_network_role + get_input: port_pd_server_2_oam_port_0_network_role subnetpoolid: - get_input: port_pd01_port_2_subnetpoolid + get_input: port_pd_server_2_oam_port_0_subnetpoolid network: get_input: - - port_pd01_port_2_network + - port_pd_server_2_oam_port_0_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: pd_server relationship: tosca.relationships.network.BindsTo - pd_server_pd01_port_3: + pd_server_pd_server_0_oam_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd01_port_3_exCP_naming + get_input: port_pd_server_0_oam_port_0_exCP_naming vlan_requirements: - get_input: port_pd01_port_3_vlan_requirements + get_input: port_pd_server_0_oam_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_pd01_port_3_related_networks + get_input: port_pd_server_0_oam_port_0_related_networks ip_requirements: - get_input: port_pd01_port_3_ip_requirements + get_input: port_pd_server_0_oam_port_0_ip_requirements network_role_tag: - get_input: port_pd01_port_3_network_role_tag + get_input: port_pd_server_0_oam_port_0_network_role_tag mac_requirements: - get_input: port_pd01_port_3_mac_requirements + get_input: port_pd_server_0_oam_port_0_mac_requirements order: - get_input: port_pd01_port_3_order + get_input: port_pd_server_0_oam_port_0_order network_role: - get_input: port_pd01_port_3_network_role + get_input: port_pd_server_0_oam_port_0_network_role subnetpoolid: - get_input: port_pd01_port_3_subnetpoolid + get_input: port_pd_server_0_oam_port_0_subnetpoolid network: get_input: - - port_pd01_port_3_network + - port_pd_server_0_oam_port_0_network - index_value requirements: - binding: @@ -206,18 +206,6 @@ topology_template: disk.read.bytes.rate_pd_server: - pd_server - disk.read.bytes.rate - forwarder_pd_server_pd01_port_2: - - pd_server_pd01_port_2 - - forwarder - binding_pd_server_pd01_port_2: - - pd_server_pd01_port_2 - - binding - forwarder_pd_server_pd01_port_3: - - pd_server_pd01_port_3 - - forwarder - binding_pd_server_pd01_port_3: - - pd_server_pd01_port_3 - - binding memory.usage_pd_server: - pd_server - memory.usage @@ -227,12 +215,24 @@ topology_template: disk.device.usage_pd_server: - pd_server - disk.device.usage + network.incoming.bytes.rate_pd_server_pd_server_2_oam_port_0: + - pd_server_pd_server_2_oam_port_0 + - network.incoming.bytes.rate + forwarder_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - forwarder os_pd_server: - pd_server - os disk.write.bytes.rate_pd_server: - pd_server - disk.write.bytes.rate + feature_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - feature + binding_pd_server_pd_server_2_oam_port_0: + - pd_server_pd_server_2_oam_port_0 + - binding cpu_pd_server: - pd_server - cpu @@ -248,39 +248,33 @@ topology_template: disk.device.read.bytes.rate_pd_server: - pd_server - disk.device.read.bytes.rate - network.incoming.packets.rate_pd_server_pd01_port_2: - - pd_server_pd01_port_2 + network.outpoing.packets_pd_server_pd_server_2_oam_port_0: + - pd_server_pd_server_2_oam_port_0 + - network.outpoing.packets + network.outgoing.packets.rate_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - network.outgoing.packets.rate + network.incoming.packets.rate_pd_server_pd_server_2_oam_port_0: + - pd_server_pd_server_2_oam_port_0 - network.incoming.packets.rate - network.incoming.bytes.rate_pd_server_pd01_port_2: - - pd_server_pd01_port_2 - - network.incoming.bytes.rate disk.iops_pd_server: - pd_server - disk.iops - network.incoming.packets.rate_pd_server_pd01_port_3: - - pd_server_pd01_port_3 - - network.incoming.packets.rate - network.incoming.bytes.rate_pd_server_pd01_port_3: - - pd_server_pd01_port_3 - - network.incoming.bytes.rate memory.resident_pd_server: - pd_server - memory.resident cpu.delta_pd_server: - pd_server - cpu.delta - network.outgoing.packets.rate_pd_server_pd01_port_3: - - pd_server_pd01_port_3 - - network.outgoing.packets.rate - network.outgoing.packets.rate_pd_server_pd01_port_2: - - pd_server_pd01_port_2 - - network.outgoing.packets.rate - attachment_pd_server_pd01_port_2: - - pd_server_pd01_port_2 - - attachment - attachment_pd_server_pd01_port_3: - - pd_server_pd01_port_3 - - attachment + network.outgoing.bytes_pd_server_pd_server_2_oam_port_0: + - pd_server_pd_server_2_oam_port_0 + - network.outgoing.bytes + feature_pd_server_pd_server_2_oam_port_0: + - pd_server_pd_server_2_oam_port_0 + - feature + forwarder_pd_server_pd_server_2_oam_port_0: + - pd_server_pd_server_2_oam_port_0 + - forwarder vcpus_pd_server: - pd_server - vcpus @@ -296,48 +290,45 @@ topology_template: disk.capacity_pd_server: - pd_server - disk.capacity - network.incoming.packets_pd_server_pd01_port_2: - - pd_server_pd01_port_2 - - network.incoming.packets + network.incoming.bytes_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - network.incoming.bytes + network.outgoing.bytes.rate_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - network.outgoing.bytes.rate disk.device.allocation_pd_server: - pd_server - disk.device.allocation disk.allocation_pd_server: - pd_server - disk.allocation - network.incoming.packets_pd_server_pd01_port_3: - - pd_server_pd01_port_3 - - network.incoming.packets binding_pd_server: - pd_server - binding disk.read.requests_pd_server: - pd_server - disk.read.requests - network.outgoing.bytes.rate_pd_server_pd01_port_2: - - pd_server_pd01_port_2 - - network.outgoing.bytes.rate + binding_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - binding feature_pd_server: - pd_server - feature disk.usage_pd_server: - pd_server - disk.usage - network.incoming.bytes_pd_server_pd01_port_2: - - pd_server_pd01_port_2 - - network.incoming.bytes - network.incoming.bytes_pd_server_pd01_port_3: - - pd_server_pd01_port_3 - - network.incoming.bytes - network.outgoing.bytes.rate_pd_server_pd01_port_3: - - pd_server_pd01_port_3 - - network.outgoing.bytes.rate disk.write.bytes_pd_server: - pd_server - disk.write.bytes - network.outgoing.bytes_pd_server_pd01_port_2: - - pd_server_pd01_port_2 + network.incoming.packets_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - network.incoming.packets + network.outgoing.bytes_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 - network.outgoing.bytes + attachment_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - attachment disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -347,18 +338,15 @@ topology_template: disk.device.read.bytes_pd_server: - pd_server - disk.device.read.bytes - network.outgoing.bytes_pd_server_pd01_port_3: - - pd_server_pd01_port_3 - - network.outgoing.bytes disk.device.write.bytes_pd_server: - pd_server - disk.device.write.bytes - network.outpoing.packets_pd_server_pd01_port_2: - - pd_server_pd01_port_2 - - network.outpoing.packets - network.outpoing.packets_pd_server_pd01_port_3: - - pd_server_pd01_port_3 - - network.outpoing.packets + network.outgoing.bytes.rate_pd_server_pd_server_2_oam_port_0: + - pd_server_pd_server_2_oam_port_0 + - network.outgoing.bytes.rate + network.incoming.bytes_pd_server_pd_server_2_oam_port_0: + - pd_server_pd_server_2_oam_port_0 + - network.incoming.bytes disk.device.read.requests_pd_server: - pd_server - disk.device.read.requests @@ -368,21 +356,24 @@ topology_template: host_pd_server: - pd_server - host - feature_pd_server_pd01_port_3: - - pd_server_pd01_port_3 - - feature - feature_pd_server_pd01_port_2: - - pd_server_pd01_port_2 - - feature disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate disk.ephemeral.size_pd_server: - pd_server - disk.ephemeral.size + network.incoming.packets_pd_server_pd_server_2_oam_port_0: + - pd_server_pd_server_2_oam_port_0 + - network.incoming.packets + network.incoming.bytes.rate_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - network.incoming.bytes.rate disk.write.requests_pd_server: - pd_server - disk.write.requests + network.incoming.packets.rate_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - network.incoming.packets.rate disk.device.latency_pd_server: - pd_server - disk.device.latency @@ -392,25 +383,34 @@ topology_template: disk.device.capacity_pd_server: - pd_server - disk.device.capacity + attachment_pd_server_pd_server_2_oam_port_0: + - pd_server_pd_server_2_oam_port_0 + - attachment + network.outgoing.packets.rate_pd_server_pd_server_2_oam_port_0: + - pd_server_pd_server_2_oam_port_0 + - network.outgoing.packets.rate disk.device.iops_pd_server: - pd_server - disk.device.iops + network.outpoing.packets_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - network.outpoing.packets requirements: local_storage_pd_server: - pd_server - local_storage - link_pd_server_pd01_port_2: - - pd_server_pd01_port_2 + link_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 - link - link_pd_server_pd01_port_3: - - pd_server_pd01_port_3 + link_pd_server_pd_server_2_oam_port_0: + - pd_server_pd_server_2_oam_port_0 - link - dependency_pd_server_pd01_port_2: - - pd_server_pd01_port_2 - - dependency dependency_pd_server: - pd_server - dependency - dependency_pd_server_pd01_port_3: - - pd_server_pd01_port_3 + dependency_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - dependency + dependency_pd_server_pd_server_2_oam_port_0: + - pd_server_pd_server_2_oam_port_0 - 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/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/GlobalSubstitutionTypesServiceTemplate.yaml index a7bda34fb6..4e72ded9e5 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,82 +8,82 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - status: SUPPORTED - constraints: - - greater_or_equal: 0 - compute_pd_server_availability_zone: - type: list + port_pd01_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: string - compute_pd_server_name: + port_pd01_port_0_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_pd01_port_related_networks: + port_pd01_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - vm_flavor_name: + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - vm_image_name: + port_pd01_port_0_network_role: type: string required: true status: SUPPORTED - port_pd01_port_ip_requirements: + port_pd01_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + status: SUPPORTED + constraints: + - greater_or_equal: 0 + compute_pd_server_availability_zone: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd01_port_order: - type: integer + compute_pd_server_name: + type: list required: true status: SUPPORTED - port_pd01_port_subnetpoolid: + entry_schema: + type: string + vm_flavor_name: type: string required: true status: SUPPORTED - port_pd01_port_network_role: - type: string + port_pd01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_pd01_port_0_order: + type: integer required: true status: SUPPORTED - port_pd01_port_network_role_tag: + vm_image_name: type: string required: true status: SUPPORTED - port_pd01_port_vlan_requirements: + port_pd01_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_0_subnetpoolid: + type: string + required: true + status: SUPPORTED compute_pd_server_user_data_format: type: list required: true @@ -109,20 +109,28 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pd01_port: + - dependency_pd_server_pd01_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd01_port: + - link_pd_server_pd01_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: + binding_pd_server_pd01_port_0: + 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 scalable_pd_server: type: tosca.capabilities.Scalable occurrences: @@ -152,12 +160,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pd01_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 os_pd_server: type: tosca.capabilities.OperatingSystem occurrences: @@ -169,12 +171,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd01_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_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -205,7 +201,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd01_port: + network.incoming.packets_pd_server_pd01_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -229,7 +225,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pd01_port: + network.incoming.packets.rate_pd_server_pd01_port_0: + 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_pd_server_pd01_port_0: + 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.packets.rate_pd_server_pd01_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -247,6 +255,11 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_pd_server_pd01_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED disk.device.write.requests_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -258,17 +271,17 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pd01_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED disk.capacity_pd_server: 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_pd_server_pd01_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.allocation_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -292,6 +305,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes.rate_pd_server_pd01_port_0: + 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_pd_server: type: tosca.capabilities.Node occurrences: @@ -303,27 +322,19 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_pd01_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 disk.write.bytes_pd_server: 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_pd_server_pd01_port: + network.outgoing.bytes_pd_server_pd01_port_0: 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_pd_server_pd01_port: + network.incoming.bytes_pd_server_pd01_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -353,6 +364,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_pd_server_pd01_port_0: + 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_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -372,14 +389,8 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pd01_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 - forwarder_pd_server_pd01_port: - type: org.openecomp.capabilities.Forwarder + feature_pd_server_pd01_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -401,11 +412,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_pd01_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.device.latency_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -424,12 +430,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pd01_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.device.iops_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -445,7 +445,7 @@ node_types: status: SUPPORTED entry_schema: type: string - port_ps01_port_subnetpoolid: + port_ps01_port_0_network_role: type: string required: true status: SUPPORTED @@ -461,6 +461,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_ps01_port_0_network: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string index_value: type: integer description: Index value of this substitution service template runtime instance @@ -469,7 +475,13 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_ps01_port_vlan_requirements: + port_ps01_port_0_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_ps01_port_0_vlan_requirements: type: list required: true status: SUPPORTED @@ -479,13 +491,11 @@ node_types: type: string required: true status: SUPPORTED - port_ps01_port_related_networks: - type: list + port_ps01_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_ps01_port_order: + port_ps01_port_0_order: type: integer required: true status: SUPPORTED @@ -493,80 +503,64 @@ node_types: type: string required: true status: SUPPORTED - port_ps01_port_network_role: + port_ps01_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_ps01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_ps01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_ps01_port_network: - type: list + port_ps01_port_0_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: string - port_ps01_port_ip_requirements: + port_ps01_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_ps01_port_network_role_tag: - type: string - required: true - status: SUPPORTED - port_ps01_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED + type: org.openecomp.datatypes.network.RelatedNetworksAssignments attributes: ps_server_accessIPv4: type: string status: SUPPORTED requirements: - - dependency_ps_server: + - dependency_ps_server_ps01_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - local_storage_ps_server: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo + - link_ps_server_ps01_port_0: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo occurrences: - - 0 - - UNBOUNDED - - dependency_ps_server_ps01_port: + - 1 + - 1 + - dependency_ps_server: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_ps_server_ps01_port: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - capabilities: - network.incoming.packets.rate_ps_server_ps01_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + - local_storage_ps_server: + capability: tosca.capabilities.Attachment + node: tosca.nodes.BlockStorage + relationship: tosca.relationships.AttachesTo occurrences: - - 1 + - 0 - UNBOUNDED + capabilities: instance_ps_server: 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_ps_server_ps01_port: + network.incoming.packets_ps_server_ps01_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -579,12 +573,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_ps_server_ps01_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_ps_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -597,12 +585,12 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_ps_server_ps01_port: + feature_ps_server: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - feature_ps_server: + feature_ps_server_ps01_port_0: type: tosca.capabilities.Node occurrences: - 1 @@ -649,12 +637,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_ps_server_ps01_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.device.latency_ps_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -720,19 +702,19 @@ node_types: occurrences: - 1 - UNBOUNDED - cpu_util_ps_server: + network.outpoing.packets_ps_server_ps01_port_0: 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_ps_server: + cpu_util_ps_server: 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_ps_server_ps01_port: + memory.resident_ps_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -750,7 +732,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_ps_server_ps01_port: + network.incoming.bytes_ps_server_ps01_port_0: + 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_ps_server_ps01_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -785,11 +773,6 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_ps_server_ps01_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED os_ps_server: type: tosca.capabilities.OperatingSystem occurrences: @@ -801,7 +784,7 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_ps_server_ps01_port: + binding_ps_server_ps01_port_0: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface @@ -809,7 +792,7 @@ node_types: occurrences: - 0 - UNBOUNDED - forwarder_ps_server_ps01_port: + forwarder_ps_server_ps01_port_0: type: org.openecomp.capabilities.Forwarder occurrences: - 1 @@ -826,6 +809,11 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_ps_server_ps01_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED disk.usage_ps_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -849,7 +837,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_ps_server_ps01_port: + network.outgoing.bytes_ps_server_ps01_port_0: + 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.packets.rate_ps_server_ps01_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -861,9 +855,15 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_ps_server_ps01_port: + network.incoming.packets.rate_ps_server_ps01_port_0: 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 + - UNBOUNDED + network.incoming.bytes.rate_ps_server_ps01_port_0: + 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 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 4d445e467c..6f9a2ce876 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 @@ -683,6 +683,18 @@ topology_template: directives: - substitutable properties: + port_pd01_port_0_mac_requirements: + mac_count_required: + is_required: false + port_pd01_port_0_network: + - get_input: oam_net_name + port_pd01_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_pd01_port_0_network_role_tag: oam compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: @@ -691,22 +703,10 @@ topology_template: - 0 vm_flavor_name: get_input: pd_flavor_name - port_pd01_port_mac_requirements: - mac_count_required: - is_required: false vm_image_name: get_attribute: - abstract_ps_server - ps_server_accessIPv4 - port_pd01_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false - port_pd01_port_network: - - get_input: oam_net_name - port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW service_template_filter: @@ -730,24 +730,24 @@ topology_template: - get_input: availabilityzone_name compute_ps_server_user_data_format: - RAW - vm_flavor_name: - get_input: pd_flavor_name - vm_image_name: - get_attribute: - - abstract_pd_server - - pd_server_accessIPv4 - port_ps01_port_mac_requirements: - mac_count_required: - is_required: false - port_ps01_port_network: + port_ps01_port_0_network: - get_input: oam_net_name - port_ps01_port_ip_requirements: + port_ps01_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_ps01_port_network_role_tag: oam + vm_flavor_name: + get_input: pd_flavor_name + port_ps01_port_0_mac_requirements: + mac_count_required: + is_required: false + vm_image_name: + get_attribute: + - abstract_pd_server + - pd_server_accessIPv4 + port_ps01_port_0_network_role_tag: oam service_template_filter: substitute_service_template: Nested_ps_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/twoComputesWithGetAttrBetweenThem/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/Nested_pd_serverServiceTemplate.yaml index e0f1093cd2..f6a610a7ed 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/Nested_pd_serverServiceTemplate.yaml @@ -11,67 +11,67 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - constraints: - - greater_or_equal: 0 - compute_pd_server_availability_zone: - type: list + port_pd01_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: string - compute_pd_server_name: + port_pd01_port_0_network: type: list required: true entry_schema: type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_pd01_port_related_networks: + port_pd01_port_0_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - vm_flavor_name: + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role_tag: type: string required: true - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - vm_image_name: + port_pd01_port_0_network_role: type: string required: true - port_pd01_port_ip_requirements: + port_pd01_port_0_related_networks: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + constraints: + - greater_or_equal: 0 + compute_pd_server_availability_zone: type: list required: true entry_schema: type: string - port_pd01_port_order: - type: integer + compute_pd_server_name: + type: list required: true - port_pd01_port_subnetpoolid: + entry_schema: + type: string + vm_flavor_name: type: string required: true - port_pd01_port_network_role: - type: string + port_pd01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_pd01_port_0_order: + type: integer required: true - port_pd01_port_network_role_tag: + vm_image_name: type: string required: true - port_pd01_port_vlan_requirements: + port_pd01_port_0_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_0_subnetpoolid: + type: string + required: true compute_pd_server_user_data_format: type: list required: true @@ -97,31 +97,31 @@ topology_template: get_input: - compute_pd_server_user_data_format - index_value - pd_server_pd01_port: + pd_server_pd01_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd01_port_exCP_naming + get_input: port_pd01_port_0_exCP_naming vlan_requirements: - get_input: port_pd01_port_vlan_requirements + get_input: port_pd01_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_pd01_port_related_networks + get_input: port_pd01_port_0_related_networks ip_requirements: - get_input: port_pd01_port_ip_requirements + get_input: port_pd01_port_0_ip_requirements network_role_tag: - get_input: port_pd01_port_network_role_tag + get_input: port_pd01_port_0_network_role_tag mac_requirements: - get_input: port_pd01_port_mac_requirements + get_input: port_pd01_port_0_mac_requirements order: - get_input: port_pd01_port_order + get_input: port_pd01_port_0_order network_role: - get_input: port_pd01_port_network_role + get_input: port_pd01_port_0_network_role subnetpoolid: - get_input: port_pd01_port_subnetpoolid + get_input: port_pd01_port_0_subnetpoolid network: get_input: - - port_pd01_port_network + - port_pd01_port_0_network - index_value requirements: - binding: @@ -138,6 +138,9 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server capabilities: + binding_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - binding scalable_pd_server: - pd_server - scalable @@ -153,18 +156,12 @@ topology_template: disk.device.usage_pd_server: - pd_server - disk.device.usage - network.outgoing.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.packets.rate os_pd_server: - pd_server - os disk.write.bytes.rate_pd_server: - pd_server - disk.write.bytes.rate - network.incoming.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes cpu_pd_server: - pd_server - cpu @@ -180,9 +177,9 @@ topology_template: disk.device.read.bytes.rate_pd_server: - pd_server - disk.device.read.bytes.rate - network.outgoing.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes + network.incoming.packets_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.packets disk.iops_pd_server: - pd_server - disk.iops @@ -192,27 +189,36 @@ topology_template: cpu.delta_pd_server: - pd_server - cpu.delta - network.incoming.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port + network.incoming.packets.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 - network.incoming.packets.rate + network.incoming.bytes.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.bytes.rate + network.outgoing.packets.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.packets.rate vcpus_pd_server: - pd_server - vcpus disk.device.write.bytes.rate_pd_server: - pd_server - disk.device.write.bytes.rate + attachment_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - attachment disk.device.write.requests_pd_server: - pd_server - disk.device.write.requests endpoint_pd_server: - pd_server - endpoint - attachment_pd_server_pd01_port: - - pd_server_pd01_port - - attachment disk.capacity_pd_server: - pd_server - disk.capacity + forwarder_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - forwarder disk.device.allocation_pd_server: - pd_server - disk.device.allocation @@ -225,24 +231,24 @@ topology_template: disk.read.requests_pd_server: - pd_server - disk.read.requests + network.outgoing.bytes.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.bytes.rate feature_pd_server: - pd_server - feature disk.usage_pd_server: - pd_server - disk.usage - binding_pd_server_pd01_port: - - pd_server_pd01_port - - binding disk.write.bytes_pd_server: - pd_server - disk.write.bytes - network.incoming.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes.rate - network.incoming.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets + network.outgoing.bytes_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.bytes + network.incoming.bytes_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.bytes disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -255,6 +261,9 @@ topology_template: disk.device.write.bytes_pd_server: - pd_server - disk.device.write.bytes + network.outpoing.packets_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outpoing.packets disk.device.read.requests_pd_server: - pd_server - disk.device.read.requests @@ -264,12 +273,9 @@ topology_template: host_pd_server: - pd_server - host - network.outpoing.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.outpoing.packets - forwarder_pd_server_pd01_port: - - pd_server_pd01_port - - forwarder + feature_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - feature disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate @@ -279,9 +285,6 @@ topology_template: disk.write.requests_pd_server: - pd_server - disk.write.requests - feature_pd_server_pd01_port: - - pd_server_pd01_port - - feature disk.device.latency_pd_server: - pd_server - disk.device.latency @@ -291,9 +294,6 @@ topology_template: disk.device.capacity_pd_server: - pd_server - disk.device.capacity - network.outgoing.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes.rate disk.device.iops_pd_server: - pd_server - disk.device.iops @@ -301,12 +301,12 @@ topology_template: local_storage_pd_server: - pd_server - local_storage - link_pd_server_pd01_port: - - pd_server_pd01_port - - link - dependency_pd_server_pd01_port: - - pd_server_pd01_port - - dependency dependency_pd_server: - pd_server - - dependency \ No newline at end of file + - dependency + dependency_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - dependency + link_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - link diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/Nested_ps_serverServiceTemplate.yaml index 4b513cac7f..76bdc2b7c1 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/Nested_ps_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/Nested_ps_serverServiceTemplate.yaml @@ -16,7 +16,7 @@ topology_template: required: true entry_schema: type: string - port_ps01_port_subnetpoolid: + port_ps01_port_0_network_role: type: string required: true compute_ps_server_availability_zone: @@ -29,6 +29,11 @@ topology_template: required: true entry_schema: type: string + port_ps01_port_0_network: + type: list + required: true + entry_schema: + type: string index_value: type: integer description: Index value of this substitution service template runtime instance @@ -36,7 +41,12 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_ps01_port_vlan_requirements: + port_ps01_port_0_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_ps01_port_0_vlan_requirements: type: list required: true entry_schema: @@ -44,90 +54,80 @@ topology_template: vm_flavor_name: type: string required: true - port_ps01_port_related_networks: - type: list + port_ps01_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_ps01_port_order: + port_ps01_port_0_order: type: integer required: true vm_image_name: type: string required: true - port_ps01_port_network_role: + port_ps01_port_0_network_role_tag: type: string required: true - port_ps01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_ps01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - port_ps01_port_network: - type: list + port_ps01_port_0_subnetpoolid: + type: string required: true - entry_schema: - type: string - port_ps01_port_ip_requirements: + port_ps01_port_0_related_networks: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_ps01_port_network_role_tag: - type: string - required: true - port_ps01_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true + type: org.openecomp.datatypes.network.RelatedNetworksAssignments node_templates: - ps_server: - type: org.openecomp.resource.vfc.compute.nodes.heat.ps_server - properties: - availability_zone: - get_input: - - compute_ps_server_availability_zone - - index_value - flavor: - get_input: vm_flavor_name - image: - get_input: vm_image_name - name: - get_input: - - compute_ps_server_name - - index_value - user_data_format: - get_input: - - compute_ps_server_user_data_format - - index_value - ps_server_ps01_port: + ps_server_ps01_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_ps01_port_exCP_naming + get_input: port_ps01_port_0_exCP_naming vlan_requirements: - get_input: port_ps01_port_vlan_requirements + get_input: port_ps01_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_ps01_port_related_networks + get_input: port_ps01_port_0_related_networks ip_requirements: - get_input: port_ps01_port_ip_requirements + get_input: port_ps01_port_0_ip_requirements network_role_tag: - get_input: port_ps01_port_network_role_tag + get_input: port_ps01_port_0_network_role_tag mac_requirements: - get_input: port_ps01_port_mac_requirements + get_input: port_ps01_port_0_mac_requirements order: - get_input: port_ps01_port_order + get_input: port_ps01_port_0_order network_role: - get_input: port_ps01_port_network_role + get_input: port_ps01_port_0_network_role subnetpoolid: - get_input: port_ps01_port_subnetpoolid + get_input: port_ps01_port_0_subnetpoolid network: get_input: - - port_ps01_port_network + - port_ps01_port_0_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: ps_server relationship: tosca.relationships.network.BindsTo + ps_server: + type: org.openecomp.resource.vfc.compute.nodes.heat.ps_server + properties: + availability_zone: + get_input: + - compute_ps_server_availability_zone + - index_value + flavor: + get_input: vm_flavor_name + image: + get_input: vm_image_name + name: + get_input: + - compute_ps_server_name + - index_value + user_data_format: + get_input: + - compute_ps_server_user_data_format + - index_value outputs: ps_server_accessIPv4: type: string @@ -138,33 +138,27 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.ps_server capabilities: - network.incoming.packets.rate_ps_server_ps01_port: - - ps_server_ps01_port - - network.incoming.packets.rate instance_ps_server: - ps_server - instance - network.outpoing.packets_ps_server_ps01_port: - - ps_server_ps01_port - - network.outpoing.packets + network.incoming.packets_ps_server_ps01_port_0: + - ps_server_ps01_port_0 + - network.incoming.packets host_ps_server: - ps_server - host - network.incoming.packets_ps_server_ps01_port: - - ps_server_ps01_port - - network.incoming.packets cpu.delta_ps_server: - ps_server - cpu.delta disk.write.bytes.rate_ps_server: - ps_server - disk.write.bytes.rate - feature_ps_server_ps01_port: - - ps_server_ps01_port - - feature feature_ps_server: - ps_server - feature + feature_ps_server_ps01_port_0: + - ps_server_ps01_port_0 + - feature disk.root.size_ps_server: - ps_server - disk.root.size @@ -186,9 +180,6 @@ topology_template: disk.device.iops_ps_server: - ps_server - disk.device.iops - network.outgoing.packets.rate_ps_server_ps01_port: - - ps_server_ps01_port - - network.outgoing.packets.rate disk.device.latency_ps_server: - ps_server - disk.device.latency @@ -222,23 +213,26 @@ topology_template: disk.device.read.bytes.rate_ps_server: - ps_server - disk.device.read.bytes.rate + network.outpoing.packets_ps_server_ps01_port_0: + - ps_server_ps01_port_0 + - network.outpoing.packets cpu_util_ps_server: - ps_server - cpu_util memory.resident_ps_server: - ps_server - memory.resident - network.incoming.bytes_ps_server_ps01_port: - - ps_server_ps01_port - - network.incoming.bytes disk.device.read.requests_ps_server: - ps_server - disk.device.read.requests disk.write.bytes_ps_server: - ps_server - disk.write.bytes - network.outgoing.bytes.rate_ps_server_ps01_port: - - ps_server_ps01_port + network.incoming.bytes_ps_server_ps01_port_0: + - ps_server_ps01_port_0 + - network.incoming.bytes + network.outgoing.bytes.rate_ps_server_ps01_port_0: + - ps_server_ps01_port_0 - network.outgoing.bytes.rate disk.device.write.requests.rate_ps_server: - ps_server @@ -255,20 +249,17 @@ topology_template: binding_ps_server: - ps_server - binding - attachment_ps_server_ps01_port: - - ps_server_ps01_port - - attachment os_ps_server: - ps_server - os disk.device.usage_ps_server: - ps_server - disk.device.usage - binding_ps_server_ps01_port: - - ps_server_ps01_port + binding_ps_server_ps01_port_0: + - ps_server_ps01_port_0 - binding - forwarder_ps_server_ps01_port: - - ps_server_ps01_port + forwarder_ps_server_ps01_port_0: + - ps_server_ps01_port_0 - forwarder disk.device.write.bytes.rate_ps_server: - ps_server @@ -276,6 +267,9 @@ topology_template: vcpus_ps_server: - ps_server - vcpus + attachment_ps_server_ps01_port_0: + - ps_server_ps01_port_0 + - attachment disk.usage_ps_server: - ps_server - disk.usage @@ -288,25 +282,31 @@ topology_template: disk.capacity_ps_server: - ps_server - disk.capacity - network.incoming.bytes.rate_ps_server_ps01_port: - - ps_server_ps01_port - - network.incoming.bytes.rate + network.outgoing.bytes_ps_server_ps01_port_0: + - ps_server_ps01_port_0 + - network.outgoing.bytes + network.outgoing.packets.rate_ps_server_ps01_port_0: + - ps_server_ps01_port_0 + - network.outgoing.packets.rate disk.device.allocation_ps_server: - ps_server - disk.device.allocation - network.outgoing.bytes_ps_server_ps01_port: - - ps_server_ps01_port - - network.outgoing.bytes + network.incoming.packets.rate_ps_server_ps01_port_0: + - ps_server_ps01_port_0 + - network.incoming.packets.rate + network.incoming.bytes.rate_ps_server_ps01_port_0: + - ps_server_ps01_port_0 + - network.incoming.bytes.rate requirements: dependency_ps_server: - ps_server - dependency - link_ps_server_ps01_port: - - ps_server_ps01_port - - link - dependency_ps_server_ps01_port: - - ps_server_ps01_port + dependency_ps_server_ps01_port_0: + - ps_server_ps01_port_0 - dependency + link_ps_server_ps01_port_0: + - ps_server_ps01_port_0 + - link local_storage_ps_server: - ps_server - - local_storage \ No newline at end of file + - local_storage diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/GlobalSubstitutionTypesServiceTemplate.yaml index 3ee76077dc..092c618595 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,82 +8,82 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - status: SUPPORTED - constraints: - - greater_or_equal: 0 - compute_pd_server_availability_zone: - type: list + port_pd01_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: string - compute_pd_server_name: + port_pd01_port_0_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_pd01_port_related_networks: + port_pd01_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - vm_flavor_name: + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - vm_image_name: + port_pd01_port_0_network_role: type: string required: true status: SUPPORTED - port_pd01_port_ip_requirements: + port_pd01_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + status: SUPPORTED + constraints: + - greater_or_equal: 0 + compute_pd_server_availability_zone: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd01_port_order: - type: integer + compute_pd_server_name: + type: list required: true status: SUPPORTED - port_pd01_port_subnetpoolid: + entry_schema: + type: string + vm_flavor_name: type: string required: true status: SUPPORTED - port_pd01_port_network_role: - type: string + port_pd01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_pd01_port_0_order: + type: integer required: true status: SUPPORTED - port_pd01_port_network_role_tag: + vm_image_name: type: string required: true status: SUPPORTED - port_pd01_port_vlan_requirements: + port_pd01_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_0_subnetpoolid: + type: string + required: true + status: SUPPORTED compute_pd_server_user_data_format: type: list required: true @@ -105,20 +105,28 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pd01_port: + - dependency_pd_server_pd01_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd01_port: + - link_pd_server_pd01_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: + binding_pd_server_pd01_port_0: + 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 scalable_pd_server: type: tosca.capabilities.Scalable occurrences: @@ -148,12 +156,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pd01_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 os_pd_server: type: tosca.capabilities.OperatingSystem occurrences: @@ -165,12 +167,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd01_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_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -201,7 +197,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd01_port: + network.incoming.packets_pd_server_pd01_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -225,7 +221,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pd01_port: + network.incoming.packets.rate_pd_server_pd01_port_0: + 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_pd_server_pd01_port_0: + 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.packets.rate_pd_server_pd01_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -243,6 +251,11 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_pd_server_pd01_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED disk.device.write.requests_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -254,17 +267,17 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pd01_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED disk.capacity_pd_server: 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_pd_server_pd01_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.allocation_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -288,6 +301,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes.rate_pd_server_pd01_port_0: + 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_pd_server: type: tosca.capabilities.Node occurrences: @@ -299,27 +318,19 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_pd01_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 disk.write.bytes_pd_server: 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_pd_server_pd01_port: + network.outgoing.bytes_pd_server_pd01_port_0: 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_pd_server_pd01_port: + network.incoming.bytes_pd_server_pd01_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -349,6 +360,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_pd_server_pd01_port_0: + 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_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -368,14 +385,8 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pd01_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 - forwarder_pd_server_pd01_port: - type: org.openecomp.capabilities.Forwarder + feature_pd_server_pd01_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -397,11 +408,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_pd01_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.device.latency_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -420,12 +426,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pd01_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.device.iops_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -441,7 +441,7 @@ node_types: status: SUPPORTED entry_schema: type: string - port_ps01_port_subnetpoolid: + port_ps01_port_0_network_role: type: string required: true status: SUPPORTED @@ -457,6 +457,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_ps01_port_0_network: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string index_value: type: integer description: Index value of this substitution service template runtime instance @@ -465,7 +471,13 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_ps01_port_vlan_requirements: + port_ps01_port_0_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_ps01_port_0_vlan_requirements: type: list required: true status: SUPPORTED @@ -475,13 +487,11 @@ node_types: type: string required: true status: SUPPORTED - port_ps01_port_related_networks: - type: list + port_ps01_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_ps01_port_order: + port_ps01_port_0_order: type: integer required: true status: SUPPORTED @@ -489,76 +499,60 @@ node_types: type: string required: true status: SUPPORTED - port_ps01_port_network_role: + port_ps01_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_ps01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_ps01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_ps01_port_network: - type: list + port_ps01_port_0_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: string - port_ps01_port_ip_requirements: + port_ps01_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_ps01_port_network_role_tag: - type: string - required: true - status: SUPPORTED - port_ps01_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED + type: org.openecomp.datatypes.network.RelatedNetworksAssignments requirements: - - dependency_ps_server: + - dependency_ps_server_ps01_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - local_storage_ps_server: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo + - link_ps_server_ps01_port_0: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo occurrences: - - 0 - - UNBOUNDED - - dependency_ps_server_ps01_port: + - 1 + - 1 + - dependency_ps_server: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_ps_server_ps01_port: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - capabilities: - network.incoming.packets.rate_ps_server_ps01_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + - local_storage_ps_server: + capability: tosca.capabilities.Attachment + node: tosca.nodes.BlockStorage + relationship: tosca.relationships.AttachesTo occurrences: - - 1 + - 0 - UNBOUNDED + capabilities: instance_ps_server: 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_ps_server_ps01_port: + network.incoming.packets_ps_server_ps01_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -571,12 +565,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_ps_server_ps01_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_ps_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -589,12 +577,12 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_ps_server_ps01_port: + feature_ps_server: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - feature_ps_server: + feature_ps_server_ps01_port_0: type: tosca.capabilities.Node occurrences: - 1 @@ -641,12 +629,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_ps_server_ps01_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.device.latency_ps_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -712,19 +694,19 @@ node_types: occurrences: - 1 - UNBOUNDED - cpu_util_ps_server: + network.outpoing.packets_ps_server_ps01_port_0: 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_ps_server: + cpu_util_ps_server: 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_ps_server_ps01_port: + memory.resident_ps_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -742,7 +724,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_ps_server_ps01_port: + network.incoming.bytes_ps_server_ps01_port_0: + 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_ps_server_ps01_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -777,11 +765,6 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_ps_server_ps01_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED os_ps_server: type: tosca.capabilities.OperatingSystem occurrences: @@ -793,7 +776,7 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_ps_server_ps01_port: + binding_ps_server_ps01_port_0: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface @@ -801,7 +784,7 @@ node_types: occurrences: - 0 - UNBOUNDED - forwarder_ps_server_ps01_port: + forwarder_ps_server_ps01_port_0: type: org.openecomp.capabilities.Forwarder occurrences: - 1 @@ -818,6 +801,11 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_ps_server_ps01_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED disk.usage_ps_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -841,7 +829,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_ps_server_ps01_port: + network.outgoing.bytes_ps_server_ps01_port_0: + 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.packets.rate_ps_server_ps01_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -853,9 +847,15 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_ps_server_ps01_port: + network.incoming.packets.rate_ps_server_ps01_port_0: 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 + - UNBOUNDED + network.incoming.bytes.rate_ps_server_ps01_port_0: + 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 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 3fe02b86e4..34880e6861 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 @@ -683,6 +683,18 @@ topology_template: directives: - substitutable properties: + port_pd01_port_0_mac_requirements: + mac_count_required: + is_required: false + port_pd01_port_0_network: + - get_input: oam_net_name + port_pd01_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_pd01_port_0_network_role_tag: oam compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: @@ -691,20 +703,8 @@ topology_template: - 0 vm_flavor_name: get_input: pd_flavor_name - port_pd01_port_mac_requirements: - mac_count_required: - is_required: false vm_image_name: get_input: pd_image_name - port_pd01_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false - port_pd01_port_network: - - get_input: oam_net_name - port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW service_template_filter: @@ -728,22 +728,22 @@ topology_template: - get_input: availabilityzone_name compute_ps_server_user_data_format: - RAW - vm_flavor_name: - get_input: pd_flavor_name - vm_image_name: - get_input: pd_image_name - port_ps01_port_mac_requirements: - mac_count_required: - is_required: false - port_ps01_port_network: + port_ps01_port_0_network: - get_input: oam_net_name - port_ps01_port_ip_requirements: + port_ps01_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_ps01_port_network_role_tag: oam + vm_flavor_name: + get_input: pd_flavor_name + port_ps01_port_0_mac_requirements: + mac_count_required: + is_required: false + vm_image_name: + get_input: pd_image_name + port_ps01_port_0_network_role_tag: oam service_template_filter: substitute_service_template: Nested_ps_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/twoSetsOfSingle/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/Nested_pd_serverServiceTemplate.yaml index 2d01270aaf..d9500a25e0 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/Nested_pd_serverServiceTemplate.yaml @@ -11,67 +11,67 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - constraints: - - greater_or_equal: 0 - compute_pd_server_availability_zone: - type: list + port_pd01_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: string - compute_pd_server_name: + port_pd01_port_0_network: type: list required: true entry_schema: type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_pd01_port_related_networks: + port_pd01_port_0_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - vm_flavor_name: + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role_tag: type: string required: true - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - vm_image_name: + port_pd01_port_0_network_role: type: string required: true - port_pd01_port_ip_requirements: + port_pd01_port_0_related_networks: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + constraints: + - greater_or_equal: 0 + compute_pd_server_availability_zone: type: list required: true entry_schema: type: string - port_pd01_port_order: - type: integer + compute_pd_server_name: + type: list required: true - port_pd01_port_subnetpoolid: + entry_schema: + type: string + vm_flavor_name: type: string required: true - port_pd01_port_network_role: - type: string + port_pd01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_pd01_port_0_order: + type: integer required: true - port_pd01_port_network_role_tag: + vm_image_name: type: string required: true - port_pd01_port_vlan_requirements: + port_pd01_port_0_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_0_subnetpoolid: + type: string + required: true compute_pd_server_user_data_format: type: list required: true @@ -97,31 +97,31 @@ topology_template: get_input: - compute_pd_server_user_data_format - index_value - pd_server_pd01_port: + pd_server_pd01_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd01_port_exCP_naming + get_input: port_pd01_port_0_exCP_naming vlan_requirements: - get_input: port_pd01_port_vlan_requirements + get_input: port_pd01_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_pd01_port_related_networks + get_input: port_pd01_port_0_related_networks ip_requirements: - get_input: port_pd01_port_ip_requirements + get_input: port_pd01_port_0_ip_requirements network_role_tag: - get_input: port_pd01_port_network_role_tag + get_input: port_pd01_port_0_network_role_tag mac_requirements: - get_input: port_pd01_port_mac_requirements + get_input: port_pd01_port_0_mac_requirements order: - get_input: port_pd01_port_order + get_input: port_pd01_port_0_order network_role: - get_input: port_pd01_port_network_role + get_input: port_pd01_port_0_network_role subnetpoolid: - get_input: port_pd01_port_subnetpoolid + get_input: port_pd01_port_0_subnetpoolid network: get_input: - - port_pd01_port_network + - port_pd01_port_0_network - index_value requirements: - binding: @@ -131,6 +131,9 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server capabilities: + binding_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - binding scalable_pd_server: - pd_server - scalable @@ -146,18 +149,12 @@ topology_template: disk.device.usage_pd_server: - pd_server - disk.device.usage - network.outgoing.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.packets.rate os_pd_server: - pd_server - os disk.write.bytes.rate_pd_server: - pd_server - disk.write.bytes.rate - network.incoming.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes cpu_pd_server: - pd_server - cpu @@ -173,9 +170,9 @@ topology_template: disk.device.read.bytes.rate_pd_server: - pd_server - disk.device.read.bytes.rate - network.outgoing.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes + network.incoming.packets_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.packets disk.iops_pd_server: - pd_server - disk.iops @@ -185,27 +182,36 @@ topology_template: cpu.delta_pd_server: - pd_server - cpu.delta - network.incoming.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port + network.incoming.packets.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 - network.incoming.packets.rate + network.incoming.bytes.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.bytes.rate + network.outgoing.packets.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.packets.rate vcpus_pd_server: - pd_server - vcpus disk.device.write.bytes.rate_pd_server: - pd_server - disk.device.write.bytes.rate + attachment_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - attachment disk.device.write.requests_pd_server: - pd_server - disk.device.write.requests endpoint_pd_server: - pd_server - endpoint - attachment_pd_server_pd01_port: - - pd_server_pd01_port - - attachment disk.capacity_pd_server: - pd_server - disk.capacity + forwarder_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - forwarder disk.device.allocation_pd_server: - pd_server - disk.device.allocation @@ -218,24 +224,24 @@ topology_template: disk.read.requests_pd_server: - pd_server - disk.read.requests + network.outgoing.bytes.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.bytes.rate feature_pd_server: - pd_server - feature disk.usage_pd_server: - pd_server - disk.usage - binding_pd_server_pd01_port: - - pd_server_pd01_port - - binding disk.write.bytes_pd_server: - pd_server - disk.write.bytes - network.incoming.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes.rate - network.incoming.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets + network.outgoing.bytes_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.bytes + network.incoming.bytes_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.bytes disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -248,6 +254,9 @@ topology_template: disk.device.write.bytes_pd_server: - pd_server - disk.device.write.bytes + network.outpoing.packets_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outpoing.packets disk.device.read.requests_pd_server: - pd_server - disk.device.read.requests @@ -257,12 +266,9 @@ topology_template: host_pd_server: - pd_server - host - network.outpoing.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.outpoing.packets - forwarder_pd_server_pd01_port: - - pd_server_pd01_port - - forwarder + feature_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - feature disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate @@ -272,9 +278,6 @@ topology_template: disk.write.requests_pd_server: - pd_server - disk.write.requests - feature_pd_server_pd01_port: - - pd_server_pd01_port - - feature disk.device.latency_pd_server: - pd_server - disk.device.latency @@ -284,9 +287,6 @@ topology_template: disk.device.capacity_pd_server: - pd_server - disk.device.capacity - network.outgoing.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes.rate disk.device.iops_pd_server: - pd_server - disk.device.iops @@ -294,12 +294,12 @@ topology_template: local_storage_pd_server: - pd_server - local_storage - link_pd_server_pd01_port: - - pd_server_pd01_port - - link - dependency_pd_server_pd01_port: - - pd_server_pd01_port - - dependency dependency_pd_server: - pd_server - - dependency \ No newline at end of file + - dependency + dependency_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - dependency + link_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - link diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/Nested_ps_serverServiceTemplate.yaml index 87be4e0414..a462b8a6de 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/Nested_ps_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/Nested_ps_serverServiceTemplate.yaml @@ -16,7 +16,7 @@ topology_template: required: true entry_schema: type: string - port_ps01_port_subnetpoolid: + port_ps01_port_0_network_role: type: string required: true compute_ps_server_availability_zone: @@ -29,6 +29,11 @@ topology_template: required: true entry_schema: type: string + port_ps01_port_0_network: + type: list + required: true + entry_schema: + type: string index_value: type: integer description: Index value of this substitution service template runtime instance @@ -36,7 +41,12 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_ps01_port_vlan_requirements: + port_ps01_port_0_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_ps01_port_0_vlan_requirements: type: list required: true entry_schema: @@ -44,120 +54,104 @@ topology_template: vm_flavor_name: type: string required: true - port_ps01_port_related_networks: - type: list + port_ps01_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_ps01_port_order: + port_ps01_port_0_order: type: integer required: true vm_image_name: type: string required: true - port_ps01_port_network_role: + port_ps01_port_0_network_role_tag: type: string required: true - port_ps01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_ps01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - port_ps01_port_network: - type: list + port_ps01_port_0_subnetpoolid: + type: string required: true - entry_schema: - type: string - port_ps01_port_ip_requirements: + port_ps01_port_0_related_networks: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_ps01_port_network_role_tag: - type: string - required: true - port_ps01_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true + type: org.openecomp.datatypes.network.RelatedNetworksAssignments node_templates: - ps_server: - type: org.openecomp.resource.vfc.compute.nodes.heat.ps_server - properties: - availability_zone: - get_input: - - compute_ps_server_availability_zone - - index_value - flavor: - get_input: vm_flavor_name - image: - get_input: vm_image_name - name: - get_input: - - compute_ps_server_name - - index_value - user_data_format: - get_input: - - compute_ps_server_user_data_format - - index_value - ps_server_ps01_port: + ps_server_ps01_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_ps01_port_exCP_naming + get_input: port_ps01_port_0_exCP_naming vlan_requirements: - get_input: port_ps01_port_vlan_requirements + get_input: port_ps01_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_ps01_port_related_networks + get_input: port_ps01_port_0_related_networks ip_requirements: - get_input: port_ps01_port_ip_requirements + get_input: port_ps01_port_0_ip_requirements network_role_tag: - get_input: port_ps01_port_network_role_tag + get_input: port_ps01_port_0_network_role_tag mac_requirements: - get_input: port_ps01_port_mac_requirements + get_input: port_ps01_port_0_mac_requirements order: - get_input: port_ps01_port_order + get_input: port_ps01_port_0_order network_role: - get_input: port_ps01_port_network_role + get_input: port_ps01_port_0_network_role subnetpoolid: - get_input: port_ps01_port_subnetpoolid + get_input: port_ps01_port_0_subnetpoolid network: get_input: - - port_ps01_port_network + - port_ps01_port_0_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: ps_server relationship: tosca.relationships.network.BindsTo + ps_server: + type: org.openecomp.resource.vfc.compute.nodes.heat.ps_server + properties: + availability_zone: + get_input: + - compute_ps_server_availability_zone + - index_value + flavor: + get_input: vm_flavor_name + image: + get_input: vm_image_name + name: + get_input: + - compute_ps_server_name + - index_value + user_data_format: + get_input: + - compute_ps_server_user_data_format + - index_value substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.ps_server capabilities: - network.incoming.packets.rate_ps_server_ps01_port: - - ps_server_ps01_port - - network.incoming.packets.rate instance_ps_server: - ps_server - instance - network.outpoing.packets_ps_server_ps01_port: - - ps_server_ps01_port - - network.outpoing.packets + network.incoming.packets_ps_server_ps01_port_0: + - ps_server_ps01_port_0 + - network.incoming.packets host_ps_server: - ps_server - host - network.incoming.packets_ps_server_ps01_port: - - ps_server_ps01_port - - network.incoming.packets cpu.delta_ps_server: - ps_server - cpu.delta disk.write.bytes.rate_ps_server: - ps_server - disk.write.bytes.rate - feature_ps_server_ps01_port: - - ps_server_ps01_port - - feature feature_ps_server: - ps_server - feature + feature_ps_server_ps01_port_0: + - ps_server_ps01_port_0 + - feature disk.root.size_ps_server: - ps_server - disk.root.size @@ -179,9 +173,6 @@ topology_template: disk.device.iops_ps_server: - ps_server - disk.device.iops - network.outgoing.packets.rate_ps_server_ps01_port: - - ps_server_ps01_port - - network.outgoing.packets.rate disk.device.latency_ps_server: - ps_server - disk.device.latency @@ -215,23 +206,26 @@ topology_template: disk.device.read.bytes.rate_ps_server: - ps_server - disk.device.read.bytes.rate + network.outpoing.packets_ps_server_ps01_port_0: + - ps_server_ps01_port_0 + - network.outpoing.packets cpu_util_ps_server: - ps_server - cpu_util memory.resident_ps_server: - ps_server - memory.resident - network.incoming.bytes_ps_server_ps01_port: - - ps_server_ps01_port - - network.incoming.bytes disk.device.read.requests_ps_server: - ps_server - disk.device.read.requests disk.write.bytes_ps_server: - ps_server - disk.write.bytes - network.outgoing.bytes.rate_ps_server_ps01_port: - - ps_server_ps01_port + network.incoming.bytes_ps_server_ps01_port_0: + - ps_server_ps01_port_0 + - network.incoming.bytes + network.outgoing.bytes.rate_ps_server_ps01_port_0: + - ps_server_ps01_port_0 - network.outgoing.bytes.rate disk.device.write.requests.rate_ps_server: - ps_server @@ -248,20 +242,17 @@ topology_template: binding_ps_server: - ps_server - binding - attachment_ps_server_ps01_port: - - ps_server_ps01_port - - attachment os_ps_server: - ps_server - os disk.device.usage_ps_server: - ps_server - disk.device.usage - binding_ps_server_ps01_port: - - ps_server_ps01_port + binding_ps_server_ps01_port_0: + - ps_server_ps01_port_0 - binding - forwarder_ps_server_ps01_port: - - ps_server_ps01_port + forwarder_ps_server_ps01_port_0: + - ps_server_ps01_port_0 - forwarder disk.device.write.bytes.rate_ps_server: - ps_server @@ -269,6 +260,9 @@ topology_template: vcpus_ps_server: - ps_server - vcpus + attachment_ps_server_ps01_port_0: + - ps_server_ps01_port_0 + - attachment disk.usage_ps_server: - ps_server - disk.usage @@ -281,25 +275,31 @@ topology_template: disk.capacity_ps_server: - ps_server - disk.capacity - network.incoming.bytes.rate_ps_server_ps01_port: - - ps_server_ps01_port - - network.incoming.bytes.rate + network.outgoing.bytes_ps_server_ps01_port_0: + - ps_server_ps01_port_0 + - network.outgoing.bytes + network.outgoing.packets.rate_ps_server_ps01_port_0: + - ps_server_ps01_port_0 + - network.outgoing.packets.rate disk.device.allocation_ps_server: - ps_server - disk.device.allocation - network.outgoing.bytes_ps_server_ps01_port: - - ps_server_ps01_port - - network.outgoing.bytes + network.incoming.packets.rate_ps_server_ps01_port_0: + - ps_server_ps01_port_0 + - network.incoming.packets.rate + network.incoming.bytes.rate_ps_server_ps01_port_0: + - ps_server_ps01_port_0 + - network.incoming.bytes.rate requirements: dependency_ps_server: - ps_server - dependency - link_ps_server_ps01_port: - - ps_server_ps01_port - - link - dependency_ps_server_ps01_port: - - ps_server_ps01_port + dependency_ps_server_ps01_port_0: + - ps_server_ps01_port_0 - dependency + link_ps_server_ps01_port_0: + - ps_server_ps01_port_0 + - link local_storage_ps_server: - ps_server - - local_storage \ No newline at end of file + - local_storage diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/computePortNetworkSubInterface/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/computePortNetworkSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml index 2846399798..b5981ebfaa 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/computePortNetworkSubInterface/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/computePortNetworkSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,26 +8,22 @@ node_types: org.openecomp.resource.abstract.nodes.vdbe: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_vdbe_untr_vmi_virtual_machine_interface_allowed_address_pairs: - type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs + subinterface_nested_parent_interface: + type: list required: true status: SUPPORTED - port_vdbe_untr_vmi_related_networks: + entry_schema: + type: string + port_vdbe_untr_vmi_1_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_vdbe_untr_vmi_network_role_tag: + type: org.openecomp.datatypes.network.VlanRequirements + port_vdbe_untr_vmi_1_subnetpoolid: type: string required: true status: SUPPORTED - subinterface_nested_parent_interface: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string subinterface_nested_aap_address_mode: type: list required: true @@ -62,12 +58,16 @@ node_types: type: string required: true status: SUPPORTED - port_vdbe_untr_vmi_virtual_machine_interface_mac_addresses: + port_vdbe_untr_vmi_1_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_vdbe_untr_vmi_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED subinterface_nested_aap_untrusted_ip_prefix: type: list required: true @@ -108,14 +108,14 @@ node_types: status: SUPPORTED entry_schema: type: string - port_vdbe_untr_vmi_virtual_network_refs: + port_vdbe_untr_vmi_1_name: type: list required: true status: SUPPORTED entry_schema: - type: json - port_vdbe_untr_vmi_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + type: string + port_vdbe_untr_vmi_1_order: + type: integer required: true status: SUPPORTED subinterface_nested_ip_address: @@ -124,22 +124,22 @@ node_types: status: SUPPORTED entry_schema: type: string - port_vdbe_untr_vmi_ip_requirements: + port_vdbe_untr_vmi_1_virtual_network_refs: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: json + port_vdbe_untr_vmi_1_network_role_tag: + type: string + required: true + status: SUPPORTED subinterface_nested_ip_v6_address: type: list required: true status: SUPPORTED entry_schema: type: string - port_vdbe_untr_vmi_order: - type: integer - required: true - status: SUPPORTED index_value: type: integer description: Index value of this substitution service template runtime instance @@ -160,21 +160,31 @@ node_types: status: SUPPORTED entry_schema: type: string - port_vdbe_untr_vmi_network_role: - type: string + port_vdbe_untr_vmi_1_ip_requirements: + type: list required: true status: SUPPORTED - port_vdbe_untr_vmi_exCP_naming: - type: org.openecomp.datatypes.Naming + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_vdbe_untr_vmi_1_virtual_machine_interface_allowed_address_pairs: + type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs required: true status: SUPPORTED - subinterface_nested_aap_untrusted_ip_prefix_len: + port_vdbe_untr_vmi_1_virtual_machine_interface_mac_addresses: type: list required: true status: SUPPORTED entry_schema: - type: string - port_vdbe_untr_vmi_name: + type: json + port_vdbe_untr_vmi_1_network_role: + type: string + required: true + status: SUPPORTED + port_vdbe_untr_vmi_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + subinterface_nested_aap_untrusted_ip_prefix_len: type: list required: true status: SUPPORTED @@ -192,71 +202,56 @@ node_types: status: SUPPORTED entry_schema: type: string - port_vdbe_untr_vmi_subnetpoolid: - type: string - required: true - status: SUPPORTED - port_vdbe_untr_vmi_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements requirements: - - dependency_vdbe: + - dependency_vdbe_vdbe_untr_vmi_1: 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 + - link_vdbe_vdbe_untr_vmi_1: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo occurrences: - - 0 - - UNBOUNDED - - dependency_vdbe_vdbe_untr_vmi: + - 1 + - 1 + - dependency_vdbe: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_vdbe_vdbe_untr_vmi: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo + - local_storage_vdbe: + capability: tosca.capabilities.Attachment + node: tosca.nodes.BlockStorage + relationship: tosca.relationships.AttachesTo occurrences: - - 1 - - 1 - - dependency_vdbe_vdbe_untr_vmi_nested: + - 0 + - UNBOUNDED + - dependency_vdbe_vdbe_untr_vmi_1_nested: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - dependency_vdbe_0_untr_vmi_0_vdbe_vdbe_untr_vmi_nested: + - dependency_vdbe_0_untr_vmi_0_vdbe_vdbe_untr_vmi_1_nested: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - subinterface_link_vdbe_0_untr_vmi_0_vdbe_vdbe_untr_vmi_nested: + - subinterface_link_vdbe_0_untr_vmi_0_vdbe_vdbe_untr_vmi_1_nested: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: - feature_vdbe_vdbe_untr_vmi_nested: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - network.incoming.packets.rate_vdbe_vdbe_untr_vmi: + network.outgoing.packets.rate_vdbe_vdbe_untr_vmi_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -284,26 +279,27 @@ node_types: occurrences: - 1 - UNBOUNDED - cpu_util_vdbe: + network.outgoing.bytes.rate_vdbe_vdbe_untr_vmi_1: 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: + 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 - disk.write.requests_vdbe: + 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 - feature_vdbe_vdbe_untr_vmi: - type: tosca.capabilities.Node + 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 @@ -325,6 +321,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets_vdbe_vdbe_untr_vmi_1: + 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: @@ -366,19 +368,24 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_vdbe_0_untr_vmi_0_vdbe_vdbe_untr_vmi_1_nested: + type: tosca.capabilities.Node + 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 - instance_vdbe: + network.outpoing.packets_vdbe_vdbe_untr_vmi_1: 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_vmi: + 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: @@ -408,68 +415,60 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_vdbe_vdbe_untr_vmi: + 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 - disk.write.requests.rate_vdbe: + 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 - network.incoming.bytes.rate_vdbe_vdbe_untr_vmi: + 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 - cpu_vdbe: + 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.write.bytes_vdbe: + 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 - binding_vdbe_vdbe_untr_vmi: - 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 - disk.device.usage_vdbe: + 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 - disk.device.read.bytes_vdbe: + network.outgoing.bytes_vdbe_vdbe_untr_vmi_1: 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: + network.incoming.bytes.rate_vdbe_vdbe_untr_vmi_1: 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_untr_vmi_0_vdbe_vdbe_untr_vmi_nested: - type: tosca.capabilities.Node + forwarder_vdbe_vdbe_untr_vmi_1: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_vdbe_vdbe_untr_vmi: + network.incoming.packets.rate_vdbe_vdbe_untr_vmi_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -494,19 +493,18 @@ node_types: 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. + feature_vdbe_vdbe_untr_vmi_1: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_vdbe_vdbe_untr_vmi: + 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 - network.incoming.bytes_vdbe_vdbe_untr_vmi: + network.incoming.bytes_vdbe_vdbe_untr_vmi_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -517,24 +515,26 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_vdbe_vdbe_untr_vmi: - type: org.openecomp.capabilities.Forwarder + binding_vdbe_vdbe_untr_vmi_1: + 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: - - 1 + - 0 - 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. + feature_vdbe_vdbe_untr_vmi_1_nested: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.root.size_vdbe: + 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 - network.outgoing.bytes_vdbe_vdbe_untr_vmi: + 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: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/computePortNetworkSubInterface/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/computePortNetworkSubInterface/out/MainServiceTemplate.yaml index 46d5688f80..9d84173051 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/computePortNetworkSubInterface/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/computePortNetworkSubInterface/out/MainServiceTemplate.yaml @@ -409,8 +409,6 @@ topology_template: - get_input: vdbe_aap_untrusted_v6_ip_prefix_len vm_flavor_name: get_input: vdbe_flavor_name - port_vdbe_untr_vmi_virtual_machine_interface_mac_addresses: - - - get_input: vdbe_hw_untr_mac_1 subinterface_nested_aap_untrusted_ip_prefix: - get_input: vdbe_aap_untrusted_ip_prefix vm_image_name: @@ -430,26 +428,28 @@ topology_template: get_input: vnf_name subinterface_nested_mac_address: - get_input: vdbe_hw_untr_mac_1 - port_vdbe_untr_vmi_virtual_network_refs: - - - control_int_net + port_vdbe_untr_vmi_1_name: + - str_replace: + template: VM_NAMEDBE001p1n004 + params: + DBE: + get_input: vdbe_device_name + VM_NAME: + get_input: vdbe_name_1 subinterface_nested_ip_address: - get_input: vdbe_untrusted_ip_1 + port_vdbe_untr_vmi_1_virtual_network_refs: + - - control_int_net subinterface_nested_ip_v6_address: - get_input: vdbe_untrusted_v6_ip_1 subinterface_nested_vmac_address: - get_input: vdbe_untrusted_vmac_address subinterface_nested_vn_network_list: - get_input: untrusted_vn_networks + port_vdbe_untr_vmi_1_virtual_machine_interface_mac_addresses: + - - get_input: vdbe_hw_untr_mac_1 subinterface_nested_aap_untrusted_ip_prefix_len: - get_input: vdbe_aap_untrusted_ip_prefix_len - port_vdbe_untr_vmi_name: - - str_replace: - template: VM_NAMEDBE001p1n004 - params: - DBE: - get_input: vdbe_device_name - VM_NAME: - get_input: vdbe_name_1 subinterface_nested_subinterfaces_name_prefix: - str_replace: template: VM_NAMEDBE001p1n004 @@ -469,7 +469,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_vdbe_vdbe_untr_vmi: + - link_vdbe_vdbe_untr_vmi_1: capability: tosca.capabilities.network.Linkable node: control_int_net relationship: tosca.relationships.network.LinksTo @@ -482,4 +482,4 @@ topology_template: Version 2.0 02-09-2016 (Authors: John Doe, user PROD) members: - 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/pattern1a/computePortNetworkSubInterface/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/computePortNetworkSubInterface/out/Nested_vdbeServiceTemplate.yaml index e4782a5120..10531d12b1 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/computePortNetworkSubInterface/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/computePortNetworkSubInterface/out/Nested_vdbeServiceTemplate.yaml @@ -11,22 +11,19 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_vdbe_untr_vmi_virtual_machine_interface_allowed_address_pairs: - type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs - required: true - port_vdbe_untr_vmi_related_networks: + subinterface_nested_parent_interface: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_vdbe_untr_vmi_network_role_tag: - type: string - required: true - subinterface_nested_parent_interface: + type: string + port_vdbe_untr_vmi_1_vlan_requirements: type: list required: true entry_schema: - type: string + type: org.openecomp.datatypes.network.VlanRequirements + port_vdbe_untr_vmi_1_subnetpoolid: + type: string + required: true subinterface_nested_aap_address_mode: type: list required: true @@ -55,11 +52,14 @@ topology_template: vm_flavor_name: type: string required: true - port_vdbe_untr_vmi_virtual_machine_interface_mac_addresses: + port_vdbe_untr_vmi_1_related_networks: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_vdbe_untr_vmi_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true subinterface_nested_aap_untrusted_ip_prefix: type: list required: true @@ -93,32 +93,32 @@ topology_template: required: true entry_schema: type: string - port_vdbe_untr_vmi_virtual_network_refs: + port_vdbe_untr_vmi_1_name: type: list required: true entry_schema: - type: json - port_vdbe_untr_vmi_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + type: string + port_vdbe_untr_vmi_1_order: + type: integer required: true subinterface_nested_ip_address: type: list required: true entry_schema: type: string - port_vdbe_untr_vmi_ip_requirements: + port_vdbe_untr_vmi_1_virtual_network_refs: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: json + port_vdbe_untr_vmi_1_network_role_tag: + type: string + required: true subinterface_nested_ip_v6_address: type: list required: true entry_schema: type: string - port_vdbe_untr_vmi_order: - type: integer - required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -136,18 +136,26 @@ topology_template: required: true entry_schema: type: string - port_vdbe_untr_vmi_network_role: - type: string + port_vdbe_untr_vmi_1_ip_requirements: + type: list required: true - port_vdbe_untr_vmi_exCP_naming: - type: org.openecomp.datatypes.Naming + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_vdbe_untr_vmi_1_virtual_machine_interface_allowed_address_pairs: + type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs required: true - subinterface_nested_aap_untrusted_ip_prefix_len: + port_vdbe_untr_vmi_1_virtual_machine_interface_mac_addresses: type: list required: true entry_schema: - type: string - port_vdbe_untr_vmi_name: + type: json + port_vdbe_untr_vmi_1_network_role: + type: string + required: true + port_vdbe_untr_vmi_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + subinterface_nested_aap_untrusted_ip_prefix_len: type: list required: true entry_schema: @@ -162,78 +170,70 @@ topology_template: required: true entry_schema: type: string - port_vdbe_untr_vmi_subnetpoolid: - type: string - required: true - port_vdbe_untr_vmi_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements 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_vmi: + vdbe_vdbe_untr_vmi_1: type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface properties: mac_requirements: - get_input: port_vdbe_untr_vmi_mac_requirements + get_input: port_vdbe_untr_vmi_1_mac_requirements order: - get_input: port_vdbe_untr_vmi_order + get_input: port_vdbe_untr_vmi_1_order exCP_naming: - get_input: port_vdbe_untr_vmi_exCP_naming + get_input: port_vdbe_untr_vmi_1_exCP_naming virtual_machine_interface_allowed_address_pairs: get_input: - - port_vdbe_untr_vmi_virtual_machine_interface_allowed_address_pairs + - port_vdbe_untr_vmi_1_virtual_machine_interface_allowed_address_pairs - index_value vlan_requirements: - get_input: port_vdbe_untr_vmi_vlan_requirements + get_input: port_vdbe_untr_vmi_1_vlan_requirements subinterface_indicator: true related_networks: - get_input: port_vdbe_untr_vmi_related_networks + get_input: port_vdbe_untr_vmi_1_related_networks virtual_network_refs: get_input: - - port_vdbe_untr_vmi_virtual_network_refs + - port_vdbe_untr_vmi_1_virtual_network_refs - index_value ip_requirements: - get_input: port_vdbe_untr_vmi_ip_requirements + get_input: port_vdbe_untr_vmi_1_ip_requirements network_role_tag: - get_input: port_vdbe_untr_vmi_network_role_tag + get_input: port_vdbe_untr_vmi_1_network_role_tag virtual_machine_interface_mac_addresses: get_input: - - port_vdbe_untr_vmi_virtual_machine_interface_mac_addresses + - port_vdbe_untr_vmi_1_virtual_machine_interface_mac_addresses - index_value network_role: - get_input: port_vdbe_untr_vmi_network_role + get_input: port_vdbe_untr_vmi_1_network_role subnetpoolid: - get_input: port_vdbe_untr_vmi_subnetpoolid + get_input: port_vdbe_untr_vmi_1_subnetpoolid name: get_input: - - port_vdbe_untr_vmi_name + - port_vdbe_untr_vmi_1_name - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: vdbe relationship: tosca.relationships.network.BindsTo - vdbe_vdbe_untr_vmi_nested: + 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_vmi_1_nested: type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested directives: - substitutable @@ -313,17 +313,14 @@ topology_template: requirements: - binding_vdbe_0_untr_vmi_0: capability: tosca.capabilities.network.Bindable - node: vdbe_vdbe_untr_vmi + node: vdbe_vdbe_untr_vmi_1 relationship: tosca.relationships.network.BindsTo substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.vdbe capabilities: - feature_vdbe_vdbe_untr_vmi_nested: - - vdbe_vdbe_untr_vmi_nested - - feature - network.incoming.packets.rate_vdbe_vdbe_untr_vmi: - - vdbe_vdbe_untr_vmi - - network.incoming.packets.rate + network.outgoing.packets.rate_vdbe_vdbe_untr_vmi_1: + - vdbe_vdbe_untr_vmi_1 + - network.outgoing.packets.rate feature_vdbe: - vdbe - feature @@ -336,6 +333,9 @@ topology_template: disk.ephemeral.size_vdbe: - vdbe - disk.ephemeral.size + network.outgoing.bytes.rate_vdbe_vdbe_untr_vmi_1: + - vdbe_vdbe_untr_vmi_1 + - network.outgoing.bytes.rate cpu_util_vdbe: - vdbe - cpu_util @@ -345,9 +345,6 @@ topology_template: disk.write.requests_vdbe: - vdbe - disk.write.requests - feature_vdbe_vdbe_untr_vmi: - - vdbe_vdbe_untr_vmi - - feature disk.device.latency_vdbe: - vdbe - disk.device.latency @@ -357,6 +354,9 @@ topology_template: disk.write.bytes.rate_vdbe: - vdbe - disk.write.bytes.rate + network.incoming.packets_vdbe_vdbe_untr_vmi_1: + - vdbe_vdbe_untr_vmi_1 + - network.incoming.packets scalable_vdbe: - vdbe - scalable @@ -378,15 +378,18 @@ topology_template: memory.usage_vdbe: - vdbe - memory.usage + feature_vdbe_0_untr_vmi_0_vdbe_vdbe_untr_vmi_1_nested: + - vdbe_vdbe_untr_vmi_1_nested + - feature_vdbe_0_untr_vmi_0 disk.read.requests_vdbe: - vdbe - disk.read.requests + network.outpoing.packets_vdbe_vdbe_untr_vmi_1: + - vdbe_vdbe_untr_vmi_1 + - network.outpoing.packets instance_vdbe: - vdbe - instance - network.outpoing.packets_vdbe_vdbe_untr_vmi: - - vdbe_vdbe_untr_vmi - - network.outpoing.packets cpu.delta_vdbe: - vdbe - cpu.delta @@ -399,24 +402,15 @@ topology_template: memory.resident_vdbe: - vdbe - memory.resident - network.incoming.packets_vdbe_vdbe_untr_vmi: - - vdbe_vdbe_untr_vmi - - network.incoming.packets disk.write.requests.rate_vdbe: - vdbe - disk.write.requests.rate - network.incoming.bytes.rate_vdbe_vdbe_untr_vmi: - - vdbe_vdbe_untr_vmi - - network.incoming.bytes.rate cpu_vdbe: - vdbe - cpu disk.write.bytes_vdbe: - vdbe - disk.write.bytes - binding_vdbe_vdbe_untr_vmi: - - vdbe_vdbe_untr_vmi - - binding disk.device.usage_vdbe: - vdbe - disk.device.usage @@ -426,12 +420,18 @@ topology_template: disk.latency_vdbe: - vdbe - disk.latency - feature_vdbe_0_untr_vmi_0_vdbe_vdbe_untr_vmi_nested: - - vdbe_vdbe_untr_vmi_nested - - feature_vdbe_0_untr_vmi_0 - network.outgoing.bytes.rate_vdbe_vdbe_untr_vmi: - - vdbe_vdbe_untr_vmi - - network.outgoing.bytes.rate + network.outgoing.bytes_vdbe_vdbe_untr_vmi_1: + - vdbe_vdbe_untr_vmi_1 + - network.outgoing.bytes + network.incoming.bytes.rate_vdbe_vdbe_untr_vmi_1: + - vdbe_vdbe_untr_vmi_1 + - network.incoming.bytes.rate + forwarder_vdbe_vdbe_untr_vmi_1: + - vdbe_vdbe_untr_vmi_1 + - forwarder + network.incoming.packets.rate_vdbe_vdbe_untr_vmi_1: + - vdbe_vdbe_untr_vmi_1 + - network.incoming.packets.rate disk.capacity_vdbe: - vdbe - disk.capacity @@ -441,30 +441,30 @@ topology_template: disk.allocation_vdbe: - vdbe - disk.allocation + feature_vdbe_vdbe_untr_vmi_1: + - vdbe_vdbe_untr_vmi_1 + - feature disk.read.bytes.rate_vdbe: - vdbe - disk.read.bytes.rate - network.outgoing.packets.rate_vdbe_vdbe_untr_vmi: - - vdbe_vdbe_untr_vmi - - network.outgoing.packets.rate - network.incoming.bytes_vdbe_vdbe_untr_vmi: - - vdbe_vdbe_untr_vmi + network.incoming.bytes_vdbe_vdbe_untr_vmi_1: + - vdbe_vdbe_untr_vmi_1 - network.incoming.bytes os_vdbe: - vdbe - os - forwarder_vdbe_vdbe_untr_vmi: - - vdbe_vdbe_untr_vmi - - forwarder + binding_vdbe_vdbe_untr_vmi_1: + - vdbe_vdbe_untr_vmi_1 + - binding + feature_vdbe_vdbe_untr_vmi_1_nested: + - vdbe_vdbe_untr_vmi_1_nested + - feature disk.device.read.requests_vdbe: - vdbe - disk.device.read.requests disk.root.size_vdbe: - vdbe - disk.root.size - network.outgoing.bytes_vdbe_vdbe_untr_vmi: - - vdbe_vdbe_untr_vmi - - network.outgoing.bytes memory_vdbe: - vdbe - memory @@ -481,24 +481,24 @@ topology_template: - vdbe - disk.read.bytes requirements: - link_vdbe_vdbe_untr_vmi: - - vdbe_vdbe_untr_vmi - - link - dependency_vdbe_vdbe_untr_vmi_nested: - - vdbe_vdbe_untr_vmi_nested + dependency_vdbe_vdbe_untr_vmi_1: + - vdbe_vdbe_untr_vmi_1 - dependency - dependency_vdbe_0_untr_vmi_0_vdbe_vdbe_untr_vmi_nested: - - vdbe_vdbe_untr_vmi_nested + dependency_vdbe_0_untr_vmi_0_vdbe_vdbe_untr_vmi_1_nested: + - vdbe_vdbe_untr_vmi_1_nested - dependency_vdbe_0_untr_vmi_0 + dependency_vdbe_vdbe_untr_vmi_1_nested: + - vdbe_vdbe_untr_vmi_1_nested + - dependency local_storage_vdbe: - vdbe - local_storage - dependency_vdbe_vdbe_untr_vmi: - - vdbe_vdbe_untr_vmi - - dependency + link_vdbe_vdbe_untr_vmi_1: + - vdbe_vdbe_untr_vmi_1 + - link + subinterface_link_vdbe_0_untr_vmi_0_vdbe_vdbe_untr_vmi_1_nested: + - vdbe_vdbe_untr_vmi_1_nested + - subinterface_link_vdbe_0_untr_vmi_0 dependency_vdbe: - vdbe - - dependency - subinterface_link_vdbe_0_untr_vmi_0_vdbe_vdbe_untr_vmi_nested: - - vdbe_vdbe_untr_vmi_nested - - subinterface_link_vdbe_0_untr_vmi_0 \ No newline at end of file + - 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/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 index 7fbaeed9c2..1fd158a6c8 100644 --- 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 @@ -8,10 +8,6 @@ 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 @@ -24,10 +20,6 @@ node_types: 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 @@ -40,11 +32,25 @@ node_types: status: SUPPORTED entry_schema: type: string + port_vdbe_untr_port_1_name: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_vdbe_untr_port_1_network_role: + type: string + required: true + status: SUPPORTED vm_flavor_name: type: string required: true status: SUPPORTED - port_vdbe_untr_port_order: + port_vdbe_untr_port_1_network_role_tag: + type: string + required: true + status: SUPPORTED + port_vdbe_untr_port_1_order: type: integer required: true status: SUPPORTED @@ -52,10 +58,6 @@ node_types: 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 @@ -98,6 +100,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_vdbe_untr_port_1_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments subinterface_nested1_aap_untrusted_ip_prefix_len: type: list required: true @@ -110,10 +118,24 @@ node_types: status: SUPPORTED entry_schema: type: string - port_vdbe_untr_port_mac_requirements: + port_vdbe_untr_port_1_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_vdbe_untr_port_1_subnetpoolid: + type: string + required: true + status: SUPPORTED + port_vdbe_untr_port_1_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED + port_vdbe_untr_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED index_value: type: integer description: Index value of this substitution service template runtime instance @@ -122,13 +144,7 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_vdbe_untr_port_name: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_vdbe_untr_port_vlan_requirements: + port_vdbe_untr_port_1_vlan_requirements: type: list required: true status: SUPPORTED @@ -140,10 +156,6 @@ node_types: 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 @@ -168,40 +180,28 @@ node_types: status: SUPPORTED entry_schema: type: string - port_vdbe_untr_port_related_networks: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments 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: + - dependency_vdbe_vdbe_untr_port_1_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: + - dependency_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_1_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: + - subinterface_link_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_1_nested1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -221,47 +221,35 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_vdbe_vdbe_untr_port: + - dependency_vdbe_vdbe_untr_port_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_vdbe_vdbe_untr_port: + - link_vdbe_vdbe_untr_port_1: 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. + forwarder_vdbe_vdbe_untr_port_1: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - feature_vdbe: + feature_vdbe_vdbe_untr_port_1_nested1: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - feature_vdbe_vdbe_untr_port: + feature_vdbe: 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. @@ -309,13 +297,24 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_vdbe_vdbe_untr_port_1: + type: tosca.capabilities.Node + 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: + network.incoming.bytes.rate_vdbe_vdbe_untr_port_1: + 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_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -338,42 +337,37 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.capacity_vdbe: + network.outgoing.packets.rate_vdbe_vdbe_untr_port_1: 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: + 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.usage_vdbe: + network.outgoing.bytes_vdbe_vdbe_untr_port_1: 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: + 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 - network.outpoing.packets_vdbe_vdbe_untr_port: + 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 - network.outgoing.bytes.rate_vdbe_vdbe_untr_port: + 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: @@ -385,12 +379,7 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_vdbe_vdbe_untr_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - binding_vdbe_vdbe_untr_port: + binding_vdbe_vdbe_untr_port_1: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface @@ -398,13 +387,19 @@ node_types: occurrences: - 0 - UNBOUNDED + network.incoming.bytes_vdbe_vdbe_untr_port_1: + 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 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: + network.outgoing.bytes.rate_vdbe_vdbe_untr_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -428,11 +423,6 @@ node_types: 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. @@ -475,9 +465,8 @@ node_types: 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. + attachment_vdbe_vdbe_untr_port_1: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED @@ -500,12 +489,29 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_vdbe_vdbe_untr_port_1: + 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 + network.incoming.packets_vdbe_vdbe_untr_port_1: + 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_1_nested1: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED os_vdbe: type: tosca.capabilities.OperatingSystem occurrences: @@ -552,12 +558,6 @@ node_types: 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: @@ -673,14 +673,12 @@ node_types: 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 + port_vdbe_untr_port_2_vlan_requirements: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements index_value: type: integer description: Index value of this substitution service template runtime instance @@ -689,46 +687,56 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - 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 + port_vdbe_untr_port_2_order: + type: integer required: true status: SUPPORTED - entry_schema: - type: string vm_flavor_name: type: string required: true status: SUPPORTED - port_vdbe_untr_port_vlan_requirements: + port_vdbe_untr_port_2_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_vdbe_untr_port_2_subnetpoolid: + type: string + required: true + status: SUPPORTED + port_vdbe_untr_port_2_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_vdbe_untr_port_network_role: - type: string + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_vdbe_untr_port_2_ip_requirements: + type: list required: true status: SUPPORTED - port_vdbe_untr_port_order: - type: integer + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_vdbe_untr_port_2_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED vm_image_name: type: string required: true status: SUPPORTED - port_vdbe_untr_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_vdbe_untr_port_2_name: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_vdbe_untr_port_2_network_role: + type: string required: true status: SUPPORTED compute_vdbe_metadata: @@ -743,56 +751,41 @@ node_types: status: SUPPORTED entry_schema: type: string - port_vdbe_untr_port_related_networks: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_vdbe_untr_port_ip_requirements: - type: list + port_vdbe_untr_port_2_network_role_tag: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements requirements: - - dependency_vdbe: + - dependency_vdbe_vdbe_untr_port_2: 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 + - link_vdbe_vdbe_untr_port_2: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo occurrences: - - 0 - - UNBOUNDED - - dependency_vdbe_vdbe_untr_port: + - 1 + - 1 + - dependency_vdbe: 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. + - local_storage_vdbe: + capability: tosca.capabilities.Attachment + node: tosca.nodes.BlockStorage + relationship: tosca.relationships.AttachesTo occurrences: - - 1 + - 0 - 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. + capabilities: + forwarder_vdbe_vdbe_untr_port_2: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED @@ -801,16 +794,6 @@ node_types: 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. @@ -846,6 +829,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets_vdbe_vdbe_untr_port_2: + 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. @@ -858,15 +847,19 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_vdbe_vdbe_untr_port_2: + type: tosca.capabilities.Node + 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. + attachment_vdbe_vdbe_untr_port_2: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED @@ -875,6 +868,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.packets.rate_vdbe_vdbe_untr_port_2: + 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.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. @@ -893,48 +892,49 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.allocation_vdbe: + network.outgoing.bytes_vdbe_vdbe_untr_port_2: 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: + 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 - memory.usage_vdbe: + network.incoming.packets.rate_vdbe_vdbe_untr_port_2: 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: + network.incoming.bytes.rate_vdbe_vdbe_untr_port_2: 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: + 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 - disk.read.requests_vdbe: + 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 - forwarder_vdbe_vdbe_untr_port: - type: org.openecomp.capabilities.Forwarder + 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 - binding_vdbe_vdbe_untr_port: + binding_vdbe_vdbe_untr_port_2: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface @@ -942,13 +942,13 @@ node_types: occurrences: - 0 - UNBOUNDED - instance_vdbe: + network.outgoing.bytes.rate_vdbe_vdbe_untr_port_2: 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: + 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: @@ -960,6 +960,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes_vdbe_vdbe_untr_port_2: + 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. @@ -1014,7 +1020,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_vdbe_vdbe_untr_port: + network.outpoing.packets_vdbe_vdbe_untr_port_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1086,12 +1092,6 @@ node_types: - 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: 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 index 66cbff9d89..edb427c692 100644 --- 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 @@ -414,12 +414,22 @@ topology_template: directives: - substitutable properties: - port_vdbe_untr_port_mac_requirements: - mac_count_required: - is_required: false compute_vdbe_availability_zone: - get_input: availability_zone_1 - port_vdbe_untr_port_name: + vm_flavor_name: + get_input: vdbe_flavor_name + port_vdbe_untr_port_2_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_vdbe_untr_port_2_mac_requirements: + mac_count_required: + is_required: false + vm_image_name: + get_input: vdbe_image_name + port_vdbe_untr_port_2_name: - str_replace: template: VM_NAMEDBE001p1n004 params: @@ -427,10 +437,6 @@ topology_template: 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 @@ -440,12 +446,6 @@ topology_template: 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 service_template_filter: substitute_service_template: Nested_vdbe_1ServiceTemplate.yaml count: 1 @@ -467,6 +467,14 @@ topology_template: - get_input: untrusted_vn_networks compute_vdbe_availability_zone: - get_input: availability_zone_1 + port_vdbe_untr_port_1_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: @@ -500,17 +508,15 @@ topology_template: - 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: + port_vdbe_untr_port_1_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_vdbe_untr_port_1_mac_requirements: mac_count_required: is_required: false - 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: @@ -523,12 +529,6 @@ topology_template: - 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 service_template_filter: substitute_service_template: Nested_vdbeServiceTemplate.yaml count: 1 @@ -558,4 +558,4 @@ topology_template: get_input: untr_vfc_instance_group_function subinterface_role: untr members: - - 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/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 index 67fb90607c..bc6f9eab32 100644 --- 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 @@ -11,9 +11,6 @@ node_types: 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 @@ -24,9 +21,6 @@ topology_template: required: true entry_schema: type: string - port_vdbe_untr_port_subnetpoolid: - type: string - required: true subinterface_nested1_vn_network_list: type: list required: true @@ -37,18 +31,26 @@ topology_template: required: true entry_schema: type: string + port_vdbe_untr_port_1_name: + type: list + required: true + entry_schema: + type: string + port_vdbe_untr_port_1_network_role: + type: string + required: true vm_flavor_name: type: string required: true - port_vdbe_untr_port_order: + port_vdbe_untr_port_1_network_role_tag: + type: string + required: true + port_vdbe_untr_port_1_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 @@ -84,6 +86,11 @@ topology_template: required: true entry_schema: type: string + port_vdbe_untr_port_1_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments subinterface_nested1_aap_untrusted_ip_prefix_len: type: list required: true @@ -94,9 +101,20 @@ topology_template: required: true entry_schema: type: string - port_vdbe_untr_port_mac_requirements: + port_vdbe_untr_port_1_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_vdbe_untr_port_1_subnetpoolid: + type: string + required: true + port_vdbe_untr_port_1_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true + port_vdbe_untr_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -104,12 +122,7 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_vdbe_untr_port_name: - type: list - required: true - entry_schema: - type: string - port_vdbe_untr_port_vlan_requirements: + port_vdbe_untr_port_1_vlan_requirements: type: list required: true entry_schema: @@ -119,9 +132,6 @@ topology_template: 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 @@ -142,23 +152,13 @@ topology_template: required: true entry_schema: type: string - port_vdbe_untr_port_related_networks: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments 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: + vdbe_vdbe_untr_port_1_nested1: type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested1 directives: - substitutable @@ -238,7 +238,7 @@ topology_template: requirements: - binding_vdbe_0_subint_untr_vmi_0: capability: tosca.capabilities.network.Bindable - node: vdbe_vdbe_untr_port + node: vdbe_vdbe_untr_port_1 relationship: tosca.relationships.network.BindsTo vdbe: type: org.openecomp.resource.vfc.compute.nodes.heat.vdbe @@ -259,31 +259,31 @@ topology_template: get_input: - compute_vdbe_name - index_value - vdbe_vdbe_untr_port: + vdbe_vdbe_untr_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_vdbe_untr_port_exCP_naming + get_input: port_vdbe_untr_port_1_exCP_naming vlan_requirements: - get_input: port_vdbe_untr_port_vlan_requirements + get_input: port_vdbe_untr_port_1_vlan_requirements subinterface_indicator: true related_networks: - get_input: port_vdbe_untr_port_related_networks + get_input: port_vdbe_untr_port_1_related_networks ip_requirements: - get_input: port_vdbe_untr_port_ip_requirements + get_input: port_vdbe_untr_port_1_ip_requirements network_role_tag: - get_input: port_vdbe_untr_port_network_role_tag + get_input: port_vdbe_untr_port_1_network_role_tag mac_requirements: - get_input: port_vdbe_untr_port_mac_requirements + get_input: port_vdbe_untr_port_1_mac_requirements order: - get_input: port_vdbe_untr_port_order + get_input: port_vdbe_untr_port_1_order network_role: - get_input: port_vdbe_untr_port_network_role + get_input: port_vdbe_untr_port_1_network_role subnetpoolid: - get_input: port_vdbe_untr_port_subnetpoolid + get_input: port_vdbe_untr_port_1_subnetpoolid name: get_input: - - port_vdbe_untr_port_name + - port_vdbe_untr_port_1_name - index_value requirements: - binding: @@ -293,21 +293,15 @@ topology_template: 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 + forwarder_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - forwarder + feature_vdbe_vdbe_untr_port_1_nested1: + - vdbe_vdbe_untr_port_1_nested1 + - feature 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 @@ -332,12 +326,18 @@ topology_template: disk.device.write.requests.rate_vdbe: - vdbe - disk.device.write.requests.rate + feature_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - feature disk.write.bytes.rate_vdbe: - vdbe - disk.write.bytes.rate - network.incoming.packets_vdbe_vdbe_untr_port: - - vdbe_vdbe_untr_port - - network.incoming.packets + network.incoming.bytes.rate_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - network.incoming.bytes.rate + network.incoming.packets.rate_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - network.incoming.packets.rate scalable_vdbe: - vdbe - scalable @@ -347,12 +347,15 @@ topology_template: disk.device.write.requests_vdbe: - vdbe - disk.device.write.requests + network.outgoing.packets.rate_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - network.outgoing.packets.rate 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 + network.outgoing.bytes_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - network.outgoing.bytes disk.device.allocation_vdbe: - vdbe - disk.device.allocation @@ -362,27 +365,21 @@ topology_template: 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_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 - binding + network.incoming.bytes_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - network.incoming.bytes instance_vdbe: - vdbe - instance - network.incoming.bytes.rate_vdbe_vdbe_untr_port: - - vdbe_vdbe_untr_port - - network.incoming.bytes.rate + network.outgoing.bytes.rate_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - network.outgoing.bytes.rate cpu.delta_vdbe: - vdbe - cpu.delta @@ -392,9 +389,6 @@ topology_template: 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 @@ -416,9 +410,9 @@ topology_template: disk.latency_vdbe: - vdbe - disk.latency - network.incoming.bytes_vdbe_vdbe_untr_port: - - vdbe_vdbe_untr_port - - network.incoming.bytes + attachment_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - attachment disk.capacity_vdbe: - vdbe - disk.capacity @@ -428,9 +422,18 @@ topology_template: disk.allocation_vdbe: - vdbe - disk.allocation + network.outpoing.packets_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - network.outpoing.packets disk.read.bytes.rate_vdbe: - vdbe - disk.read.bytes.rate + network.incoming.packets_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - network.incoming.packets + feature_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_1_nested1: + - vdbe_vdbe_untr_port_1_nested1 + - feature_vdbe_0_subint_untr_vmi_0 os_vdbe: - vdbe - os @@ -455,28 +458,25 @@ topology_template: 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_vdbe_vdbe_untr_port_1_nested1: + - vdbe_vdbe_untr_port_1_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_vdbe_vdbe_untr_port_1_nested1: + - vdbe_vdbe_untr_port_1_nested1 - dependency_vdbe_0_subint_untr_vmi_0 - link_vdbe_vdbe_untr_port: - - vdbe_vdbe_untr_port + dependency_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - dependency + dependency_vdbe_vdbe_untr_port_1_nested1: + - vdbe_vdbe_untr_port_1_nested1 + - dependency + link_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 - link local_storage_vdbe: - vdbe - local_storage - dependency_vdbe_vdbe_untr_port_nested1: - - vdbe_vdbe_untr_port_nested1 - - dependency 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/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 index f3cc4049b1..a1b1ff5462 100644 --- 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 @@ -11,12 +11,11 @@ node_types: 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 + port_vdbe_untr_port_2_vlan_requirements: + type: list required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements index_value: type: integer description: Index value of this substitution service template runtime instance @@ -24,38 +23,46 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - 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 + port_vdbe_untr_port_2_order: + type: integer required: true - entry_schema: - type: string vm_flavor_name: type: string required: true - port_vdbe_untr_port_vlan_requirements: + port_vdbe_untr_port_2_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_vdbe_untr_port_2_subnetpoolid: + type: string + required: true + port_vdbe_untr_port_2_related_networks: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_vdbe_untr_port_network_role: - type: string + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_vdbe_untr_port_2_ip_requirements: + type: list required: true - port_vdbe_untr_port_order: - type: integer + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_vdbe_untr_port_2_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true vm_image_name: type: string required: true - port_vdbe_untr_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_vdbe_untr_port_2_name: + type: list + required: true + entry_schema: + type: string + port_vdbe_untr_port_2_network_role: + type: string required: true compute_vdbe_metadata: type: list @@ -67,85 +74,69 @@ topology_template: required: true entry_schema: type: string - port_vdbe_untr_port_related_networks: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_vdbe_untr_port_ip_requirements: - type: list + port_vdbe_untr_port_2_network_role_tag: + type: string 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: + vdbe_vdbe_untr_port_2: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_vdbe_untr_port_exCP_naming + get_input: port_vdbe_untr_port_2_exCP_naming vlan_requirements: - get_input: port_vdbe_untr_port_vlan_requirements + get_input: port_vdbe_untr_port_2_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_vdbe_untr_port_related_networks + get_input: port_vdbe_untr_port_2_related_networks ip_requirements: - get_input: port_vdbe_untr_port_ip_requirements + get_input: port_vdbe_untr_port_2_ip_requirements network_role_tag: - get_input: port_vdbe_untr_port_network_role_tag + get_input: port_vdbe_untr_port_2_network_role_tag mac_requirements: - get_input: port_vdbe_untr_port_mac_requirements + get_input: port_vdbe_untr_port_2_mac_requirements order: - get_input: port_vdbe_untr_port_order + get_input: port_vdbe_untr_port_2_order network_role: - get_input: port_vdbe_untr_port_network_role + get_input: port_vdbe_untr_port_2_network_role subnetpoolid: - get_input: port_vdbe_untr_port_subnetpoolid + get_input: port_vdbe_untr_port_2_subnetpoolid name: get_input: - - port_vdbe_untr_port_name + - port_vdbe_untr_port_2_name - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: vdbe 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 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 + forwarder_vdbe_vdbe_untr_port_2: + - vdbe_vdbe_untr_port_2 + - forwarder 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 @@ -164,21 +155,30 @@ topology_template: disk.write.requests_vdbe: - vdbe - disk.write.requests + network.incoming.packets_vdbe_vdbe_untr_port_2: + - vdbe_vdbe_untr_port_2 + - network.incoming.packets disk.device.latency_vdbe: - vdbe - disk.device.latency disk.device.write.requests.rate_vdbe: - vdbe - disk.device.write.requests.rate + feature_vdbe_vdbe_untr_port_2: + - vdbe_vdbe_untr_port_2 + - feature disk.write.bytes.rate_vdbe: - vdbe - disk.write.bytes.rate - network.incoming.packets_vdbe_vdbe_untr_port: - - vdbe_vdbe_untr_port - - network.incoming.packets + attachment_vdbe_vdbe_untr_port_2: + - vdbe_vdbe_untr_port_2 + - attachment scalable_vdbe: - vdbe - scalable + network.outgoing.packets.rate_vdbe_vdbe_untr_port_2: + - vdbe_vdbe_untr_port_2 + - network.outgoing.packets.rate disk.iops_vdbe: - vdbe - disk.iops @@ -188,39 +188,42 @@ topology_template: disk.device.capacity_vdbe: - vdbe - disk.device.capacity + network.outgoing.bytes_vdbe_vdbe_untr_port_2: + - vdbe_vdbe_untr_port_2 + - network.outgoing.bytes disk.device.allocation_vdbe: - vdbe - disk.device.allocation + network.incoming.packets.rate_vdbe_vdbe_untr_port_2: + - vdbe_vdbe_untr_port_2 + - network.incoming.packets.rate + network.incoming.bytes.rate_vdbe_vdbe_untr_port_2: + - vdbe_vdbe_untr_port_2 + - network.incoming.bytes.rate 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_vdbe_vdbe_untr_port_2: + - vdbe_vdbe_untr_port_2 - binding + network.outgoing.bytes.rate_vdbe_vdbe_untr_port_2: + - vdbe_vdbe_untr_port_2 + - network.outgoing.bytes.rate 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 + network.incoming.bytes_vdbe_vdbe_untr_port_2: + - vdbe_vdbe_untr_port_2 + - network.incoming.bytes disk.device.read.bytes.rate_vdbe: - vdbe - disk.device.read.bytes.rate @@ -248,9 +251,9 @@ topology_template: disk.latency_vdbe: - vdbe - disk.latency - network.incoming.bytes_vdbe_vdbe_untr_port: - - vdbe_vdbe_untr_port - - network.incoming.bytes + network.outpoing.packets_vdbe_vdbe_untr_port_2: + - vdbe_vdbe_untr_port_2 + - network.outpoing.packets disk.capacity_vdbe: - vdbe - disk.capacity @@ -287,19 +290,16 @@ topology_template: 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_vdbe_vdbe_untr_port_2: + - vdbe_vdbe_untr_port_2 - link local_storage_vdbe: - vdbe - local_storage + dependency_vdbe_vdbe_untr_port_2: + - vdbe_vdbe_untr_port_2 + - dependency 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/pattern1b/diffComputeSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml index 8a0a77b277..fd261d6cf3 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,77 +8,81 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 + port_pd01_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true status: SUPPORTED - constraints: - - greater_or_equal: 0 - compute_pd_server_availability_zone: + port_pd01_port_0_network: type: list required: true status: SUPPORTED entry_schema: type: string - compute_pd_server_name: + port_pd01_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role_tag: + type: string required: true status: SUPPORTED - subinterface_nested_service_template_filter_count: - type: list + port_pd01_port_0_network_role: + type: string required: true status: SUPPORTED - entry_schema: - type: float - port_pd01_port_related_networks: + port_pd01_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - vm_flavor_name: - type: string + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + status: SUPPORTED + constraints: + - greater_or_equal: 0 + compute_pd_server_availability_zone: + type: list required: true status: SUPPORTED - subinterface_nested_p1: + entry_schema: + type: string + compute_pd_server_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + subinterface_nested_service_template_filter_count: + type: list required: true status: SUPPORTED - vm_image_name: + entry_schema: + type: float + vm_flavor_name: type: string required: true status: SUPPORTED - port_pd01_port_ip_requirements: - type: list + port_pd01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + subinterface_nested_p1: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd01_port_order: + port_pd01_port_0_order: type: integer required: true status: SUPPORTED - port_pd01_port_subnetpoolid: + vm_image_name: type: string required: true status: SUPPORTED @@ -88,20 +92,16 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_network_role: - type: string - required: true - status: SUPPORTED - port_pd01_port_network_role_tag: - type: string - required: true - status: SUPPORTED - port_pd01_port_vlan_requirements: + port_pd01_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_0_subnetpoolid: + type: string + required: true + status: SUPPORTED compute_pd_server_user_data_format: type: list required: true @@ -109,54 +109,62 @@ node_types: entry_schema: type: string requirements: - - dependency_pd_server_pd01_port_nested: + - dependency_pd_server: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - dependency_template_Vlan_1_pd_server_pd01_port_nested: + - local_storage_pd_server: + capability: tosca.capabilities.Attachment + node: tosca.nodes.BlockStorage + relationship: tosca.relationships.AttachesTo + occurrences: + - 0 + - UNBOUNDED + - dependency_pd_server_pd01_port_0_nested: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - subinterface_link_template_Vlan_1_pd_server_pd01_port_nested: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - - dependency_pd_server: + - dependency_template_Vlan_1_pd_server_pd01_port_0_nested: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - local_storage_pd_server: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo + - subinterface_link_template_Vlan_1_pd_server_pd01_port_0_nested: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo occurrences: - - 0 - - UNBOUNDED - - dependency_pd_server_pd01_port: + - 1 + - 1 + - dependency_pd_server_pd01_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd01_port: + - link_pd_server_pd01_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: + binding_pd_server_pd01_port_0: + 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 scalable_pd_server: type: tosca.capabilities.Scalable occurrences: @@ -168,11 +176,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_template_Vlan_1_pd_server_pd01_port_nested: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED memory.usage_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -191,12 +194,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pd01_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 os_pd_server: type: tosca.capabilities.OperatingSystem occurrences: @@ -208,9 +205,8 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd01_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_template_Vlan_1_pd_server_pd01_port_0_nested: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -244,7 +240,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd01_port: + network.incoming.packets_pd_server_pd01_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -268,7 +264,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pd01_port: + network.incoming.packets.rate_pd_server_pd01_port_0: + 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_pd_server_pd01_port_0: + 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.packets.rate_pd_server_pd01_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -286,6 +294,11 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_pd_server_pd01_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED disk.device.write.requests_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -297,17 +310,17 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pd01_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED disk.capacity_pd_server: 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_pd_server_pd01_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.allocation_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -331,8 +344,9 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_pd01_port_nested: - type: tosca.capabilities.Node + network.outgoing.bytes.rate_pd_server_pd01_port_0: + 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 @@ -347,27 +361,19 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_pd01_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 disk.write.bytes_pd_server: 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_pd_server_pd01_port: + network.outgoing.bytes_pd_server_pd01_port_0: 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_pd_server_pd01_port: + network.incoming.bytes_pd_server_pd01_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -397,6 +403,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_pd_server_pd01_port_0: + 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_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -416,14 +428,8 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pd01_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 - forwarder_pd_server_pd01_port: - type: org.openecomp.capabilities.Forwarder + feature_pd_server_pd01_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -439,36 +445,30 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.write.requests_pd_server: - 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_pd_server_pd01_port: + feature_pd_server_pd01_port_0_nested: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.device.latency_pd_server: + disk.write.requests_pd_server: 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_pd_server: + disk.device.latency_pd_server: 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_pd_server: + disk.latency_pd_server: 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_pd_server_pd01_port: + disk.device.capacity_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -564,7 +564,7 @@ node_types: status: SUPPORTED entry_schema: type: string - port_ps01_port_subnetpoolid: + port_ps01_port_0_network_role: type: string required: true status: SUPPORTED @@ -580,6 +580,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_ps01_port_0_network: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string index_value: type: integer description: Index value of this substitution service template runtime instance @@ -588,18 +594,24 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_ps01_port_vlan_requirements: + port_ps01_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.IpRequirements subinterface_nested_service_template_filter_count: type: list required: true status: SUPPORTED entry_schema: type: float + port_ps01_port_0_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements vm_flavor_name: type: string required: true @@ -610,13 +622,11 @@ node_types: status: SUPPORTED entry_schema: type: string - port_ps01_port_related_networks: - type: list + port_ps01_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_ps01_port_order: + port_ps01_port_0_order: type: integer required: true status: SUPPORTED @@ -624,102 +634,86 @@ node_types: type: string required: true status: SUPPORTED - port_ps01_port_network_role: + port_ps01_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_ps01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_ps01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_ps01_port_network: - type: list + port_ps01_port_0_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: string - subinterface_nested_net1: + port_ps01_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: string - port_ps01_port_ip_requirements: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + subinterface_nested_net1: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_ps01_port_network_role_tag: - type: string - required: true - status: SUPPORTED - port_ps01_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED + type: string requirements: - - dependency_ps_server_ps01_port_nested: + - dependency_ps_server_ps01_port_0_nested: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - dependency_template_Vlan_1_ps_server_ps01_port_nested: + - dependency_template_Vlan_1_ps_server_ps01_port_0_nested: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - subinterface_link_template_Vlan_1_ps_server_ps01_port_nested: + - subinterface_link_template_Vlan_1_ps_server_ps01_port_0_nested: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_ps_server: + - dependency_ps_server_ps01_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - local_storage_ps_server: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo + - link_ps_server_ps01_port_0: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo occurrences: - - 0 - - UNBOUNDED - - dependency_ps_server_ps01_port: + - 1 + - 1 + - dependency_ps_server: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_ps_server_ps01_port: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - capabilities: - network.incoming.packets.rate_ps_server_ps01_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + - local_storage_ps_server: + capability: tosca.capabilities.Attachment + node: tosca.nodes.BlockStorage + relationship: tosca.relationships.AttachesTo occurrences: - - 1 + - 0 - UNBOUNDED + capabilities: instance_ps_server: 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_ps_server_ps01_port: + network.incoming.packets_ps_server_ps01_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -732,12 +726,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_ps_server_ps01_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_ps_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -750,17 +738,12 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_ps_server_ps01_port_nested: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - feature_ps_server_ps01_port: + feature_ps_server: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - feature_ps_server: + feature_ps_server_ps01_port_0: type: tosca.capabilities.Node occurrences: - 1 @@ -807,12 +790,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_ps_server_ps01_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.device.latency_ps_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -878,24 +855,29 @@ node_types: occurrences: - 1 - UNBOUNDED - cpu_util_ps_server: + network.outpoing.packets_ps_server_ps01_port_0: 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_ps_server: + cpu_util_ps_server: 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_ps_server_ps01_port: + memory.resident_ps_server: 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_template_Vlan_1_ps_server_ps01_port_0_nested: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.device.read.requests_ps_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -908,12 +890,13 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_template_Vlan_1_ps_server_ps01_port_nested: - type: tosca.capabilities.Node + network.incoming.bytes_ps_server_ps01_port_0: + 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_ps_server_ps01_port: + network.outgoing.bytes.rate_ps_server_ps01_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -948,8 +931,8 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_ps_server_ps01_port: - type: tosca.capabilities.Attachment + feature_ps_server_ps01_port_0_nested: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -964,7 +947,7 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_ps_server_ps01_port: + binding_ps_server_ps01_port_0: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface @@ -972,7 +955,7 @@ node_types: occurrences: - 0 - UNBOUNDED - forwarder_ps_server_ps01_port: + forwarder_ps_server_ps01_port_0: type: org.openecomp.capabilities.Forwarder occurrences: - 1 @@ -989,6 +972,11 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_ps_server_ps01_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED disk.usage_ps_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1012,7 +1000,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_ps_server_ps01_port: + network.outgoing.bytes_ps_server_ps01_port_0: + 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.packets.rate_ps_server_ps01_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1024,7 +1018,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_ps_server_ps01_port: + network.incoming.packets.rate_ps_server_ps01_port_0: + 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_ps_server_ps01_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/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/diffComputeSubInterface/out/MainServiceTemplate.yaml index ca498b2bff..08dd21d0eb 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/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/diffComputeSubInterface/out/MainServiceTemplate.yaml @@ -708,6 +708,18 @@ topology_template: directives: - substitutable properties: + port_pd01_port_0_mac_requirements: + mac_count_required: + is_required: false + port_pd01_port_0_network: + - get_input: oam_net_name + port_pd01_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_pd01_port_0_network_role_tag: oam compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: @@ -720,22 +732,10 @@ topology_template: get_input: pd_flavor_name subinterface_nested_p1: - pd01_port_0 - port_pd01_port_mac_requirements: - mac_count_required: - is_required: false vm_image_name: get_input: pd_image_name - port_pd01_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false - port_pd01_port_network: - - get_input: oam_net_name subinterface_nested_net1: - test_net1 - port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW service_template_filter: @@ -747,7 +747,7 @@ topology_template: - service_template_filter - index_value requirements: - - subinterface_link_template_Vlan_1_pd_server_pd01_port_nested: + - subinterface_link_template_Vlan_1_pd_server_pd01_port_0_nested: capability: tosca.capabilities.network.Linkable node: test_net1 relationship: tosca.relationships.network.LinksTo @@ -764,28 +764,28 @@ topology_template: - get_input: availabilityzone_name compute_ps_server_user_data_format: - RAW + port_ps01_port_0_network: + - get_input: oam_net_name + port_ps01_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false subinterface_nested_service_template_filter_count: - 9 vm_flavor_name: get_input: pd_flavor_name subinterface_nested_p1: - ps01_port_0 - vm_image_name: - get_input: pd_image_name - port_ps01_port_mac_requirements: + port_ps01_port_0_mac_requirements: mac_count_required: is_required: false - port_ps01_port_network: - - get_input: oam_net_name + vm_image_name: + get_input: pd_image_name + port_ps01_port_0_network_role_tag: oam subinterface_nested_net1: - test_net1 - port_ps01_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false - port_ps01_port_network_role_tag: oam service_template_filter: substitute_service_template: Nested_ps_serverServiceTemplate.yaml count: 1 @@ -795,7 +795,7 @@ topology_template: - service_template_filter - index_value requirements: - - subinterface_link_template_Vlan_1_ps_server_ps01_port_nested: + - subinterface_link_template_Vlan_1_ps_server_ps01_port_0_nested: capability: tosca.capabilities.network.Linkable node: test_net1 relationship: tosca.relationships.network.LinksTo @@ -809,4 +809,4 @@ topology_template: - test_net2 - test_net1 - abstract_pd_server - - abstract_ps_server + - abstract_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/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/Nested_pd_serverServiceTemplate.yaml index 174544b79d..50b0adbe52 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/Nested_pd_serverServiceTemplate.yaml @@ -11,6 +11,30 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pd01_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_pd01_port_0_network: + type: list + required: true + entry_schema: + type: string + port_pd01_port_0_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role_tag: + type: string + required: true + port_pd01_port_0_network_role: + type: string + required: true + port_pd01_port_0_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments index_value: type: integer description: Index value of this substitution service template runtime instance @@ -28,47 +52,26 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true subinterface_nested_service_template_filter_count: type: list required: true entry_schema: type: float - port_pd01_port_related_networks: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true - subinterface_nested_p1: - type: list - required: true - entry_schema: - type: string - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - vm_image_name: - type: string - required: true - port_pd01_port_ip_requirements: - type: list + port_pd01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + subinterface_nested_p1: type: list required: true entry_schema: type: string - port_pd01_port_order: + port_pd01_port_0_order: type: integer required: true - port_pd01_port_subnetpoolid: + vm_image_name: type: string required: true subinterface_nested_net1: @@ -76,24 +79,40 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_network_role: - type: string - required: true - port_pd01_port_network_role_tag: - type: string - required: true - port_pd01_port_vlan_requirements: + port_pd01_port_0_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_0_subnetpoolid: + type: string + required: true compute_pd_server_user_data_format: type: list required: true entry_schema: type: string node_templates: - pd_server_pd01_port_nested: + pd_server: + type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server + properties: + availability_zone: + get_input: + - compute_pd_server_availability_zone + - index_value + flavor: + get_input: vm_flavor_name + image: + get_input: vm_image_name + name: + get_input: + - compute_pd_server_name + - index_value + user_data_format: + get_input: + - compute_pd_server_user_data_format + - index_value + pd_server_pd01_port_0_nested: type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested directives: - substitutable @@ -116,52 +135,33 @@ topology_template: requirements: - binding_template_Vlan_1: capability: tosca.capabilities.network.Bindable - node: pd_server_pd01_port + node: pd_server_pd01_port_0 relationship: tosca.relationships.network.BindsTo - pd_server: - type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server - properties: - availability_zone: - get_input: - - compute_pd_server_availability_zone - - index_value - flavor: - get_input: vm_flavor_name - image: - get_input: vm_image_name - name: - get_input: - - compute_pd_server_name - - index_value - user_data_format: - get_input: - - compute_pd_server_user_data_format - - index_value - pd_server_pd01_port: + pd_server_pd01_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd01_port_exCP_naming + get_input: port_pd01_port_0_exCP_naming vlan_requirements: - get_input: port_pd01_port_vlan_requirements + get_input: port_pd01_port_0_vlan_requirements subinterface_indicator: true related_networks: - get_input: port_pd01_port_related_networks + get_input: port_pd01_port_0_related_networks ip_requirements: - get_input: port_pd01_port_ip_requirements + get_input: port_pd01_port_0_ip_requirements network_role_tag: - get_input: port_pd01_port_network_role_tag + get_input: port_pd01_port_0_network_role_tag mac_requirements: - get_input: port_pd01_port_mac_requirements + get_input: port_pd01_port_0_mac_requirements order: - get_input: port_pd01_port_order + get_input: port_pd01_port_0_order network_role: - get_input: port_pd01_port_network_role + get_input: port_pd01_port_0_network_role subnetpoolid: - get_input: port_pd01_port_subnetpoolid + get_input: port_pd01_port_0_subnetpoolid network: get_input: - - port_pd01_port_network + - port_pd01_port_0_network - index_value requirements: - binding: @@ -171,15 +171,15 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server capabilities: + binding_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - binding scalable_pd_server: - pd_server - scalable disk.read.bytes.rate_pd_server: - pd_server - disk.read.bytes.rate - feature_template_Vlan_1_pd_server_pd01_port_nested: - - pd_server_pd01_port_nested - - feature_template_Vlan_1 memory.usage_pd_server: - pd_server - memory.usage @@ -189,18 +189,15 @@ topology_template: disk.device.usage_pd_server: - pd_server - disk.device.usage - network.outgoing.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.packets.rate os_pd_server: - pd_server - os disk.write.bytes.rate_pd_server: - pd_server - disk.write.bytes.rate - network.incoming.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes + feature_template_Vlan_1_pd_server_pd01_port_0_nested: + - pd_server_pd01_port_0_nested + - feature_template_Vlan_1 cpu_pd_server: - pd_server - cpu @@ -216,9 +213,9 @@ topology_template: disk.device.read.bytes.rate_pd_server: - pd_server - disk.device.read.bytes.rate - network.outgoing.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes + network.incoming.packets_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.packets disk.iops_pd_server: - pd_server - disk.iops @@ -228,27 +225,36 @@ topology_template: cpu.delta_pd_server: - pd_server - cpu.delta - network.incoming.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port + network.incoming.packets.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 - network.incoming.packets.rate + network.incoming.bytes.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.bytes.rate + network.outgoing.packets.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.packets.rate vcpus_pd_server: - pd_server - vcpus disk.device.write.bytes.rate_pd_server: - pd_server - disk.device.write.bytes.rate + attachment_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - attachment disk.device.write.requests_pd_server: - pd_server - disk.device.write.requests endpoint_pd_server: - pd_server - endpoint - attachment_pd_server_pd01_port: - - pd_server_pd01_port - - attachment disk.capacity_pd_server: - pd_server - disk.capacity + forwarder_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - forwarder disk.device.allocation_pd_server: - pd_server - disk.device.allocation @@ -261,27 +267,24 @@ topology_template: disk.read.requests_pd_server: - pd_server - disk.read.requests - feature_pd_server_pd01_port_nested: - - pd_server_pd01_port_nested - - feature + network.outgoing.bytes.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.bytes.rate feature_pd_server: - pd_server - feature disk.usage_pd_server: - pd_server - disk.usage - binding_pd_server_pd01_port: - - pd_server_pd01_port - - binding disk.write.bytes_pd_server: - pd_server - disk.write.bytes - network.incoming.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes.rate - network.incoming.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets + network.outgoing.bytes_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.bytes + network.incoming.bytes_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.bytes disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -294,6 +297,9 @@ topology_template: disk.device.write.bytes_pd_server: - pd_server - disk.device.write.bytes + network.outpoing.packets_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outpoing.packets disk.device.read.requests_pd_server: - pd_server - disk.device.read.requests @@ -303,24 +309,21 @@ topology_template: host_pd_server: - pd_server - host - network.outpoing.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.outpoing.packets - forwarder_pd_server_pd01_port: - - pd_server_pd01_port - - forwarder + feature_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - feature disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate disk.ephemeral.size_pd_server: - pd_server - disk.ephemeral.size + feature_pd_server_pd01_port_0_nested: + - pd_server_pd01_port_0_nested + - feature disk.write.requests_pd_server: - pd_server - disk.write.requests - feature_pd_server_pd01_port: - - pd_server_pd01_port - - feature disk.device.latency_pd_server: - pd_server - disk.device.latency @@ -330,9 +333,6 @@ topology_template: disk.device.capacity_pd_server: - pd_server - disk.device.capacity - network.outgoing.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes.rate disk.device.iops_pd_server: - pd_server - disk.device.iops @@ -340,21 +340,21 @@ topology_template: local_storage_pd_server: - pd_server - local_storage - link_pd_server_pd01_port: - - pd_server_pd01_port - - link - dependency_pd_server_pd01_port: - - pd_server_pd01_port - - dependency - dependency_pd_server_pd01_port_nested: - - pd_server_pd01_port_nested - - dependency dependency_pd_server: - pd_server - dependency - subinterface_link_template_Vlan_1_pd_server_pd01_port_nested: - - pd_server_pd01_port_nested + dependency_pd_server_pd01_port_0_nested: + - pd_server_pd01_port_0_nested + - dependency + subinterface_link_template_Vlan_1_pd_server_pd01_port_0_nested: + - pd_server_pd01_port_0_nested - subinterface_link_template_Vlan_1 - dependency_template_Vlan_1_pd_server_pd01_port_nested: - - pd_server_pd01_port_nested - - dependency_template_Vlan_1 \ No newline at end of file + dependency_template_Vlan_1_pd_server_pd01_port_0_nested: + - pd_server_pd01_port_0_nested + - dependency_template_Vlan_1 + dependency_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - dependency + link_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - link \ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/Nested_ps_serverServiceTemplate.yaml index 6f9292285b..843e8c7d30 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/Nested_ps_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/Nested_ps_serverServiceTemplate.yaml @@ -16,7 +16,7 @@ topology_template: required: true entry_schema: type: string - port_ps01_port_subnetpoolid: + port_ps01_port_0_network_role: type: string required: true compute_ps_server_availability_zone: @@ -29,6 +29,11 @@ topology_template: required: true entry_schema: type: string + port_ps01_port_0_network: + type: list + required: true + entry_schema: + type: string index_value: type: integer description: Index value of this substitution service template runtime instance @@ -36,16 +41,21 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_ps01_port_vlan_requirements: + port_ps01_port_0_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.IpRequirements subinterface_nested_service_template_filter_count: type: list required: true entry_schema: type: float + port_ps01_port_0_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements vm_flavor_name: type: string required: true @@ -54,46 +64,36 @@ topology_template: required: true entry_schema: type: string - port_ps01_port_related_networks: - type: list + port_ps01_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_ps01_port_order: + port_ps01_port_0_order: type: integer required: true vm_image_name: type: string required: true - port_ps01_port_network_role: + port_ps01_port_0_network_role_tag: type: string required: true - port_ps01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_ps01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_ps01_port_0_subnetpoolid: + type: string required: true - port_ps01_port_network: + port_ps01_port_0_related_networks: type: list required: true entry_schema: - type: string + type: org.openecomp.datatypes.network.RelatedNetworksAssignments subinterface_nested_net1: type: list required: true entry_schema: type: string - port_ps01_port_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_ps01_port_network_role_tag: - type: string - required: true - port_ps01_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true node_templates: - ps_server_ps01_port_nested: + ps_server_ps01_port_0_nested: type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested directives: - substitutable @@ -116,91 +116,82 @@ topology_template: requirements: - binding_template_Vlan_1: capability: tosca.capabilities.network.Bindable - node: ps_server_ps01_port + node: ps_server_ps01_port_0 relationship: tosca.relationships.network.BindsTo - ps_server: - type: org.openecomp.resource.vfc.compute.nodes.heat.ps_server - properties: - availability_zone: - get_input: - - compute_ps_server_availability_zone - - index_value - flavor: - get_input: vm_flavor_name - image: - get_input: vm_image_name - name: - get_input: - - compute_ps_server_name - - index_value - user_data_format: - get_input: - - compute_ps_server_user_data_format - - index_value - ps_server_ps01_port: + ps_server_ps01_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_ps01_port_exCP_naming + get_input: port_ps01_port_0_exCP_naming vlan_requirements: - get_input: port_ps01_port_vlan_requirements + get_input: port_ps01_port_0_vlan_requirements subinterface_indicator: true related_networks: - get_input: port_ps01_port_related_networks + get_input: port_ps01_port_0_related_networks ip_requirements: - get_input: port_ps01_port_ip_requirements + get_input: port_ps01_port_0_ip_requirements network_role_tag: - get_input: port_ps01_port_network_role_tag + get_input: port_ps01_port_0_network_role_tag mac_requirements: - get_input: port_ps01_port_mac_requirements + get_input: port_ps01_port_0_mac_requirements order: - get_input: port_ps01_port_order + get_input: port_ps01_port_0_order network_role: - get_input: port_ps01_port_network_role + get_input: port_ps01_port_0_network_role subnetpoolid: - get_input: port_ps01_port_subnetpoolid + get_input: port_ps01_port_0_subnetpoolid network: get_input: - - port_ps01_port_network + - port_ps01_port_0_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: ps_server relationship: tosca.relationships.network.BindsTo + ps_server: + type: org.openecomp.resource.vfc.compute.nodes.heat.ps_server + properties: + availability_zone: + get_input: + - compute_ps_server_availability_zone + - index_value + flavor: + get_input: vm_flavor_name + image: + get_input: vm_image_name + name: + get_input: + - compute_ps_server_name + - index_value + user_data_format: + get_input: + - compute_ps_server_user_data_format + - index_value substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.ps_server capabilities: - network.incoming.packets.rate_ps_server_ps01_port: - - ps_server_ps01_port - - network.incoming.packets.rate instance_ps_server: - ps_server - instance - network.outpoing.packets_ps_server_ps01_port: - - ps_server_ps01_port - - network.outpoing.packets + network.incoming.packets_ps_server_ps01_port_0: + - ps_server_ps01_port_0 + - network.incoming.packets host_ps_server: - ps_server - host - network.incoming.packets_ps_server_ps01_port: - - ps_server_ps01_port - - network.incoming.packets cpu.delta_ps_server: - ps_server - cpu.delta disk.write.bytes.rate_ps_server: - ps_server - disk.write.bytes.rate - feature_ps_server_ps01_port_nested: - - ps_server_ps01_port_nested - - feature - feature_ps_server_ps01_port: - - ps_server_ps01_port - - feature feature_ps_server: - ps_server - feature + feature_ps_server_ps01_port_0: + - ps_server_ps01_port_0 + - feature disk.root.size_ps_server: - ps_server - disk.root.size @@ -222,9 +213,6 @@ topology_template: disk.device.iops_ps_server: - ps_server - disk.device.iops - network.outgoing.packets.rate_ps_server_ps01_port: - - ps_server_ps01_port - - network.outgoing.packets.rate disk.device.latency_ps_server: - ps_server - disk.device.latency @@ -258,26 +246,29 @@ topology_template: disk.device.read.bytes.rate_ps_server: - ps_server - disk.device.read.bytes.rate + network.outpoing.packets_ps_server_ps01_port_0: + - ps_server_ps01_port_0 + - network.outpoing.packets cpu_util_ps_server: - ps_server - cpu_util memory.resident_ps_server: - ps_server - memory.resident - network.incoming.bytes_ps_server_ps01_port: - - ps_server_ps01_port - - network.incoming.bytes + feature_template_Vlan_1_ps_server_ps01_port_0_nested: + - ps_server_ps01_port_0_nested + - feature_template_Vlan_1 disk.device.read.requests_ps_server: - ps_server - disk.device.read.requests disk.write.bytes_ps_server: - ps_server - disk.write.bytes - feature_template_Vlan_1_ps_server_ps01_port_nested: - - ps_server_ps01_port_nested - - feature_template_Vlan_1 - network.outgoing.bytes.rate_ps_server_ps01_port: - - ps_server_ps01_port + network.incoming.bytes_ps_server_ps01_port_0: + - ps_server_ps01_port_0 + - network.incoming.bytes + network.outgoing.bytes.rate_ps_server_ps01_port_0: + - ps_server_ps01_port_0 - network.outgoing.bytes.rate disk.device.write.requests.rate_ps_server: - ps_server @@ -294,20 +285,20 @@ topology_template: binding_ps_server: - ps_server - binding - attachment_ps_server_ps01_port: - - ps_server_ps01_port - - attachment + feature_ps_server_ps01_port_0_nested: + - ps_server_ps01_port_0_nested + - feature os_ps_server: - ps_server - os disk.device.usage_ps_server: - ps_server - disk.device.usage - binding_ps_server_ps01_port: - - ps_server_ps01_port + binding_ps_server_ps01_port_0: + - ps_server_ps01_port_0 - binding - forwarder_ps_server_ps01_port: - - ps_server_ps01_port + forwarder_ps_server_ps01_port_0: + - ps_server_ps01_port_0 - forwarder disk.device.write.bytes.rate_ps_server: - ps_server @@ -315,6 +306,9 @@ topology_template: vcpus_ps_server: - ps_server - vcpus + attachment_ps_server_ps01_port_0: + - ps_server_ps01_port_0 + - attachment disk.usage_ps_server: - ps_server - disk.usage @@ -327,34 +321,40 @@ topology_template: disk.capacity_ps_server: - ps_server - disk.capacity - network.incoming.bytes.rate_ps_server_ps01_port: - - ps_server_ps01_port - - network.incoming.bytes.rate + network.outgoing.bytes_ps_server_ps01_port_0: + - ps_server_ps01_port_0 + - network.outgoing.bytes + network.outgoing.packets.rate_ps_server_ps01_port_0: + - ps_server_ps01_port_0 + - network.outgoing.packets.rate disk.device.allocation_ps_server: - ps_server - disk.device.allocation - network.outgoing.bytes_ps_server_ps01_port: - - ps_server_ps01_port - - network.outgoing.bytes + network.incoming.packets.rate_ps_server_ps01_port_0: + - ps_server_ps01_port_0 + - network.incoming.packets.rate + network.incoming.bytes.rate_ps_server_ps01_port_0: + - ps_server_ps01_port_0 + - network.incoming.bytes.rate requirements: - subinterface_link_template_Vlan_1_ps_server_ps01_port_nested: - - ps_server_ps01_port_nested + dependency_ps_server_ps01_port_0_nested: + - ps_server_ps01_port_0_nested + - dependency + subinterface_link_template_Vlan_1_ps_server_ps01_port_0_nested: + - ps_server_ps01_port_0_nested - subinterface_link_template_Vlan_1 + dependency_template_Vlan_1_ps_server_ps01_port_0_nested: + - ps_server_ps01_port_0_nested + - dependency_template_Vlan_1 dependency_ps_server: - ps_server - dependency - dependency_ps_server_ps01_port_nested: - - ps_server_ps01_port_nested + dependency_ps_server_ps01_port_0: + - ps_server_ps01_port_0 - dependency - link_ps_server_ps01_port: - - ps_server_ps01_port + link_ps_server_ps01_port_0: + - ps_server_ps01_port_0 - link - dependency_ps_server_ps01_port: - - ps_server_ps01_port - - dependency - dependency_template_Vlan_1_ps_server_ps01_port_nested: - - ps_server_ps01_port_nested - - dependency_template_Vlan_1 local_storage_ps_server: - ps_server - local_storage \ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/GlobalSubstitutionTypesServiceTemplate.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/GlobalSubstitutionTypesServiceTemplate.yaml index 0924527c8d..f31af57507 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/GlobalSubstitutionTypesServiceTemplate.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/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,6 +8,12 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_pd01_port_1_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements index_value: type: integer description: Index value of this substitution service template runtime instance @@ -28,11 +34,11 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd01_port_1_order: + type: integer required: true status: SUPPORTED - port_pd01_port_related_networks: + port_pd01_port_1_related_networks: type: list required: true status: SUPPORTED @@ -42,48 +48,42 @@ node_types: type: string required: true status: SUPPORTED - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - vm_image_name: + port_pd01_port_1_network_role: type: string required: true status: SUPPORTED - port_pd01_port_ip_requirements: + port_pd01_port_1_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: - type: list + type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: string - port_pd01_port_order: - type: integer + port_pd01_port_1_subnetpoolid: + type: string required: true status: SUPPORTED - port_pd01_port_subnetpoolid: + vm_image_name: type: string required: true status: SUPPORTED - port_pd01_port_network_role: - type: string + port_pd01_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_pd01_port_network_role_tag: + port_pd01_port_1_network_role_tag: type: string required: true status: SUPPORTED - port_pd01_port_vlan_requirements: + port_pd01_port_1_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: string compute_pd_server_user_data_format: type: list required: true @@ -105,14 +105,14 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pd01_port: + - dependency_pd_server_pd01_port_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd01_port: + - link_pd_server_pd01_port_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -130,6 +130,14 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_pd_server_pd01_port_1: + 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 memory.usage_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -148,12 +156,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pd01_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 os_pd_server: type: tosca.capabilities.OperatingSystem occurrences: @@ -165,12 +167,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd01_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_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -201,13 +197,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd01_port: + disk.iops_pd_server: 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.iops_pd_server: + network.incoming.packets.rate_pd_server_pd01_port_1: + 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_pd_server_pd01_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -225,7 +227,12 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pd01_port: + attachment_pd_server_pd01_port_1: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + network.outgoing.packets.rate_pd_server_pd01_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -254,12 +261,18 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pd01_port: - type: tosca.capabilities.Attachment + disk.capacity_pd_server: + 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_pd_server: + forwarder_pd_server_pd01_port_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets_pd_server_pd01_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -288,6 +301,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes.rate_pd_server_pd01_port_1: + 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_pd_server: type: tosca.capabilities.Node occurrences: @@ -299,27 +318,19 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_pd01_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 - disk.write.bytes_pd_server: + network.incoming.bytes_pd_server_pd01_port_1: 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_pd_server_pd01_port: + disk.write.bytes_pd_server: 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_pd_server_pd01_port: + network.outgoing.bytes_pd_server_pd01_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -349,6 +360,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_pd_server_pd01_port_1: + 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_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -368,14 +385,8 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pd01_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 - forwarder_pd_server_pd01_port: - type: org.openecomp.capabilities.Forwarder + feature_pd_server_pd01_port_1: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -397,11 +408,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_pd01_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.device.latency_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -420,12 +426,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pd01_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.device.iops_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -435,77 +435,81 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server_1: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 + port_pd01_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true status: SUPPORTED - constraints: - - greater_or_equal: 0 - compute_pd_server_availability_zone: + port_pd01_port_0_network: type: list required: true status: SUPPORTED entry_schema: type: string - compute_pd_server_name: + port_pd01_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role_tag: + type: string required: true status: SUPPORTED - subinterface_nested_service_template_filter_count: - type: list + port_pd01_port_0_network_role: + type: string required: true status: SUPPORTED - entry_schema: - type: float - port_pd01_port_related_networks: + port_pd01_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - vm_flavor_name: - type: string + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + status: SUPPORTED + constraints: + - greater_or_equal: 0 + compute_pd_server_availability_zone: + type: list required: true status: SUPPORTED - subinterface_nested_p1: + entry_schema: + type: string + compute_pd_server_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + subinterface_nested_service_template_filter_count: + type: list required: true status: SUPPORTED - vm_image_name: + entry_schema: + type: float + vm_flavor_name: type: string required: true status: SUPPORTED - port_pd01_port_ip_requirements: - type: list + port_pd01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + subinterface_nested_p1: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd01_port_order: + port_pd01_port_0_order: type: integer required: true status: SUPPORTED - port_pd01_port_subnetpoolid: + vm_image_name: type: string required: true status: SUPPORTED @@ -515,20 +519,16 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_network_role: - type: string - required: true - status: SUPPORTED - port_pd01_port_network_role_tag: - type: string - required: true - status: SUPPORTED - port_pd01_port_vlan_requirements: + port_pd01_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_0_subnetpoolid: + type: string + required: true + status: SUPPORTED compute_pd_server_user_data_format: type: list required: true @@ -536,54 +536,62 @@ node_types: entry_schema: type: string requirements: - - dependency_pd_server_pd01_port_nested: + - dependency_pd_server: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - dependency_template_Vlan_vmi_1_pd_server_pd01_port_nested: + - local_storage_pd_server: + capability: tosca.capabilities.Attachment + node: tosca.nodes.BlockStorage + relationship: tosca.relationships.AttachesTo + occurrences: + - 0 + - UNBOUNDED + - dependency_pd_server_pd01_port_0_nested: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - subinterface_link_template_Vlan_vmi_1_pd_server_pd01_port_nested: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - - dependency_pd_server: + - dependency_template_Vlan_vmi_1_pd_server_pd01_port_0_nested: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - local_storage_pd_server: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo + - subinterface_link_template_Vlan_vmi_1_pd_server_pd01_port_0_nested: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo occurrences: - - 0 - - UNBOUNDED - - dependency_pd_server_pd01_port: + - 1 + - 1 + - dependency_pd_server_pd01_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd01_port: + - link_pd_server_pd01_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: + binding_pd_server_pd01_port_0: + 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 scalable_pd_server: type: tosca.capabilities.Scalable occurrences: @@ -613,12 +621,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pd01_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 os_pd_server: type: tosca.capabilities.OperatingSystem occurrences: @@ -630,21 +632,20 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd01_port: + cpu_pd_server: 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_pd_server: + cpu_util_pd_server: 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_pd_server: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_template_Vlan_vmi_1_pd_server_pd01_port_0_nested: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -666,7 +667,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd01_port: + network.incoming.packets_pd_server_pd01_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -690,7 +691,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pd01_port: + network.incoming.packets.rate_pd_server_pd01_port_0: + 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_pd_server_pd01_port_0: + 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.packets.rate_pd_server_pd01_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -708,6 +721,11 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_pd_server_pd01_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED disk.device.write.requests_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -719,19 +737,14 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pd01_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED disk.capacity_pd_server: 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_template_Vlan_vmi_1_pd_server_pd01_port_nested: - type: tosca.capabilities.Node + forwarder_pd_server_pd01_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED @@ -758,8 +771,9 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_pd01_port_nested: - type: tosca.capabilities.Node + network.outgoing.bytes.rate_pd_server_pd01_port_0: + 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 @@ -774,27 +788,19 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_pd01_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 disk.write.bytes_pd_server: 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_pd_server_pd01_port: + network.outgoing.bytes_pd_server_pd01_port_0: 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_pd_server_pd01_port: + network.incoming.bytes_pd_server_pd01_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -824,6 +830,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_pd_server_pd01_port_0: + 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_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -843,14 +855,8 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pd01_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 - forwarder_pd_server_pd01_port: - type: org.openecomp.capabilities.Forwarder + feature_pd_server_pd01_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -866,36 +872,30 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.write.requests_pd_server: - 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_pd_server_pd01_port: + feature_pd_server_pd01_port_0_nested: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.device.latency_pd_server: + disk.write.requests_pd_server: 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_pd_server: + disk.device.latency_pd_server: 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_pd_server: + disk.latency_pd_server: 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_pd_server_pd01_port: + disk.device.capacity_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: 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 e873e659f2..4fef6d6222 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 @@ -708,6 +708,12 @@ topology_template: directives: - substitutable properties: + port_pd01_port_1_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: @@ -716,20 +722,14 @@ topology_template: - 1 vm_flavor_name: get_input: pd_flavor_name - port_pd01_port_mac_requirements: + port_pd01_port_1_mac_requirements: mac_count_required: is_required: false vm_image_name: get_input: pd_image_name - port_pd01_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false - port_pd01_port_network: + port_pd01_port_1_network_role_tag: oam + port_pd01_port_1_network: - get_input: oam_net_name - port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW service_template_filter: @@ -745,6 +745,18 @@ topology_template: directives: - substitutable properties: + port_pd01_port_0_mac_requirements: + mac_count_required: + is_required: false + port_pd01_port_0_network: + - get_input: oam_net_name + port_pd01_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_pd01_port_0_network_role_tag: oam compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: @@ -757,22 +769,10 @@ topology_template: get_input: pd_flavor_name subinterface_nested_p1: - pd01_port_0 - port_pd01_port_mac_requirements: - mac_count_required: - is_required: false vm_image_name: get_input: pd_image_name - port_pd01_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false - port_pd01_port_network: - - get_input: oam_net_name subinterface_nested_net1: - test_net1 - port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW service_template_filter: @@ -784,7 +784,7 @@ topology_template: - service_template_filter - index_value requirements: - - subinterface_link_template_Vlan_vmi_1_pd_server_pd01_port_nested: + - subinterface_link_template_Vlan_vmi_1_pd_server_pd01_port_0_nested: capability: tosca.capabilities.network.Linkable node: test_net1 relationship: tosca.relationships.network.LinksTo @@ -798,4 +798,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/onePortIsConnectedWithSubInf/out/Nested_pd_serverServiceTemplate.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/Nested_pd_serverServiceTemplate.yaml index 2d01270aaf..734675faec 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/Nested_pd_serverServiceTemplate.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/Nested_pd_serverServiceTemplate.yaml @@ -11,6 +11,11 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pd01_port_1_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements index_value: type: integer description: Index value of this substitution service template runtime instance @@ -28,10 +33,10 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd01_port_1_order: + type: integer required: true - port_pd01_port_related_networks: + port_pd01_port_1_related_networks: type: list required: true entry_schema: @@ -39,39 +44,34 @@ topology_template: vm_flavor_name: type: string required: true - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - vm_image_name: + port_pd01_port_1_network_role: type: string required: true - port_pd01_port_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + port_pd01_port_1_vlan_requirements: type: list required: true entry_schema: - type: string - port_pd01_port_order: - type: integer + type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_pd01_port_subnetpoolid: + port_pd01_port_1_subnetpoolid: type: string required: true - port_pd01_port_network_role: + vm_image_name: type: string required: true - port_pd01_port_network_role_tag: + port_pd01_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_pd01_port_1_network_role_tag: type: string required: true - port_pd01_port_vlan_requirements: + port_pd01_port_1_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: string compute_pd_server_user_data_format: type: list required: true @@ -97,31 +97,31 @@ topology_template: get_input: - compute_pd_server_user_data_format - index_value - pd_server_pd01_port: + pd_server_pd01_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd01_port_exCP_naming + get_input: port_pd01_port_1_exCP_naming vlan_requirements: - get_input: port_pd01_port_vlan_requirements + get_input: port_pd01_port_1_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_pd01_port_related_networks + get_input: port_pd01_port_1_related_networks ip_requirements: - get_input: port_pd01_port_ip_requirements + get_input: port_pd01_port_1_ip_requirements network_role_tag: - get_input: port_pd01_port_network_role_tag + get_input: port_pd01_port_1_network_role_tag mac_requirements: - get_input: port_pd01_port_mac_requirements + get_input: port_pd01_port_1_mac_requirements order: - get_input: port_pd01_port_order + get_input: port_pd01_port_1_order network_role: - get_input: port_pd01_port_network_role + get_input: port_pd01_port_1_network_role subnetpoolid: - get_input: port_pd01_port_subnetpoolid + get_input: port_pd01_port_1_subnetpoolid network: get_input: - - port_pd01_port_network + - port_pd01_port_1_network - index_value requirements: - binding: @@ -137,6 +137,9 @@ topology_template: disk.read.bytes.rate_pd_server: - pd_server - disk.read.bytes.rate + binding_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - binding memory.usage_pd_server: - pd_server - memory.usage @@ -146,18 +149,12 @@ topology_template: disk.device.usage_pd_server: - pd_server - disk.device.usage - network.outgoing.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.packets.rate os_pd_server: - pd_server - os disk.write.bytes.rate_pd_server: - pd_server - disk.write.bytes.rate - network.incoming.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes cpu_pd_server: - pd_server - cpu @@ -173,21 +170,27 @@ topology_template: disk.device.read.bytes.rate_pd_server: - pd_server - disk.device.read.bytes.rate - network.outgoing.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes disk.iops_pd_server: - pd_server - disk.iops + network.incoming.packets.rate_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - network.incoming.packets.rate + network.incoming.bytes.rate_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - network.incoming.bytes.rate memory.resident_pd_server: - pd_server - memory.resident cpu.delta_pd_server: - pd_server - cpu.delta - network.incoming.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets.rate + attachment_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - attachment + network.outgoing.packets.rate_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - network.outgoing.packets.rate vcpus_pd_server: - pd_server - vcpus @@ -200,12 +203,15 @@ topology_template: endpoint_pd_server: - pd_server - endpoint - attachment_pd_server_pd01_port: - - pd_server_pd01_port - - attachment disk.capacity_pd_server: - pd_server - disk.capacity + forwarder_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - forwarder + network.incoming.packets_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - network.incoming.packets disk.device.allocation_pd_server: - pd_server - disk.device.allocation @@ -218,24 +224,24 @@ topology_template: disk.read.requests_pd_server: - pd_server - disk.read.requests + network.outgoing.bytes.rate_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - network.outgoing.bytes.rate feature_pd_server: - pd_server - feature disk.usage_pd_server: - pd_server - disk.usage - binding_pd_server_pd01_port: - - pd_server_pd01_port - - binding + network.incoming.bytes_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - network.incoming.bytes disk.write.bytes_pd_server: - pd_server - disk.write.bytes - network.incoming.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes.rate - network.incoming.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets + network.outgoing.bytes_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - network.outgoing.bytes disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -248,6 +254,9 @@ topology_template: disk.device.write.bytes_pd_server: - pd_server - disk.device.write.bytes + network.outpoing.packets_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - network.outpoing.packets disk.device.read.requests_pd_server: - pd_server - disk.device.read.requests @@ -257,12 +266,9 @@ topology_template: host_pd_server: - pd_server - host - network.outpoing.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.outpoing.packets - forwarder_pd_server_pd01_port: - - pd_server_pd01_port - - forwarder + feature_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - feature disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate @@ -272,9 +278,6 @@ topology_template: disk.write.requests_pd_server: - pd_server - disk.write.requests - feature_pd_server_pd01_port: - - pd_server_pd01_port - - feature disk.device.latency_pd_server: - pd_server - disk.device.latency @@ -284,9 +287,6 @@ topology_template: disk.device.capacity_pd_server: - pd_server - disk.device.capacity - network.outgoing.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes.rate disk.device.iops_pd_server: - pd_server - disk.device.iops @@ -294,12 +294,12 @@ topology_template: local_storage_pd_server: - pd_server - local_storage - link_pd_server_pd01_port: - - pd_server_pd01_port - - link - dependency_pd_server_pd01_port: - - pd_server_pd01_port + dependency_pd_server_pd01_port_1: + - pd_server_pd01_port_1 - dependency dependency_pd_server: - pd_server - - dependency \ No newline at end of file + - dependency + link_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - link \ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/Nested_pd_server_1ServiceTemplate.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/Nested_pd_server_1ServiceTemplate.yaml index dc53df8166..16c362eacb 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/Nested_pd_server_1ServiceTemplate.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/Nested_pd_server_1ServiceTemplate.yaml @@ -11,6 +11,30 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pd01_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_pd01_port_0_network: + type: list + required: true + entry_schema: + type: string + port_pd01_port_0_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role_tag: + type: string + required: true + port_pd01_port_0_network_role: + type: string + required: true + port_pd01_port_0_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments index_value: type: integer description: Index value of this substitution service template runtime instance @@ -28,47 +52,26 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true subinterface_nested_service_template_filter_count: type: list required: true entry_schema: type: float - port_pd01_port_related_networks: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true - subinterface_nested_p1: - type: list - required: true - entry_schema: - type: string - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - vm_image_name: - type: string - required: true - port_pd01_port_ip_requirements: - type: list + port_pd01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + subinterface_nested_p1: type: list required: true entry_schema: type: string - port_pd01_port_order: + port_pd01_port_0_order: type: integer required: true - port_pd01_port_subnetpoolid: + vm_image_name: type: string required: true subinterface_nested_net1: @@ -76,24 +79,40 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_network_role: - type: string - required: true - port_pd01_port_network_role_tag: - type: string - required: true - port_pd01_port_vlan_requirements: + port_pd01_port_0_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_0_subnetpoolid: + type: string + required: true compute_pd_server_user_data_format: type: list required: true entry_schema: type: string node_templates: - pd_server_pd01_port_nested: + pd_server: + type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server + properties: + availability_zone: + get_input: + - compute_pd_server_availability_zone + - index_value + flavor: + get_input: vm_flavor_name + image: + get_input: vm_image_name + name: + get_input: + - compute_pd_server_name + - index_value + user_data_format: + get_input: + - compute_pd_server_user_data_format + - index_value + pd_server_pd01_port_0_nested: type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested directives: - substitutable @@ -116,52 +135,33 @@ topology_template: requirements: - binding_template_Vlan_vmi_1: capability: tosca.capabilities.network.Bindable - node: pd_server_pd01_port + node: pd_server_pd01_port_0 relationship: tosca.relationships.network.BindsTo - pd_server: - type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server - properties: - availability_zone: - get_input: - - compute_pd_server_availability_zone - - index_value - flavor: - get_input: vm_flavor_name - image: - get_input: vm_image_name - name: - get_input: - - compute_pd_server_name - - index_value - user_data_format: - get_input: - - compute_pd_server_user_data_format - - index_value - pd_server_pd01_port: + pd_server_pd01_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd01_port_exCP_naming + get_input: port_pd01_port_0_exCP_naming vlan_requirements: - get_input: port_pd01_port_vlan_requirements + get_input: port_pd01_port_0_vlan_requirements subinterface_indicator: true related_networks: - get_input: port_pd01_port_related_networks + get_input: port_pd01_port_0_related_networks ip_requirements: - get_input: port_pd01_port_ip_requirements + get_input: port_pd01_port_0_ip_requirements network_role_tag: - get_input: port_pd01_port_network_role_tag + get_input: port_pd01_port_0_network_role_tag mac_requirements: - get_input: port_pd01_port_mac_requirements + get_input: port_pd01_port_0_mac_requirements order: - get_input: port_pd01_port_order + get_input: port_pd01_port_0_order network_role: - get_input: port_pd01_port_network_role + get_input: port_pd01_port_0_network_role subnetpoolid: - get_input: port_pd01_port_subnetpoolid + get_input: port_pd01_port_0_subnetpoolid network: get_input: - - port_pd01_port_network + - port_pd01_port_0_network - index_value requirements: - binding: @@ -171,6 +171,9 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server_1 capabilities: + binding_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - binding scalable_pd_server: - pd_server - scalable @@ -186,24 +189,21 @@ topology_template: disk.device.usage_pd_server: - pd_server - disk.device.usage - network.outgoing.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.packets.rate os_pd_server: - pd_server - os disk.write.bytes.rate_pd_server: - pd_server - disk.write.bytes.rate - network.incoming.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes cpu_pd_server: - pd_server - cpu cpu_util_pd_server: - pd_server - cpu_util + feature_template_Vlan_vmi_1_pd_server_pd01_port_0_nested: + - pd_server_pd01_port_0_nested + - feature_template_Vlan_vmi_1 disk.device.write.requests.rate_pd_server: - pd_server - disk.device.write.requests.rate @@ -213,9 +213,9 @@ topology_template: disk.device.read.bytes.rate_pd_server: - pd_server - disk.device.read.bytes.rate - network.outgoing.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes + network.incoming.packets_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.packets disk.iops_pd_server: - pd_server - disk.iops @@ -225,30 +225,36 @@ topology_template: cpu.delta_pd_server: - pd_server - cpu.delta - network.incoming.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port + network.incoming.packets.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 - network.incoming.packets.rate + network.incoming.bytes.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.bytes.rate + network.outgoing.packets.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.packets.rate vcpus_pd_server: - pd_server - vcpus disk.device.write.bytes.rate_pd_server: - pd_server - disk.device.write.bytes.rate + attachment_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - attachment disk.device.write.requests_pd_server: - pd_server - disk.device.write.requests endpoint_pd_server: - pd_server - endpoint - attachment_pd_server_pd01_port: - - pd_server_pd01_port - - attachment disk.capacity_pd_server: - pd_server - disk.capacity - feature_template_Vlan_vmi_1_pd_server_pd01_port_nested: - - pd_server_pd01_port_nested - - feature_template_Vlan_vmi_1 + forwarder_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - forwarder disk.device.allocation_pd_server: - pd_server - disk.device.allocation @@ -261,27 +267,24 @@ topology_template: disk.read.requests_pd_server: - pd_server - disk.read.requests - feature_pd_server_pd01_port_nested: - - pd_server_pd01_port_nested - - feature + network.outgoing.bytes.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.bytes.rate feature_pd_server: - pd_server - feature disk.usage_pd_server: - pd_server - disk.usage - binding_pd_server_pd01_port: - - pd_server_pd01_port - - binding disk.write.bytes_pd_server: - pd_server - disk.write.bytes - network.incoming.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes.rate - network.incoming.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets + network.outgoing.bytes_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.bytes + network.incoming.bytes_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.bytes disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -294,6 +297,9 @@ topology_template: disk.device.write.bytes_pd_server: - pd_server - disk.device.write.bytes + network.outpoing.packets_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outpoing.packets disk.device.read.requests_pd_server: - pd_server - disk.device.read.requests @@ -303,24 +309,21 @@ topology_template: host_pd_server: - pd_server - host - network.outpoing.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.outpoing.packets - forwarder_pd_server_pd01_port: - - pd_server_pd01_port - - forwarder + feature_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - feature disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate disk.ephemeral.size_pd_server: - pd_server - disk.ephemeral.size + feature_pd_server_pd01_port_0_nested: + - pd_server_pd01_port_0_nested + - feature disk.write.requests_pd_server: - pd_server - disk.write.requests - feature_pd_server_pd01_port: - - pd_server_pd01_port - - feature disk.device.latency_pd_server: - pd_server - disk.device.latency @@ -330,9 +333,6 @@ topology_template: disk.device.capacity_pd_server: - pd_server - disk.device.capacity - network.outgoing.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes.rate disk.device.iops_pd_server: - pd_server - disk.device.iops @@ -340,21 +340,21 @@ topology_template: local_storage_pd_server: - pd_server - local_storage - link_pd_server_pd01_port: - - pd_server_pd01_port - - link - dependency_pd_server_pd01_port: - - pd_server_pd01_port - - dependency - dependency_pd_server_pd01_port_nested: - - pd_server_pd01_port_nested - - dependency + subinterface_link_template_Vlan_vmi_1_pd_server_pd01_port_0_nested: + - pd_server_pd01_port_0_nested + - subinterface_link_template_Vlan_vmi_1 + dependency_template_Vlan_vmi_1_pd_server_pd01_port_0_nested: + - pd_server_pd01_port_0_nested + - dependency_template_Vlan_vmi_1 dependency_pd_server: - pd_server - dependency - dependency_template_Vlan_vmi_1_pd_server_pd01_port_nested: - - pd_server_pd01_port_nested - - dependency_template_Vlan_vmi_1 - subinterface_link_template_Vlan_vmi_1_pd_server_pd01_port_nested: - - pd_server_pd01_port_nested - - subinterface_link_template_Vlan_vmi_1 \ No newline at end of file + dependency_pd_server_pd01_port_0_nested: + - pd_server_pd01_port_0_nested + - dependency + dependency_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - dependency + link_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - link \ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/regularNestedSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/regularNestedSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml index 8a0a77b277..fd261d6cf3 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/regularNestedSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/regularNestedSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,77 +8,81 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 + port_pd01_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true status: SUPPORTED - constraints: - - greater_or_equal: 0 - compute_pd_server_availability_zone: + port_pd01_port_0_network: type: list required: true status: SUPPORTED entry_schema: type: string - compute_pd_server_name: + port_pd01_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role_tag: + type: string required: true status: SUPPORTED - subinterface_nested_service_template_filter_count: - type: list + port_pd01_port_0_network_role: + type: string required: true status: SUPPORTED - entry_schema: - type: float - port_pd01_port_related_networks: + port_pd01_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - vm_flavor_name: - type: string + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + status: SUPPORTED + constraints: + - greater_or_equal: 0 + compute_pd_server_availability_zone: + type: list required: true status: SUPPORTED - subinterface_nested_p1: + entry_schema: + type: string + compute_pd_server_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + subinterface_nested_service_template_filter_count: + type: list required: true status: SUPPORTED - vm_image_name: + entry_schema: + type: float + vm_flavor_name: type: string required: true status: SUPPORTED - port_pd01_port_ip_requirements: - type: list + port_pd01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + subinterface_nested_p1: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd01_port_order: + port_pd01_port_0_order: type: integer required: true status: SUPPORTED - port_pd01_port_subnetpoolid: + vm_image_name: type: string required: true status: SUPPORTED @@ -88,20 +92,16 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_network_role: - type: string - required: true - status: SUPPORTED - port_pd01_port_network_role_tag: - type: string - required: true - status: SUPPORTED - port_pd01_port_vlan_requirements: + port_pd01_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_0_subnetpoolid: + type: string + required: true + status: SUPPORTED compute_pd_server_user_data_format: type: list required: true @@ -109,54 +109,62 @@ node_types: entry_schema: type: string requirements: - - dependency_pd_server_pd01_port_nested: + - dependency_pd_server: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - dependency_template_Vlan_1_pd_server_pd01_port_nested: + - local_storage_pd_server: + capability: tosca.capabilities.Attachment + node: tosca.nodes.BlockStorage + relationship: tosca.relationships.AttachesTo + occurrences: + - 0 + - UNBOUNDED + - dependency_pd_server_pd01_port_0_nested: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - subinterface_link_template_Vlan_1_pd_server_pd01_port_nested: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - - dependency_pd_server: + - dependency_template_Vlan_1_pd_server_pd01_port_0_nested: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - local_storage_pd_server: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo + - subinterface_link_template_Vlan_1_pd_server_pd01_port_0_nested: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo occurrences: - - 0 - - UNBOUNDED - - dependency_pd_server_pd01_port: + - 1 + - 1 + - dependency_pd_server_pd01_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd01_port: + - link_pd_server_pd01_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: + binding_pd_server_pd01_port_0: + 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 scalable_pd_server: type: tosca.capabilities.Scalable occurrences: @@ -168,11 +176,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_template_Vlan_1_pd_server_pd01_port_nested: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED memory.usage_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -191,12 +194,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pd01_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 os_pd_server: type: tosca.capabilities.OperatingSystem occurrences: @@ -208,9 +205,8 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd01_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_template_Vlan_1_pd_server_pd01_port_0_nested: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -244,7 +240,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd01_port: + network.incoming.packets_pd_server_pd01_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -268,7 +264,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pd01_port: + network.incoming.packets.rate_pd_server_pd01_port_0: + 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_pd_server_pd01_port_0: + 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.packets.rate_pd_server_pd01_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -286,6 +294,11 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_pd_server_pd01_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED disk.device.write.requests_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -297,17 +310,17 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pd01_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED disk.capacity_pd_server: 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_pd_server_pd01_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.allocation_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -331,8 +344,9 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_pd01_port_nested: - type: tosca.capabilities.Node + network.outgoing.bytes.rate_pd_server_pd01_port_0: + 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 @@ -347,27 +361,19 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_pd01_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 disk.write.bytes_pd_server: 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_pd_server_pd01_port: + network.outgoing.bytes_pd_server_pd01_port_0: 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_pd_server_pd01_port: + network.incoming.bytes_pd_server_pd01_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -397,6 +403,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_pd_server_pd01_port_0: + 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_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -416,14 +428,8 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pd01_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 - forwarder_pd_server_pd01_port: - type: org.openecomp.capabilities.Forwarder + feature_pd_server_pd01_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -439,36 +445,30 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.write.requests_pd_server: - 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_pd_server_pd01_port: + feature_pd_server_pd01_port_0_nested: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.device.latency_pd_server: + disk.write.requests_pd_server: 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_pd_server: + disk.device.latency_pd_server: 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_pd_server: + disk.latency_pd_server: 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_pd_server_pd01_port: + disk.device.capacity_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -564,7 +564,7 @@ node_types: status: SUPPORTED entry_schema: type: string - port_ps01_port_subnetpoolid: + port_ps01_port_0_network_role: type: string required: true status: SUPPORTED @@ -580,6 +580,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_ps01_port_0_network: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string index_value: type: integer description: Index value of this substitution service template runtime instance @@ -588,18 +594,24 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_ps01_port_vlan_requirements: + port_ps01_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.IpRequirements subinterface_nested_service_template_filter_count: type: list required: true status: SUPPORTED entry_schema: type: float + port_ps01_port_0_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements vm_flavor_name: type: string required: true @@ -610,13 +622,11 @@ node_types: status: SUPPORTED entry_schema: type: string - port_ps01_port_related_networks: - type: list + port_ps01_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_ps01_port_order: + port_ps01_port_0_order: type: integer required: true status: SUPPORTED @@ -624,102 +634,86 @@ node_types: type: string required: true status: SUPPORTED - port_ps01_port_network_role: + port_ps01_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_ps01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_ps01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_ps01_port_network: - type: list + port_ps01_port_0_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: string - subinterface_nested_net1: + port_ps01_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: string - port_ps01_port_ip_requirements: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + subinterface_nested_net1: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_ps01_port_network_role_tag: - type: string - required: true - status: SUPPORTED - port_ps01_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED + type: string requirements: - - dependency_ps_server_ps01_port_nested: + - dependency_ps_server_ps01_port_0_nested: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - dependency_template_Vlan_1_ps_server_ps01_port_nested: + - dependency_template_Vlan_1_ps_server_ps01_port_0_nested: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - subinterface_link_template_Vlan_1_ps_server_ps01_port_nested: + - subinterface_link_template_Vlan_1_ps_server_ps01_port_0_nested: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_ps_server: + - dependency_ps_server_ps01_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - local_storage_ps_server: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo + - link_ps_server_ps01_port_0: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo occurrences: - - 0 - - UNBOUNDED - - dependency_ps_server_ps01_port: + - 1 + - 1 + - dependency_ps_server: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_ps_server_ps01_port: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - capabilities: - network.incoming.packets.rate_ps_server_ps01_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + - local_storage_ps_server: + capability: tosca.capabilities.Attachment + node: tosca.nodes.BlockStorage + relationship: tosca.relationships.AttachesTo occurrences: - - 1 + - 0 - UNBOUNDED + capabilities: instance_ps_server: 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_ps_server_ps01_port: + network.incoming.packets_ps_server_ps01_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -732,12 +726,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_ps_server_ps01_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_ps_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -750,17 +738,12 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_ps_server_ps01_port_nested: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - feature_ps_server_ps01_port: + feature_ps_server: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - feature_ps_server: + feature_ps_server_ps01_port_0: type: tosca.capabilities.Node occurrences: - 1 @@ -807,12 +790,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_ps_server_ps01_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.device.latency_ps_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -878,24 +855,29 @@ node_types: occurrences: - 1 - UNBOUNDED - cpu_util_ps_server: + network.outpoing.packets_ps_server_ps01_port_0: 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_ps_server: + cpu_util_ps_server: 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_ps_server_ps01_port: + memory.resident_ps_server: 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_template_Vlan_1_ps_server_ps01_port_0_nested: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.device.read.requests_ps_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -908,12 +890,13 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_template_Vlan_1_ps_server_ps01_port_nested: - type: tosca.capabilities.Node + network.incoming.bytes_ps_server_ps01_port_0: + 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_ps_server_ps01_port: + network.outgoing.bytes.rate_ps_server_ps01_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -948,8 +931,8 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_ps_server_ps01_port: - type: tosca.capabilities.Attachment + feature_ps_server_ps01_port_0_nested: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -964,7 +947,7 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_ps_server_ps01_port: + binding_ps_server_ps01_port_0: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface @@ -972,7 +955,7 @@ node_types: occurrences: - 0 - UNBOUNDED - forwarder_ps_server_ps01_port: + forwarder_ps_server_ps01_port_0: type: org.openecomp.capabilities.Forwarder occurrences: - 1 @@ -989,6 +972,11 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_ps_server_ps01_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED disk.usage_ps_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1012,7 +1000,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_ps_server_ps01_port: + network.outgoing.bytes_ps_server_ps01_port_0: + 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.packets.rate_ps_server_ps01_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1024,7 +1018,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_ps_server_ps01_port: + network.incoming.packets.rate_ps_server_ps01_port_0: + 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_ps_server_ps01_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/regularNestedSubInterface/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/regularNestedSubInterface/out/MainServiceTemplate.yaml index 22aa789154..192f34f1a4 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/regularNestedSubInterface/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/regularNestedSubInterface/out/MainServiceTemplate.yaml @@ -708,6 +708,18 @@ topology_template: directives: - substitutable properties: + port_pd01_port_0_mac_requirements: + mac_count_required: + is_required: false + port_pd01_port_0_network: + - get_input: oam_net_name + port_pd01_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_pd01_port_0_network_role_tag: oam compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: @@ -718,22 +730,10 @@ topology_template: get_input: pd_flavor_name subinterface_nested_p1: - pd01_port_0 - port_pd01_port_mac_requirements: - mac_count_required: - is_required: false vm_image_name: get_input: pd_image_name - port_pd01_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false - port_pd01_port_network: - - get_input: oam_net_name subinterface_nested_net1: - test_net1 - port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW service_template_filter: @@ -745,7 +745,7 @@ topology_template: - service_template_filter - index_value requirements: - - subinterface_link_template_Vlan_1_pd_server_pd01_port_nested: + - subinterface_link_template_Vlan_1_pd_server_pd01_port_0_nested: capability: tosca.capabilities.network.Linkable node: test_net1 relationship: tosca.relationships.network.LinksTo @@ -762,26 +762,26 @@ topology_template: - get_input: availabilityzone_name compute_ps_server_user_data_format: - RAW + port_ps01_port_0_network: + - get_input: oam_net_name + port_ps01_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false vm_flavor_name: get_input: pd_flavor_name subinterface_nested_p1: - ps01_port_0 - vm_image_name: - get_input: pd_image_name - port_ps01_port_mac_requirements: + port_ps01_port_0_mac_requirements: mac_count_required: is_required: false - port_ps01_port_network: - - get_input: oam_net_name + vm_image_name: + get_input: pd_image_name + port_ps01_port_0_network_role_tag: oam subinterface_nested_net1: - test_net1 - port_ps01_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false - port_ps01_port_network_role_tag: oam service_template_filter: substitute_service_template: Nested_ps_serverServiceTemplate.yaml count: 1 @@ -791,7 +791,7 @@ topology_template: - service_template_filter - index_value requirements: - - subinterface_link_template_Vlan_1_ps_server_ps01_port_nested: + - subinterface_link_template_Vlan_1_ps_server_ps01_port_0_nested: capability: tosca.capabilities.network.Linkable node: test_net1 relationship: tosca.relationships.network.LinksTo @@ -805,4 +805,4 @@ topology_template: - test_net2 - test_net1 - abstract_pd_server - - abstract_ps_server + - abstract_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/subinterface/vlantagging/pattern1b/regularNestedSubInterface/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/regularNestedSubInterface/out/Nested_pd_serverServiceTemplate.yaml index 92f4690704..162ffbde33 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/regularNestedSubInterface/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/regularNestedSubInterface/out/Nested_pd_serverServiceTemplate.yaml @@ -11,6 +11,30 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pd01_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_pd01_port_0_network: + type: list + required: true + entry_schema: + type: string + port_pd01_port_0_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role_tag: + type: string + required: true + port_pd01_port_0_network_role: + type: string + required: true + port_pd01_port_0_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments index_value: type: integer description: Index value of this substitution service template runtime instance @@ -28,47 +52,26 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true subinterface_nested_service_template_filter_count: type: list required: true entry_schema: type: float - port_pd01_port_related_networks: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true - subinterface_nested_p1: - type: list - required: true - entry_schema: - type: string - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - vm_image_name: - type: string - required: true - port_pd01_port_ip_requirements: - type: list + port_pd01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + subinterface_nested_p1: type: list required: true entry_schema: type: string - port_pd01_port_order: + port_pd01_port_0_order: type: integer required: true - port_pd01_port_subnetpoolid: + vm_image_name: type: string required: true subinterface_nested_net1: @@ -76,24 +79,40 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_network_role: - type: string - required: true - port_pd01_port_network_role_tag: - type: string - required: true - port_pd01_port_vlan_requirements: + port_pd01_port_0_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_0_subnetpoolid: + type: string + required: true compute_pd_server_user_data_format: type: list required: true entry_schema: type: string node_templates: - pd_server_pd01_port_nested: + pd_server: + type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server + properties: + availability_zone: + get_input: + - compute_pd_server_availability_zone + - index_value + flavor: + get_input: vm_flavor_name + image: + get_input: vm_image_name + name: + get_input: + - compute_pd_server_name + - index_value + user_data_format: + get_input: + - compute_pd_server_user_data_format + - index_value + pd_server_pd01_port_0_nested: type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested directives: - substitutable @@ -115,52 +134,33 @@ topology_template: requirements: - binding_template_Vlan_1: capability: tosca.capabilities.network.Bindable - node: pd_server_pd01_port + node: pd_server_pd01_port_0 relationship: tosca.relationships.network.BindsTo - pd_server: - type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server - properties: - availability_zone: - get_input: - - compute_pd_server_availability_zone - - index_value - flavor: - get_input: vm_flavor_name - image: - get_input: vm_image_name - name: - get_input: - - compute_pd_server_name - - index_value - user_data_format: - get_input: - - compute_pd_server_user_data_format - - index_value - pd_server_pd01_port: + pd_server_pd01_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd01_port_exCP_naming + get_input: port_pd01_port_0_exCP_naming vlan_requirements: - get_input: port_pd01_port_vlan_requirements + get_input: port_pd01_port_0_vlan_requirements subinterface_indicator: true related_networks: - get_input: port_pd01_port_related_networks + get_input: port_pd01_port_0_related_networks ip_requirements: - get_input: port_pd01_port_ip_requirements + get_input: port_pd01_port_0_ip_requirements network_role_tag: - get_input: port_pd01_port_network_role_tag + get_input: port_pd01_port_0_network_role_tag mac_requirements: - get_input: port_pd01_port_mac_requirements + get_input: port_pd01_port_0_mac_requirements order: - get_input: port_pd01_port_order + get_input: port_pd01_port_0_order network_role: - get_input: port_pd01_port_network_role + get_input: port_pd01_port_0_network_role subnetpoolid: - get_input: port_pd01_port_subnetpoolid + get_input: port_pd01_port_0_subnetpoolid network: get_input: - - port_pd01_port_network + - port_pd01_port_0_network - index_value requirements: - binding: @@ -170,15 +170,15 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server capabilities: + binding_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - binding scalable_pd_server: - pd_server - scalable disk.read.bytes.rate_pd_server: - pd_server - disk.read.bytes.rate - feature_template_Vlan_1_pd_server_pd01_port_nested: - - pd_server_pd01_port_nested - - feature_template_Vlan_1 memory.usage_pd_server: - pd_server - memory.usage @@ -188,18 +188,15 @@ topology_template: disk.device.usage_pd_server: - pd_server - disk.device.usage - network.outgoing.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.packets.rate os_pd_server: - pd_server - os disk.write.bytes.rate_pd_server: - pd_server - disk.write.bytes.rate - network.incoming.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes + feature_template_Vlan_1_pd_server_pd01_port_0_nested: + - pd_server_pd01_port_0_nested + - feature_template_Vlan_1 cpu_pd_server: - pd_server - cpu @@ -215,9 +212,9 @@ topology_template: disk.device.read.bytes.rate_pd_server: - pd_server - disk.device.read.bytes.rate - network.outgoing.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes + network.incoming.packets_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.packets disk.iops_pd_server: - pd_server - disk.iops @@ -227,27 +224,36 @@ topology_template: cpu.delta_pd_server: - pd_server - cpu.delta - network.incoming.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port + network.incoming.packets.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 - network.incoming.packets.rate + network.incoming.bytes.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.bytes.rate + network.outgoing.packets.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.packets.rate vcpus_pd_server: - pd_server - vcpus disk.device.write.bytes.rate_pd_server: - pd_server - disk.device.write.bytes.rate + attachment_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - attachment disk.device.write.requests_pd_server: - pd_server - disk.device.write.requests endpoint_pd_server: - pd_server - endpoint - attachment_pd_server_pd01_port: - - pd_server_pd01_port - - attachment disk.capacity_pd_server: - pd_server - disk.capacity + forwarder_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - forwarder disk.device.allocation_pd_server: - pd_server - disk.device.allocation @@ -260,27 +266,24 @@ topology_template: disk.read.requests_pd_server: - pd_server - disk.read.requests - feature_pd_server_pd01_port_nested: - - pd_server_pd01_port_nested - - feature + network.outgoing.bytes.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.bytes.rate feature_pd_server: - pd_server - feature disk.usage_pd_server: - pd_server - disk.usage - binding_pd_server_pd01_port: - - pd_server_pd01_port - - binding disk.write.bytes_pd_server: - pd_server - disk.write.bytes - network.incoming.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes.rate - network.incoming.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets + network.outgoing.bytes_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.bytes + network.incoming.bytes_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.bytes disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -293,6 +296,9 @@ topology_template: disk.device.write.bytes_pd_server: - pd_server - disk.device.write.bytes + network.outpoing.packets_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outpoing.packets disk.device.read.requests_pd_server: - pd_server - disk.device.read.requests @@ -302,24 +308,21 @@ topology_template: host_pd_server: - pd_server - host - network.outpoing.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.outpoing.packets - forwarder_pd_server_pd01_port: - - pd_server_pd01_port - - forwarder + feature_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - feature disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate disk.ephemeral.size_pd_server: - pd_server - disk.ephemeral.size + feature_pd_server_pd01_port_0_nested: + - pd_server_pd01_port_0_nested + - feature disk.write.requests_pd_server: - pd_server - disk.write.requests - feature_pd_server_pd01_port: - - pd_server_pd01_port - - feature disk.device.latency_pd_server: - pd_server - disk.device.latency @@ -329,9 +332,6 @@ topology_template: disk.device.capacity_pd_server: - pd_server - disk.device.capacity - network.outgoing.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes.rate disk.device.iops_pd_server: - pd_server - disk.device.iops @@ -339,21 +339,21 @@ topology_template: local_storage_pd_server: - pd_server - local_storage - link_pd_server_pd01_port: - - pd_server_pd01_port - - link - dependency_pd_server_pd01_port: - - pd_server_pd01_port - - dependency - dependency_pd_server_pd01_port_nested: - - pd_server_pd01_port_nested - - dependency dependency_pd_server: - pd_server - dependency - subinterface_link_template_Vlan_1_pd_server_pd01_port_nested: - - pd_server_pd01_port_nested + dependency_pd_server_pd01_port_0_nested: + - pd_server_pd01_port_0_nested + - dependency + subinterface_link_template_Vlan_1_pd_server_pd01_port_0_nested: + - pd_server_pd01_port_0_nested - subinterface_link_template_Vlan_1 - dependency_template_Vlan_1_pd_server_pd01_port_nested: - - pd_server_pd01_port_nested - - dependency_template_Vlan_1 \ No newline at end of file + dependency_template_Vlan_1_pd_server_pd01_port_0_nested: + - pd_server_pd01_port_0_nested + - dependency_template_Vlan_1 + dependency_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - dependency + link_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - link \ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/regularNestedSubInterface/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/regularNestedSubInterface/out/Nested_ps_serverServiceTemplate.yaml index fa71d6f0df..7e453b3114 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/regularNestedSubInterface/out/Nested_ps_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/regularNestedSubInterface/out/Nested_ps_serverServiceTemplate.yaml @@ -16,7 +16,7 @@ topology_template: required: true entry_schema: type: string - port_ps01_port_subnetpoolid: + port_ps01_port_0_network_role: type: string required: true compute_ps_server_availability_zone: @@ -29,6 +29,11 @@ topology_template: required: true entry_schema: type: string + port_ps01_port_0_network: + type: list + required: true + entry_schema: + type: string index_value: type: integer description: Index value of this substitution service template runtime instance @@ -36,16 +41,21 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_ps01_port_vlan_requirements: + port_ps01_port_0_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.IpRequirements subinterface_nested_service_template_filter_count: type: list required: true entry_schema: type: float + port_ps01_port_0_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements vm_flavor_name: type: string required: true @@ -54,46 +64,36 @@ topology_template: required: true entry_schema: type: string - port_ps01_port_related_networks: - type: list + port_ps01_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_ps01_port_order: + port_ps01_port_0_order: type: integer required: true vm_image_name: type: string required: true - port_ps01_port_network_role: + port_ps01_port_0_network_role_tag: type: string required: true - port_ps01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_ps01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_ps01_port_0_subnetpoolid: + type: string required: true - port_ps01_port_network: + port_ps01_port_0_related_networks: type: list required: true entry_schema: - type: string + type: org.openecomp.datatypes.network.RelatedNetworksAssignments subinterface_nested_net1: type: list required: true entry_schema: type: string - port_ps01_port_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_ps01_port_network_role_tag: - type: string - required: true - port_ps01_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true node_templates: - ps_server_ps01_port_nested: + ps_server_ps01_port_0_nested: type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested directives: - substitutable @@ -115,91 +115,82 @@ topology_template: requirements: - binding_template_Vlan_1: capability: tosca.capabilities.network.Bindable - node: ps_server_ps01_port + node: ps_server_ps01_port_0 relationship: tosca.relationships.network.BindsTo - ps_server: - type: org.openecomp.resource.vfc.compute.nodes.heat.ps_server - properties: - availability_zone: - get_input: - - compute_ps_server_availability_zone - - index_value - flavor: - get_input: vm_flavor_name - image: - get_input: vm_image_name - name: - get_input: - - compute_ps_server_name - - index_value - user_data_format: - get_input: - - compute_ps_server_user_data_format - - index_value - ps_server_ps01_port: + ps_server_ps01_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_ps01_port_exCP_naming + get_input: port_ps01_port_0_exCP_naming vlan_requirements: - get_input: port_ps01_port_vlan_requirements + get_input: port_ps01_port_0_vlan_requirements subinterface_indicator: true related_networks: - get_input: port_ps01_port_related_networks + get_input: port_ps01_port_0_related_networks ip_requirements: - get_input: port_ps01_port_ip_requirements + get_input: port_ps01_port_0_ip_requirements network_role_tag: - get_input: port_ps01_port_network_role_tag + get_input: port_ps01_port_0_network_role_tag mac_requirements: - get_input: port_ps01_port_mac_requirements + get_input: port_ps01_port_0_mac_requirements order: - get_input: port_ps01_port_order + get_input: port_ps01_port_0_order network_role: - get_input: port_ps01_port_network_role + get_input: port_ps01_port_0_network_role subnetpoolid: - get_input: port_ps01_port_subnetpoolid + get_input: port_ps01_port_0_subnetpoolid network: get_input: - - port_ps01_port_network + - port_ps01_port_0_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: ps_server relationship: tosca.relationships.network.BindsTo + ps_server: + type: org.openecomp.resource.vfc.compute.nodes.heat.ps_server + properties: + availability_zone: + get_input: + - compute_ps_server_availability_zone + - index_value + flavor: + get_input: vm_flavor_name + image: + get_input: vm_image_name + name: + get_input: + - compute_ps_server_name + - index_value + user_data_format: + get_input: + - compute_ps_server_user_data_format + - index_value substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.ps_server capabilities: - network.incoming.packets.rate_ps_server_ps01_port: - - ps_server_ps01_port - - network.incoming.packets.rate instance_ps_server: - ps_server - instance - network.outpoing.packets_ps_server_ps01_port: - - ps_server_ps01_port - - network.outpoing.packets + network.incoming.packets_ps_server_ps01_port_0: + - ps_server_ps01_port_0 + - network.incoming.packets host_ps_server: - ps_server - host - network.incoming.packets_ps_server_ps01_port: - - ps_server_ps01_port - - network.incoming.packets cpu.delta_ps_server: - ps_server - cpu.delta disk.write.bytes.rate_ps_server: - ps_server - disk.write.bytes.rate - feature_ps_server_ps01_port_nested: - - ps_server_ps01_port_nested - - feature - feature_ps_server_ps01_port: - - ps_server_ps01_port - - feature feature_ps_server: - ps_server - feature + feature_ps_server_ps01_port_0: + - ps_server_ps01_port_0 + - feature disk.root.size_ps_server: - ps_server - disk.root.size @@ -221,9 +212,6 @@ topology_template: disk.device.iops_ps_server: - ps_server - disk.device.iops - network.outgoing.packets.rate_ps_server_ps01_port: - - ps_server_ps01_port - - network.outgoing.packets.rate disk.device.latency_ps_server: - ps_server - disk.device.latency @@ -257,26 +245,29 @@ topology_template: disk.device.read.bytes.rate_ps_server: - ps_server - disk.device.read.bytes.rate + network.outpoing.packets_ps_server_ps01_port_0: + - ps_server_ps01_port_0 + - network.outpoing.packets cpu_util_ps_server: - ps_server - cpu_util memory.resident_ps_server: - ps_server - memory.resident - network.incoming.bytes_ps_server_ps01_port: - - ps_server_ps01_port - - network.incoming.bytes + feature_template_Vlan_1_ps_server_ps01_port_0_nested: + - ps_server_ps01_port_0_nested + - feature_template_Vlan_1 disk.device.read.requests_ps_server: - ps_server - disk.device.read.requests disk.write.bytes_ps_server: - ps_server - disk.write.bytes - feature_template_Vlan_1_ps_server_ps01_port_nested: - - ps_server_ps01_port_nested - - feature_template_Vlan_1 - network.outgoing.bytes.rate_ps_server_ps01_port: - - ps_server_ps01_port + network.incoming.bytes_ps_server_ps01_port_0: + - ps_server_ps01_port_0 + - network.incoming.bytes + network.outgoing.bytes.rate_ps_server_ps01_port_0: + - ps_server_ps01_port_0 - network.outgoing.bytes.rate disk.device.write.requests.rate_ps_server: - ps_server @@ -293,20 +284,20 @@ topology_template: binding_ps_server: - ps_server - binding - attachment_ps_server_ps01_port: - - ps_server_ps01_port - - attachment + feature_ps_server_ps01_port_0_nested: + - ps_server_ps01_port_0_nested + - feature os_ps_server: - ps_server - os disk.device.usage_ps_server: - ps_server - disk.device.usage - binding_ps_server_ps01_port: - - ps_server_ps01_port + binding_ps_server_ps01_port_0: + - ps_server_ps01_port_0 - binding - forwarder_ps_server_ps01_port: - - ps_server_ps01_port + forwarder_ps_server_ps01_port_0: + - ps_server_ps01_port_0 - forwarder disk.device.write.bytes.rate_ps_server: - ps_server @@ -314,6 +305,9 @@ topology_template: vcpus_ps_server: - ps_server - vcpus + attachment_ps_server_ps01_port_0: + - ps_server_ps01_port_0 + - attachment disk.usage_ps_server: - ps_server - disk.usage @@ -326,34 +320,40 @@ topology_template: disk.capacity_ps_server: - ps_server - disk.capacity - network.incoming.bytes.rate_ps_server_ps01_port: - - ps_server_ps01_port - - network.incoming.bytes.rate + network.outgoing.bytes_ps_server_ps01_port_0: + - ps_server_ps01_port_0 + - network.outgoing.bytes + network.outgoing.packets.rate_ps_server_ps01_port_0: + - ps_server_ps01_port_0 + - network.outgoing.packets.rate disk.device.allocation_ps_server: - ps_server - disk.device.allocation - network.outgoing.bytes_ps_server_ps01_port: - - ps_server_ps01_port - - network.outgoing.bytes + network.incoming.packets.rate_ps_server_ps01_port_0: + - ps_server_ps01_port_0 + - network.incoming.packets.rate + network.incoming.bytes.rate_ps_server_ps01_port_0: + - ps_server_ps01_port_0 + - network.incoming.bytes.rate requirements: - subinterface_link_template_Vlan_1_ps_server_ps01_port_nested: - - ps_server_ps01_port_nested + dependency_ps_server_ps01_port_0_nested: + - ps_server_ps01_port_0_nested + - dependency + subinterface_link_template_Vlan_1_ps_server_ps01_port_0_nested: + - ps_server_ps01_port_0_nested - subinterface_link_template_Vlan_1 + dependency_template_Vlan_1_ps_server_ps01_port_0_nested: + - ps_server_ps01_port_0_nested + - dependency_template_Vlan_1 dependency_ps_server: - ps_server - dependency - dependency_ps_server_ps01_port_nested: - - ps_server_ps01_port_nested + dependency_ps_server_ps01_port_0: + - ps_server_ps01_port_0 - dependency - link_ps_server_ps01_port: - - ps_server_ps01_port + link_ps_server_ps01_port_0: + - ps_server_ps01_port_0 - link - dependency_ps_server_ps01_port: - - ps_server_ps01_port - - dependency - dependency_template_Vlan_1_ps_server_ps01_port_nested: - - ps_server_ps01_port_nested - - dependency_template_Vlan_1 local_storage_ps_server: - ps_server - local_storage \ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml index aea332012e..0c17a3cd9b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,10 +8,16 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_ps01_port_subnetpoolid: + port_ps01_port_0_network_role: type: string required: true status: SUPPORTED + port_ps01_port_0_network: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string index_value: type: integer description: Index value of this substitution service template runtime instance @@ -32,18 +38,24 @@ node_types: status: SUPPORTED entry_schema: type: string - port_ps01_port_vlan_requirements: + port_ps01_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.IpRequirements subinterface_nested_service_template_filter_count: type: list required: true status: SUPPORTED entry_schema: type: float + port_ps01_port_0_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements vm_flavor_name: type: string required: true @@ -54,13 +66,11 @@ node_types: status: SUPPORTED entry_schema: type: string - port_ps01_port_related_networks: - type: list + port_ps01_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_ps01_port_order: + port_ps01_port_0_order: type: integer required: true status: SUPPORTED @@ -68,75 +78,52 @@ node_types: type: string required: true status: SUPPORTED - port_ps01_port_network_role: + port_ps01_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_ps01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_ps01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_ps01_port_network: - type: list + port_ps01_port_0_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: string - subinterface_nested_net1: + port_ps01_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: string - port_ps01_port_ip_requirements: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + subinterface_nested_net1: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_ps01_port_network_role_tag: - type: string - required: true - status: SUPPORTED + type: string compute_pd_server_user_data_format: type: list required: true status: SUPPORTED entry_schema: type: string - port_ps01_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED requirements: - - dependency_pd_server_ps01_port_nested: - capability: tosca.capabilities.Node - node: tosca.nodes.Root - relationship: tosca.relationships.DependsOn - occurrences: - - 0 - - UNBOUNDED - - dependency_template_Vlan_vmi_1_pd_server_ps01_port_nested: + - dependency_pd_server_ps01_port_0_nested: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - subinterface_link_template_Vlan_vmi_1_pd_server_ps01_port_nested: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - - dependency_pd_server_ps01_port: + - dependency_template_Vlan_vmi_1_pd_server_ps01_port_0_nested: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_ps01_port: + - subinterface_link_template_Vlan_vmi_1_pd_server_ps01_port_0_nested: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -156,7 +143,25 @@ node_types: occurrences: - 0 - UNBOUNDED + - dependency_pd_server_ps01_port_0: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - link_pd_server_ps01_port_0: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 capabilities: + forwarder_pd_server_ps01_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED scalable_pd_server: type: tosca.capabilities.Scalable occurrences: @@ -191,6 +196,11 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_template_Vlan_vmi_1_pd_server_ps01_port_0_nested: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.write.bytes.rate_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -221,43 +231,37 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.read.bytes.rate_pd_server: + network.incoming.packets_pd_server_ps01_port_0: 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_pd_server_ps01_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.iops_pd_server: + disk.device.read.bytes.rate_pd_server: 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_pd_server: + network.outpoing.packets_pd_server_ps01_port_0: 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_pd_server: + disk.iops_pd_server: 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.packets.rate_pd_server_ps01_port: + memory.resident_pd_server: 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_pd_server_ps01_port: + cpu.delta_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -286,23 +290,12 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_ps01_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.capacity_pd_server: 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_pd_server_ps01_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.device.allocation_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -326,33 +319,23 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_ps01_port: + network.incoming.bytes_pd_server_ps01_port_0: 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_pd_server_ps01_port_nested: + feature_pd_server: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_ps01_port: + network.outgoing.bytes.rate_pd_server_ps01_port_0: 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_pd_server: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - forwarder_pd_server_ps01_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED disk.usage_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -371,41 +354,47 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_ps01_port: + disk.root.size_pd_server: 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_pd_server: + disk.device.read.bytes_pd_server: 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_pd_server: + disk.device.write.bytes_pd_server: 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_pd_server: + network.incoming.packets.rate_pd_server_ps01_port_0: 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_template_Vlan_vmi_1_pd_server_ps01_port_nested: - type: tosca.capabilities.Node + disk.device.read.requests_pd_server: + 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_pd_server: + network.incoming.bytes.rate_pd_server_ps01_port_0: 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_pd_server_ps01_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED instance_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -419,15 +408,12 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_ps01_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 + attachment_pd_server_ps01_port_0: + type: tosca.capabilities.Attachment occurrences: - - 0 + - 1 - UNBOUNDED - network.incoming.bytes_pd_server_ps01_port: + network.outgoing.packets.rate_pd_server_ps01_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -445,14 +431,20 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_pd_server_ps01_port_0_nested: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.write.requests_pd_server: 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 - attachment_pd_server_ps01_port: - type: tosca.capabilities.Attachment + network.outgoing.bytes_pd_server_ps01_port_0: + 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 @@ -474,6 +466,14 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_pd_server_ps01_port_0: + 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 disk.device.iops_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -483,77 +483,81 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server_1: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 + port_pd01_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true status: SUPPORTED - constraints: - - greater_or_equal: 0 - compute_pd_server_availability_zone: + port_pd01_port_0_network: type: list required: true status: SUPPORTED entry_schema: type: string - compute_pd_server_name: + port_pd01_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role_tag: + type: string required: true status: SUPPORTED - subinterface_nested_service_template_filter_count: - type: list + port_pd01_port_0_network_role: + type: string required: true status: SUPPORTED - entry_schema: - type: float - port_pd01_port_related_networks: + port_pd01_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - vm_flavor_name: - type: string + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + status: SUPPORTED + constraints: + - greater_or_equal: 0 + compute_pd_server_availability_zone: + type: list required: true status: SUPPORTED - subinterface_nested_p1: + entry_schema: + type: string + compute_pd_server_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + subinterface_nested_service_template_filter_count: + type: list required: true status: SUPPORTED - vm_image_name: + entry_schema: + type: float + vm_flavor_name: type: string required: true status: SUPPORTED - port_pd01_port_ip_requirements: - type: list + port_pd01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + subinterface_nested_p1: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd01_port_order: + port_pd01_port_0_order: type: integer required: true status: SUPPORTED - port_pd01_port_subnetpoolid: + vm_image_name: type: string required: true status: SUPPORTED @@ -563,20 +567,16 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_network_role: - type: string - required: true - status: SUPPORTED - port_pd01_port_network_role_tag: - type: string - required: true - status: SUPPORTED - port_pd01_port_vlan_requirements: + port_pd01_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_0_subnetpoolid: + type: string + required: true + status: SUPPORTED compute_pd_server_user_data_format: type: list required: true @@ -584,54 +584,62 @@ node_types: entry_schema: type: string requirements: - - dependency_pd_server_pd01_port_nested: + - dependency_pd_server: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - dependency_template_Vlan_vmi_1_pd_server_pd01_port_nested: + - local_storage_pd_server: + capability: tosca.capabilities.Attachment + node: tosca.nodes.BlockStorage + relationship: tosca.relationships.AttachesTo + occurrences: + - 0 + - UNBOUNDED + - dependency_pd_server_pd01_port_0_nested: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - subinterface_link_template_Vlan_vmi_1_pd_server_pd01_port_nested: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - - dependency_pd_server: + - dependency_template_Vlan_vmi_1_pd_server_pd01_port_0_nested: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - local_storage_pd_server: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo + - subinterface_link_template_Vlan_vmi_1_pd_server_pd01_port_0_nested: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo occurrences: - - 0 - - UNBOUNDED - - dependency_pd_server_pd01_port: + - 1 + - 1 + - dependency_pd_server_pd01_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd01_port: + - link_pd_server_pd01_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: + binding_pd_server_pd01_port_0: + 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 scalable_pd_server: type: tosca.capabilities.Scalable occurrences: @@ -661,12 +669,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pd01_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 os_pd_server: type: tosca.capabilities.OperatingSystem occurrences: @@ -678,21 +680,20 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd01_port: + cpu_pd_server: 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_pd_server: + cpu_util_pd_server: 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_pd_server: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_template_Vlan_vmi_1_pd_server_pd01_port_0_nested: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -714,7 +715,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd01_port: + network.incoming.packets_pd_server_pd01_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -738,7 +739,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pd01_port: + network.incoming.packets.rate_pd_server_pd01_port_0: + 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_pd_server_pd01_port_0: + 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.packets.rate_pd_server_pd01_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -756,6 +769,11 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_pd_server_pd01_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED disk.device.write.requests_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -767,19 +785,14 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pd01_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED disk.capacity_pd_server: 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_template_Vlan_vmi_1_pd_server_pd01_port_nested: - type: tosca.capabilities.Node + forwarder_pd_server_pd01_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED @@ -806,8 +819,9 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_pd01_port_nested: - type: tosca.capabilities.Node + network.outgoing.bytes.rate_pd_server_pd01_port_0: + 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 @@ -822,27 +836,19 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_pd01_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 disk.write.bytes_pd_server: 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_pd_server_pd01_port: + network.outgoing.bytes_pd_server_pd01_port_0: 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_pd_server_pd01_port: + network.incoming.bytes_pd_server_pd01_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -872,6 +878,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_pd_server_pd01_port_0: + 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_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -891,14 +903,8 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pd01_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 - forwarder_pd_server_pd01_port: - type: org.openecomp.capabilities.Forwarder + feature_pd_server_pd01_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -914,36 +920,30 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.write.requests_pd_server: - 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_pd_server_pd01_port: + feature_pd_server_pd01_port_0_nested: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.device.latency_pd_server: + disk.write.requests_pd_server: 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_pd_server: + disk.device.latency_pd_server: 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_pd_server: + disk.latency_pd_server: 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_pd_server_pd01_port: + disk.device.capacity_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/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/sameComputeDiffPortSubInterface/out/MainServiceTemplate.yaml index b902522d1c..8c0a766525 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/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/sameComputeDiffPortSubInterface/out/MainServiceTemplate.yaml @@ -708,34 +708,34 @@ topology_template: directives: - substitutable properties: + port_ps01_port_0_network: + - get_input: oam_net_name compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: - get_input: - pd_server_names - 1 + port_ps01_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false subinterface_nested_service_template_filter_count: - 9 vm_flavor_name: get_input: pd_flavor_name subinterface_nested_p1: - ps01_port_0 - vm_image_name: - get_input: pd_image_name - port_ps01_port_mac_requirements: + port_ps01_port_0_mac_requirements: mac_count_required: is_required: false - port_ps01_port_network: - - get_input: oam_net_name + vm_image_name: + get_input: pd_image_name + port_ps01_port_0_network_role_tag: oam subinterface_nested_net1: - test_net1 - port_ps01_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false - port_ps01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW service_template_filter: @@ -747,7 +747,7 @@ topology_template: - service_template_filter - index_value requirements: - - subinterface_link_template_Vlan_vmi_1_pd_server_ps01_port_nested: + - subinterface_link_template_Vlan_vmi_1_pd_server_ps01_port_0_nested: capability: tosca.capabilities.network.Linkable node: test_net1 relationship: tosca.relationships.network.LinksTo @@ -756,6 +756,18 @@ topology_template: directives: - substitutable properties: + port_pd01_port_0_mac_requirements: + mac_count_required: + is_required: false + port_pd01_port_0_network: + - get_input: oam_net_name + port_pd01_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_pd01_port_0_network_role_tag: oam compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: @@ -768,22 +780,10 @@ topology_template: get_input: pd_flavor_name subinterface_nested_p1: - pd01_port_0 - port_pd01_port_mac_requirements: - mac_count_required: - is_required: false vm_image_name: get_input: pd_image_name - port_pd01_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false - port_pd01_port_network: - - get_input: oam_net_name subinterface_nested_net1: - test_net1 - port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW service_template_filter: @@ -795,7 +795,7 @@ topology_template: - service_template_filter - index_value requirements: - - subinterface_link_template_Vlan_vmi_1_pd_server_pd01_port_nested: + - subinterface_link_template_Vlan_vmi_1_pd_server_pd01_port_0_nested: capability: tosca.capabilities.network.Linkable node: test_net1 relationship: tosca.relationships.network.LinksTo @@ -809,4 +809,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/sameComputeDiffPortSubInterface/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/Nested_pd_serverServiceTemplate.yaml index 4ffb7466f9..560bd31f43 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/Nested_pd_serverServiceTemplate.yaml @@ -11,9 +11,14 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_ps01_port_subnetpoolid: + port_ps01_port_0_network_role: type: string required: true + port_ps01_port_0_network: + type: list + required: true + entry_schema: + type: string index_value: type: integer description: Index value of this substitution service template runtime instance @@ -31,16 +36,21 @@ topology_template: required: true entry_schema: type: string - port_ps01_port_vlan_requirements: + port_ps01_port_0_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.IpRequirements subinterface_nested_service_template_filter_count: type: list required: true entry_schema: type: float + port_ps01_port_0_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements vm_flavor_name: type: string required: true @@ -49,51 +59,41 @@ topology_template: required: true entry_schema: type: string - port_ps01_port_related_networks: - type: list + port_ps01_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_ps01_port_order: + port_ps01_port_0_order: type: integer required: true vm_image_name: type: string required: true - port_ps01_port_network_role: + port_ps01_port_0_network_role_tag: type: string required: true - port_ps01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_ps01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - port_ps01_port_network: + port_ps01_port_0_subnetpoolid: + type: string + required: true + port_ps01_port_0_related_networks: type: list required: true entry_schema: - type: string + type: org.openecomp.datatypes.network.RelatedNetworksAssignments subinterface_nested_net1: type: list required: true entry_schema: type: string - port_ps01_port_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_ps01_port_network_role_tag: - type: string - required: true compute_pd_server_user_data_format: type: list required: true entry_schema: type: string - port_ps01_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true node_templates: - pd_server_ps01_port_nested: + pd_server_ps01_port_0_nested: type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested directives: - substitutable @@ -116,61 +116,64 @@ topology_template: requirements: - binding_template_Vlan_vmi_1: capability: tosca.capabilities.network.Bindable - node: pd_server_ps01_port + node: pd_server_ps01_port_0 relationship: tosca.relationships.network.BindsTo - pd_server_ps01_port: + pd_server: + type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server + properties: + availability_zone: + get_input: + - compute_pd_server_availability_zone + - index_value + flavor: + get_input: vm_flavor_name + image: + get_input: vm_image_name + name: + get_input: + - compute_pd_server_name + - index_value + user_data_format: + get_input: + - compute_pd_server_user_data_format + - index_value + pd_server_ps01_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_ps01_port_exCP_naming + get_input: port_ps01_port_0_exCP_naming vlan_requirements: - get_input: port_ps01_port_vlan_requirements + get_input: port_ps01_port_0_vlan_requirements subinterface_indicator: true related_networks: - get_input: port_ps01_port_related_networks + get_input: port_ps01_port_0_related_networks ip_requirements: - get_input: port_ps01_port_ip_requirements + get_input: port_ps01_port_0_ip_requirements network_role_tag: - get_input: port_ps01_port_network_role_tag + get_input: port_ps01_port_0_network_role_tag mac_requirements: - get_input: port_ps01_port_mac_requirements + get_input: port_ps01_port_0_mac_requirements order: - get_input: port_ps01_port_order + get_input: port_ps01_port_0_order network_role: - get_input: port_ps01_port_network_role + get_input: port_ps01_port_0_network_role subnetpoolid: - get_input: port_ps01_port_subnetpoolid + get_input: port_ps01_port_0_subnetpoolid network: get_input: - - port_ps01_port_network + - port_ps01_port_0_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: pd_server relationship: tosca.relationships.network.BindsTo - pd_server: - type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server - properties: - availability_zone: - get_input: - - compute_pd_server_availability_zone - - index_value - flavor: - get_input: vm_flavor_name - image: - get_input: vm_image_name - name: - get_input: - - compute_pd_server_name - - index_value - user_data_format: - get_input: - - compute_pd_server_user_data_format - - index_value substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server capabilities: + forwarder_pd_server_ps01_port_0: + - pd_server_ps01_port_0 + - forwarder scalable_pd_server: - pd_server - scalable @@ -189,6 +192,9 @@ topology_template: os_pd_server: - pd_server - os + feature_template_Vlan_vmi_1_pd_server_ps01_port_0_nested: + - pd_server_ps01_port_0_nested + - feature_template_Vlan_vmi_1 disk.write.bytes.rate_pd_server: - pd_server - disk.write.bytes.rate @@ -204,12 +210,15 @@ topology_template: disk.read.bytes_pd_server: - pd_server - disk.read.bytes + network.incoming.packets_pd_server_ps01_port_0: + - pd_server_ps01_port_0 + - network.incoming.packets disk.device.read.bytes.rate_pd_server: - pd_server - disk.device.read.bytes.rate - network.incoming.bytes.rate_pd_server_ps01_port: - - pd_server_ps01_port - - network.incoming.bytes.rate + network.outpoing.packets_pd_server_ps01_port_0: + - pd_server_ps01_port_0 + - network.outpoing.packets disk.iops_pd_server: - pd_server - disk.iops @@ -219,12 +228,6 @@ topology_template: cpu.delta_pd_server: - pd_server - cpu.delta - network.outgoing.packets.rate_pd_server_ps01_port: - - pd_server_ps01_port - - network.outgoing.packets.rate - network.incoming.packets_pd_server_ps01_port: - - pd_server_ps01_port - - network.incoming.packets vcpus_pd_server: - pd_server - vcpus @@ -237,15 +240,9 @@ topology_template: endpoint_pd_server: - pd_server - endpoint - feature_pd_server_ps01_port: - - pd_server_ps01_port - - feature disk.capacity_pd_server: - pd_server - disk.capacity - network.outgoing.bytes.rate_pd_server_ps01_port: - - pd_server_ps01_port - - network.outgoing.bytes.rate disk.device.allocation_pd_server: - pd_server - disk.device.allocation @@ -258,21 +255,15 @@ topology_template: disk.read.requests_pd_server: - pd_server - disk.read.requests - network.outpoing.packets_pd_server_ps01_port: - - pd_server_ps01_port - - network.outpoing.packets - feature_pd_server_ps01_port_nested: - - pd_server_ps01_port_nested - - feature - network.incoming.packets.rate_pd_server_ps01_port: - - pd_server_ps01_port - - network.incoming.packets.rate + network.incoming.bytes_pd_server_ps01_port_0: + - pd_server_ps01_port_0 + - network.incoming.bytes feature_pd_server: - pd_server - feature - forwarder_pd_server_ps01_port: - - pd_server_ps01_port - - forwarder + network.outgoing.bytes.rate_pd_server_ps01_port_0: + - pd_server_ps01_port_0 + - network.outgoing.bytes.rate disk.usage_pd_server: - pd_server - disk.usage @@ -282,9 +273,6 @@ topology_template: disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate - network.outgoing.bytes_pd_server_ps01_port: - - pd_server_ps01_port - - network.outgoing.bytes disk.root.size_pd_server: - pd_server - disk.root.size @@ -294,36 +282,45 @@ topology_template: disk.device.write.bytes_pd_server: - pd_server - disk.device.write.bytes - feature_template_Vlan_vmi_1_pd_server_ps01_port_nested: - - pd_server_ps01_port_nested - - feature_template_Vlan_vmi_1 + network.incoming.packets.rate_pd_server_ps01_port_0: + - pd_server_ps01_port_0 + - network.incoming.packets.rate disk.device.read.requests_pd_server: - pd_server - disk.device.read.requests + network.incoming.bytes.rate_pd_server_ps01_port_0: + - pd_server_ps01_port_0 + - network.incoming.bytes.rate + feature_pd_server_ps01_port_0: + - pd_server_ps01_port_0 + - feature instance_pd_server: - pd_server - instance host_pd_server: - pd_server - host - binding_pd_server_ps01_port: - - pd_server_ps01_port - - binding - network.incoming.bytes_pd_server_ps01_port: - - pd_server_ps01_port - - network.incoming.bytes + attachment_pd_server_ps01_port_0: + - pd_server_ps01_port_0 + - attachment + network.outgoing.packets.rate_pd_server_ps01_port_0: + - pd_server_ps01_port_0 + - network.outgoing.packets.rate disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate disk.ephemeral.size_pd_server: - pd_server - disk.ephemeral.size + feature_pd_server_ps01_port_0_nested: + - pd_server_ps01_port_0_nested + - feature disk.write.requests_pd_server: - pd_server - disk.write.requests - attachment_pd_server_ps01_port: - - pd_server_ps01_port - - attachment + network.outgoing.bytes_pd_server_ps01_port_0: + - pd_server_ps01_port_0 + - network.outgoing.bytes disk.device.latency_pd_server: - pd_server - disk.device.latency @@ -333,6 +330,9 @@ topology_template: disk.device.capacity_pd_server: - pd_server - disk.device.capacity + binding_pd_server_ps01_port_0: + - pd_server_ps01_port_0 + - binding disk.device.iops_pd_server: - pd_server - disk.device.iops @@ -340,21 +340,21 @@ topology_template: local_storage_pd_server: - pd_server - local_storage - dependency_pd_server_ps01_port: - - pd_server_ps01_port + dependency_pd_server_ps01_port_0: + - pd_server_ps01_port_0 + - dependency + dependency_pd_server_ps01_port_0_nested: + - pd_server_ps01_port_0_nested - dependency - dependency_template_Vlan_vmi_1_pd_server_ps01_port_nested: - - pd_server_ps01_port_nested - - dependency_template_Vlan_vmi_1 - link_pd_server_ps01_port: - - pd_server_ps01_port - - link dependency_pd_server: - pd_server - dependency - subinterface_link_template_Vlan_vmi_1_pd_server_ps01_port_nested: - - pd_server_ps01_port_nested + subinterface_link_template_Vlan_vmi_1_pd_server_ps01_port_0_nested: + - pd_server_ps01_port_0_nested - subinterface_link_template_Vlan_vmi_1 - dependency_pd_server_ps01_port_nested: - - pd_server_ps01_port_nested - - dependency \ No newline at end of file + dependency_template_Vlan_vmi_1_pd_server_ps01_port_0_nested: + - pd_server_ps01_port_0_nested + - dependency_template_Vlan_vmi_1 + link_pd_server_ps01_port_0: + - pd_server_ps01_port_0 + - link \ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/Nested_pd_server_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/Nested_pd_server_1ServiceTemplate.yaml index dc53df8166..16c362eacb 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/Nested_pd_server_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/Nested_pd_server_1ServiceTemplate.yaml @@ -11,6 +11,30 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pd01_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_pd01_port_0_network: + type: list + required: true + entry_schema: + type: string + port_pd01_port_0_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role_tag: + type: string + required: true + port_pd01_port_0_network_role: + type: string + required: true + port_pd01_port_0_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments index_value: type: integer description: Index value of this substitution service template runtime instance @@ -28,47 +52,26 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true subinterface_nested_service_template_filter_count: type: list required: true entry_schema: type: float - port_pd01_port_related_networks: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true - subinterface_nested_p1: - type: list - required: true - entry_schema: - type: string - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - vm_image_name: - type: string - required: true - port_pd01_port_ip_requirements: - type: list + port_pd01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + subinterface_nested_p1: type: list required: true entry_schema: type: string - port_pd01_port_order: + port_pd01_port_0_order: type: integer required: true - port_pd01_port_subnetpoolid: + vm_image_name: type: string required: true subinterface_nested_net1: @@ -76,24 +79,40 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_network_role: - type: string - required: true - port_pd01_port_network_role_tag: - type: string - required: true - port_pd01_port_vlan_requirements: + port_pd01_port_0_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_0_subnetpoolid: + type: string + required: true compute_pd_server_user_data_format: type: list required: true entry_schema: type: string node_templates: - pd_server_pd01_port_nested: + pd_server: + type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server + properties: + availability_zone: + get_input: + - compute_pd_server_availability_zone + - index_value + flavor: + get_input: vm_flavor_name + image: + get_input: vm_image_name + name: + get_input: + - compute_pd_server_name + - index_value + user_data_format: + get_input: + - compute_pd_server_user_data_format + - index_value + pd_server_pd01_port_0_nested: type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested directives: - substitutable @@ -116,52 +135,33 @@ topology_template: requirements: - binding_template_Vlan_vmi_1: capability: tosca.capabilities.network.Bindable - node: pd_server_pd01_port + node: pd_server_pd01_port_0 relationship: tosca.relationships.network.BindsTo - pd_server: - type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server - properties: - availability_zone: - get_input: - - compute_pd_server_availability_zone - - index_value - flavor: - get_input: vm_flavor_name - image: - get_input: vm_image_name - name: - get_input: - - compute_pd_server_name - - index_value - user_data_format: - get_input: - - compute_pd_server_user_data_format - - index_value - pd_server_pd01_port: + pd_server_pd01_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd01_port_exCP_naming + get_input: port_pd01_port_0_exCP_naming vlan_requirements: - get_input: port_pd01_port_vlan_requirements + get_input: port_pd01_port_0_vlan_requirements subinterface_indicator: true related_networks: - get_input: port_pd01_port_related_networks + get_input: port_pd01_port_0_related_networks ip_requirements: - get_input: port_pd01_port_ip_requirements + get_input: port_pd01_port_0_ip_requirements network_role_tag: - get_input: port_pd01_port_network_role_tag + get_input: port_pd01_port_0_network_role_tag mac_requirements: - get_input: port_pd01_port_mac_requirements + get_input: port_pd01_port_0_mac_requirements order: - get_input: port_pd01_port_order + get_input: port_pd01_port_0_order network_role: - get_input: port_pd01_port_network_role + get_input: port_pd01_port_0_network_role subnetpoolid: - get_input: port_pd01_port_subnetpoolid + get_input: port_pd01_port_0_subnetpoolid network: get_input: - - port_pd01_port_network + - port_pd01_port_0_network - index_value requirements: - binding: @@ -171,6 +171,9 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server_1 capabilities: + binding_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - binding scalable_pd_server: - pd_server - scalable @@ -186,24 +189,21 @@ topology_template: disk.device.usage_pd_server: - pd_server - disk.device.usage - network.outgoing.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.packets.rate os_pd_server: - pd_server - os disk.write.bytes.rate_pd_server: - pd_server - disk.write.bytes.rate - network.incoming.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes cpu_pd_server: - pd_server - cpu cpu_util_pd_server: - pd_server - cpu_util + feature_template_Vlan_vmi_1_pd_server_pd01_port_0_nested: + - pd_server_pd01_port_0_nested + - feature_template_Vlan_vmi_1 disk.device.write.requests.rate_pd_server: - pd_server - disk.device.write.requests.rate @@ -213,9 +213,9 @@ topology_template: disk.device.read.bytes.rate_pd_server: - pd_server - disk.device.read.bytes.rate - network.outgoing.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes + network.incoming.packets_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.packets disk.iops_pd_server: - pd_server - disk.iops @@ -225,30 +225,36 @@ topology_template: cpu.delta_pd_server: - pd_server - cpu.delta - network.incoming.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port + network.incoming.packets.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 - network.incoming.packets.rate + network.incoming.bytes.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.bytes.rate + network.outgoing.packets.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.packets.rate vcpus_pd_server: - pd_server - vcpus disk.device.write.bytes.rate_pd_server: - pd_server - disk.device.write.bytes.rate + attachment_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - attachment disk.device.write.requests_pd_server: - pd_server - disk.device.write.requests endpoint_pd_server: - pd_server - endpoint - attachment_pd_server_pd01_port: - - pd_server_pd01_port - - attachment disk.capacity_pd_server: - pd_server - disk.capacity - feature_template_Vlan_vmi_1_pd_server_pd01_port_nested: - - pd_server_pd01_port_nested - - feature_template_Vlan_vmi_1 + forwarder_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - forwarder disk.device.allocation_pd_server: - pd_server - disk.device.allocation @@ -261,27 +267,24 @@ topology_template: disk.read.requests_pd_server: - pd_server - disk.read.requests - feature_pd_server_pd01_port_nested: - - pd_server_pd01_port_nested - - feature + network.outgoing.bytes.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.bytes.rate feature_pd_server: - pd_server - feature disk.usage_pd_server: - pd_server - disk.usage - binding_pd_server_pd01_port: - - pd_server_pd01_port - - binding disk.write.bytes_pd_server: - pd_server - disk.write.bytes - network.incoming.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes.rate - network.incoming.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets + network.outgoing.bytes_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.bytes + network.incoming.bytes_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.bytes disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -294,6 +297,9 @@ topology_template: disk.device.write.bytes_pd_server: - pd_server - disk.device.write.bytes + network.outpoing.packets_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outpoing.packets disk.device.read.requests_pd_server: - pd_server - disk.device.read.requests @@ -303,24 +309,21 @@ topology_template: host_pd_server: - pd_server - host - network.outpoing.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.outpoing.packets - forwarder_pd_server_pd01_port: - - pd_server_pd01_port - - forwarder + feature_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - feature disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate disk.ephemeral.size_pd_server: - pd_server - disk.ephemeral.size + feature_pd_server_pd01_port_0_nested: + - pd_server_pd01_port_0_nested + - feature disk.write.requests_pd_server: - pd_server - disk.write.requests - feature_pd_server_pd01_port: - - pd_server_pd01_port - - feature disk.device.latency_pd_server: - pd_server - disk.device.latency @@ -330,9 +333,6 @@ topology_template: disk.device.capacity_pd_server: - pd_server - disk.device.capacity - network.outgoing.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes.rate disk.device.iops_pd_server: - pd_server - disk.device.iops @@ -340,21 +340,21 @@ topology_template: local_storage_pd_server: - pd_server - local_storage - link_pd_server_pd01_port: - - pd_server_pd01_port - - link - dependency_pd_server_pd01_port: - - pd_server_pd01_port - - dependency - dependency_pd_server_pd01_port_nested: - - pd_server_pd01_port_nested - - dependency + subinterface_link_template_Vlan_vmi_1_pd_server_pd01_port_0_nested: + - pd_server_pd01_port_0_nested + - subinterface_link_template_Vlan_vmi_1 + dependency_template_Vlan_vmi_1_pd_server_pd01_port_0_nested: + - pd_server_pd01_port_0_nested + - dependency_template_Vlan_vmi_1 dependency_pd_server: - pd_server - dependency - dependency_template_Vlan_vmi_1_pd_server_pd01_port_nested: - - pd_server_pd01_port_nested - - dependency_template_Vlan_vmi_1 - subinterface_link_template_Vlan_vmi_1_pd_server_pd01_port_nested: - - pd_server_pd01_port_nested - - subinterface_link_template_Vlan_vmi_1 \ No newline at end of file + dependency_pd_server_pd01_port_0_nested: + - pd_server_pd01_port_0_nested + - dependency + dependency_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - dependency + link_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - link \ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/GlobalSubstitutionTypesServiceTemplate.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/GlobalSubstitutionTypesServiceTemplate.yaml index 0924527c8d..f31af57507 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/GlobalSubstitutionTypesServiceTemplate.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/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,6 +8,12 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_pd01_port_1_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements index_value: type: integer description: Index value of this substitution service template runtime instance @@ -28,11 +34,11 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd01_port_1_order: + type: integer required: true status: SUPPORTED - port_pd01_port_related_networks: + port_pd01_port_1_related_networks: type: list required: true status: SUPPORTED @@ -42,48 +48,42 @@ node_types: type: string required: true status: SUPPORTED - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - vm_image_name: + port_pd01_port_1_network_role: type: string required: true status: SUPPORTED - port_pd01_port_ip_requirements: + port_pd01_port_1_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: - type: list + type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: string - port_pd01_port_order: - type: integer + port_pd01_port_1_subnetpoolid: + type: string required: true status: SUPPORTED - port_pd01_port_subnetpoolid: + vm_image_name: type: string required: true status: SUPPORTED - port_pd01_port_network_role: - type: string + port_pd01_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_pd01_port_network_role_tag: + port_pd01_port_1_network_role_tag: type: string required: true status: SUPPORTED - port_pd01_port_vlan_requirements: + port_pd01_port_1_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: string compute_pd_server_user_data_format: type: list required: true @@ -105,14 +105,14 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pd01_port: + - dependency_pd_server_pd01_port_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd01_port: + - link_pd_server_pd01_port_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -130,6 +130,14 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_pd_server_pd01_port_1: + 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 memory.usage_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -148,12 +156,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pd01_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 os_pd_server: type: tosca.capabilities.OperatingSystem occurrences: @@ -165,12 +167,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd01_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_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -201,13 +197,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd01_port: + disk.iops_pd_server: 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.iops_pd_server: + network.incoming.packets.rate_pd_server_pd01_port_1: + 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_pd_server_pd01_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -225,7 +227,12 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pd01_port: + attachment_pd_server_pd01_port_1: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + network.outgoing.packets.rate_pd_server_pd01_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -254,12 +261,18 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pd01_port: - type: tosca.capabilities.Attachment + disk.capacity_pd_server: + 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_pd_server: + forwarder_pd_server_pd01_port_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets_pd_server_pd01_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -288,6 +301,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes.rate_pd_server_pd01_port_1: + 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_pd_server: type: tosca.capabilities.Node occurrences: @@ -299,27 +318,19 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_pd01_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 - disk.write.bytes_pd_server: + network.incoming.bytes_pd_server_pd01_port_1: 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_pd_server_pd01_port: + disk.write.bytes_pd_server: 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_pd_server_pd01_port: + network.outgoing.bytes_pd_server_pd01_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -349,6 +360,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_pd_server_pd01_port_1: + 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_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -368,14 +385,8 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pd01_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 - forwarder_pd_server_pd01_port: - type: org.openecomp.capabilities.Forwarder + feature_pd_server_pd01_port_1: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -397,11 +408,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_pd01_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.device.latency_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -420,12 +426,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pd01_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.device.iops_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -435,77 +435,81 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server_1: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 + port_pd01_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true status: SUPPORTED - constraints: - - greater_or_equal: 0 - compute_pd_server_availability_zone: + port_pd01_port_0_network: type: list required: true status: SUPPORTED entry_schema: type: string - compute_pd_server_name: + port_pd01_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role_tag: + type: string required: true status: SUPPORTED - subinterface_nested_service_template_filter_count: - type: list + port_pd01_port_0_network_role: + type: string required: true status: SUPPORTED - entry_schema: - type: float - port_pd01_port_related_networks: + port_pd01_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - vm_flavor_name: - type: string + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + status: SUPPORTED + constraints: + - greater_or_equal: 0 + compute_pd_server_availability_zone: + type: list required: true status: SUPPORTED - subinterface_nested_p1: + entry_schema: + type: string + compute_pd_server_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + subinterface_nested_service_template_filter_count: + type: list required: true status: SUPPORTED - vm_image_name: + entry_schema: + type: float + vm_flavor_name: type: string required: true status: SUPPORTED - port_pd01_port_ip_requirements: - type: list + port_pd01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + subinterface_nested_p1: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd01_port_order: + port_pd01_port_0_order: type: integer required: true status: SUPPORTED - port_pd01_port_subnetpoolid: + vm_image_name: type: string required: true status: SUPPORTED @@ -515,20 +519,16 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_network_role: - type: string - required: true - status: SUPPORTED - port_pd01_port_network_role_tag: - type: string - required: true - status: SUPPORTED - port_pd01_port_vlan_requirements: + port_pd01_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_0_subnetpoolid: + type: string + required: true + status: SUPPORTED compute_pd_server_user_data_format: type: list required: true @@ -536,54 +536,62 @@ node_types: entry_schema: type: string requirements: - - dependency_pd_server_pd01_port_nested: + - dependency_pd_server: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - dependency_template_Vlan_vmi_1_pd_server_pd01_port_nested: + - local_storage_pd_server: + capability: tosca.capabilities.Attachment + node: tosca.nodes.BlockStorage + relationship: tosca.relationships.AttachesTo + occurrences: + - 0 + - UNBOUNDED + - dependency_pd_server_pd01_port_0_nested: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - subinterface_link_template_Vlan_vmi_1_pd_server_pd01_port_nested: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - - dependency_pd_server: + - dependency_template_Vlan_vmi_1_pd_server_pd01_port_0_nested: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - local_storage_pd_server: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo + - subinterface_link_template_Vlan_vmi_1_pd_server_pd01_port_0_nested: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo occurrences: - - 0 - - UNBOUNDED - - dependency_pd_server_pd01_port: + - 1 + - 1 + - dependency_pd_server_pd01_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd01_port: + - link_pd_server_pd01_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: + binding_pd_server_pd01_port_0: + 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 scalable_pd_server: type: tosca.capabilities.Scalable occurrences: @@ -613,12 +621,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pd01_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 os_pd_server: type: tosca.capabilities.OperatingSystem occurrences: @@ -630,21 +632,20 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd01_port: + cpu_pd_server: 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_pd_server: + cpu_util_pd_server: 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_pd_server: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_template_Vlan_vmi_1_pd_server_pd01_port_0_nested: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -666,7 +667,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd01_port: + network.incoming.packets_pd_server_pd01_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -690,7 +691,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pd01_port: + network.incoming.packets.rate_pd_server_pd01_port_0: + 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_pd_server_pd01_port_0: + 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.packets.rate_pd_server_pd01_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -708,6 +721,11 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_pd_server_pd01_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED disk.device.write.requests_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -719,19 +737,14 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pd01_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED disk.capacity_pd_server: 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_template_Vlan_vmi_1_pd_server_pd01_port_nested: - type: tosca.capabilities.Node + forwarder_pd_server_pd01_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED @@ -758,8 +771,9 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_pd01_port_nested: - type: tosca.capabilities.Node + network.outgoing.bytes.rate_pd_server_pd01_port_0: + 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 @@ -774,27 +788,19 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_pd01_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 disk.write.bytes_pd_server: 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_pd_server_pd01_port: + network.outgoing.bytes_pd_server_pd01_port_0: 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_pd_server_pd01_port: + network.incoming.bytes_pd_server_pd01_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -824,6 +830,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_pd_server_pd01_port_0: + 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_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -843,14 +855,8 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pd01_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 - forwarder_pd_server_pd01_port: - type: org.openecomp.capabilities.Forwarder + feature_pd_server_pd01_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -866,36 +872,30 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.write.requests_pd_server: - 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_pd_server_pd01_port: + feature_pd_server_pd01_port_0_nested: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.device.latency_pd_server: + disk.write.requests_pd_server: 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_pd_server: + disk.device.latency_pd_server: 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_pd_server: + disk.latency_pd_server: 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_pd_server_pd01_port: + disk.device.capacity_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: 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 e873e659f2..4fef6d6222 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 @@ -708,6 +708,12 @@ topology_template: directives: - substitutable properties: + port_pd01_port_1_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: @@ -716,20 +722,14 @@ topology_template: - 1 vm_flavor_name: get_input: pd_flavor_name - port_pd01_port_mac_requirements: + port_pd01_port_1_mac_requirements: mac_count_required: is_required: false vm_image_name: get_input: pd_image_name - port_pd01_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false - port_pd01_port_network: + port_pd01_port_1_network_role_tag: oam + port_pd01_port_1_network: - get_input: oam_net_name - port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW service_template_filter: @@ -745,6 +745,18 @@ topology_template: directives: - substitutable properties: + port_pd01_port_0_mac_requirements: + mac_count_required: + is_required: false + port_pd01_port_0_network: + - get_input: oam_net_name + port_pd01_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_pd01_port_0_network_role_tag: oam compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: @@ -757,22 +769,10 @@ topology_template: get_input: pd_flavor_name subinterface_nested_p1: - pd01_port_0 - port_pd01_port_mac_requirements: - mac_count_required: - is_required: false vm_image_name: get_input: pd_image_name - port_pd01_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false - port_pd01_port_network: - - get_input: oam_net_name subinterface_nested_net1: - test_net1 - port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW service_template_filter: @@ -784,7 +784,7 @@ topology_template: - service_template_filter - index_value requirements: - - subinterface_link_template_Vlan_vmi_1_pd_server_pd01_port_nested: + - subinterface_link_template_Vlan_vmi_1_pd_server_pd01_port_0_nested: capability: tosca.capabilities.network.Linkable node: test_net1 relationship: tosca.relationships.network.LinksTo @@ -798,4 +798,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/Nested_pd_serverServiceTemplate.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/Nested_pd_serverServiceTemplate.yaml index 2d01270aaf..734675faec 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/Nested_pd_serverServiceTemplate.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/Nested_pd_serverServiceTemplate.yaml @@ -11,6 +11,11 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pd01_port_1_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements index_value: type: integer description: Index value of this substitution service template runtime instance @@ -28,10 +33,10 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd01_port_1_order: + type: integer required: true - port_pd01_port_related_networks: + port_pd01_port_1_related_networks: type: list required: true entry_schema: @@ -39,39 +44,34 @@ topology_template: vm_flavor_name: type: string required: true - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - vm_image_name: + port_pd01_port_1_network_role: type: string required: true - port_pd01_port_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + port_pd01_port_1_vlan_requirements: type: list required: true entry_schema: - type: string - port_pd01_port_order: - type: integer + type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_pd01_port_subnetpoolid: + port_pd01_port_1_subnetpoolid: type: string required: true - port_pd01_port_network_role: + vm_image_name: type: string required: true - port_pd01_port_network_role_tag: + port_pd01_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_pd01_port_1_network_role_tag: type: string required: true - port_pd01_port_vlan_requirements: + port_pd01_port_1_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: string compute_pd_server_user_data_format: type: list required: true @@ -97,31 +97,31 @@ topology_template: get_input: - compute_pd_server_user_data_format - index_value - pd_server_pd01_port: + pd_server_pd01_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd01_port_exCP_naming + get_input: port_pd01_port_1_exCP_naming vlan_requirements: - get_input: port_pd01_port_vlan_requirements + get_input: port_pd01_port_1_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_pd01_port_related_networks + get_input: port_pd01_port_1_related_networks ip_requirements: - get_input: port_pd01_port_ip_requirements + get_input: port_pd01_port_1_ip_requirements network_role_tag: - get_input: port_pd01_port_network_role_tag + get_input: port_pd01_port_1_network_role_tag mac_requirements: - get_input: port_pd01_port_mac_requirements + get_input: port_pd01_port_1_mac_requirements order: - get_input: port_pd01_port_order + get_input: port_pd01_port_1_order network_role: - get_input: port_pd01_port_network_role + get_input: port_pd01_port_1_network_role subnetpoolid: - get_input: port_pd01_port_subnetpoolid + get_input: port_pd01_port_1_subnetpoolid network: get_input: - - port_pd01_port_network + - port_pd01_port_1_network - index_value requirements: - binding: @@ -137,6 +137,9 @@ topology_template: disk.read.bytes.rate_pd_server: - pd_server - disk.read.bytes.rate + binding_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - binding memory.usage_pd_server: - pd_server - memory.usage @@ -146,18 +149,12 @@ topology_template: disk.device.usage_pd_server: - pd_server - disk.device.usage - network.outgoing.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.packets.rate os_pd_server: - pd_server - os disk.write.bytes.rate_pd_server: - pd_server - disk.write.bytes.rate - network.incoming.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes cpu_pd_server: - pd_server - cpu @@ -173,21 +170,27 @@ topology_template: disk.device.read.bytes.rate_pd_server: - pd_server - disk.device.read.bytes.rate - network.outgoing.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes disk.iops_pd_server: - pd_server - disk.iops + network.incoming.packets.rate_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - network.incoming.packets.rate + network.incoming.bytes.rate_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - network.incoming.bytes.rate memory.resident_pd_server: - pd_server - memory.resident cpu.delta_pd_server: - pd_server - cpu.delta - network.incoming.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets.rate + attachment_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - attachment + network.outgoing.packets.rate_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - network.outgoing.packets.rate vcpus_pd_server: - pd_server - vcpus @@ -200,12 +203,15 @@ topology_template: endpoint_pd_server: - pd_server - endpoint - attachment_pd_server_pd01_port: - - pd_server_pd01_port - - attachment disk.capacity_pd_server: - pd_server - disk.capacity + forwarder_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - forwarder + network.incoming.packets_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - network.incoming.packets disk.device.allocation_pd_server: - pd_server - disk.device.allocation @@ -218,24 +224,24 @@ topology_template: disk.read.requests_pd_server: - pd_server - disk.read.requests + network.outgoing.bytes.rate_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - network.outgoing.bytes.rate feature_pd_server: - pd_server - feature disk.usage_pd_server: - pd_server - disk.usage - binding_pd_server_pd01_port: - - pd_server_pd01_port - - binding + network.incoming.bytes_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - network.incoming.bytes disk.write.bytes_pd_server: - pd_server - disk.write.bytes - network.incoming.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes.rate - network.incoming.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets + network.outgoing.bytes_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - network.outgoing.bytes disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -248,6 +254,9 @@ topology_template: disk.device.write.bytes_pd_server: - pd_server - disk.device.write.bytes + network.outpoing.packets_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - network.outpoing.packets disk.device.read.requests_pd_server: - pd_server - disk.device.read.requests @@ -257,12 +266,9 @@ topology_template: host_pd_server: - pd_server - host - network.outpoing.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.outpoing.packets - forwarder_pd_server_pd01_port: - - pd_server_pd01_port - - forwarder + feature_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - feature disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate @@ -272,9 +278,6 @@ topology_template: disk.write.requests_pd_server: - pd_server - disk.write.requests - feature_pd_server_pd01_port: - - pd_server_pd01_port - - feature disk.device.latency_pd_server: - pd_server - disk.device.latency @@ -284,9 +287,6 @@ topology_template: disk.device.capacity_pd_server: - pd_server - disk.device.capacity - network.outgoing.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes.rate disk.device.iops_pd_server: - pd_server - disk.device.iops @@ -294,12 +294,12 @@ topology_template: local_storage_pd_server: - pd_server - local_storage - link_pd_server_pd01_port: - - pd_server_pd01_port - - link - dependency_pd_server_pd01_port: - - pd_server_pd01_port + dependency_pd_server_pd01_port_1: + - pd_server_pd01_port_1 - dependency dependency_pd_server: - pd_server - - dependency \ No newline at end of file + - dependency + link_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - link \ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/Nested_pd_server_1ServiceTemplate.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/Nested_pd_server_1ServiceTemplate.yaml index dc53df8166..16c362eacb 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/Nested_pd_server_1ServiceTemplate.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/Nested_pd_server_1ServiceTemplate.yaml @@ -11,6 +11,30 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pd01_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_pd01_port_0_network: + type: list + required: true + entry_schema: + type: string + port_pd01_port_0_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role_tag: + type: string + required: true + port_pd01_port_0_network_role: + type: string + required: true + port_pd01_port_0_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments index_value: type: integer description: Index value of this substitution service template runtime instance @@ -28,47 +52,26 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true subinterface_nested_service_template_filter_count: type: list required: true entry_schema: type: float - port_pd01_port_related_networks: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true - subinterface_nested_p1: - type: list - required: true - entry_schema: - type: string - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - vm_image_name: - type: string - required: true - port_pd01_port_ip_requirements: - type: list + port_pd01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + subinterface_nested_p1: type: list required: true entry_schema: type: string - port_pd01_port_order: + port_pd01_port_0_order: type: integer required: true - port_pd01_port_subnetpoolid: + vm_image_name: type: string required: true subinterface_nested_net1: @@ -76,24 +79,40 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_network_role: - type: string - required: true - port_pd01_port_network_role_tag: - type: string - required: true - port_pd01_port_vlan_requirements: + port_pd01_port_0_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_0_subnetpoolid: + type: string + required: true compute_pd_server_user_data_format: type: list required: true entry_schema: type: string node_templates: - pd_server_pd01_port_nested: + pd_server: + type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server + properties: + availability_zone: + get_input: + - compute_pd_server_availability_zone + - index_value + flavor: + get_input: vm_flavor_name + image: + get_input: vm_image_name + name: + get_input: + - compute_pd_server_name + - index_value + user_data_format: + get_input: + - compute_pd_server_user_data_format + - index_value + pd_server_pd01_port_0_nested: type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested directives: - substitutable @@ -116,52 +135,33 @@ topology_template: requirements: - binding_template_Vlan_vmi_1: capability: tosca.capabilities.network.Bindable - node: pd_server_pd01_port + node: pd_server_pd01_port_0 relationship: tosca.relationships.network.BindsTo - pd_server: - type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server - properties: - availability_zone: - get_input: - - compute_pd_server_availability_zone - - index_value - flavor: - get_input: vm_flavor_name - image: - get_input: vm_image_name - name: - get_input: - - compute_pd_server_name - - index_value - user_data_format: - get_input: - - compute_pd_server_user_data_format - - index_value - pd_server_pd01_port: + pd_server_pd01_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd01_port_exCP_naming + get_input: port_pd01_port_0_exCP_naming vlan_requirements: - get_input: port_pd01_port_vlan_requirements + get_input: port_pd01_port_0_vlan_requirements subinterface_indicator: true related_networks: - get_input: port_pd01_port_related_networks + get_input: port_pd01_port_0_related_networks ip_requirements: - get_input: port_pd01_port_ip_requirements + get_input: port_pd01_port_0_ip_requirements network_role_tag: - get_input: port_pd01_port_network_role_tag + get_input: port_pd01_port_0_network_role_tag mac_requirements: - get_input: port_pd01_port_mac_requirements + get_input: port_pd01_port_0_mac_requirements order: - get_input: port_pd01_port_order + get_input: port_pd01_port_0_order network_role: - get_input: port_pd01_port_network_role + get_input: port_pd01_port_0_network_role subnetpoolid: - get_input: port_pd01_port_subnetpoolid + get_input: port_pd01_port_0_subnetpoolid network: get_input: - - port_pd01_port_network + - port_pd01_port_0_network - index_value requirements: - binding: @@ -171,6 +171,9 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server_1 capabilities: + binding_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - binding scalable_pd_server: - pd_server - scalable @@ -186,24 +189,21 @@ topology_template: disk.device.usage_pd_server: - pd_server - disk.device.usage - network.outgoing.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.packets.rate os_pd_server: - pd_server - os disk.write.bytes.rate_pd_server: - pd_server - disk.write.bytes.rate - network.incoming.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes cpu_pd_server: - pd_server - cpu cpu_util_pd_server: - pd_server - cpu_util + feature_template_Vlan_vmi_1_pd_server_pd01_port_0_nested: + - pd_server_pd01_port_0_nested + - feature_template_Vlan_vmi_1 disk.device.write.requests.rate_pd_server: - pd_server - disk.device.write.requests.rate @@ -213,9 +213,9 @@ topology_template: disk.device.read.bytes.rate_pd_server: - pd_server - disk.device.read.bytes.rate - network.outgoing.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes + network.incoming.packets_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.packets disk.iops_pd_server: - pd_server - disk.iops @@ -225,30 +225,36 @@ topology_template: cpu.delta_pd_server: - pd_server - cpu.delta - network.incoming.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port + network.incoming.packets.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 - network.incoming.packets.rate + network.incoming.bytes.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.bytes.rate + network.outgoing.packets.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.packets.rate vcpus_pd_server: - pd_server - vcpus disk.device.write.bytes.rate_pd_server: - pd_server - disk.device.write.bytes.rate + attachment_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - attachment disk.device.write.requests_pd_server: - pd_server - disk.device.write.requests endpoint_pd_server: - pd_server - endpoint - attachment_pd_server_pd01_port: - - pd_server_pd01_port - - attachment disk.capacity_pd_server: - pd_server - disk.capacity - feature_template_Vlan_vmi_1_pd_server_pd01_port_nested: - - pd_server_pd01_port_nested - - feature_template_Vlan_vmi_1 + forwarder_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - forwarder disk.device.allocation_pd_server: - pd_server - disk.device.allocation @@ -261,27 +267,24 @@ topology_template: disk.read.requests_pd_server: - pd_server - disk.read.requests - feature_pd_server_pd01_port_nested: - - pd_server_pd01_port_nested - - feature + network.outgoing.bytes.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.bytes.rate feature_pd_server: - pd_server - feature disk.usage_pd_server: - pd_server - disk.usage - binding_pd_server_pd01_port: - - pd_server_pd01_port - - binding disk.write.bytes_pd_server: - pd_server - disk.write.bytes - network.incoming.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes.rate - network.incoming.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets + network.outgoing.bytes_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.bytes + network.incoming.bytes_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.bytes disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -294,6 +297,9 @@ topology_template: disk.device.write.bytes_pd_server: - pd_server - disk.device.write.bytes + network.outpoing.packets_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outpoing.packets disk.device.read.requests_pd_server: - pd_server - disk.device.read.requests @@ -303,24 +309,21 @@ topology_template: host_pd_server: - pd_server - host - network.outpoing.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.outpoing.packets - forwarder_pd_server_pd01_port: - - pd_server_pd01_port - - forwarder + feature_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - feature disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate disk.ephemeral.size_pd_server: - pd_server - disk.ephemeral.size + feature_pd_server_pd01_port_0_nested: + - pd_server_pd01_port_0_nested + - feature disk.write.requests_pd_server: - pd_server - disk.write.requests - feature_pd_server_pd01_port: - - pd_server_pd01_port - - feature disk.device.latency_pd_server: - pd_server - disk.device.latency @@ -330,9 +333,6 @@ topology_template: disk.device.capacity_pd_server: - pd_server - disk.device.capacity - network.outgoing.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes.rate disk.device.iops_pd_server: - pd_server - disk.device.iops @@ -340,21 +340,21 @@ topology_template: local_storage_pd_server: - pd_server - local_storage - link_pd_server_pd01_port: - - pd_server_pd01_port - - link - dependency_pd_server_pd01_port: - - pd_server_pd01_port - - dependency - dependency_pd_server_pd01_port_nested: - - pd_server_pd01_port_nested - - dependency + subinterface_link_template_Vlan_vmi_1_pd_server_pd01_port_0_nested: + - pd_server_pd01_port_0_nested + - subinterface_link_template_Vlan_vmi_1 + dependency_template_Vlan_vmi_1_pd_server_pd01_port_0_nested: + - pd_server_pd01_port_0_nested + - dependency_template_Vlan_vmi_1 dependency_pd_server: - pd_server - dependency - dependency_template_Vlan_vmi_1_pd_server_pd01_port_nested: - - pd_server_pd01_port_nested - - dependency_template_Vlan_vmi_1 - subinterface_link_template_Vlan_vmi_1_pd_server_pd01_port_nested: - - pd_server_pd01_port_nested - - subinterface_link_template_Vlan_vmi_1 \ No newline at end of file + dependency_pd_server_pd01_port_0_nested: + - pd_server_pd01_port_0_nested + - dependency + dependency_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - dependency + link_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - link \ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/allConnectivities/in/main.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/allConnectivities/in/main.yml index d4590c8a4b..662eef8732 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/allConnectivities/in/main.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/allConnectivities/in/main.yml @@ -196,8 +196,8 @@ resources: name: get_param: vdbe_name_1 networks: - - port: {get_resource: vdbe_untr_1_port_2} - - port: {get_resource: vdbe_untr_2_port_2} + - port: {get_resource: vdbe_1_untr_1_port_1} + - port: {get_resource: vdbe_1_untr_2_port_1} vdbe_untr_1_port_1: type: OS::ContrailV2::VirtualMachineInterface properties: @@ -294,7 +294,7 @@ resources: - vdbe_untr_1_port_2: + vdbe_1_untr_1_port_1: type: OS::ContrailV2::VirtualMachineInterface properties: name: @@ -344,7 +344,7 @@ resources: virtual_network_refs: - get_resource: control_int_net - vdbe_untr_2_port_2: + vdbe_1_untr_2_port_1: type: OS::ContrailV2::VirtualMachineInterface properties: name: Port_4 @@ -420,7 +420,7 @@ resources: mac_address: get_param: vdbe_hw_untr_mac_1 parent_interface: - get_resource: vdbe_untr_1_port_2 + get_resource: vdbe_1_untr_1_port_1 subinterfaces_name_prefix: str_replace: params: 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/GlobalSubstitutionTypesServiceTemplate.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/GlobalSubstitutionTypesServiceTemplate.yaml index b7b6ef9288..0156a9af57 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/GlobalSubstitutionTypesServiceTemplate.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/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,31 +8,43 @@ node_types: org.openecomp.resource.abstract.nodes.vdbe: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_vdbe_untr_1_port_1_order: + type: integer + required: true + status: SUPPORTED + port_vdbe_untr_1_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED subinterface_vlan1_aap_untrusted_v6_ip_prefix: type: list required: true status: SUPPORTED entry_schema: type: string - subinterface_vlan1_aap_sec_untrusted_ip_prefix: + port_vdbe_untr_2_port_1_network_role_tag: + type: string + required: true + status: SUPPORTED + port_vdbe_untr_1_port_1_virtual_machine_interface_mac_addresses: type: list required: true status: SUPPORTED entry_schema: - type: string - compute_vdbe_availability_zone: + type: json + subinterface_vlan1_aap_sec_untrusted_ip_prefix: type: list required: true status: SUPPORTED entry_schema: type: string - port_vdbe_untr_2_port_virtual_machine_interface_mac_addresses: + compute_vdbe_availability_zone: type: list required: true status: SUPPORTED entry_schema: - type: json - port_vdbe_untr_2_port_network_role_tag: + type: string + port_vdbe_untr_1_port_1_network_role: type: string required: true status: SUPPORTED @@ -40,71 +52,67 @@ node_types: type: string required: true status: SUPPORTED - subinterface_vlan1_counter: + port_vdbe_untr_1_port_1_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: float - vm_image_name: - type: string - required: true - status: SUPPORTED - port_vdbe_untr_2_port_network_role: - type: string - required: true - status: SUPPORTED - compute_vdbe_metadata: + type: org.openecomp.datatypes.network.IpRequirements + port_vdbe_untr_1_port_1_name: type: list required: true status: SUPPORTED entry_schema: - type: json - subinterface_vlan1_aap_untrusted_v6_ip_prefix_len: + type: string + port_vdbe_untr_2_port_1_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_vdbe_untr_1_port_ip_requirements: + port_vdbe_untr_2_port_1_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_vdbe_untr_2_port_vlan_requirements: + type: org.openecomp.datatypes.network.VlanRequirements + subinterface_vlan1_counter: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_vdbe_untr_2_port_exCP_naming: - type: org.openecomp.datatypes.Naming + type: float + vm_image_name: + type: string required: true status: SUPPORTED - port_vdbe_untr_2_port_ip_requirements: + compute_vdbe_metadata: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_vdbe_untr_1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + type: json + subinterface_vlan1_aap_untrusted_v6_ip_prefix_len: + type: list required: true status: SUPPORTED - port_vdbe_untr_1_port_order: - type: integer + entry_schema: + type: string + port_vdbe_untr_2_port_1_virtual_machine_interface_mac_addresses: + type: list required: true status: SUPPORTED - port_vdbe_untr_1_port_subnetpoolid: - type: string + entry_schema: + type: json + port_vdbe_untr_2_port_1_virtual_machine_interface_allowed_address_pairs: + type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs required: true status: SUPPORTED - port_vdbe_untr_2_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_vdbe_untr_2_port_1_network_role: + type: string required: true status: SUPPORTED - port_vdbe_untr_1_port_virtual_machine_interface_allowed_address_pairs: + port_vdbe_untr_1_port_1_virtual_machine_interface_allowed_address_pairs: type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs required: true status: SUPPORTED @@ -120,6 +128,10 @@ node_types: status: SUPPORTED entry_schema: type: string + port_vdbe_untr_1_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED subinterface_vlan1_ip_address: type: list required: true @@ -132,76 +144,68 @@ node_types: status: SUPPORTED entry_schema: type: string - port_vdbe_untr_1_port_network_role_tag: + port_vdbe_untr_2_port_1_subnetpoolid: type: string required: true status: SUPPORTED - subinterface_vlan1_ip_v6_address: - type: list + port_vdbe_untr_2_port_1_order: + type: integer required: true status: SUPPORTED - entry_schema: - type: string - port_vdbe_untr_1_port_related_networks: + port_vdbe_untr_2_port_1_related_networks: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - subinterface_vlan1_aap_untrusted_ip_prefix: + port_vdbe_untr_2_port_1_virtual_network_refs: type: list required: true status: SUPPORTED entry_schema: - type: string - port_vdbe_untr_2_port_virtual_network_refs: + type: json + port_vdbe_untr_2_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + subinterface_vlan1_ip_v6_address: type: list required: true status: SUPPORTED entry_schema: - type: json - subinterface_vlan1_subinterfaces_name_prefix: + type: string + subinterface_vlan1_aap_untrusted_ip_prefix: type: list required: true status: SUPPORTED entry_schema: type: string - port_vdbe_untr_1_port_network_role: + port_vdbe_untr_1_port_1_network_role_tag: type: string required: true status: SUPPORTED - port_vdbe_untr_2_port_name: + subinterface_vlan1_subinterfaces_name_prefix: type: list required: true status: SUPPORTED entry_schema: type: string - port_vdbe_untr_2_port_related_networks: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_vdbe_untr_1_port_virtual_network_refs: - type: list + port_vdbe_untr_1_port_1_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: json subinterface_vlan1_vn_network_list: type: list required: true status: SUPPORTED entry_schema: type: string - port_vdbe_untr_2_port_subnetpoolid: - type: string - required: true - status: SUPPORTED - port_vdbe_untr_2_port_order: - type: integer + port_vdbe_untr_1_port_1_vlan_requirements: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements subinterface_vlan1_service_template_filter_count: type: list required: true @@ -220,6 +224,10 @@ node_types: status: SUPPORTED entry_schema: type: string + port_vdbe_untr_2_port_1_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 @@ -228,45 +236,37 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_vdbe_untr_1_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED subinterface_vlan1_optional_property_1: type: list required: true status: SUPPORTED entry_schema: type: string - port_vdbe_untr_1_port_name: + port_vdbe_untr_2_port_1_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - subinterface_vlan1_optional_property_2: + type: org.openecomp.datatypes.network.IpRequirements + port_vdbe_untr_1_port_1_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: string - subinterface_vlan1_aap_sec_untrusted_ip_prefix_len: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + subinterface_vlan1_optional_property_2: type: list required: true status: SUPPORTED entry_schema: type: string - port_vdbe_untr_2_port_virtual_machine_interface_allowed_address_pairs: - type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs - required: true - status: SUPPORTED - port_vdbe_untr_1_port_vlan_requirements: + subinterface_vlan1_aap_sec_untrusted_ip_prefix_len: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_vdbe_untr_1_port_virtual_machine_interface_mac_addresses: + type: string + port_vdbe_untr_1_port_1_virtual_network_refs: type: list required: true status: SUPPORTED @@ -279,7 +279,7 @@ node_types: entry_schema: type: json attributes: - vdbe_vdbe_untr_1_port_vlan1_aap_address_mode: + vdbe_vdbe_untr_1_port_1_vlan1_aap_address_mode: type: string status: SUPPORTED requirements: @@ -297,47 +297,47 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_vdbe_vdbe_untr_2_port: + - dependency_vdbe_vdbe_untr_1_port_1_vlan1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_vdbe_vdbe_untr_2_port: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - - dependency_vdbe_vdbe_untr_1_port_vlan1: + - dependency_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_1_port_1_vlan1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - dependency_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_1_port_vlan1: + - subinterface_link_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_1_port_1_vlan1: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 + - dependency_vdbe_vdbe_untr_1_port_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - subinterface_link_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_1_port_vlan1: + - link_vdbe_vdbe_untr_1_port_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_vdbe_vdbe_untr_1_port: + - dependency_vdbe_vdbe_untr_2_port_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_vdbe_vdbe_untr_1_port: + - link_vdbe_vdbe_untr_2_port_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -366,13 +366,15 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_vdbe_vdbe_untr_2_port: - type: tosca.capabilities.Node + network.outpoing.packets_vdbe_vdbe_untr_1_port_1: + 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_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_1_port_vlan1: - type: tosca.capabilities.Node + network.outpoing.packets_vdbe_vdbe_untr_2_port_1: + 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 @@ -394,47 +396,43 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_vdbe_vdbe_untr_1_port_vlan1: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - disk.device.latency_vdbe: + network.outgoing.packets.rate_vdbe_vdbe_untr_2_port_1: 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: + network.outgoing.packets.rate_vdbe_vdbe_untr_1_port_1: 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_2_port: + 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 - feature_vdbe_vdbe_untr_1_port: - type: tosca.capabilities.Node + 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: + network.incoming.bytes_vdbe_vdbe_untr_1_port_1: 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_1_port: + 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.rate_vdbe_vdbe_untr_1_port: + network.outgoing.bytes.rate_vdbe_vdbe_untr_2_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -463,79 +461,83 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_vdbe_vdbe_untr_2_port: + binding_vdbe_vdbe_untr_1_port_1: + 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 + 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 - network.outgoing.bytes_vdbe_vdbe_untr_1_port: + 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 - disk.device.allocation_vdbe: + 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 - disk.usage_vdbe: + network.outgoing.bytes_vdbe_vdbe_untr_1_port_1: 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: + 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 - network.outpoing.packets_vdbe_vdbe_untr_2_port: + network.incoming.packets.rate_vdbe_vdbe_untr_1_port_1: 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: + network.incoming.packets_vdbe_vdbe_untr_2_port_1: 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_1_port: + network.incoming.bytes.rate_vdbe_vdbe_untr_2_port_1: 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 - 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. + forwarder_vdbe_vdbe_untr_1_port_1: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - cpu.delta_vdbe: + 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.outgoing.packets.rate_vdbe_vdbe_untr_2_port: + 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 - binding_vdbe_vdbe_untr_1_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 + forwarder_vdbe_vdbe_untr_2_port_1: + type: org.openecomp.capabilities.Forwarder occurrences: - - 0 + - 1 - UNBOUNDED disk.device.read.bytes.rate_vdbe: type: org.openecomp.capabilities.metric.Ceilometer @@ -555,17 +557,17 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_vdbe_vdbe_untr_1_port: - type: org.openecomp.capabilities.Forwarder - 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 + feature_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_1_port_1_vlan1: + type: tosca.capabilities.Node + 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. @@ -578,11 +580,6 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_vdbe_vdbe_untr_2_port: - type: org.openecomp.capabilities.Forwarder - 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. @@ -595,13 +592,24 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_vdbe_vdbe_untr_2_port_1: + type: tosca.capabilities.Node + 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.outgoing.packets.rate_vdbe_vdbe_untr_1_port: + network.incoming.bytes_vdbe_vdbe_untr_2_port_1: + 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_1_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -626,15 +634,8 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_vdbe_vdbe_untr_1_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.incoming.packets_vdbe_vdbe_untr_1_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_vdbe_vdbe_untr_1_port_1: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -644,11 +645,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_vdbe_vdbe_untr_2_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_vdbe_vdbe_untr_2_port_1: + 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: - - 1 + - 0 - UNBOUNDED os_vdbe: type: tosca.capabilities.OperatingSystem @@ -661,7 +664,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_vdbe_vdbe_untr_2_port: + network.outgoing.bytes_vdbe_vdbe_untr_2_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -673,44 +676,41 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_vdbe_vdbe_untr_2_port: + network.incoming.packets.rate_vdbe_vdbe_untr_2_port_1: 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_vdbe_untr_2_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 + feature_vdbe_vdbe_untr_1_port_1_vlan1: + type: tosca.capabilities.Node occurrences: - - 0 + - 1 - UNBOUNDED - memory_vdbe: + network.incoming.packets_vdbe_vdbe_untr_1_port_1: 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 + network.incoming.bytes.rate_vdbe_vdbe_untr_1_port_1: + 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_vdbe: + 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 - network.outgoing.bytes_vdbe_vdbe_untr_2_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_vdbe: + type: tosca.capabilities.network.Bindable occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_vdbe_vdbe_untr_1_port: + 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: @@ -849,4 +849,4 @@ node_types: type: tosca.capabilities.Node occurrences: - 1 - - UNBOUNDED \ No newline at end of file + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/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 70051fa4b7..0fe1683c3f 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 @@ -471,17 +471,35 @@ topology_template: subinterface_vlan1_aap_untrusted_v6_ip_prefix: - get_input: vdbe_aap_untrusted_v6_ip_prefix - get_input: vdbe_aap_untrusted_v6_ip_prefix + port_vdbe_untr_1_port_1_virtual_machine_interface_mac_addresses: + - - get_input: vdbe_hw_untr_mac_1 + - - get_input: vdbe_hw_untr_mac_1 subinterface_vlan1_aap_sec_untrusted_ip_prefix: - get_input: vdbe_aap_sec_untrusted_ip_prefix - get_input: vdbe_aap_sec_untrusted_ip_prefix compute_vdbe_availability_zone: - get_input: availability_zone_1 - get_input: availability_zone_1 - port_vdbe_untr_2_port_virtual_machine_interface_mac_addresses: - - - get_input: vdbe_hw_untr_mac_1 - - - get_input: vdbe_hw_untr_mac_1 vm_flavor_name: get_input: vdbe_flavor_name + port_vdbe_untr_1_port_1_name: + - str_replace: + template: VM_NAMEDBE001p1n004 + params: + DBE: + get_input: vdbe_device_name + VM_NAME: + get_input: vdbe_name_1 + - str_replace: + template: Port 3 + params: + DBE: + get_input: vdbe_device_name + VM_NAME: + get_input: vdbe_name_1 + port_vdbe_untr_2_port_1_name: + - Port_2 + - Port_4 subinterface_vlan1_counter: - get_input: counter - get_input: counter @@ -503,6 +521,9 @@ topology_template: subinterface_vlan1_aap_untrusted_v6_ip_prefix_len: - get_input: vdbe_aap_untrusted_v6_ip_prefix_len - get_input: vdbe_aap_untrusted_v6_ip_prefix_len + port_vdbe_untr_2_port_1_virtual_machine_interface_mac_addresses: + - - get_input: vdbe_hw_untr_mac_1 + - - get_input: vdbe_hw_untr_mac_1 subinterface_vlan1_mac_address: - get_input: vdbe_hw_untr_mac_1 - get_input: vdbe_hw_untr_mac_1 @@ -515,15 +536,15 @@ topology_template: compute_vdbe_name: - get_input: vdbe_name_1 - get_input: vdbe_name_1 + port_vdbe_untr_2_port_1_virtual_network_refs: + - - fabric_int_net + - - fabric_int_net subinterface_vlan1_ip_v6_address: - get_input: vdbe_untrusted_v6_ip_1 - get_input: vdbe_untrusted_v6_ip_1 subinterface_vlan1_aap_untrusted_ip_prefix: - get_input: vdbe_aap_untrusted_ip_prefix - get_input: vdbe_aap_untrusted_ip_prefix - port_vdbe_untr_2_port_virtual_network_refs: - - - fabric_int_net - - - fabric_int_net subinterface_vlan1_subinterfaces_name_prefix: - str_replace: template: VM_NAMEDBE001p1n004 @@ -539,12 +560,6 @@ topology_template: get_input: vdbe_device_name VM_NAME: get_input: vdbe_name_1 - port_vdbe_untr_2_port_name: - - Port_2 - - Port_4 - port_vdbe_untr_1_port_virtual_network_refs: - - - control_int_net - - - control_int_net subinterface_vlan1_vn_network_list: - control_int_net - control_int_net @@ -553,37 +568,22 @@ topology_template: - get_input: untrusted_num_vn subinterface_vlan1_parent_interface: - vdbe_untr_1_port_1 - - vdbe_untr_1_port_2 + - vdbe_1_untr_1_port_1 subinterface_vlan1_aap_address_mode: - get_input: aap_address_mode - get_input: aap_address_mode subinterface_vlan1_optional_property_1: - OPTIONAL_VALUE_SUBPORT_1 - null - port_vdbe_untr_1_port_name: - - str_replace: - template: VM_NAMEDBE001p1n004 - params: - DBE: - get_input: vdbe_device_name - VM_NAME: - get_input: vdbe_name_1 - - str_replace: - template: Port 3 - params: - DBE: - get_input: vdbe_device_name - VM_NAME: - get_input: vdbe_name_1 subinterface_vlan1_optional_property_2: - null - OPTIONAL_VALUE_SUBPORT_2 subinterface_vlan1_aap_sec_untrusted_ip_prefix_len: - get_input: vdbe_aap_sec_untrusted_ip_prefix_len - get_input: vdbe_aap_sec_untrusted_ip_prefix_len - port_vdbe_untr_1_port_virtual_machine_interface_mac_addresses: - - - get_input: vdbe_hw_untr_mac_1 - - - get_input: vdbe_hw_untr_mac_1 + port_vdbe_untr_1_port_1_virtual_network_refs: + - - control_int_net + - - control_int_net subinterface_vlan1_vlan_tag_list: - get_input: untrusted_vlan_tags - get_input: untrusted_vlan_tags @@ -596,15 +596,15 @@ topology_template: - service_template_filter - index_value requirements: - - link_vdbe_vdbe_untr_1_port: + - link_vdbe_vdbe_untr_1_port_1: capability: tosca.capabilities.network.Linkable node: control_int_net relationship: tosca.relationships.network.LinksTo - - link_vdbe_vdbe_untr_2_port: + - link_vdbe_vdbe_untr_2_port_1: capability: tosca.capabilities.network.Linkable node: fabric_int_net relationship: tosca.relationships.network.LinksTo - - subinterface_link_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_1_port_vlan1: + - subinterface_link_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_1_port_1_vlan1: capability: tosca.capabilities.network.Linkable node: control_int_net relationship: tosca.relationships.network.LinksTo @@ -625,4 +625,4 @@ topology_template: value: get_attribute: - abstract_vdbe - - vdbe_vdbe_untr_1_port_vlan1_aap_address_mode \ No newline at end of file + - vdbe_vdbe_untr_1_port_1_vlan1_aap_address_mode 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/Nested_vdbeServiceTemplate.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/Nested_vdbeServiceTemplate.yaml index 3b803ba26b..c316709067 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/Nested_vdbeServiceTemplate.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/Nested_vdbeServiceTemplate.yaml @@ -11,84 +11,91 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_vdbe_untr_1_port_1_order: + type: integer + required: true + port_vdbe_untr_1_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true subinterface_vlan1_aap_untrusted_v6_ip_prefix: type: list required: true entry_schema: type: string - subinterface_vlan1_aap_sec_untrusted_ip_prefix: + port_vdbe_untr_2_port_1_network_role_tag: + type: string + required: true + port_vdbe_untr_1_port_1_virtual_machine_interface_mac_addresses: type: list required: true entry_schema: - type: string - compute_vdbe_availability_zone: + type: json + subinterface_vlan1_aap_sec_untrusted_ip_prefix: type: list required: true entry_schema: type: string - port_vdbe_untr_2_port_virtual_machine_interface_mac_addresses: + compute_vdbe_availability_zone: type: list required: true entry_schema: - type: json - port_vdbe_untr_2_port_network_role_tag: + type: string + port_vdbe_untr_1_port_1_network_role: type: string required: true vm_flavor_name: type: string required: true - subinterface_vlan1_counter: + port_vdbe_untr_1_port_1_ip_requirements: type: list required: true entry_schema: - type: float - vm_image_name: - type: string - required: true - port_vdbe_untr_2_port_network_role: - type: string - required: true - compute_vdbe_metadata: + type: org.openecomp.datatypes.network.IpRequirements + port_vdbe_untr_1_port_1_name: type: list required: true entry_schema: - type: json - subinterface_vlan1_aap_untrusted_v6_ip_prefix_len: + type: string + port_vdbe_untr_2_port_1_name: type: list required: true entry_schema: type: string - port_vdbe_untr_1_port_ip_requirements: + port_vdbe_untr_2_port_1_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_vdbe_untr_2_port_vlan_requirements: + type: org.openecomp.datatypes.network.VlanRequirements + subinterface_vlan1_counter: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_vdbe_untr_2_port_exCP_naming: - type: org.openecomp.datatypes.Naming + type: float + vm_image_name: + type: string required: true - port_vdbe_untr_2_port_ip_requirements: + compute_vdbe_metadata: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_vdbe_untr_1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + type: json + subinterface_vlan1_aap_untrusted_v6_ip_prefix_len: + type: list required: true - port_vdbe_untr_1_port_order: - type: integer + entry_schema: + type: string + port_vdbe_untr_2_port_1_virtual_machine_interface_mac_addresses: + type: list required: true - port_vdbe_untr_1_port_subnetpoolid: - type: string + entry_schema: + type: json + port_vdbe_untr_2_port_1_virtual_machine_interface_allowed_address_pairs: + type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs required: true - port_vdbe_untr_2_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_vdbe_untr_2_port_1_network_role: + type: string required: true - port_vdbe_untr_1_port_virtual_machine_interface_allowed_address_pairs: + port_vdbe_untr_1_port_1_virtual_machine_interface_allowed_address_pairs: type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs required: true subinterface_vlan1_mac_address: @@ -101,6 +108,9 @@ topology_template: required: true entry_schema: type: string + port_vdbe_untr_1_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true subinterface_vlan1_ip_address: type: list required: true @@ -111,63 +121,56 @@ topology_template: required: true entry_schema: type: string - port_vdbe_untr_1_port_network_role_tag: + port_vdbe_untr_2_port_1_subnetpoolid: type: string required: true - subinterface_vlan1_ip_v6_address: - type: list + port_vdbe_untr_2_port_1_order: + type: integer required: true - entry_schema: - type: string - port_vdbe_untr_1_port_related_networks: + port_vdbe_untr_2_port_1_related_networks: type: list required: true entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - subinterface_vlan1_aap_untrusted_ip_prefix: + port_vdbe_untr_2_port_1_virtual_network_refs: type: list required: true entry_schema: - type: string - port_vdbe_untr_2_port_virtual_network_refs: + type: json + port_vdbe_untr_2_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + subinterface_vlan1_ip_v6_address: type: list required: true entry_schema: - type: json - subinterface_vlan1_subinterfaces_name_prefix: + type: string + subinterface_vlan1_aap_untrusted_ip_prefix: type: list required: true entry_schema: type: string - port_vdbe_untr_1_port_network_role: + port_vdbe_untr_1_port_1_network_role_tag: type: string required: true - port_vdbe_untr_2_port_name: + subinterface_vlan1_subinterfaces_name_prefix: type: list required: true entry_schema: type: string - port_vdbe_untr_2_port_related_networks: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_vdbe_untr_1_port_virtual_network_refs: - type: list + port_vdbe_untr_1_port_1_subnetpoolid: + type: string required: true - entry_schema: - type: json subinterface_vlan1_vn_network_list: type: list required: true entry_schema: type: string - port_vdbe_untr_2_port_subnetpoolid: - type: string - required: true - port_vdbe_untr_2_port_order: - type: integer + port_vdbe_untr_1_port_1_vlan_requirements: + type: list required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements subinterface_vlan1_service_template_filter_count: type: list required: true @@ -183,6 +186,9 @@ topology_template: required: true entry_schema: type: string + port_vdbe_untr_2_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -190,38 +196,32 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_vdbe_untr_1_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true subinterface_vlan1_optional_property_1: type: list required: true entry_schema: type: string - port_vdbe_untr_1_port_name: + port_vdbe_untr_2_port_1_ip_requirements: type: list required: true entry_schema: - type: string - subinterface_vlan1_optional_property_2: + type: org.openecomp.datatypes.network.IpRequirements + port_vdbe_untr_1_port_1_related_networks: type: list required: true entry_schema: - type: string - subinterface_vlan1_aap_sec_untrusted_ip_prefix_len: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + subinterface_vlan1_optional_property_2: type: list required: true entry_schema: type: string - port_vdbe_untr_2_port_virtual_machine_interface_allowed_address_pairs: - type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs - required: true - port_vdbe_untr_1_port_vlan_requirements: + subinterface_vlan1_aap_sec_untrusted_ip_prefix_len: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_vdbe_untr_1_port_virtual_machine_interface_mac_addresses: + type: string + port_vdbe_untr_1_port_1_virtual_network_refs: type: list required: true entry_schema: @@ -251,50 +251,7 @@ topology_template: get_input: - compute_vdbe_name - index_value - vdbe_vdbe_untr_2_port: - type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface - properties: - mac_requirements: - get_input: port_vdbe_untr_2_port_mac_requirements - order: - get_input: port_vdbe_untr_2_port_order - exCP_naming: - get_input: port_vdbe_untr_2_port_exCP_naming - virtual_machine_interface_allowed_address_pairs: - get_input: - - port_vdbe_untr_2_port_virtual_machine_interface_allowed_address_pairs - - index_value - vlan_requirements: - get_input: port_vdbe_untr_2_port_vlan_requirements - subinterface_indicator: false - related_networks: - get_input: port_vdbe_untr_2_port_related_networks - virtual_network_refs: - get_input: - - port_vdbe_untr_2_port_virtual_network_refs - - index_value - ip_requirements: - get_input: port_vdbe_untr_2_port_ip_requirements - network_role_tag: - get_input: port_vdbe_untr_2_port_network_role_tag - virtual_machine_interface_mac_addresses: - get_input: - - port_vdbe_untr_2_port_virtual_machine_interface_mac_addresses - - index_value - network_role: - get_input: port_vdbe_untr_2_port_network_role - subnetpoolid: - get_input: port_vdbe_untr_2_port_subnetpoolid - name: - get_input: - - port_vdbe_untr_2_port_name - - index_value - requirements: - - binding: - capability: tosca.capabilities.network.Bindable - node: vdbe - relationship: tosca.relationships.network.BindsTo - vdbe_vdbe_untr_1_port_vlan1: + vdbe_vdbe_untr_1_port_1_vlan1: type: org.openecomp.resource.abstract.nodes.heat.subinterface.vlan1 directives: - substitutable @@ -381,45 +338,88 @@ topology_template: requirements: - binding_vdbe_untr_x_vlan1-Network-Role_vmi_subport: capability: tosca.capabilities.network.Bindable - node: vdbe_vdbe_untr_1_port + node: vdbe_vdbe_untr_1_port_1 relationship: tosca.relationships.network.BindsTo - vdbe_vdbe_untr_1_port: + vdbe_vdbe_untr_1_port_1: type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface properties: mac_requirements: - get_input: port_vdbe_untr_1_port_mac_requirements + get_input: port_vdbe_untr_1_port_1_mac_requirements order: - get_input: port_vdbe_untr_1_port_order + get_input: port_vdbe_untr_1_port_1_order exCP_naming: - get_input: port_vdbe_untr_1_port_exCP_naming + get_input: port_vdbe_untr_1_port_1_exCP_naming virtual_machine_interface_allowed_address_pairs: get_input: - - port_vdbe_untr_1_port_virtual_machine_interface_allowed_address_pairs + - port_vdbe_untr_1_port_1_virtual_machine_interface_allowed_address_pairs - index_value vlan_requirements: - get_input: port_vdbe_untr_1_port_vlan_requirements + get_input: port_vdbe_untr_1_port_1_vlan_requirements subinterface_indicator: true related_networks: - get_input: port_vdbe_untr_1_port_related_networks + get_input: port_vdbe_untr_1_port_1_related_networks + virtual_network_refs: + get_input: + - port_vdbe_untr_1_port_1_virtual_network_refs + - index_value + ip_requirements: + get_input: port_vdbe_untr_1_port_1_ip_requirements + network_role_tag: + get_input: port_vdbe_untr_1_port_1_network_role_tag + virtual_machine_interface_mac_addresses: + get_input: + - port_vdbe_untr_1_port_1_virtual_machine_interface_mac_addresses + - index_value + network_role: + get_input: port_vdbe_untr_1_port_1_network_role + subnetpoolid: + get_input: port_vdbe_untr_1_port_1_subnetpoolid + name: + get_input: + - port_vdbe_untr_1_port_1_name + - index_value + requirements: + - binding: + capability: tosca.capabilities.network.Bindable + node: vdbe + relationship: tosca.relationships.network.BindsTo + vdbe_vdbe_untr_2_port_1: + type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface + properties: + mac_requirements: + get_input: port_vdbe_untr_2_port_1_mac_requirements + order: + get_input: port_vdbe_untr_2_port_1_order + exCP_naming: + get_input: port_vdbe_untr_2_port_1_exCP_naming + virtual_machine_interface_allowed_address_pairs: + get_input: + - port_vdbe_untr_2_port_1_virtual_machine_interface_allowed_address_pairs + - index_value + vlan_requirements: + get_input: port_vdbe_untr_2_port_1_vlan_requirements + subinterface_indicator: false + related_networks: + get_input: port_vdbe_untr_2_port_1_related_networks virtual_network_refs: get_input: - - port_vdbe_untr_1_port_virtual_network_refs + - port_vdbe_untr_2_port_1_virtual_network_refs - index_value ip_requirements: - get_input: port_vdbe_untr_1_port_ip_requirements + get_input: port_vdbe_untr_2_port_1_ip_requirements network_role_tag: - get_input: port_vdbe_untr_1_port_network_role_tag + get_input: port_vdbe_untr_2_port_1_network_role_tag virtual_machine_interface_mac_addresses: get_input: - - port_vdbe_untr_1_port_virtual_machine_interface_mac_addresses + - port_vdbe_untr_2_port_1_virtual_machine_interface_mac_addresses - index_value network_role: - get_input: port_vdbe_untr_1_port_network_role + get_input: port_vdbe_untr_2_port_1_network_role subnetpoolid: - get_input: port_vdbe_untr_1_port_subnetpoolid + get_input: port_vdbe_untr_2_port_1_subnetpoolid name: get_input: - - port_vdbe_untr_1_port_name + - port_vdbe_untr_2_port_1_name - index_value requirements: - binding: @@ -427,11 +427,11 @@ topology_template: node: vdbe relationship: tosca.relationships.network.BindsTo outputs: - vdbe_vdbe_untr_1_port_vlan1_aap_address_mode: + vdbe_vdbe_untr_1_port_1_vlan1_aap_address_mode: type: string value: get_attribute: - - vdbe_vdbe_untr_1_port_vlan1 + - vdbe_vdbe_untr_1_port_1_vlan1 - aap_address_mode substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.vdbe @@ -448,12 +448,12 @@ topology_template: disk.ephemeral.size_vdbe: - vdbe - disk.ephemeral.size - feature_vdbe_vdbe_untr_2_port: - - vdbe_vdbe_untr_2_port - - feature - feature_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_1_port_vlan1: - - vdbe_vdbe_untr_1_port_vlan1 - - feature_vdbe_untr_x_vlan1-Network-Role_vmi_subport + network.outpoing.packets_vdbe_vdbe_untr_1_port_1: + - vdbe_vdbe_untr_1_port_1 + - network.outpoing.packets + network.outpoing.packets_vdbe_vdbe_untr_2_port_1: + - vdbe_vdbe_untr_2_port_1 + - network.outpoing.packets cpu_util_vdbe: - vdbe - cpu_util @@ -463,30 +463,27 @@ topology_template: disk.write.requests_vdbe: - vdbe - disk.write.requests - feature_vdbe_vdbe_untr_1_port_vlan1: - - vdbe_vdbe_untr_1_port_vlan1 - - feature + network.outgoing.packets.rate_vdbe_vdbe_untr_2_port_1: + - vdbe_vdbe_untr_2_port_1 + - network.outgoing.packets.rate + network.outgoing.packets.rate_vdbe_vdbe_untr_1_port_1: + - vdbe_vdbe_untr_1_port_1 + - network.outgoing.packets.rate disk.device.latency_vdbe: - vdbe - disk.device.latency disk.device.write.requests.rate_vdbe: - vdbe - disk.device.write.requests.rate - network.incoming.packets_vdbe_vdbe_untr_2_port: - - vdbe_vdbe_untr_2_port - - network.incoming.packets - feature_vdbe_vdbe_untr_1_port: - - vdbe_vdbe_untr_1_port - - feature + network.incoming.bytes_vdbe_vdbe_untr_1_port_1: + - vdbe_vdbe_untr_1_port_1 + - network.incoming.bytes disk.write.bytes.rate_vdbe: - vdbe - disk.write.bytes.rate - network.incoming.bytes.rate_vdbe_vdbe_untr_1_port: - - vdbe_vdbe_untr_1_port - - network.incoming.bytes.rate - network.incoming.packets.rate_vdbe_vdbe_untr_1_port: - - vdbe_vdbe_untr_1_port - - network.incoming.packets.rate + network.outgoing.bytes.rate_vdbe_vdbe_untr_2_port_1: + - vdbe_vdbe_untr_2_port_1 + - network.outgoing.bytes.rate scalable_vdbe: - vdbe - scalable @@ -499,12 +496,9 @@ topology_template: disk.device.capacity_vdbe: - vdbe - disk.device.capacity - network.outgoing.bytes.rate_vdbe_vdbe_untr_2_port: - - vdbe_vdbe_untr_2_port - - network.outgoing.bytes.rate - network.outgoing.bytes_vdbe_vdbe_untr_1_port: - - vdbe_vdbe_untr_1_port - - network.outgoing.bytes + binding_vdbe_vdbe_untr_1_port_1: + - vdbe_vdbe_untr_1_port_1 + - binding disk.device.allocation_vdbe: - vdbe - disk.device.allocation @@ -514,27 +508,33 @@ topology_template: memory.usage_vdbe: - vdbe - memory.usage - network.outpoing.packets_vdbe_vdbe_untr_2_port: - - vdbe_vdbe_untr_2_port - - network.outpoing.packets + network.outgoing.bytes_vdbe_vdbe_untr_1_port_1: + - vdbe_vdbe_untr_1_port_1 + - network.outgoing.bytes disk.read.requests_vdbe: - vdbe - disk.read.requests - network.incoming.bytes_vdbe_vdbe_untr_1_port: - - vdbe_vdbe_untr_1_port - - network.incoming.bytes + network.incoming.packets.rate_vdbe_vdbe_untr_1_port_1: + - vdbe_vdbe_untr_1_port_1 + - network.incoming.packets.rate + network.incoming.packets_vdbe_vdbe_untr_2_port_1: + - vdbe_vdbe_untr_2_port_1 + - network.incoming.packets + network.incoming.bytes.rate_vdbe_vdbe_untr_2_port_1: + - vdbe_vdbe_untr_2_port_1 + - network.incoming.bytes.rate + forwarder_vdbe_vdbe_untr_1_port_1: + - vdbe_vdbe_untr_1_port_1 + - forwarder instance_vdbe: - vdbe - instance cpu.delta_vdbe: - vdbe - cpu.delta - network.outgoing.packets.rate_vdbe_vdbe_untr_2_port: - - vdbe_vdbe_untr_2_port - - network.outgoing.packets.rate - binding_vdbe_vdbe_untr_1_port: - - vdbe_vdbe_untr_1_port - - binding + forwarder_vdbe_vdbe_untr_2_port_1: + - vdbe_vdbe_untr_2_port_1 + - forwarder disk.device.read.bytes.rate_vdbe: - vdbe - disk.device.read.bytes.rate @@ -544,33 +544,36 @@ topology_template: memory.resident_vdbe: - vdbe - memory.resident - forwarder_vdbe_vdbe_untr_1_port: - - vdbe_vdbe_untr_1_port - - forwarder disk.write.requests.rate_vdbe: - vdbe - disk.write.requests.rate + feature_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_1_port_1_vlan1: + - vdbe_vdbe_untr_1_port_1_vlan1 + - feature_vdbe_untr_x_vlan1-Network-Role_vmi_subport cpu_vdbe: - vdbe - cpu disk.write.bytes_vdbe: - vdbe - disk.write.bytes - forwarder_vdbe_vdbe_untr_2_port: - - vdbe_vdbe_untr_2_port - - forwarder disk.device.usage_vdbe: - vdbe - disk.device.usage disk.device.read.bytes_vdbe: - vdbe - disk.device.read.bytes + feature_vdbe_vdbe_untr_2_port_1: + - vdbe_vdbe_untr_2_port_1 + - feature disk.latency_vdbe: - vdbe - disk.latency - network.outgoing.packets.rate_vdbe_vdbe_untr_1_port: - - vdbe_vdbe_untr_1_port - - network.outgoing.packets.rate + network.incoming.bytes_vdbe_vdbe_untr_2_port_1: + - vdbe_vdbe_untr_2_port_1 + - network.incoming.bytes + network.outgoing.bytes.rate_vdbe_vdbe_untr_1_port_1: + - vdbe_vdbe_untr_1_port_1 + - network.outgoing.bytes.rate disk.capacity_vdbe: - vdbe - disk.capacity @@ -580,36 +583,39 @@ topology_template: disk.allocation_vdbe: - vdbe - disk.allocation - network.outpoing.packets_vdbe_vdbe_untr_1_port: - - vdbe_vdbe_untr_1_port - - network.outpoing.packets - network.incoming.packets_vdbe_vdbe_untr_1_port: - - vdbe_vdbe_untr_1_port - - network.incoming.packets + feature_vdbe_vdbe_untr_1_port_1: + - vdbe_vdbe_untr_1_port_1 + - feature disk.read.bytes.rate_vdbe: - vdbe - disk.read.bytes.rate - network.incoming.bytes_vdbe_vdbe_untr_2_port: - - vdbe_vdbe_untr_2_port - - network.incoming.bytes + binding_vdbe_vdbe_untr_2_port_1: + - vdbe_vdbe_untr_2_port_1 + - binding os_vdbe: - vdbe - os disk.device.read.requests_vdbe: - vdbe - disk.device.read.requests - network.incoming.packets.rate_vdbe_vdbe_untr_2_port: - - vdbe_vdbe_untr_2_port - - network.incoming.packets.rate + network.outgoing.bytes_vdbe_vdbe_untr_2_port_1: + - vdbe_vdbe_untr_2_port_1 + - network.outgoing.bytes disk.root.size_vdbe: - vdbe - disk.root.size - network.incoming.bytes.rate_vdbe_vdbe_untr_2_port: - - vdbe_vdbe_untr_2_port + network.incoming.packets.rate_vdbe_vdbe_untr_2_port_1: + - vdbe_vdbe_untr_2_port_1 + - network.incoming.packets.rate + feature_vdbe_vdbe_untr_1_port_1_vlan1: + - vdbe_vdbe_untr_1_port_1_vlan1 + - feature + network.incoming.packets_vdbe_vdbe_untr_1_port_1: + - vdbe_vdbe_untr_1_port_1 + - network.incoming.packets + network.incoming.bytes.rate_vdbe_vdbe_untr_1_port_1: + - vdbe_vdbe_untr_1_port_1 - network.incoming.bytes.rate - binding_vdbe_vdbe_untr_2_port: - - vdbe_vdbe_untr_2_port - - binding memory_vdbe: - vdbe - memory @@ -619,12 +625,6 @@ topology_template: disk.device.write.bytes_vdbe: - vdbe - disk.device.write.bytes - network.outgoing.bytes_vdbe_vdbe_untr_2_port: - - vdbe_vdbe_untr_2_port - - network.outgoing.bytes - network.outgoing.bytes.rate_vdbe_vdbe_untr_1_port: - - vdbe_vdbe_untr_1_port - - network.outgoing.bytes.rate disk.device.read.requests.rate_vdbe: - vdbe - disk.device.read.requests.rate @@ -632,30 +632,30 @@ topology_template: - vdbe - disk.read.bytes requirements: - dependency_vdbe_vdbe_untr_1_port: - - vdbe_vdbe_untr_1_port + dependency_vdbe_vdbe_untr_1_port_1: + - vdbe_vdbe_untr_1_port_1 + - dependency + dependency_vdbe_vdbe_untr_2_port_1: + - vdbe_vdbe_untr_2_port_1 + - dependency + dependency_vdbe_vdbe_untr_1_port_1_vlan1: + - vdbe_vdbe_untr_1_port_1_vlan1 - dependency - link_vdbe_vdbe_untr_2_port: - - vdbe_vdbe_untr_2_port - - link local_storage_vdbe: - vdbe - local_storage - dependency_vdbe_vdbe_untr_2_port: - - vdbe_vdbe_untr_2_port - - dependency - dependency_vdbe_vdbe_untr_1_port_vlan1: - - vdbe_vdbe_untr_1_port_vlan1 - - dependency - dependency_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_1_port_vlan1: - - vdbe_vdbe_untr_1_port_vlan1 + link_vdbe_vdbe_untr_2_port_1: + - vdbe_vdbe_untr_2_port_1 + - link + subinterface_link_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_1_port_1_vlan1: + - vdbe_vdbe_untr_1_port_1_vlan1 + - subinterface_link_vdbe_untr_x_vlan1-Network-Role_vmi_subport + dependency_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_1_port_1_vlan1: + - vdbe_vdbe_untr_1_port_1_vlan1 - dependency_vdbe_untr_x_vlan1-Network-Role_vmi_subport - link_vdbe_vdbe_untr_1_port: - - vdbe_vdbe_untr_1_port + link_vdbe_vdbe_untr_1_port_1: + - vdbe_vdbe_untr_1_port_1 - link dependency_vdbe: - vdbe - dependency - subinterface_link_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_1_port_vlan1: - - vdbe_vdbe_untr_1_port_vlan1 - - subinterface_link_vdbe_untr_x_vlan1-Network-Role_vmi_subport \ 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/multiplePortsMultipleVlans/in/main.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/multiplePortsMultipleVlans/in/main.yml index 42b84b7734..59afff7776 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/multiplePortsMultipleVlans/in/main.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/multiplePortsMultipleVlans/in/main.yml @@ -139,7 +139,7 @@ resources: mac_address: get_param: vdbe_hw_untr_mac_1 parent_interface: - get_resource: vdbe_1_untr_vmi_1 + get_resource: vdbe_untr_vmi_1 subinterfaces_name_prefix: str_replace: params: @@ -173,8 +173,8 @@ resources: name: get_param: vdbe_name_1 networks: - - port: {get_resource: vdbe_1_untr_vmi_1} - - port: {get_resource: vdbe_1_oam_vmi_1} + - port: {get_resource: vdbe_untr_vmi_1} + - port: {get_resource: vdbe_oam_vmi_1} vdbe_node_2: type: OS::Nova::Server properties: @@ -194,9 +194,9 @@ resources: name: get_param: vdbe_name_1 networks: - - port: {get_resource: vdbe_1_untr_vmi_2} - - port: {get_resource: vdbe_2_oam_vmi_2} - vdbe_1_untr_vmi_1: + - port: {get_resource: vdbe_1_untr_vmi_1} + - port: {get_resource: vdbe_1_oam_vmi_1} + vdbe_untr_vmi_1: type: OS::ContrailV2::VirtualMachineInterface properties: name: @@ -246,7 +246,7 @@ resources: virtual_network_refs: - get_resource: control_int_net - vdbe_1_oam_vmi_1: + vdbe_oam_vmi_1: type: OS::ContrailV2::VirtualMachineInterface properties: name: Port_2 @@ -292,7 +292,7 @@ resources: - vdbe_1_untr_vmi_2: + vdbe_1_untr_vmi_1: type: OS::ContrailV2::VirtualMachineInterface properties: name: @@ -342,7 +342,7 @@ resources: virtual_network_refs: - get_resource: control_int_net - vdbe_2_oam_vmi_2: + vdbe_1_oam_vmi_1: type: OS::ContrailV2::VirtualMachineInterface properties: name: Port_4 @@ -415,7 +415,7 @@ resources: mac_address: get_param: vdbe_hw_untr_mac_1 parent_interface: - get_resource: vdbe_1_oam_vmi_1 + get_resource: vdbe_oam_vmi_1 subinterfaces_name_prefix: str_replace: params: @@ -462,7 +462,7 @@ resources: mac_address: get_param: vdbe_hw_untr_mac_1 parent_interface: - get_resource: vdbe_1_untr_vmi_2 + get_resource: vdbe_1_untr_vmi_1 subinterfaces_name_prefix: str_replace: params: @@ -508,7 +508,7 @@ resources: mac_address: get_param: vdbe_hw_untr_mac_1 parent_interface: - get_resource: vdbe_2_oam_vmi_2 + get_resource: vdbe_1_oam_vmi_1 subinterfaces_name_prefix: str_replace: params: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/multiplePortsMultipleVlans/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/multiplePortsMultipleVlans/out/GlobalSubstitutionTypesServiceTemplate.yaml index 51a1003a95..52446f0fb1 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/multiplePortsMultipleVlans/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/multiplePortsMultipleVlans/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,51 +8,57 @@ node_types: org.openecomp.resource.abstract.nodes.vdbe: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_vdbe_untr_vmi_virtual_machine_interface_allowed_address_pairs: - type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs - required: true - status: SUPPORTED - port_vdbe_untr_vmi_related_networks: + subinterface_vlan1_aap_untrusted_v6_ip_prefix: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - subinterface_vlan1_aap_untrusted_v6_ip_prefix: + type: string + port_vdbe_oam_vmi_1_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string + type: org.openecomp.datatypes.network.VlanRequirements subinterface_vlan1_aap_sec_untrusted_ip_prefix: type: list required: true status: SUPPORTED entry_schema: type: string - port_vdbe_oam_vmi_virtual_machine_interface_mac_addresses: + subinterface_vlan1_vmac_address: type: list required: true status: SUPPORTED entry_schema: - type: json - subinterface_vlan1_vmac_address: + type: string + compute_vdbe_availability_zone: type: list required: true status: SUPPORTED entry_schema: type: string - compute_vdbe_availability_zone: + port_vdbe_oam_vmi_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_vdbe_oam_vmi_1_virtual_network_refs: type: list required: true status: SUPPORTED entry_schema: - type: string + type: json vm_flavor_name: type: string required: true status: SUPPORTED - port_vdbe_oam_vmi_subnetpoolid: + port_vdbe_untr_vmi_1_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_vdbe_oam_vmi_1_network_role_tag: type: string required: true status: SUPPORTED @@ -72,8 +78,8 @@ node_types: type: string required: true status: SUPPORTED - port_vdbe_oam_vmi_network_role_tag: - type: string + port_vdbe_oam_vmi_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED compute_vdbe_metadata: @@ -88,34 +94,28 @@ node_types: status: SUPPORTED entry_schema: type: string - port_vdbe_oam_vmi_virtual_network_refs: + port_vdbe_untr_vmi_1_name: type: list required: true status: SUPPORTED entry_schema: - type: json - port_vdbe_untr_vmi_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_vdbe_oam_vmi_order: + type: string + port_vdbe_untr_vmi_1_order: type: integer required: true status: SUPPORTED - port_vdbe_oam_vmi_vlan_requirements: + port_vdbe_oam_vmi_1_name: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_vdbe_oam_vmi_name: + type: string + port_vdbe_untr_vmi_1_virtual_network_refs: type: list required: true status: SUPPORTED entry_schema: - type: string + type: json subinterface_vlan2_ip_address: type: list required: true @@ -128,12 +128,18 @@ node_types: status: SUPPORTED entry_schema: type: string - port_vdbe_untr_vmi_network_role: - type: string + port_vdbe_oam_vmi_1_ip_requirements: + type: list required: true status: SUPPORTED - port_vdbe_oam_vmi_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_vdbe_untr_vmi_1_virtual_machine_interface_allowed_address_pairs: + type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs + required: true + status: SUPPORTED + port_vdbe_untr_vmi_1_network_role: + type: string required: true status: SUPPORTED subinterface_vlan2_parent_interface: @@ -148,6 +154,10 @@ node_types: status: SUPPORTED entry_schema: type: string + port_vdbe_untr_vmi_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED subinterface_vlan1_mac_address: type: list required: true @@ -178,29 +188,29 @@ node_types: status: SUPPORTED entry_schema: type: string - port_vdbe_untr_vmi_name: + compute_vdbe_name: type: list required: true status: SUPPORTED entry_schema: type: string - compute_vdbe_name: + subinterface_vlan2_aap_untrusted_ip_prefix: type: list required: true status: SUPPORTED entry_schema: type: string - port_vdbe_untr_vmi_subnetpoolid: + port_vdbe_oam_vmi_1_subnetpoolid: type: string required: true status: SUPPORTED - subinterface_vlan2_aap_untrusted_ip_prefix: + port_vdbe_untr_vmi_1_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_vdbe_untr_vmi_network_role_tag: + type: org.openecomp.datatypes.network.VlanRequirements + port_vdbe_untr_vmi_1_subnetpoolid: type: string required: true status: SUPPORTED @@ -216,6 +226,14 @@ node_types: status: SUPPORTED entry_schema: type: string + port_vdbe_oam_vmi_1_virtual_machine_interface_allowed_address_pairs: + type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs + required: true + status: SUPPORTED + port_vdbe_oam_vmi_1_order: + type: integer + required: true + status: SUPPORTED subinterface_vlan1_aap_untrusted_ip_prefix: type: list required: true @@ -228,32 +246,16 @@ node_types: status: SUPPORTED entry_schema: type: string - port_vdbe_untr_vmi_virtual_machine_interface_mac_addresses: - type: list + port_vdbe_untr_vmi_1_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json subinterface_vlan1_subinterfaces_name_prefix: type: list required: true status: SUPPORTED entry_schema: type: string - port_vdbe_oam_vmi_network_role: - type: string - required: true - status: SUPPORTED - port_vdbe_untr_vmi_virtual_network_refs: - type: list - required: true - status: SUPPORTED - entry_schema: - type: json - port_vdbe_untr_vmi_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED subinterface_vlan2_vlan_tag_list: type: list required: true @@ -272,14 +274,8 @@ node_types: status: SUPPORTED entry_schema: type: string - port_vdbe_oam_vmi_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_vdbe_oam_vmi_exCP_naming: - type: org.openecomp.datatypes.Naming + port_vdbe_untr_vmi_1_network_role_tag: + type: string required: true status: SUPPORTED subinterface_vlan1_service_template_filter_count: @@ -294,10 +290,6 @@ node_types: status: SUPPORTED entry_schema: type: float - port_vdbe_untr_vmi_order: - type: integer - required: true - status: SUPPORTED subinterface_vlan1_parent_interface: type: list required: true @@ -336,36 +328,44 @@ node_types: status: SUPPORTED entry_schema: type: string - port_vdbe_untr_vmi_exCP_naming: - type: org.openecomp.datatypes.Naming + port_vdbe_untr_vmi_1_ip_requirements: + type: list required: true status: SUPPORTED - subinterface_vlan2_service_template_filter_count: + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_vdbe_untr_vmi_1_virtual_machine_interface_mac_addresses: type: list required: true status: SUPPORTED entry_schema: - type: float - subinterface_vlan1_aap_sec_untrusted_ip_prefix_len: + type: json + port_vdbe_oam_vmi_1_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: string - port_vdbe_oam_vmi_related_networks: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + subinterface_vlan2_service_template_filter_count: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_vdbe_untr_vmi_vlan_requirements: + type: float + subinterface_vlan1_aap_sec_untrusted_ip_prefix_len: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_vdbe_oam_vmi_virtual_machine_interface_allowed_address_pairs: - type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs + type: string + port_vdbe_oam_vmi_1_virtual_machine_interface_mac_addresses: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_vdbe_oam_vmi_1_network_role: + type: string required: true status: SUPPORTED subinterface_vlan1_vlan_tag_list: @@ -375,6 +375,19 @@ node_types: entry_schema: type: json requirements: + - dependency_vdbe_vdbe_untr_vmi_1: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - link_vdbe_vdbe_untr_vmi_1: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 - dependency_vdbe: capability: tosca.capabilities.Node node: tosca.nodes.Root @@ -389,85 +402,71 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_vdbe_vdbe_untr_vmi_vlan1: + - dependency_vdbe_vdbe_oam_vmi_1_vlan2: 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_vmi_vlan1: + - dependency_vdbe_1_subint_oam_vmi_1_vdbe_vdbe_oam_vmi_1_vlan2: 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_vmi_vlan1: + - subinterface_link_vdbe_1_subint_oam_vmi_1_vdbe_vdbe_oam_vmi_1_vlan2: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_vdbe_vdbe_untr_vmi: + - dependency_vdbe_vdbe_untr_vmi_1_vlan1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_vdbe_vdbe_untr_vmi: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - - dependency_vdbe_vdbe_oam_vmi: + - dependency_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_vmi_1_vlan1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_vdbe_vdbe_oam_vmi: + - subinterface_link_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_vmi_1_vlan1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_vdbe_vdbe_oam_vmi_vlan2: + - dependency_vdbe_vdbe_oam_vmi_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - dependency_vdbe_1_subint_oam_vmi_1_vdbe_vdbe_oam_vmi_vlan2: - capability: tosca.capabilities.Node - node: tosca.nodes.Root - relationship: tosca.relationships.DependsOn - occurrences: - - 0 - - UNBOUNDED - - subinterface_link_vdbe_1_subint_oam_vmi_1_vdbe_vdbe_oam_vmi_vlan2: + - link_vdbe_vdbe_oam_vmi_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: - feature_vdbe_vdbe_oam_vmi: + feature_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_vmi_1_vlan1: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.incoming.bytes_vdbe_vdbe_oam_vmi: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_vdbe_vdbe_oam_vmi_1_vlan2: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_vdbe_vdbe_untr_vmi: + network.outgoing.packets.rate_vdbe_vdbe_untr_vmi_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -484,6 +483,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.packets.rate_vdbe_vdbe_oam_vmi_1: + 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: @@ -495,18 +500,13 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_vdbe_vdbe_oam_vmi_vlan2: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - cpu_util_vdbe: + network.outgoing.bytes.rate_vdbe_vdbe_untr_vmi_1: 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_oam_vmi: + 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: @@ -524,8 +524,9 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_vdbe_vdbe_untr_vmi: - type: tosca.capabilities.Node + network.outgoing.bytes_vdbe_vdbe_oam_vmi_1: + 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 @@ -547,8 +548,9 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_vdbe_1_subint_oam_vmi_1_vdbe_vdbe_oam_vmi_vlan2: - type: tosca.capabilities.Node + network.incoming.packets_vdbe_vdbe_untr_vmi_1: + 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 @@ -575,8 +577,8 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_vdbe_vdbe_oam_vmi: - type: org.openecomp.capabilities.Forwarder + feature_vdbe_1_subint_oam_vmi_1_vdbe_vdbe_oam_vmi_1_vlan2: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -586,11 +588,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_vmi_vlan1: - type: tosca.capabilities.Node - 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. @@ -603,39 +600,47 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.read.requests_vdbe: + forwarder_vdbe_vdbe_oam_vmi_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets_vdbe_vdbe_oam_vmi_1: 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.packets.rate_vdbe_vdbe_oam_vmi: + 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 - network.incoming.packets_vdbe_vdbe_oam_vmi: + network.outgoing.bytes.rate_vdbe_vdbe_oam_vmi_1: 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 - instance_vdbe: + feature_vdbe_vdbe_oam_vmi_1: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + network.outpoing.packets_vdbe_vdbe_untr_vmi_1: 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_vdbe_oam_vmi: - 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 + network.outpoing.packets_vdbe_vdbe_oam_vmi_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - - 0 + - 1 - UNBOUNDED - network.outpoing.packets_vdbe_vdbe_untr_vmi: + 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: @@ -647,6 +652,14 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_vdbe_vdbe_oam_vmi_1: + 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 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. @@ -665,80 +678,72 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_vdbe_vdbe_untr_vmi: + 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 - disk.write.requests.rate_vdbe: + 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 - network.incoming.bytes.rate_vdbe_vdbe_untr_vmi: + 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 - cpu_vdbe: + network.incoming.bytes.rate_vdbe_vdbe_oam_vmi_1: 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: + 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 - network.incoming.packets.rate_vdbe_vdbe_oam_vmi: + 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 - binding_vdbe_vdbe_untr_vmi: - 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 - network.outgoing.bytes.rate_vdbe_vdbe_oam_vmi: + 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 - disk.device.usage_vdbe: + network.outgoing.bytes_vdbe_vdbe_untr_vmi_1: 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: + network.incoming.bytes.rate_vdbe_vdbe_untr_vmi_1: 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: + network.incoming.packets.rate_vdbe_vdbe_oam_vmi_1: 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_vmi_vlan1: - type: tosca.capabilities.Node + forwarder_vdbe_vdbe_untr_vmi_1: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_vdbe_vdbe_untr_vmi: + network.incoming.packets.rate_vdbe_vdbe_untr_vmi_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -763,9 +768,8 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_vdbe_vdbe_oam_vmi: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_vdbe_vdbe_untr_vmi_1: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -775,13 +779,12 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_vdbe_vdbe_untr_vmi: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_vdbe_vdbe_untr_vmi_1_vlan1: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.incoming.bytes_vdbe_vdbe_untr_vmi: + network.incoming.bytes_vdbe_vdbe_untr_vmi_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -792,10 +795,13 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_vdbe_vdbe_untr_vmi: - type: org.openecomp.capabilities.Forwarder + binding_vdbe_vdbe_untr_vmi_1: + 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: - - 1 + - 0 - UNBOUNDED disk.device.read.requests_vdbe: type: org.openecomp.capabilities.metric.Ceilometer @@ -803,19 +809,13 @@ node_types: 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 - network.outgoing.bytes_vdbe_vdbe_oam_vmi: + network.incoming.bytes_vdbe_vdbe_oam_vmi_1: 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_vmi: + 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: @@ -1073,4 +1073,4 @@ node_types: type: tosca.capabilities.Node occurrences: - 1 - - UNBOUNDED \ No newline at end of file + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/multiplePortsMultipleVlans/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/multiplePortsMultipleVlans/out/MainServiceTemplate.yaml index 226d35e920..dc1bb1e431 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/multiplePortsMultipleVlans/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/multiplePortsMultipleVlans/out/MainServiceTemplate.yaml @@ -486,15 +486,15 @@ topology_template: subinterface_vlan1_aap_sec_untrusted_ip_prefix: - get_input: vdbe_aap_sec_untrusted_ip_prefix - get_input: vdbe_aap_sec_untrusted_ip_prefix - port_vdbe_oam_vmi_virtual_machine_interface_mac_addresses: - - - get_input: vdbe_hw_untr_mac_1 - - - get_input: vdbe_hw_untr_mac_1 subinterface_vlan1_vmac_address: - get_input: vdbe_untrusted_vmac_address - get_input: vdbe_untrusted_vmac_address compute_vdbe_availability_zone: - get_input: availability_zone_1 - get_input: availability_zone_1 + port_vdbe_oam_vmi_1_virtual_network_refs: + - - fabric_int_net + - - fabric_int_net vm_flavor_name: get_input: vdbe_flavor_name subinterface_vlan1_counter: @@ -521,12 +521,27 @@ topology_template: subinterface_vlan1_aap_untrusted_v6_ip_prefix_len: - get_input: vdbe_aap_untrusted_v6_ip_prefix_len - get_input: vdbe_aap_untrusted_v6_ip_prefix_len - port_vdbe_oam_vmi_virtual_network_refs: - - - fabric_int_net - - - fabric_int_net - port_vdbe_oam_vmi_name: + port_vdbe_untr_vmi_1_name: + - str_replace: + template: VM_NAMEDBE001p1n004 + params: + DBE: + get_input: vdbe_device_name + VM_NAME: + get_input: vdbe_name_1 + - str_replace: + template: Port 3 + params: + DBE: + get_input: vdbe_device_name + VM_NAME: + get_input: vdbe_name_1 + port_vdbe_oam_vmi_1_name: - Port_2 - Port_4 + port_vdbe_untr_vmi_1_virtual_network_refs: + - - control_int_net + - - control_int_net subinterface_vlan2_ip_address: - get_input: vdbe_untrusted_ip_1 - get_input: vdbe_untrusted_ip_1 @@ -534,8 +549,8 @@ topology_template: - get_input: vdbe_untrusted_v6_ip_1 - get_input: vdbe_untrusted_v6_ip_1 subinterface_vlan2_parent_interface: + - vdbe_oam_vmi_1 - vdbe_1_oam_vmi_1 - - vdbe_2_oam_vmi_2 subinterface_vlan2_aap_address_mode: - get_input: aap_address_mode - get_input: aap_address_mode @@ -554,21 +569,6 @@ topology_template: subinterface_vlan2_aap_sec_untrusted_ip_prefix: - get_input: vdbe_aap_sec_untrusted_ip_prefix - get_input: vdbe_aap_sec_untrusted_ip_prefix - port_vdbe_untr_vmi_name: - - str_replace: - template: VM_NAMEDBE001p1n004 - params: - DBE: - get_input: vdbe_device_name - VM_NAME: - get_input: vdbe_name_1 - - str_replace: - template: Port 3 - params: - DBE: - get_input: vdbe_device_name - VM_NAME: - get_input: vdbe_name_1 compute_vdbe_name: - get_input: vdbe_name_1 - get_input: vdbe_name_1 @@ -587,9 +587,6 @@ topology_template: subinterface_vlan2_vn_network_list: - fabric_int_net - fabric_int_net - port_vdbe_untr_vmi_virtual_machine_interface_mac_addresses: - - - get_input: vdbe_hw_untr_mac_1 - - - get_input: vdbe_hw_untr_mac_1 subinterface_vlan1_subinterfaces_name_prefix: - str_replace: template: VM_NAMEDBE001p1n004 @@ -605,9 +602,6 @@ topology_template: get_input: vdbe_device_name VM_NAME: get_input: vdbe_name_1 - port_vdbe_untr_vmi_virtual_network_refs: - - - control_int_net - - - control_int_net subinterface_vlan2_vlan_tag_list: - get_input: untrusted_vlan_tags - get_input: untrusted_vlan_tags @@ -624,8 +618,8 @@ topology_template: - get_input: counter - get_input: counter subinterface_vlan1_parent_interface: + - vdbe_untr_vmi_1 - vdbe_1_untr_vmi_1 - - vdbe_1_untr_vmi_2 subinterface_vlan1_aap_address_mode: - get_input: aap_address_mode - get_input: aap_address_mode @@ -650,12 +644,18 @@ topology_template: subinterface_vlan2_aap_untrusted_v6_ip_prefix_len: - get_input: vdbe_aap_untrusted_v6_ip_prefix_len - get_input: vdbe_aap_untrusted_v6_ip_prefix_len + port_vdbe_untr_vmi_1_virtual_machine_interface_mac_addresses: + - - get_input: vdbe_hw_untr_mac_1 + - - get_input: vdbe_hw_untr_mac_1 subinterface_vlan2_service_template_filter_count: - 5 - 5 subinterface_vlan1_aap_sec_untrusted_ip_prefix_len: - get_input: vdbe_aap_sec_untrusted_ip_prefix_len - get_input: vdbe_aap_sec_untrusted_ip_prefix_len + port_vdbe_oam_vmi_1_virtual_machine_interface_mac_addresses: + - - get_input: vdbe_hw_untr_mac_1 + - - get_input: vdbe_hw_untr_mac_1 subinterface_vlan1_vlan_tag_list: - get_input: untrusted_vlan_tags - get_input: untrusted_vlan_tags @@ -668,15 +668,15 @@ topology_template: - service_template_filter - index_value requirements: - - link_vdbe_vdbe_untr_vmi: + - link_vdbe_vdbe_untr_vmi_1: capability: tosca.capabilities.network.Linkable node: control_int_net relationship: tosca.relationships.network.LinksTo - - link_vdbe_vdbe_oam_vmi: + - link_vdbe_vdbe_oam_vmi_1: capability: tosca.capabilities.network.Linkable node: fabric_int_net relationship: tosca.relationships.network.LinksTo - - subinterface_link_vdbe_1_subint_oam_vmi_1_vdbe_vdbe_oam_vmi_vlan2: + - subinterface_link_vdbe_1_subint_oam_vmi_1_vdbe_vdbe_oam_vmi_1_vlan2: capability: tosca.capabilities.network.Linkable node: fabric_int_net relationship: tosca.relationships.network.LinksTo diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/multiplePortsMultipleVlans/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/pattern1c1/multiplePortsMultipleVlans/out/Nested_vdbeServiceTemplate.yaml index 196ba8fdd6..9406e5cb10 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/multiplePortsMultipleVlans/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/pattern1c1/multiplePortsMultipleVlans/out/Nested_vdbeServiceTemplate.yaml @@ -11,29 +11,21 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_vdbe_untr_vmi_virtual_machine_interface_allowed_address_pairs: - type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs - required: true - port_vdbe_untr_vmi_related_networks: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments subinterface_vlan1_aap_untrusted_v6_ip_prefix: type: list required: true entry_schema: type: string - subinterface_vlan1_aap_sec_untrusted_ip_prefix: + port_vdbe_oam_vmi_1_vlan_requirements: type: list required: true entry_schema: - type: string - port_vdbe_oam_vmi_virtual_machine_interface_mac_addresses: + type: org.openecomp.datatypes.network.VlanRequirements + subinterface_vlan1_aap_sec_untrusted_ip_prefix: type: list required: true entry_schema: - type: json + type: string subinterface_vlan1_vmac_address: type: list required: true @@ -44,10 +36,23 @@ topology_template: required: true entry_schema: type: string + port_vdbe_oam_vmi_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_vdbe_oam_vmi_1_virtual_network_refs: + type: list + required: true + entry_schema: + type: json vm_flavor_name: type: string required: true - port_vdbe_oam_vmi_subnetpoolid: + port_vdbe_untr_vmi_1_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_vdbe_oam_vmi_1_network_role_tag: type: string required: true subinterface_vlan1_counter: @@ -63,8 +68,8 @@ topology_template: vm_image_name: type: string required: true - port_vdbe_oam_vmi_network_role_tag: - type: string + port_vdbe_oam_vmi_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true compute_vdbe_metadata: type: list @@ -76,29 +81,24 @@ topology_template: required: true entry_schema: type: string - port_vdbe_oam_vmi_virtual_network_refs: - type: list - required: true - entry_schema: - type: json - port_vdbe_untr_vmi_ip_requirements: + port_vdbe_untr_vmi_1_name: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_vdbe_oam_vmi_order: + type: string + port_vdbe_untr_vmi_1_order: type: integer required: true - port_vdbe_oam_vmi_vlan_requirements: + port_vdbe_oam_vmi_1_name: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_vdbe_oam_vmi_name: + type: string + port_vdbe_untr_vmi_1_virtual_network_refs: type: list required: true entry_schema: - type: string + type: json subinterface_vlan2_ip_address: type: list required: true @@ -109,11 +109,16 @@ topology_template: required: true entry_schema: type: string - port_vdbe_untr_vmi_network_role: - type: string + port_vdbe_oam_vmi_1_ip_requirements: + type: list required: true - port_vdbe_oam_vmi_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_vdbe_untr_vmi_1_virtual_machine_interface_allowed_address_pairs: + type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs + required: true + port_vdbe_untr_vmi_1_network_role: + type: string required: true subinterface_vlan2_parent_interface: type: list @@ -125,6 +130,9 @@ topology_template: required: true entry_schema: type: string + port_vdbe_untr_vmi_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true subinterface_vlan1_mac_address: type: list required: true @@ -150,25 +158,25 @@ topology_template: required: true entry_schema: type: string - port_vdbe_untr_vmi_name: + compute_vdbe_name: type: list required: true entry_schema: type: string - compute_vdbe_name: + subinterface_vlan2_aap_untrusted_ip_prefix: type: list required: true entry_schema: type: string - port_vdbe_untr_vmi_subnetpoolid: + port_vdbe_oam_vmi_1_subnetpoolid: type: string required: true - subinterface_vlan2_aap_untrusted_ip_prefix: + port_vdbe_untr_vmi_1_vlan_requirements: type: list required: true entry_schema: - type: string - port_vdbe_untr_vmi_network_role_tag: + type: org.openecomp.datatypes.network.VlanRequirements + port_vdbe_untr_vmi_1_subnetpoolid: type: string required: true subinterface_vlan1_ip_v6_address: @@ -181,6 +189,12 @@ topology_template: required: true entry_schema: type: string + port_vdbe_oam_vmi_1_virtual_machine_interface_allowed_address_pairs: + type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs + required: true + port_vdbe_oam_vmi_1_order: + type: integer + required: true subinterface_vlan1_aap_untrusted_ip_prefix: type: list required: true @@ -191,27 +205,14 @@ topology_template: required: true entry_schema: type: string - port_vdbe_untr_vmi_virtual_machine_interface_mac_addresses: - type: list + port_vdbe_untr_vmi_1_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json subinterface_vlan1_subinterfaces_name_prefix: type: list required: true entry_schema: type: string - port_vdbe_oam_vmi_network_role: - type: string - required: true - port_vdbe_untr_vmi_virtual_network_refs: - type: list - required: true - entry_schema: - type: json - port_vdbe_untr_vmi_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true subinterface_vlan2_vlan_tag_list: type: list required: true @@ -227,13 +228,8 @@ topology_template: required: true entry_schema: type: string - port_vdbe_oam_vmi_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_vdbe_oam_vmi_exCP_naming: - type: org.openecomp.datatypes.Naming + port_vdbe_untr_vmi_1_network_role_tag: + type: string required: true subinterface_vlan1_service_template_filter_count: type: list @@ -245,9 +241,6 @@ topology_template: required: true entry_schema: type: float - port_vdbe_untr_vmi_order: - type: integer - required: true subinterface_vlan1_parent_interface: type: list required: true @@ -280,9 +273,21 @@ topology_template: required: true entry_schema: type: string - port_vdbe_untr_vmi_exCP_naming: - type: org.openecomp.datatypes.Naming + port_vdbe_untr_vmi_1_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_vdbe_untr_vmi_1_virtual_machine_interface_mac_addresses: + type: list + required: true + entry_schema: + type: json + port_vdbe_oam_vmi_1_related_networks: + type: list required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments subinterface_vlan2_service_template_filter_count: type: list required: true @@ -293,18 +298,13 @@ topology_template: required: true entry_schema: type: string - port_vdbe_oam_vmi_related_networks: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_vdbe_untr_vmi_vlan_requirements: + port_vdbe_oam_vmi_1_virtual_machine_interface_mac_addresses: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_vdbe_oam_vmi_virtual_machine_interface_allowed_address_pairs: - type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs + type: json + port_vdbe_oam_vmi_1_network_role: + type: string required: true subinterface_vlan1_vlan_tag_list: type: list @@ -312,6 +312,49 @@ topology_template: entry_schema: type: json node_templates: + vdbe_vdbe_untr_vmi_1: + type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface + properties: + mac_requirements: + get_input: port_vdbe_untr_vmi_1_mac_requirements + order: + get_input: port_vdbe_untr_vmi_1_order + exCP_naming: + get_input: port_vdbe_untr_vmi_1_exCP_naming + virtual_machine_interface_allowed_address_pairs: + get_input: + - port_vdbe_untr_vmi_1_virtual_machine_interface_allowed_address_pairs + - index_value + vlan_requirements: + get_input: port_vdbe_untr_vmi_1_vlan_requirements + subinterface_indicator: true + related_networks: + get_input: port_vdbe_untr_vmi_1_related_networks + virtual_network_refs: + get_input: + - port_vdbe_untr_vmi_1_virtual_network_refs + - index_value + ip_requirements: + get_input: port_vdbe_untr_vmi_1_ip_requirements + network_role_tag: + get_input: port_vdbe_untr_vmi_1_network_role_tag + virtual_machine_interface_mac_addresses: + get_input: + - port_vdbe_untr_vmi_1_virtual_machine_interface_mac_addresses + - index_value + network_role: + get_input: port_vdbe_untr_vmi_1_network_role + subnetpoolid: + get_input: port_vdbe_untr_vmi_1_subnetpoolid + name: + get_input: + - port_vdbe_untr_vmi_1_name + - index_value + requirements: + - binding: + capability: tosca.capabilities.network.Bindable + node: vdbe + relationship: tosca.relationships.network.BindsTo vdbe: type: org.openecomp.resource.vfc.compute.nodes.heat.vdbe properties: @@ -331,296 +374,253 @@ topology_template: get_input: - compute_vdbe_name - index_value - vdbe_vdbe_untr_vmi_vlan1: - type: org.openecomp.resource.abstract.nodes.heat.subinterface.vlan1 + vdbe_vdbe_oam_vmi_1_vlan2: + type: org.openecomp.resource.abstract.nodes.heat.subinterface.vlan2 directives: - substitutable properties: aap_untrusted_ip_prefix: get_input: - - subinterface_vlan1_aap_untrusted_ip_prefix + - subinterface_vlan2_aap_untrusted_ip_prefix - index_value aap_sec_untrusted_ip_prefix: get_input: - - subinterface_vlan1_aap_sec_untrusted_ip_prefix + - subinterface_vlan2_aap_sec_untrusted_ip_prefix - index_value ip_v6_address: get_input: - - subinterface_vlan1_ip_v6_address + - subinterface_vlan2_ip_v6_address - index_value counter: get_input: - - subinterface_vlan1_counter + - subinterface_vlan2_counter - index_value ip_address: get_input: - - subinterface_vlan1_ip_address + - subinterface_vlan2_ip_address - index_value subinterfaces_name_prefix: get_input: - - subinterface_vlan1_subinterfaces_name_prefix + - subinterface_vlan2_subinterfaces_name_prefix - index_value aap_address_mode: get_input: - - subinterface_vlan1_aap_address_mode + - subinterface_vlan2_aap_address_mode - index_value service_template_filter: count: get_input: - - subinterface_vlan1_service_template_filter_count + - subinterface_vlan2_service_template_filter_count - index_value - substitute_service_template: vlan1ServiceTemplate.yaml - mandatory: false + substitute_service_template: vlan2ServiceTemplate.yaml + mandatory: true aap_untrusted_v6_ip_prefix: get_input: - - subinterface_vlan1_aap_untrusted_v6_ip_prefix + - subinterface_vlan2_aap_untrusted_v6_ip_prefix - index_value parent_interface: get_input: - - subinterface_vlan1_parent_interface + - subinterface_vlan2_parent_interface - index_value vn_network_list: get_input: - - subinterface_vlan1_vn_network_list + - subinterface_vlan2_vn_network_list - index_value mac_address: get_input: - - subinterface_vlan1_mac_address + - subinterface_vlan2_mac_address - index_value vlan_tag_list: get_input: - - subinterface_vlan1_vlan_tag_list + - subinterface_vlan2_vlan_tag_list - index_value aap_sec_untrusted_ip_prefix_len: get_input: - - subinterface_vlan1_aap_sec_untrusted_ip_prefix_len + - subinterface_vlan2_aap_sec_untrusted_ip_prefix_len - index_value vmac_address: get_input: - - subinterface_vlan1_vmac_address + - subinterface_vlan2_vmac_address - index_value aap_untrusted_v6_ip_prefix_len: get_input: - - subinterface_vlan1_aap_untrusted_v6_ip_prefix_len + - subinterface_vlan2_aap_untrusted_v6_ip_prefix_len - index_value aap_untrusted_ip_prefix_len: get_input: - - subinterface_vlan1_aap_untrusted_ip_prefix_len - - index_value - requirements: - - binding_vdbe_0_subint_untr_vmi_0: - capability: tosca.capabilities.network.Bindable - node: vdbe_vdbe_untr_vmi - relationship: tosca.relationships.network.BindsTo - vdbe_vdbe_untr_vmi: - type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface - properties: - mac_requirements: - get_input: port_vdbe_untr_vmi_mac_requirements - order: - get_input: port_vdbe_untr_vmi_order - exCP_naming: - get_input: port_vdbe_untr_vmi_exCP_naming - virtual_machine_interface_allowed_address_pairs: - get_input: - - port_vdbe_untr_vmi_virtual_machine_interface_allowed_address_pairs - - index_value - vlan_requirements: - get_input: port_vdbe_untr_vmi_vlan_requirements - subinterface_indicator: true - related_networks: - get_input: port_vdbe_untr_vmi_related_networks - virtual_network_refs: - get_input: - - port_vdbe_untr_vmi_virtual_network_refs - - index_value - ip_requirements: - get_input: port_vdbe_untr_vmi_ip_requirements - network_role_tag: - get_input: port_vdbe_untr_vmi_network_role_tag - virtual_machine_interface_mac_addresses: - get_input: - - port_vdbe_untr_vmi_virtual_machine_interface_mac_addresses - - index_value - network_role: - get_input: port_vdbe_untr_vmi_network_role - subnetpoolid: - get_input: port_vdbe_untr_vmi_subnetpoolid - name: - get_input: - - port_vdbe_untr_vmi_name - - index_value - requirements: - - binding: - capability: tosca.capabilities.network.Bindable - node: vdbe - relationship: tosca.relationships.network.BindsTo - vdbe_vdbe_oam_vmi: - type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface - properties: - mac_requirements: - get_input: port_vdbe_oam_vmi_mac_requirements - order: - get_input: port_vdbe_oam_vmi_order - exCP_naming: - get_input: port_vdbe_oam_vmi_exCP_naming - virtual_machine_interface_allowed_address_pairs: - get_input: - - port_vdbe_oam_vmi_virtual_machine_interface_allowed_address_pairs - - index_value - vlan_requirements: - get_input: port_vdbe_oam_vmi_vlan_requirements - subinterface_indicator: true - related_networks: - get_input: port_vdbe_oam_vmi_related_networks - virtual_network_refs: - get_input: - - port_vdbe_oam_vmi_virtual_network_refs - - index_value - ip_requirements: - get_input: port_vdbe_oam_vmi_ip_requirements - network_role_tag: - get_input: port_vdbe_oam_vmi_network_role_tag - virtual_machine_interface_mac_addresses: - get_input: - - port_vdbe_oam_vmi_virtual_machine_interface_mac_addresses - - index_value - network_role: - get_input: port_vdbe_oam_vmi_network_role - subnetpoolid: - get_input: port_vdbe_oam_vmi_subnetpoolid - name: - get_input: - - port_vdbe_oam_vmi_name + - subinterface_vlan2_aap_untrusted_ip_prefix_len - index_value requirements: - - binding: + - binding_vdbe_1_subint_oam_vmi_1: capability: tosca.capabilities.network.Bindable - node: vdbe + node: vdbe_vdbe_oam_vmi_1 relationship: tosca.relationships.network.BindsTo - vdbe_vdbe_oam_vmi_vlan2: - type: org.openecomp.resource.abstract.nodes.heat.subinterface.vlan2 + vdbe_vdbe_untr_vmi_1_vlan1: + type: org.openecomp.resource.abstract.nodes.heat.subinterface.vlan1 directives: - substitutable properties: aap_untrusted_ip_prefix: get_input: - - subinterface_vlan2_aap_untrusted_ip_prefix + - subinterface_vlan1_aap_untrusted_ip_prefix - index_value aap_sec_untrusted_ip_prefix: get_input: - - subinterface_vlan2_aap_sec_untrusted_ip_prefix + - subinterface_vlan1_aap_sec_untrusted_ip_prefix - index_value ip_v6_address: get_input: - - subinterface_vlan2_ip_v6_address + - subinterface_vlan1_ip_v6_address - index_value counter: get_input: - - subinterface_vlan2_counter + - subinterface_vlan1_counter - index_value ip_address: get_input: - - subinterface_vlan2_ip_address + - subinterface_vlan1_ip_address - index_value subinterfaces_name_prefix: get_input: - - subinterface_vlan2_subinterfaces_name_prefix + - subinterface_vlan1_subinterfaces_name_prefix - index_value aap_address_mode: get_input: - - subinterface_vlan2_aap_address_mode + - subinterface_vlan1_aap_address_mode - index_value service_template_filter: count: get_input: - - subinterface_vlan2_service_template_filter_count + - subinterface_vlan1_service_template_filter_count - index_value - substitute_service_template: vlan2ServiceTemplate.yaml - mandatory: true + substitute_service_template: vlan1ServiceTemplate.yaml + mandatory: false aap_untrusted_v6_ip_prefix: get_input: - - subinterface_vlan2_aap_untrusted_v6_ip_prefix + - subinterface_vlan1_aap_untrusted_v6_ip_prefix - index_value parent_interface: get_input: - - subinterface_vlan2_parent_interface + - subinterface_vlan1_parent_interface - index_value vn_network_list: get_input: - - subinterface_vlan2_vn_network_list + - subinterface_vlan1_vn_network_list - index_value mac_address: get_input: - - subinterface_vlan2_mac_address + - subinterface_vlan1_mac_address - index_value vlan_tag_list: get_input: - - subinterface_vlan2_vlan_tag_list + - subinterface_vlan1_vlan_tag_list - index_value aap_sec_untrusted_ip_prefix_len: get_input: - - subinterface_vlan2_aap_sec_untrusted_ip_prefix_len + - subinterface_vlan1_aap_sec_untrusted_ip_prefix_len - index_value vmac_address: get_input: - - subinterface_vlan2_vmac_address + - subinterface_vlan1_vmac_address - index_value aap_untrusted_v6_ip_prefix_len: get_input: - - subinterface_vlan2_aap_untrusted_v6_ip_prefix_len + - subinterface_vlan1_aap_untrusted_v6_ip_prefix_len - index_value aap_untrusted_ip_prefix_len: get_input: - - subinterface_vlan2_aap_untrusted_ip_prefix_len + - subinterface_vlan1_aap_untrusted_ip_prefix_len - index_value requirements: - - binding_vdbe_1_subint_oam_vmi_1: + - binding_vdbe_0_subint_untr_vmi_0: capability: tosca.capabilities.network.Bindable - node: vdbe_vdbe_oam_vmi + node: vdbe_vdbe_untr_vmi_1 + relationship: tosca.relationships.network.BindsTo + vdbe_vdbe_oam_vmi_1: + type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface + properties: + mac_requirements: + get_input: port_vdbe_oam_vmi_1_mac_requirements + order: + get_input: port_vdbe_oam_vmi_1_order + exCP_naming: + get_input: port_vdbe_oam_vmi_1_exCP_naming + virtual_machine_interface_allowed_address_pairs: + get_input: + - port_vdbe_oam_vmi_1_virtual_machine_interface_allowed_address_pairs + - index_value + vlan_requirements: + get_input: port_vdbe_oam_vmi_1_vlan_requirements + subinterface_indicator: true + related_networks: + get_input: port_vdbe_oam_vmi_1_related_networks + virtual_network_refs: + get_input: + - port_vdbe_oam_vmi_1_virtual_network_refs + - index_value + ip_requirements: + get_input: port_vdbe_oam_vmi_1_ip_requirements + network_role_tag: + get_input: port_vdbe_oam_vmi_1_network_role_tag + virtual_machine_interface_mac_addresses: + get_input: + - port_vdbe_oam_vmi_1_virtual_machine_interface_mac_addresses + - index_value + network_role: + get_input: port_vdbe_oam_vmi_1_network_role + subnetpoolid: + get_input: port_vdbe_oam_vmi_1_subnetpoolid + name: + get_input: + - port_vdbe_oam_vmi_1_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: - feature_vdbe_vdbe_oam_vmi: - - vdbe_vdbe_oam_vmi + feature_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_vmi_1_vlan1: + - vdbe_vdbe_untr_vmi_1_vlan1 + - feature_vdbe_0_subint_untr_vmi_0 + feature_vdbe_vdbe_oam_vmi_1_vlan2: + - vdbe_vdbe_oam_vmi_1_vlan2 - feature - network.incoming.bytes_vdbe_vdbe_oam_vmi: - - vdbe_vdbe_oam_vmi - - network.incoming.bytes - network.incoming.packets.rate_vdbe_vdbe_untr_vmi: - - vdbe_vdbe_untr_vmi - - network.incoming.packets.rate + network.outgoing.packets.rate_vdbe_vdbe_untr_vmi_1: + - vdbe_vdbe_untr_vmi_1 + - network.outgoing.packets.rate feature_vdbe: - vdbe - feature disk.device.iops_vdbe: - vdbe - disk.device.iops + network.outgoing.packets.rate_vdbe_vdbe_oam_vmi_1: + - vdbe_vdbe_oam_vmi_1 + - network.outgoing.packets.rate endpoint_vdbe: - vdbe - endpoint disk.ephemeral.size_vdbe: - vdbe - disk.ephemeral.size - feature_vdbe_vdbe_oam_vmi_vlan2: - - vdbe_vdbe_oam_vmi_vlan2 - - feature + network.outgoing.bytes.rate_vdbe_vdbe_untr_vmi_1: + - vdbe_vdbe_untr_vmi_1 + - network.outgoing.bytes.rate cpu_util_vdbe: - vdbe - cpu_util - network.incoming.bytes.rate_vdbe_vdbe_oam_vmi: - - vdbe_vdbe_oam_vmi - - network.incoming.bytes.rate vcpus_vdbe: - vdbe - vcpus disk.write.requests_vdbe: - vdbe - disk.write.requests - feature_vdbe_vdbe_untr_vmi: - - vdbe_vdbe_untr_vmi - - feature + network.outgoing.bytes_vdbe_vdbe_oam_vmi_1: + - vdbe_vdbe_oam_vmi_1 + - network.outgoing.bytes disk.device.latency_vdbe: - vdbe - disk.device.latency @@ -630,9 +630,9 @@ topology_template: disk.write.bytes.rate_vdbe: - vdbe - disk.write.bytes.rate - feature_vdbe_1_subint_oam_vmi_1_vdbe_vdbe_oam_vmi_vlan2: - - vdbe_vdbe_oam_vmi_vlan2 - - feature_vdbe_1_subint_oam_vmi_1 + network.incoming.packets_vdbe_vdbe_untr_vmi_1: + - vdbe_vdbe_untr_vmi_1 + - network.incoming.packets scalable_vdbe: - vdbe - scalable @@ -645,42 +645,48 @@ topology_template: disk.device.capacity_vdbe: - vdbe - disk.device.capacity - forwarder_vdbe_vdbe_oam_vmi: - - vdbe_vdbe_oam_vmi - - forwarder + feature_vdbe_1_subint_oam_vmi_1_vdbe_vdbe_oam_vmi_1_vlan2: + - vdbe_vdbe_oam_vmi_1_vlan2 + - feature_vdbe_1_subint_oam_vmi_1 disk.device.allocation_vdbe: - vdbe - disk.device.allocation - feature_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_vmi_vlan1: - - vdbe_vdbe_untr_vmi_vlan1 - - feature_vdbe_0_subint_untr_vmi_0 disk.usage_vdbe: - vdbe - disk.usage memory.usage_vdbe: - vdbe - memory.usage + forwarder_vdbe_vdbe_oam_vmi_1: + - vdbe_vdbe_oam_vmi_1 + - forwarder + network.incoming.packets_vdbe_vdbe_oam_vmi_1: + - vdbe_vdbe_oam_vmi_1 + - network.incoming.packets disk.read.requests_vdbe: - vdbe - disk.read.requests - network.outgoing.packets.rate_vdbe_vdbe_oam_vmi: - - vdbe_vdbe_oam_vmi - - network.outgoing.packets.rate - network.incoming.packets_vdbe_vdbe_oam_vmi: - - vdbe_vdbe_oam_vmi - - network.incoming.packets + network.outgoing.bytes.rate_vdbe_vdbe_oam_vmi_1: + - vdbe_vdbe_oam_vmi_1 + - network.outgoing.bytes.rate + feature_vdbe_vdbe_oam_vmi_1: + - vdbe_vdbe_oam_vmi_1 + - feature + network.outpoing.packets_vdbe_vdbe_untr_vmi_1: + - vdbe_vdbe_untr_vmi_1 + - network.outpoing.packets + network.outpoing.packets_vdbe_vdbe_oam_vmi_1: + - vdbe_vdbe_oam_vmi_1 + - network.outpoing.packets instance_vdbe: - vdbe - instance - binding_vdbe_vdbe_oam_vmi: - - vdbe_vdbe_oam_vmi - - binding - network.outpoing.packets_vdbe_vdbe_untr_vmi: - - vdbe_vdbe_untr_vmi - - network.outpoing.packets cpu.delta_vdbe: - vdbe - cpu.delta + binding_vdbe_vdbe_oam_vmi_1: + - vdbe_vdbe_oam_vmi_1 + - binding disk.device.read.bytes.rate_vdbe: - vdbe - disk.device.read.bytes.rate @@ -690,30 +696,18 @@ topology_template: memory.resident_vdbe: - vdbe - memory.resident - network.incoming.packets_vdbe_vdbe_untr_vmi: - - vdbe_vdbe_untr_vmi - - network.incoming.packets disk.write.requests.rate_vdbe: - vdbe - disk.write.requests.rate - network.incoming.bytes.rate_vdbe_vdbe_untr_vmi: - - vdbe_vdbe_untr_vmi - - network.incoming.bytes.rate cpu_vdbe: - vdbe - cpu disk.write.bytes_vdbe: - vdbe - disk.write.bytes - network.incoming.packets.rate_vdbe_vdbe_oam_vmi: - - vdbe_vdbe_oam_vmi - - network.incoming.packets.rate - binding_vdbe_vdbe_untr_vmi: - - vdbe_vdbe_untr_vmi - - binding - network.outgoing.bytes.rate_vdbe_vdbe_oam_vmi: - - vdbe_vdbe_oam_vmi - - network.outgoing.bytes.rate + network.incoming.bytes.rate_vdbe_vdbe_oam_vmi_1: + - vdbe_vdbe_oam_vmi_1 + - network.incoming.bytes.rate disk.device.usage_vdbe: - vdbe - disk.device.usage @@ -723,12 +717,21 @@ topology_template: disk.latency_vdbe: - vdbe - disk.latency - feature_vdbe_vdbe_untr_vmi_vlan1: - - vdbe_vdbe_untr_vmi_vlan1 - - feature - network.outgoing.bytes.rate_vdbe_vdbe_untr_vmi: - - vdbe_vdbe_untr_vmi - - network.outgoing.bytes.rate + network.outgoing.bytes_vdbe_vdbe_untr_vmi_1: + - vdbe_vdbe_untr_vmi_1 + - network.outgoing.bytes + network.incoming.bytes.rate_vdbe_vdbe_untr_vmi_1: + - vdbe_vdbe_untr_vmi_1 + - network.incoming.bytes.rate + network.incoming.packets.rate_vdbe_vdbe_oam_vmi_1: + - vdbe_vdbe_oam_vmi_1 + - network.incoming.packets.rate + forwarder_vdbe_vdbe_untr_vmi_1: + - vdbe_vdbe_untr_vmi_1 + - forwarder + network.incoming.packets.rate_vdbe_vdbe_untr_vmi_1: + - vdbe_vdbe_untr_vmi_1 + - network.incoming.packets.rate disk.capacity_vdbe: - vdbe - disk.capacity @@ -738,36 +741,33 @@ topology_template: disk.allocation_vdbe: - vdbe - disk.allocation - network.outpoing.packets_vdbe_vdbe_oam_vmi: - - vdbe_vdbe_oam_vmi - - network.outpoing.packets + feature_vdbe_vdbe_untr_vmi_1: + - vdbe_vdbe_untr_vmi_1 + - feature disk.read.bytes.rate_vdbe: - vdbe - disk.read.bytes.rate - network.outgoing.packets.rate_vdbe_vdbe_untr_vmi: - - vdbe_vdbe_untr_vmi - - network.outgoing.packets.rate - network.incoming.bytes_vdbe_vdbe_untr_vmi: - - vdbe_vdbe_untr_vmi + feature_vdbe_vdbe_untr_vmi_1_vlan1: + - vdbe_vdbe_untr_vmi_1_vlan1 + - feature + network.incoming.bytes_vdbe_vdbe_untr_vmi_1: + - vdbe_vdbe_untr_vmi_1 - network.incoming.bytes os_vdbe: - vdbe - os - forwarder_vdbe_vdbe_untr_vmi: - - vdbe_vdbe_untr_vmi - - forwarder + binding_vdbe_vdbe_untr_vmi_1: + - vdbe_vdbe_untr_vmi_1 + - binding disk.device.read.requests_vdbe: - vdbe - disk.device.read.requests + network.incoming.bytes_vdbe_vdbe_oam_vmi_1: + - vdbe_vdbe_oam_vmi_1 + - network.incoming.bytes disk.root.size_vdbe: - vdbe - disk.root.size - network.outgoing.bytes_vdbe_vdbe_oam_vmi: - - vdbe_vdbe_oam_vmi - - network.outgoing.bytes - network.outgoing.bytes_vdbe_vdbe_untr_vmi: - - vdbe_vdbe_untr_vmi - - network.outgoing.bytes memory_vdbe: - vdbe - memory @@ -784,39 +784,39 @@ topology_template: - vdbe - disk.read.bytes requirements: - subinterface_link_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_vmi_vlan1: - - vdbe_vdbe_untr_vmi_vlan1 - - subinterface_link_vdbe_0_subint_untr_vmi_0 - link_vdbe_vdbe_untr_vmi: - - vdbe_vdbe_untr_vmi - - link - dependency_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_vmi_vlan1: - - vdbe_vdbe_untr_vmi_vlan1 - - dependency_vdbe_0_subint_untr_vmi_0 - subinterface_link_vdbe_1_subint_oam_vmi_1_vdbe_vdbe_oam_vmi_vlan2: - - vdbe_vdbe_oam_vmi_vlan2 - - subinterface_link_vdbe_1_subint_oam_vmi_1 - dependency_vdbe_vdbe_oam_vmi: - - vdbe_vdbe_oam_vmi + dependency_vdbe_vdbe_oam_vmi_1_vlan2: + - vdbe_vdbe_oam_vmi_1_vlan2 - dependency - link_vdbe_vdbe_oam_vmi: - - vdbe_vdbe_oam_vmi - - link - dependency_vdbe_vdbe_untr_vmi_vlan1: - - vdbe_vdbe_untr_vmi_vlan1 + dependency_vdbe_vdbe_untr_vmi_1: + - vdbe_vdbe_untr_vmi_1 + - dependency + subinterface_link_vdbe_1_subint_oam_vmi_1_vdbe_vdbe_oam_vmi_1_vlan2: + - vdbe_vdbe_oam_vmi_1_vlan2 + - subinterface_link_vdbe_1_subint_oam_vmi_1 + dependency_vdbe_vdbe_untr_vmi_1_vlan1: + - vdbe_vdbe_untr_vmi_1_vlan1 - dependency local_storage_vdbe: - vdbe - local_storage - dependency_vdbe_vdbe_untr_vmi: - - vdbe_vdbe_untr_vmi - - dependency - dependency_vdbe_vdbe_oam_vmi_vlan2: - - vdbe_vdbe_oam_vmi_vlan2 + link_vdbe_vdbe_untr_vmi_1: + - vdbe_vdbe_untr_vmi_1 + - link + dependency_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_vmi_1_vlan1: + - vdbe_vdbe_untr_vmi_1_vlan1 + - dependency_vdbe_0_subint_untr_vmi_0 + subinterface_link_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_vmi_1_vlan1: + - vdbe_vdbe_untr_vmi_1_vlan1 + - subinterface_link_vdbe_0_subint_untr_vmi_0 + dependency_vdbe_vdbe_oam_vmi_1: + - vdbe_vdbe_oam_vmi_1 - dependency - dependency_vdbe_1_subint_oam_vmi_1_vdbe_vdbe_oam_vmi_vlan2: - - vdbe_vdbe_oam_vmi_vlan2 - - dependency_vdbe_1_subint_oam_vmi_1 + link_vdbe_vdbe_oam_vmi_1: + - vdbe_vdbe_oam_vmi_1 + - link dependency_vdbe: - vdbe - - dependency \ No newline at end of file + - dependency + dependency_vdbe_1_subint_oam_vmi_1_vdbe_vdbe_oam_vmi_1_vlan2: + - vdbe_vdbe_oam_vmi_1_vlan2 + - dependency_vdbe_1_subint_oam_vmi_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/onePortVlanSameType/in/main.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/onePortVlanSameType/in/main.yml index 3bf6d050ff..486a0f8bf0 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/onePortVlanSameType/in/main.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/onePortVlanSameType/in/main.yml @@ -154,7 +154,7 @@ resources: name: get_param: vdbe_name_2 networks: - - port: {get_resource: vdbe_untr_port_2} + - port: {get_resource: vdbe_1_untr_port_1} vdbe_untr_port_1: type: OS::ContrailV2::VirtualMachineInterface properties: @@ -198,7 +198,7 @@ resources: virtual_network_refs: - get_resource: control_int_net - vdbe_untr_port_2: + vdbe_1_untr_port_1: type: OS::ContrailV2::VirtualMachineInterface properties: name: Untr_Port_2 @@ -317,7 +317,7 @@ resources: mac_address: get_param: vdbe_hw_untr_mac_1 parent_interface: - get_resource: vdbe_untr_port_2 + get_resource: vdbe_1_untr_port_1 subinterfaces_name_prefix: str_replace: params: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/onePortVlanSameType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/onePortVlanSameType/out/GlobalSubstitutionTypesServiceTemplate.yaml index f1fc7d9e85..3a0a9ff451 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/onePortVlanSameType/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/onePortVlanSameType/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,10 +8,6 @@ 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_nested_parent_interface: type: list required: true @@ -30,8 +26,8 @@ node_types: status: SUPPORTED entry_schema: type: json - port_vdbe_untr_port_subnetpoolid: - type: string + port_vdbe_untr_port_1_virtual_machine_interface_allowed_address_pairs: + type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs required: true status: SUPPORTED compute_vdbe_availability_zone: @@ -52,12 +48,28 @@ node_types: status: SUPPORTED entry_schema: type: string + port_vdbe_untr_port_1_name: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_vdbe_untr_port_1_network_role: + type: string + required: true + status: SUPPORTED vm_flavor_name: type: string required: true status: SUPPORTED - port_vdbe_untr_port_order: - type: integer + port_vdbe_untr_port_1_virtual_machine_interface_mac_addresses: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_vdbe_untr_port_1_network_role_tag: + type: string required: true status: SUPPORTED subinterface_nested_aap_untrusted_ip_prefix: @@ -66,12 +78,12 @@ node_types: status: SUPPORTED entry_schema: type: string - vm_image_name: - type: string + port_vdbe_untr_port_1_order: + type: integer required: true status: SUPPORTED - port_vdbe_untr_port_exCP_naming: - type: org.openecomp.datatypes.Naming + vm_image_name: + type: string required: true status: SUPPORTED subinterface_nested_aap_sec_untrusted_ip_prefix_len: @@ -104,32 +116,42 @@ node_types: status: SUPPORTED entry_schema: type: string - port_vdbe_untr_port_virtual_machine_interface_allowed_address_pairs: - type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs - required: true - status: SUPPORTED subinterface_nested_ip_address: type: list required: true status: SUPPORTED entry_schema: type: string - port_vdbe_untr_port_virtual_network_refs: + port_vdbe_untr_port_1_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.RelatedNetworksAssignments subinterface_nested_ip_v6_address: type: list required: true status: SUPPORTED entry_schema: type: string - port_vdbe_untr_port_mac_requirements: + port_vdbe_untr_port_1_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_vdbe_untr_port_1_subnetpoolid: + type: string + required: true + status: SUPPORTED + port_vdbe_untr_port_1_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED + port_vdbe_untr_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED index_value: type: integer description: Index value of this substitution service template runtime instance @@ -150,28 +172,12 @@ node_types: status: SUPPORTED entry_schema: type: string - port_vdbe_untr_port_name: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_vdbe_untr_port_vlan_requirements: + port_vdbe_untr_port_1_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_virtual_machine_interface_mac_addresses: - type: list - required: true - status: SUPPORTED - entry_schema: - type: json subinterface_nested_aap_untrusted_ip_prefix_len: type: list required: true @@ -196,76 +202,63 @@ node_types: status: SUPPORTED entry_schema: type: string - port_vdbe_untr_port_related_networks: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_vdbe_untr_port_ip_requirements: + port_vdbe_untr_port_1_virtual_network_refs: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: json requirements: - - dependency_vdbe: + - dependency_vdbe_vdbe_untr_port_1_nested: 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: + - dependency_vdbe_untr_x_int_vmi_subport_vdbe_vdbe_untr_port_1_nested: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_vdbe_vdbe_untr_port: + - subinterface_link_vdbe_untr_x_int_vmi_subport_vdbe_vdbe_untr_port_1_nested: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_vdbe_vdbe_untr_port_nested: + - dependency_vdbe: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - dependency_vdbe_untr_x_int_vmi_subport_vdbe_vdbe_untr_port_nested: + - local_storage_vdbe: + capability: tosca.capabilities.Attachment + node: tosca.nodes.BlockStorage + relationship: tosca.relationships.AttachesTo + occurrences: + - 0 + - UNBOUNDED + - dependency_vdbe_vdbe_untr_port_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - subinterface_link_vdbe_untr_x_int_vmi_subport_vdbe_vdbe_untr_port_nested: + - link_vdbe_vdbe_untr_port_1: 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. + forwarder_vdbe_vdbe_untr_port_1: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED @@ -274,11 +267,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_vdbe_vdbe_untr_port: - type: tosca.capabilities.Node - 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. @@ -296,11 +284,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_vdbe_untr_x_int_vmi_subport_vdbe_vdbe_untr_port_nested: - type: tosca.capabilities.Node - 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. @@ -331,13 +314,29 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_vdbe_untr_x_int_vmi_subport_vdbe_vdbe_untr_port_1_nested: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + feature_vdbe_vdbe_untr_port_1: + type: tosca.capabilities.Node + 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: + network.incoming.bytes.rate_vdbe_vdbe_untr_port_1: + 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_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -360,37 +359,37 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.capacity_vdbe: + network.outgoing.packets.rate_vdbe_vdbe_untr_port_1: 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: + 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.usage_vdbe: + network.outgoing.bytes_vdbe_vdbe_untr_port_1: 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: + 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 - network.outpoing.packets_vdbe_vdbe_untr_port: + 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 - network.outgoing.bytes.rate_vdbe_vdbe_untr_port: + 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: @@ -402,12 +401,7 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_vdbe_vdbe_untr_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - binding_vdbe_vdbe_untr_port: + binding_vdbe_vdbe_untr_port_1: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface @@ -415,13 +409,19 @@ node_types: occurrences: - 0 - UNBOUNDED + network.incoming.bytes_vdbe_vdbe_untr_port_1: + 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 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: + network.outgoing.bytes.rate_vdbe_vdbe_untr_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -451,11 +451,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_vdbe_vdbe_untr_port_nested: - type: tosca.capabilities.Node - 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. @@ -492,12 +487,6 @@ node_types: 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. @@ -517,17 +506,34 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_vdbe_vdbe_untr_port_1: + 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 + network.incoming.packets_vdbe_vdbe_untr_port_1: + 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 + feature_vdbe_vdbe_untr_port_1_nested: + type: tosca.capabilities.Node + 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. @@ -569,12 +575,6 @@ node_types: 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.nested: derived_from: org.openecomp.resource.abstract.nodes.AbstractSubstitute properties: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/onePortVlanSameType/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/onePortVlanSameType/out/MainServiceTemplate.yaml index dda3d09c8d..562d5fc9a2 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/onePortVlanSameType/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/onePortVlanSameType/out/MainServiceTemplate.yaml @@ -488,7 +488,7 @@ topology_template: properties: subinterface_nested_parent_interface: - vdbe_untr_port_1 - - vdbe_untr_port_2 + - vdbe_1_untr_port_1 subinterface_nested_aap_address_mode: - get_input: aap_address_mode - get_input: aap_address_mode @@ -504,8 +504,14 @@ topology_template: subinterface_nested_aap_untrusted_v6_ip_prefix_len: - get_input: vdbe_aap_untrusted_v6_ip_prefix_len - get_input: vdbe_aap_untrusted_v6_ip_prefix_len + port_vdbe_untr_port_1_name: + - Untr_Port_1 + - Untr_Port_2 vm_flavor_name: get_input: vdbe_flavor_name + port_vdbe_untr_port_1_virtual_machine_interface_mac_addresses: + - - get_input: vdbe_hw_untr_mac_1 + - - get_input: vdbe_hw_untr_mac_1 subinterface_nested_aap_untrusted_ip_prefix: - get_input: vdbe_aap_untrusted_ip_prefix - get_input: vdbe_aap_untrusted_ip_prefix @@ -539,9 +545,6 @@ topology_template: subinterface_nested_ip_address: - get_input: vdbe_untrusted_ip_1 - get_input: vdbe_untrusted_ip_1 - port_vdbe_untr_port_virtual_network_refs: - - - control_int_net - - - control_int_net subinterface_nested_ip_v6_address: - get_input: vdbe_untrusted_v6_ip_1 - get_input: vdbe_untrusted_v6_ip_1 @@ -551,12 +554,6 @@ topology_template: subinterface_nested_vn_network_list: - get_input: untrusted_vn_networks - get_input: untrusted_vn_networks - port_vdbe_untr_port_name: - - Untr_Port_1 - - Untr_Port_2 - port_vdbe_untr_port_virtual_machine_interface_mac_addresses: - - - get_input: vdbe_hw_untr_mac_1 - - - get_input: vdbe_hw_untr_mac_1 subinterface_nested_aap_untrusted_ip_prefix_len: - get_input: vdbe_aap_untrusted_ip_prefix_len - get_input: vdbe_aap_untrusted_ip_prefix_len @@ -584,6 +581,9 @@ topology_template: compute_vdbe_name: - get_input: vdbe_name_1 - get_input: vdbe_name_2 + port_vdbe_untr_port_1_virtual_network_refs: + - - control_int_net + - - control_int_net service_template_filter: substitute_service_template: Nested_vdbeServiceTemplate.yaml count: 2 @@ -593,7 +593,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_vdbe_vdbe_untr_port: + - link_vdbe_vdbe_untr_port_1: capability: tosca.capabilities.network.Linkable node: control_int_net relationship: tosca.relationships.network.LinksTo @@ -606,4 +606,4 @@ topology_template: Version 2.0 02-09-2016 (Authors: John Doe, user PROD) members: - 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/pattern1c1/onePortVlanSameType/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/pattern1c1/onePortVlanSameType/out/Nested_vdbeServiceTemplate.yaml index 1e55c60396..66aa427c11 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/onePortVlanSameType/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/pattern1c1/onePortVlanSameType/out/Nested_vdbeServiceTemplate.yaml @@ -11,9 +11,6 @@ node_types: 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_nested_parent_interface: type: list required: true @@ -29,8 +26,8 @@ topology_template: required: true entry_schema: type: json - port_vdbe_untr_port_subnetpoolid: - type: string + port_vdbe_untr_port_1_virtual_machine_interface_allowed_address_pairs: + type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs required: true compute_vdbe_availability_zone: type: list @@ -47,23 +44,36 @@ topology_template: required: true entry_schema: type: string + port_vdbe_untr_port_1_name: + type: list + required: true + entry_schema: + type: string + port_vdbe_untr_port_1_network_role: + type: string + required: true vm_flavor_name: type: string required: true - port_vdbe_untr_port_order: - type: integer + port_vdbe_untr_port_1_virtual_machine_interface_mac_addresses: + type: list + required: true + entry_schema: + type: json + port_vdbe_untr_port_1_network_role_tag: + type: string required: true subinterface_nested_aap_untrusted_ip_prefix: type: list required: true entry_schema: type: string + port_vdbe_untr_port_1_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_nested_aap_sec_untrusted_ip_prefix_len: type: list required: true @@ -89,27 +99,35 @@ topology_template: required: true entry_schema: type: string - port_vdbe_untr_port_virtual_machine_interface_allowed_address_pairs: - type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs - required: true subinterface_nested_ip_address: type: list required: true entry_schema: type: string - port_vdbe_untr_port_virtual_network_refs: + port_vdbe_untr_port_1_related_networks: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.RelatedNetworksAssignments subinterface_nested_ip_v6_address: type: list required: true entry_schema: type: string - port_vdbe_untr_port_mac_requirements: + port_vdbe_untr_port_1_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_vdbe_untr_port_1_subnetpoolid: + type: string + required: true + port_vdbe_untr_port_1_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true + port_vdbe_untr_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -127,24 +145,11 @@ topology_template: required: true entry_schema: type: string - port_vdbe_untr_port_name: - type: list - required: true - entry_schema: - type: string - port_vdbe_untr_port_vlan_requirements: + port_vdbe_untr_port_1_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_virtual_machine_interface_mac_addresses: - type: list - required: true - entry_schema: - type: json subinterface_nested_aap_untrusted_ip_prefix_len: type: list required: true @@ -165,80 +170,13 @@ topology_template: required: true entry_schema: type: string - port_vdbe_untr_port_related_networks: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_vdbe_untr_port_ip_requirements: + port_vdbe_untr_port_1_virtual_network_refs: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: json 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.contrailV2.VirtualMachineInterface - properties: - mac_requirements: - get_input: port_vdbe_untr_port_mac_requirements - order: - get_input: port_vdbe_untr_port_order - exCP_naming: - get_input: port_vdbe_untr_port_exCP_naming - virtual_machine_interface_allowed_address_pairs: - get_input: - - port_vdbe_untr_port_virtual_machine_interface_allowed_address_pairs - - index_value - vlan_requirements: - get_input: port_vdbe_untr_port_vlan_requirements - subinterface_indicator: true - related_networks: - get_input: port_vdbe_untr_port_related_networks - virtual_network_refs: - get_input: - - port_vdbe_untr_port_virtual_network_refs - - index_value - ip_requirements: - get_input: port_vdbe_untr_port_ip_requirements - network_role_tag: - get_input: port_vdbe_untr_port_network_role_tag - virtual_machine_interface_mac_addresses: - get_input: - - port_vdbe_untr_port_virtual_machine_interface_mac_addresses - - index_value - 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 - vdbe_vdbe_untr_port_nested: + vdbe_vdbe_untr_port_1_nested: type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested directives: - substitutable @@ -317,23 +255,79 @@ topology_template: requirements: - binding_vdbe_untr_x_int_vmi_subport: capability: tosca.capabilities.network.Bindable - node: vdbe_vdbe_untr_port + node: vdbe_vdbe_untr_port_1 + 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_1: + type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface + properties: + mac_requirements: + get_input: port_vdbe_untr_port_1_mac_requirements + order: + get_input: port_vdbe_untr_port_1_order + exCP_naming: + get_input: port_vdbe_untr_port_1_exCP_naming + virtual_machine_interface_allowed_address_pairs: + get_input: + - port_vdbe_untr_port_1_virtual_machine_interface_allowed_address_pairs + - index_value + vlan_requirements: + get_input: port_vdbe_untr_port_1_vlan_requirements + subinterface_indicator: true + related_networks: + get_input: port_vdbe_untr_port_1_related_networks + virtual_network_refs: + get_input: + - port_vdbe_untr_port_1_virtual_network_refs + - index_value + ip_requirements: + get_input: port_vdbe_untr_port_1_ip_requirements + network_role_tag: + get_input: port_vdbe_untr_port_1_network_role_tag + virtual_machine_interface_mac_addresses: + get_input: + - port_vdbe_untr_port_1_virtual_machine_interface_mac_addresses + - index_value + network_role: + get_input: port_vdbe_untr_port_1_network_role + subnetpoolid: + get_input: port_vdbe_untr_port_1_subnetpoolid + name: + get_input: + - port_vdbe_untr_port_1_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 + forwarder_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - forwarder feature_vdbe: - vdbe - feature - feature_vdbe_vdbe_untr_port: - - vdbe_vdbe_untr_port - - feature disk.device.iops_vdbe: - vdbe - disk.device.iops @@ -343,9 +337,6 @@ topology_template: disk.ephemeral.size_vdbe: - vdbe - disk.ephemeral.size - feature_vdbe_untr_x_int_vmi_subport_vdbe_vdbe_untr_port_nested: - - vdbe_vdbe_untr_port_nested - - feature_vdbe_untr_x_int_vmi_subport cpu_util_vdbe: - vdbe - cpu_util @@ -361,12 +352,21 @@ topology_template: disk.device.write.requests.rate_vdbe: - vdbe - disk.device.write.requests.rate + feature_vdbe_untr_x_int_vmi_subport_vdbe_vdbe_untr_port_1_nested: + - vdbe_vdbe_untr_port_1_nested + - feature_vdbe_untr_x_int_vmi_subport + feature_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - feature disk.write.bytes.rate_vdbe: - vdbe - disk.write.bytes.rate - network.incoming.packets_vdbe_vdbe_untr_port: - - vdbe_vdbe_untr_port - - network.incoming.packets + network.incoming.bytes.rate_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - network.incoming.bytes.rate + network.incoming.packets.rate_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - network.incoming.packets.rate scalable_vdbe: - vdbe - scalable @@ -376,9 +376,15 @@ topology_template: disk.device.write.requests_vdbe: - vdbe - disk.device.write.requests + network.outgoing.packets.rate_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - network.outgoing.packets.rate disk.device.capacity_vdbe: - vdbe - disk.device.capacity + network.outgoing.bytes_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - network.outgoing.bytes disk.device.allocation_vdbe: - vdbe - disk.device.allocation @@ -388,27 +394,21 @@ topology_template: 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_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 - binding + network.incoming.bytes_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - network.incoming.bytes instance_vdbe: - vdbe - instance - network.incoming.bytes.rate_vdbe_vdbe_untr_port: - - vdbe_vdbe_untr_port - - network.incoming.bytes.rate + network.outgoing.bytes.rate_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - network.outgoing.bytes.rate cpu.delta_vdbe: - vdbe - cpu.delta @@ -421,9 +421,6 @@ topology_template: memory.resident_vdbe: - vdbe - memory.resident - feature_vdbe_vdbe_untr_port_nested: - - vdbe_vdbe_untr_port_nested - - feature disk.write.requests.rate_vdbe: - vdbe - disk.write.requests.rate @@ -442,9 +439,6 @@ topology_template: 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 @@ -454,12 +448,21 @@ topology_template: disk.allocation_vdbe: - vdbe - disk.allocation + network.outpoing.packets_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - network.outpoing.packets disk.read.bytes.rate_vdbe: - vdbe - disk.read.bytes.rate + network.incoming.packets_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - network.incoming.packets os_vdbe: - vdbe - os + feature_vdbe_vdbe_untr_port_1_nested: + - vdbe_vdbe_untr_port_1_nested + - feature disk.device.read.requests_vdbe: - vdbe - disk.device.read.requests @@ -481,28 +484,25 @@ topology_template: 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_vdbe_vdbe_untr_port_1_nested: + - vdbe_vdbe_untr_port_1_nested - dependency - dependency_vdbe_untr_x_int_vmi_subport_vdbe_vdbe_untr_port_nested: - - vdbe_vdbe_untr_port_nested - - dependency_vdbe_untr_x_int_vmi_subport - link_vdbe_vdbe_untr_port: - - vdbe_vdbe_untr_port + dependency_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - dependency + link_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 - link + dependency_vdbe_untr_x_int_vmi_subport_vdbe_vdbe_untr_port_1_nested: + - vdbe_vdbe_untr_port_1_nested + - dependency_vdbe_untr_x_int_vmi_subport local_storage_vdbe: - vdbe - local_storage - subinterface_link_vdbe_untr_x_int_vmi_subport_vdbe_vdbe_untr_port_nested: - - vdbe_vdbe_untr_port_nested + subinterface_link_vdbe_untr_x_int_vmi_subport_vdbe_vdbe_untr_port_1_nested: + - vdbe_vdbe_untr_port_1_nested - subinterface_link_vdbe_untr_x_int_vmi_subport - dependency_vdbe_vdbe_untr_port_nested: - - vdbe_vdbe_untr_port_nested - - dependency 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/pattern1c1/optionalPropertiesConsolidation/in/main.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/optionalPropertiesConsolidation/in/main.yml index 47280fa625..5f49fce709 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/optionalPropertiesConsolidation/in/main.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/optionalPropertiesConsolidation/in/main.yml @@ -1,473 +1,473 @@ -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 - fabric_int_net_flood_unknown_unicast: - description: "forwarding mode of the fabric virtual network" - type: boolean - fabric_int_net_forwarding_mode: - description: "forwarding mode of the fabric virtual network" - type: string - fabric_int_net_rpf: - description: "Reverse Path Filtering enable or disable for the fabric virtual network" - type: string - fabric_int_net_shared: - description: "fabric virtual network shared" - 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_untr_1_subports: - type: OS::Heat::ResourceGroup - properties: - count: - get_param: untrusted_num_vn - resource_def: - type: vlan1.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: - get_param: counter - 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_untr_1_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 - optional_property_1: OPTIONAL_VALUE_SUBPORT_1 - 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_untr_1_port_1} - - port: {get_resource: vdbe_untr_2_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_untr_1_port_2} - - port: {get_resource: vdbe_untr_2_port_2} - vdbe_untr_1_port_1: - type: OS::ContrailV2::VirtualMachineInterface - properties: - name: - str_replace: - params: - DBE: - get_param: vdbe_device_name - VM_NAME: - get_param: vdbe_name_1 - template: VM_NAMEDBE001p1n004 - 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: vdbe_aap_untrusted_ip_prefix - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: - get_param: vdbe_aap_untrusted_ip_prefix_len - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac: - get_param: vdbe_untrusted_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: vdbe_aap_sec_untrusted_ip_prefix - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: - get_param: vdbe_aap_sec_untrusted_ip_prefix_len - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac: - get_param: vdbe_hw_untr_mac_1 - - - 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: vdbe_aap_untrusted_v6_ip_prefix - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: - get_param: vdbe_aap_untrusted_v6_ip_prefix_len - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac: - get_param: vdbe_untrusted_vmac_address - virtual_machine_interface_mac_addresses: - virtual_machine_interface_mac_addresses_mac_address: - - - get_param: vdbe_hw_untr_mac_1 - virtual_network_refs: - - - get_resource: control_int_net - vdbe_untr_2_port_1: - type: OS::ContrailV2::VirtualMachineInterface - properties: - name: Port_2 - 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: vdbe_aap_untrusted_ip_prefix - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: - get_param: vdbe_aap_untrusted_ip_prefix_len - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac: - get_param: vdbe_untrusted_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: vdbe_aap_sec_untrusted_ip_prefix - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: - get_param: vdbe_aap_sec_untrusted_ip_prefix_len - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac: - get_param: vdbe_hw_untr_mac_1 - - - 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: vdbe_aap_untrusted_v6_ip_prefix - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: - get_param: vdbe_aap_untrusted_v6_ip_prefix_len - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac: - get_param: vdbe_untrusted_vmac_address - virtual_machine_interface_mac_addresses: - virtual_machine_interface_mac_addresses_mac_address: - - - get_param: vdbe_hw_untr_mac_1 - virtual_network_refs: - - - get_resource: fabric_int_net - - - - vdbe_untr_1_port_2: - type: OS::ContrailV2::VirtualMachineInterface - properties: - name: - str_replace: - params: - DBE: - get_param: vdbe_device_name - VM_NAME: - get_param: vdbe_name_1 - template: Port 3 - 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: vdbe_aap_untrusted_ip_prefix - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: - get_param: vdbe_aap_untrusted_ip_prefix_len - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac: - get_param: vdbe_untrusted_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: vdbe_aap_sec_untrusted_ip_prefix - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: - get_param: vdbe_aap_sec_untrusted_ip_prefix_len - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac: - get_param: vdbe_hw_untr_mac_1 - - - 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: vdbe_aap_untrusted_v6_ip_prefix - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: - get_param: vdbe_aap_untrusted_v6_ip_prefix_len - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac: - get_param: vdbe_untrusted_vmac_address - virtual_machine_interface_mac_addresses: - virtual_machine_interface_mac_addresses_mac_address: - - - get_param: vdbe_hw_untr_mac_1 - virtual_network_refs: - - - get_resource: control_int_net - vdbe_untr_2_port_2: - type: OS::ContrailV2::VirtualMachineInterface - properties: - name: Port_4 - 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: vdbe_aap_untrusted_ip_prefix - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: - get_param: vdbe_aap_untrusted_ip_prefix_len - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac: - get_param: vdbe_untrusted_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: vdbe_aap_sec_untrusted_ip_prefix - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: - get_param: vdbe_aap_sec_untrusted_ip_prefix_len - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac: - get_param: vdbe_hw_untr_mac_1 - - - 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: vdbe_aap_untrusted_v6_ip_prefix - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: - get_param: vdbe_aap_untrusted_v6_ip_prefix_len - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac: - get_param: vdbe_untrusted_vmac_address - virtual_machine_interface_mac_addresses: - virtual_machine_interface_mac_addresses_mac_address: - - - get_param: vdbe_hw_untr_mac_1 - virtual_network_refs: - - - get_resource: fabric_int_net - - vdbe_untr_2_subports: - type: OS::Heat::ResourceGroup - properties: - count: - get_param: untrusted_num_vn - resource_def: - type: vlan1.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: - get_param: counter - 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_untr_1_port_2 - 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 - optional_property_2: OPTIONAL_VALUE_SUBPORT_2 - - 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 - fabric_int_net: - type: OS::ContrailV2::VirtualNetwork - properties: - flood_unknown_unicast: - get_param: fabric_int_net_flood_unknown_unicast - is_shared: - get_param: fabric_int_net_shared - name: - str_replace: - params: - VNF_NAME: - get_param: vnf_name - template: template-fabric-int - virtual_network_properties: - virtual_network_properties_forwarding_mode: - get_param: fabric_int_net_forwarding_mode - virtual_network_properties_rpf: - get_param: fabric_int_net_rpf \ No newline at end of file +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 + fabric_int_net_flood_unknown_unicast: + description: "forwarding mode of the fabric virtual network" + type: boolean + fabric_int_net_forwarding_mode: + description: "forwarding mode of the fabric virtual network" + type: string + fabric_int_net_rpf: + description: "Reverse Path Filtering enable or disable for the fabric virtual network" + type: string + fabric_int_net_shared: + description: "fabric virtual network shared" + 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_untr_1_subports: + type: OS::Heat::ResourceGroup + properties: + count: + get_param: untrusted_num_vn + resource_def: + type: vlan1.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: + get_param: counter + 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_untr_1_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 + optional_property_1: OPTIONAL_VALUE_SUBPORT_1 + 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_untr_1_port_1} + - port: {get_resource: vdbe_untr_2_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_1_untr_1_port_1} + - port: {get_resource: vdbe_1_untr_2_port_1} + vdbe_untr_1_port_1: + type: OS::ContrailV2::VirtualMachineInterface + properties: + name: + str_replace: + params: + DBE: + get_param: vdbe_device_name + VM_NAME: + get_param: vdbe_name_1 + template: VM_NAMEDBE001p1n004 + 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: vdbe_aap_untrusted_ip_prefix + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: + get_param: vdbe_aap_untrusted_ip_prefix_len + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac: + get_param: vdbe_untrusted_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: vdbe_aap_sec_untrusted_ip_prefix + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: + get_param: vdbe_aap_sec_untrusted_ip_prefix_len + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac: + get_param: vdbe_hw_untr_mac_1 + - + 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: vdbe_aap_untrusted_v6_ip_prefix + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: + get_param: vdbe_aap_untrusted_v6_ip_prefix_len + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac: + get_param: vdbe_untrusted_vmac_address + virtual_machine_interface_mac_addresses: + virtual_machine_interface_mac_addresses_mac_address: + - + get_param: vdbe_hw_untr_mac_1 + virtual_network_refs: + - + get_resource: control_int_net + vdbe_untr_2_port_1: + type: OS::ContrailV2::VirtualMachineInterface + properties: + name: Port_2 + 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: vdbe_aap_untrusted_ip_prefix + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: + get_param: vdbe_aap_untrusted_ip_prefix_len + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac: + get_param: vdbe_untrusted_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: vdbe_aap_sec_untrusted_ip_prefix + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: + get_param: vdbe_aap_sec_untrusted_ip_prefix_len + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac: + get_param: vdbe_hw_untr_mac_1 + - + 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: vdbe_aap_untrusted_v6_ip_prefix + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: + get_param: vdbe_aap_untrusted_v6_ip_prefix_len + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac: + get_param: vdbe_untrusted_vmac_address + virtual_machine_interface_mac_addresses: + virtual_machine_interface_mac_addresses_mac_address: + - + get_param: vdbe_hw_untr_mac_1 + virtual_network_refs: + - + get_resource: fabric_int_net + + + + vdbe_1_untr_1_port_1: + type: OS::ContrailV2::VirtualMachineInterface + properties: + name: + str_replace: + params: + DBE: + get_param: vdbe_device_name + VM_NAME: + get_param: vdbe_name_1 + template: Port 3 + 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: vdbe_aap_untrusted_ip_prefix + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: + get_param: vdbe_aap_untrusted_ip_prefix_len + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac: + get_param: vdbe_untrusted_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: vdbe_aap_sec_untrusted_ip_prefix + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: + get_param: vdbe_aap_sec_untrusted_ip_prefix_len + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac: + get_param: vdbe_hw_untr_mac_1 + - + 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: vdbe_aap_untrusted_v6_ip_prefix + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: + get_param: vdbe_aap_untrusted_v6_ip_prefix_len + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac: + get_param: vdbe_untrusted_vmac_address + virtual_machine_interface_mac_addresses: + virtual_machine_interface_mac_addresses_mac_address: + - + get_param: vdbe_hw_untr_mac_1 + virtual_network_refs: + - + get_resource: control_int_net + vdbe_1_untr_2_port_1: + type: OS::ContrailV2::VirtualMachineInterface + properties: + name: Port_4 + 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: vdbe_aap_untrusted_ip_prefix + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: + get_param: vdbe_aap_untrusted_ip_prefix_len + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac: + get_param: vdbe_untrusted_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: vdbe_aap_sec_untrusted_ip_prefix + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: + get_param: vdbe_aap_sec_untrusted_ip_prefix_len + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac: + get_param: vdbe_hw_untr_mac_1 + - + 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: vdbe_aap_untrusted_v6_ip_prefix + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: + get_param: vdbe_aap_untrusted_v6_ip_prefix_len + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac: + get_param: vdbe_untrusted_vmac_address + virtual_machine_interface_mac_addresses: + virtual_machine_interface_mac_addresses_mac_address: + - + get_param: vdbe_hw_untr_mac_1 + virtual_network_refs: + - + get_resource: fabric_int_net + + vdbe_untr_2_subports: + type: OS::Heat::ResourceGroup + properties: + count: + get_param: untrusted_num_vn + resource_def: + type: vlan1.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: + get_param: counter + 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_1_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 + optional_property_2: OPTIONAL_VALUE_SUBPORT_2 + + 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 + fabric_int_net: + type: OS::ContrailV2::VirtualNetwork + properties: + flood_unknown_unicast: + get_param: fabric_int_net_flood_unknown_unicast + is_shared: + get_param: fabric_int_net_shared + name: + str_replace: + params: + VNF_NAME: + get_param: vnf_name + template: template-fabric-int + virtual_network_properties: + virtual_network_properties_forwarding_mode: + get_param: fabric_int_net_forwarding_mode + virtual_network_properties_rpf: + get_param: fabric_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/pattern1c1/optionalPropertiesConsolidation/out/GlobalSubstitutionTypesServiceTemplate.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/GlobalSubstitutionTypesServiceTemplate.yaml index 8f31c10481..5f71804e20 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/GlobalSubstitutionTypesServiceTemplate.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/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,37 +8,49 @@ node_types: org.openecomp.resource.abstract.nodes.vdbe: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_vdbe_untr_1_port_1_order: + type: integer + required: true + status: SUPPORTED + port_vdbe_untr_1_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED subinterface_vlan1_aap_untrusted_v6_ip_prefix: type: list required: true status: SUPPORTED entry_schema: type: string - subinterface_vlan1_aap_sec_untrusted_ip_prefix: + port_vdbe_untr_2_port_1_network_role_tag: + type: string + required: true + status: SUPPORTED + port_vdbe_untr_1_port_1_virtual_machine_interface_mac_addresses: type: list required: true status: SUPPORTED entry_schema: - type: string - subinterface_vlan1_vmac_address: + type: json + subinterface_vlan1_aap_sec_untrusted_ip_prefix: type: list required: true status: SUPPORTED entry_schema: type: string - compute_vdbe_availability_zone: + subinterface_vlan1_vmac_address: type: list required: true status: SUPPORTED entry_schema: type: string - port_vdbe_untr_2_port_virtual_machine_interface_mac_addresses: + compute_vdbe_availability_zone: type: list required: true status: SUPPORTED entry_schema: - type: json - port_vdbe_untr_2_port_network_role_tag: + type: string + port_vdbe_untr_1_port_1_network_role: type: string required: true status: SUPPORTED @@ -46,71 +58,67 @@ node_types: type: string required: true status: SUPPORTED - subinterface_vlan1_counter: + port_vdbe_untr_1_port_1_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: float - vm_image_name: - type: string - required: true - status: SUPPORTED - port_vdbe_untr_2_port_network_role: - type: string - required: true - status: SUPPORTED - compute_vdbe_metadata: + type: org.openecomp.datatypes.network.IpRequirements + port_vdbe_untr_1_port_1_name: type: list required: true status: SUPPORTED entry_schema: - type: json - subinterface_vlan1_aap_untrusted_v6_ip_prefix_len: + type: string + port_vdbe_untr_2_port_1_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_vdbe_untr_1_port_ip_requirements: + port_vdbe_untr_2_port_1_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_vdbe_untr_2_port_vlan_requirements: + type: org.openecomp.datatypes.network.VlanRequirements + subinterface_vlan1_counter: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_vdbe_untr_2_port_exCP_naming: - type: org.openecomp.datatypes.Naming + type: float + vm_image_name: + type: string required: true status: SUPPORTED - port_vdbe_untr_2_port_ip_requirements: + compute_vdbe_metadata: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_vdbe_untr_1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + type: json + subinterface_vlan1_aap_untrusted_v6_ip_prefix_len: + type: list required: true status: SUPPORTED - port_vdbe_untr_1_port_order: - type: integer + entry_schema: + type: string + port_vdbe_untr_2_port_1_virtual_machine_interface_mac_addresses: + type: list required: true status: SUPPORTED - port_vdbe_untr_1_port_subnetpoolid: - type: string + entry_schema: + type: json + port_vdbe_untr_2_port_1_virtual_machine_interface_allowed_address_pairs: + type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs required: true status: SUPPORTED - port_vdbe_untr_2_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_vdbe_untr_2_port_1_network_role: + type: string required: true status: SUPPORTED - port_vdbe_untr_1_port_virtual_machine_interface_allowed_address_pairs: + port_vdbe_untr_1_port_1_virtual_machine_interface_allowed_address_pairs: type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs required: true status: SUPPORTED @@ -126,6 +134,10 @@ node_types: status: SUPPORTED entry_schema: type: string + port_vdbe_untr_1_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED subinterface_vlan1_ip_address: type: list required: true @@ -138,76 +150,68 @@ node_types: status: SUPPORTED entry_schema: type: string - port_vdbe_untr_1_port_network_role_tag: + port_vdbe_untr_2_port_1_subnetpoolid: type: string required: true status: SUPPORTED - subinterface_vlan1_ip_v6_address: - type: list + port_vdbe_untr_2_port_1_order: + type: integer required: true status: SUPPORTED - entry_schema: - type: string - port_vdbe_untr_1_port_related_networks: + port_vdbe_untr_2_port_1_related_networks: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - subinterface_vlan1_aap_untrusted_ip_prefix: + port_vdbe_untr_2_port_1_virtual_network_refs: type: list required: true status: SUPPORTED entry_schema: - type: string - port_vdbe_untr_2_port_virtual_network_refs: + type: json + port_vdbe_untr_2_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + subinterface_vlan1_ip_v6_address: type: list required: true status: SUPPORTED entry_schema: - type: json - subinterface_vlan1_subinterfaces_name_prefix: + type: string + subinterface_vlan1_aap_untrusted_ip_prefix: type: list required: true status: SUPPORTED entry_schema: type: string - port_vdbe_untr_1_port_network_role: + port_vdbe_untr_1_port_1_network_role_tag: type: string required: true status: SUPPORTED - port_vdbe_untr_2_port_name: + subinterface_vlan1_subinterfaces_name_prefix: type: list required: true status: SUPPORTED entry_schema: type: string - port_vdbe_untr_2_port_related_networks: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_vdbe_untr_1_port_virtual_network_refs: - type: list + port_vdbe_untr_1_port_1_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: json subinterface_vlan1_vn_network_list: type: list required: true status: SUPPORTED entry_schema: type: string - port_vdbe_untr_2_port_subnetpoolid: - type: string - required: true - status: SUPPORTED - port_vdbe_untr_2_port_order: - type: integer + port_vdbe_untr_1_port_1_vlan_requirements: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements subinterface_vlan1_service_template_filter_count: type: list required: true @@ -226,6 +230,10 @@ node_types: status: SUPPORTED entry_schema: type: string + port_vdbe_untr_2_port_1_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 @@ -234,45 +242,37 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_vdbe_untr_1_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED subinterface_vlan1_optional_property_1: type: list required: true status: SUPPORTED entry_schema: type: string - port_vdbe_untr_1_port_name: + port_vdbe_untr_2_port_1_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - subinterface_vlan1_optional_property_2: + type: org.openecomp.datatypes.network.IpRequirements + port_vdbe_untr_1_port_1_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: string - subinterface_vlan1_aap_sec_untrusted_ip_prefix_len: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + subinterface_vlan1_optional_property_2: type: list required: true status: SUPPORTED entry_schema: type: string - port_vdbe_untr_2_port_virtual_machine_interface_allowed_address_pairs: - type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs - required: true - status: SUPPORTED - port_vdbe_untr_1_port_vlan_requirements: + subinterface_vlan1_aap_sec_untrusted_ip_prefix_len: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_vdbe_untr_1_port_virtual_machine_interface_mac_addresses: + type: string + port_vdbe_untr_1_port_1_virtual_network_refs: type: list required: true status: SUPPORTED @@ -299,47 +299,47 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_vdbe_vdbe_untr_2_port: + - dependency_vdbe_vdbe_untr_1_port_1_vlan1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_vdbe_vdbe_untr_2_port: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - - dependency_vdbe_vdbe_untr_1_port_vlan1: + - dependency_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_1_port_1_vlan1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - dependency_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_1_port_vlan1: + - subinterface_link_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_1_port_1_vlan1: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 + - dependency_vdbe_vdbe_untr_1_port_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - subinterface_link_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_1_port_vlan1: + - link_vdbe_vdbe_untr_1_port_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_vdbe_vdbe_untr_1_port: + - dependency_vdbe_vdbe_untr_2_port_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_vdbe_vdbe_untr_1_port: + - link_vdbe_vdbe_untr_2_port_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -368,13 +368,15 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_vdbe_vdbe_untr_2_port: - type: tosca.capabilities.Node + network.outpoing.packets_vdbe_vdbe_untr_1_port_1: + 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_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_1_port_vlan1: - type: tosca.capabilities.Node + network.outpoing.packets_vdbe_vdbe_untr_2_port_1: + 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 @@ -396,47 +398,43 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_vdbe_vdbe_untr_1_port_vlan1: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - disk.device.latency_vdbe: + network.outgoing.packets.rate_vdbe_vdbe_untr_2_port_1: 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: + network.outgoing.packets.rate_vdbe_vdbe_untr_1_port_1: 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_2_port: + 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 - feature_vdbe_vdbe_untr_1_port: - type: tosca.capabilities.Node + 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: + network.incoming.bytes_vdbe_vdbe_untr_1_port_1: 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_1_port: + 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.rate_vdbe_vdbe_untr_1_port: + network.outgoing.bytes.rate_vdbe_vdbe_untr_2_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -465,79 +463,83 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_vdbe_vdbe_untr_2_port: + binding_vdbe_vdbe_untr_1_port_1: + 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 + 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 - network.outgoing.bytes_vdbe_vdbe_untr_1_port: + 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 - disk.device.allocation_vdbe: + 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 - disk.usage_vdbe: + network.outgoing.bytes_vdbe_vdbe_untr_1_port_1: 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: + 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 - network.outpoing.packets_vdbe_vdbe_untr_2_port: + network.incoming.packets.rate_vdbe_vdbe_untr_1_port_1: 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: + network.incoming.packets_vdbe_vdbe_untr_2_port_1: 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_1_port: + network.incoming.bytes.rate_vdbe_vdbe_untr_2_port_1: 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 - 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. + forwarder_vdbe_vdbe_untr_1_port_1: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - cpu.delta_vdbe: + 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.outgoing.packets.rate_vdbe_vdbe_untr_2_port: + 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 - binding_vdbe_vdbe_untr_1_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 + forwarder_vdbe_vdbe_untr_2_port_1: + type: org.openecomp.capabilities.Forwarder occurrences: - - 0 + - 1 - UNBOUNDED disk.device.read.bytes.rate_vdbe: type: org.openecomp.capabilities.metric.Ceilometer @@ -557,17 +559,17 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_vdbe_vdbe_untr_1_port: - type: org.openecomp.capabilities.Forwarder - 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 + feature_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_1_port_1_vlan1: + type: tosca.capabilities.Node + 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. @@ -580,11 +582,6 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_vdbe_vdbe_untr_2_port: - type: org.openecomp.capabilities.Forwarder - 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. @@ -597,13 +594,24 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_vdbe_vdbe_untr_2_port_1: + type: tosca.capabilities.Node + 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.outgoing.packets.rate_vdbe_vdbe_untr_1_port: + network.incoming.bytes_vdbe_vdbe_untr_2_port_1: + 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_1_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -628,15 +636,8 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_vdbe_vdbe_untr_1_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.incoming.packets_vdbe_vdbe_untr_1_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_vdbe_vdbe_untr_1_port_1: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -646,11 +647,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_vdbe_vdbe_untr_2_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_vdbe_vdbe_untr_2_port_1: + 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: - - 1 + - 0 - UNBOUNDED os_vdbe: type: tosca.capabilities.OperatingSystem @@ -663,7 +666,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_vdbe_vdbe_untr_2_port: + network.outgoing.bytes_vdbe_vdbe_untr_2_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -675,44 +678,41 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_vdbe_vdbe_untr_2_port: + network.incoming.packets.rate_vdbe_vdbe_untr_2_port_1: 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_vdbe_untr_2_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 + feature_vdbe_vdbe_untr_1_port_1_vlan1: + type: tosca.capabilities.Node occurrences: - - 0 + - 1 - UNBOUNDED - memory_vdbe: + network.incoming.packets_vdbe_vdbe_untr_1_port_1: 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 + network.incoming.bytes.rate_vdbe_vdbe_untr_1_port_1: + 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_vdbe: + 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 - network.outgoing.bytes_vdbe_vdbe_untr_2_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_vdbe: + type: tosca.capabilities.network.Bindable occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_vdbe_vdbe_untr_1_port: + 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: 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 d7306a1a23..02412befd7 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 @@ -471,6 +471,9 @@ topology_template: subinterface_vlan1_aap_untrusted_v6_ip_prefix: - get_input: vdbe_aap_untrusted_v6_ip_prefix - get_input: vdbe_aap_untrusted_v6_ip_prefix + port_vdbe_untr_1_port_1_virtual_machine_interface_mac_addresses: + - - get_input: vdbe_hw_untr_mac_1 + - - get_input: vdbe_hw_untr_mac_1 subinterface_vlan1_aap_sec_untrusted_ip_prefix: - get_input: vdbe_aap_sec_untrusted_ip_prefix - get_input: vdbe_aap_sec_untrusted_ip_prefix @@ -480,11 +483,26 @@ topology_template: compute_vdbe_availability_zone: - get_input: availability_zone_1 - get_input: availability_zone_1 - port_vdbe_untr_2_port_virtual_machine_interface_mac_addresses: - - - get_input: vdbe_hw_untr_mac_1 - - - get_input: vdbe_hw_untr_mac_1 vm_flavor_name: get_input: vdbe_flavor_name + port_vdbe_untr_1_port_1_name: + - str_replace: + template: VM_NAMEDBE001p1n004 + params: + DBE: + get_input: vdbe_device_name + VM_NAME: + get_input: vdbe_name_1 + - str_replace: + template: Port 3 + params: + DBE: + get_input: vdbe_device_name + VM_NAME: + get_input: vdbe_name_1 + port_vdbe_untr_2_port_1_name: + - Port_2 + - Port_4 subinterface_vlan1_counter: - get_input: counter - get_input: counter @@ -506,6 +524,9 @@ topology_template: subinterface_vlan1_aap_untrusted_v6_ip_prefix_len: - get_input: vdbe_aap_untrusted_v6_ip_prefix_len - get_input: vdbe_aap_untrusted_v6_ip_prefix_len + port_vdbe_untr_2_port_1_virtual_machine_interface_mac_addresses: + - - get_input: vdbe_hw_untr_mac_1 + - - get_input: vdbe_hw_untr_mac_1 subinterface_vlan1_mac_address: - get_input: vdbe_hw_untr_mac_1 - get_input: vdbe_hw_untr_mac_1 @@ -518,15 +539,15 @@ topology_template: compute_vdbe_name: - get_input: vdbe_name_1 - get_input: vdbe_name_1 + port_vdbe_untr_2_port_1_virtual_network_refs: + - - fabric_int_net + - - fabric_int_net subinterface_vlan1_ip_v6_address: - get_input: vdbe_untrusted_v6_ip_1 - get_input: vdbe_untrusted_v6_ip_1 subinterface_vlan1_aap_untrusted_ip_prefix: - get_input: vdbe_aap_untrusted_ip_prefix - get_input: vdbe_aap_untrusted_ip_prefix - port_vdbe_untr_2_port_virtual_network_refs: - - - fabric_int_net - - - fabric_int_net subinterface_vlan1_subinterfaces_name_prefix: - str_replace: template: VM_NAMEDBE001p1n004 @@ -542,12 +563,6 @@ topology_template: get_input: vdbe_device_name VM_NAME: get_input: vdbe_name_1 - port_vdbe_untr_2_port_name: - - Port_2 - - Port_4 - port_vdbe_untr_1_port_virtual_network_refs: - - - control_int_net - - - control_int_net subinterface_vlan1_vn_network_list: - get_input: untrusted_vn_networks - get_input: untrusted_vn_networks @@ -556,37 +571,22 @@ topology_template: - get_input: untrusted_num_vn subinterface_vlan1_parent_interface: - vdbe_untr_1_port_1 - - vdbe_untr_1_port_2 + - vdbe_1_untr_1_port_1 subinterface_vlan1_aap_address_mode: - get_input: aap_address_mode - get_input: aap_address_mode subinterface_vlan1_optional_property_1: - OPTIONAL_VALUE_SUBPORT_1 - null - port_vdbe_untr_1_port_name: - - str_replace: - template: VM_NAMEDBE001p1n004 - params: - DBE: - get_input: vdbe_device_name - VM_NAME: - get_input: vdbe_name_1 - - str_replace: - template: Port 3 - params: - DBE: - get_input: vdbe_device_name - VM_NAME: - get_input: vdbe_name_1 subinterface_vlan1_optional_property_2: - null - OPTIONAL_VALUE_SUBPORT_2 subinterface_vlan1_aap_sec_untrusted_ip_prefix_len: - get_input: vdbe_aap_sec_untrusted_ip_prefix_len - get_input: vdbe_aap_sec_untrusted_ip_prefix_len - port_vdbe_untr_1_port_virtual_machine_interface_mac_addresses: - - - get_input: vdbe_hw_untr_mac_1 - - - get_input: vdbe_hw_untr_mac_1 + port_vdbe_untr_1_port_1_virtual_network_refs: + - - control_int_net + - - control_int_net subinterface_vlan1_vlan_tag_list: - get_input: untrusted_vlan_tags - get_input: untrusted_vlan_tags @@ -599,11 +599,11 @@ topology_template: - service_template_filter - index_value requirements: - - link_vdbe_vdbe_untr_1_port: + - link_vdbe_vdbe_untr_1_port_1: capability: tosca.capabilities.network.Linkable node: control_int_net relationship: tosca.relationships.network.LinksTo - - link_vdbe_vdbe_untr_2_port: + - link_vdbe_vdbe_untr_2_port_1: capability: tosca.capabilities.network.Linkable node: fabric_int_net relationship: tosca.relationships.network.LinksTo @@ -617,4 +617,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/pattern1c1/optionalPropertiesConsolidation/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/pattern1c1/optionalPropertiesConsolidation/out/Nested_vdbeServiceTemplate.yaml index 4fac95aa24..0f096464ae 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/Nested_vdbeServiceTemplate.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/Nested_vdbeServiceTemplate.yaml @@ -11,11 +11,25 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_vdbe_untr_1_port_1_order: + type: integer + required: true + port_vdbe_untr_1_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true subinterface_vlan1_aap_untrusted_v6_ip_prefix: type: list required: true entry_schema: type: string + port_vdbe_untr_2_port_1_network_role_tag: + type: string + required: true + port_vdbe_untr_1_port_1_virtual_machine_interface_mac_addresses: + type: list + required: true + entry_schema: + type: json subinterface_vlan1_aap_sec_untrusted_ip_prefix: type: list required: true @@ -31,69 +45,62 @@ topology_template: required: true entry_schema: type: string - port_vdbe_untr_2_port_virtual_machine_interface_mac_addresses: - type: list - required: true - entry_schema: - type: json - port_vdbe_untr_2_port_network_role_tag: + port_vdbe_untr_1_port_1_network_role: type: string required: true vm_flavor_name: type: string required: true - subinterface_vlan1_counter: + port_vdbe_untr_1_port_1_ip_requirements: type: list required: true entry_schema: - type: float - vm_image_name: - type: string - required: true - port_vdbe_untr_2_port_network_role: - type: string - required: true - compute_vdbe_metadata: + type: org.openecomp.datatypes.network.IpRequirements + port_vdbe_untr_1_port_1_name: type: list required: true entry_schema: - type: json - subinterface_vlan1_aap_untrusted_v6_ip_prefix_len: + type: string + port_vdbe_untr_2_port_1_name: type: list required: true entry_schema: type: string - port_vdbe_untr_1_port_ip_requirements: + port_vdbe_untr_2_port_1_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_vdbe_untr_2_port_vlan_requirements: + type: org.openecomp.datatypes.network.VlanRequirements + subinterface_vlan1_counter: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_vdbe_untr_2_port_exCP_naming: - type: org.openecomp.datatypes.Naming + type: float + vm_image_name: + type: string required: true - port_vdbe_untr_2_port_ip_requirements: + compute_vdbe_metadata: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_vdbe_untr_1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + type: json + subinterface_vlan1_aap_untrusted_v6_ip_prefix_len: + type: list required: true - port_vdbe_untr_1_port_order: - type: integer + entry_schema: + type: string + port_vdbe_untr_2_port_1_virtual_machine_interface_mac_addresses: + type: list required: true - port_vdbe_untr_1_port_subnetpoolid: - type: string + entry_schema: + type: json + port_vdbe_untr_2_port_1_virtual_machine_interface_allowed_address_pairs: + type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs required: true - port_vdbe_untr_2_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_vdbe_untr_2_port_1_network_role: + type: string required: true - port_vdbe_untr_1_port_virtual_machine_interface_allowed_address_pairs: + port_vdbe_untr_1_port_1_virtual_machine_interface_allowed_address_pairs: type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs required: true subinterface_vlan1_mac_address: @@ -106,6 +113,9 @@ topology_template: required: true entry_schema: type: string + port_vdbe_untr_1_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true subinterface_vlan1_ip_address: type: list required: true @@ -116,63 +126,56 @@ topology_template: required: true entry_schema: type: string - port_vdbe_untr_1_port_network_role_tag: + port_vdbe_untr_2_port_1_subnetpoolid: type: string required: true - subinterface_vlan1_ip_v6_address: - type: list + port_vdbe_untr_2_port_1_order: + type: integer required: true - entry_schema: - type: string - port_vdbe_untr_1_port_related_networks: + port_vdbe_untr_2_port_1_related_networks: type: list required: true entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - subinterface_vlan1_aap_untrusted_ip_prefix: + port_vdbe_untr_2_port_1_virtual_network_refs: type: list required: true entry_schema: - type: string - port_vdbe_untr_2_port_virtual_network_refs: + type: json + port_vdbe_untr_2_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + subinterface_vlan1_ip_v6_address: type: list required: true entry_schema: - type: json - subinterface_vlan1_subinterfaces_name_prefix: + type: string + subinterface_vlan1_aap_untrusted_ip_prefix: type: list required: true entry_schema: type: string - port_vdbe_untr_1_port_network_role: + port_vdbe_untr_1_port_1_network_role_tag: type: string required: true - port_vdbe_untr_2_port_name: + subinterface_vlan1_subinterfaces_name_prefix: type: list required: true entry_schema: type: string - port_vdbe_untr_2_port_related_networks: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_vdbe_untr_1_port_virtual_network_refs: - type: list + port_vdbe_untr_1_port_1_subnetpoolid: + type: string required: true - entry_schema: - type: json subinterface_vlan1_vn_network_list: type: list required: true entry_schema: type: string - port_vdbe_untr_2_port_subnetpoolid: - type: string - required: true - port_vdbe_untr_2_port_order: - type: integer + port_vdbe_untr_1_port_1_vlan_requirements: + type: list required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements subinterface_vlan1_service_template_filter_count: type: list required: true @@ -188,6 +191,9 @@ topology_template: required: true entry_schema: type: string + port_vdbe_untr_2_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -195,38 +201,32 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_vdbe_untr_1_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true subinterface_vlan1_optional_property_1: type: list required: true entry_schema: type: string - port_vdbe_untr_1_port_name: + port_vdbe_untr_2_port_1_ip_requirements: type: list required: true entry_schema: - type: string - subinterface_vlan1_optional_property_2: + type: org.openecomp.datatypes.network.IpRequirements + port_vdbe_untr_1_port_1_related_networks: type: list required: true entry_schema: - type: string - subinterface_vlan1_aap_sec_untrusted_ip_prefix_len: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + subinterface_vlan1_optional_property_2: type: list required: true entry_schema: type: string - port_vdbe_untr_2_port_virtual_machine_interface_allowed_address_pairs: - type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs - required: true - port_vdbe_untr_1_port_vlan_requirements: + subinterface_vlan1_aap_sec_untrusted_ip_prefix_len: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_vdbe_untr_1_port_virtual_machine_interface_mac_addresses: + type: string + port_vdbe_untr_1_port_1_virtual_network_refs: type: list required: true entry_schema: @@ -256,50 +256,7 @@ topology_template: get_input: - compute_vdbe_name - index_value - vdbe_vdbe_untr_2_port: - type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface - properties: - mac_requirements: - get_input: port_vdbe_untr_2_port_mac_requirements - order: - get_input: port_vdbe_untr_2_port_order - exCP_naming: - get_input: port_vdbe_untr_2_port_exCP_naming - virtual_machine_interface_allowed_address_pairs: - get_input: - - port_vdbe_untr_2_port_virtual_machine_interface_allowed_address_pairs - - index_value - vlan_requirements: - get_input: port_vdbe_untr_2_port_vlan_requirements - subinterface_indicator: false - related_networks: - get_input: port_vdbe_untr_2_port_related_networks - virtual_network_refs: - get_input: - - port_vdbe_untr_2_port_virtual_network_refs - - index_value - ip_requirements: - get_input: port_vdbe_untr_2_port_ip_requirements - network_role_tag: - get_input: port_vdbe_untr_2_port_network_role_tag - virtual_machine_interface_mac_addresses: - get_input: - - port_vdbe_untr_2_port_virtual_machine_interface_mac_addresses - - index_value - network_role: - get_input: port_vdbe_untr_2_port_network_role - subnetpoolid: - get_input: port_vdbe_untr_2_port_subnetpoolid - name: - get_input: - - port_vdbe_untr_2_port_name - - index_value - requirements: - - binding: - capability: tosca.capabilities.network.Bindable - node: vdbe - relationship: tosca.relationships.network.BindsTo - vdbe_vdbe_untr_1_port_vlan1: + vdbe_vdbe_untr_1_port_1_vlan1: type: org.openecomp.resource.abstract.nodes.heat.subinterface.vlan1 directives: - substitutable @@ -386,45 +343,88 @@ topology_template: requirements: - binding_vdbe_untr_x_vlan1-Network-Role_vmi_subport: capability: tosca.capabilities.network.Bindable - node: vdbe_vdbe_untr_1_port + node: vdbe_vdbe_untr_1_port_1 relationship: tosca.relationships.network.BindsTo - vdbe_vdbe_untr_1_port: + vdbe_vdbe_untr_1_port_1: type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface properties: mac_requirements: - get_input: port_vdbe_untr_1_port_mac_requirements + get_input: port_vdbe_untr_1_port_1_mac_requirements order: - get_input: port_vdbe_untr_1_port_order + get_input: port_vdbe_untr_1_port_1_order exCP_naming: - get_input: port_vdbe_untr_1_port_exCP_naming + get_input: port_vdbe_untr_1_port_1_exCP_naming virtual_machine_interface_allowed_address_pairs: get_input: - - port_vdbe_untr_1_port_virtual_machine_interface_allowed_address_pairs + - port_vdbe_untr_1_port_1_virtual_machine_interface_allowed_address_pairs - index_value vlan_requirements: - get_input: port_vdbe_untr_1_port_vlan_requirements + get_input: port_vdbe_untr_1_port_1_vlan_requirements subinterface_indicator: true related_networks: - get_input: port_vdbe_untr_1_port_related_networks + get_input: port_vdbe_untr_1_port_1_related_networks + virtual_network_refs: + get_input: + - port_vdbe_untr_1_port_1_virtual_network_refs + - index_value + ip_requirements: + get_input: port_vdbe_untr_1_port_1_ip_requirements + network_role_tag: + get_input: port_vdbe_untr_1_port_1_network_role_tag + virtual_machine_interface_mac_addresses: + get_input: + - port_vdbe_untr_1_port_1_virtual_machine_interface_mac_addresses + - index_value + network_role: + get_input: port_vdbe_untr_1_port_1_network_role + subnetpoolid: + get_input: port_vdbe_untr_1_port_1_subnetpoolid + name: + get_input: + - port_vdbe_untr_1_port_1_name + - index_value + requirements: + - binding: + capability: tosca.capabilities.network.Bindable + node: vdbe + relationship: tosca.relationships.network.BindsTo + vdbe_vdbe_untr_2_port_1: + type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface + properties: + mac_requirements: + get_input: port_vdbe_untr_2_port_1_mac_requirements + order: + get_input: port_vdbe_untr_2_port_1_order + exCP_naming: + get_input: port_vdbe_untr_2_port_1_exCP_naming + virtual_machine_interface_allowed_address_pairs: + get_input: + - port_vdbe_untr_2_port_1_virtual_machine_interface_allowed_address_pairs + - index_value + vlan_requirements: + get_input: port_vdbe_untr_2_port_1_vlan_requirements + subinterface_indicator: false + related_networks: + get_input: port_vdbe_untr_2_port_1_related_networks virtual_network_refs: get_input: - - port_vdbe_untr_1_port_virtual_network_refs + - port_vdbe_untr_2_port_1_virtual_network_refs - index_value ip_requirements: - get_input: port_vdbe_untr_1_port_ip_requirements + get_input: port_vdbe_untr_2_port_1_ip_requirements network_role_tag: - get_input: port_vdbe_untr_1_port_network_role_tag + get_input: port_vdbe_untr_2_port_1_network_role_tag virtual_machine_interface_mac_addresses: get_input: - - port_vdbe_untr_1_port_virtual_machine_interface_mac_addresses + - port_vdbe_untr_2_port_1_virtual_machine_interface_mac_addresses - index_value network_role: - get_input: port_vdbe_untr_1_port_network_role + get_input: port_vdbe_untr_2_port_1_network_role subnetpoolid: - get_input: port_vdbe_untr_1_port_subnetpoolid + get_input: port_vdbe_untr_2_port_1_subnetpoolid name: get_input: - - port_vdbe_untr_1_port_name + - port_vdbe_untr_2_port_1_name - index_value requirements: - binding: @@ -446,12 +446,12 @@ topology_template: disk.ephemeral.size_vdbe: - vdbe - disk.ephemeral.size - feature_vdbe_vdbe_untr_2_port: - - vdbe_vdbe_untr_2_port - - feature - feature_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_1_port_vlan1: - - vdbe_vdbe_untr_1_port_vlan1 - - feature_vdbe_untr_x_vlan1-Network-Role_vmi_subport + network.outpoing.packets_vdbe_vdbe_untr_1_port_1: + - vdbe_vdbe_untr_1_port_1 + - network.outpoing.packets + network.outpoing.packets_vdbe_vdbe_untr_2_port_1: + - vdbe_vdbe_untr_2_port_1 + - network.outpoing.packets cpu_util_vdbe: - vdbe - cpu_util @@ -461,30 +461,27 @@ topology_template: disk.write.requests_vdbe: - vdbe - disk.write.requests - feature_vdbe_vdbe_untr_1_port_vlan1: - - vdbe_vdbe_untr_1_port_vlan1 - - feature + network.outgoing.packets.rate_vdbe_vdbe_untr_2_port_1: + - vdbe_vdbe_untr_2_port_1 + - network.outgoing.packets.rate + network.outgoing.packets.rate_vdbe_vdbe_untr_1_port_1: + - vdbe_vdbe_untr_1_port_1 + - network.outgoing.packets.rate disk.device.latency_vdbe: - vdbe - disk.device.latency disk.device.write.requests.rate_vdbe: - vdbe - disk.device.write.requests.rate - network.incoming.packets_vdbe_vdbe_untr_2_port: - - vdbe_vdbe_untr_2_port - - network.incoming.packets - feature_vdbe_vdbe_untr_1_port: - - vdbe_vdbe_untr_1_port - - feature + network.incoming.bytes_vdbe_vdbe_untr_1_port_1: + - vdbe_vdbe_untr_1_port_1 + - network.incoming.bytes disk.write.bytes.rate_vdbe: - vdbe - disk.write.bytes.rate - network.incoming.bytes.rate_vdbe_vdbe_untr_1_port: - - vdbe_vdbe_untr_1_port - - network.incoming.bytes.rate - network.incoming.packets.rate_vdbe_vdbe_untr_1_port: - - vdbe_vdbe_untr_1_port - - network.incoming.packets.rate + network.outgoing.bytes.rate_vdbe_vdbe_untr_2_port_1: + - vdbe_vdbe_untr_2_port_1 + - network.outgoing.bytes.rate scalable_vdbe: - vdbe - scalable @@ -497,12 +494,9 @@ topology_template: disk.device.capacity_vdbe: - vdbe - disk.device.capacity - network.outgoing.bytes.rate_vdbe_vdbe_untr_2_port: - - vdbe_vdbe_untr_2_port - - network.outgoing.bytes.rate - network.outgoing.bytes_vdbe_vdbe_untr_1_port: - - vdbe_vdbe_untr_1_port - - network.outgoing.bytes + binding_vdbe_vdbe_untr_1_port_1: + - vdbe_vdbe_untr_1_port_1 + - binding disk.device.allocation_vdbe: - vdbe - disk.device.allocation @@ -512,27 +506,33 @@ topology_template: memory.usage_vdbe: - vdbe - memory.usage - network.outpoing.packets_vdbe_vdbe_untr_2_port: - - vdbe_vdbe_untr_2_port - - network.outpoing.packets + network.outgoing.bytes_vdbe_vdbe_untr_1_port_1: + - vdbe_vdbe_untr_1_port_1 + - network.outgoing.bytes disk.read.requests_vdbe: - vdbe - disk.read.requests - network.incoming.bytes_vdbe_vdbe_untr_1_port: - - vdbe_vdbe_untr_1_port - - network.incoming.bytes + network.incoming.packets.rate_vdbe_vdbe_untr_1_port_1: + - vdbe_vdbe_untr_1_port_1 + - network.incoming.packets.rate + network.incoming.packets_vdbe_vdbe_untr_2_port_1: + - vdbe_vdbe_untr_2_port_1 + - network.incoming.packets + network.incoming.bytes.rate_vdbe_vdbe_untr_2_port_1: + - vdbe_vdbe_untr_2_port_1 + - network.incoming.bytes.rate + forwarder_vdbe_vdbe_untr_1_port_1: + - vdbe_vdbe_untr_1_port_1 + - forwarder instance_vdbe: - vdbe - instance cpu.delta_vdbe: - vdbe - cpu.delta - network.outgoing.packets.rate_vdbe_vdbe_untr_2_port: - - vdbe_vdbe_untr_2_port - - network.outgoing.packets.rate - binding_vdbe_vdbe_untr_1_port: - - vdbe_vdbe_untr_1_port - - binding + forwarder_vdbe_vdbe_untr_2_port_1: + - vdbe_vdbe_untr_2_port_1 + - forwarder disk.device.read.bytes.rate_vdbe: - vdbe - disk.device.read.bytes.rate @@ -542,33 +542,36 @@ topology_template: memory.resident_vdbe: - vdbe - memory.resident - forwarder_vdbe_vdbe_untr_1_port: - - vdbe_vdbe_untr_1_port - - forwarder disk.write.requests.rate_vdbe: - vdbe - disk.write.requests.rate + feature_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_1_port_1_vlan1: + - vdbe_vdbe_untr_1_port_1_vlan1 + - feature_vdbe_untr_x_vlan1-Network-Role_vmi_subport cpu_vdbe: - vdbe - cpu disk.write.bytes_vdbe: - vdbe - disk.write.bytes - forwarder_vdbe_vdbe_untr_2_port: - - vdbe_vdbe_untr_2_port - - forwarder disk.device.usage_vdbe: - vdbe - disk.device.usage disk.device.read.bytes_vdbe: - vdbe - disk.device.read.bytes + feature_vdbe_vdbe_untr_2_port_1: + - vdbe_vdbe_untr_2_port_1 + - feature disk.latency_vdbe: - vdbe - disk.latency - network.outgoing.packets.rate_vdbe_vdbe_untr_1_port: - - vdbe_vdbe_untr_1_port - - network.outgoing.packets.rate + network.incoming.bytes_vdbe_vdbe_untr_2_port_1: + - vdbe_vdbe_untr_2_port_1 + - network.incoming.bytes + network.outgoing.bytes.rate_vdbe_vdbe_untr_1_port_1: + - vdbe_vdbe_untr_1_port_1 + - network.outgoing.bytes.rate disk.capacity_vdbe: - vdbe - disk.capacity @@ -578,36 +581,39 @@ topology_template: disk.allocation_vdbe: - vdbe - disk.allocation - network.outpoing.packets_vdbe_vdbe_untr_1_port: - - vdbe_vdbe_untr_1_port - - network.outpoing.packets - network.incoming.packets_vdbe_vdbe_untr_1_port: - - vdbe_vdbe_untr_1_port - - network.incoming.packets + feature_vdbe_vdbe_untr_1_port_1: + - vdbe_vdbe_untr_1_port_1 + - feature disk.read.bytes.rate_vdbe: - vdbe - disk.read.bytes.rate - network.incoming.bytes_vdbe_vdbe_untr_2_port: - - vdbe_vdbe_untr_2_port - - network.incoming.bytes + binding_vdbe_vdbe_untr_2_port_1: + - vdbe_vdbe_untr_2_port_1 + - binding os_vdbe: - vdbe - os disk.device.read.requests_vdbe: - vdbe - disk.device.read.requests - network.incoming.packets.rate_vdbe_vdbe_untr_2_port: - - vdbe_vdbe_untr_2_port - - network.incoming.packets.rate + network.outgoing.bytes_vdbe_vdbe_untr_2_port_1: + - vdbe_vdbe_untr_2_port_1 + - network.outgoing.bytes disk.root.size_vdbe: - vdbe - disk.root.size - network.incoming.bytes.rate_vdbe_vdbe_untr_2_port: - - vdbe_vdbe_untr_2_port + network.incoming.packets.rate_vdbe_vdbe_untr_2_port_1: + - vdbe_vdbe_untr_2_port_1 + - network.incoming.packets.rate + feature_vdbe_vdbe_untr_1_port_1_vlan1: + - vdbe_vdbe_untr_1_port_1_vlan1 + - feature + network.incoming.packets_vdbe_vdbe_untr_1_port_1: + - vdbe_vdbe_untr_1_port_1 + - network.incoming.packets + network.incoming.bytes.rate_vdbe_vdbe_untr_1_port_1: + - vdbe_vdbe_untr_1_port_1 - network.incoming.bytes.rate - binding_vdbe_vdbe_untr_2_port: - - vdbe_vdbe_untr_2_port - - binding memory_vdbe: - vdbe - memory @@ -617,12 +623,6 @@ topology_template: disk.device.write.bytes_vdbe: - vdbe - disk.device.write.bytes - network.outgoing.bytes_vdbe_vdbe_untr_2_port: - - vdbe_vdbe_untr_2_port - - network.outgoing.bytes - network.outgoing.bytes.rate_vdbe_vdbe_untr_1_port: - - vdbe_vdbe_untr_1_port - - network.outgoing.bytes.rate disk.device.read.requests.rate_vdbe: - vdbe - disk.device.read.requests.rate @@ -630,30 +630,30 @@ topology_template: - vdbe - disk.read.bytes requirements: - dependency_vdbe_vdbe_untr_1_port: - - vdbe_vdbe_untr_1_port + dependency_vdbe_vdbe_untr_1_port_1: + - vdbe_vdbe_untr_1_port_1 + - dependency + dependency_vdbe_vdbe_untr_2_port_1: + - vdbe_vdbe_untr_2_port_1 + - dependency + dependency_vdbe_vdbe_untr_1_port_1_vlan1: + - vdbe_vdbe_untr_1_port_1_vlan1 - dependency - link_vdbe_vdbe_untr_2_port: - - vdbe_vdbe_untr_2_port - - link local_storage_vdbe: - vdbe - local_storage - dependency_vdbe_vdbe_untr_2_port: - - vdbe_vdbe_untr_2_port - - dependency - dependency_vdbe_vdbe_untr_1_port_vlan1: - - vdbe_vdbe_untr_1_port_vlan1 - - dependency - dependency_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_1_port_vlan1: - - vdbe_vdbe_untr_1_port_vlan1 + link_vdbe_vdbe_untr_2_port_1: + - vdbe_vdbe_untr_2_port_1 + - link + subinterface_link_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_1_port_1_vlan1: + - vdbe_vdbe_untr_1_port_1_vlan1 + - subinterface_link_vdbe_untr_x_vlan1-Network-Role_vmi_subport + dependency_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_1_port_1_vlan1: + - vdbe_vdbe_untr_1_port_1_vlan1 - dependency_vdbe_untr_x_vlan1-Network-Role_vmi_subport - link_vdbe_vdbe_untr_1_port: - - vdbe_vdbe_untr_1_port + link_vdbe_vdbe_untr_1_port_1: + - vdbe_vdbe_untr_1_port_1 - link dependency_vdbe: - vdbe - - dependency - subinterface_link_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_1_port_vlan1: - - vdbe_vdbe_untr_1_port_vlan1 - - subinterface_link_vdbe_untr_x_vlan1-Network-Role_vmi_subport \ No newline at end of file + - 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/pattern1c1/regularNestedSubInterface/in/main.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/regularNestedSubInterface/in/main.yml index 5d2410ce66..490ae7caf5 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/regularNestedSubInterface/in/main.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/regularNestedSubInterface/in/main.yml @@ -154,7 +154,7 @@ resources: name: get_param: vdbe_name_2 networks: - - port: {get_resource: vdbe_untr_port_2} + - port: {get_resource: vdbe_1_untr_port_1} vdbe_untr_port_1: type: OS::ContrailV2::VirtualMachineInterface properties: @@ -198,7 +198,7 @@ resources: virtual_network_refs: - get_resource: control_int_net - vdbe_untr_port_2: + vdbe_1_untr_port_1: type: OS::ContrailV2::VirtualMachineInterface properties: name: Untr_Port_2 @@ -310,7 +310,7 @@ resources: mac_address: get_param: vdbe_hw_untr_mac_1 parent_interface: - get_resource: vdbe_untr_port_2 + get_resource: vdbe_1_untr_port_1 subinterfaces_name_prefix: str_replace: params: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/regularNestedSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/regularNestedSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml index 27074c4f90..7ac84b0fcf 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/regularNestedSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/regularNestedSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,10 +8,6 @@ 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_nested_parent_interface: type: list required: true @@ -30,8 +26,8 @@ node_types: status: SUPPORTED entry_schema: type: json - port_vdbe_untr_port_subnetpoolid: - type: string + port_vdbe_untr_port_1_virtual_machine_interface_allowed_address_pairs: + type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs required: true status: SUPPORTED compute_vdbe_availability_zone: @@ -52,12 +48,28 @@ node_types: status: SUPPORTED entry_schema: type: string + port_vdbe_untr_port_1_name: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_vdbe_untr_port_1_network_role: + type: string + required: true + status: SUPPORTED vm_flavor_name: type: string required: true status: SUPPORTED - port_vdbe_untr_port_order: - type: integer + port_vdbe_untr_port_1_virtual_machine_interface_mac_addresses: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_vdbe_untr_port_1_network_role_tag: + type: string required: true status: SUPPORTED subinterface_nested_aap_untrusted_ip_prefix: @@ -66,12 +78,12 @@ node_types: status: SUPPORTED entry_schema: type: string - vm_image_name: - type: string + port_vdbe_untr_port_1_order: + type: integer required: true status: SUPPORTED - port_vdbe_untr_port_exCP_naming: - type: org.openecomp.datatypes.Naming + vm_image_name: + type: string required: true status: SUPPORTED subinterface_nested_aap_sec_untrusted_ip_prefix_len: @@ -104,32 +116,42 @@ node_types: status: SUPPORTED entry_schema: type: string - port_vdbe_untr_port_virtual_machine_interface_allowed_address_pairs: - type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs - required: true - status: SUPPORTED subinterface_nested_ip_address: type: list required: true status: SUPPORTED entry_schema: type: string - port_vdbe_untr_port_virtual_network_refs: + port_vdbe_untr_port_1_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.RelatedNetworksAssignments subinterface_nested_ip_v6_address: type: list required: true status: SUPPORTED entry_schema: type: string - port_vdbe_untr_port_mac_requirements: + port_vdbe_untr_port_1_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_vdbe_untr_port_1_subnetpoolid: + type: string + required: true + status: SUPPORTED + port_vdbe_untr_port_1_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED + port_vdbe_untr_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED index_value: type: integer description: Index value of this substitution service template runtime instance @@ -150,28 +172,12 @@ node_types: status: SUPPORTED entry_schema: type: string - port_vdbe_untr_port_name: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_vdbe_untr_port_vlan_requirements: + port_vdbe_untr_port_1_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_virtual_machine_interface_mac_addresses: - type: list - required: true - status: SUPPORTED - entry_schema: - type: json subinterface_nested_aap_untrusted_ip_prefix_len: type: list required: true @@ -208,76 +214,68 @@ node_types: status: SUPPORTED entry_schema: type: string - port_vdbe_untr_port_related_networks: + port_vdbe_untr_port_1_virtual_network_refs: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_vdbe_untr_port_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: json requirements: - - dependency_vdbe: + - dependency_vdbe_vdbe_untr_port_1_nested: 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: + - dependency_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_port_1_nested: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_vdbe_vdbe_untr_port: + - subinterface_link_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_port_1_nested: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_vdbe_vdbe_untr_port_nested: + - dependency_vdbe: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - dependency_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_port_nested: + - local_storage_vdbe: + capability: tosca.capabilities.Attachment + node: tosca.nodes.BlockStorage + relationship: tosca.relationships.AttachesTo + occurrences: + - 0 + - UNBOUNDED + - dependency_vdbe_vdbe_untr_port_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - subinterface_link_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_port_nested: + - link_vdbe_vdbe_untr_port_1: 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. + feature_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_port_1_nested: + type: tosca.capabilities.Node 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. + forwarder_vdbe_vdbe_untr_port_1: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED @@ -286,11 +284,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_vdbe_vdbe_untr_port: - type: tosca.capabilities.Node - 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. @@ -338,13 +331,24 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_vdbe_vdbe_untr_port_1: + type: tosca.capabilities.Node + 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: + network.incoming.bytes.rate_vdbe_vdbe_untr_port_1: + 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_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -367,37 +371,37 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.capacity_vdbe: + network.outgoing.packets.rate_vdbe_vdbe_untr_port_1: 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: + 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.usage_vdbe: + network.outgoing.bytes_vdbe_vdbe_untr_port_1: 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: + 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 - network.outpoing.packets_vdbe_vdbe_untr_port: + 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 - network.outgoing.bytes.rate_vdbe_vdbe_untr_port: + 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: @@ -409,17 +413,7 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_vdbe_vdbe_untr_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - feature_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_port_nested: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - binding_vdbe_vdbe_untr_port: + binding_vdbe_vdbe_untr_port_1: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface @@ -427,13 +421,19 @@ node_types: occurrences: - 0 - UNBOUNDED + network.incoming.bytes_vdbe_vdbe_untr_port_1: + 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 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: + network.outgoing.bytes.rate_vdbe_vdbe_untr_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -463,11 +463,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_vdbe_vdbe_untr_port_nested: - type: tosca.capabilities.Node - 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. @@ -504,12 +499,6 @@ node_types: 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. @@ -529,17 +518,34 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_vdbe_vdbe_untr_port_1: + 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 + network.incoming.packets_vdbe_vdbe_untr_port_1: + 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 + feature_vdbe_vdbe_untr_port_1_nested: + type: tosca.capabilities.Node + 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. @@ -581,12 +587,6 @@ node_types: 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.nested: derived_from: org.openecomp.resource.abstract.nodes.AbstractSubstitute properties: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/regularNestedSubInterface/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/regularNestedSubInterface/out/MainServiceTemplate.yaml index 60c5fb643a..f5c296dd4f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/regularNestedSubInterface/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/regularNestedSubInterface/out/MainServiceTemplate.yaml @@ -488,7 +488,7 @@ topology_template: properties: subinterface_nested_parent_interface: - vdbe_untr_port_1 - - vdbe_untr_port_2 + - vdbe_1_untr_port_1 subinterface_nested_aap_address_mode: - get_input: aap_address_mode - get_input: aap_address_mode @@ -501,8 +501,14 @@ topology_template: subinterface_nested_aap_untrusted_v6_ip_prefix_len: - get_input: vdbe_aap_untrusted_v6_ip_prefix_len - get_input: vdbe_aap_untrusted_v6_ip_prefix_len + port_vdbe_untr_port_1_name: + - Untr_Port_1 + - Untr_Port_2 vm_flavor_name: get_input: vdbe_flavor_name + port_vdbe_untr_port_1_virtual_machine_interface_mac_addresses: + - - get_input: vdbe_hw_untr_mac_1 + - - get_input: vdbe_hw_untr_mac_1 subinterface_nested_aap_untrusted_ip_prefix: - get_input: vdbe_aap_untrusted_ip_prefix - get_input: vdbe_aap_untrusted_ip_prefix @@ -536,9 +542,6 @@ topology_template: subinterface_nested_ip_address: - get_input: vdbe_untrusted_ip_1 - get_input: vdbe_untrusted_ip_1 - port_vdbe_untr_port_virtual_network_refs: - - - control_int_net - - - control_int_net subinterface_nested_ip_v6_address: - get_input: vdbe_untrusted_v6_ip_1 - get_input: vdbe_untrusted_v6_ip_1 @@ -548,12 +551,6 @@ topology_template: subinterface_nested_vn_network_list: - get_input: untrusted_vn_networks - get_input: untrusted_vn_networks - port_vdbe_untr_port_name: - - Untr_Port_1 - - Untr_Port_2 - port_vdbe_untr_port_virtual_machine_interface_mac_addresses: - - - get_input: vdbe_hw_untr_mac_1 - - - get_input: vdbe_hw_untr_mac_1 subinterface_nested_aap_untrusted_ip_prefix_len: - get_input: vdbe_aap_untrusted_ip_prefix_len - get_input: vdbe_aap_untrusted_ip_prefix_len @@ -584,6 +581,9 @@ topology_template: subinterface_nested_optional_property_2: - null - OPTIONAL_VALUE_SUBPORT_2 + port_vdbe_untr_port_1_virtual_network_refs: + - - control_int_net + - - control_int_net service_template_filter: substitute_service_template: Nested_vdbeServiceTemplate.yaml count: 2 @@ -593,7 +593,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_vdbe_vdbe_untr_port: + - link_vdbe_vdbe_untr_port_1: capability: tosca.capabilities.network.Linkable node: control_int_net relationship: tosca.relationships.network.LinksTo @@ -606,4 +606,4 @@ topology_template: Version 2.0 02-09-2016 (Authors: John Doe, user PROD) members: - 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/pattern1c1/regularNestedSubInterface/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/pattern1c1/regularNestedSubInterface/out/Nested_vdbeServiceTemplate.yaml index c25df79fc7..b04f04dd3d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/regularNestedSubInterface/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/pattern1c1/regularNestedSubInterface/out/Nested_vdbeServiceTemplate.yaml @@ -11,9 +11,6 @@ node_types: 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_nested_parent_interface: type: list required: true @@ -29,8 +26,8 @@ topology_template: required: true entry_schema: type: json - port_vdbe_untr_port_subnetpoolid: - type: string + port_vdbe_untr_port_1_virtual_machine_interface_allowed_address_pairs: + type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs required: true compute_vdbe_availability_zone: type: list @@ -47,23 +44,36 @@ topology_template: required: true entry_schema: type: string + port_vdbe_untr_port_1_name: + type: list + required: true + entry_schema: + type: string + port_vdbe_untr_port_1_network_role: + type: string + required: true vm_flavor_name: type: string required: true - port_vdbe_untr_port_order: - type: integer + port_vdbe_untr_port_1_virtual_machine_interface_mac_addresses: + type: list + required: true + entry_schema: + type: json + port_vdbe_untr_port_1_network_role_tag: + type: string required: true subinterface_nested_aap_untrusted_ip_prefix: type: list required: true entry_schema: type: string + port_vdbe_untr_port_1_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_nested_aap_sec_untrusted_ip_prefix_len: type: list required: true @@ -89,27 +99,35 @@ topology_template: required: true entry_schema: type: string - port_vdbe_untr_port_virtual_machine_interface_allowed_address_pairs: - type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs - required: true subinterface_nested_ip_address: type: list required: true entry_schema: type: string - port_vdbe_untr_port_virtual_network_refs: + port_vdbe_untr_port_1_related_networks: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.RelatedNetworksAssignments subinterface_nested_ip_v6_address: type: list required: true entry_schema: type: string - port_vdbe_untr_port_mac_requirements: + port_vdbe_untr_port_1_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_vdbe_untr_port_1_subnetpoolid: + type: string + required: true + port_vdbe_untr_port_1_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true + port_vdbe_untr_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -127,24 +145,11 @@ topology_template: required: true entry_schema: type: string - port_vdbe_untr_port_name: - type: list - required: true - entry_schema: - type: string - port_vdbe_untr_port_vlan_requirements: + port_vdbe_untr_port_1_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_virtual_machine_interface_mac_addresses: - type: list - required: true - entry_schema: - type: json subinterface_nested_aap_untrusted_ip_prefix_len: type: list required: true @@ -175,80 +180,13 @@ topology_template: required: true entry_schema: type: string - port_vdbe_untr_port_related_networks: + port_vdbe_untr_port_1_virtual_network_refs: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_vdbe_untr_port_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: json 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.contrailV2.VirtualMachineInterface - properties: - mac_requirements: - get_input: port_vdbe_untr_port_mac_requirements - order: - get_input: port_vdbe_untr_port_order - exCP_naming: - get_input: port_vdbe_untr_port_exCP_naming - virtual_machine_interface_allowed_address_pairs: - get_input: - - port_vdbe_untr_port_virtual_machine_interface_allowed_address_pairs - - index_value - vlan_requirements: - get_input: port_vdbe_untr_port_vlan_requirements - subinterface_indicator: true - related_networks: - get_input: port_vdbe_untr_port_related_networks - virtual_network_refs: - get_input: - - port_vdbe_untr_port_virtual_network_refs - - index_value - ip_requirements: - get_input: port_vdbe_untr_port_ip_requirements - network_role_tag: - get_input: port_vdbe_untr_port_network_role_tag - virtual_machine_interface_mac_addresses: - get_input: - - port_vdbe_untr_port_virtual_machine_interface_mac_addresses - - index_value - 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 - vdbe_vdbe_untr_port_nested: + vdbe_vdbe_untr_port_1_nested: type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested directives: - substitutable @@ -334,23 +272,82 @@ topology_template: requirements: - binding_vdbe_untr_x_vlan1-Network-Role_vmi_subport: capability: tosca.capabilities.network.Bindable - node: vdbe_vdbe_untr_port + node: vdbe_vdbe_untr_port_1 + 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_1: + type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface + properties: + mac_requirements: + get_input: port_vdbe_untr_port_1_mac_requirements + order: + get_input: port_vdbe_untr_port_1_order + exCP_naming: + get_input: port_vdbe_untr_port_1_exCP_naming + virtual_machine_interface_allowed_address_pairs: + get_input: + - port_vdbe_untr_port_1_virtual_machine_interface_allowed_address_pairs + - index_value + vlan_requirements: + get_input: port_vdbe_untr_port_1_vlan_requirements + subinterface_indicator: true + related_networks: + get_input: port_vdbe_untr_port_1_related_networks + virtual_network_refs: + get_input: + - port_vdbe_untr_port_1_virtual_network_refs + - index_value + ip_requirements: + get_input: port_vdbe_untr_port_1_ip_requirements + network_role_tag: + get_input: port_vdbe_untr_port_1_network_role_tag + virtual_machine_interface_mac_addresses: + get_input: + - port_vdbe_untr_port_1_virtual_machine_interface_mac_addresses + - index_value + network_role: + get_input: port_vdbe_untr_port_1_network_role + subnetpoolid: + get_input: port_vdbe_untr_port_1_subnetpoolid + name: + get_input: + - port_vdbe_untr_port_1_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_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_port_1_nested: + - vdbe_vdbe_untr_port_1_nested + - feature_vdbe_untr_x_vlan1-Network-Role_vmi_subport + forwarder_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - forwarder feature_vdbe: - vdbe - feature - feature_vdbe_vdbe_untr_port: - - vdbe_vdbe_untr_port - - feature disk.device.iops_vdbe: - vdbe - disk.device.iops @@ -375,12 +372,18 @@ topology_template: disk.device.write.requests.rate_vdbe: - vdbe - disk.device.write.requests.rate + feature_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - feature disk.write.bytes.rate_vdbe: - vdbe - disk.write.bytes.rate - network.incoming.packets_vdbe_vdbe_untr_port: - - vdbe_vdbe_untr_port - - network.incoming.packets + network.incoming.bytes.rate_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - network.incoming.bytes.rate + network.incoming.packets.rate_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - network.incoming.packets.rate scalable_vdbe: - vdbe - scalable @@ -390,9 +393,15 @@ topology_template: disk.device.write.requests_vdbe: - vdbe - disk.device.write.requests + network.outgoing.packets.rate_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - network.outgoing.packets.rate disk.device.capacity_vdbe: - vdbe - disk.device.capacity + network.outgoing.bytes_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - network.outgoing.bytes disk.device.allocation_vdbe: - vdbe - disk.device.allocation @@ -402,30 +411,21 @@ topology_template: 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 - feature_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_port_nested: - - vdbe_vdbe_untr_port_nested - - feature_vdbe_untr_x_vlan1-Network-Role_vmi_subport - binding_vdbe_vdbe_untr_port: - - vdbe_vdbe_untr_port + binding_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 - binding + network.incoming.bytes_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - network.incoming.bytes instance_vdbe: - vdbe - instance - network.incoming.bytes.rate_vdbe_vdbe_untr_port: - - vdbe_vdbe_untr_port - - network.incoming.bytes.rate + network.outgoing.bytes.rate_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - network.outgoing.bytes.rate cpu.delta_vdbe: - vdbe - cpu.delta @@ -438,9 +438,6 @@ topology_template: memory.resident_vdbe: - vdbe - memory.resident - feature_vdbe_vdbe_untr_port_nested: - - vdbe_vdbe_untr_port_nested - - feature disk.write.requests.rate_vdbe: - vdbe - disk.write.requests.rate @@ -459,9 +456,6 @@ topology_template: 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 @@ -471,12 +465,21 @@ topology_template: disk.allocation_vdbe: - vdbe - disk.allocation + network.outpoing.packets_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - network.outpoing.packets disk.read.bytes.rate_vdbe: - vdbe - disk.read.bytes.rate + network.incoming.packets_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - network.incoming.packets os_vdbe: - vdbe - os + feature_vdbe_vdbe_untr_port_1_nested: + - vdbe_vdbe_untr_port_1_nested + - feature disk.device.read.requests_vdbe: - vdbe - disk.device.read.requests @@ -498,28 +501,25 @@ topology_template: 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_vdbe_vdbe_untr_port_1_nested: + - vdbe_vdbe_untr_port_1_nested - dependency - link_vdbe_vdbe_untr_port: - - vdbe_vdbe_untr_port + dependency_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_port_1_nested: + - vdbe_vdbe_untr_port_1_nested + - dependency_vdbe_untr_x_vlan1-Network-Role_vmi_subport + dependency_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - dependency + subinterface_link_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_port_1_nested: + - vdbe_vdbe_untr_port_1_nested + - subinterface_link_vdbe_untr_x_vlan1-Network-Role_vmi_subport + link_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 - link local_storage_vdbe: - vdbe - local_storage - subinterface_link_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_port_nested: - - vdbe_vdbe_untr_port_nested - - subinterface_link_vdbe_untr_x_vlan1-Network-Role_vmi_subport - dependency_vdbe_vdbe_untr_port_nested: - - vdbe_vdbe_untr_port_nested - - dependency dependency_vdbe: - vdbe - - dependency - dependency_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_port_nested: - - vdbe_vdbe_untr_port_nested - - dependency_vdbe_untr_x_vlan1-Network-Role_vmi_subport \ No newline at end of file + - 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/pattern1c2/differentNetwork/in/main.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNetwork/in/main.yml index a7f27a34cb..78be5c1ca7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNetwork/in/main.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNetwork/in/main.yml @@ -177,10 +177,10 @@ resources: flavor: {get_param: pd_flavor_name} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: pd01_port_0} + - port: {get_resource: pd_server_port_1} user_data_format: RAW - pd01_port_0: + pd_server_port_1: type: OS::Neutron::Port properties: network: {get_param: oam_net_name} @@ -194,10 +194,10 @@ resources: flavor: {get_param: pd_flavor_name} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: pd01_port_1} + - port: {get_resource: pd_server_1_port_1} user_data_format: RAW - pd01_port_1: + pd_server_1_port_1: type: OS::Neutron::Port properties: network: {get_param: oam_net_name} @@ -209,7 +209,7 @@ resources: resource_def: type: nested.yml properties: - p1: { get_resource: pd01_port_0} + p1: { get_resource: pd_server_port_1} net1: { get_resource: test_net1} test_resourceGroup2: @@ -219,7 +219,7 @@ resources: resource_def: type: nested.yml properties: - p1: { get_resource: pd01_port_1} + p1: { get_resource: pd_server_1_port_1} net1: { get_resource: test_net2} test_net1: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNetwork/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNetwork/out/GlobalSubstitutionTypesServiceTemplate.yaml index 3e2ef2c327..2204cc5703 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNetwork/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNetwork/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,6 +8,12 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_pd_server_port_1_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments index_value: type: integer description: Index value of this substitution service template runtime instance @@ -16,6 +22,16 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 + port_pd_server_port_1_network_role_tag: + type: string + required: true + status: SUPPORTED + port_pd_server_port_1_network: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string compute_pd_server_availability_zone: type: list required: true @@ -28,8 +44,8 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_port_1_order: + type: integer required: true status: SUPPORTED subinterface_nested_service_template_filter_count: @@ -38,12 +54,6 @@ node_types: status: SUPPORTED entry_schema: type: float - port_pd01_port_related_networks: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true @@ -54,31 +64,21 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - vm_image_name: - type: string - required: true - status: SUPPORTED - port_pd01_port_ip_requirements: + port_pd_server_port_1_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: - type: list + type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: string - port_pd01_port_order: - type: integer + port_pd_server_port_1_network_role: + type: string required: true status: SUPPORTED - port_pd01_port_subnetpoolid: + vm_image_name: type: string required: true status: SUPPORTED @@ -88,69 +88,69 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_network_role: - type: string - required: true - status: SUPPORTED - port_pd01_port_network_role_tag: - type: string - required: true - status: SUPPORTED - port_pd01_port_vlan_requirements: + port_pd_server_port_1_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.IpRequirements compute_pd_server_user_data_format: type: list required: true status: SUPPORTED entry_schema: type: string + port_pd_server_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_pd_server_port_1_subnetpoolid: + type: string + required: true + status: SUPPORTED requirements: - - dependency_pd_server_pd01_port_nested: + - dependency_pd_server: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - dependency_template_Vlan_vmi_1_pd_server_pd01_port_nested: + - local_storage_pd_server: + capability: tosca.capabilities.Attachment + node: tosca.nodes.BlockStorage + relationship: tosca.relationships.AttachesTo + occurrences: + - 0 + - UNBOUNDED + - dependency_pd_server_pd_server_port_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - subinterface_link_template_Vlan_vmi_1_pd_server_pd01_port_nested: + - link_pd_server_pd_server_port_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_pd_server: + - dependency_pd_server_pd_server_port_1_nested: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - local_storage_pd_server: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo - occurrences: - - 0 - - UNBOUNDED - - dependency_pd_server_pd01_port: + - dependency_template_Vlan_vmi_1_pd_server_pd_server_port_1_nested: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd01_port: + - subinterface_link_template_Vlan_vmi_1_pd_server_pd_server_port_1_nested: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -168,6 +168,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.packets.rate_pd_server_pd_server_port_1: + 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_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -186,9 +192,8 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pd01_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_pd_server_pd_server_port_1: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED @@ -203,7 +208,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd01_port: + network.outgoing.bytes.rate_pd_server_pd_server_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -239,12 +244,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd01_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.iops_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -263,19 +262,24 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pd01_port: + vcpus_pd_server: 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_pd_server: + disk.device.write.bytes.rate_pd_server: 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_pd_server: + attachment_pd_server_pd_server_port_1: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes.rate_pd_server_pd_server_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -292,18 +296,13 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pd01_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED disk.capacity_pd_server: 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_template_Vlan_vmi_1_pd_server_pd01_port_nested: + feature_pd_server_pd_server_port_1_nested: type: tosca.capabilities.Node occurrences: - 1 @@ -325,14 +324,15 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.read.requests_pd_server: + network.incoming.bytes_pd_server_pd_server_port_1: 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_pd_server_pd01_port_nested: - type: tosca.capabilities.Node + disk.read.requests_pd_server: + 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 @@ -347,7 +347,7 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_pd01_port: + binding_pd_server_pd_server_port_1: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface @@ -355,21 +355,19 @@ node_types: occurrences: - 0 - UNBOUNDED - disk.write.bytes_pd_server: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_pd_server_pd_server_port_1: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pd_server_pd01_port: + disk.write.bytes_pd_server: 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_pd_server_pd01_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_template_Vlan_vmi_1_pd_server_pd_server_port_1_nested: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -397,6 +395,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets_pd_server_pd_server_port_1: + 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_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -416,17 +420,12 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pd01_port: + network.outgoing.bytes_pd_server_pd_server_port_1: 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_pd_server_pd01_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED disk.write.requests.rate_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -445,11 +444,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_pd01_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.device.latency_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -468,7 +462,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pd01_port: + network.incoming.packets.rate_pd_server_pd_server_port_1: + 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_pd_server_pd_server_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -554,4 +554,4 @@ node_types: type: tosca.capabilities.Node occurrences: - 1 - - UNBOUNDED \ No newline at end of file + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNetwork/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNetwork/out/MainServiceTemplate.yaml index cd1888879e..98d3d8e56e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNetwork/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNetwork/out/MainServiceTemplate.yaml @@ -708,6 +708,9 @@ topology_template: directives: - substitutable properties: + port_pd_server_port_1_network_role_tag: oam + port_pd_server_port_1_network: + - get_input: oam_net_name compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: @@ -719,23 +722,20 @@ topology_template: vm_flavor_name: get_input: pd_flavor_name subinterface_nested_p1: - - pd01_port_1 - port_pd01_port_mac_requirements: + - pd_server_1_port_1 + port_pd_server_port_1_mac_requirements: mac_count_required: is_required: false vm_image_name: get_input: pd_image_name - port_pd01_port_ip_requirements: + subinterface_nested_net1: + - test_net2 + port_pd_server_port_1_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_network: - - get_input: oam_net_name - subinterface_nested_net1: - - test_net2 - port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW service_template_filter: @@ -747,7 +747,7 @@ topology_template: - service_template_filter - index_value requirements: - - subinterface_link_template_Vlan_vmi_1_pd_server_pd01_port_nested: + - subinterface_link_template_Vlan_vmi_1_pd_server_pd_server_port_1_nested: capability: tosca.capabilities.network.Linkable node: test_net2 relationship: tosca.relationships.network.LinksTo @@ -756,6 +756,9 @@ topology_template: directives: - substitutable properties: + port_pd_server_port_1_network_role_tag: oam + port_pd_server_port_1_network: + - get_input: oam_net_name compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: @@ -767,23 +770,20 @@ topology_template: vm_flavor_name: get_input: pd_flavor_name subinterface_nested_p1: - - pd01_port_0 - port_pd01_port_mac_requirements: + - pd_server_port_1 + port_pd_server_port_1_mac_requirements: mac_count_required: is_required: false vm_image_name: get_input: pd_image_name - port_pd01_port_ip_requirements: + subinterface_nested_net1: + - test_net1 + port_pd_server_port_1_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_network: - - get_input: oam_net_name - subinterface_nested_net1: - - test_net1 - port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW service_template_filter: @@ -795,7 +795,7 @@ topology_template: - service_template_filter - index_value requirements: - - subinterface_link_template_Vlan_vmi_1_pd_server_pd01_port_nested: + - subinterface_link_template_Vlan_vmi_1_pd_server_pd_server_port_1_nested: capability: tosca.capabilities.network.Linkable node: test_net1 relationship: tosca.relationships.network.LinksTo diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNetwork/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNetwork/out/Nested_pd_serverServiceTemplate.yaml index 80a1b10e27..20ef055bce 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNetwork/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNetwork/out/Nested_pd_serverServiceTemplate.yaml @@ -11,6 +11,11 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pd_server_port_1_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments index_value: type: integer description: Index value of this substitution service template runtime instance @@ -18,6 +23,14 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 + port_pd_server_port_1_network_role_tag: + type: string + required: true + port_pd_server_port_1_network: + type: list + required: true + entry_schema: + type: string compute_pd_server_availability_zone: type: list required: true @@ -28,19 +41,14 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_port_1_order: + type: integer required: true subinterface_nested_service_template_filter_count: type: list required: true entry_schema: type: float - port_pd01_port_related_networks: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true @@ -49,26 +57,18 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - vm_image_name: - type: string - required: true - port_pd01_port_ip_requirements: + port_pd_server_port_1_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: - type: list + type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: string - port_pd01_port_order: - type: integer + port_pd_server_port_1_network_role: + type: string required: true - port_pd01_port_subnetpoolid: + vm_image_name: type: string required: true subinterface_nested_net1: @@ -76,48 +76,23 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_network_role: - type: string - required: true - port_pd01_port_network_role_tag: - type: string - required: true - port_pd01_port_vlan_requirements: + port_pd_server_port_1_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.IpRequirements compute_pd_server_user_data_format: type: list required: true entry_schema: type: string + port_pd_server_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_pd_server_port_1_subnetpoolid: + type: string + required: true node_templates: - pd_server_pd01_port_nested: - type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested - directives: - - substitutable - properties: - p1: - get_input: - - subinterface_nested_p1 - - index_value - service_template_filter: - count: - get_input: - - subinterface_nested_service_template_filter_count - - index_value - substitute_service_template: nestedServiceTemplate.yaml - mandatory: true - net1: - get_input: - - subinterface_nested_net1 - - index_value - requirements: - - binding_template_Vlan_vmi_1: - capability: tosca.capabilities.network.Bindable - node: pd_server_pd01_port - relationship: tosca.relationships.network.BindsTo pd_server: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server properties: @@ -137,37 +112,62 @@ topology_template: get_input: - compute_pd_server_user_data_format - index_value - pd_server_pd01_port: + pd_server_pd_server_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd01_port_exCP_naming + get_input: port_pd_server_port_1_exCP_naming vlan_requirements: - get_input: port_pd01_port_vlan_requirements + get_input: port_pd_server_port_1_vlan_requirements subinterface_indicator: true related_networks: - get_input: port_pd01_port_related_networks + get_input: port_pd_server_port_1_related_networks ip_requirements: - get_input: port_pd01_port_ip_requirements + get_input: port_pd_server_port_1_ip_requirements network_role_tag: - get_input: port_pd01_port_network_role_tag + get_input: port_pd_server_port_1_network_role_tag mac_requirements: - get_input: port_pd01_port_mac_requirements + get_input: port_pd_server_port_1_mac_requirements order: - get_input: port_pd01_port_order + get_input: port_pd_server_port_1_order network_role: - get_input: port_pd01_port_network_role + get_input: port_pd_server_port_1_network_role subnetpoolid: - get_input: port_pd01_port_subnetpoolid + get_input: port_pd_server_port_1_subnetpoolid network: get_input: - - port_pd01_port_network + - port_pd_server_port_1_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: pd_server relationship: tosca.relationships.network.BindsTo + pd_server_pd_server_port_1_nested: + type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested + directives: + - substitutable + properties: + p1: + get_input: + - subinterface_nested_p1 + - index_value + service_template_filter: + count: + get_input: + - subinterface_nested_service_template_filter_count + - index_value + substitute_service_template: nestedServiceTemplate.yaml + mandatory: true + net1: + get_input: + - subinterface_nested_net1 + - index_value + requirements: + - binding_template_Vlan_vmi_1: + capability: tosca.capabilities.network.Bindable + node: pd_server_pd_server_port_1 + relationship: tosca.relationships.network.BindsTo substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server capabilities: @@ -177,6 +177,9 @@ topology_template: disk.read.bytes.rate_pd_server: - pd_server - disk.read.bytes.rate + network.outgoing.packets.rate_pd_server_pd_server_port_1: + - pd_server_pd_server_port_1 + - network.outgoing.packets.rate memory.usage_pd_server: - pd_server - memory.usage @@ -186,18 +189,18 @@ topology_template: disk.device.usage_pd_server: - pd_server - disk.device.usage - network.outgoing.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.packets.rate + forwarder_pd_server_pd_server_port_1: + - pd_server_pd_server_port_1 + - forwarder os_pd_server: - pd_server - os disk.write.bytes.rate_pd_server: - pd_server - disk.write.bytes.rate - network.incoming.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes + network.outgoing.bytes.rate_pd_server_pd_server_port_1: + - pd_server_pd_server_port_1 + - network.outgoing.bytes.rate cpu_pd_server: - pd_server - cpu @@ -213,9 +216,6 @@ topology_template: disk.device.read.bytes.rate_pd_server: - pd_server - disk.device.read.bytes.rate - network.outgoing.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes disk.iops_pd_server: - pd_server - disk.iops @@ -225,30 +225,30 @@ topology_template: cpu.delta_pd_server: - pd_server - cpu.delta - network.incoming.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets.rate vcpus_pd_server: - pd_server - vcpus disk.device.write.bytes.rate_pd_server: - pd_server - disk.device.write.bytes.rate + attachment_pd_server_pd_server_port_1: + - pd_server_pd_server_port_1 + - attachment + network.incoming.bytes.rate_pd_server_pd_server_port_1: + - pd_server_pd_server_port_1 + - network.incoming.bytes.rate disk.device.write.requests_pd_server: - pd_server - disk.device.write.requests endpoint_pd_server: - pd_server - endpoint - attachment_pd_server_pd01_port: - - pd_server_pd01_port - - attachment disk.capacity_pd_server: - pd_server - disk.capacity - feature_template_Vlan_vmi_1_pd_server_pd01_port_nested: - - pd_server_pd01_port_nested - - feature_template_Vlan_vmi_1 + feature_pd_server_pd_server_port_1_nested: + - pd_server_pd_server_port_1_nested + - feature disk.device.allocation_pd_server: - pd_server - disk.device.allocation @@ -258,30 +258,30 @@ topology_template: binding_pd_server: - pd_server - binding + network.incoming.bytes_pd_server_pd_server_port_1: + - pd_server_pd_server_port_1 + - network.incoming.bytes disk.read.requests_pd_server: - pd_server - disk.read.requests - feature_pd_server_pd01_port_nested: - - pd_server_pd01_port_nested - - feature feature_pd_server: - pd_server - feature disk.usage_pd_server: - pd_server - disk.usage - binding_pd_server_pd01_port: - - pd_server_pd01_port + binding_pd_server_pd_server_port_1: + - pd_server_pd_server_port_1 - binding + feature_pd_server_pd_server_port_1: + - pd_server_pd_server_port_1 + - feature disk.write.bytes_pd_server: - pd_server - disk.write.bytes - network.incoming.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes.rate - network.incoming.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets + feature_template_Vlan_vmi_1_pd_server_pd_server_port_1_nested: + - pd_server_pd_server_port_1_nested + - feature_template_Vlan_vmi_1 disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -294,6 +294,9 @@ topology_template: disk.device.write.bytes_pd_server: - pd_server - disk.device.write.bytes + network.incoming.packets_pd_server_pd_server_port_1: + - pd_server_pd_server_port_1 + - network.incoming.packets disk.device.read.requests_pd_server: - pd_server - disk.device.read.requests @@ -303,12 +306,9 @@ topology_template: host_pd_server: - pd_server - host - network.outpoing.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.outpoing.packets - forwarder_pd_server_pd01_port: - - pd_server_pd01_port - - forwarder + network.outgoing.bytes_pd_server_pd_server_port_1: + - pd_server_pd_server_port_1 + - network.outgoing.bytes disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate @@ -318,9 +318,6 @@ topology_template: disk.write.requests_pd_server: - pd_server - disk.write.requests - feature_pd_server_pd01_port: - - pd_server_pd01_port - - feature disk.device.latency_pd_server: - pd_server - disk.device.latency @@ -330,9 +327,12 @@ topology_template: disk.device.capacity_pd_server: - pd_server - disk.device.capacity - network.outgoing.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes.rate + network.incoming.packets.rate_pd_server_pd_server_port_1: + - pd_server_pd_server_port_1 + - network.incoming.packets.rate + network.outpoing.packets_pd_server_pd_server_port_1: + - pd_server_pd_server_port_1 + - network.outpoing.packets disk.device.iops_pd_server: - pd_server - disk.device.iops @@ -340,21 +340,21 @@ topology_template: local_storage_pd_server: - pd_server - local_storage - link_pd_server_pd01_port: - - pd_server_pd01_port - - link - dependency_pd_server_pd01_port: - - pd_server_pd01_port - - dependency - dependency_pd_server_pd01_port_nested: - - pd_server_pd01_port_nested - - dependency + subinterface_link_template_Vlan_vmi_1_pd_server_pd_server_port_1_nested: + - pd_server_pd_server_port_1_nested + - subinterface_link_template_Vlan_vmi_1 + dependency_template_Vlan_vmi_1_pd_server_pd_server_port_1_nested: + - pd_server_pd_server_port_1_nested + - dependency_template_Vlan_vmi_1 dependency_pd_server: - pd_server - dependency - dependency_template_Vlan_vmi_1_pd_server_pd01_port_nested: - - pd_server_pd01_port_nested - - dependency_template_Vlan_vmi_1 - subinterface_link_template_Vlan_vmi_1_pd_server_pd01_port_nested: - - pd_server_pd01_port_nested - - subinterface_link_template_Vlan_vmi_1 \ No newline at end of file + link_pd_server_pd_server_port_1: + - pd_server_pd_server_port_1 + - link + dependency_pd_server_pd_server_port_1: + - pd_server_pd_server_port_1 + - dependency + dependency_pd_server_pd_server_port_1_nested: + - pd_server_pd_server_port_1_nested + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNodesConnectedOut/in/main.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNodesConnectedOut/in/main.yml index 75ff05f142..78cf3f37e5 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNodesConnectedOut/in/main.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNodesConnectedOut/in/main.yml @@ -177,10 +177,10 @@ resources: flavor: {get_param: pd_flavor_name} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: pd01_port_0} + - port: {get_resource: pd_server_port_1} user_data_format: RAW - pd01_port_0: + pd_server_port_1: type: OS::Neutron::Port properties: network: {get_param: oam_net_name} @@ -193,10 +193,10 @@ resources: flavor: {get_param: pd_flavor_name} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: pd01_port_1} + - port: {get_resource: pd_server_1_port_1} user_data_format: RAW - pd01_port_1: + pd_server_1_port_1: type: OS::Neutron::Port properties: network: {get_param: oam_net_name} @@ -209,7 +209,7 @@ resources: resource_def: type: nested.yml properties: - p1: { get_resource: pd01_port_0} + p1: { get_resource: pd_server_port_1} net1: { get_resource: test_net1} test_resourceGroup2: @@ -219,7 +219,7 @@ resources: resource_def: type: nested.yml properties: - p1: { get_resource: pd01_port_1} + p1: { get_resource: pd_server_1_port_1} net1: { get_resource: test_net1} test_net1: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNodesConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNodesConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml index 3e2ef2c327..2204cc5703 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNodesConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNodesConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,6 +8,12 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_pd_server_port_1_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments index_value: type: integer description: Index value of this substitution service template runtime instance @@ -16,6 +22,16 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 + port_pd_server_port_1_network_role_tag: + type: string + required: true + status: SUPPORTED + port_pd_server_port_1_network: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string compute_pd_server_availability_zone: type: list required: true @@ -28,8 +44,8 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_port_1_order: + type: integer required: true status: SUPPORTED subinterface_nested_service_template_filter_count: @@ -38,12 +54,6 @@ node_types: status: SUPPORTED entry_schema: type: float - port_pd01_port_related_networks: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true @@ -54,31 +64,21 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - vm_image_name: - type: string - required: true - status: SUPPORTED - port_pd01_port_ip_requirements: + port_pd_server_port_1_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: - type: list + type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: string - port_pd01_port_order: - type: integer + port_pd_server_port_1_network_role: + type: string required: true status: SUPPORTED - port_pd01_port_subnetpoolid: + vm_image_name: type: string required: true status: SUPPORTED @@ -88,69 +88,69 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_network_role: - type: string - required: true - status: SUPPORTED - port_pd01_port_network_role_tag: - type: string - required: true - status: SUPPORTED - port_pd01_port_vlan_requirements: + port_pd_server_port_1_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.IpRequirements compute_pd_server_user_data_format: type: list required: true status: SUPPORTED entry_schema: type: string + port_pd_server_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_pd_server_port_1_subnetpoolid: + type: string + required: true + status: SUPPORTED requirements: - - dependency_pd_server_pd01_port_nested: + - dependency_pd_server: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - dependency_template_Vlan_vmi_1_pd_server_pd01_port_nested: + - local_storage_pd_server: + capability: tosca.capabilities.Attachment + node: tosca.nodes.BlockStorage + relationship: tosca.relationships.AttachesTo + occurrences: + - 0 + - UNBOUNDED + - dependency_pd_server_pd_server_port_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - subinterface_link_template_Vlan_vmi_1_pd_server_pd01_port_nested: + - link_pd_server_pd_server_port_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_pd_server: + - dependency_pd_server_pd_server_port_1_nested: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - local_storage_pd_server: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo - occurrences: - - 0 - - UNBOUNDED - - dependency_pd_server_pd01_port: + - dependency_template_Vlan_vmi_1_pd_server_pd_server_port_1_nested: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd01_port: + - subinterface_link_template_Vlan_vmi_1_pd_server_pd_server_port_1_nested: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -168,6 +168,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.packets.rate_pd_server_pd_server_port_1: + 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_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -186,9 +192,8 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pd01_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_pd_server_pd_server_port_1: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED @@ -203,7 +208,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd01_port: + network.outgoing.bytes.rate_pd_server_pd_server_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -239,12 +244,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd01_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.iops_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -263,19 +262,24 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pd01_port: + vcpus_pd_server: 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_pd_server: + disk.device.write.bytes.rate_pd_server: 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_pd_server: + attachment_pd_server_pd_server_port_1: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes.rate_pd_server_pd_server_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -292,18 +296,13 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pd01_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED disk.capacity_pd_server: 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_template_Vlan_vmi_1_pd_server_pd01_port_nested: + feature_pd_server_pd_server_port_1_nested: type: tosca.capabilities.Node occurrences: - 1 @@ -325,14 +324,15 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.read.requests_pd_server: + network.incoming.bytes_pd_server_pd_server_port_1: 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_pd_server_pd01_port_nested: - type: tosca.capabilities.Node + disk.read.requests_pd_server: + 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 @@ -347,7 +347,7 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_pd01_port: + binding_pd_server_pd_server_port_1: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface @@ -355,21 +355,19 @@ node_types: occurrences: - 0 - UNBOUNDED - disk.write.bytes_pd_server: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_pd_server_pd_server_port_1: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pd_server_pd01_port: + disk.write.bytes_pd_server: 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_pd_server_pd01_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_template_Vlan_vmi_1_pd_server_pd_server_port_1_nested: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -397,6 +395,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets_pd_server_pd_server_port_1: + 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_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -416,17 +420,12 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pd01_port: + network.outgoing.bytes_pd_server_pd_server_port_1: 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_pd_server_pd01_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED disk.write.requests.rate_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -445,11 +444,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_pd01_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.device.latency_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -468,7 +462,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pd01_port: + network.incoming.packets.rate_pd_server_pd_server_port_1: + 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_pd_server_pd_server_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -554,4 +554,4 @@ node_types: type: tosca.capabilities.Node occurrences: - 1 - - UNBOUNDED \ No newline at end of file + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNodesConnectedOut/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNodesConnectedOut/out/MainServiceTemplate.yaml index b4bd810ae8..b0ead5c67e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNodesConnectedOut/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNodesConnectedOut/out/MainServiceTemplate.yaml @@ -708,6 +708,9 @@ topology_template: directives: - substitutable properties: + port_pd_server_port_1_network_role_tag: oam + port_pd_server_port_1_network: + - get_input: oam_net_name compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: @@ -719,23 +722,20 @@ topology_template: vm_flavor_name: get_input: pd_flavor_name subinterface_nested_p1: - - pd01_port_1 - port_pd01_port_mac_requirements: + - pd_server_1_port_1 + port_pd_server_port_1_mac_requirements: mac_count_required: is_required: false vm_image_name: get_input: pd_image_name - port_pd01_port_ip_requirements: + subinterface_nested_net1: + - test_net1 + port_pd_server_port_1_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_network: - - get_input: oam_net_name - subinterface_nested_net1: - - test_net1 - port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW service_template_filter: @@ -747,7 +747,7 @@ topology_template: - service_template_filter - index_value requirements: - - subinterface_link_template_Vlan_vmi_1_pd_server_pd01_port_nested: + - subinterface_link_template_Vlan_vmi_1_pd_server_pd_server_port_1_nested: capability: tosca.capabilities.network.Linkable node: test_net1 relationship: tosca.relationships.network.LinksTo @@ -756,6 +756,9 @@ topology_template: directives: - substitutable properties: + port_pd_server_port_1_network_role_tag: oam + port_pd_server_port_1_network: + - get_input: oam_net_name compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: @@ -767,23 +770,20 @@ topology_template: vm_flavor_name: get_input: pd_flavor_name subinterface_nested_p1: - - pd01_port_0 - port_pd01_port_mac_requirements: + - pd_server_port_1 + port_pd_server_port_1_mac_requirements: mac_count_required: is_required: false vm_image_name: get_input: pd_image_name - port_pd01_port_ip_requirements: + subinterface_nested_net1: + - test_net1 + port_pd_server_port_1_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_network: - - get_input: oam_net_name - subinterface_nested_net1: - - test_net1 - port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW service_template_filter: @@ -795,7 +795,7 @@ topology_template: - service_template_filter - index_value requirements: - - subinterface_link_template_Vlan_vmi_1_pd_server_pd01_port_nested: + - subinterface_link_template_Vlan_vmi_1_pd_server_pd_server_port_1_nested: capability: tosca.capabilities.network.Linkable node: test_net1 relationship: tosca.relationships.network.LinksTo @@ -809,4 +809,4 @@ topology_template: - test_net2 - test_net1 - abstract_pd_server_0 - - abstract_pd_server_1 \ No newline at end of file + - abstract_pd_server_1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNodesConnectedOut/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNodesConnectedOut/out/Nested_pd_serverServiceTemplate.yaml index 80a1b10e27..20ef055bce 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNodesConnectedOut/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNodesConnectedOut/out/Nested_pd_serverServiceTemplate.yaml @@ -11,6 +11,11 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pd_server_port_1_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments index_value: type: integer description: Index value of this substitution service template runtime instance @@ -18,6 +23,14 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 + port_pd_server_port_1_network_role_tag: + type: string + required: true + port_pd_server_port_1_network: + type: list + required: true + entry_schema: + type: string compute_pd_server_availability_zone: type: list required: true @@ -28,19 +41,14 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_port_1_order: + type: integer required: true subinterface_nested_service_template_filter_count: type: list required: true entry_schema: type: float - port_pd01_port_related_networks: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true @@ -49,26 +57,18 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - vm_image_name: - type: string - required: true - port_pd01_port_ip_requirements: + port_pd_server_port_1_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: - type: list + type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: string - port_pd01_port_order: - type: integer + port_pd_server_port_1_network_role: + type: string required: true - port_pd01_port_subnetpoolid: + vm_image_name: type: string required: true subinterface_nested_net1: @@ -76,48 +76,23 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_network_role: - type: string - required: true - port_pd01_port_network_role_tag: - type: string - required: true - port_pd01_port_vlan_requirements: + port_pd_server_port_1_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.IpRequirements compute_pd_server_user_data_format: type: list required: true entry_schema: type: string + port_pd_server_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_pd_server_port_1_subnetpoolid: + type: string + required: true node_templates: - pd_server_pd01_port_nested: - type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested - directives: - - substitutable - properties: - p1: - get_input: - - subinterface_nested_p1 - - index_value - service_template_filter: - count: - get_input: - - subinterface_nested_service_template_filter_count - - index_value - substitute_service_template: nestedServiceTemplate.yaml - mandatory: true - net1: - get_input: - - subinterface_nested_net1 - - index_value - requirements: - - binding_template_Vlan_vmi_1: - capability: tosca.capabilities.network.Bindable - node: pd_server_pd01_port - relationship: tosca.relationships.network.BindsTo pd_server: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server properties: @@ -137,37 +112,62 @@ topology_template: get_input: - compute_pd_server_user_data_format - index_value - pd_server_pd01_port: + pd_server_pd_server_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd01_port_exCP_naming + get_input: port_pd_server_port_1_exCP_naming vlan_requirements: - get_input: port_pd01_port_vlan_requirements + get_input: port_pd_server_port_1_vlan_requirements subinterface_indicator: true related_networks: - get_input: port_pd01_port_related_networks + get_input: port_pd_server_port_1_related_networks ip_requirements: - get_input: port_pd01_port_ip_requirements + get_input: port_pd_server_port_1_ip_requirements network_role_tag: - get_input: port_pd01_port_network_role_tag + get_input: port_pd_server_port_1_network_role_tag mac_requirements: - get_input: port_pd01_port_mac_requirements + get_input: port_pd_server_port_1_mac_requirements order: - get_input: port_pd01_port_order + get_input: port_pd_server_port_1_order network_role: - get_input: port_pd01_port_network_role + get_input: port_pd_server_port_1_network_role subnetpoolid: - get_input: port_pd01_port_subnetpoolid + get_input: port_pd_server_port_1_subnetpoolid network: get_input: - - port_pd01_port_network + - port_pd_server_port_1_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: pd_server relationship: tosca.relationships.network.BindsTo + pd_server_pd_server_port_1_nested: + type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested + directives: + - substitutable + properties: + p1: + get_input: + - subinterface_nested_p1 + - index_value + service_template_filter: + count: + get_input: + - subinterface_nested_service_template_filter_count + - index_value + substitute_service_template: nestedServiceTemplate.yaml + mandatory: true + net1: + get_input: + - subinterface_nested_net1 + - index_value + requirements: + - binding_template_Vlan_vmi_1: + capability: tosca.capabilities.network.Bindable + node: pd_server_pd_server_port_1 + relationship: tosca.relationships.network.BindsTo substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server capabilities: @@ -177,6 +177,9 @@ topology_template: disk.read.bytes.rate_pd_server: - pd_server - disk.read.bytes.rate + network.outgoing.packets.rate_pd_server_pd_server_port_1: + - pd_server_pd_server_port_1 + - network.outgoing.packets.rate memory.usage_pd_server: - pd_server - memory.usage @@ -186,18 +189,18 @@ topology_template: disk.device.usage_pd_server: - pd_server - disk.device.usage - network.outgoing.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.packets.rate + forwarder_pd_server_pd_server_port_1: + - pd_server_pd_server_port_1 + - forwarder os_pd_server: - pd_server - os disk.write.bytes.rate_pd_server: - pd_server - disk.write.bytes.rate - network.incoming.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes + network.outgoing.bytes.rate_pd_server_pd_server_port_1: + - pd_server_pd_server_port_1 + - network.outgoing.bytes.rate cpu_pd_server: - pd_server - cpu @@ -213,9 +216,6 @@ topology_template: disk.device.read.bytes.rate_pd_server: - pd_server - disk.device.read.bytes.rate - network.outgoing.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes disk.iops_pd_server: - pd_server - disk.iops @@ -225,30 +225,30 @@ topology_template: cpu.delta_pd_server: - pd_server - cpu.delta - network.incoming.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets.rate vcpus_pd_server: - pd_server - vcpus disk.device.write.bytes.rate_pd_server: - pd_server - disk.device.write.bytes.rate + attachment_pd_server_pd_server_port_1: + - pd_server_pd_server_port_1 + - attachment + network.incoming.bytes.rate_pd_server_pd_server_port_1: + - pd_server_pd_server_port_1 + - network.incoming.bytes.rate disk.device.write.requests_pd_server: - pd_server - disk.device.write.requests endpoint_pd_server: - pd_server - endpoint - attachment_pd_server_pd01_port: - - pd_server_pd01_port - - attachment disk.capacity_pd_server: - pd_server - disk.capacity - feature_template_Vlan_vmi_1_pd_server_pd01_port_nested: - - pd_server_pd01_port_nested - - feature_template_Vlan_vmi_1 + feature_pd_server_pd_server_port_1_nested: + - pd_server_pd_server_port_1_nested + - feature disk.device.allocation_pd_server: - pd_server - disk.device.allocation @@ -258,30 +258,30 @@ topology_template: binding_pd_server: - pd_server - binding + network.incoming.bytes_pd_server_pd_server_port_1: + - pd_server_pd_server_port_1 + - network.incoming.bytes disk.read.requests_pd_server: - pd_server - disk.read.requests - feature_pd_server_pd01_port_nested: - - pd_server_pd01_port_nested - - feature feature_pd_server: - pd_server - feature disk.usage_pd_server: - pd_server - disk.usage - binding_pd_server_pd01_port: - - pd_server_pd01_port + binding_pd_server_pd_server_port_1: + - pd_server_pd_server_port_1 - binding + feature_pd_server_pd_server_port_1: + - pd_server_pd_server_port_1 + - feature disk.write.bytes_pd_server: - pd_server - disk.write.bytes - network.incoming.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes.rate - network.incoming.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets + feature_template_Vlan_vmi_1_pd_server_pd_server_port_1_nested: + - pd_server_pd_server_port_1_nested + - feature_template_Vlan_vmi_1 disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -294,6 +294,9 @@ topology_template: disk.device.write.bytes_pd_server: - pd_server - disk.device.write.bytes + network.incoming.packets_pd_server_pd_server_port_1: + - pd_server_pd_server_port_1 + - network.incoming.packets disk.device.read.requests_pd_server: - pd_server - disk.device.read.requests @@ -303,12 +306,9 @@ topology_template: host_pd_server: - pd_server - host - network.outpoing.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.outpoing.packets - forwarder_pd_server_pd01_port: - - pd_server_pd01_port - - forwarder + network.outgoing.bytes_pd_server_pd_server_port_1: + - pd_server_pd_server_port_1 + - network.outgoing.bytes disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate @@ -318,9 +318,6 @@ topology_template: disk.write.requests_pd_server: - pd_server - disk.write.requests - feature_pd_server_pd01_port: - - pd_server_pd01_port - - feature disk.device.latency_pd_server: - pd_server - disk.device.latency @@ -330,9 +327,12 @@ topology_template: disk.device.capacity_pd_server: - pd_server - disk.device.capacity - network.outgoing.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes.rate + network.incoming.packets.rate_pd_server_pd_server_port_1: + - pd_server_pd_server_port_1 + - network.incoming.packets.rate + network.outpoing.packets_pd_server_pd_server_port_1: + - pd_server_pd_server_port_1 + - network.outpoing.packets disk.device.iops_pd_server: - pd_server - disk.device.iops @@ -340,21 +340,21 @@ topology_template: local_storage_pd_server: - pd_server - local_storage - link_pd_server_pd01_port: - - pd_server_pd01_port - - link - dependency_pd_server_pd01_port: - - pd_server_pd01_port - - dependency - dependency_pd_server_pd01_port_nested: - - pd_server_pd01_port_nested - - dependency + subinterface_link_template_Vlan_vmi_1_pd_server_pd_server_port_1_nested: + - pd_server_pd_server_port_1_nested + - subinterface_link_template_Vlan_vmi_1 + dependency_template_Vlan_vmi_1_pd_server_pd_server_port_1_nested: + - pd_server_pd_server_port_1_nested + - dependency_template_Vlan_vmi_1 dependency_pd_server: - pd_server - dependency - dependency_template_Vlan_vmi_1_pd_server_pd01_port_nested: - - pd_server_pd01_port_nested - - dependency_template_Vlan_vmi_1 - subinterface_link_template_Vlan_vmi_1_pd_server_pd01_port_nested: - - pd_server_pd01_port_nested - - subinterface_link_template_Vlan_vmi_1 \ No newline at end of file + link_pd_server_pd_server_port_1: + - pd_server_pd_server_port_1 + - link + dependency_pd_server_pd_server_port_1: + - pd_server_pd_server_port_1 + - dependency + dependency_pd_server_pd_server_port_1_nested: + - pd_server_pd_server_port_1_nested + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentResourceGroupCount/in/main.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentResourceGroupCount/in/main.yml index b4eb432e8d..4e7e15e638 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentResourceGroupCount/in/main.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentResourceGroupCount/in/main.yml @@ -187,8 +187,8 @@ resources: name: get_param: vdbe_name_1 networks: - - port: {get_resource: vdbe_untr_1_port_2} - vdbe_untr_1_port_2: + - port: {get_resource: vdbe_1_untr_1_port_1} + vdbe_1_untr_1_port_1: type: OS::ContrailV2::VirtualMachineInterface properties: name: @@ -313,7 +313,7 @@ resources: mac_address: get_param: vdbe_hw_untr_mac_1 parent_interface: - get_resource: vdbe_untr_1_port_2 + get_resource: vdbe_1_untr_1_port_1 subinterfaces_name_prefix: str_replace: params: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentResourceGroupCount/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentResourceGroupCount/out/GlobalSubstitutionTypesServiceTemplate.yaml index 094898920f..54a6020581 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentResourceGroupCount/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentResourceGroupCount/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,12 +8,26 @@ node_types: org.openecomp.resource.abstract.nodes.vdbe: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_vdbe_untr_1_port_1_order: + type: integer + required: true + status: SUPPORTED + port_vdbe_untr_1_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED subinterface_nested_parent_interface: type: list required: true status: SUPPORTED entry_schema: type: string + port_vdbe_untr_1_port_1_virtual_machine_interface_mac_addresses: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json subinterface_nested_aap_address_mode: type: list required: true @@ -32,12 +46,6 @@ node_types: status: SUPPORTED entry_schema: type: string - port_vdbe_untr_1_port_related_networks: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments subinterface_nested_service_template_filter_count: type: list required: true @@ -50,21 +58,37 @@ node_types: status: SUPPORTED entry_schema: type: string + port_vdbe_untr_1_port_1_network_role: + type: string + required: true + status: SUPPORTED vm_flavor_name: type: string required: true status: SUPPORTED + port_vdbe_untr_1_port_1_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_vdbe_untr_1_port_1_name: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string subinterface_nested_aap_untrusted_ip_prefix: type: list required: true status: SUPPORTED entry_schema: type: string - vm_image_name: + port_vdbe_untr_1_port_1_network_role_tag: type: string required: true status: SUPPORTED - port_vdbe_untr_1_port_network_role: + vm_image_name: type: string required: true status: SUPPORTED @@ -92,44 +116,34 @@ node_types: status: SUPPORTED entry_schema: type: json - subinterface_nested_mac_address: - type: list + port_vdbe_untr_1_port_1_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: string - port_vdbe_untr_1_port_virtual_network_refs: + subinterface_nested_mac_address: type: list required: true status: SUPPORTED entry_schema: - type: json - port_vdbe_untr_1_port_ip_requirements: + type: string + subinterface_nested_ip_address: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - subinterface_nested_ip_address: + type: string + port_vdbe_untr_1_port_1_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string + type: org.openecomp.datatypes.network.VlanRequirements subinterface_nested_ip_v6_address: type: list required: true status: SUPPORTED entry_schema: type: string - port_vdbe_untr_1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_vdbe_untr_1_port_order: - type: integer - required: true - status: SUPPORTED index_value: type: integer description: Index value of this substitution service template runtime instance @@ -150,30 +164,32 @@ node_types: status: SUPPORTED entry_schema: type: string - port_vdbe_untr_1_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_vdbe_untr_1_port_1_related_networks: + type: list required: true status: SUPPORTED - port_vdbe_untr_1_port_subnetpoolid: - type: string + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + subinterface_nested_aap_untrusted_ip_prefix_len: + type: list required: true status: SUPPORTED - port_vdbe_untr_1_port_name: + entry_schema: + type: string + port_vdbe_untr_1_port_1_virtual_network_refs: type: list required: true status: SUPPORTED entry_schema: - type: string - port_vdbe_untr_1_port_virtual_machine_interface_allowed_address_pairs: + type: json + port_vdbe_untr_1_port_1_virtual_machine_interface_allowed_address_pairs: type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs required: true status: SUPPORTED - subinterface_nested_aap_untrusted_ip_prefix_len: - type: list + port_vdbe_untr_1_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: string subinterface_nested_counter: type: list required: true @@ -192,65 +208,49 @@ node_types: status: SUPPORTED entry_schema: type: string - port_vdbe_untr_1_port_network_role_tag: - type: string - required: true - status: SUPPORTED - port_vdbe_untr_1_port_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_vdbe_untr_1_port_virtual_machine_interface_mac_addresses: - type: list - required: true - status: SUPPORTED - entry_schema: - type: json requirements: - - dependency_vdbe_vdbe_untr_1_port_nested: + - dependency_vdbe: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - dependency_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_nested: + - local_storage_vdbe: + capability: tosca.capabilities.Attachment + node: tosca.nodes.BlockStorage + relationship: tosca.relationships.AttachesTo + occurrences: + - 0 + - UNBOUNDED + - dependency_vdbe_vdbe_untr_1_port_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - subinterface_link_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_nested: + - link_vdbe_vdbe_untr_1_port_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_vdbe: + - dependency_vdbe_vdbe_untr_1_port_1_nested: 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_1_port: + - dependency_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_1_nested: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_vdbe_vdbe_untr_1_port: + - subinterface_link_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_1_nested: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -279,8 +279,9 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_nested: - type: tosca.capabilities.Node + network.outpoing.packets_vdbe_vdbe_untr_1_port_1: + 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 @@ -302,36 +303,31 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.latency_vdbe: + network.outgoing.packets.rate_vdbe_vdbe_untr_1_port_1: 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: + 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 - feature_vdbe_vdbe_untr_1_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - disk.write.bytes.rate_vdbe: + 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 - network.incoming.bytes.rate_vdbe_vdbe_untr_1_port: + network.incoming.bytes_vdbe_vdbe_untr_1_port_1: 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_1_port: + 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: @@ -360,12 +356,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_vdbe_vdbe_untr_1_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_vdbe_vdbe_untr_1_port_1_nested: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED + binding_vdbe_vdbe_untr_1_port_1: + 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 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. @@ -384,18 +387,29 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes_vdbe_vdbe_untr_1_port_1: + 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 - network.incoming.bytes_vdbe_vdbe_untr_1_port: + network.incoming.packets.rate_vdbe_vdbe_untr_1_port_1: 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_1_port_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - 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. @@ -408,14 +422,6 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_vdbe_vdbe_untr_1_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 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. @@ -434,16 +440,6 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_vdbe_vdbe_untr_1_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - feature_vdbe_vdbe_untr_1_port_nested: - type: tosca.capabilities.Node - 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. @@ -468,6 +464,11 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_1_nested: + type: tosca.capabilities.Node + 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. @@ -480,7 +481,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_vdbe_vdbe_untr_1_port: + network.outgoing.bytes.rate_vdbe_vdbe_untr_1_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -505,15 +506,8 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_vdbe_vdbe_untr_1_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.incoming.packets_vdbe_vdbe_untr_1_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_vdbe_vdbe_untr_1_port_1: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -540,24 +534,30 @@ node_types: occurrences: - 1 - UNBOUNDED - memory_vdbe: + network.incoming.packets_vdbe_vdbe_untr_1_port_1: 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 + network.incoming.bytes.rate_vdbe_vdbe_untr_1_port_1: + 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_vdbe: + 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 - network.outgoing.bytes.rate_vdbe_vdbe_untr_1_port: + 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: @@ -686,4 +686,4 @@ node_types: type: tosca.capabilities.Node occurrences: - 1 - - UNBOUNDED \ No newline at end of file + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentResourceGroupCount/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentResourceGroupCount/out/MainServiceTemplate.yaml index 8a3bf941d1..e5c29a52c6 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentResourceGroupCount/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentResourceGroupCount/out/MainServiceTemplate.yaml @@ -401,6 +401,8 @@ topology_template: properties: subinterface_nested_parent_interface: - vdbe_untr_1_port_1 + port_vdbe_untr_1_port_1_virtual_machine_interface_mac_addresses: + - - get_input: vdbe_hw_untr_mac_1 subinterface_nested_aap_address_mode: - get_input: aap_address_mode subinterface_nested_vlan_tag_list: @@ -413,6 +415,14 @@ topology_template: - get_input: vdbe_aap_untrusted_v6_ip_prefix_len vm_flavor_name: get_input: vdbe_flavor_name + port_vdbe_untr_1_port_1_name: + - str_replace: + template: VM_NAMEDBE001p1n004 + params: + DBE: + get_input: vdbe_device_name + VM_NAME: + get_input: vdbe_name_1 subinterface_nested_aap_untrusted_ip_prefix: - get_input: vdbe_aap_untrusted_ip_prefix vm_image_name: @@ -432,8 +442,6 @@ topology_template: get_input: vnf_name subinterface_nested_mac_address: - get_input: vdbe_hw_untr_mac_1 - port_vdbe_untr_1_port_virtual_network_refs: - - - control_int_net subinterface_nested_ip_address: - get_input: vdbe_untrusted_ip_1 subinterface_nested_ip_v6_address: @@ -442,16 +450,10 @@ topology_template: - get_input: vdbe_untrusted_vmac_address subinterface_nested_vn_network_list: - get_input: untrusted_vn_networks - port_vdbe_untr_1_port_name: - - str_replace: - template: VM_NAMEDBE001p1n004 - params: - DBE: - get_input: vdbe_device_name - VM_NAME: - get_input: vdbe_name_1 subinterface_nested_aap_untrusted_ip_prefix_len: - get_input: vdbe_aap_untrusted_ip_prefix_len + port_vdbe_untr_1_port_1_virtual_network_refs: + - - control_int_net subinterface_nested_counter: - get_property: - SELF @@ -467,8 +469,6 @@ topology_template: get_input: vdbe_name_1 compute_vdbe_name: - get_input: vdbe_name_1 - port_vdbe_untr_1_port_virtual_machine_interface_mac_addresses: - - - get_input: vdbe_hw_untr_mac_1 service_template_filter: substitute_service_template: Nested_vdbeServiceTemplate.yaml count: 1 @@ -478,7 +478,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_vdbe_vdbe_untr_1_port: + - link_vdbe_vdbe_untr_1_port_1: capability: tosca.capabilities.network.Linkable node: control_int_net relationship: tosca.relationships.network.LinksTo @@ -497,7 +497,9 @@ topology_template: - substitutable properties: subinterface_nested_parent_interface: - - vdbe_untr_1_port_2 + - vdbe_1_untr_1_port_1 + port_vdbe_untr_1_port_1_virtual_machine_interface_mac_addresses: + - - get_input: vdbe_hw_untr_mac_1 subinterface_nested_aap_address_mode: - get_input: aap_address_mode subinterface_nested_vlan_tag_list: @@ -510,6 +512,14 @@ topology_template: - get_input: vdbe_aap_untrusted_v6_ip_prefix_len vm_flavor_name: get_input: vdbe_flavor_name + port_vdbe_untr_1_port_1_name: + - str_replace: + template: VM_NAMEDBE001p1n004 + params: + DBE: + get_input: vdbe_device_name + VM_NAME: + get_input: vdbe_name_1 subinterface_nested_aap_untrusted_ip_prefix: - get_input: vdbe_aap_untrusted_ip_prefix vm_image_name: @@ -529,8 +539,6 @@ topology_template: get_input: vnf_name subinterface_nested_mac_address: - get_input: vdbe_hw_untr_mac_1 - port_vdbe_untr_1_port_virtual_network_refs: - - - control_int_net subinterface_nested_ip_address: - get_input: vdbe_untrusted_ip_1 subinterface_nested_ip_v6_address: @@ -539,16 +547,10 @@ topology_template: - get_input: vdbe_untrusted_vmac_address subinterface_nested_vn_network_list: - get_input: untrusted_vn_networks - port_vdbe_untr_1_port_name: - - str_replace: - template: VM_NAMEDBE001p1n004 - params: - DBE: - get_input: vdbe_device_name - VM_NAME: - get_input: vdbe_name_1 subinterface_nested_aap_untrusted_ip_prefix_len: - get_input: vdbe_aap_untrusted_ip_prefix_len + port_vdbe_untr_1_port_1_virtual_network_refs: + - - control_int_net subinterface_nested_counter: - get_input: counter subinterface_nested_subinterfaces_name_prefix: @@ -561,8 +563,6 @@ topology_template: get_input: vdbe_name_1 compute_vdbe_name: - get_input: vdbe_name_1 - port_vdbe_untr_1_port_virtual_machine_interface_mac_addresses: - - - get_input: vdbe_hw_untr_mac_1 service_template_filter: substitute_service_template: Nested_vdbeServiceTemplate.yaml count: 1 @@ -572,7 +572,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_vdbe_vdbe_untr_1_port: + - link_vdbe_vdbe_untr_1_port_1: capability: tosca.capabilities.network.Linkable node: control_int_net relationship: tosca.relationships.network.LinksTo diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentResourceGroupCount/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/pattern1c2/differentResourceGroupCount/out/Nested_vdbeServiceTemplate.yaml index 39bf635d05..3563d416a3 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentResourceGroupCount/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/pattern1c2/differentResourceGroupCount/out/Nested_vdbeServiceTemplate.yaml @@ -11,11 +11,22 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_vdbe_untr_1_port_1_order: + type: integer + required: true + port_vdbe_untr_1_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true subinterface_nested_parent_interface: type: list required: true entry_schema: type: string + port_vdbe_untr_1_port_1_virtual_machine_interface_mac_addresses: + type: list + required: true + entry_schema: + type: json subinterface_nested_aap_address_mode: type: list required: true @@ -31,11 +42,6 @@ topology_template: required: true entry_schema: type: string - port_vdbe_untr_1_port_related_networks: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments subinterface_nested_service_template_filter_count: type: list required: true @@ -46,18 +52,31 @@ topology_template: required: true entry_schema: type: string + port_vdbe_untr_1_port_1_network_role: + type: string + required: true vm_flavor_name: type: string required: true + port_vdbe_untr_1_port_1_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_vdbe_untr_1_port_1_name: + type: list + required: true + entry_schema: + type: string subinterface_nested_aap_untrusted_ip_prefix: type: list required: true entry_schema: type: string - vm_image_name: + port_vdbe_untr_1_port_1_network_role_tag: type: string required: true - port_vdbe_untr_1_port_network_role: + vm_image_name: type: string required: true subinterface_nested_aap_sec_untrusted_ip_prefix_len: @@ -80,37 +99,29 @@ topology_template: required: true entry_schema: type: json + port_vdbe_untr_1_port_1_subnetpoolid: + type: string + required: true subinterface_nested_mac_address: type: list required: true entry_schema: type: string - port_vdbe_untr_1_port_virtual_network_refs: - type: list - required: true - entry_schema: - type: json - port_vdbe_untr_1_port_ip_requirements: + subinterface_nested_ip_address: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - subinterface_nested_ip_address: + type: string + port_vdbe_untr_1_port_1_vlan_requirements: type: list required: true entry_schema: - type: string + type: org.openecomp.datatypes.network.VlanRequirements subinterface_nested_ip_v6_address: type: list required: true entry_schema: type: string - port_vdbe_untr_1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_vdbe_untr_1_port_order: - type: integer - required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -128,25 +139,27 @@ topology_template: required: true entry_schema: type: string - port_vdbe_untr_1_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_vdbe_untr_1_port_subnetpoolid: - type: string - required: true - port_vdbe_untr_1_port_name: + port_vdbe_untr_1_port_1_related_networks: type: list required: true entry_schema: - type: string - port_vdbe_untr_1_port_virtual_machine_interface_allowed_address_pairs: - type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs - required: true + type: org.openecomp.datatypes.network.RelatedNetworksAssignments subinterface_nested_aap_untrusted_ip_prefix_len: type: list required: true entry_schema: type: string + port_vdbe_untr_1_port_1_virtual_network_refs: + type: list + required: true + entry_schema: + type: json + port_vdbe_untr_1_port_1_virtual_machine_interface_allowed_address_pairs: + type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs + required: true + port_vdbe_untr_1_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true subinterface_nested_counter: type: list required: true @@ -162,21 +175,70 @@ topology_template: required: true entry_schema: type: string - port_vdbe_untr_1_port_network_role_tag: - type: string - required: true - port_vdbe_untr_1_port_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_vdbe_untr_1_port_virtual_machine_interface_mac_addresses: - type: list - required: true - entry_schema: - type: json node_templates: - vdbe_vdbe_untr_1_port_nested: + 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_1_port_1: + type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface + properties: + mac_requirements: + get_input: port_vdbe_untr_1_port_1_mac_requirements + order: + get_input: port_vdbe_untr_1_port_1_order + exCP_naming: + get_input: port_vdbe_untr_1_port_1_exCP_naming + virtual_machine_interface_allowed_address_pairs: + get_input: + - port_vdbe_untr_1_port_1_virtual_machine_interface_allowed_address_pairs + - index_value + vlan_requirements: + get_input: port_vdbe_untr_1_port_1_vlan_requirements + subinterface_indicator: true + related_networks: + get_input: port_vdbe_untr_1_port_1_related_networks + virtual_network_refs: + get_input: + - port_vdbe_untr_1_port_1_virtual_network_refs + - index_value + ip_requirements: + get_input: port_vdbe_untr_1_port_1_ip_requirements + network_role_tag: + get_input: port_vdbe_untr_1_port_1_network_role_tag + virtual_machine_interface_mac_addresses: + get_input: + - port_vdbe_untr_1_port_1_virtual_machine_interface_mac_addresses + - index_value + network_role: + get_input: port_vdbe_untr_1_port_1_network_role + subnetpoolid: + get_input: port_vdbe_untr_1_port_1_subnetpoolid + name: + get_input: + - port_vdbe_untr_1_port_1_name + - index_value + requirements: + - binding: + capability: tosca.capabilities.network.Bindable + node: vdbe + relationship: tosca.relationships.network.BindsTo + vdbe_vdbe_untr_1_port_1_nested: type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested directives: - substitutable @@ -255,69 +317,7 @@ topology_template: requirements: - binding_vdbe_untr_x_subport: capability: tosca.capabilities.network.Bindable - node: vdbe_vdbe_untr_1_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_1_port: - type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface - properties: - mac_requirements: - get_input: port_vdbe_untr_1_port_mac_requirements - order: - get_input: port_vdbe_untr_1_port_order - exCP_naming: - get_input: port_vdbe_untr_1_port_exCP_naming - virtual_machine_interface_allowed_address_pairs: - get_input: - - port_vdbe_untr_1_port_virtual_machine_interface_allowed_address_pairs - - index_value - vlan_requirements: - get_input: port_vdbe_untr_1_port_vlan_requirements - subinterface_indicator: true - related_networks: - get_input: port_vdbe_untr_1_port_related_networks - virtual_network_refs: - get_input: - - port_vdbe_untr_1_port_virtual_network_refs - - index_value - ip_requirements: - get_input: port_vdbe_untr_1_port_ip_requirements - network_role_tag: - get_input: port_vdbe_untr_1_port_network_role_tag - virtual_machine_interface_mac_addresses: - get_input: - - port_vdbe_untr_1_port_virtual_machine_interface_mac_addresses - - index_value - network_role: - get_input: port_vdbe_untr_1_port_network_role - subnetpoolid: - get_input: port_vdbe_untr_1_port_subnetpoolid - name: - get_input: - - port_vdbe_untr_1_port_name - - index_value - requirements: - - binding: - capability: tosca.capabilities.network.Bindable - node: vdbe + node: vdbe_vdbe_untr_1_port_1 relationship: tosca.relationships.network.BindsTo substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.vdbe @@ -334,9 +334,9 @@ topology_template: disk.ephemeral.size_vdbe: - vdbe - disk.ephemeral.size - feature_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_nested: - - vdbe_vdbe_untr_1_port_nested - - feature_vdbe_untr_x_subport + network.outpoing.packets_vdbe_vdbe_untr_1_port_1: + - vdbe_vdbe_untr_1_port_1 + - network.outpoing.packets cpu_util_vdbe: - vdbe - cpu_util @@ -346,24 +346,21 @@ topology_template: disk.write.requests_vdbe: - vdbe - disk.write.requests + network.outgoing.packets.rate_vdbe_vdbe_untr_1_port_1: + - vdbe_vdbe_untr_1_port_1 + - network.outgoing.packets.rate disk.device.latency_vdbe: - vdbe - disk.device.latency disk.device.write.requests.rate_vdbe: - vdbe - disk.device.write.requests.rate - feature_vdbe_vdbe_untr_1_port: - - vdbe_vdbe_untr_1_port - - feature + network.incoming.bytes_vdbe_vdbe_untr_1_port_1: + - vdbe_vdbe_untr_1_port_1 + - network.incoming.bytes disk.write.bytes.rate_vdbe: - vdbe - disk.write.bytes.rate - network.incoming.bytes.rate_vdbe_vdbe_untr_1_port: - - vdbe_vdbe_untr_1_port - - network.incoming.bytes.rate - network.incoming.packets.rate_vdbe_vdbe_untr_1_port: - - vdbe_vdbe_untr_1_port - - network.incoming.packets.rate scalable_vdbe: - vdbe - scalable @@ -376,9 +373,12 @@ topology_template: disk.device.capacity_vdbe: - vdbe - disk.device.capacity - network.outgoing.bytes_vdbe_vdbe_untr_1_port: - - vdbe_vdbe_untr_1_port - - network.outgoing.bytes + feature_vdbe_vdbe_untr_1_port_1_nested: + - vdbe_vdbe_untr_1_port_1_nested + - feature + binding_vdbe_vdbe_untr_1_port_1: + - vdbe_vdbe_untr_1_port_1 + - binding disk.device.allocation_vdbe: - vdbe - disk.device.allocation @@ -388,21 +388,24 @@ topology_template: memory.usage_vdbe: - vdbe - memory.usage + network.outgoing.bytes_vdbe_vdbe_untr_1_port_1: + - vdbe_vdbe_untr_1_port_1 + - network.outgoing.bytes disk.read.requests_vdbe: - vdbe - disk.read.requests - network.incoming.bytes_vdbe_vdbe_untr_1_port: - - vdbe_vdbe_untr_1_port - - network.incoming.bytes + network.incoming.packets.rate_vdbe_vdbe_untr_1_port_1: + - vdbe_vdbe_untr_1_port_1 + - network.incoming.packets.rate + forwarder_vdbe_vdbe_untr_1_port_1: + - vdbe_vdbe_untr_1_port_1 + - forwarder instance_vdbe: - vdbe - instance cpu.delta_vdbe: - vdbe - cpu.delta - binding_vdbe_vdbe_untr_1_port: - - vdbe_vdbe_untr_1_port - - binding disk.device.read.bytes.rate_vdbe: - vdbe - disk.device.read.bytes.rate @@ -412,12 +415,6 @@ topology_template: memory.resident_vdbe: - vdbe - memory.resident - forwarder_vdbe_vdbe_untr_1_port: - - vdbe_vdbe_untr_1_port - - forwarder - feature_vdbe_vdbe_untr_1_port_nested: - - vdbe_vdbe_untr_1_port_nested - - feature disk.write.requests.rate_vdbe: - vdbe - disk.write.requests.rate @@ -430,15 +427,18 @@ topology_template: disk.device.usage_vdbe: - vdbe - disk.device.usage + feature_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_1_nested: + - vdbe_vdbe_untr_1_port_1_nested + - feature_vdbe_untr_x_subport disk.device.read.bytes_vdbe: - vdbe - disk.device.read.bytes disk.latency_vdbe: - vdbe - disk.latency - network.outgoing.packets.rate_vdbe_vdbe_untr_1_port: - - vdbe_vdbe_untr_1_port - - network.outgoing.packets.rate + network.outgoing.bytes.rate_vdbe_vdbe_untr_1_port_1: + - vdbe_vdbe_untr_1_port_1 + - network.outgoing.bytes.rate disk.capacity_vdbe: - vdbe - disk.capacity @@ -448,12 +448,9 @@ topology_template: disk.allocation_vdbe: - vdbe - disk.allocation - network.outpoing.packets_vdbe_vdbe_untr_1_port: - - vdbe_vdbe_untr_1_port - - network.outpoing.packets - network.incoming.packets_vdbe_vdbe_untr_1_port: - - vdbe_vdbe_untr_1_port - - network.incoming.packets + feature_vdbe_vdbe_untr_1_port_1: + - vdbe_vdbe_untr_1_port_1 + - feature disk.read.bytes.rate_vdbe: - vdbe - disk.read.bytes.rate @@ -466,6 +463,12 @@ topology_template: disk.root.size_vdbe: - vdbe - disk.root.size + network.incoming.packets_vdbe_vdbe_untr_1_port_1: + - vdbe_vdbe_untr_1_port_1 + - network.incoming.packets + network.incoming.bytes.rate_vdbe_vdbe_untr_1_port_1: + - vdbe_vdbe_untr_1_port_1 + - network.incoming.bytes.rate memory_vdbe: - vdbe - memory @@ -475,9 +478,6 @@ topology_template: disk.device.write.bytes_vdbe: - vdbe - disk.device.write.bytes - network.outgoing.bytes.rate_vdbe_vdbe_untr_1_port: - - vdbe_vdbe_untr_1_port - - network.outgoing.bytes.rate disk.device.read.requests.rate_vdbe: - vdbe - disk.device.read.requests.rate @@ -485,23 +485,23 @@ topology_template: - vdbe - disk.read.bytes requirements: - subinterface_link_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_nested: - - vdbe_vdbe_untr_1_port_nested + dependency_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_1_nested: + - vdbe_vdbe_untr_1_port_1_nested + - dependency_vdbe_untr_x_subport + subinterface_link_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_1_nested: + - vdbe_vdbe_untr_1_port_1_nested - subinterface_link_vdbe_untr_x_subport - dependency_vdbe_vdbe_untr_1_port: - - vdbe_vdbe_untr_1_port + dependency_vdbe_vdbe_untr_1_port_1: + - vdbe_vdbe_untr_1_port_1 - dependency local_storage_vdbe: - vdbe - local_storage - dependency_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_nested: - - vdbe_vdbe_untr_1_port_nested - - dependency_vdbe_untr_x_subport - dependency_vdbe_vdbe_untr_1_port_nested: - - vdbe_vdbe_untr_1_port_nested + dependency_vdbe_vdbe_untr_1_port_1_nested: + - vdbe_vdbe_untr_1_port_1_nested - dependency - link_vdbe_vdbe_untr_1_port: - - vdbe_vdbe_untr_1_port + link_vdbe_vdbe_untr_1_port_1: + - vdbe_vdbe_untr_1_port_1 - link dependency_vdbe: - vdbe diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml index de35f9126e..0aaf991239 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -918,6 +918,14 @@ node_types: status: SUPPORTED entry_schema: type: float + port_pd_server_1b_port_0_subnetpoolid: + type: string + required: true + status: SUPPORTED + port_pd_server_1b_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED index_value: type: integer description: Index value of this substitution service template runtime instance @@ -926,108 +934,100 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 + port_pd_server_1b_port_0_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd_server_1b_port_0_network_role_tag: + type: string + required: true + status: SUPPORTED vm_flavor_name: type: string required: true status: SUPPORTED - port_pd_server_1b_port_vlan_requirements: + port_pd_server_1b_port_0_order: + type: integer + required: true + status: SUPPORTED + port_pd_server_1b_port_0_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: string subinterface_nested_vlan_net1: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd_server_1b_port_related_networks: + port_pd_server_1b_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd_server_1b_port_network_role_tag: - type: string - required: true - status: SUPPORTED + type: org.openecomp.datatypes.network.VlanRequirements vm_image_name: type: string required: true status: SUPPORTED - port_pd_server_1b_port_replacement_policy: + port_pd_server_1b_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd_server_1b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_pd_server_1b_port_network_role: - type: string - required: true - status: SUPPORTED + type: org.openecomp.datatypes.network.RelatedNetworksAssignments subinterface_nested_vlan_parent_interface: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd_server_1b_port_fixed_ips: + port_pd_server_1b_port_0_replacement_policy: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_pd_server_1b_port_network: - type: list + type: string + port_pd_server_1b_port_0_network_role: + type: string + required: true + status: SUPPORTED + port_pd_server_1b_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: string compute_pd_server_1b_availability_zone: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd_server_1b_port_order: - type: integer - required: true - status: SUPPORTED - port_pd_server_1b_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_pd_server_1b_port_ip_requirements: + port_pd_server_1b_port_0_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd_server_1b_port_subnetpoolid: - type: string - required: true - status: SUPPORTED + type: org.openecomp.datatypes.heat.neutron.port.FixedIps requirements: - - dependency_pd_server_1b_pd_server_1b_port_nested_vlan: + - dependency_pd_server_1b_pd_server_1b_port_0_nested_vlan: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - dependency_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: + - dependency_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_0_nested_vlan: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: + - subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_0_nested_vlan: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -1047,14 +1047,14 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_1b_pd_server_1b_port: + - dependency_pd_server_1b_pd_server_1b_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_1b_pd_server_1b_port: + - link_pd_server_1b_pd_server_1b_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -1067,11 +1067,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_1b_pd_server_1b_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED host_pd_server_1b: type: tosca.capabilities.Container valid_source_types: @@ -1091,34 +1086,31 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port: + cpu.delta_pd_server_1b: 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_pd_server_1b: + disk.device.read.requests_pd_server_1b: 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_pd_server_1b_pd_server_1b_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - network.incoming.bytes_pd_server_1b_pd_server_1b_port: + network.incoming.packets.rate_pd_server_1b_pd_server_1b_port_0: 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_pd_server_1b: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_pd_server_1b_pd_server_1b_port_0: + 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: - - 1 + - 0 - UNBOUNDED feature_pd_server_1b: type: tosca.capabilities.Node @@ -1131,14 +1123,6 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_1b_pd_server_1b_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 cpu_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1174,7 +1158,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_1b_pd_server_1b_port: + network.incoming.bytes_pd_server_1b_pd_server_1b_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1204,14 +1188,15 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.usage_pd_server_1b: + network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port_0: 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 - attachment_pd_server_1b_pd_server_1b_port: - type: tosca.capabilities.Attachment + disk.device.usage_pd_server_1b: + 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 @@ -1227,13 +1212,23 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_pd_server_1b_pd_server_1b_port_0_nested_vlan: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.ephemeral.size_pd_server_1b: 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_pd_server_1b_pd_server_1b_port: + forwarder_pd_server_1b_pd_server_1b_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes_pd_server_1b_pd_server_1b_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1250,18 +1245,19 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: - type: tosca.capabilities.Node + disk.device.write.bytes.rate_pd_server_1b: + 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_pd_server_1b: + disk.root.size_pd_server_1b: 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_pd_server_1b: + network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1273,6 +1269,11 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_pd_server_1b_pd_server_1b_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.write.bytes_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1296,15 +1297,14 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_1b_pd_server_1b_port: + instance_pd_server_1b: 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 - instance_pd_server_1b: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_0_nested_vlan: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -1319,24 +1319,24 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_1b_pd_server_1b_port: + network.outpoing.packets_pd_server_1b_pd_server_1b_port_0: 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_pd_server_1b: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_pd_server_1b_pd_server_1b_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - feature_pd_server_1b_pd_server_1b_port_nested_vlan: - type: tosca.capabilities.Node + memory.resident_pd_server_1b: + 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_pd_server_1b_pd_server_1b_port: + network.incoming.packets_pd_server_1b_pd_server_1b_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1360,19 +1360,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port: + disk.capacity_pd_server_1b: 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_pd_server_1b: + disk.usage_pd_server_1b: 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_pd_server_1b: + network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1966,4 +1966,4 @@ node_types: type: tosca.capabilities.Node occurrences: - 1 - - UNBOUNDED \ No newline at end of file + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/Nested_pd_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/Nested_pd_server_1bServiceTemplate.yaml index 17f0ff073f..92de2147d9 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/Nested_pd_server_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/Nested_pd_server_1bServiceTemplate.yaml @@ -21,6 +21,12 @@ topology_template: required: true entry_schema: type: float + port_pd_server_1b_port_0_subnetpoolid: + type: string + required: true + port_pd_server_1b_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -28,77 +34,71 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 + port_pd_server_1b_port_0_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd_server_1b_port_0_network_role_tag: + type: string + required: true vm_flavor_name: type: string required: true - port_pd_server_1b_port_vlan_requirements: + port_pd_server_1b_port_0_order: + type: integer + required: true + port_pd_server_1b_port_0_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: string subinterface_nested_vlan_net1: type: list required: true entry_schema: type: string - port_pd_server_1b_port_related_networks: + port_pd_server_1b_port_0_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd_server_1b_port_network_role_tag: - type: string - required: true + type: org.openecomp.datatypes.network.VlanRequirements vm_image_name: type: string required: true - port_pd_server_1b_port_replacement_policy: + port_pd_server_1b_port_0_related_networks: type: list required: true entry_schema: - type: string - port_pd_server_1b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_pd_server_1b_port_network_role: - type: string - required: true + type: org.openecomp.datatypes.network.RelatedNetworksAssignments subinterface_nested_vlan_parent_interface: type: list required: true entry_schema: type: string - port_pd_server_1b_port_fixed_ips: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_pd_server_1b_port_network: + port_pd_server_1b_port_0_replacement_policy: type: list required: true entry_schema: type: string + port_pd_server_1b_port_0_network_role: + type: string + required: true + port_pd_server_1b_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true compute_pd_server_1b_availability_zone: type: list required: true entry_schema: type: string - port_pd_server_1b_port_order: - type: integer - required: true - port_pd_server_1b_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_pd_server_1b_port_ip_requirements: + port_pd_server_1b_port_0_fixed_ips: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd_server_1b_port_subnetpoolid: - type: string - required: true + type: org.openecomp.datatypes.heat.neutron.port.FixedIps node_templates: - pd_server_1b_pd_server_1b_port_nested_vlan: + pd_server_1b_pd_server_1b_port_0_nested_vlan: type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested_vlan directives: - substitutable @@ -121,7 +121,7 @@ topology_template: requirements: - binding_template_Vlan_vmi_1: capability: tosca.capabilities.network.Bindable - node: pd_server_1b_pd_server_1b_port + node: pd_server_1b_pd_server_1b_port_0 relationship: tosca.relationships.network.BindsTo pd_server_1b: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server_1b @@ -138,39 +138,39 @@ topology_template: get_input: - compute_pd_server_1b_name - index_value - pd_server_1b_pd_server_1b_port: + pd_server_1b_pd_server_1b_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_pd_server_1b_port_replacement_policy + - port_pd_server_1b_port_0_replacement_policy - index_value mac_requirements: - get_input: port_pd_server_1b_port_mac_requirements + get_input: port_pd_server_1b_port_0_mac_requirements order: - get_input: port_pd_server_1b_port_order + get_input: port_pd_server_1b_port_0_order exCP_naming: - get_input: port_pd_server_1b_port_exCP_naming + get_input: port_pd_server_1b_port_0_exCP_naming vlan_requirements: - get_input: port_pd_server_1b_port_vlan_requirements + get_input: port_pd_server_1b_port_0_vlan_requirements subinterface_indicator: true ip_requirements: - get_input: port_pd_server_1b_port_ip_requirements + get_input: port_pd_server_1b_port_0_ip_requirements related_networks: - get_input: port_pd_server_1b_port_related_networks + get_input: port_pd_server_1b_port_0_related_networks network_role_tag: - get_input: port_pd_server_1b_port_network_role_tag + get_input: port_pd_server_1b_port_0_network_role_tag network_role: - get_input: port_pd_server_1b_port_network_role + get_input: port_pd_server_1b_port_0_network_role fixed_ips: get_input: - - port_pd_server_1b_port_fixed_ips + - port_pd_server_1b_port_0_fixed_ips - index_value subnetpoolid: - get_input: port_pd_server_1b_port_subnetpoolid + get_input: port_pd_server_1b_port_0_subnetpoolid network: get_input: - - port_pd_server_1b_port_network + - port_pd_server_1b_port_0_network - index_value requirements: - binding: @@ -183,9 +183,6 @@ topology_template: disk.device.read.bytes_pd_server_1b: - pd_server_1b - disk.device.read.bytes - feature_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - feature host_pd_server_1b: - pd_server_1b - host @@ -195,30 +192,24 @@ topology_template: disk.allocation_pd_server_1b: - pd_server_1b - disk.allocation - network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.incoming.bytes.rate cpu.delta_pd_server_1b: - pd_server_1b - cpu.delta - forwarder_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - forwarder - network.incoming.bytes_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.incoming.bytes disk.device.read.requests_pd_server_1b: - pd_server_1b - disk.device.read.requests + network.incoming.packets.rate_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - network.incoming.packets.rate + binding_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - binding feature_pd_server_1b: - pd_server_1b - feature disk.device.iops_pd_server_1b: - pd_server_1b - disk.device.iops - binding_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - binding cpu_pd_server_1b: - pd_server_1b - cpu @@ -237,9 +228,9 @@ topology_template: memory.usage_pd_server_1b: - pd_server_1b - memory.usage - network.outpoing.packets_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.outpoing.packets + network.incoming.bytes_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - network.incoming.bytes memory_pd_server_1b: - pd_server_1b - memory @@ -252,42 +243,51 @@ topology_template: disk.read.bytes_pd_server_1b: - pd_server_1b - disk.read.bytes + network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - network.incoming.bytes.rate disk.device.usage_pd_server_1b: - pd_server_1b - disk.device.usage - attachment_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - attachment disk.device.write.requests_pd_server_1b: - pd_server_1b - disk.device.write.requests disk.latency_pd_server_1b: - pd_server_1b - disk.latency + feature_pd_server_1b_pd_server_1b_port_0_nested_vlan: + - pd_server_1b_pd_server_1b_port_0_nested_vlan + - feature disk.ephemeral.size_pd_server_1b: - pd_server_1b - disk.ephemeral.size - network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.outgoing.bytes.rate + forwarder_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - forwarder + network.outgoing.bytes_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - network.outgoing.bytes scalable_pd_server_1b: - pd_server_1b - scalable disk.write.requests_pd_server_1b: - pd_server_1b - disk.write.requests - feature_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: - - pd_server_1b_pd_server_1b_port_nested_vlan - - feature_template_Vlan_vmi_1 disk.device.write.bytes.rate_pd_server_1b: - pd_server_1b - disk.device.write.bytes.rate disk.root.size_pd_server_1b: - pd_server_1b - disk.root.size + network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - network.outgoing.bytes.rate disk.iops_pd_server_1b: - pd_server_1b - disk.iops + feature_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - feature disk.write.bytes_pd_server_1b: - pd_server_1b - disk.write.bytes @@ -300,29 +300,29 @@ topology_template: vcpus_pd_server_1b: - pd_server_1b - vcpus - network.incoming.packets.rate_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.incoming.packets.rate instance_pd_server_1b: - pd_server_1b - instance + feature_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_0_nested_vlan: + - pd_server_1b_pd_server_1b_port_0_nested_vlan + - feature_template_Vlan_vmi_1 binding_pd_server_1b: - pd_server_1b - binding cpu_util_pd_server_1b: - pd_server_1b - cpu_util - network.outgoing.bytes_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.outgoing.bytes + network.outpoing.packets_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - network.outpoing.packets + attachment_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - attachment memory.resident_pd_server_1b: - pd_server_1b - memory.resident - feature_pd_server_1b_pd_server_1b_port_nested_vlan: - - pd_server_1b_pd_server_1b_port_nested_vlan - - feature - network.incoming.packets_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port + network.incoming.packets_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 - network.incoming.packets disk.device.write.requests.rate_pd_server_1b: - pd_server_1b @@ -333,15 +333,15 @@ topology_template: disk.read.requests_pd_server_1b: - pd_server_1b - disk.read.requests - network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.outgoing.packets.rate disk.capacity_pd_server_1b: - pd_server_1b - disk.capacity disk.usage_pd_server_1b: - pd_server_1b - disk.usage + network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - network.outgoing.packets.rate disk.write.requests.rate_pd_server_1b: - pd_server_1b - disk.write.requests.rate @@ -352,18 +352,18 @@ topology_template: local_storage_pd_server_1b: - pd_server_1b - local_storage - link_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - link - dependency_pd_server_1b_pd_server_1b_port_nested_vlan: - - pd_server_1b_pd_server_1b_port_nested_vlan + subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_0_nested_vlan: + - pd_server_1b_pd_server_1b_port_0_nested_vlan + - subinterface_link_template_Vlan_vmi_1 + dependency_pd_server_1b_pd_server_1b_port_0_nested_vlan: + - pd_server_1b_pd_server_1b_port_0_nested_vlan + - dependency + dependency_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 - dependency - dependency_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: - - pd_server_1b_pd_server_1b_port_nested_vlan + link_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - link + dependency_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_0_nested_vlan: + - pd_server_1b_pd_server_1b_port_0_nested_vlan - dependency_template_Vlan_vmi_1 - subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: - - pd_server_1b_pd_server_1b_port_nested_vlan - - subinterface_link_template_Vlan_vmi_1 - dependency_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - 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/complexVFCMultiLevelNestedDiffComputeScenario/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/complexVFCMultiLevelNestedDiffComputeScenario/out/nested_pattern5ServiceTemplate.yaml index 033465e290..35faea70fa 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/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/complexVFCMultiLevelNestedDiffComputeScenario/out/nested_pattern5ServiceTemplate.yaml @@ -104,34 +104,34 @@ topology_template: - 0 subinterface_nested_vlan_service_template_filter_count: - 9 + port_pd_server_1b_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false vm_flavor_name: get_input: pd_server_1b_flavor + port_pd_server_1b_port_0_network: + - packet_internal_network subinterface_nested_vlan_net1: - packet_external_network vm_image_name: get_input: pd_server_1b_image - port_pd_server_1b_port_replacement_policy: + subinterface_nested_vlan_parent_interface: + - pd_server_1b_port_0 + port_pd_server_1b_port_0_replacement_policy: - AUTO - port_pd_server_1b_port_mac_requirements: + port_pd_server_1b_port_0_mac_requirements: mac_count_required: is_required: false - subinterface_nested_vlan_parent_interface: - - pd_server_1b_port_0 - port_pd_server_1b_port_fixed_ips: + compute_pd_server_1b_availability_zone: + - get_input: availability_zone_0 + port_pd_server_1b_port_0_fixed_ips: - ip_address: get_input: - pd_server_1b_ips - 0 - port_pd_server_1b_port_network: - - packet_internal_network - compute_pd_server_1b_availability_zone: - - get_input: availability_zone_0 - port_pd_server_1b_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false service_template_filter: substitute_service_template: Nested_pd_server_1bServiceTemplate.yaml count: 1 @@ -141,11 +141,11 @@ topology_template: - service_template_filter - index_value requirements: - - link_pd_server_1b_pd_server_1b_port: + - link_pd_server_1b_pd_server_1b_port_0: capability: tosca.capabilities.network.Linkable node: packet_internal_network relationship: tosca.relationships.network.LinksTo - - subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: + - subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_0_nested_vlan: capability: tosca.capabilities.network.Linkable node: packet_external_network relationship: tosca.relationships.network.LinksTo @@ -186,19 +186,19 @@ topology_template: - forwarder_ps_server_1b_port_1 forwarder_pd_server_1b_port_0: - abstract_pd_server_1b - - forwarder_pd_server_1b_pd_server_1b_port + - forwarder_pd_server_1b_pd_server_1b_port_0 disk.capacity_server_1b_pd_0: - abstract_pd_server_1b - disk.capacity_pd_server_1b network.outpoing.packets_pd_server_1b_port_0: - abstract_pd_server_1b - - network.outpoing.packets_pd_server_1b_pd_server_1b_port + - network.outpoing.packets_pd_server_1b_pd_server_1b_port_0 network.incoming.packets_ps_server_1b_port_1_test_nested_level2: - test_nested_level2 - network.incoming.packets_ps_server_1b_port_1 feature_pd_server_1b_port_0: - abstract_pd_server_1b - - feature_pd_server_1b_pd_server_1b_port + - feature_pd_server_1b_pd_server_1b_port_0 memory_server_1b_ps_1_test_nested_level2: - test_nested_level2 - memory_server_1b_ps_1 @@ -324,7 +324,7 @@ topology_template: - feature_template_Vlan_vmi_1_test_resourceGroup_1 network.outgoing.bytes_pd_server_1b_port_0: - abstract_pd_server_1b - - network.outgoing.bytes_pd_server_1b_pd_server_1b_port + - network.outgoing.bytes_pd_server_1b_pd_server_1b_port_0 disk.read.requests_server_1b_ps_1_test_nested_level2: - test_nested_level2 - disk.read.requests_server_1b_ps_1 @@ -342,7 +342,7 @@ topology_template: - memory.resident_pd_server_1b network.outgoing.packets.rate_pd_server_1b_port_0: - abstract_pd_server_1b - - network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port + - network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port_0 disk.device.read.bytes_server_1b_pd_0: - abstract_pd_server_1b - disk.device.read.bytes_pd_server_1b @@ -351,7 +351,7 @@ topology_template: - feature_server_1b_ps_1 attachment_pd_server_1b_port_0: - abstract_pd_server_1b - - attachment_pd_server_1b_pd_server_1b_port + - attachment_pd_server_1b_pd_server_1b_port_0 attachment_packet_ext_network_test_nested_level2: - test_nested_level2 - attachment_packet_ext_network @@ -414,10 +414,10 @@ topology_template: - disk.device.read.requests_server_1b_ps_1 network.outgoing.bytes.rate_pd_server_1b_port_0: - abstract_pd_server_1b - - network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port + - network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port_0 network.incoming.packets.rate_pd_server_1b_port_0: - abstract_pd_server_1b - - network.incoming.packets.rate_pd_server_1b_pd_server_1b_port + - network.incoming.packets.rate_pd_server_1b_pd_server_1b_port_0 os_server_1b_pd_0: - abstract_pd_server_1b - os_pd_server_1b @@ -450,7 +450,7 @@ topology_template: - attachment_packet_int_network network.incoming.bytes_pd_server_1b_port_0: - abstract_pd_server_1b - - network.incoming.bytes_pd_server_1b_pd_server_1b_port + - network.incoming.bytes_pd_server_1b_pd_server_1b_port_0 disk.root.size_server_1b_pd_0: - abstract_pd_server_1b - disk.root.size_pd_server_1b @@ -489,7 +489,7 @@ topology_template: - link_packet_ext_network binding_pd_server_1b_port_0: - abstract_pd_server_1b - - binding_pd_server_1b_pd_server_1b_port + - binding_pd_server_1b_pd_server_1b_port_0 disk.device.read.requests.rate_server_1b_pd_0: - abstract_pd_server_1b - disk.device.read.requests.rate_pd_server_1b @@ -522,7 +522,7 @@ topology_template: - disk.device.read.requests_pd_server_1b network.incoming.packets_pd_server_1b_port_0: - abstract_pd_server_1b - - network.incoming.packets_pd_server_1b_pd_server_1b_port + - network.incoming.packets_pd_server_1b_pd_server_1b_port_0 disk.read.bytes.rate_server_1b_pd_0: - abstract_pd_server_1b - disk.read.bytes.rate_pd_server_1b @@ -540,7 +540,7 @@ topology_template: - disk.latency_pd_server_1b network.incoming.bytes.rate_pd_server_1b_port_0: - abstract_pd_server_1b - - network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port + - network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port_0 disk.write.requests.rate_server_1b_ps_1_test_nested_level2: - test_nested_level2 - disk.write.requests.rate_server_1b_ps_1 @@ -553,7 +553,7 @@ topology_template: - dependency_ps_server_1b_port_1 dependency_pd_server_1b_port_0: - abstract_pd_server_1b - - dependency_pd_server_1b_pd_server_1b_port + - dependency_pd_server_1b_pd_server_1b_port_0 dependency_template_Vlan_vmi_1_test_resourceGroup_0: - test_resourceGroup_0 - dependency_template_Vlan_vmi_1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/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/complexVFCMultiLevelNestedDiffComputeScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml index a27844365a..0e7a681e1b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/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/complexVFCMultiLevelNestedDiffComputeScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml @@ -409,4 +409,4 @@ topology_template: - dependency_template_Vlan_vmi_1 dependency_server_1b_ps_1: - server_1b_ps_1 - - dependency \ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/in/nested_pattern5_levelTwo.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/in/nested_pattern5_levelTwo.yml index 57e3d22955..51358a7c38 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/in/nested_pattern5_levelTwo.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/in/nested_pattern5_levelTwo.yml @@ -66,7 +66,7 @@ resources: networks: - port: { get_resource: ps_server_1b_port_1 } - ps_server_1b_port_2: + ps_server_1b_1_port_1: type: OS::Neutron::Port properties: network: {get_resource: packet_int_network} @@ -81,7 +81,7 @@ resources: availability_zone: { get_param: availability_zone_0 } flavor: { get_param: ps_server_1b_flavor } networks: - - port: { get_resource: ps_server_1b_port_2 } + - port: { get_resource: ps_server_1b_1_port_1 } test_resourceGroup_1: type: OS::Heat::ResourceGroup @@ -100,5 +100,5 @@ resources: resource_def: type: nested_vlan.yml properties: - parent_interface: { get_resource: ps_server_1b_port_2} + parent_interface: { get_resource: ps_server_1b_1_port_1} net1: { get_resource: packet_ext_network} \ 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/complexVFCMultiLevelNestedMultiComputeScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml index 1fe62b6cad..fe48762a9b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -171,7 +171,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_ps_server_1b_port_2_test_nested_level2: + - dependency_ps_server_1b_1_port_1_test_nested_level2: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn @@ -213,14 +213,14 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_ps_server_1b_port_2_test_nested_level2: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + scalable_server_1b_ps_1_test_nested_level2: + type: tosca.capabilities.Scalable occurrences: - 1 - UNBOUNDED - scalable_server_1b_ps_1_test_nested_level2: - type: tosca.capabilities.Scalable + network.outgoing.bytes.rate_ps_server_1b_1_port_1_test_nested_level2: + 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 @@ -253,6 +253,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets_ps_server_1b_1_port_1_test_nested_level2: + 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_server_1b_ps_2_test_nested_level2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -297,12 +303,22 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_ps_server_1b_1_port_1_test_nested_level2: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED network.outpoing.packets_pd_server_1b_port_0: 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_ps_server_1b_1_port_1_test_nested_level2: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED cpu_util_server_1b_ps_2_test_nested_level2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -315,6 +331,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_ps_server_1b_1_port_1_test_nested_level2: + 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_pd_server_1b_port_0: type: tosca.capabilities.Node occurrences: @@ -336,12 +358,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_ps_server_1b_port_2_test_nested_level2: - 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_server_1b_ps_1_test_nested_level2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -387,12 +403,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_ps_server_1b_port_2_test_nested_level2: - 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_server_1b_ps_1_test_nested_level2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -492,6 +502,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.packets.rate_ps_server_1b_1_port_1_test_nested_level2: + 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_server_1b_pd_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -550,23 +566,12 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_ps_server_1b_port_2_test_nested_level2: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.allocation_server_1b_ps_1_test_nested_level2: 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_ps_server_1b_port_2_test_nested_level2: - 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_server_1b_ps_1_test_nested_level2: type: tosca.capabilities.Endpoint.Admin occurrences: @@ -600,11 +605,6 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_ps_server_1b_port_2_test_nested_level2: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED disk.write.bytes_server_1b_pd_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -640,6 +640,20 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_ps_server_1b_1_port_1_test_nested_level2: + 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 + network.incoming.bytes_ps_server_1b_1_port_1_test_nested_level2: + 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_server_1b_pd_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -668,12 +682,24 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets.rate_ps_server_1b_1_port_1_test_nested_level2: + 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_server_1b_ps_1_test_nested_level2: 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_ps_server_1b_1_port_1_test_nested_level2: + 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_server_1b_ps_1_test_nested_level2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -871,12 +897,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_ps_server_1b_port_2_test_nested_level2: - 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_server_1b_pd_0: type: tosca.capabilities.OperatingSystem occurrences: @@ -966,14 +986,6 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_ps_server_1b_port_2_test_nested_level2: - 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 disk.ephemeral.size_server_1b_ps_1_test_nested_level2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1015,6 +1027,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes.rate_ps_server_1b_1_port_1_test_nested_level2: + 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_server_1b_ps_2_test_nested_level2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1105,29 +1123,23 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_ps_server_1b_port_2_test_nested_level2: + disk.write.requests_server_1b_pd_0: 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_server_1b_pd_0: + disk.device.allocation_server_1b_ps_1_test_nested_level2: 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 - attachment_ps_server_1b_port_2_test_nested_level2: + attachment_ps_server_1b_1_port_1_test_nested_level2: type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - disk.device.allocation_server_1b_ps_1_test_nested_level2: - 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_server_1b_ps_2_test_nested_level2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1145,12 +1157,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_ps_server_1b_port_2_test_nested_level2: - 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_server_1b_ps_2_test_nested_level2: type: tosca.capabilities.OperatingSystem occurrences: @@ -1237,12 +1243,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_ps_server_1b_port_2_test_nested_level2: - 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_pd_server_1b_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1276,6 +1276,14 @@ node_types: status: SUPPORTED entry_schema: type: float + port_pd_server_1b_port_0_subnetpoolid: + type: string + required: true + status: SUPPORTED + port_pd_server_1b_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED index_value: type: integer description: Index value of this substitution service template runtime instance @@ -1284,108 +1292,100 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 + port_pd_server_1b_port_0_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd_server_1b_port_0_network_role_tag: + type: string + required: true + status: SUPPORTED vm_flavor_name: type: string required: true status: SUPPORTED - port_pd_server_1b_port_vlan_requirements: + port_pd_server_1b_port_0_order: + type: integer + required: true + status: SUPPORTED + port_pd_server_1b_port_0_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: string subinterface_nested_vlan_net1: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd_server_1b_port_related_networks: + port_pd_server_1b_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd_server_1b_port_network_role_tag: - type: string - required: true - status: SUPPORTED + type: org.openecomp.datatypes.network.VlanRequirements vm_image_name: type: string required: true status: SUPPORTED - port_pd_server_1b_port_replacement_policy: + port_pd_server_1b_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd_server_1b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_pd_server_1b_port_network_role: - type: string - required: true - status: SUPPORTED + type: org.openecomp.datatypes.network.RelatedNetworksAssignments subinterface_nested_vlan_parent_interface: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd_server_1b_port_fixed_ips: + port_pd_server_1b_port_0_replacement_policy: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_pd_server_1b_port_network: - type: list + type: string + port_pd_server_1b_port_0_network_role: + type: string + required: true + status: SUPPORTED + port_pd_server_1b_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: string compute_pd_server_1b_availability_zone: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd_server_1b_port_order: - type: integer - required: true - status: SUPPORTED - port_pd_server_1b_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_pd_server_1b_port_ip_requirements: + port_pd_server_1b_port_0_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd_server_1b_port_subnetpoolid: - type: string - required: true - status: SUPPORTED + type: org.openecomp.datatypes.heat.neutron.port.FixedIps requirements: - - dependency_pd_server_1b_pd_server_1b_port_nested_vlan: + - dependency_pd_server_1b_pd_server_1b_port_0_nested_vlan: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - dependency_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: + - dependency_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_0_nested_vlan: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: + - subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_0_nested_vlan: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -1405,14 +1405,14 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_1b_pd_server_1b_port: + - dependency_pd_server_1b_pd_server_1b_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_1b_pd_server_1b_port: + - link_pd_server_1b_pd_server_1b_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -1425,11 +1425,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_1b_pd_server_1b_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED host_pd_server_1b: type: tosca.capabilities.Container valid_source_types: @@ -1449,34 +1444,31 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port: + cpu.delta_pd_server_1b: 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_pd_server_1b: + disk.device.read.requests_pd_server_1b: 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_pd_server_1b_pd_server_1b_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - network.incoming.bytes_pd_server_1b_pd_server_1b_port: + network.incoming.packets.rate_pd_server_1b_pd_server_1b_port_0: 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_pd_server_1b: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_pd_server_1b_pd_server_1b_port_0: + 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: - - 1 + - 0 - UNBOUNDED feature_pd_server_1b: type: tosca.capabilities.Node @@ -1489,14 +1481,6 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_1b_pd_server_1b_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 cpu_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1532,7 +1516,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_1b_pd_server_1b_port: + network.incoming.bytes_pd_server_1b_pd_server_1b_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1562,14 +1546,15 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.usage_pd_server_1b: + network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port_0: 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 - attachment_pd_server_1b_pd_server_1b_port: - type: tosca.capabilities.Attachment + disk.device.usage_pd_server_1b: + 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 @@ -1585,13 +1570,23 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_pd_server_1b_pd_server_1b_port_0_nested_vlan: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.ephemeral.size_pd_server_1b: 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_pd_server_1b_pd_server_1b_port: + forwarder_pd_server_1b_pd_server_1b_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes_pd_server_1b_pd_server_1b_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1608,18 +1603,19 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: - type: tosca.capabilities.Node + disk.device.write.bytes.rate_pd_server_1b: + 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_pd_server_1b: + disk.root.size_pd_server_1b: 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_pd_server_1b: + network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1631,6 +1627,11 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_pd_server_1b_pd_server_1b_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.write.bytes_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1654,15 +1655,14 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_1b_pd_server_1b_port: + instance_pd_server_1b: 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 - instance_pd_server_1b: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_0_nested_vlan: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -1677,24 +1677,24 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_1b_pd_server_1b_port: + network.outpoing.packets_pd_server_1b_pd_server_1b_port_0: 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_pd_server_1b: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_pd_server_1b_pd_server_1b_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - feature_pd_server_1b_pd_server_1b_port_nested_vlan: - type: tosca.capabilities.Node + memory.resident_pd_server_1b: + 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_pd_server_1b_pd_server_1b_port: + network.incoming.packets_pd_server_1b_pd_server_1b_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1718,19 +1718,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port: + disk.capacity_pd_server_1b: 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_pd_server_1b: + disk.usage_pd_server_1b: 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_pd_server_1b: + network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1852,7 +1852,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_ps_server_1b_port_2: + - dependency_ps_server_1b_1_port_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn @@ -1888,14 +1888,6 @@ node_types: - 0 - UNBOUNDED capabilities: - binding_ps_server_1b_port_2: - 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 disk.device.latency_server_1b_ps_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1970,12 +1962,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_ps_server_1b_port_2: - 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_server_1b_ps_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2005,12 +1991,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_ps_server_1b_port_2: - 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_ps_server_1b_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2123,17 +2103,6 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_ps_server_1b_port_2: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - network.outgoing.packets.rate_ps_server_1b_port_2: - 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 link_packet_int_network: type: tosca.capabilities.network.Linkable occurrences: @@ -2155,6 +2124,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.packets.rate_ps_server_1b_1_port_1: + 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_server_1b_ps_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2172,7 +2147,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_ps_server_1b_port_2: + network.outgoing.bytes_ps_server_1b_1_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2202,20 +2177,26 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_ps_server_1b_port_2: + network.outpoing.packets_ps_server_1b_port_1: 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_ps_server_1b_port_1: + endpoint_server_1b_ps_1: + type: tosca.capabilities.Endpoint.Admin + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets.rate_ps_server_1b_1_port_1: 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_server_1b_ps_1: - type: tosca.capabilities.Endpoint.Admin + network.incoming.bytes.rate_ps_server_1b_1_port_1: + 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 @@ -2256,14 +2237,13 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_packet_int_network: - type: tosca.capabilities.Node + attachment_ps_server_1b_1_port_1: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_ps_server_1b_port_2: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_packet_int_network: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -2314,6 +2294,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_ps_server_1b_1_port_1: + 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_server_1b_ps_2: type: tosca.capabilities.Scalable occurrences: @@ -2347,12 +2333,24 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes.rate_ps_server_1b_1_port_1: + 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_server_1b_ps_2: 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_ps_server_1b_1_port_1: + 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_server_1b_ps_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2401,12 +2399,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_ps_server_1b_port_2: - 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_server_1b_ps_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2474,13 +2466,14 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_ps_server_1b_port_2: + attachment_packet_ext_network: type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - attachment_packet_ext_network: - type: tosca.capabilities.Attachment + network.incoming.packets_ps_server_1b_1_port_1: + 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 @@ -2494,20 +2487,27 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_ps_server_1b_1_port_1: + 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 feature_test_resourceGroup_2: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_ps_server_1b_port_2: + network.outgoing.bytes_ps_server_1b_port_1: 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_ps_server_1b_port_1: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_ps_server_1b_1_port_1: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -2523,6 +2523,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_ps_server_1b_1_port_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.read.bytes_server_1b_ps_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2557,11 +2562,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_ps_server_1b_port_2: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.device.read.bytes.rate_server_1b_ps_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2577,32 +2577,22 @@ node_types: org.openecomp.resource.abstract.nodes.ps_server_1b: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_ps_server_1b_port_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_ps_server_1b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_ps_server_1b_port_1_network_role_tag: + type: string required: true status: SUPPORTED - subinterface_nested_vlan_service_template_filter_count: + port_ps_server_1b_port_1_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: float - port_ps_server_1b_port_network_role_tag: - type: string - required: true - status: SUPPORTED - port_ps_server_1b_port_fixed_ips: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + subinterface_nested_vlan_service_template_filter_count: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps + type: float index_value: type: integer description: Index value of this substitution service template runtime instance @@ -2611,72 +2601,82 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_ps_server_1b_port_order: - type: integer + port_ps_server_1b_port_1_ip_requirements: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements vm_flavor_name: type: string required: true status: SUPPORTED - port_ps_server_1b_port_related_networks: + port_ps_server_1b_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_ps_server_1b_port_1_network_role: + type: string + required: true + status: SUPPORTED + subinterface_nested_vlan_net1: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_ps_server_1b_port_network: + type: string + vm_image_name: + type: string + required: true + status: SUPPORTED + port_ps_server_1b_port_1_replacement_policy: type: list required: true status: SUPPORTED entry_schema: type: string - port_ps_server_1b_port_exCP_naming: + port_ps_server_1b_port_1_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - subinterface_nested_vlan_net1: + port_ps_server_1b_port_1_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: string - port_ps_server_1b_port_ip_requirements: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + subinterface_nested_vlan_parent_interface: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - vm_image_name: - type: string + type: string + port_ps_server_1b_port_1_order: + type: integer required: true status: SUPPORTED - port_ps_server_1b_port_network_role: + port_ps_server_1b_port_1_subnetpoolid: type: string required: true status: SUPPORTED - port_ps_server_1b_port_replacement_policy: + port_ps_server_1b_port_1_network: type: list required: true status: SUPPORTED entry_schema: type: string - subinterface_nested_vlan_parent_interface: + compute_ps_server_1b_availability_zone: type: list required: true status: SUPPORTED entry_schema: type: string - port_ps_server_1b_port_subnetpoolid: - type: string - required: true - status: SUPPORTED - compute_ps_server_1b_availability_zone: + port_ps_server_1b_port_1_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string + type: org.openecomp.datatypes.network.VlanRequirements compute_ps_server_1b_name: type: list required: true @@ -2698,34 +2698,34 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_ps_server_1b_ps_server_1b_port_nested_vlan: + - dependency_ps_server_1b_ps_server_1b_port_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - dependency_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: + - link_ps_server_1b_ps_server_1b_port_1: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 + - dependency_ps_server_1b_ps_server_1b_port_1_nested_vlan: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - subinterface_link_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - - dependency_ps_server_1b_ps_server_1b_port: + - dependency_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_1_nested_vlan: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_ps_server_1b_ps_server_1b_port: + - subinterface_link_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_1_nested_vlan: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -2744,6 +2744,11 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_1_nested_vlan: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.device.allocation_ps_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2767,30 +2772,31 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.read.bytes.rate_ps_server_1b: + network.outgoing.bytes_ps_server_1b_ps_server_1b_port_1: 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_ps_server_1b: + disk.device.read.bytes.rate_ps_server_1b: 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.iops_ps_server_1b: + disk.device.latency_ps_server_1b: 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 - attachment_ps_server_1b_ps_server_1b_port: - type: tosca.capabilities.Attachment + network.outgoing.packets.rate_ps_server_1b_ps_server_1b_port_1: + 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.packets.rate_ps_server_1b_ps_server_1b_port: + disk.device.iops_ps_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2802,11 +2808,6 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_ps_server_1b_ps_server_1b_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED instance_ps_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2856,11 +2857,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_ps_server_1b_ps_server_1b_port_nested_vlan: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.device.read.requests.rate_ps_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2873,7 +2869,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_ps_server_1b_ps_server_1b_port: + network.incoming.bytes_ps_server_1b_ps_server_1b_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2891,72 +2887,70 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.write.requests.rate_ps_server_1b: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_ps_server_1b_ps_server_1b_port_1: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - disk.root.size_ps_server_1b: + disk.device.write.requests.rate_ps_server_1b: 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_ps_server_1b: - type: tosca.capabilities.network.Bindable + network.incoming.packets_ps_server_1b_ps_server_1b_port_1: + 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_ps_server_1b: + disk.root.size_ps_server_1b: 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_ps_server_1b: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_ps_server_1b_ps_server_1b_port_1_nested_vlan: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.write.bytes_ps_server_1b: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_ps_server_1b: + type: tosca.capabilities.network.Bindable occurrences: - 1 - UNBOUNDED - disk.device.write.bytes.rate_ps_server_1b: + memory.resident_ps_server_1b: 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_ps_server_1b: + memory_ps_server_1b: 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_ps_server_1b_ps_server_1b_port: + disk.write.bytes_ps_server_1b: 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_ps_server_1b_ps_server_1b_port: + disk.device.write.bytes.rate_ps_server_1b: 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_ps_server_1b_ps_server_1b_port: + disk.read.bytes_ps_server_1b: 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_ps_server_1b_ps_server_1b_port: + network.outgoing.bytes.rate_ps_server_1b_ps_server_1b_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2972,6 +2966,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_ps_server_1b_ps_server_1b_port_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.iops_ps_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2990,12 +2989,20 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_ps_server_1b_ps_server_1b_port: + network.incoming.packets.rate_ps_server_1b_ps_server_1b_port_1: 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_ps_server_1b_ps_server_1b_port_1: + 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 memory.usage_ps_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3008,23 +3015,24 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_ps_server_1b_ps_server_1b_port_1: + 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_ps_server_1b: type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_ps_server_1b_ps_server_1b_port: + vcpus_ps_server_1b: 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_ps_server_1b_ps_server_1b_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - vcpus_ps_server_1b: + network.incoming.bytes.rate_ps_server_1b_ps_server_1b_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -3042,15 +3050,7 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_ps_server_1b_ps_server_1b_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 - feature_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: + feature_ps_server_1b_ps_server_1b_port_1: type: tosca.capabilities.Node occurrences: - 1 @@ -3121,4 +3121,4 @@ node_types: type: tosca.capabilities.Node occurrences: - 1 - - UNBOUNDED \ No newline at end of file + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/Nested_pd_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/Nested_pd_server_1bServiceTemplate.yaml index 17f0ff073f..92de2147d9 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/Nested_pd_server_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/Nested_pd_server_1bServiceTemplate.yaml @@ -21,6 +21,12 @@ topology_template: required: true entry_schema: type: float + port_pd_server_1b_port_0_subnetpoolid: + type: string + required: true + port_pd_server_1b_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -28,77 +34,71 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 + port_pd_server_1b_port_0_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd_server_1b_port_0_network_role_tag: + type: string + required: true vm_flavor_name: type: string required: true - port_pd_server_1b_port_vlan_requirements: + port_pd_server_1b_port_0_order: + type: integer + required: true + port_pd_server_1b_port_0_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: string subinterface_nested_vlan_net1: type: list required: true entry_schema: type: string - port_pd_server_1b_port_related_networks: + port_pd_server_1b_port_0_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd_server_1b_port_network_role_tag: - type: string - required: true + type: org.openecomp.datatypes.network.VlanRequirements vm_image_name: type: string required: true - port_pd_server_1b_port_replacement_policy: + port_pd_server_1b_port_0_related_networks: type: list required: true entry_schema: - type: string - port_pd_server_1b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_pd_server_1b_port_network_role: - type: string - required: true + type: org.openecomp.datatypes.network.RelatedNetworksAssignments subinterface_nested_vlan_parent_interface: type: list required: true entry_schema: type: string - port_pd_server_1b_port_fixed_ips: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_pd_server_1b_port_network: + port_pd_server_1b_port_0_replacement_policy: type: list required: true entry_schema: type: string + port_pd_server_1b_port_0_network_role: + type: string + required: true + port_pd_server_1b_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true compute_pd_server_1b_availability_zone: type: list required: true entry_schema: type: string - port_pd_server_1b_port_order: - type: integer - required: true - port_pd_server_1b_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_pd_server_1b_port_ip_requirements: + port_pd_server_1b_port_0_fixed_ips: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd_server_1b_port_subnetpoolid: - type: string - required: true + type: org.openecomp.datatypes.heat.neutron.port.FixedIps node_templates: - pd_server_1b_pd_server_1b_port_nested_vlan: + pd_server_1b_pd_server_1b_port_0_nested_vlan: type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested_vlan directives: - substitutable @@ -121,7 +121,7 @@ topology_template: requirements: - binding_template_Vlan_vmi_1: capability: tosca.capabilities.network.Bindable - node: pd_server_1b_pd_server_1b_port + node: pd_server_1b_pd_server_1b_port_0 relationship: tosca.relationships.network.BindsTo pd_server_1b: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server_1b @@ -138,39 +138,39 @@ topology_template: get_input: - compute_pd_server_1b_name - index_value - pd_server_1b_pd_server_1b_port: + pd_server_1b_pd_server_1b_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_pd_server_1b_port_replacement_policy + - port_pd_server_1b_port_0_replacement_policy - index_value mac_requirements: - get_input: port_pd_server_1b_port_mac_requirements + get_input: port_pd_server_1b_port_0_mac_requirements order: - get_input: port_pd_server_1b_port_order + get_input: port_pd_server_1b_port_0_order exCP_naming: - get_input: port_pd_server_1b_port_exCP_naming + get_input: port_pd_server_1b_port_0_exCP_naming vlan_requirements: - get_input: port_pd_server_1b_port_vlan_requirements + get_input: port_pd_server_1b_port_0_vlan_requirements subinterface_indicator: true ip_requirements: - get_input: port_pd_server_1b_port_ip_requirements + get_input: port_pd_server_1b_port_0_ip_requirements related_networks: - get_input: port_pd_server_1b_port_related_networks + get_input: port_pd_server_1b_port_0_related_networks network_role_tag: - get_input: port_pd_server_1b_port_network_role_tag + get_input: port_pd_server_1b_port_0_network_role_tag network_role: - get_input: port_pd_server_1b_port_network_role + get_input: port_pd_server_1b_port_0_network_role fixed_ips: get_input: - - port_pd_server_1b_port_fixed_ips + - port_pd_server_1b_port_0_fixed_ips - index_value subnetpoolid: - get_input: port_pd_server_1b_port_subnetpoolid + get_input: port_pd_server_1b_port_0_subnetpoolid network: get_input: - - port_pd_server_1b_port_network + - port_pd_server_1b_port_0_network - index_value requirements: - binding: @@ -183,9 +183,6 @@ topology_template: disk.device.read.bytes_pd_server_1b: - pd_server_1b - disk.device.read.bytes - feature_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - feature host_pd_server_1b: - pd_server_1b - host @@ -195,30 +192,24 @@ topology_template: disk.allocation_pd_server_1b: - pd_server_1b - disk.allocation - network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.incoming.bytes.rate cpu.delta_pd_server_1b: - pd_server_1b - cpu.delta - forwarder_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - forwarder - network.incoming.bytes_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.incoming.bytes disk.device.read.requests_pd_server_1b: - pd_server_1b - disk.device.read.requests + network.incoming.packets.rate_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - network.incoming.packets.rate + binding_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - binding feature_pd_server_1b: - pd_server_1b - feature disk.device.iops_pd_server_1b: - pd_server_1b - disk.device.iops - binding_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - binding cpu_pd_server_1b: - pd_server_1b - cpu @@ -237,9 +228,9 @@ topology_template: memory.usage_pd_server_1b: - pd_server_1b - memory.usage - network.outpoing.packets_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.outpoing.packets + network.incoming.bytes_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - network.incoming.bytes memory_pd_server_1b: - pd_server_1b - memory @@ -252,42 +243,51 @@ topology_template: disk.read.bytes_pd_server_1b: - pd_server_1b - disk.read.bytes + network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - network.incoming.bytes.rate disk.device.usage_pd_server_1b: - pd_server_1b - disk.device.usage - attachment_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - attachment disk.device.write.requests_pd_server_1b: - pd_server_1b - disk.device.write.requests disk.latency_pd_server_1b: - pd_server_1b - disk.latency + feature_pd_server_1b_pd_server_1b_port_0_nested_vlan: + - pd_server_1b_pd_server_1b_port_0_nested_vlan + - feature disk.ephemeral.size_pd_server_1b: - pd_server_1b - disk.ephemeral.size - network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.outgoing.bytes.rate + forwarder_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - forwarder + network.outgoing.bytes_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - network.outgoing.bytes scalable_pd_server_1b: - pd_server_1b - scalable disk.write.requests_pd_server_1b: - pd_server_1b - disk.write.requests - feature_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: - - pd_server_1b_pd_server_1b_port_nested_vlan - - feature_template_Vlan_vmi_1 disk.device.write.bytes.rate_pd_server_1b: - pd_server_1b - disk.device.write.bytes.rate disk.root.size_pd_server_1b: - pd_server_1b - disk.root.size + network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - network.outgoing.bytes.rate disk.iops_pd_server_1b: - pd_server_1b - disk.iops + feature_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - feature disk.write.bytes_pd_server_1b: - pd_server_1b - disk.write.bytes @@ -300,29 +300,29 @@ topology_template: vcpus_pd_server_1b: - pd_server_1b - vcpus - network.incoming.packets.rate_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.incoming.packets.rate instance_pd_server_1b: - pd_server_1b - instance + feature_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_0_nested_vlan: + - pd_server_1b_pd_server_1b_port_0_nested_vlan + - feature_template_Vlan_vmi_1 binding_pd_server_1b: - pd_server_1b - binding cpu_util_pd_server_1b: - pd_server_1b - cpu_util - network.outgoing.bytes_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.outgoing.bytes + network.outpoing.packets_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - network.outpoing.packets + attachment_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - attachment memory.resident_pd_server_1b: - pd_server_1b - memory.resident - feature_pd_server_1b_pd_server_1b_port_nested_vlan: - - pd_server_1b_pd_server_1b_port_nested_vlan - - feature - network.incoming.packets_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port + network.incoming.packets_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 - network.incoming.packets disk.device.write.requests.rate_pd_server_1b: - pd_server_1b @@ -333,15 +333,15 @@ topology_template: disk.read.requests_pd_server_1b: - pd_server_1b - disk.read.requests - network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.outgoing.packets.rate disk.capacity_pd_server_1b: - pd_server_1b - disk.capacity disk.usage_pd_server_1b: - pd_server_1b - disk.usage + network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - network.outgoing.packets.rate disk.write.requests.rate_pd_server_1b: - pd_server_1b - disk.write.requests.rate @@ -352,18 +352,18 @@ topology_template: local_storage_pd_server_1b: - pd_server_1b - local_storage - link_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - link - dependency_pd_server_1b_pd_server_1b_port_nested_vlan: - - pd_server_1b_pd_server_1b_port_nested_vlan + subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_0_nested_vlan: + - pd_server_1b_pd_server_1b_port_0_nested_vlan + - subinterface_link_template_Vlan_vmi_1 + dependency_pd_server_1b_pd_server_1b_port_0_nested_vlan: + - pd_server_1b_pd_server_1b_port_0_nested_vlan + - dependency + dependency_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 - dependency - dependency_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: - - pd_server_1b_pd_server_1b_port_nested_vlan + link_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - link + dependency_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_0_nested_vlan: + - pd_server_1b_pd_server_1b_port_0_nested_vlan - dependency_template_Vlan_vmi_1 - subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: - - pd_server_1b_pd_server_1b_port_nested_vlan - - subinterface_link_template_Vlan_vmi_1 - dependency_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - 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/complexVFCMultiLevelNestedMultiComputeScenario/out/Nested_ps_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/Nested_ps_server_1bServiceTemplate.yaml index 2cdd4ed59a..9b142fd46b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/Nested_ps_server_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/Nested_ps_server_1bServiceTemplate.yaml @@ -11,27 +11,19 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_ps_server_1b_port_vlan_requirements: + port_ps_server_1b_port_1_network_role_tag: + type: string + required: true + port_ps_server_1b_port_1_related_networks: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_ps_server_1b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true + type: org.openecomp.datatypes.network.RelatedNetworksAssignments subinterface_nested_vlan_service_template_filter_count: type: list required: true entry_schema: type: float - port_ps_server_1b_port_network_role_tag: - type: string - required: true - port_ps_server_1b_port_fixed_ips: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps index_value: type: integer description: Index value of this substitution service template runtime instance @@ -39,59 +31,67 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_ps_server_1b_port_order: - type: integer + port_ps_server_1b_port_1_ip_requirements: + type: list required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements vm_flavor_name: type: string required: true - port_ps_server_1b_port_related_networks: + port_ps_server_1b_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_ps_server_1b_port_1_network_role: + type: string + required: true + subinterface_nested_vlan_net1: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_ps_server_1b_port_network: + type: string + vm_image_name: + type: string + required: true + port_ps_server_1b_port_1_replacement_policy: type: list required: true entry_schema: type: string - port_ps_server_1b_port_exCP_naming: + port_ps_server_1b_port_1_exCP_naming: type: org.openecomp.datatypes.Naming required: true - subinterface_nested_vlan_net1: + port_ps_server_1b_port_1_fixed_ips: type: list required: true entry_schema: - type: string - port_ps_server_1b_port_ip_requirements: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + subinterface_nested_vlan_parent_interface: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - vm_image_name: - type: string + type: string + port_ps_server_1b_port_1_order: + type: integer required: true - port_ps_server_1b_port_network_role: + port_ps_server_1b_port_1_subnetpoolid: type: string required: true - port_ps_server_1b_port_replacement_policy: + port_ps_server_1b_port_1_network: type: list required: true entry_schema: type: string - subinterface_nested_vlan_parent_interface: + compute_ps_server_1b_availability_zone: type: list required: true entry_schema: type: string - port_ps_server_1b_port_subnetpoolid: - type: string - required: true - compute_ps_server_1b_availability_zone: + port_ps_server_1b_port_1_vlan_requirements: type: list required: true entry_schema: - type: string + type: org.openecomp.datatypes.network.VlanRequirements compute_ps_server_1b_name: type: list required: true @@ -113,70 +113,70 @@ topology_template: get_input: - compute_ps_server_1b_name - index_value - ps_server_1b_ps_server_1b_port_nested_vlan: - type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested_vlan - directives: - - substitutable - properties: - service_template_filter: - count: - get_input: - - subinterface_nested_vlan_service_template_filter_count - - index_value - substitute_service_template: nested_vlanServiceTemplate.yaml - mandatory: true - parent_interface: - get_input: - - subinterface_nested_vlan_parent_interface - - index_value - net1: - get_input: - - subinterface_nested_vlan_net1 - - index_value - requirements: - - binding_template_Vlan_vmi_1: - capability: tosca.capabilities.network.Bindable - node: ps_server_1b_ps_server_1b_port - relationship: tosca.relationships.network.BindsTo - ps_server_1b_ps_server_1b_port: + ps_server_1b_ps_server_1b_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_ps_server_1b_port_replacement_policy + - port_ps_server_1b_port_1_replacement_policy - index_value mac_requirements: - get_input: port_ps_server_1b_port_mac_requirements + get_input: port_ps_server_1b_port_1_mac_requirements order: - get_input: port_ps_server_1b_port_order + get_input: port_ps_server_1b_port_1_order exCP_naming: - get_input: port_ps_server_1b_port_exCP_naming + get_input: port_ps_server_1b_port_1_exCP_naming vlan_requirements: - get_input: port_ps_server_1b_port_vlan_requirements + get_input: port_ps_server_1b_port_1_vlan_requirements subinterface_indicator: true ip_requirements: - get_input: port_ps_server_1b_port_ip_requirements + get_input: port_ps_server_1b_port_1_ip_requirements related_networks: - get_input: port_ps_server_1b_port_related_networks + get_input: port_ps_server_1b_port_1_related_networks network_role_tag: - get_input: port_ps_server_1b_port_network_role_tag + get_input: port_ps_server_1b_port_1_network_role_tag network_role: - get_input: port_ps_server_1b_port_network_role + get_input: port_ps_server_1b_port_1_network_role fixed_ips: get_input: - - port_ps_server_1b_port_fixed_ips + - port_ps_server_1b_port_1_fixed_ips - index_value subnetpoolid: - get_input: port_ps_server_1b_port_subnetpoolid + get_input: port_ps_server_1b_port_1_subnetpoolid network: get_input: - - port_ps_server_1b_port_network + - port_ps_server_1b_port_1_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: ps_server_1b relationship: tosca.relationships.network.BindsTo + ps_server_1b_ps_server_1b_port_1_nested_vlan: + type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested_vlan + directives: + - substitutable + properties: + service_template_filter: + count: + get_input: + - subinterface_nested_vlan_service_template_filter_count + - index_value + substitute_service_template: nested_vlanServiceTemplate.yaml + mandatory: true + parent_interface: + get_input: + - subinterface_nested_vlan_parent_interface + - index_value + net1: + get_input: + - subinterface_nested_vlan_net1 + - index_value + requirements: + - binding_template_Vlan_vmi_1: + capability: tosca.capabilities.network.Bindable + node: ps_server_1b_ps_server_1b_port_1 + relationship: tosca.relationships.network.BindsTo substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.ps_server_1b capabilities: @@ -186,6 +186,9 @@ topology_template: disk.device.usage_ps_server_1b: - ps_server_1b - disk.device.usage + feature_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_1_nested_vlan: + - ps_server_1b_ps_server_1b_port_1_nested_vlan + - feature_template_Vlan_vmi_1 disk.device.allocation_ps_server_1b: - ps_server_1b - disk.device.allocation @@ -198,27 +201,24 @@ topology_template: scalable_ps_server_1b: - ps_server_1b - scalable + network.outgoing.bytes_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 + - network.outgoing.bytes disk.device.read.bytes.rate_ps_server_1b: - ps_server_1b - disk.device.read.bytes.rate disk.device.latency_ps_server_1b: - ps_server_1b - disk.device.latency + network.outgoing.packets.rate_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 + - network.outgoing.packets.rate disk.device.iops_ps_server_1b: - ps_server_1b - disk.device.iops - attachment_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - attachment - network.outgoing.packets.rate_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - network.outgoing.packets.rate disk.device.capacity_ps_server_1b: - ps_server_1b - disk.device.capacity - forwarder_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - forwarder instance_ps_server_1b: - ps_server_1b - instance @@ -243,17 +243,14 @@ topology_template: disk.read.requests_ps_server_1b: - ps_server_1b - disk.read.requests - feature_ps_server_1b_ps_server_1b_port_nested_vlan: - - ps_server_1b_ps_server_1b_port_nested_vlan - - feature disk.device.read.requests.rate_ps_server_1b: - ps_server_1b - disk.device.read.requests.rate disk.capacity_ps_server_1b: - ps_server_1b - disk.capacity - network.incoming.bytes_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port + network.incoming.bytes_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 - network.incoming.bytes disk.write.requests.rate_ps_server_1b: - ps_server_1b @@ -261,12 +258,21 @@ topology_template: disk.device.read.bytes_ps_server_1b: - ps_server_1b - disk.device.read.bytes + attachment_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 + - attachment disk.device.write.requests.rate_ps_server_1b: - ps_server_1b - disk.device.write.requests.rate + network.incoming.packets_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 + - network.incoming.packets disk.root.size_ps_server_1b: - ps_server_1b - disk.root.size + feature_ps_server_1b_ps_server_1b_port_1_nested_vlan: + - ps_server_1b_ps_server_1b_port_1_nested_vlan + - feature binding_ps_server_1b: - ps_server_1b - binding @@ -285,17 +291,8 @@ topology_template: disk.read.bytes_ps_server_1b: - ps_server_1b - disk.read.bytes - network.incoming.packets.rate_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - network.incoming.packets.rate - network.outgoing.bytes_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - network.outgoing.bytes - network.incoming.packets_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - network.incoming.packets - network.outgoing.bytes.rate_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port + network.outgoing.bytes.rate_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 - network.outgoing.bytes.rate feature_ps_server_1b: - ps_server_1b @@ -303,6 +300,9 @@ topology_template: os_ps_server_1b: - ps_server_1b - os + forwarder_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 + - forwarder disk.iops_ps_server_1b: - ps_server_1b - disk.iops @@ -312,58 +312,58 @@ topology_template: disk.write.requests_ps_server_1b: - ps_server_1b - disk.write.requests - network.outpoing.packets_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - network.outpoing.packets + network.incoming.packets.rate_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 + - network.incoming.packets.rate + binding_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 + - binding memory.usage_ps_server_1b: - ps_server_1b - memory.usage disk.latency_ps_server_1b: - ps_server_1b - disk.latency + network.outpoing.packets_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 + - network.outpoing.packets endpoint_ps_server_1b: - ps_server_1b - endpoint - network.incoming.bytes.rate_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - network.incoming.bytes.rate - feature_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - feature vcpus_ps_server_1b: - ps_server_1b - vcpus + network.incoming.bytes.rate_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 + - network.incoming.bytes.rate cpu.delta_ps_server_1b: - ps_server_1b - cpu.delta disk.ephemeral.size_ps_server_1b: - ps_server_1b - disk.ephemeral.size - binding_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - binding - feature_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: - - ps_server_1b_ps_server_1b_port_nested_vlan - - feature_template_Vlan_vmi_1 + feature_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 + - feature requirements: - dependency_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: - - ps_server_1b_ps_server_1b_port_nested_vlan - - dependency_template_Vlan_vmi_1 - subinterface_link_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: - - ps_server_1b_ps_server_1b_port_nested_vlan + subinterface_link_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_1_nested_vlan: + - ps_server_1b_ps_server_1b_port_1_nested_vlan - subinterface_link_template_Vlan_vmi_1 + link_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 + - link local_storage_ps_server_1b: - ps_server_1b - local_storage - dependency_ps_server_1b_ps_server_1b_port_nested_vlan: - - ps_server_1b_ps_server_1b_port_nested_vlan + dependency_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 - dependency - dependency_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port + dependency_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_1_nested_vlan: + - ps_server_1b_ps_server_1b_port_1_nested_vlan + - dependency_template_Vlan_vmi_1 + dependency_ps_server_1b_ps_server_1b_port_1_nested_vlan: + - ps_server_1b_ps_server_1b_port_1_nested_vlan - dependency - link_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - link dependency_ps_server_1b: - ps_server_1b - - dependency \ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/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/complexVFCMultiLevelNestedMultiComputeScenario/out/nested_pattern5ServiceTemplate.yaml index bbc680fb1c..d252cfcc6e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/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/complexVFCMultiLevelNestedMultiComputeScenario/out/nested_pattern5ServiceTemplate.yaml @@ -95,34 +95,34 @@ topology_template: - 0 subinterface_nested_vlan_service_template_filter_count: - 9 + port_pd_server_1b_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false vm_flavor_name: get_input: pd_server_1b_flavor + port_pd_server_1b_port_0_network: + - packet_internal_network subinterface_nested_vlan_net1: - packet_external_network vm_image_name: get_input: pd_server_1b_image - port_pd_server_1b_port_replacement_policy: + subinterface_nested_vlan_parent_interface: + - pd_server_1b_port_0 + port_pd_server_1b_port_0_replacement_policy: - AUTO - port_pd_server_1b_port_mac_requirements: + port_pd_server_1b_port_0_mac_requirements: mac_count_required: is_required: false - subinterface_nested_vlan_parent_interface: - - pd_server_1b_port_0 - port_pd_server_1b_port_fixed_ips: + compute_pd_server_1b_availability_zone: + - get_input: availability_zone_0 + port_pd_server_1b_port_0_fixed_ips: - ip_address: get_input: - pd_server_1b_ips - 0 - port_pd_server_1b_port_network: - - packet_internal_network - compute_pd_server_1b_availability_zone: - - get_input: availability_zone_0 - port_pd_server_1b_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false service_template_filter: substitute_service_template: Nested_pd_server_1bServiceTemplate.yaml count: 1 @@ -132,11 +132,11 @@ topology_template: - service_template_filter - index_value requirements: - - link_pd_server_1b_pd_server_1b_port: + - link_pd_server_1b_pd_server_1b_port_0: capability: tosca.capabilities.network.Linkable node: packet_internal_network relationship: tosca.relationships.network.LinksTo - - subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: + - subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_0_nested_vlan: capability: tosca.capabilities.network.Linkable node: packet_external_network relationship: tosca.relationships.network.LinksTo @@ -157,12 +157,12 @@ topology_template: disk.device.write.bytes.rate_server_1b_ps_1_test_nested_level2: - test_nested_level2 - disk.device.write.bytes.rate_server_1b_ps_1 - network.outgoing.packets.rate_ps_server_1b_port_2_test_nested_level2: - - test_nested_level2 - - network.outgoing.packets.rate_ps_server_1b_port_2 scalable_server_1b_ps_1_test_nested_level2: - test_nested_level2 - scalable_server_1b_ps_1 + network.outgoing.bytes.rate_ps_server_1b_1_port_1_test_nested_level2: + - test_nested_level2 + - network.outgoing.bytes.rate_ps_server_1b_1_port_1 end_point_packet_ext_network_test_nested_level2: - test_nested_level2 - end_point_packet_ext_network @@ -178,6 +178,9 @@ topology_template: disk.device.write.requests_server_1b_pd_0: - abstract_pd_server_1b - disk.device.write.requests_pd_server_1b + network.incoming.packets_ps_server_1b_1_port_1_test_nested_level2: + - test_nested_level2 + - network.incoming.packets_ps_server_1b_1_port_1 disk.read.requests_server_1b_ps_2_test_nested_level2: - test_nested_level2 - disk.read.requests_server_1b_ps_2 @@ -198,22 +201,31 @@ topology_template: - forwarder_ps_server_1b_port_1 forwarder_pd_server_1b_port_0: - abstract_pd_server_1b - - forwarder_pd_server_1b_pd_server_1b_port + - forwarder_pd_server_1b_pd_server_1b_port_0 disk.capacity_server_1b_pd_0: - abstract_pd_server_1b - disk.capacity_pd_server_1b + forwarder_ps_server_1b_1_port_1_test_nested_level2: + - test_nested_level2 + - forwarder_ps_server_1b_1_port_1 network.outpoing.packets_pd_server_1b_port_0: - abstract_pd_server_1b - - network.outpoing.packets_pd_server_1b_pd_server_1b_port + - network.outpoing.packets_pd_server_1b_pd_server_1b_port_0 + feature_ps_server_1b_1_port_1_test_nested_level2: + - test_nested_level2 + - feature_ps_server_1b_1_port_1 cpu_util_server_1b_ps_2_test_nested_level2: - test_nested_level2 - cpu_util_server_1b_ps_2 network.incoming.packets_ps_server_1b_port_1_test_nested_level2: - test_nested_level2 - network.incoming.packets_ps_server_1b_port_1 + network.outpoing.packets_ps_server_1b_1_port_1_test_nested_level2: + - test_nested_level2 + - network.outpoing.packets_ps_server_1b_1_port_1 feature_pd_server_1b_port_0: - abstract_pd_server_1b - - feature_pd_server_1b_pd_server_1b_port + - feature_pd_server_1b_pd_server_1b_port_0 memory_server_1b_ps_1_test_nested_level2: - test_nested_level2 - memory_server_1b_ps_1 @@ -223,9 +235,6 @@ topology_template: os_server_1b_ps_1_test_nested_level2: - test_nested_level2 - os_server_1b_ps_1 - network.incoming.bytes_ps_server_1b_port_2_test_nested_level2: - - test_nested_level2 - - network.incoming.bytes_ps_server_1b_port_2 disk.root.size_server_1b_ps_1_test_nested_level2: - test_nested_level2 - disk.root.size_server_1b_ps_1 @@ -250,9 +259,6 @@ topology_template: disk.write.requests.rate_server_1b_pd_0: - abstract_pd_server_1b - disk.write.requests.rate_pd_server_1b - network.incoming.bytes.rate_ps_server_1b_port_2_test_nested_level2: - - test_nested_level2 - - network.incoming.bytes.rate_ps_server_1b_port_2 disk.latency_server_1b_ps_1_test_nested_level2: - test_nested_level2 - disk.latency_server_1b_ps_1 @@ -304,6 +310,9 @@ topology_template: disk.read.requests_server_1b_pd_0: - abstract_pd_server_1b - disk.read.requests_pd_server_1b + network.outgoing.packets.rate_ps_server_1b_1_port_1_test_nested_level2: + - test_nested_level2 + - network.outgoing.packets.rate_ps_server_1b_1_port_1 disk.device.write.bytes.rate_server_1b_pd_0: - abstract_pd_server_1b - disk.device.write.bytes.rate_pd_server_1b @@ -334,15 +343,9 @@ topology_template: disk.capacity_server_1b_ps_1_test_nested_level2: - test_nested_level2 - disk.capacity_server_1b_ps_1 - feature_ps_server_1b_port_2_test_nested_level2: - - test_nested_level2 - - feature_ps_server_1b_port_2 disk.allocation_server_1b_ps_1_test_nested_level2: - test_nested_level2 - disk.allocation_server_1b_ps_1 - network.outgoing.bytes_ps_server_1b_port_2_test_nested_level2: - - test_nested_level2 - - network.outgoing.bytes_ps_server_1b_port_2 endpoint_server_1b_ps_1_test_nested_level2: - test_nested_level2 - endpoint_server_1b_ps_1 @@ -361,9 +364,6 @@ topology_template: end_point_packet_external_network: - packet_external_network - end_point - forwarder_ps_server_1b_port_2_test_nested_level2: - - test_nested_level2 - - forwarder_ps_server_1b_port_2 disk.write.bytes_server_1b_pd_0: - abstract_pd_server_1b - disk.write.bytes_pd_server_1b @@ -382,6 +382,12 @@ topology_template: disk.device.read.requests_server_1b_ps_2_test_nested_level2: - test_nested_level2 - disk.device.read.requests_server_1b_ps_2 + binding_ps_server_1b_1_port_1_test_nested_level2: + - test_nested_level2 + - binding_ps_server_1b_1_port_1 + network.incoming.bytes_ps_server_1b_1_port_1_test_nested_level2: + - test_nested_level2 + - network.incoming.bytes_ps_server_1b_1_port_1 disk.device.write.requests.rate_server_1b_pd_0: - abstract_pd_server_1b - disk.device.write.requests.rate_pd_server_1b @@ -396,10 +402,16 @@ topology_template: - feature_template_Vlan_vmi_1_test_resourceGroup_1 network.outgoing.bytes_pd_server_1b_port_0: - abstract_pd_server_1b - - network.outgoing.bytes_pd_server_1b_pd_server_1b_port + - network.outgoing.bytes_pd_server_1b_pd_server_1b_port_0 + network.incoming.packets.rate_ps_server_1b_1_port_1_test_nested_level2: + - test_nested_level2 + - network.incoming.packets.rate_ps_server_1b_1_port_1 disk.read.requests_server_1b_ps_1_test_nested_level2: - test_nested_level2 - disk.read.requests_server_1b_ps_1 + network.outgoing.bytes_ps_server_1b_1_port_1_test_nested_level2: + - test_nested_level2 + - network.outgoing.bytes_ps_server_1b_1_port_1 memory.usage_server_1b_ps_1_test_nested_level2: - test_nested_level2 - memory.usage_server_1b_ps_1 @@ -417,7 +429,7 @@ topology_template: - memory.resident_pd_server_1b network.outgoing.packets.rate_pd_server_1b_port_0: - abstract_pd_server_1b - - network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port + - network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port_0 disk.device.read.bytes_server_1b_pd_0: - abstract_pd_server_1b - disk.device.read.bytes_pd_server_1b @@ -429,7 +441,7 @@ topology_template: - vcpus_server_1b_ps_2 attachment_pd_server_1b_port_0: - abstract_pd_server_1b - - attachment_pd_server_1b_pd_server_1b_port + - attachment_pd_server_1b_pd_server_1b_port_0 attachment_packet_ext_network_test_nested_level2: - test_nested_level2 - attachment_packet_ext_network @@ -498,13 +510,10 @@ topology_template: - disk.device.read.requests_server_1b_ps_1 network.outgoing.bytes.rate_pd_server_1b_port_0: - abstract_pd_server_1b - - network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port + - network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port_0 network.incoming.packets.rate_pd_server_1b_port_0: - abstract_pd_server_1b - - network.incoming.packets.rate_pd_server_1b_pd_server_1b_port - network.incoming.packets_ps_server_1b_port_2_test_nested_level2: - - test_nested_level2 - - network.incoming.packets_ps_server_1b_port_2 + - network.incoming.packets.rate_pd_server_1b_pd_server_1b_port_0 os_server_1b_pd_0: - abstract_pd_server_1b - os_pd_server_1b @@ -546,13 +555,10 @@ topology_template: - attachment_packet_int_network network.incoming.bytes_pd_server_1b_port_0: - abstract_pd_server_1b - - network.incoming.bytes_pd_server_1b_pd_server_1b_port + - network.incoming.bytes_pd_server_1b_pd_server_1b_port_0 disk.root.size_server_1b_pd_0: - abstract_pd_server_1b - disk.root.size_pd_server_1b - binding_ps_server_1b_port_2_test_nested_level2: - - test_nested_level2 - - binding_ps_server_1b_port_2 disk.ephemeral.size_server_1b_ps_1_test_nested_level2: - test_nested_level2 - disk.ephemeral.size_server_1b_ps_1 @@ -574,6 +580,9 @@ topology_template: disk.device.usage_server_1b_pd_0: - abstract_pd_server_1b - disk.device.usage_pd_server_1b + network.incoming.bytes.rate_ps_server_1b_1_port_1_test_nested_level2: + - test_nested_level2 + - network.incoming.bytes.rate_ps_server_1b_1_port_1 cpu_server_1b_ps_2_test_nested_level2: - test_nested_level2 - cpu_server_1b_ps_2 @@ -609,7 +618,7 @@ topology_template: - disk.write.bytes_server_1b_ps_2 binding_pd_server_1b_port_0: - abstract_pd_server_1b - - binding_pd_server_1b_pd_server_1b_port + - binding_pd_server_1b_pd_server_1b_port_0 host_server_1b_ps_2_test_nested_level2: - test_nested_level2 - host_server_1b_ps_2 @@ -619,18 +628,15 @@ topology_template: link_packet_internal_network: - packet_internal_network - link - network.incoming.packets.rate_ps_server_1b_port_2_test_nested_level2: - - test_nested_level2 - - network.incoming.packets.rate_ps_server_1b_port_2 disk.write.requests_server_1b_pd_0: - abstract_pd_server_1b - disk.write.requests_pd_server_1b - attachment_ps_server_1b_port_2_test_nested_level2: - - test_nested_level2 - - attachment_ps_server_1b_port_2 disk.device.allocation_server_1b_ps_1_test_nested_level2: - test_nested_level2 - disk.device.allocation_server_1b_ps_1 + attachment_ps_server_1b_1_port_1_test_nested_level2: + - test_nested_level2 + - attachment_ps_server_1b_1_port_1 disk.device.read.bytes.rate_server_1b_ps_2_test_nested_level2: - test_nested_level2 - disk.device.read.bytes.rate_server_1b_ps_2 @@ -640,9 +646,6 @@ topology_template: memory_server_1b_ps_2_test_nested_level2: - test_nested_level2 - memory_server_1b_ps_2 - network.outgoing.bytes.rate_ps_server_1b_port_2_test_nested_level2: - - test_nested_level2 - - network.outgoing.bytes.rate_ps_server_1b_port_2 os_server_1b_ps_2_test_nested_level2: - test_nested_level2 - os_server_1b_ps_2 @@ -672,7 +675,7 @@ topology_template: - disk.device.read.requests_pd_server_1b network.incoming.packets_pd_server_1b_port_0: - abstract_pd_server_1b - - network.incoming.packets_pd_server_1b_pd_server_1b_port + - network.incoming.packets_pd_server_1b_pd_server_1b_port_0 disk.read.bytes.rate_server_1b_pd_0: - abstract_pd_server_1b - disk.read.bytes.rate_pd_server_1b @@ -688,12 +691,9 @@ topology_template: disk.latency_server_1b_pd_0: - abstract_pd_server_1b - disk.latency_pd_server_1b - network.outpoing.packets_ps_server_1b_port_2_test_nested_level2: - - test_nested_level2 - - network.outpoing.packets_ps_server_1b_port_2 network.incoming.bytes.rate_pd_server_1b_port_0: - abstract_pd_server_1b - - network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port + - network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port_0 disk.write.requests.rate_server_1b_ps_2_test_nested_level2: - test_nested_level2 - disk.write.requests.rate_server_1b_ps_2 @@ -701,6 +701,9 @@ topology_template: - test_nested_level2 - disk.write.requests.rate_server_1b_ps_1 requirements: + dependency_ps_server_1b_1_port_1_test_nested_level2: + - test_nested_level2 + - dependency_ps_server_1b_1_port_1 dependency_server_1b_ps_2_test_nested_level2: - test_nested_level2 - dependency_server_1b_ps_2 @@ -712,13 +715,10 @@ topology_template: - dependency_ps_server_1b_port_1 dependency_pd_server_1b_port_0: - abstract_pd_server_1b - - dependency_pd_server_1b_pd_server_1b_port + - dependency_pd_server_1b_pd_server_1b_port_0 dependency_template_Vlan_vmi_1_test_resourceGroup_0: - test_resourceGroup_0 - dependency_template_Vlan_vmi_1 - dependency_ps_server_1b_port_2_test_nested_level2: - - test_nested_level2 - - dependency_ps_server_1b_port_2 dependency_test_resourceGroup_2_test_nested_level2: - test_nested_level2 - dependency_test_resourceGroup_2 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/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/complexVFCMultiLevelNestedMultiComputeScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml index f0f55f27cc..34216708d7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/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/complexVFCMultiLevelNestedMultiComputeScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml @@ -82,43 +82,43 @@ topology_template: directives: - substitutable properties: - port_ps_server_1b_port_mac_requirements: - mac_count_required: - is_required: false subinterface_nested_vlan_service_template_filter_count: - 9 - 9 - port_ps_server_1b_port_fixed_ips: - - - ip_address: - get_input: - - ps_server_1b_ips - - 0 - - - ip_address: - get_input: - - ps_server_1b_ips - - 1 - vm_flavor_name: - get_input: ps_server_1b_flavor - port_ps_server_1b_port_network: - - packet_int_network - - packet_int_network - subinterface_nested_vlan_net1: - - packet_ext_network - - packet_ext_network - port_ps_server_1b_port_ip_requirements: + port_ps_server_1b_port_1_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false + vm_flavor_name: + get_input: ps_server_1b_flavor + port_ps_server_1b_port_1_mac_requirements: + mac_count_required: + is_required: false + subinterface_nested_vlan_net1: + - packet_ext_network + - packet_ext_network vm_image_name: get_input: ps_server_1b_image - port_ps_server_1b_port_replacement_policy: + port_ps_server_1b_port_1_replacement_policy: - AUTO - AUTO + port_ps_server_1b_port_1_fixed_ips: + - - ip_address: + get_input: + - ps_server_1b_ips + - 0 + - - ip_address: + get_input: + - ps_server_1b_ips + - 1 subinterface_nested_vlan_parent_interface: - ps_server_1b_port_1 - - ps_server_1b_port_2 + - ps_server_1b_1_port_1 + port_ps_server_1b_port_1_network: + - packet_int_network + - packet_int_network compute_ps_server_1b_availability_zone: - get_input: availability_zone_0 - get_input: availability_zone_0 @@ -138,11 +138,11 @@ topology_template: - service_template_filter - index_value requirements: - - link_ps_server_1b_ps_server_1b_port: + - link_ps_server_1b_ps_server_1b_port_1: capability: tosca.capabilities.network.Linkable node: packet_int_network relationship: tosca.relationships.network.LinksTo - - subinterface_link_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: + - subinterface_link_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_1_nested_vlan: capability: tosca.capabilities.network.Linkable node: packet_ext_network relationship: tosca.relationships.network.LinksTo @@ -159,9 +159,6 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.heat.nested_pattern5_levelTwo capabilities: - binding_ps_server_1b_port_2: - - abstract_ps_server_1b - - binding_ps_server_1b_ps_server_1b_port disk.device.latency_server_1b_ps_1: - abstract_ps_server_1b - disk.device.latency_ps_server_1b @@ -185,7 +182,7 @@ topology_template: - disk.device.write.requests.rate_ps_server_1b binding_ps_server_1b_port_1: - abstract_ps_server_1b - - binding_ps_server_1b_ps_server_1b_port + - binding_ps_server_1b_ps_server_1b_port_1 disk.read.bytes_server_1b_ps_1: - abstract_ps_server_1b - disk.read.bytes_ps_server_1b @@ -198,15 +195,12 @@ topology_template: disk.root.size_server_1b_ps_1: - abstract_ps_server_1b - disk.root.size_ps_server_1b - network.incoming.bytes.rate_ps_server_1b_port_2: - - abstract_ps_server_1b - - network.incoming.bytes.rate_ps_server_1b_ps_server_1b_port disk.root.size_server_1b_ps_2: - abstract_ps_server_1b - disk.root.size_ps_server_1b network.incoming.bytes.rate_ps_server_1b_port_1: - abstract_ps_server_1b - - network.incoming.bytes.rate_ps_server_1b_ps_server_1b_port + - network.incoming.bytes.rate_ps_server_1b_ps_server_1b_port_1 disk.device.read.requests.rate_server_1b_ps_1: - abstract_ps_server_1b - disk.device.read.requests.rate_ps_server_1b @@ -216,12 +210,9 @@ topology_template: feature_test_resourceGroup_1: - test_resourceGroup_1 - feature - network.incoming.bytes_ps_server_1b_port_2: - - abstract_ps_server_1b - - network.incoming.bytes_ps_server_1b_ps_server_1b_port network.incoming.bytes_ps_server_1b_port_1: - abstract_ps_server_1b - - network.incoming.bytes_ps_server_1b_ps_server_1b_port + - network.incoming.bytes_ps_server_1b_ps_server_1b_port_1 attachment_packet_int_network: - packet_int_network - attachment @@ -263,7 +254,7 @@ topology_template: - memory_ps_server_1b network.outgoing.packets.rate_ps_server_1b_port_1: - abstract_ps_server_1b - - network.outgoing.packets.rate_ps_server_1b_ps_server_1b_port + - network.outgoing.packets.rate_ps_server_1b_ps_server_1b_port_1 disk.capacity_server_1b_ps_1: - abstract_ps_server_1b - disk.capacity_ps_server_1b @@ -275,13 +266,7 @@ topology_template: - instance_ps_server_1b forwarder_ps_server_1b_port_1: - abstract_ps_server_1b - - forwarder_ps_server_1b_ps_server_1b_port - forwarder_ps_server_1b_port_2: - - abstract_ps_server_1b - - forwarder_ps_server_1b_ps_server_1b_port - network.outgoing.packets.rate_ps_server_1b_port_2: - - abstract_ps_server_1b - - network.outgoing.packets.rate_ps_server_1b_ps_server_1b_port + - forwarder_ps_server_1b_ps_server_1b_port_1 link_packet_int_network: - packet_int_network - link @@ -294,6 +279,9 @@ topology_template: feature_template_Vlan_vmi_1_test_resourceGroup_2: - test_resourceGroup_2 - feature_template_Vlan_vmi_1 + network.outgoing.packets.rate_ps_server_1b_1_port_1: + - abstract_ps_server_1b + - network.outgoing.packets.rate_ps_server_1b_ps_server_1b_port_1 disk.device.capacity_server_1b_ps_1: - abstract_ps_server_1b - disk.device.capacity_ps_server_1b @@ -303,9 +291,9 @@ topology_template: disk.device.capacity_server_1b_ps_2: - abstract_ps_server_1b - disk.device.capacity_ps_server_1b - network.incoming.packets_ps_server_1b_port_2: + network.outgoing.bytes_ps_server_1b_1_port_1: - abstract_ps_server_1b - - network.incoming.packets_ps_server_1b_ps_server_1b_port + - network.outgoing.bytes_ps_server_1b_ps_server_1b_port_1 disk.device.iops_server_1b_ps_2: - abstract_ps_server_1b - disk.device.iops_ps_server_1b @@ -314,19 +302,22 @@ topology_template: - disk.device.iops_ps_server_1b network.incoming.packets_ps_server_1b_port_1: - abstract_ps_server_1b - - network.incoming.packets_ps_server_1b_ps_server_1b_port + - network.incoming.packets_ps_server_1b_ps_server_1b_port_1 network.outgoing.bytes.rate_ps_server_1b_port_1: - abstract_ps_server_1b - - network.outgoing.bytes.rate_ps_server_1b_ps_server_1b_port - network.outpoing.packets_ps_server_1b_port_2: - - abstract_ps_server_1b - - network.outpoing.packets_ps_server_1b_ps_server_1b_port + - network.outgoing.bytes.rate_ps_server_1b_ps_server_1b_port_1 network.outpoing.packets_ps_server_1b_port_1: - abstract_ps_server_1b - - network.outpoing.packets_ps_server_1b_ps_server_1b_port + - network.outpoing.packets_ps_server_1b_ps_server_1b_port_1 endpoint_server_1b_ps_1: - abstract_ps_server_1b - endpoint_ps_server_1b + network.incoming.packets.rate_ps_server_1b_1_port_1: + - abstract_ps_server_1b + - network.incoming.packets.rate_ps_server_1b_ps_server_1b_port_1 + network.incoming.bytes.rate_ps_server_1b_1_port_1: + - abstract_ps_server_1b + - network.incoming.bytes.rate_ps_server_1b_ps_server_1b_port_1 disk.device.allocation_server_1b_ps_1: - abstract_ps_server_1b - disk.device.allocation_ps_server_1b @@ -345,12 +336,12 @@ topology_template: host_server_1b_ps_1: - abstract_ps_server_1b - host_ps_server_1b + attachment_ps_server_1b_1_port_1: + - abstract_ps_server_1b + - attachment_ps_server_1b_ps_server_1b_port_1 feature_packet_int_network: - packet_int_network - feature - network.outgoing.bytes.rate_ps_server_1b_port_2: - - abstract_ps_server_1b - - network.outgoing.bytes.rate_ps_server_1b_ps_server_1b_port disk.write.bytes.rate_server_1b_ps_1: - abstract_ps_server_1b - disk.write.bytes.rate_ps_server_1b @@ -375,6 +366,9 @@ topology_template: scalable_server_1b_ps_1: - abstract_ps_server_1b - scalable_ps_server_1b + network.outpoing.packets_ps_server_1b_1_port_1: + - abstract_ps_server_1b + - network.outpoing.packets_ps_server_1b_ps_server_1b_port_1 scalable_server_1b_ps_2: - abstract_ps_server_1b - scalable_ps_server_1b @@ -393,9 +387,15 @@ topology_template: vcpus_server_1b_ps_1: - abstract_ps_server_1b - vcpus_ps_server_1b + network.outgoing.bytes.rate_ps_server_1b_1_port_1: + - abstract_ps_server_1b + - network.outgoing.bytes.rate_ps_server_1b_ps_server_1b_port_1 vcpus_server_1b_ps_2: - abstract_ps_server_1b - vcpus_ps_server_1b + network.incoming.bytes_ps_server_1b_1_port_1: + - abstract_ps_server_1b + - network.incoming.bytes_ps_server_1b_ps_server_1b_port_1 disk.read.bytes.rate_server_1b_ps_2: - abstract_ps_server_1b - disk.read.bytes.rate_ps_server_1b @@ -420,9 +420,6 @@ topology_template: disk.write.requests_server_1b_ps_2: - abstract_ps_server_1b - disk.write.requests_ps_server_1b - network.incoming.packets.rate_ps_server_1b_port_2: - - abstract_ps_server_1b - - network.incoming.packets.rate_ps_server_1b_ps_server_1b_port disk.latency_server_1b_ps_2: - abstract_ps_server_1b - disk.latency_ps_server_1b @@ -431,7 +428,7 @@ topology_template: - disk.latency_ps_server_1b network.incoming.packets.rate_ps_server_1b_port_1: - abstract_ps_server_1b - - network.incoming.packets.rate_ps_server_1b_ps_server_1b_port + - network.incoming.packets.rate_ps_server_1b_ps_server_1b_port_1 binding_server_1b_ps_1: - abstract_ps_server_1b - binding_ps_server_1b @@ -458,34 +455,40 @@ topology_template: - end_point attachment_ps_server_1b_port_1: - abstract_ps_server_1b - - attachment_ps_server_1b_ps_server_1b_port - attachment_ps_server_1b_port_2: - - abstract_ps_server_1b - - attachment_ps_server_1b_ps_server_1b_port + - attachment_ps_server_1b_ps_server_1b_port_1 attachment_packet_ext_network: - packet_ext_network - attachment + network.incoming.packets_ps_server_1b_1_port_1: + - abstract_ps_server_1b + - network.incoming.packets_ps_server_1b_ps_server_1b_port_1 os_server_1b_ps_2: - abstract_ps_server_1b - os_ps_server_1b os_server_1b_ps_1: - abstract_ps_server_1b - os_ps_server_1b + binding_ps_server_1b_1_port_1: + - abstract_ps_server_1b + - binding_ps_server_1b_ps_server_1b_port_1 feature_test_resourceGroup_2: - test_resourceGroup_2 - feature - network.outgoing.bytes_ps_server_1b_port_2: - - abstract_ps_server_1b - - network.outgoing.bytes_ps_server_1b_ps_server_1b_port network.outgoing.bytes_ps_server_1b_port_1: - abstract_ps_server_1b - - network.outgoing.bytes_ps_server_1b_ps_server_1b_port + - network.outgoing.bytes_ps_server_1b_ps_server_1b_port_1 + feature_ps_server_1b_1_port_1: + - abstract_ps_server_1b + - feature_ps_server_1b_ps_server_1b_port_1 disk.usage_server_1b_ps_2: - abstract_ps_server_1b - disk.usage_ps_server_1b disk.usage_server_1b_ps_1: - abstract_ps_server_1b - disk.usage_ps_server_1b + forwarder_ps_server_1b_1_port_1: + - abstract_ps_server_1b + - forwarder_ps_server_1b_ps_server_1b_port_1 disk.device.read.bytes_server_1b_ps_2: - abstract_ps_server_1b - disk.device.read.bytes_ps_server_1b @@ -503,10 +506,7 @@ topology_template: - feature feature_ps_server_1b_port_1: - abstract_ps_server_1b - - feature_ps_server_1b_ps_server_1b_port - feature_ps_server_1b_port_2: - - abstract_ps_server_1b - - feature_ps_server_1b_ps_server_1b_port + - feature_ps_server_1b_ps_server_1b_port_1 disk.device.read.bytes.rate_server_1b_ps_1: - abstract_ps_server_1b - disk.device.read.bytes.rate_ps_server_1b @@ -517,21 +517,21 @@ topology_template: dependency_test_resourceGroup_1: - test_resourceGroup_1 - dependency - dependency_ps_server_1b_port_2: - - abstract_ps_server_1b - - dependency_ps_server_1b_ps_server_1b_port dependency_test_resourceGroup_2: - test_resourceGroup_2 - dependency dependency_ps_server_1b_port_1: - abstract_ps_server_1b - - dependency_ps_server_1b_ps_server_1b_port + - dependency_ps_server_1b_ps_server_1b_port_1 dependency_packet_int_network: - packet_int_network - dependency local_storage_server_1b_ps_1: - abstract_ps_server_1b - local_storage_ps_server_1b + dependency_ps_server_1b_1_port_1: + - abstract_ps_server_1b + - dependency_ps_server_1b_ps_server_1b_port_1 dependency_packet_ext_network: - packet_ext_network - dependency @@ -549,4 +549,4 @@ topology_template: - dependency_ps_server_1b dependency_server_1b_ps_2: - abstract_ps_server_1b - - dependency_ps_server_1b \ No newline at end of file + - dependency_ps_server_1b diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml index bd9cb40b38..6cbf3dfc19 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -849,6 +849,14 @@ node_types: status: SUPPORTED entry_schema: type: float + port_pd_server_1b_port_0_subnetpoolid: + type: string + required: true + status: SUPPORTED + port_pd_server_1b_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED index_value: type: integer description: Index value of this substitution service template runtime instance @@ -857,108 +865,100 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 + port_pd_server_1b_port_0_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd_server_1b_port_0_network_role_tag: + type: string + required: true + status: SUPPORTED vm_flavor_name: type: string required: true status: SUPPORTED - port_pd_server_1b_port_vlan_requirements: + port_pd_server_1b_port_0_order: + type: integer + required: true + status: SUPPORTED + port_pd_server_1b_port_0_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: string subinterface_nested_vlan_net1: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd_server_1b_port_related_networks: + port_pd_server_1b_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd_server_1b_port_network_role_tag: - type: string - required: true - status: SUPPORTED + type: org.openecomp.datatypes.network.VlanRequirements vm_image_name: type: string required: true status: SUPPORTED - port_pd_server_1b_port_replacement_policy: + port_pd_server_1b_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd_server_1b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_pd_server_1b_port_network_role: - type: string - required: true - status: SUPPORTED + type: org.openecomp.datatypes.network.RelatedNetworksAssignments subinterface_nested_vlan_parent_interface: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd_server_1b_port_fixed_ips: + port_pd_server_1b_port_0_replacement_policy: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_pd_server_1b_port_network: - type: list + type: string + port_pd_server_1b_port_0_network_role: + type: string + required: true + status: SUPPORTED + port_pd_server_1b_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: string compute_pd_server_1b_availability_zone: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd_server_1b_port_order: - type: integer - required: true - status: SUPPORTED - port_pd_server_1b_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_pd_server_1b_port_ip_requirements: + port_pd_server_1b_port_0_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd_server_1b_port_subnetpoolid: - type: string - required: true - status: SUPPORTED + type: org.openecomp.datatypes.heat.neutron.port.FixedIps requirements: - - dependency_pd_server_1b_pd_server_1b_port_nested_vlan: + - dependency_pd_server_1b_pd_server_1b_port_0_nested_vlan: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - dependency_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: + - dependency_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_0_nested_vlan: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: + - subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_0_nested_vlan: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -978,14 +978,14 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_1b_pd_server_1b_port: + - dependency_pd_server_1b_pd_server_1b_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_1b_pd_server_1b_port: + - link_pd_server_1b_pd_server_1b_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -998,11 +998,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_1b_pd_server_1b_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED host_pd_server_1b: type: tosca.capabilities.Container valid_source_types: @@ -1022,34 +1017,31 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port: + cpu.delta_pd_server_1b: 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_pd_server_1b: + disk.device.read.requests_pd_server_1b: 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_pd_server_1b_pd_server_1b_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - network.incoming.bytes_pd_server_1b_pd_server_1b_port: + network.incoming.packets.rate_pd_server_1b_pd_server_1b_port_0: 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_pd_server_1b: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_pd_server_1b_pd_server_1b_port_0: + 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: - - 1 + - 0 - UNBOUNDED feature_pd_server_1b: type: tosca.capabilities.Node @@ -1062,14 +1054,6 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_1b_pd_server_1b_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 cpu_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1105,7 +1089,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_1b_pd_server_1b_port: + network.incoming.bytes_pd_server_1b_pd_server_1b_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1135,14 +1119,15 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.usage_pd_server_1b: + network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port_0: 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 - attachment_pd_server_1b_pd_server_1b_port: - type: tosca.capabilities.Attachment + disk.device.usage_pd_server_1b: + 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 @@ -1158,13 +1143,23 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_pd_server_1b_pd_server_1b_port_0_nested_vlan: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.ephemeral.size_pd_server_1b: 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_pd_server_1b_pd_server_1b_port: + forwarder_pd_server_1b_pd_server_1b_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes_pd_server_1b_pd_server_1b_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1181,18 +1176,19 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: - type: tosca.capabilities.Node + disk.device.write.bytes.rate_pd_server_1b: + 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_pd_server_1b: + disk.root.size_pd_server_1b: 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_pd_server_1b: + network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1204,6 +1200,11 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_pd_server_1b_pd_server_1b_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.write.bytes_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1227,15 +1228,14 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_1b_pd_server_1b_port: + instance_pd_server_1b: 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 - instance_pd_server_1b: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_0_nested_vlan: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -1250,24 +1250,24 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_1b_pd_server_1b_port: + network.outpoing.packets_pd_server_1b_pd_server_1b_port_0: 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_pd_server_1b: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_pd_server_1b_pd_server_1b_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - feature_pd_server_1b_pd_server_1b_port_nested_vlan: - type: tosca.capabilities.Node + memory.resident_pd_server_1b: + 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_pd_server_1b_pd_server_1b_port: + network.incoming.packets_pd_server_1b_pd_server_1b_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1291,19 +1291,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port: + disk.capacity_pd_server_1b: 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_pd_server_1b: + disk.usage_pd_server_1b: 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_pd_server_1b: + network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1870,4 +1870,4 @@ node_types: type: tosca.capabilities.Node occurrences: - 1 - - UNBOUNDED \ No newline at end of file + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/Nested_pd_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/Nested_pd_server_1bServiceTemplate.yaml index 17f0ff073f..92de2147d9 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/Nested_pd_server_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/Nested_pd_server_1bServiceTemplate.yaml @@ -21,6 +21,12 @@ topology_template: required: true entry_schema: type: float + port_pd_server_1b_port_0_subnetpoolid: + type: string + required: true + port_pd_server_1b_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -28,77 +34,71 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 + port_pd_server_1b_port_0_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd_server_1b_port_0_network_role_tag: + type: string + required: true vm_flavor_name: type: string required: true - port_pd_server_1b_port_vlan_requirements: + port_pd_server_1b_port_0_order: + type: integer + required: true + port_pd_server_1b_port_0_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: string subinterface_nested_vlan_net1: type: list required: true entry_schema: type: string - port_pd_server_1b_port_related_networks: + port_pd_server_1b_port_0_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd_server_1b_port_network_role_tag: - type: string - required: true + type: org.openecomp.datatypes.network.VlanRequirements vm_image_name: type: string required: true - port_pd_server_1b_port_replacement_policy: + port_pd_server_1b_port_0_related_networks: type: list required: true entry_schema: - type: string - port_pd_server_1b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_pd_server_1b_port_network_role: - type: string - required: true + type: org.openecomp.datatypes.network.RelatedNetworksAssignments subinterface_nested_vlan_parent_interface: type: list required: true entry_schema: type: string - port_pd_server_1b_port_fixed_ips: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_pd_server_1b_port_network: + port_pd_server_1b_port_0_replacement_policy: type: list required: true entry_schema: type: string + port_pd_server_1b_port_0_network_role: + type: string + required: true + port_pd_server_1b_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true compute_pd_server_1b_availability_zone: type: list required: true entry_schema: type: string - port_pd_server_1b_port_order: - type: integer - required: true - port_pd_server_1b_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_pd_server_1b_port_ip_requirements: + port_pd_server_1b_port_0_fixed_ips: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd_server_1b_port_subnetpoolid: - type: string - required: true + type: org.openecomp.datatypes.heat.neutron.port.FixedIps node_templates: - pd_server_1b_pd_server_1b_port_nested_vlan: + pd_server_1b_pd_server_1b_port_0_nested_vlan: type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested_vlan directives: - substitutable @@ -121,7 +121,7 @@ topology_template: requirements: - binding_template_Vlan_vmi_1: capability: tosca.capabilities.network.Bindable - node: pd_server_1b_pd_server_1b_port + node: pd_server_1b_pd_server_1b_port_0 relationship: tosca.relationships.network.BindsTo pd_server_1b: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server_1b @@ -138,39 +138,39 @@ topology_template: get_input: - compute_pd_server_1b_name - index_value - pd_server_1b_pd_server_1b_port: + pd_server_1b_pd_server_1b_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_pd_server_1b_port_replacement_policy + - port_pd_server_1b_port_0_replacement_policy - index_value mac_requirements: - get_input: port_pd_server_1b_port_mac_requirements + get_input: port_pd_server_1b_port_0_mac_requirements order: - get_input: port_pd_server_1b_port_order + get_input: port_pd_server_1b_port_0_order exCP_naming: - get_input: port_pd_server_1b_port_exCP_naming + get_input: port_pd_server_1b_port_0_exCP_naming vlan_requirements: - get_input: port_pd_server_1b_port_vlan_requirements + get_input: port_pd_server_1b_port_0_vlan_requirements subinterface_indicator: true ip_requirements: - get_input: port_pd_server_1b_port_ip_requirements + get_input: port_pd_server_1b_port_0_ip_requirements related_networks: - get_input: port_pd_server_1b_port_related_networks + get_input: port_pd_server_1b_port_0_related_networks network_role_tag: - get_input: port_pd_server_1b_port_network_role_tag + get_input: port_pd_server_1b_port_0_network_role_tag network_role: - get_input: port_pd_server_1b_port_network_role + get_input: port_pd_server_1b_port_0_network_role fixed_ips: get_input: - - port_pd_server_1b_port_fixed_ips + - port_pd_server_1b_port_0_fixed_ips - index_value subnetpoolid: - get_input: port_pd_server_1b_port_subnetpoolid + get_input: port_pd_server_1b_port_0_subnetpoolid network: get_input: - - port_pd_server_1b_port_network + - port_pd_server_1b_port_0_network - index_value requirements: - binding: @@ -183,9 +183,6 @@ topology_template: disk.device.read.bytes_pd_server_1b: - pd_server_1b - disk.device.read.bytes - feature_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - feature host_pd_server_1b: - pd_server_1b - host @@ -195,30 +192,24 @@ topology_template: disk.allocation_pd_server_1b: - pd_server_1b - disk.allocation - network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.incoming.bytes.rate cpu.delta_pd_server_1b: - pd_server_1b - cpu.delta - forwarder_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - forwarder - network.incoming.bytes_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.incoming.bytes disk.device.read.requests_pd_server_1b: - pd_server_1b - disk.device.read.requests + network.incoming.packets.rate_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - network.incoming.packets.rate + binding_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - binding feature_pd_server_1b: - pd_server_1b - feature disk.device.iops_pd_server_1b: - pd_server_1b - disk.device.iops - binding_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - binding cpu_pd_server_1b: - pd_server_1b - cpu @@ -237,9 +228,9 @@ topology_template: memory.usage_pd_server_1b: - pd_server_1b - memory.usage - network.outpoing.packets_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.outpoing.packets + network.incoming.bytes_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - network.incoming.bytes memory_pd_server_1b: - pd_server_1b - memory @@ -252,42 +243,51 @@ topology_template: disk.read.bytes_pd_server_1b: - pd_server_1b - disk.read.bytes + network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - network.incoming.bytes.rate disk.device.usage_pd_server_1b: - pd_server_1b - disk.device.usage - attachment_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - attachment disk.device.write.requests_pd_server_1b: - pd_server_1b - disk.device.write.requests disk.latency_pd_server_1b: - pd_server_1b - disk.latency + feature_pd_server_1b_pd_server_1b_port_0_nested_vlan: + - pd_server_1b_pd_server_1b_port_0_nested_vlan + - feature disk.ephemeral.size_pd_server_1b: - pd_server_1b - disk.ephemeral.size - network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.outgoing.bytes.rate + forwarder_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - forwarder + network.outgoing.bytes_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - network.outgoing.bytes scalable_pd_server_1b: - pd_server_1b - scalable disk.write.requests_pd_server_1b: - pd_server_1b - disk.write.requests - feature_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: - - pd_server_1b_pd_server_1b_port_nested_vlan - - feature_template_Vlan_vmi_1 disk.device.write.bytes.rate_pd_server_1b: - pd_server_1b - disk.device.write.bytes.rate disk.root.size_pd_server_1b: - pd_server_1b - disk.root.size + network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - network.outgoing.bytes.rate disk.iops_pd_server_1b: - pd_server_1b - disk.iops + feature_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - feature disk.write.bytes_pd_server_1b: - pd_server_1b - disk.write.bytes @@ -300,29 +300,29 @@ topology_template: vcpus_pd_server_1b: - pd_server_1b - vcpus - network.incoming.packets.rate_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.incoming.packets.rate instance_pd_server_1b: - pd_server_1b - instance + feature_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_0_nested_vlan: + - pd_server_1b_pd_server_1b_port_0_nested_vlan + - feature_template_Vlan_vmi_1 binding_pd_server_1b: - pd_server_1b - binding cpu_util_pd_server_1b: - pd_server_1b - cpu_util - network.outgoing.bytes_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.outgoing.bytes + network.outpoing.packets_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - network.outpoing.packets + attachment_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - attachment memory.resident_pd_server_1b: - pd_server_1b - memory.resident - feature_pd_server_1b_pd_server_1b_port_nested_vlan: - - pd_server_1b_pd_server_1b_port_nested_vlan - - feature - network.incoming.packets_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port + network.incoming.packets_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 - network.incoming.packets disk.device.write.requests.rate_pd_server_1b: - pd_server_1b @@ -333,15 +333,15 @@ topology_template: disk.read.requests_pd_server_1b: - pd_server_1b - disk.read.requests - network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.outgoing.packets.rate disk.capacity_pd_server_1b: - pd_server_1b - disk.capacity disk.usage_pd_server_1b: - pd_server_1b - disk.usage + network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - network.outgoing.packets.rate disk.write.requests.rate_pd_server_1b: - pd_server_1b - disk.write.requests.rate @@ -352,18 +352,18 @@ topology_template: local_storage_pd_server_1b: - pd_server_1b - local_storage - link_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - link - dependency_pd_server_1b_pd_server_1b_port_nested_vlan: - - pd_server_1b_pd_server_1b_port_nested_vlan + subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_0_nested_vlan: + - pd_server_1b_pd_server_1b_port_0_nested_vlan + - subinterface_link_template_Vlan_vmi_1 + dependency_pd_server_1b_pd_server_1b_port_0_nested_vlan: + - pd_server_1b_pd_server_1b_port_0_nested_vlan + - dependency + dependency_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 - dependency - dependency_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: - - pd_server_1b_pd_server_1b_port_nested_vlan + link_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - link + dependency_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_0_nested_vlan: + - pd_server_1b_pd_server_1b_port_0_nested_vlan - dependency_template_Vlan_vmi_1 - subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: - - pd_server_1b_pd_server_1b_port_nested_vlan - - subinterface_link_template_Vlan_vmi_1 - dependency_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - 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/complexVFCMultiLevelNestedScenario/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/complexVFCMultiLevelNestedScenario/out/nested_pattern5ServiceTemplate.yaml index fc9893df82..2fea17fae4 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/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/complexVFCMultiLevelNestedScenario/out/nested_pattern5ServiceTemplate.yaml @@ -113,34 +113,34 @@ topology_template: - 0 subinterface_nested_vlan_service_template_filter_count: - 9 + port_pd_server_1b_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false vm_flavor_name: get_input: pd_server_1b_flavor + port_pd_server_1b_port_0_network: + - get_input: port_net subinterface_nested_vlan_net1: - get_input: sub_inf_net vm_image_name: get_input: pd_server_1b_image - port_pd_server_1b_port_replacement_policy: + subinterface_nested_vlan_parent_interface: + - pd_server_1b_port_0 + port_pd_server_1b_port_0_replacement_policy: - AUTO - port_pd_server_1b_port_mac_requirements: + port_pd_server_1b_port_0_mac_requirements: mac_count_required: is_required: false - subinterface_nested_vlan_parent_interface: - - pd_server_1b_port_0 - port_pd_server_1b_port_fixed_ips: + compute_pd_server_1b_availability_zone: + - get_input: availability_zone_0 + port_pd_server_1b_port_0_fixed_ips: - ip_address: get_input: - pd_server_1b_ips - 0 - port_pd_server_1b_port_network: - - get_input: port_net - compute_pd_server_1b_availability_zone: - - get_input: availability_zone_0 - port_pd_server_1b_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false service_template_filter: substitute_service_template: Nested_pd_server_1bServiceTemplate.yaml count: 1 @@ -175,7 +175,7 @@ topology_template: - disk.write.bytes_server_1b_pd_1 forwarder_pd_server_1b_port_0: - abstract_pd_server_1b - - forwarder_pd_server_1b_pd_server_1b_port + - forwarder_pd_server_1b_pd_server_1b_port_0 network.outpoing.packets_pd_server_1b_port_1_test_nested_level2: - test_nested_level2 - network.outpoing.packets_pd_server_1b_port_1 @@ -187,13 +187,13 @@ topology_template: - disk.capacity_pd_server_1b network.outpoing.packets_pd_server_1b_port_0: - abstract_pd_server_1b - - network.outpoing.packets_pd_server_1b_pd_server_1b_port + - network.outpoing.packets_pd_server_1b_pd_server_1b_port_0 disk.device.read.requests.rate_server_1b_pd_1_test_nested_level2: - test_nested_level2 - disk.device.read.requests.rate_server_1b_pd_1 feature_pd_server_1b_port_0: - abstract_pd_server_1b - - feature_pd_server_1b_pd_server_1b_port + - feature_pd_server_1b_pd_server_1b_port_0 cpu_util_server_1b_pd_1_test_nested_level2: - test_nested_level2 - cpu_util_server_1b_pd_1 @@ -319,7 +319,7 @@ topology_template: - disk.usage_server_1b_pd_1 network.outgoing.bytes_pd_server_1b_port_0: - abstract_pd_server_1b - - network.outgoing.bytes_pd_server_1b_pd_server_1b_port + - network.outgoing.bytes_pd_server_1b_pd_server_1b_port_0 disk.device.write.requests_server_1b_pd_1_test_nested_level2: - test_nested_level2 - disk.device.write.requests_server_1b_pd_1 @@ -340,13 +340,13 @@ topology_template: - memory.resident_pd_server_1b network.outgoing.packets.rate_pd_server_1b_port_0: - abstract_pd_server_1b - - network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port + - network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port_0 disk.device.read.bytes_server_1b_pd_0: - abstract_pd_server_1b - disk.device.read.bytes_pd_server_1b attachment_pd_server_1b_port_0: - abstract_pd_server_1b - - attachment_pd_server_1b_pd_server_1b_port + - attachment_pd_server_1b_pd_server_1b_port_0 disk.device.write.bytes.rate_server_1b_pd_1_test_nested_level2: - test_nested_level2 - disk.device.write.bytes.rate_server_1b_pd_1 @@ -367,10 +367,10 @@ topology_template: - network.outgoing.packets.rate_pd_server_1b_port_1 network.outgoing.bytes.rate_pd_server_1b_port_0: - abstract_pd_server_1b - - network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port + - network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port_0 network.incoming.packets.rate_pd_server_1b_port_0: - abstract_pd_server_1b - - network.incoming.packets.rate_pd_server_1b_pd_server_1b_port + - network.incoming.packets.rate_pd_server_1b_pd_server_1b_port_0 os_server_1b_pd_0: - abstract_pd_server_1b - os_pd_server_1b @@ -391,7 +391,7 @@ topology_template: - host_pd_server_1b network.incoming.bytes_pd_server_1b_port_0: - abstract_pd_server_1b - - network.incoming.bytes_pd_server_1b_pd_server_1b_port + - network.incoming.bytes_pd_server_1b_pd_server_1b_port_0 disk.root.size_server_1b_pd_0: - abstract_pd_server_1b - disk.root.size_pd_server_1b @@ -424,7 +424,7 @@ topology_template: - memory.resident_server_1b_pd_1 binding_pd_server_1b_port_0: - abstract_pd_server_1b - - binding_pd_server_1b_pd_server_1b_port + - binding_pd_server_1b_pd_server_1b_port_0 disk.capacity_server_1b_pd_1_test_nested_level2: - test_nested_level2 - disk.capacity_server_1b_pd_1 @@ -460,7 +460,7 @@ topology_template: - disk.device.read.requests_pd_server_1b network.incoming.packets_pd_server_1b_port_0: - abstract_pd_server_1b - - network.incoming.packets_pd_server_1b_pd_server_1b_port + - network.incoming.packets_pd_server_1b_pd_server_1b_port_0 disk.read.bytes_server_1b_pd_1_test_nested_level2: - test_nested_level2 - disk.read.bytes_server_1b_pd_1 @@ -490,20 +490,20 @@ topology_template: - disk.latency_pd_server_1b network.incoming.bytes.rate_pd_server_1b_port_0: - abstract_pd_server_1b - - network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port + - network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port_0 disk.write.requests_server_1b_pd_1_test_nested_level2: - test_nested_level2 - disk.write.requests_server_1b_pd_1 requirements: dependency_pd_server_1b_port_0: - abstract_pd_server_1b - - dependency_pd_server_1b_pd_server_1b_port + - dependency_pd_server_1b_pd_server_1b_port_0 dependency_server_1b_pd_1_test_nested_level2: - test_nested_level2 - dependency_server_1b_pd_1 link_pd_server_1b_port_0: - abstract_pd_server_1b - - link_pd_server_1b_pd_server_1b_port + - link_pd_server_1b_pd_server_1b_port_0 subinterface_link_template_Vlan_vmi_1_test_resourceGroup_0: - test_resourceGroup_0 - subinterface_link_template_Vlan_vmi_1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/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/complexVFCMultiLevelNestedScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml index 4f11d4d3c4..e3b7cb6aa1 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/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/complexVFCMultiLevelNestedScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml @@ -382,4 +382,4 @@ topology_template: - dependency dependency_pd_server_1b_port_1: - pd_server_1b_port_1 - - dependency \ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/in/main.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/in/main.yml index 1fa93606cc..4aef865a20 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/in/main.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/in/main.yml @@ -52,7 +52,7 @@ resources: name: get_param: packet_externalmain_network_name - pd_server_1b_port_0: + pd_server_1b_1_port_1: type: OS::Neutron::Port properties: network: { get_resource: packet_internalmain_network } @@ -66,14 +66,14 @@ resources: fixed_ips: [{"ip_address": {get_param: [pd_server_1b_ips, 1]}}] replacement_policy: AUTO - pd_server_1b_port_01: + pd_server_1b_2_port_1: type: OS::Neutron::Port properties: network: {get_resource: packet_internalmain_network} fixed_ips: [{"ip_address": {get_param: [pd_server_1b_ips, 0]}}] replacement_policy: AUTO - pd_server_1b_port_11: + pd_server_1b_3_port_1: type: OS::Neutron::Port properties: network: {get_resource: packet_internalmain_network} @@ -88,7 +88,7 @@ resources: availability_zone: { get_param: availability_zone_0 } flavor: { get_param: pd_server_1b_flavor } networks: - - port: { get_resource: pd_server_1b_port_0 } + - port: { get_resource: pd_server_1b_1_port_1 } server_1b_pd_1: type: OS::Nova::Server @@ -108,7 +108,7 @@ resources: availability_zone: { get_param: availability_zone_0 } flavor: { get_param: pd_server_1b_flavor } networks: - - port: { get_resource: pd_server_1b_port_01 } + - port: { get_resource: pd_server_1b_2_port_1 } server_1b_pd_11: type: OS::Nova::Server @@ -118,7 +118,7 @@ resources: availability_zone: { get_param: availability_zone_0 } flavor: { get_param: pd_server_1b_flavor } networks: - - port: { get_resource: pd_server_1b_port_11 } + - port: { get_resource: pd_server_1b_3_port_1 } test_resourceGroup_0: type: OS::Heat::ResourceGroup @@ -127,7 +127,7 @@ resources: resource_def: type: nested_vlan.yml properties: - parent_interface: { get_resource: pd_server_1b_port_0} + parent_interface: { get_resource: pd_server_1b_1_port_1} net1: { get_resource: packet_externalmain_network} test_resourceGroup_1: @@ -147,7 +147,7 @@ resources: resource_def: type: nested_vlan.yml properties: - parent_interface: { get_resource: pd_server_1b_port_01} + parent_interface: { get_resource: pd_server_1b_2_port_1} net1: { get_resource: packet_externalmain_network} test_resourceGroup_11: @@ -157,7 +157,7 @@ resources: resource_def: type: nested_vlan.yml properties: - parent_interface: { get_resource: pd_server_1b_port_11} + parent_interface: { get_resource: pd_server_1b_3_port_1} net1: { get_resource: packet_externalmain_network} test_nested_level1: 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/in/nested_pattern5.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/in/nested_pattern5.yml index d3ca9e5cca..5dcc2d8285 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/in/nested_pattern5.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/in/nested_pattern5.yml @@ -77,7 +77,7 @@ resources: networks: - port: { get_resource: ps_server_1b_port_2 } - ps_server_1b_port_3: + ps_server_1b_1_port_2: type: OS::Neutron::Port properties: network: {get_resource: packet_int_network} @@ -92,7 +92,7 @@ resources: availability_zone: { get_param: availability_zone_0 } flavor: { get_param: ps_server_1b_flavor } networks: - - port: { get_resource: ps_server_1b_port_3 } + - port: { get_resource: ps_server_1b_1_port_2 } test_resourceGroup_2: type: OS::Heat::ResourceGroup @@ -111,7 +111,7 @@ resources: resource_def: type: nested_vlan.yml properties: - parent_interface: { get_resource: ps_server_1b_port_3} + parent_interface: { get_resource: ps_server_1b_1_port_2} net1: { get_resource: packet_ext_network} pd_server_1b_port_2: @@ -131,7 +131,7 @@ resources: networks: - port: { get_resource: pd_server_1b_port_2 } - pd_server_1b_port_3: + pd_server_1b_1_port_2: type: OS::Neutron::Port properties: network: { get_resource: packet_int_network } @@ -146,4 +146,4 @@ resources: availability_zone: { get_param: availability_zone_0 } flavor: { get_param: pd_server_1b_flavor } networks: - - port: { get_resource: pd_server_1b_port_3 } \ No newline at end of file + - port: { get_resource: pd_server_1b_1_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/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/GlobalSubstitutionTypesServiceTemplate.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/GlobalSubstitutionTypesServiceTemplate.yaml index 5a6cedc9f4..6d8d1684d9 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/GlobalSubstitutionTypesServiceTemplate.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/GlobalSubstitutionTypesServiceTemplate.yaml @@ -20,143 +20,143 @@ node_types: status: SUPPORTED entry_schema: type: float - 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 - vm_flavor_name: + port_pd_server_1b_port_1_network_role_tag: type: string required: true status: SUPPORTED - port_pd_server_1b_port_vlan_requirements: + port_pd_server_1b_port_1_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - subinterface_nested_vlan_net1: + port_pd_server_1b_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_pd_server_1b_port_1_subnetpoolid: + type: string + required: true + status: SUPPORTED + port_pd_server_1b_port_1_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd_server_1b_port_related_networks: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + 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_pd_server_1b_port_1_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd_server_1b_port_network_role_tag: - type: string + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_pd_server_1b_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - vm_image_name: + vm_flavor_name: type: string required: true status: SUPPORTED - port_pd_server_1b_port_replacement_policy: + subinterface_nested_vlan_net1: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd_server_1b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pd_server_1b_port_1_order: + type: integer required: true status: SUPPORTED - port_pd_server_1b_port_network_role: + vm_image_name: type: string required: true status: SUPPORTED - subinterface_nested_vlan_parent_interface: + port_pd_server_1b_port_1_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd_server_1b_port_fixed_ips: + subinterface_nested_vlan_parent_interface: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_pd_server_1b_port_network: + type: string + port_pd_server_1b_port_1_replacement_policy: type: list required: true status: SUPPORTED entry_schema: type: string - compute_pd_server_1b_availability_zone: + port_pd_server_1b_port_1_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd_server_1b_port_order: - type: integer - required: true - status: SUPPORTED - port_pd_server_1b_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_pd_server_1b_port_ip_requirements: + type: org.openecomp.datatypes.network.IpRequirements + compute_pd_server_1b_availability_zone: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd_server_1b_port_subnetpoolid: + type: string + port_pd_server_1b_port_1_network_role: type: string required: true status: SUPPORTED requirements: - - dependency_pd_server_1b_pd_server_1b_port_nested_vlan: + - dependency_pd_server_1b: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - dependency_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: + - local_storage_pd_server_1b: + capability: tosca.capabilities.Attachment + node: tosca.nodes.BlockStorage + relationship: tosca.relationships.AttachesTo + occurrences: + - 0 + - UNBOUNDED + - dependency_pd_server_1b_pd_server_1b_port_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: + - link_pd_server_1b_pd_server_1b_port_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_pd_server_1b: + - dependency_pd_server_1b_pd_server_1b_port_1_nested_vlan: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - local_storage_pd_server_1b: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo - occurrences: - - 0 - - UNBOUNDED - - dependency_pd_server_1b_pd_server_1b_port: + - dependency_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_1_nested_vlan: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_1b_pd_server_1b_port: + - subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_1_nested_vlan: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -169,11 +169,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_1b_pd_server_1b_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED host_pd_server_1b: type: tosca.capabilities.Container valid_source_types: @@ -193,28 +188,25 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port: + cpu.delta_pd_server_1b: 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_pd_server_1b: + network.incoming.packets.rate_pd_server_1b_pd_server_1b_port_1: 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_pd_server_1b_pd_server_1b_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - network.incoming.bytes_pd_server_1b_pd_server_1b_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_pd_server_1b_pd_server_1b_port_1: + 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: - - 1 + - 0 - UNBOUNDED disk.device.read.requests_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer @@ -233,14 +225,6 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_1b_pd_server_1b_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 cpu_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -264,6 +248,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_pd_server_1b_pd_server_1b_port_1: + 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_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -276,7 +266,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_1b_pd_server_1b_port: + network.incoming.bytes_pd_server_1b_pd_server_1b_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -306,14 +296,15 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.usage_pd_server_1b: + network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port_1: 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 - attachment_pd_server_1b_pd_server_1b_port: - type: tosca.capabilities.Attachment + disk.device.usage_pd_server_1b: + 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 @@ -335,7 +326,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port: + network.outgoing.bytes_pd_server_1b_pd_server_1b_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -352,7 +343,7 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: + feature_pd_server_1b_pd_server_1b_port_1_nested_vlan: type: tosca.capabilities.Node occurrences: - 1 @@ -363,6 +354,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port_1: + 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_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -375,6 +372,16 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pd_server_1b_pd_server_1b_port_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + feature_pd_server_1b_pd_server_1b_port_1: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.write.bytes_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -398,12 +405,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_1b_pd_server_1b_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 instance_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -415,15 +416,19 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_1_nested_vlan: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED cpu_util_pd_server_1b: 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_pd_server_1b_pd_server_1b_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_pd_server_1b_pd_server_1b_port_1: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED @@ -433,12 +438,7 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_1b_pd_server_1b_port_nested_vlan: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - network.incoming.packets_pd_server_1b_pd_server_1b_port: + network.incoming.packets_pd_server_1b_pd_server_1b_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -462,25 +462,25 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port: + disk.capacity_pd_server_1b: 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_pd_server_1b: + disk.usage_pd_server_1b: 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_pd_server_1b: + disk.write.requests.rate_pd_server_1b: 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_pd_server_1b: + network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -582,14 +582,21 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_ps_server_1b_port_2: + - dependency_pd_server_1b_1_port_2: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - dependency_ps_server_1b_1_port_2: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - dependency_ps_server_1b_port_3: + - dependency_ps_server_1b_port_2: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn @@ -673,13 +680,6 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_1b_port_3: - capability: tosca.capabilities.Node - node: tosca.nodes.Root - relationship: tosca.relationships.DependsOn - occurrences: - - 0 - - UNBOUNDED - dependency_server_1b_ps_2: capability: tosca.capabilities.Node node: tosca.nodes.Root @@ -703,14 +703,6 @@ node_types: occurrences: - 0 - UNBOUNDED - binding_ps_server_1b_port_3: - 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 disk.device.usage_server_1b_ps_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -746,11 +738,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_1b_port_3: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.capacity_server_1b_pd_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -762,23 +749,12 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_pd_server_1b_port_3: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED network.outpoing.packets_pd_server_1b_port_2: 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_pd_server_1b_port_3: - 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.iops_server_1b_pd_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -846,12 +822,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_ps_server_1b_port_3: - 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 instance_server_1b_ps_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -910,6 +880,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.packets.rate_ps_server_1b_1_port_2: + 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_server_1b_ps_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -928,25 +904,36 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_ps_server_1b_port_3: + disk.device.iops_server_1b_ps_2: 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.iops_server_1b_ps_2: + network.outgoing.bytes_pd_server_1b_1_port_2: 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_pd_server_1b_port_2: + attachment_pd_server_1b_1_port_2: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets.rate_ps_server_1b_1_port_2: + 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_ps_server_1b_1_port_2: 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_pd_server_1b_port_3: + network.outgoing.bytes_pd_server_1b_port_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -969,12 +956,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_ps_server_1b_port_3: - 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_packet_int_network: type: tosca.capabilities.Node occurrences: @@ -1016,7 +997,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_1b_port_3: + network.outpoing.packets_ps_server_1b_1_port_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1028,13 +1009,19 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes_pd_server_1b_1_port_2: + 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.allocation_server_1b_ps_3: 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_pd_server_1b_port_3: + network.incoming.bytes_ps_server_1b_1_port_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1098,31 +1085,31 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.write.requests_server_1b_ps_2: + network.outpoing.packets_pd_server_1b_1_port_2: 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_ps_server_1b_port_2: + disk.write.requests_server_1b_ps_2: 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_server_1b_pd_3: + network.incoming.packets.rate_ps_server_1b_port_2: 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_server_1b_ps_3: + disk.root.size_server_1b_pd_3: 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_ps_server_1b_port_3: + disk.latency_server_1b_ps_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1192,19 +1179,6 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_1b_port_3: - 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 - attachment_ps_server_1b_port_3: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED attachment_ps_server_1b_port_2: type: tosca.capabilities.Attachment occurrences: @@ -1279,12 +1253,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_ps_server_1b_port_3: - 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_server_1b_ps_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1434,12 +1402,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_ps_server_1b_port_3: - 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_server_1b_ps_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1488,12 +1450,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_ps_server_1b_port_3: - 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 attachment_packet_int_network: type: tosca.capabilities.Attachment occurrences: @@ -1612,11 +1568,6 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_ps_server_1b_port_3: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED feature_server_1b_pd_3: type: tosca.capabilities.Node occurrences: @@ -1671,73 +1622,91 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_ps_server_1b_port_3: + network.outgoing.bytes_ps_server_1b_1_port_2: 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_ps_server_1b_port_2: + network.outgoing.packets.rate_pd_server_1b_1_port_2: 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_server_1b_ps_2: + network.outpoing.packets_ps_server_1b_port_2: 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_server_1b_pd_3: + network.incoming.bytes.rate_pd_server_1b_1_port_2: 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_server_1b_pd_3: + disk.write.requests.rate_server_1b_ps_2: 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_server_1b_ps_3: + network.incoming.packets.rate_pd_server_1b_1_port_2: 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 - attachment_pd_server_1b_port_2: + attachment_ps_server_1b_1_port_2: type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - disk.write.bytes_server_1b_ps_3: + cpu_util_server_1b_pd_3: 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_server_1b_ps_3: + disk.device.write.bytes.rate_server_1b_pd_3: 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_server_1b_ps_2: + disk.write.requests.rate_server_1b_ps_3: 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_server_1b_ps_2: + attachment_pd_server_1b_port_2: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + disk.write.bytes_server_1b_ps_3: 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 - attachment_pd_server_1b_port_3: - type: tosca.capabilities.Attachment + disk.device.write.bytes_server_1b_ps_3: + 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_server_1b_ps_2: + 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_server_1b_ps_2: + 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 @@ -1793,11 +1762,23 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes.rate_pd_server_1b_1_port_2: + 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_server_1b_ps_2: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED + network.outgoing.bytes.rate_ps_server_1b_1_port_2: + 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_server_1b_ps_3: type: tosca.capabilities.Node occurrences: @@ -1861,24 +1842,12 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_1b_port_3: - 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_pd_server_1b_port_2: 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_pd_server_1b_port_3: - 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_server_1b_pd_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1915,28 +1884,66 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_pd_server_1b_1_port_2: + 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 + forwarder_pd_server_1b_1_port_2: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.latency_server_1b_pd_2: 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_ps_server_1b_1_port_2: + 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_server_1b_pd_3: 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_ps_server_1b_1_port_2: + 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 scalable_server_1b_pd_3: type: tosca.capabilities.Scalable occurrences: - 1 - UNBOUNDED + feature_ps_server_1b_1_port_2: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED scalable_server_1b_pd_2: type: tosca.capabilities.Scalable occurrences: - 1 - UNBOUNDED + network.incoming.packets_pd_server_1b_1_port_2: + 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_server_1b_pd_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1955,9 +1962,8 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_pd_server_1b_port_3: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_pd_server_1b_1_port_2: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -1973,25 +1979,24 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.read.bytes_server_1b_ps_2: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_ps_server_1b_1_port_2: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - disk.device.read.bytes_server_1b_ps_3: + disk.device.read.bytes_server_1b_ps_2: 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_pd_server_1b_port_2: + disk.device.read.bytes_server_1b_ps_3: 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_pd_server_1b_port_3: + network.incoming.bytes.rate_pd_server_1b_port_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2002,11 +2007,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_ps_server_1b_port_3: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED org.openecomp.resource.abstract.nodes.pd_server_1b: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: @@ -2016,6 +2016,22 @@ node_types: status: SUPPORTED entry_schema: type: string + port_pd_server_1b_port_2_fixed_ips: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_pd_server_1b_port_2_subnetpoolid: + type: string + required: true + status: SUPPORTED + port_pd_server_1b_port_2_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements index_value: type: integer description: Index value of this substitution service template runtime instance @@ -2028,76 +2044,60 @@ node_types: type: string required: true status: SUPPORTED - port_pd_server_1b_port_vlan_requirements: + port_pd_server_1b_port_2_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd_server_1b_port_related_networks: + type: org.openecomp.datatypes.network.IpRequirements + port_pd_server_1b_port_2_related_networks: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd_server_1b_port_network_role_tag: - type: string - required: true - status: SUPPORTED - vm_image_name: - type: string - required: true - status: SUPPORTED - port_pd_server_1b_port_replacement_policy: + port_pd_server_1b_port_2_replacement_policy: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd_server_1b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + vm_image_name: + type: string required: true status: SUPPORTED - port_pd_server_1b_port_network_role: + port_pd_server_1b_port_2_network_role_tag: type: string required: true status: SUPPORTED - port_pd_server_1b_port_fixed_ips: + port_pd_server_1b_port_2_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_pd_server_1b_port_network: - type: list + type: string + port_pd_server_1b_port_2_network_role: + type: string required: true status: SUPPORTED - entry_schema: - type: string - compute_pd_server_1b_availability_zone: - type: list + port_pd_server_1b_port_2_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: string - port_pd_server_1b_port_order: - type: integer + port_pd_server_1b_port_2_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_pd_server_1b_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_1b_port_2_order: + type: integer required: true status: SUPPORTED - port_pd_server_1b_port_ip_requirements: + compute_pd_server_1b_availability_zone: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd_server_1b_port_subnetpoolid: - type: string - required: true - status: SUPPORTED + type: string requirements: - dependency_pd_server_1b: capability: tosca.capabilities.Node @@ -2113,14 +2113,14 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_1b_pd_server_1b_port: + - dependency_pd_server_1b_pd_server_1b_port_2: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_1b_pd_server_1b_port: + - link_pd_server_1b_pd_server_1b_port_2: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -2133,8 +2133,9 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_1b_pd_server_1b_port: - type: tosca.capabilities.Node + network.incoming.bytes_pd_server_1b_pd_server_1b_port_2: + 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 @@ -2157,29 +2158,12 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pd_server_1b_pd_server_1b_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_pd_server_1b: 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_pd_server_1b_pd_server_1b_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - network.incoming.bytes_pd_server_1b_pd_server_1b_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.device.read.requests_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2197,7 +2181,13 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_1b_pd_server_1b_port: + cpu_pd_server_1b: + 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_pd_server_1b_pd_server_1b_port_2: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface @@ -2205,19 +2195,19 @@ node_types: occurrences: - 0 - UNBOUNDED - cpu_pd_server_1b: + disk.write.bytes.rate_pd_server_1b: 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_pd_server_1b: + disk.device.read.requests.rate_pd_server_1b: 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_pd_server_1b: + network.incoming.packets.rate_pd_server_1b_pd_server_1b_port_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2234,13 +2224,13 @@ node_types: occurrences: - 1 - UNBOUNDED - memory.usage_pd_server_1b: + network.outpoing.packets_pd_server_1b_pd_server_1b_port_2: 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_pd_server_1b_pd_server_1b_port: + memory.usage_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2276,8 +2266,9 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_1b_pd_server_1b_port: - type: tosca.capabilities.Attachment + network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port_2: + 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 @@ -2299,7 +2290,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port: + network.outgoing.bytes_pd_server_1b_pd_server_1b_port_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2328,12 +2319,28 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port_2: + 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.iops_pd_server_1b: 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_pd_server_1b_pd_server_1b_port_2: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + feature_pd_server_1b_pd_server_1b_port_2: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.write.bytes_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2357,12 +2364,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_1b_pd_server_1b_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 instance_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2380,25 +2381,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_1b_pd_server_1b_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 memory.resident_pd_server_1b: 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_pd_server_1b_pd_server_1b_port: + disk.device.write.requests.rate_pd_server_1b: 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_pd_server_1b: + network.incoming.packets_pd_server_1b_pd_server_1b_port_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2416,25 +2411,30 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port: + disk.capacity_pd_server_1b: 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_pd_server_1b: + disk.usage_pd_server_1b: 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_pd_server_1b: + attachment_pd_server_1b_pd_server_1b_port_2: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + disk.write.requests.rate_pd_server_1b: 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_pd_server_1b: + network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2443,32 +2443,28 @@ node_types: org.openecomp.resource.abstract.nodes.ps_server_1b: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_ps_server_1b_port_vlan_requirements: + port_ps_server_1b_port_2_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_ps_server_1b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - subinterface_nested_vlan_service_template_filter_count: + type: string + port_ps_server_1b_port_2_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: float - port_ps_server_1b_port_network_role_tag: - type: string + type: org.openecomp.datatypes.network.IpRequirements + port_ps_server_1b_port_2_order: + type: integer required: true status: SUPPORTED - port_ps_server_1b_port_fixed_ips: + subinterface_nested_vlan_service_template_filter_count: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps + type: float index_value: type: integer description: Index value of this substitution service template runtime instance @@ -2477,51 +2473,53 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_ps_server_1b_port_order: - type: integer + port_ps_server_1b_port_2_vlan_requirements: + type: list required: true status: SUPPORTED - vm_flavor_name: + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_ps_server_1b_port_2_network_role: type: string required: true status: SUPPORTED - port_ps_server_1b_port_related_networks: - type: list + port_ps_server_1b_port_2_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_ps_server_1b_port_network: - type: list + vm_flavor_name: + type: string required: true status: SUPPORTED - entry_schema: - type: string - port_ps_server_1b_port_exCP_naming: + port_ps_server_1b_port_2_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED + port_ps_server_1b_port_2_network_role_tag: + type: string + required: true + status: SUPPORTED subinterface_nested_vlan_net1: type: list required: true status: SUPPORTED entry_schema: type: string - port_ps_server_1b_port_ip_requirements: + port_ps_server_1b_port_2_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - vm_image_name: - type: string + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_ps_server_1b_port_2_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_ps_server_1b_port_network_role: + vm_image_name: type: string required: true status: SUPPORTED - port_ps_server_1b_port_replacement_policy: + port_ps_server_1b_port_2_replacement_policy: type: list required: true status: SUPPORTED @@ -2533,10 +2531,12 @@ node_types: status: SUPPORTED entry_schema: type: string - port_ps_server_1b_port_subnetpoolid: - type: string + port_ps_server_1b_port_2_related_networks: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments compute_ps_server_1b_availability_zone: type: list required: true @@ -2564,34 +2564,34 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_ps_server_1b_ps_server_1b_port_nested_vlan: + - dependency_ps_server_1b_ps_server_1b_port_2_nested_vlan: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - dependency_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: + - dependency_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_2_nested_vlan: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - subinterface_link_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: + - subinterface_link_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_2_nested_vlan: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_ps_server_1b_ps_server_1b_port: + - dependency_ps_server_1b_ps_server_1b_port_2: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_ps_server_1b_ps_server_1b_port: + - link_ps_server_1b_ps_server_1b_port_2: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -2622,6 +2622,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes_ps_server_1b_ps_server_1b_port_2: + 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_ps_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2633,6 +2639,11 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_2_nested_vlan: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.device.read.bytes.rate_ps_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2651,12 +2662,7 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_ps_server_1b_ps_server_1b_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - network.outgoing.packets.rate_ps_server_1b_ps_server_1b_port: + network.outgoing.packets.rate_ps_server_1b_ps_server_1b_port_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2668,11 +2674,6 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_ps_server_1b_ps_server_1b_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED instance_ps_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2697,12 +2698,23 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets_ps_server_1b_ps_server_1b_port_2: + 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_ps_server_1b: 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 + attachment_ps_server_1b_ps_server_1b_port_2: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED host_ps_server_1b: type: tosca.capabilities.Container valid_source_types: @@ -2722,11 +2734,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_ps_server_1b_ps_server_1b_port_nested_vlan: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.device.read.requests.rate_ps_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2739,7 +2746,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_ps_server_1b_ps_server_1b_port: + network.incoming.bytes_ps_server_1b_ps_server_1b_port_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2774,6 +2781,11 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_ps_server_1b_ps_server_1b_port_2_nested_vlan: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED memory.resident_ps_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2804,25 +2816,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_ps_server_1b_ps_server_1b_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_ps_server_1b_ps_server_1b_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.incoming.packets_ps_server_1b_ps_server_1b_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_ps_server_1b_ps_server_1b_port: + network.outgoing.bytes.rate_ps_server_1b_ps_server_1b_port_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2838,6 +2832,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_ps_server_1b_ps_server_1b_port_2: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.iops_ps_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2856,19 +2855,27 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_ps_server_1b_ps_server_1b_port: + memory.usage_ps_server_1b: 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_ps_server_1b: + binding_ps_server_1b_ps_server_1b_port_2: + 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 + disk.latency_ps_server_1b: 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_ps_server_1b: + network.incoming.packets.rate_ps_server_1b_ps_server_1b_port_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2879,18 +2886,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_ps_server_1b_ps_server_1b_port: + network.outpoing.packets_ps_server_1b_ps_server_1b_port_2: 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_ps_server_1b_ps_server_1b_port: - type: tosca.capabilities.Node + vcpus_ps_server_1b: + 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_ps_server_1b: + network.incoming.bytes.rate_ps_server_1b_ps_server_1b_port_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2908,15 +2916,7 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_ps_server_1b_ps_server_1b_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 - feature_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: + feature_ps_server_1b_ps_server_1b_port_2: type: tosca.capabilities.Node occurrences: - 1 @@ -2987,4 +2987,4 @@ node_types: type: tosca.capabilities.Node occurrences: - 1 - - UNBOUNDED \ No newline at end of file + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/MainServiceTemplate.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/MainServiceTemplate.yaml index fa1596322b..e6cc52a094 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/MainServiceTemplate.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/MainServiceTemplate.yaml @@ -137,29 +137,7 @@ topology_template: - 9 - 9 - 9 - vm_flavor_name: - get_input: pd_server_1b_flavor - subinterface_nested_vlan_net1: - - packet_externalmain_network - - packet_externalmain_network - - packet_externalmain_network - - packet_externalmain_network - vm_image_name: - get_input: pd_server_1b_image - port_pd_server_1b_port_replacement_policy: - - AUTO - - AUTO - - AUTO - - AUTO - port_pd_server_1b_port_mac_requirements: - mac_count_required: - is_required: false - subinterface_nested_vlan_parent_interface: - - pd_server_1b_port_0 - - pd_server_1b_port_01 - - pd_server_1b_port_11 - - pd_server_1b_port_1 - port_pd_server_1b_port_fixed_ips: + port_pd_server_1b_port_1_fixed_ips: - - ip_address: get_input: - pd_server_1b_ips @@ -176,22 +154,44 @@ topology_template: get_input: - pd_server_1b_ips - 1 - port_pd_server_1b_port_network: + port_pd_server_1b_port_1_mac_requirements: + mac_count_required: + is_required: false + vm_flavor_name: + get_input: pd_server_1b_flavor + subinterface_nested_vlan_net1: + - packet_externalmain_network + - packet_externalmain_network + - packet_externalmain_network + - packet_externalmain_network + vm_image_name: + get_input: pd_server_1b_image + port_pd_server_1b_port_1_network: - packet_internalmain_network - packet_internalmain_network - packet_internalmain_network - packet_internalmain_network - compute_pd_server_1b_availability_zone: - - get_input: availability_zone_0 - - get_input: availability_zone_0 - - get_input: availability_zone_0 - - get_input: availability_zone_0 - port_pd_server_1b_port_ip_requirements: + subinterface_nested_vlan_parent_interface: + - pd_server_1b_1_port_1 + - pd_server_1b_2_port_1 + - pd_server_1b_3_port_1 + - pd_server_1b_port_1 + port_pd_server_1b_port_1_replacement_policy: + - AUTO + - AUTO + - AUTO + - AUTO + port_pd_server_1b_port_1_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false + compute_pd_server_1b_availability_zone: + - get_input: availability_zone_0 + - get_input: availability_zone_0 + - get_input: availability_zone_0 + - get_input: availability_zone_0 service_template_filter: substitute_service_template: Nested_pd_server_1b_1ServiceTemplate.yaml count: 4 @@ -201,11 +201,11 @@ topology_template: - service_template_filter - index_value requirements: - - link_pd_server_1b_pd_server_1b_port: + - link_pd_server_1b_pd_server_1b_port_1: capability: tosca.capabilities.network.Linkable node: packet_internalmain_network relationship: tosca.relationships.network.LinksTo - - subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: + - subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_1_nested_vlan: capability: tosca.capabilities.network.Linkable node: packet_externalmain_network relationship: tosca.relationships.network.LinksTo @@ -237,4 +237,4 @@ topology_template: - packet_internalmain_network - test_nested_level1 - packet_externalmain_network - - abstract_pd_server_1b_1 \ No newline at end of file + - abstract_pd_server_1b_1 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_pd_server_1bServiceTemplate.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_pd_server_1bServiceTemplate.yaml index d0921140a5..e2354d22f7 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_pd_server_1bServiceTemplate.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_pd_server_1bServiceTemplate.yaml @@ -16,6 +16,19 @@ topology_template: required: true entry_schema: type: string + port_pd_server_1b_port_2_fixed_ips: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_pd_server_1b_port_2_subnetpoolid: + type: string + required: true + port_pd_server_1b_port_2_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements index_value: type: integer description: Index value of this substitution service template runtime instance @@ -26,62 +39,49 @@ topology_template: vm_flavor_name: type: string required: true - port_pd_server_1b_port_vlan_requirements: + port_pd_server_1b_port_2_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd_server_1b_port_related_networks: + type: org.openecomp.datatypes.network.IpRequirements + port_pd_server_1b_port_2_related_networks: type: list required: true entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd_server_1b_port_network_role_tag: - type: string - required: true - vm_image_name: - type: string - required: true - port_pd_server_1b_port_replacement_policy: + port_pd_server_1b_port_2_replacement_policy: type: list required: true entry_schema: type: string - port_pd_server_1b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_pd_server_1b_port_network_role: + vm_image_name: type: string required: true - port_pd_server_1b_port_fixed_ips: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_pd_server_1b_port_network: - type: list + port_pd_server_1b_port_2_network_role_tag: + type: string required: true - entry_schema: - type: string - compute_pd_server_1b_availability_zone: + port_pd_server_1b_port_2_network: type: list required: true entry_schema: type: string - port_pd_server_1b_port_order: - type: integer + port_pd_server_1b_port_2_network_role: + type: string required: true - port_pd_server_1b_port_exCP_naming: + port_pd_server_1b_port_2_exCP_naming: type: org.openecomp.datatypes.Naming required: true - port_pd_server_1b_port_ip_requirements: + port_pd_server_1b_port_2_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_pd_server_1b_port_2_order: + type: integer + required: true + compute_pd_server_1b_availability_zone: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd_server_1b_port_subnetpoolid: - type: string - required: true + type: string node_templates: pd_server_1b: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server_1b @@ -98,39 +98,39 @@ topology_template: get_input: - compute_pd_server_1b_name - index_value - pd_server_1b_pd_server_1b_port: + pd_server_1b_pd_server_1b_port_2: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_pd_server_1b_port_replacement_policy + - port_pd_server_1b_port_2_replacement_policy - index_value mac_requirements: - get_input: port_pd_server_1b_port_mac_requirements + get_input: port_pd_server_1b_port_2_mac_requirements order: - get_input: port_pd_server_1b_port_order + get_input: port_pd_server_1b_port_2_order exCP_naming: - get_input: port_pd_server_1b_port_exCP_naming + get_input: port_pd_server_1b_port_2_exCP_naming vlan_requirements: - get_input: port_pd_server_1b_port_vlan_requirements + get_input: port_pd_server_1b_port_2_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_pd_server_1b_port_ip_requirements + get_input: port_pd_server_1b_port_2_ip_requirements related_networks: - get_input: port_pd_server_1b_port_related_networks + get_input: port_pd_server_1b_port_2_related_networks network_role_tag: - get_input: port_pd_server_1b_port_network_role_tag + get_input: port_pd_server_1b_port_2_network_role_tag network_role: - get_input: port_pd_server_1b_port_network_role + get_input: port_pd_server_1b_port_2_network_role fixed_ips: get_input: - - port_pd_server_1b_port_fixed_ips + - port_pd_server_1b_port_2_fixed_ips - index_value subnetpoolid: - get_input: port_pd_server_1b_port_subnetpoolid + get_input: port_pd_server_1b_port_2_subnetpoolid network: get_input: - - port_pd_server_1b_port_network + - port_pd_server_1b_port_2_network - index_value requirements: - binding: @@ -143,9 +143,9 @@ topology_template: disk.device.read.bytes_pd_server_1b: - pd_server_1b - disk.device.read.bytes - feature_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - feature + network.incoming.bytes_pd_server_1b_pd_server_1b_port_2: + - pd_server_1b_pd_server_1b_port_2 + - network.incoming.bytes host_pd_server_1b: - pd_server_1b - host @@ -155,18 +155,9 @@ topology_template: disk.allocation_pd_server_1b: - pd_server_1b - disk.allocation - network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.incoming.bytes.rate cpu.delta_pd_server_1b: - pd_server_1b - cpu.delta - forwarder_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - forwarder - network.incoming.bytes_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.incoming.bytes disk.device.read.requests_pd_server_1b: - pd_server_1b - disk.device.read.requests @@ -176,30 +167,33 @@ topology_template: disk.device.iops_pd_server_1b: - pd_server_1b - disk.device.iops - binding_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - binding cpu_pd_server_1b: - pd_server_1b - cpu + binding_pd_server_1b_pd_server_1b_port_2: + - pd_server_1b_pd_server_1b_port_2 + - binding disk.write.bytes.rate_pd_server_1b: - pd_server_1b - disk.write.bytes.rate disk.device.read.requests.rate_pd_server_1b: - pd_server_1b - disk.device.read.requests.rate + network.incoming.packets.rate_pd_server_1b_pd_server_1b_port_2: + - pd_server_1b_pd_server_1b_port_2 + - network.incoming.packets.rate endpoint_pd_server_1b: - pd_server_1b - endpoint disk.device.allocation_pd_server_1b: - pd_server_1b - disk.device.allocation + network.outpoing.packets_pd_server_1b_pd_server_1b_port_2: + - pd_server_1b_pd_server_1b_port_2 + - network.outpoing.packets memory.usage_pd_server_1b: - pd_server_1b - memory.usage - network.outpoing.packets_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.outpoing.packets memory_pd_server_1b: - pd_server_1b - memory @@ -215,9 +209,9 @@ topology_template: disk.device.usage_pd_server_1b: - pd_server_1b - disk.device.usage - attachment_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - attachment + network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port_2: + - pd_server_1b_pd_server_1b_port_2 + - network.incoming.bytes.rate disk.device.write.requests_pd_server_1b: - pd_server_1b - disk.device.write.requests @@ -227,9 +221,9 @@ topology_template: disk.ephemeral.size_pd_server_1b: - pd_server_1b - disk.ephemeral.size - network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.outgoing.bytes.rate + network.outgoing.bytes_pd_server_1b_pd_server_1b_port_2: + - pd_server_1b_pd_server_1b_port_2 + - network.outgoing.bytes scalable_pd_server_1b: - pd_server_1b - scalable @@ -242,9 +236,18 @@ topology_template: disk.root.size_pd_server_1b: - pd_server_1b - disk.root.size + network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port_2: + - pd_server_1b_pd_server_1b_port_2 + - network.outgoing.bytes.rate disk.iops_pd_server_1b: - pd_server_1b - disk.iops + forwarder_pd_server_1b_pd_server_1b_port_2: + - pd_server_1b_pd_server_1b_port_2 + - forwarder + feature_pd_server_1b_pd_server_1b_port_2: + - pd_server_1b_pd_server_1b_port_2 + - feature disk.write.bytes_pd_server_1b: - pd_server_1b - disk.write.bytes @@ -257,9 +260,6 @@ topology_template: vcpus_pd_server_1b: - pd_server_1b - vcpus - network.incoming.packets.rate_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.incoming.packets.rate instance_pd_server_1b: - pd_server_1b - instance @@ -269,36 +269,36 @@ topology_template: cpu_util_pd_server_1b: - pd_server_1b - cpu_util - network.outgoing.bytes_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.outgoing.bytes memory.resident_pd_server_1b: - pd_server_1b - memory.resident - network.incoming.packets_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.incoming.packets disk.device.write.requests.rate_pd_server_1b: - pd_server_1b - disk.device.write.requests.rate + network.incoming.packets_pd_server_1b_pd_server_1b_port_2: + - pd_server_1b_pd_server_1b_port_2 + - network.incoming.packets disk.device.capacity_pd_server_1b: - pd_server_1b - disk.device.capacity disk.read.requests_pd_server_1b: - pd_server_1b - disk.read.requests - network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.outgoing.packets.rate disk.capacity_pd_server_1b: - pd_server_1b - disk.capacity disk.usage_pd_server_1b: - pd_server_1b - disk.usage + attachment_pd_server_1b_pd_server_1b_port_2: + - pd_server_1b_pd_server_1b_port_2 + - attachment disk.write.requests.rate_pd_server_1b: - pd_server_1b - disk.write.requests.rate + network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port_2: + - pd_server_1b_pd_server_1b_port_2 + - network.outgoing.packets.rate requirements: dependency_pd_server_1b: - pd_server_1b @@ -306,9 +306,9 @@ topology_template: local_storage_pd_server_1b: - pd_server_1b - local_storage - link_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port + dependency_pd_server_1b_pd_server_1b_port_2: + - pd_server_1b_pd_server_1b_port_2 + - dependency + link_pd_server_1b_pd_server_1b_port_2: + - pd_server_1b_pd_server_1b_port_2 - link - dependency_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - 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_pd_server_1b_1ServiceTemplate.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_pd_server_1b_1ServiceTemplate.yaml index 9920d7e27f..3ee9e8faad 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_pd_server_1b_1ServiceTemplate.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_pd_server_1b_1ServiceTemplate.yaml @@ -21,108 +21,83 @@ topology_template: required: true entry_schema: type: float - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - constraints: - - greater_or_equal: 0 - vm_flavor_name: + port_pd_server_1b_port_1_network_role_tag: type: string required: true - port_pd_server_1b_port_vlan_requirements: + port_pd_server_1b_port_1_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - subinterface_nested_vlan_net1: + port_pd_server_1b_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_pd_server_1b_port_1_subnetpoolid: + type: string + required: true + port_pd_server_1b_port_1_related_networks: type: list required: true entry_schema: - type: string - port_pd_server_1b_port_related_networks: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + constraints: + - greater_or_equal: 0 + port_pd_server_1b_port_1_fixed_ips: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd_server_1b_port_network_role_tag: - type: string + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_pd_server_1b_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - vm_image_name: + vm_flavor_name: type: string required: true - port_pd_server_1b_port_replacement_policy: + subinterface_nested_vlan_net1: type: list required: true entry_schema: type: string - port_pd_server_1b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pd_server_1b_port_1_order: + type: integer required: true - port_pd_server_1b_port_network_role: + vm_image_name: type: string required: true - subinterface_nested_vlan_parent_interface: + port_pd_server_1b_port_1_network: type: list required: true entry_schema: type: string - port_pd_server_1b_port_fixed_ips: + subinterface_nested_vlan_parent_interface: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_pd_server_1b_port_network: + type: string + port_pd_server_1b_port_1_replacement_policy: type: list required: true entry_schema: type: string - compute_pd_server_1b_availability_zone: + port_pd_server_1b_port_1_ip_requirements: type: list required: true entry_schema: - type: string - port_pd_server_1b_port_order: - type: integer - required: true - port_pd_server_1b_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_pd_server_1b_port_ip_requirements: + type: org.openecomp.datatypes.network.IpRequirements + compute_pd_server_1b_availability_zone: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd_server_1b_port_subnetpoolid: + type: string + port_pd_server_1b_port_1_network_role: type: string required: true node_templates: - pd_server_1b_pd_server_1b_port_nested_vlan: - type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested_vlan - directives: - - substitutable - properties: - service_template_filter: - count: - get_input: - - subinterface_nested_vlan_service_template_filter_count - - index_value - substitute_service_template: nested_vlanServiceTemplate.yaml - mandatory: true - parent_interface: - get_input: - - subinterface_nested_vlan_parent_interface - - index_value - net1: - get_input: - - subinterface_nested_vlan_net1 - - index_value - requirements: - - binding_template_Vlan_vmi_1: - capability: tosca.capabilities.network.Bindable - node: pd_server_1b_pd_server_1b_port - relationship: tosca.relationships.network.BindsTo pd_server_1b: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server_1b properties: @@ -138,54 +113,76 @@ topology_template: get_input: - compute_pd_server_1b_name - index_value - pd_server_1b_pd_server_1b_port: + pd_server_1b_pd_server_1b_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_pd_server_1b_port_replacement_policy + - port_pd_server_1b_port_1_replacement_policy - index_value mac_requirements: - get_input: port_pd_server_1b_port_mac_requirements + get_input: port_pd_server_1b_port_1_mac_requirements order: - get_input: port_pd_server_1b_port_order + get_input: port_pd_server_1b_port_1_order exCP_naming: - get_input: port_pd_server_1b_port_exCP_naming + get_input: port_pd_server_1b_port_1_exCP_naming vlan_requirements: - get_input: port_pd_server_1b_port_vlan_requirements + get_input: port_pd_server_1b_port_1_vlan_requirements subinterface_indicator: true ip_requirements: - get_input: port_pd_server_1b_port_ip_requirements + get_input: port_pd_server_1b_port_1_ip_requirements related_networks: - get_input: port_pd_server_1b_port_related_networks + get_input: port_pd_server_1b_port_1_related_networks network_role_tag: - get_input: port_pd_server_1b_port_network_role_tag + get_input: port_pd_server_1b_port_1_network_role_tag network_role: - get_input: port_pd_server_1b_port_network_role + get_input: port_pd_server_1b_port_1_network_role fixed_ips: get_input: - - port_pd_server_1b_port_fixed_ips + - port_pd_server_1b_port_1_fixed_ips - index_value subnetpoolid: - get_input: port_pd_server_1b_port_subnetpoolid + get_input: port_pd_server_1b_port_1_subnetpoolid network: get_input: - - port_pd_server_1b_port_network + - port_pd_server_1b_port_1_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: pd_server_1b relationship: tosca.relationships.network.BindsTo + pd_server_1b_pd_server_1b_port_1_nested_vlan: + type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested_vlan + directives: + - substitutable + properties: + service_template_filter: + count: + get_input: + - subinterface_nested_vlan_service_template_filter_count + - index_value + substitute_service_template: nested_vlanServiceTemplate.yaml + mandatory: true + parent_interface: + get_input: + - subinterface_nested_vlan_parent_interface + - index_value + net1: + get_input: + - subinterface_nested_vlan_net1 + - index_value + requirements: + - binding_template_Vlan_vmi_1: + capability: tosca.capabilities.network.Bindable + node: pd_server_1b_pd_server_1b_port_1 + relationship: tosca.relationships.network.BindsTo substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server_1b_1 capabilities: disk.device.read.bytes_pd_server_1b: - pd_server_1b - disk.device.read.bytes - feature_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - feature host_pd_server_1b: - pd_server_1b - host @@ -195,18 +192,15 @@ topology_template: disk.allocation_pd_server_1b: - pd_server_1b - disk.allocation - network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.incoming.bytes.rate cpu.delta_pd_server_1b: - pd_server_1b - cpu.delta - forwarder_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - forwarder - network.incoming.bytes_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.incoming.bytes + network.incoming.packets.rate_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 + - network.incoming.packets.rate + binding_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 + - binding disk.device.read.requests_pd_server_1b: - pd_server_1b - disk.device.read.requests @@ -216,9 +210,6 @@ topology_template: disk.device.iops_pd_server_1b: - pd_server_1b - disk.device.iops - binding_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - binding cpu_pd_server_1b: - pd_server_1b - cpu @@ -231,15 +222,18 @@ topology_template: endpoint_pd_server_1b: - pd_server_1b - endpoint + network.outpoing.packets_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 + - network.outpoing.packets disk.device.allocation_pd_server_1b: - pd_server_1b - disk.device.allocation memory.usage_pd_server_1b: - pd_server_1b - memory.usage - network.outpoing.packets_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.outpoing.packets + network.incoming.bytes_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 + - network.incoming.bytes memory_pd_server_1b: - pd_server_1b - memory @@ -252,12 +246,12 @@ topology_template: disk.read.bytes_pd_server_1b: - pd_server_1b - disk.read.bytes + network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 + - network.incoming.bytes.rate disk.device.usage_pd_server_1b: - pd_server_1b - disk.device.usage - attachment_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - attachment disk.device.write.requests_pd_server_1b: - pd_server_1b - disk.device.write.requests @@ -267,27 +261,36 @@ topology_template: disk.ephemeral.size_pd_server_1b: - pd_server_1b - disk.ephemeral.size - network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.outgoing.bytes.rate + network.outgoing.bytes_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 + - network.outgoing.bytes scalable_pd_server_1b: - pd_server_1b - scalable disk.write.requests_pd_server_1b: - pd_server_1b - disk.write.requests - feature_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: - - pd_server_1b_pd_server_1b_port_nested_vlan - - feature_template_Vlan_vmi_1 + feature_pd_server_1b_pd_server_1b_port_1_nested_vlan: + - pd_server_1b_pd_server_1b_port_1_nested_vlan + - feature disk.device.write.bytes.rate_pd_server_1b: - pd_server_1b - disk.device.write.bytes.rate + network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 + - network.outgoing.bytes.rate disk.root.size_pd_server_1b: - pd_server_1b - disk.root.size disk.iops_pd_server_1b: - pd_server_1b - disk.iops + forwarder_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 + - forwarder + feature_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 + - feature disk.write.bytes_pd_server_1b: - pd_server_1b - disk.write.bytes @@ -300,29 +303,26 @@ topology_template: vcpus_pd_server_1b: - pd_server_1b - vcpus - network.incoming.packets.rate_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.incoming.packets.rate instance_pd_server_1b: - pd_server_1b - instance binding_pd_server_1b: - pd_server_1b - binding + feature_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_1_nested_vlan: + - pd_server_1b_pd_server_1b_port_1_nested_vlan + - feature_template_Vlan_vmi_1 cpu_util_pd_server_1b: - pd_server_1b - cpu_util - network.outgoing.bytes_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.outgoing.bytes + attachment_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 + - attachment memory.resident_pd_server_1b: - pd_server_1b - memory.resident - feature_pd_server_1b_pd_server_1b_port_nested_vlan: - - pd_server_1b_pd_server_1b_port_nested_vlan - - feature - network.incoming.packets_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port + network.incoming.packets_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 - network.incoming.packets disk.device.write.requests.rate_pd_server_1b: - pd_server_1b @@ -333,9 +333,6 @@ topology_template: disk.read.requests_pd_server_1b: - pd_server_1b - disk.read.requests - network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.outgoing.packets.rate disk.capacity_pd_server_1b: - pd_server_1b - disk.capacity @@ -345,6 +342,9 @@ topology_template: disk.write.requests.rate_pd_server_1b: - pd_server_1b - disk.write.requests.rate + network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 + - network.outgoing.packets.rate requirements: dependency_pd_server_1b: - pd_server_1b @@ -352,18 +352,18 @@ topology_template: local_storage_pd_server_1b: - pd_server_1b - local_storage - link_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port + link_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 - link - dependency_pd_server_1b_pd_server_1b_port_nested_vlan: - - pd_server_1b_pd_server_1b_port_nested_vlan + dependency_pd_server_1b_pd_server_1b_port_1_nested_vlan: + - pd_server_1b_pd_server_1b_port_1_nested_vlan - dependency - dependency_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: - - pd_server_1b_pd_server_1b_port_nested_vlan + dependency_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_1_nested_vlan: + - pd_server_1b_pd_server_1b_port_1_nested_vlan - dependency_template_Vlan_vmi_1 - subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: - - pd_server_1b_pd_server_1b_port_nested_vlan + dependency_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 + - dependency + subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_1_nested_vlan: + - pd_server_1b_pd_server_1b_port_1_nested_vlan - subinterface_link_template_Vlan_vmi_1 - dependency_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - 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_ps_server_1bServiceTemplate.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_ps_server_1bServiceTemplate.yaml index 2cdd4ed59a..048e4146de 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_ps_server_1bServiceTemplate.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_ps_server_1bServiceTemplate.yaml @@ -11,27 +11,24 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_ps_server_1b_port_vlan_requirements: + port_ps_server_1b_port_2_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_ps_server_1b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - subinterface_nested_vlan_service_template_filter_count: + type: string + port_ps_server_1b_port_2_ip_requirements: type: list required: true entry_schema: - type: float - port_ps_server_1b_port_network_role_tag: - type: string + type: org.openecomp.datatypes.network.IpRequirements + port_ps_server_1b_port_2_order: + type: integer required: true - port_ps_server_1b_port_fixed_ips: + subinterface_nested_vlan_service_template_filter_count: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps + type: float index_value: type: integer description: Index value of this substitution service template runtime instance @@ -39,42 +36,43 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_ps_server_1b_port_order: - type: integer + port_ps_server_1b_port_2_vlan_requirements: + type: list required: true - vm_flavor_name: + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_ps_server_1b_port_2_network_role: type: string required: true - port_ps_server_1b_port_related_networks: - type: list + port_ps_server_1b_port_2_subnetpoolid: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_ps_server_1b_port_network: - type: list + vm_flavor_name: + type: string required: true - entry_schema: - type: string - port_ps_server_1b_port_exCP_naming: + port_ps_server_1b_port_2_exCP_naming: type: org.openecomp.datatypes.Naming required: true + port_ps_server_1b_port_2_network_role_tag: + type: string + required: true subinterface_nested_vlan_net1: type: list required: true entry_schema: type: string - port_ps_server_1b_port_ip_requirements: + port_ps_server_1b_port_2_fixed_ips: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - vm_image_name: - type: string + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_ps_server_1b_port_2_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_ps_server_1b_port_network_role: + vm_image_name: type: string required: true - port_ps_server_1b_port_replacement_policy: + port_ps_server_1b_port_2_replacement_policy: type: list required: true entry_schema: @@ -84,9 +82,11 @@ topology_template: required: true entry_schema: type: string - port_ps_server_1b_port_subnetpoolid: - type: string + port_ps_server_1b_port_2_related_networks: + type: list required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments compute_ps_server_1b_availability_zone: type: list required: true @@ -113,7 +113,7 @@ topology_template: get_input: - compute_ps_server_1b_name - index_value - ps_server_1b_ps_server_1b_port_nested_vlan: + ps_server_1b_ps_server_1b_port_2_nested_vlan: type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested_vlan directives: - substitutable @@ -136,41 +136,41 @@ topology_template: requirements: - binding_template_Vlan_vmi_1: capability: tosca.capabilities.network.Bindable - node: ps_server_1b_ps_server_1b_port + node: ps_server_1b_ps_server_1b_port_2 relationship: tosca.relationships.network.BindsTo - ps_server_1b_ps_server_1b_port: + ps_server_1b_ps_server_1b_port_2: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_ps_server_1b_port_replacement_policy + - port_ps_server_1b_port_2_replacement_policy - index_value mac_requirements: - get_input: port_ps_server_1b_port_mac_requirements + get_input: port_ps_server_1b_port_2_mac_requirements order: - get_input: port_ps_server_1b_port_order + get_input: port_ps_server_1b_port_2_order exCP_naming: - get_input: port_ps_server_1b_port_exCP_naming + get_input: port_ps_server_1b_port_2_exCP_naming vlan_requirements: - get_input: port_ps_server_1b_port_vlan_requirements + get_input: port_ps_server_1b_port_2_vlan_requirements subinterface_indicator: true ip_requirements: - get_input: port_ps_server_1b_port_ip_requirements + get_input: port_ps_server_1b_port_2_ip_requirements related_networks: - get_input: port_ps_server_1b_port_related_networks + get_input: port_ps_server_1b_port_2_related_networks network_role_tag: - get_input: port_ps_server_1b_port_network_role_tag + get_input: port_ps_server_1b_port_2_network_role_tag network_role: - get_input: port_ps_server_1b_port_network_role + get_input: port_ps_server_1b_port_2_network_role fixed_ips: get_input: - - port_ps_server_1b_port_fixed_ips + - port_ps_server_1b_port_2_fixed_ips - index_value subnetpoolid: - get_input: port_ps_server_1b_port_subnetpoolid + get_input: port_ps_server_1b_port_2_subnetpoolid network: get_input: - - port_ps_server_1b_port_network + - port_ps_server_1b_port_2_network - index_value requirements: - binding: @@ -192,12 +192,18 @@ topology_template: disk.device.write.requests_ps_server_1b: - ps_server_1b - disk.device.write.requests + network.outgoing.bytes_ps_server_1b_ps_server_1b_port_2: + - ps_server_1b_ps_server_1b_port_2 + - network.outgoing.bytes cpu_util_ps_server_1b: - ps_server_1b - cpu_util scalable_ps_server_1b: - ps_server_1b - scalable + feature_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_2_nested_vlan: + - ps_server_1b_ps_server_1b_port_2_nested_vlan + - feature_template_Vlan_vmi_1 disk.device.read.bytes.rate_ps_server_1b: - ps_server_1b - disk.device.read.bytes.rate @@ -207,18 +213,12 @@ topology_template: disk.device.iops_ps_server_1b: - ps_server_1b - disk.device.iops - attachment_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - attachment - network.outgoing.packets.rate_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port + network.outgoing.packets.rate_ps_server_1b_ps_server_1b_port_2: + - ps_server_1b_ps_server_1b_port_2 - network.outgoing.packets.rate disk.device.capacity_ps_server_1b: - ps_server_1b - disk.device.capacity - forwarder_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - forwarder instance_ps_server_1b: - ps_server_1b - instance @@ -231,9 +231,15 @@ topology_template: disk.read.bytes.rate_ps_server_1b: - ps_server_1b - disk.read.bytes.rate + network.incoming.packets_ps_server_1b_ps_server_1b_port_2: + - ps_server_1b_ps_server_1b_port_2 + - network.incoming.packets disk.device.read.requests_ps_server_1b: - ps_server_1b - disk.device.read.requests + attachment_ps_server_1b_ps_server_1b_port_2: + - ps_server_1b_ps_server_1b_port_2 + - attachment host_ps_server_1b: - ps_server_1b - host @@ -243,17 +249,14 @@ topology_template: disk.read.requests_ps_server_1b: - ps_server_1b - disk.read.requests - feature_ps_server_1b_ps_server_1b_port_nested_vlan: - - ps_server_1b_ps_server_1b_port_nested_vlan - - feature disk.device.read.requests.rate_ps_server_1b: - ps_server_1b - disk.device.read.requests.rate disk.capacity_ps_server_1b: - ps_server_1b - disk.capacity - network.incoming.bytes_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port + network.incoming.bytes_ps_server_1b_ps_server_1b_port_2: + - ps_server_1b_ps_server_1b_port_2 - network.incoming.bytes disk.write.requests.rate_ps_server_1b: - ps_server_1b @@ -270,6 +273,9 @@ topology_template: binding_ps_server_1b: - ps_server_1b - binding + feature_ps_server_1b_ps_server_1b_port_2_nested_vlan: + - ps_server_1b_ps_server_1b_port_2_nested_vlan + - feature memory.resident_ps_server_1b: - ps_server_1b - memory.resident @@ -285,17 +291,8 @@ topology_template: disk.read.bytes_ps_server_1b: - ps_server_1b - disk.read.bytes - network.incoming.packets.rate_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - network.incoming.packets.rate - network.outgoing.bytes_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - network.outgoing.bytes - network.incoming.packets_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - network.incoming.packets - network.outgoing.bytes.rate_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port + network.outgoing.bytes.rate_ps_server_1b_ps_server_1b_port_2: + - ps_server_1b_ps_server_1b_port_2 - network.outgoing.bytes.rate feature_ps_server_1b: - ps_server_1b @@ -303,6 +300,9 @@ topology_template: os_ps_server_1b: - ps_server_1b - os + forwarder_ps_server_1b_ps_server_1b_port_2: + - ps_server_1b_ps_server_1b_port_2 + - forwarder disk.iops_ps_server_1b: - ps_server_1b - disk.iops @@ -312,58 +312,58 @@ topology_template: disk.write.requests_ps_server_1b: - ps_server_1b - disk.write.requests - network.outpoing.packets_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - network.outpoing.packets memory.usage_ps_server_1b: - ps_server_1b - memory.usage + binding_ps_server_1b_ps_server_1b_port_2: + - ps_server_1b_ps_server_1b_port_2 + - binding disk.latency_ps_server_1b: - ps_server_1b - disk.latency + network.incoming.packets.rate_ps_server_1b_ps_server_1b_port_2: + - ps_server_1b_ps_server_1b_port_2 + - network.incoming.packets.rate endpoint_ps_server_1b: - ps_server_1b - endpoint - network.incoming.bytes.rate_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - network.incoming.bytes.rate - feature_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - feature + network.outpoing.packets_ps_server_1b_ps_server_1b_port_2: + - ps_server_1b_ps_server_1b_port_2 + - network.outpoing.packets vcpus_ps_server_1b: - ps_server_1b - vcpus + network.incoming.bytes.rate_ps_server_1b_ps_server_1b_port_2: + - ps_server_1b_ps_server_1b_port_2 + - network.incoming.bytes.rate cpu.delta_ps_server_1b: - ps_server_1b - cpu.delta disk.ephemeral.size_ps_server_1b: - ps_server_1b - disk.ephemeral.size - binding_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - binding - feature_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: - - ps_server_1b_ps_server_1b_port_nested_vlan - - feature_template_Vlan_vmi_1 + feature_ps_server_1b_ps_server_1b_port_2: + - ps_server_1b_ps_server_1b_port_2 + - feature requirements: - dependency_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: - - ps_server_1b_ps_server_1b_port_nested_vlan - - dependency_template_Vlan_vmi_1 - subinterface_link_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: - - ps_server_1b_ps_server_1b_port_nested_vlan + subinterface_link_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_2_nested_vlan: + - ps_server_1b_ps_server_1b_port_2_nested_vlan - subinterface_link_template_Vlan_vmi_1 + dependency_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_2_nested_vlan: + - ps_server_1b_ps_server_1b_port_2_nested_vlan + - dependency_template_Vlan_vmi_1 + dependency_ps_server_1b_ps_server_1b_port_2: + - ps_server_1b_ps_server_1b_port_2 + - dependency + link_ps_server_1b_ps_server_1b_port_2: + - ps_server_1b_ps_server_1b_port_2 + - link + dependency_ps_server_1b_ps_server_1b_port_2_nested_vlan: + - ps_server_1b_ps_server_1b_port_2_nested_vlan + - dependency local_storage_ps_server_1b: - ps_server_1b - local_storage - dependency_ps_server_1b_ps_server_1b_port_nested_vlan: - - ps_server_1b_ps_server_1b_port_nested_vlan - - dependency - dependency_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - dependency - link_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - link dependency_ps_server_1b: - ps_server_1b - - dependency \ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/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 873ade14f4..8a89b5699d 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 @@ -100,17 +100,7 @@ topology_template: - get_input: - pd_server_1b_names - 0 - vm_flavor_name: - get_input: pd_server_1b_flavor - vm_image_name: - get_input: pd_server_1b_image - port_pd_server_1b_port_replacement_policy: - - AUTO - - AUTO - port_pd_server_1b_port_mac_requirements: - mac_count_required: - is_required: false - port_pd_server_1b_port_fixed_ips: + port_pd_server_1b_port_2_fixed_ips: - - ip_address: get_input: - pd_server_1b_ips @@ -119,18 +109,28 @@ topology_template: get_input: - pd_server_1b_ips - 0 - port_pd_server_1b_port_network: - - packet_int_network - - packet_int_network - compute_pd_server_1b_availability_zone: - - get_input: availability_zone_0 - - get_input: availability_zone_0 - port_pd_server_1b_port_ip_requirements: + vm_flavor_name: + get_input: pd_server_1b_flavor + port_pd_server_1b_port_2_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false + port_pd_server_1b_port_2_replacement_policy: + - AUTO + - AUTO + vm_image_name: + get_input: pd_server_1b_image + port_pd_server_1b_port_2_network: + - packet_int_network + - packet_int_network + port_pd_server_1b_port_2_mac_requirements: + mac_count_required: + is_required: false + compute_pd_server_1b_availability_zone: + - get_input: availability_zone_0 + - get_input: availability_zone_0 service_template_filter: substitute_service_template: Nested_pd_server_1bServiceTemplate.yaml count: 2 @@ -140,7 +140,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_pd_server_1b_pd_server_1b_port: + - link_pd_server_1b_pd_server_1b_port_2: capability: tosca.capabilities.network.Linkable node: packet_int_network relationship: tosca.relationships.network.LinksTo @@ -159,13 +159,24 @@ topology_template: directives: - substitutable properties: - port_ps_server_1b_port_mac_requirements: - mac_count_required: + port_ps_server_1b_port_2_network: + - packet_int_network + - packet_int_network + port_ps_server_1b_port_2_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: is_required: false subinterface_nested_vlan_service_template_filter_count: - 9 - 9 - port_ps_server_1b_port_fixed_ips: + vm_flavor_name: + get_input: ps_server_1b_flavor + subinterface_nested_vlan_net1: + - packet_ext_network + - packet_ext_network + port_ps_server_1b_port_2_fixed_ips: - - ip_address: get_input: - ps_server_1b_ips @@ -174,27 +185,16 @@ topology_template: get_input: - ps_server_1b_ips - 0 - vm_flavor_name: - get_input: ps_server_1b_flavor - port_ps_server_1b_port_network: - - packet_int_network - - packet_int_network - subinterface_nested_vlan_net1: - - packet_ext_network - - packet_ext_network - port_ps_server_1b_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: + port_ps_server_1b_port_2_mac_requirements: + mac_count_required: is_required: false vm_image_name: get_input: ps_server_1b_image - port_ps_server_1b_port_replacement_policy: + port_ps_server_1b_port_2_replacement_policy: - AUTO - AUTO subinterface_nested_vlan_parent_interface: - - ps_server_1b_port_3 + - ps_server_1b_1_port_2 - ps_server_1b_port_2 compute_ps_server_1b_availability_zone: - get_input: availability_zone_0 @@ -215,11 +215,11 @@ topology_template: - service_template_filter - index_value requirements: - - link_ps_server_1b_ps_server_1b_port: + - link_ps_server_1b_ps_server_1b_port_2: capability: tosca.capabilities.network.Linkable node: packet_int_network relationship: tosca.relationships.network.LinksTo - - subinterface_link_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: + - subinterface_link_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_2_nested_vlan: capability: tosca.capabilities.network.Linkable node: packet_ext_network relationship: tosca.relationships.network.LinksTo @@ -239,10 +239,7 @@ topology_template: capabilities: binding_ps_server_1b_port_2: - abstract_ps_server_1b - - binding_ps_server_1b_ps_server_1b_port - binding_ps_server_1b_port_3: - - abstract_ps_server_1b - - binding_ps_server_1b_ps_server_1b_port + - binding_ps_server_1b_ps_server_1b_port_2 disk.device.usage_server_1b_ps_2: - abstract_ps_server_1b - disk.device.usage_ps_server_1b @@ -257,28 +254,19 @@ topology_template: - disk.device.write.requests.rate_ps_server_1b feature_pd_server_1b_port_2: - abstract_pd_server_1b - - feature_pd_server_1b_pd_server_1b_port + - feature_pd_server_1b_pd_server_1b_port_2 disk.capacity_server_1b_pd_3: - abstract_pd_server_1b - disk.capacity_pd_server_1b - feature_pd_server_1b_port_3: - - abstract_pd_server_1b - - feature_pd_server_1b_pd_server_1b_port disk.capacity_server_1b_pd_2: - abstract_pd_server_1b - disk.capacity_pd_server_1b forwarder_pd_server_1b_port_2: - abstract_pd_server_1b - - forwarder_pd_server_1b_pd_server_1b_port - forwarder_pd_server_1b_port_3: - - abstract_pd_server_1b - - forwarder_pd_server_1b_pd_server_1b_port + - forwarder_pd_server_1b_pd_server_1b_port_2 network.outpoing.packets_pd_server_1b_port_2: - abstract_pd_server_1b - - network.outpoing.packets_pd_server_1b_pd_server_1b_port - network.outpoing.packets_pd_server_1b_port_3: - - abstract_pd_server_1b - - network.outpoing.packets_pd_server_1b_pd_server_1b_port + - network.outpoing.packets_pd_server_1b_pd_server_1b_port_2 disk.device.iops_server_1b_pd_3: - abstract_pd_server_1b - disk.device.iops_pd_server_1b @@ -312,15 +300,12 @@ topology_template: memory_server_1b_ps_2: - abstract_ps_server_1b - memory_ps_server_1b - network.outgoing.packets.rate_ps_server_1b_port_3: - - abstract_ps_server_1b - - network.outgoing.packets.rate_ps_server_1b_ps_server_1b_port instance_server_1b_ps_3: - abstract_ps_server_1b - instance_ps_server_1b network.outgoing.packets.rate_ps_server_1b_port_2: - abstract_ps_server_1b - - network.outgoing.packets.rate_ps_server_1b_ps_server_1b_port + - network.outgoing.packets.rate_ps_server_1b_ps_server_1b_port_2 instance_server_1b_ps_2: - abstract_ps_server_1b - instance_ps_server_1b @@ -345,6 +330,9 @@ topology_template: disk.device.iops_server_1b_ps_3: - abstract_ps_server_1b - disk.device.iops_ps_server_1b + network.outgoing.packets.rate_ps_server_1b_1_port_2: + - abstract_ps_server_1b + - network.outgoing.packets.rate_ps_server_1b_ps_server_1b_port_2 disk.device.capacity_server_1b_ps_2: - abstract_ps_server_1b - disk.device.capacity_ps_server_1b @@ -353,19 +341,25 @@ topology_template: - disk.device.capacity_ps_server_1b network.incoming.packets_ps_server_1b_port_2: - abstract_ps_server_1b - - network.incoming.packets_ps_server_1b_ps_server_1b_port - network.incoming.packets_ps_server_1b_port_3: - - abstract_ps_server_1b - - network.incoming.packets_ps_server_1b_ps_server_1b_port + - network.incoming.packets_ps_server_1b_ps_server_1b_port_2 disk.device.iops_server_1b_ps_2: - abstract_ps_server_1b - disk.device.iops_ps_server_1b - network.outgoing.bytes_pd_server_1b_port_2: + network.outgoing.bytes_pd_server_1b_1_port_2: - abstract_pd_server_1b - - network.outgoing.bytes_pd_server_1b_pd_server_1b_port - network.outgoing.bytes_pd_server_1b_port_3: + - network.outgoing.bytes_pd_server_1b_pd_server_1b_port_2 + attachment_pd_server_1b_1_port_2: + - abstract_pd_server_1b + - attachment_pd_server_1b_pd_server_1b_port_2 + network.incoming.packets.rate_ps_server_1b_1_port_2: + - abstract_ps_server_1b + - network.incoming.packets.rate_ps_server_1b_ps_server_1b_port_2 + network.incoming.bytes.rate_ps_server_1b_1_port_2: + - abstract_ps_server_1b + - network.incoming.bytes.rate_ps_server_1b_ps_server_1b_port_2 + network.outgoing.bytes_pd_server_1b_port_2: - abstract_pd_server_1b - - network.outgoing.bytes_pd_server_1b_pd_server_1b_port + - network.outgoing.bytes_pd_server_1b_pd_server_1b_port_2 endpoint_server_1b_ps_3: - abstract_ps_server_1b - endpoint_ps_server_1b @@ -375,18 +369,15 @@ topology_template: host_server_1b_ps_2: - abstract_ps_server_1b - host_ps_server_1b - network.outgoing.bytes.rate_ps_server_1b_port_3: - - abstract_ps_server_1b - - network.outgoing.bytes.rate_ps_server_1b_ps_server_1b_port feature_packet_int_network: - packet_int_network - feature network.outgoing.bytes.rate_ps_server_1b_port_2: - abstract_ps_server_1b - - network.outgoing.bytes.rate_ps_server_1b_ps_server_1b_port + - network.outgoing.bytes.rate_ps_server_1b_ps_server_1b_port_2 network.outgoing.packets.rate_pd_server_1b_port_2: - abstract_pd_server_1b - - network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port + - network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port_2 memory.resident_server_1b_pd_2: - abstract_pd_server_1b - memory.resident_pd_server_1b @@ -399,18 +390,21 @@ topology_template: disk.device.allocation_server_1b_ps_2: - abstract_ps_server_1b - disk.device.allocation_ps_server_1b - network.outgoing.packets.rate_pd_server_1b_port_3: - - abstract_pd_server_1b - - network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port + network.outpoing.packets_ps_server_1b_1_port_2: + - abstract_ps_server_1b + - network.outpoing.packets_ps_server_1b_ps_server_1b_port_2 disk.allocation_server_1b_ps_2: - abstract_ps_server_1b - disk.allocation_ps_server_1b + network.incoming.bytes_pd_server_1b_1_port_2: + - abstract_pd_server_1b + - network.incoming.bytes_pd_server_1b_pd_server_1b_port_2 disk.allocation_server_1b_ps_3: - abstract_ps_server_1b - disk.allocation_ps_server_1b - network.outgoing.bytes.rate_pd_server_1b_port_3: - - abstract_pd_server_1b - - network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port + network.incoming.bytes_ps_server_1b_1_port_2: + - abstract_ps_server_1b + - network.incoming.bytes_ps_server_1b_ps_server_1b_port_2 vcpus_server_1b_ps_2: - abstract_ps_server_1b - vcpus_ps_server_1b @@ -419,7 +413,7 @@ topology_template: - vcpus_ps_server_1b network.outgoing.bytes.rate_pd_server_1b_port_2: - abstract_pd_server_1b - - network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port + - network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port_2 disk.write.requests_server_1b_ps_3: - abstract_ps_server_1b - disk.write.requests_ps_server_1b @@ -441,21 +435,21 @@ topology_template: os_server_1b_pd_2: - abstract_pd_server_1b - os_pd_server_1b + network.outpoing.packets_pd_server_1b_1_port_2: + - abstract_pd_server_1b + - network.outpoing.packets_pd_server_1b_pd_server_1b_port_2 disk.write.requests_server_1b_ps_2: - abstract_ps_server_1b - disk.write.requests_ps_server_1b network.incoming.packets.rate_ps_server_1b_port_2: - abstract_ps_server_1b - - network.incoming.packets.rate_ps_server_1b_ps_server_1b_port + - network.incoming.packets.rate_ps_server_1b_ps_server_1b_port_2 disk.root.size_server_1b_pd_3: - abstract_pd_server_1b - disk.root.size_pd_server_1b disk.latency_server_1b_ps_3: - abstract_ps_server_1b - disk.latency_ps_server_1b - network.incoming.packets.rate_ps_server_1b_port_3: - - abstract_ps_server_1b - - network.incoming.packets.rate_ps_server_1b_ps_server_1b_port disk.root.size_server_1b_pd_2: - abstract_pd_server_1b - disk.root.size_pd_server_1b @@ -489,15 +483,9 @@ topology_template: end_point_packet_int_network: - packet_int_network - end_point - binding_pd_server_1b_port_3: - - abstract_pd_server_1b - - binding_pd_server_1b_pd_server_1b_port - attachment_ps_server_1b_port_3: - - abstract_ps_server_1b - - attachment_ps_server_1b_ps_server_1b_port attachment_ps_server_1b_port_2: - abstract_ps_server_1b - - attachment_ps_server_1b_ps_server_1b_port + - attachment_ps_server_1b_ps_server_1b_port_2 cpu_server_1b_ps_3: - abstract_ps_server_1b - cpu_ps_server_1b @@ -506,7 +494,7 @@ topology_template: - attachment binding_pd_server_1b_port_2: - abstract_pd_server_1b - - binding_pd_server_1b_pd_server_1b_port + - binding_pd_server_1b_pd_server_1b_port_2 disk.allocation_server_1b_pd_3: - abstract_pd_server_1b - disk.allocation_pd_server_1b @@ -533,10 +521,7 @@ topology_template: - feature network.outgoing.bytes_ps_server_1b_port_2: - abstract_ps_server_1b - - network.outgoing.bytes_ps_server_1b_ps_server_1b_port - network.outgoing.bytes_ps_server_1b_port_3: - - abstract_ps_server_1b - - network.outgoing.bytes_ps_server_1b_ps_server_1b_port + - network.outgoing.bytes_ps_server_1b_ps_server_1b_port_2 disk.usage_server_1b_ps_3: - abstract_ps_server_1b - disk.usage_ps_server_1b @@ -611,10 +596,7 @@ topology_template: - disk.root.size_ps_server_1b network.incoming.bytes.rate_ps_server_1b_port_2: - abstract_ps_server_1b - - network.incoming.bytes.rate_ps_server_1b_ps_server_1b_port - network.incoming.bytes.rate_ps_server_1b_port_3: - - abstract_ps_server_1b - - network.incoming.bytes.rate_ps_server_1b_ps_server_1b_port + - network.incoming.bytes.rate_ps_server_1b_ps_server_1b_port_2 disk.root.size_server_1b_ps_2: - abstract_ps_server_1b - disk.root.size_ps_server_1b @@ -638,10 +620,7 @@ topology_template: - disk.write.requests.rate_pd_server_1b network.incoming.bytes_ps_server_1b_port_2: - abstract_ps_server_1b - - network.incoming.bytes_ps_server_1b_ps_server_1b_port - network.incoming.bytes_ps_server_1b_port_3: - - abstract_ps_server_1b - - network.incoming.bytes_ps_server_1b_ps_server_1b_port + - network.incoming.bytes_ps_server_1b_ps_server_1b_port_2 attachment_packet_int_network: - packet_int_network - attachment @@ -701,10 +680,7 @@ topology_template: - cpu_util_pd_server_1b forwarder_ps_server_1b_port_2: - abstract_ps_server_1b - - forwarder_ps_server_1b_ps_server_1b_port - forwarder_ps_server_1b_port_3: - - abstract_ps_server_1b - - forwarder_ps_server_1b_ps_server_1b_port + - forwarder_ps_server_1b_ps_server_1b_port_2 feature_server_1b_pd_3: - abstract_pd_server_1b - feature_pd_server_1b @@ -735,15 +711,27 @@ topology_template: end_point_packet_ext_network: - packet_ext_network - end_point - network.outpoing.packets_ps_server_1b_port_3: + network.outgoing.bytes_ps_server_1b_1_port_2: - abstract_ps_server_1b - - network.outpoing.packets_ps_server_1b_ps_server_1b_port + - network.outgoing.bytes_ps_server_1b_ps_server_1b_port_2 + network.outgoing.packets.rate_pd_server_1b_1_port_2: + - abstract_pd_server_1b + - network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port_2 network.outpoing.packets_ps_server_1b_port_2: - abstract_ps_server_1b - - network.outpoing.packets_ps_server_1b_ps_server_1b_port + - network.outpoing.packets_ps_server_1b_ps_server_1b_port_2 + network.incoming.bytes.rate_pd_server_1b_1_port_2: + - abstract_pd_server_1b + - network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port_2 disk.write.requests.rate_server_1b_ps_2: - abstract_ps_server_1b - disk.write.requests.rate_ps_server_1b + network.incoming.packets.rate_pd_server_1b_1_port_2: + - abstract_pd_server_1b + - network.incoming.packets.rate_pd_server_1b_pd_server_1b_port_2 + attachment_ps_server_1b_1_port_2: + - abstract_ps_server_1b + - attachment_ps_server_1b_ps_server_1b_port_2 cpu_util_server_1b_pd_3: - abstract_pd_server_1b - cpu_util_pd_server_1b @@ -755,7 +743,7 @@ topology_template: - disk.write.requests.rate_ps_server_1b attachment_pd_server_1b_port_2: - abstract_pd_server_1b - - attachment_pd_server_1b_pd_server_1b_port + - attachment_pd_server_1b_pd_server_1b_port_2 disk.write.bytes_server_1b_ps_3: - abstract_ps_server_1b - disk.write.bytes_ps_server_1b @@ -768,9 +756,6 @@ topology_template: disk.device.write.bytes_server_1b_ps_2: - abstract_ps_server_1b - disk.device.write.bytes_ps_server_1b - attachment_pd_server_1b_port_3: - - abstract_pd_server_1b - - attachment_pd_server_1b_pd_server_1b_port disk.device.read.bytes_server_1b_pd_3: - abstract_pd_server_1b - disk.device.read.bytes_pd_server_1b @@ -798,9 +783,15 @@ topology_template: disk.device.capacity_server_1b_pd_3: - abstract_pd_server_1b - disk.device.capacity_pd_server_1b + network.outgoing.bytes.rate_pd_server_1b_1_port_2: + - abstract_pd_server_1b + - network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port_2 feature_server_1b_ps_2: - abstract_ps_server_1b - feature_ps_server_1b + network.outgoing.bytes.rate_ps_server_1b_1_port_2: + - abstract_ps_server_1b + - network.outgoing.bytes.rate_ps_server_1b_ps_server_1b_port_2 feature_server_1b_ps_3: - abstract_ps_server_1b - feature_ps_server_1b @@ -824,7 +815,7 @@ topology_template: - disk.read.bytes_pd_server_1b network.incoming.packets.rate_pd_server_1b_port_2: - abstract_pd_server_1b - - network.incoming.packets.rate_pd_server_1b_pd_server_1b_port + - network.incoming.packets.rate_pd_server_1b_pd_server_1b_port_2 disk.iops_server_1b_ps_2: - abstract_ps_server_1b - disk.iops_ps_server_1b @@ -834,15 +825,9 @@ topology_template: endpoint_server_1b_pd_2: - abstract_pd_server_1b - endpoint_pd_server_1b - network.incoming.packets.rate_pd_server_1b_port_3: - - abstract_pd_server_1b - - network.incoming.packets.rate_pd_server_1b_pd_server_1b_port network.incoming.bytes_pd_server_1b_port_2: - abstract_pd_server_1b - - network.incoming.bytes_pd_server_1b_pd_server_1b_port - network.incoming.bytes_pd_server_1b_port_3: - - abstract_pd_server_1b - - network.incoming.bytes_pd_server_1b_pd_server_1b_port + - network.incoming.bytes_pd_server_1b_pd_server_1b_port_2 memory_server_1b_pd_2: - abstract_pd_server_1b - memory_pd_server_1b @@ -861,18 +846,36 @@ topology_template: disk.device.usage_server_1b_pd_3: - abstract_pd_server_1b - disk.device.usage_pd_server_1b + binding_pd_server_1b_1_port_2: + - abstract_pd_server_1b + - binding_pd_server_1b_pd_server_1b_port_2 + forwarder_pd_server_1b_1_port_2: + - abstract_pd_server_1b + - forwarder_pd_server_1b_pd_server_1b_port_2 disk.device.latency_server_1b_pd_2: - abstract_pd_server_1b - disk.device.latency_pd_server_1b + network.incoming.packets_ps_server_1b_1_port_2: + - abstract_ps_server_1b + - network.incoming.packets_ps_server_1b_ps_server_1b_port_2 disk.device.latency_server_1b_pd_3: - abstract_pd_server_1b - disk.device.latency_pd_server_1b + binding_ps_server_1b_1_port_2: + - abstract_ps_server_1b + - binding_ps_server_1b_ps_server_1b_port_2 scalable_server_1b_pd_3: - abstract_pd_server_1b - scalable_pd_server_1b + feature_ps_server_1b_1_port_2: + - abstract_ps_server_1b + - feature_ps_server_1b_ps_server_1b_port_2 scalable_server_1b_pd_2: - abstract_pd_server_1b - scalable_pd_server_1b + network.incoming.packets_pd_server_1b_1_port_2: + - abstract_pd_server_1b + - network.incoming.packets_pd_server_1b_pd_server_1b_port_2 cpu.delta_server_1b_pd_2: - abstract_pd_server_1b - cpu.delta_pd_server_1b @@ -882,15 +885,18 @@ topology_template: disk.device.read.requests_server_1b_pd_2: - abstract_pd_server_1b - disk.device.read.requests_pd_server_1b - network.incoming.packets_pd_server_1b_port_3: + feature_pd_server_1b_1_port_2: - abstract_pd_server_1b - - network.incoming.packets_pd_server_1b_pd_server_1b_port + - feature_pd_server_1b_pd_server_1b_port_2 network.incoming.packets_pd_server_1b_port_2: - abstract_pd_server_1b - - network.incoming.packets_pd_server_1b_pd_server_1b_port + - network.incoming.packets_pd_server_1b_pd_server_1b_port_2 disk.device.read.requests_server_1b_pd_3: - abstract_pd_server_1b - disk.device.read.requests_pd_server_1b + forwarder_ps_server_1b_1_port_2: + - abstract_ps_server_1b + - forwarder_ps_server_1b_ps_server_1b_port_2 disk.device.read.bytes_server_1b_ps_2: - abstract_ps_server_1b - disk.device.read.bytes_ps_server_1b @@ -899,16 +905,10 @@ topology_template: - disk.device.read.bytes_ps_server_1b network.incoming.bytes.rate_pd_server_1b_port_2: - abstract_pd_server_1b - - network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port - network.incoming.bytes.rate_pd_server_1b_port_3: - - abstract_pd_server_1b - - network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port + - network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port_2 feature_ps_server_1b_port_2: - abstract_ps_server_1b - - feature_ps_server_1b_ps_server_1b_port - feature_ps_server_1b_port_3: - - abstract_ps_server_1b - - feature_ps_server_1b_ps_server_1b_port + - feature_ps_server_1b_ps_server_1b_port_2 requirements: dependency_template_Vlan_vmi_1_test_resourceGroup_2: - test_resourceGroup_2 @@ -922,9 +922,6 @@ topology_template: local_storage_server_1b_pd_2: - abstract_pd_server_1b - local_storage_pd_server_1b - dependency_pd_server_1b_port_3: - - abstract_pd_server_1b - - dependency_pd_server_1b_pd_server_1b_port dependency_server_1b_ps_2: - abstract_ps_server_1b - dependency_ps_server_1b @@ -933,16 +930,16 @@ topology_template: - dependency_ps_server_1b dependency_pd_server_1b_port_2: - abstract_pd_server_1b - - dependency_pd_server_1b_pd_server_1b_port + - dependency_pd_server_1b_pd_server_1b_port_2 dependency_ps_server_1b_port_2: - abstract_ps_server_1b - - dependency_ps_server_1b_ps_server_1b_port + - dependency_ps_server_1b_ps_server_1b_port_2 dependency_test_resourceGroup_2: - test_resourceGroup_2 - dependency - dependency_ps_server_1b_port_3: + dependency_ps_server_1b_1_port_2: - abstract_ps_server_1b - - dependency_ps_server_1b_ps_server_1b_port + - dependency_ps_server_1b_ps_server_1b_port_2 dependency_packet_int_network: - packet_int_network - dependency @@ -952,6 +949,9 @@ topology_template: dependency_test_resourceGroup_3: - test_resourceGroup_3 - dependency + dependency_pd_server_1b_1_port_2: + - abstract_pd_server_1b + - dependency_pd_server_1b_pd_server_1b_port_2 local_storage_server_1b_ps_2: - abstract_ps_server_1b - local_storage_ps_server_1b @@ -963,4 +963,4 @@ topology_template: - dependency_pd_server_1b dependency_server_1b_pd_3: - abstract_pd_server_1b - - dependency_pd_server_1b \ No newline at end of file + - dependency_pd_server_1b diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/in/nested_pattern5.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/in/nested_pattern5.yml index 8998579aef..e4b250261f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/in/nested_pattern5.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/in/nested_pattern5.yml @@ -50,7 +50,7 @@ parameters: type: string resources: - pd_server_1b_port_0: + pd_server_1b_1_port_1: type: OS::Neutron::Port properties: network: {get_resource: packet_internal_network} @@ -72,7 +72,7 @@ resources: availability_zone: { get_param: availability_zone_0 } flavor: { get_param: pd_server_1b_flavor } networks: - - port: { get_resource: pd_server_1b_port_0 } + - port: { get_resource: pd_server_1b_1_port_1 } server_1b_pd_1: type: OS::Nova::Server @@ -103,7 +103,7 @@ resources: resource_def: type: nested_vlan.yml properties: - parent_interface: { get_resource: pd_server_1b_port_0} + parent_interface: { get_resource: pd_server_1b_1_port_1} net1: { get_resource: packet_external_network} test_resourceGroup_1: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml index eba8068126..e53e4ad2c3 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -121,28 +121,28 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_1b_port_0: + - dependency_packet_external_network: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - dependency_packet_external_network: + - dependency_test_resourceGroup_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - dependency_test_resourceGroup_0: + - dependency_template_Vlan_vmi_1_test_resourceGroup_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - dependency_template_Vlan_vmi_1_test_resourceGroup_0: + - dependency_pd_server_1b_1_port_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn @@ -190,11 +190,6 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_pd_server_1b_port_0: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED disk.capacity_server_1b_pd_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -212,23 +207,12 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_1b_port_0: - 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_pd_server_1b_port_1: 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_pd_server_1b_port_0: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED feature_pd_server_1b_port_1: type: tosca.capabilities.Node occurrences: @@ -452,18 +436,41 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_1b_port_0: + network.outgoing.bytes_pd_server_1b_1_port_1: + 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.packets.rate_pd_server_1b_1_port_1: 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 + attachment_pd_server_1b_1_port_1: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED network.outgoing.bytes_pd_server_1b_port_1: 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_pd_server_1b_1_port_1: + 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_pd_server_1b_1_port_1: + 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 link_packet_external_network: type: tosca.capabilities.network.Linkable occurrences: @@ -486,12 +493,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_1b_port_0: - 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_server_1b_pd_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -510,18 +511,19 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_1b_port_0: - type: tosca.capabilities.Attachment + disk.ephemeral.size_server_1b_pd_0: + 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.ephemeral.size_server_1b_pd_0: + disk.ephemeral.size_server_1b_pd_1: 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.ephemeral.size_server_1b_pd_1: + network.incoming.bytes_pd_server_1b_1_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -537,43 +539,37 @@ node_types: occurrences: - 1 - UNBOUNDED - instance_server_1b_pd_0: + network.outgoing.bytes.rate_pd_server_1b_1_port_1: 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_server_1b_pd_0: - 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 - instance_server_1b_pd_1: + instance_server_1b_pd_0: 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_server_1b_pd_1: + disk.device.capacity_server_1b_pd_0: 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_pd_server_1b_port_1: + instance_server_1b_pd_1: 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_pd_server_1b_port_0: + disk.device.capacity_server_1b_pd_1: 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_pd_server_1b_port_0: + network.outgoing.bytes.rate_pd_server_1b_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -600,6 +596,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_pd_server_1b_1_port_1: + 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_pd_server_1b_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -637,12 +639,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_1b_port_0: - 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_server_1b_pd_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -696,19 +692,24 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_pd_server_1b_1_port_1: + 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 disk.allocation_server_1b_pd_0: 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_pd_server_1b_port_0: - 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 + forwarder_pd_server_1b_1_port_1: + type: org.openecomp.capabilities.Forwarder occurrences: - - 0 + - 1 - UNBOUNDED disk.device.latency_server_1b_pd_1: type: org.openecomp.capabilities.metric.Ceilometer @@ -769,6 +770,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets_pd_server_1b_1_port_1: + 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_server_1b_pd_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -793,19 +800,18 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_pd_server_1b_port_1: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_pd_server_1b_1_port_1: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - vcpus_server_1b_pd_1: + network.incoming.packets_pd_server_1b_port_1: 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_pd_server_1b_port_0: + vcpus_server_1b_pd_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -858,12 +864,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pd_server_1b_port_0: - 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.pd_server_1b: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: @@ -879,143 +879,143 @@ node_types: status: SUPPORTED entry_schema: type: float - 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 - vm_flavor_name: + port_pd_server_1b_port_1_network_role_tag: type: string required: true status: SUPPORTED - port_pd_server_1b_port_vlan_requirements: + port_pd_server_1b_port_1_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - subinterface_nested_vlan_net1: + port_pd_server_1b_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_pd_server_1b_port_1_subnetpoolid: + type: string + required: true + status: SUPPORTED + port_pd_server_1b_port_1_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd_server_1b_port_related_networks: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + 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_pd_server_1b_port_1_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd_server_1b_port_network_role_tag: - type: string + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_pd_server_1b_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - vm_image_name: + vm_flavor_name: type: string required: true status: SUPPORTED - port_pd_server_1b_port_replacement_policy: + subinterface_nested_vlan_net1: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd_server_1b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pd_server_1b_port_1_order: + type: integer required: true status: SUPPORTED - port_pd_server_1b_port_network_role: + vm_image_name: type: string required: true status: SUPPORTED - subinterface_nested_vlan_parent_interface: + port_pd_server_1b_port_1_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd_server_1b_port_fixed_ips: + subinterface_nested_vlan_parent_interface: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_pd_server_1b_port_network: + type: string + port_pd_server_1b_port_1_replacement_policy: type: list required: true status: SUPPORTED entry_schema: type: string - compute_pd_server_1b_availability_zone: + port_pd_server_1b_port_1_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd_server_1b_port_order: - type: integer - required: true - status: SUPPORTED - port_pd_server_1b_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_pd_server_1b_port_ip_requirements: + type: org.openecomp.datatypes.network.IpRequirements + compute_pd_server_1b_availability_zone: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd_server_1b_port_subnetpoolid: + type: string + port_pd_server_1b_port_1_network_role: type: string required: true status: SUPPORTED requirements: - - dependency_pd_server_1b_pd_server_1b_port_nested_vlan: + - dependency_pd_server_1b: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - dependency_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: + - local_storage_pd_server_1b: + capability: tosca.capabilities.Attachment + node: tosca.nodes.BlockStorage + relationship: tosca.relationships.AttachesTo + occurrences: + - 0 + - UNBOUNDED + - dependency_pd_server_1b_pd_server_1b_port_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: + - link_pd_server_1b_pd_server_1b_port_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_pd_server_1b: + - dependency_pd_server_1b_pd_server_1b_port_1_nested_vlan: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - local_storage_pd_server_1b: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo - occurrences: - - 0 - - UNBOUNDED - - dependency_pd_server_1b_pd_server_1b_port: + - dependency_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_1_nested_vlan: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_1b_pd_server_1b_port: + - subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_1_nested_vlan: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -1028,11 +1028,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_1b_pd_server_1b_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED host_pd_server_1b: type: tosca.capabilities.Container valid_source_types: @@ -1052,28 +1047,25 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port: + cpu.delta_pd_server_1b: 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_pd_server_1b: + network.incoming.packets.rate_pd_server_1b_pd_server_1b_port_1: 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_pd_server_1b_pd_server_1b_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - network.incoming.bytes_pd_server_1b_pd_server_1b_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_pd_server_1b_pd_server_1b_port_1: + 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: - - 1 + - 0 - UNBOUNDED disk.device.read.requests_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer @@ -1092,14 +1084,6 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_1b_pd_server_1b_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 cpu_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1123,6 +1107,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_pd_server_1b_pd_server_1b_port_1: + 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_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1135,7 +1125,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_1b_pd_server_1b_port: + network.incoming.bytes_pd_server_1b_pd_server_1b_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1165,14 +1155,15 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.usage_pd_server_1b: + network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port_1: 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 - attachment_pd_server_1b_pd_server_1b_port: - type: tosca.capabilities.Attachment + disk.device.usage_pd_server_1b: + 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 @@ -1194,7 +1185,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port: + network.outgoing.bytes_pd_server_1b_pd_server_1b_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1211,7 +1202,7 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: + feature_pd_server_1b_pd_server_1b_port_1_nested_vlan: type: tosca.capabilities.Node occurrences: - 1 @@ -1222,6 +1213,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port_1: + 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_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1234,6 +1231,16 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pd_server_1b_pd_server_1b_port_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + feature_pd_server_1b_pd_server_1b_port_1: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.write.bytes_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1257,12 +1264,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_1b_pd_server_1b_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 instance_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1274,15 +1275,19 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_1_nested_vlan: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED cpu_util_pd_server_1b: 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_pd_server_1b_pd_server_1b_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_pd_server_1b_pd_server_1b_port_1: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED @@ -1292,12 +1297,7 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_1b_pd_server_1b_port_nested_vlan: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - network.incoming.packets_pd_server_1b_pd_server_1b_port: + network.incoming.packets_pd_server_1b_pd_server_1b_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1321,25 +1321,25 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port: + disk.capacity_pd_server_1b: 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_pd_server_1b: + disk.usage_pd_server_1b: 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_pd_server_1b: + disk.write.requests.rate_pd_server_1b: 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_pd_server_1b: + network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1411,4 +1411,4 @@ node_types: type: tosca.capabilities.Node occurrences: - 1 - - UNBOUNDED \ No newline at end of file + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/Nested_pd_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/Nested_pd_server_1bServiceTemplate.yaml index 17f0ff073f..c0531975e0 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/Nested_pd_server_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/Nested_pd_server_1bServiceTemplate.yaml @@ -21,108 +21,83 @@ topology_template: required: true entry_schema: type: float - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - constraints: - - greater_or_equal: 0 - vm_flavor_name: + port_pd_server_1b_port_1_network_role_tag: type: string required: true - port_pd_server_1b_port_vlan_requirements: + port_pd_server_1b_port_1_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - subinterface_nested_vlan_net1: + port_pd_server_1b_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_pd_server_1b_port_1_subnetpoolid: + type: string + required: true + port_pd_server_1b_port_1_related_networks: type: list required: true entry_schema: - type: string - port_pd_server_1b_port_related_networks: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + constraints: + - greater_or_equal: 0 + port_pd_server_1b_port_1_fixed_ips: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd_server_1b_port_network_role_tag: - type: string + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_pd_server_1b_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - vm_image_name: + vm_flavor_name: type: string required: true - port_pd_server_1b_port_replacement_policy: + subinterface_nested_vlan_net1: type: list required: true entry_schema: type: string - port_pd_server_1b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pd_server_1b_port_1_order: + type: integer required: true - port_pd_server_1b_port_network_role: + vm_image_name: type: string required: true - subinterface_nested_vlan_parent_interface: + port_pd_server_1b_port_1_network: type: list required: true entry_schema: type: string - port_pd_server_1b_port_fixed_ips: + subinterface_nested_vlan_parent_interface: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_pd_server_1b_port_network: + type: string + port_pd_server_1b_port_1_replacement_policy: type: list required: true entry_schema: type: string - compute_pd_server_1b_availability_zone: + port_pd_server_1b_port_1_ip_requirements: type: list required: true entry_schema: - type: string - port_pd_server_1b_port_order: - type: integer - required: true - port_pd_server_1b_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_pd_server_1b_port_ip_requirements: + type: org.openecomp.datatypes.network.IpRequirements + compute_pd_server_1b_availability_zone: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd_server_1b_port_subnetpoolid: + type: string + port_pd_server_1b_port_1_network_role: type: string required: true node_templates: - pd_server_1b_pd_server_1b_port_nested_vlan: - type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested_vlan - directives: - - substitutable - properties: - service_template_filter: - count: - get_input: - - subinterface_nested_vlan_service_template_filter_count - - index_value - substitute_service_template: nested_vlanServiceTemplate.yaml - mandatory: true - parent_interface: - get_input: - - subinterface_nested_vlan_parent_interface - - index_value - net1: - get_input: - - subinterface_nested_vlan_net1 - - index_value - requirements: - - binding_template_Vlan_vmi_1: - capability: tosca.capabilities.network.Bindable - node: pd_server_1b_pd_server_1b_port - relationship: tosca.relationships.network.BindsTo pd_server_1b: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server_1b properties: @@ -138,54 +113,76 @@ topology_template: get_input: - compute_pd_server_1b_name - index_value - pd_server_1b_pd_server_1b_port: + pd_server_1b_pd_server_1b_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_pd_server_1b_port_replacement_policy + - port_pd_server_1b_port_1_replacement_policy - index_value mac_requirements: - get_input: port_pd_server_1b_port_mac_requirements + get_input: port_pd_server_1b_port_1_mac_requirements order: - get_input: port_pd_server_1b_port_order + get_input: port_pd_server_1b_port_1_order exCP_naming: - get_input: port_pd_server_1b_port_exCP_naming + get_input: port_pd_server_1b_port_1_exCP_naming vlan_requirements: - get_input: port_pd_server_1b_port_vlan_requirements + get_input: port_pd_server_1b_port_1_vlan_requirements subinterface_indicator: true ip_requirements: - get_input: port_pd_server_1b_port_ip_requirements + get_input: port_pd_server_1b_port_1_ip_requirements related_networks: - get_input: port_pd_server_1b_port_related_networks + get_input: port_pd_server_1b_port_1_related_networks network_role_tag: - get_input: port_pd_server_1b_port_network_role_tag + get_input: port_pd_server_1b_port_1_network_role_tag network_role: - get_input: port_pd_server_1b_port_network_role + get_input: port_pd_server_1b_port_1_network_role fixed_ips: get_input: - - port_pd_server_1b_port_fixed_ips + - port_pd_server_1b_port_1_fixed_ips - index_value subnetpoolid: - get_input: port_pd_server_1b_port_subnetpoolid + get_input: port_pd_server_1b_port_1_subnetpoolid network: get_input: - - port_pd_server_1b_port_network + - port_pd_server_1b_port_1_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: pd_server_1b relationship: tosca.relationships.network.BindsTo + pd_server_1b_pd_server_1b_port_1_nested_vlan: + type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested_vlan + directives: + - substitutable + properties: + service_template_filter: + count: + get_input: + - subinterface_nested_vlan_service_template_filter_count + - index_value + substitute_service_template: nested_vlanServiceTemplate.yaml + mandatory: true + parent_interface: + get_input: + - subinterface_nested_vlan_parent_interface + - index_value + net1: + get_input: + - subinterface_nested_vlan_net1 + - index_value + requirements: + - binding_template_Vlan_vmi_1: + capability: tosca.capabilities.network.Bindable + node: pd_server_1b_pd_server_1b_port_1 + relationship: tosca.relationships.network.BindsTo substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server_1b capabilities: disk.device.read.bytes_pd_server_1b: - pd_server_1b - disk.device.read.bytes - feature_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - feature host_pd_server_1b: - pd_server_1b - host @@ -195,18 +192,15 @@ topology_template: disk.allocation_pd_server_1b: - pd_server_1b - disk.allocation - network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.incoming.bytes.rate cpu.delta_pd_server_1b: - pd_server_1b - cpu.delta - forwarder_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - forwarder - network.incoming.bytes_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.incoming.bytes + network.incoming.packets.rate_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 + - network.incoming.packets.rate + binding_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 + - binding disk.device.read.requests_pd_server_1b: - pd_server_1b - disk.device.read.requests @@ -216,9 +210,6 @@ topology_template: disk.device.iops_pd_server_1b: - pd_server_1b - disk.device.iops - binding_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - binding cpu_pd_server_1b: - pd_server_1b - cpu @@ -231,15 +222,18 @@ topology_template: endpoint_pd_server_1b: - pd_server_1b - endpoint + network.outpoing.packets_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 + - network.outpoing.packets disk.device.allocation_pd_server_1b: - pd_server_1b - disk.device.allocation memory.usage_pd_server_1b: - pd_server_1b - memory.usage - network.outpoing.packets_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.outpoing.packets + network.incoming.bytes_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 + - network.incoming.bytes memory_pd_server_1b: - pd_server_1b - memory @@ -252,12 +246,12 @@ topology_template: disk.read.bytes_pd_server_1b: - pd_server_1b - disk.read.bytes + network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 + - network.incoming.bytes.rate disk.device.usage_pd_server_1b: - pd_server_1b - disk.device.usage - attachment_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - attachment disk.device.write.requests_pd_server_1b: - pd_server_1b - disk.device.write.requests @@ -267,27 +261,36 @@ topology_template: disk.ephemeral.size_pd_server_1b: - pd_server_1b - disk.ephemeral.size - network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.outgoing.bytes.rate + network.outgoing.bytes_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 + - network.outgoing.bytes scalable_pd_server_1b: - pd_server_1b - scalable disk.write.requests_pd_server_1b: - pd_server_1b - disk.write.requests - feature_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: - - pd_server_1b_pd_server_1b_port_nested_vlan - - feature_template_Vlan_vmi_1 + feature_pd_server_1b_pd_server_1b_port_1_nested_vlan: + - pd_server_1b_pd_server_1b_port_1_nested_vlan + - feature disk.device.write.bytes.rate_pd_server_1b: - pd_server_1b - disk.device.write.bytes.rate + network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 + - network.outgoing.bytes.rate disk.root.size_pd_server_1b: - pd_server_1b - disk.root.size disk.iops_pd_server_1b: - pd_server_1b - disk.iops + forwarder_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 + - forwarder + feature_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 + - feature disk.write.bytes_pd_server_1b: - pd_server_1b - disk.write.bytes @@ -300,29 +303,26 @@ topology_template: vcpus_pd_server_1b: - pd_server_1b - vcpus - network.incoming.packets.rate_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.incoming.packets.rate instance_pd_server_1b: - pd_server_1b - instance binding_pd_server_1b: - pd_server_1b - binding + feature_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_1_nested_vlan: + - pd_server_1b_pd_server_1b_port_1_nested_vlan + - feature_template_Vlan_vmi_1 cpu_util_pd_server_1b: - pd_server_1b - cpu_util - network.outgoing.bytes_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.outgoing.bytes + attachment_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 + - attachment memory.resident_pd_server_1b: - pd_server_1b - memory.resident - feature_pd_server_1b_pd_server_1b_port_nested_vlan: - - pd_server_1b_pd_server_1b_port_nested_vlan - - feature - network.incoming.packets_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port + network.incoming.packets_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 - network.incoming.packets disk.device.write.requests.rate_pd_server_1b: - pd_server_1b @@ -333,9 +333,6 @@ topology_template: disk.read.requests_pd_server_1b: - pd_server_1b - disk.read.requests - network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.outgoing.packets.rate disk.capacity_pd_server_1b: - pd_server_1b - disk.capacity @@ -345,6 +342,9 @@ topology_template: disk.write.requests.rate_pd_server_1b: - pd_server_1b - disk.write.requests.rate + network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 + - network.outgoing.packets.rate requirements: dependency_pd_server_1b: - pd_server_1b @@ -352,18 +352,18 @@ topology_template: local_storage_pd_server_1b: - pd_server_1b - local_storage - link_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port + link_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 - link - dependency_pd_server_1b_pd_server_1b_port_nested_vlan: - - pd_server_1b_pd_server_1b_port_nested_vlan + dependency_pd_server_1b_pd_server_1b_port_1_nested_vlan: + - pd_server_1b_pd_server_1b_port_1_nested_vlan - dependency - dependency_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: - - pd_server_1b_pd_server_1b_port_nested_vlan + dependency_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_1_nested_vlan: + - pd_server_1b_pd_server_1b_port_1_nested_vlan - dependency_template_Vlan_vmi_1 - subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: - - pd_server_1b_pd_server_1b_port_nested_vlan + dependency_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 + - dependency + subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_1_nested_vlan: + - pd_server_1b_pd_server_1b_port_1_nested_vlan - subinterface_link_template_Vlan_vmi_1 - dependency_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - 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/complexVFCScalingScenario/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/complexVFCScalingScenario/out/nested_pattern5ServiceTemplate.yaml index b822c5efa3..1eac7cb338 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/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/complexVFCScalingScenario/out/nested_pattern5ServiceTemplate.yaml @@ -119,23 +119,7 @@ topology_template: subinterface_nested_vlan_service_template_filter_count: - 9 - 9 - vm_flavor_name: - get_input: pd_server_1b_flavor - subinterface_nested_vlan_net1: - - packet_external_network - - packet_external_network - vm_image_name: - get_input: pd_server_1b_image - port_pd_server_1b_port_replacement_policy: - - AUTO - - AUTO - port_pd_server_1b_port_mac_requirements: - mac_count_required: - is_required: false - subinterface_nested_vlan_parent_interface: - - pd_server_1b_port_0 - - pd_server_1b_port_1 - port_pd_server_1b_port_fixed_ips: + port_pd_server_1b_port_1_fixed_ips: - - ip_address: get_input: - pd_server_1b_ips @@ -144,18 +128,34 @@ topology_template: get_input: - pd_server_1b_ips - 0 - port_pd_server_1b_port_network: + port_pd_server_1b_port_1_mac_requirements: + mac_count_required: + is_required: false + vm_flavor_name: + get_input: pd_server_1b_flavor + subinterface_nested_vlan_net1: + - packet_external_network + - packet_external_network + vm_image_name: + get_input: pd_server_1b_image + port_pd_server_1b_port_1_network: - packet_internal_network - packet_internal_network - compute_pd_server_1b_availability_zone: - - get_input: availability_zone_0 - - get_input: availability_zone_0 - port_pd_server_1b_port_ip_requirements: + subinterface_nested_vlan_parent_interface: + - pd_server_1b_1_port_1 + - pd_server_1b_port_1 + port_pd_server_1b_port_1_replacement_policy: + - AUTO + - AUTO + port_pd_server_1b_port_1_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false + compute_pd_server_1b_availability_zone: + - get_input: availability_zone_0 + - get_input: availability_zone_0 service_template_filter: substitute_service_template: Nested_pd_server_1bServiceTemplate.yaml count: 2 @@ -165,11 +165,11 @@ topology_template: - service_template_filter - index_value requirements: - - link_pd_server_1b_pd_server_1b_port: + - link_pd_server_1b_pd_server_1b_port_1: capability: tosca.capabilities.network.Linkable node: packet_internal_network relationship: tosca.relationships.network.LinksTo - - subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: + - subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_1_nested_vlan: capability: tosca.capabilities.network.Linkable node: packet_external_network relationship: tosca.relationships.network.LinksTo @@ -192,30 +192,21 @@ topology_template: disk.device.write.requests_server_1b_pd_1: - abstract_pd_server_1b - disk.device.write.requests_pd_server_1b - forwarder_pd_server_1b_port_0: - - abstract_pd_server_1b - - forwarder_pd_server_1b_pd_server_1b_port disk.capacity_server_1b_pd_1: - abstract_pd_server_1b - disk.capacity_pd_server_1b forwarder_pd_server_1b_port_1: - abstract_pd_server_1b - - forwarder_pd_server_1b_pd_server_1b_port + - forwarder_pd_server_1b_pd_server_1b_port_1 disk.capacity_server_1b_pd_0: - abstract_pd_server_1b - disk.capacity_pd_server_1b - network.outpoing.packets_pd_server_1b_port_0: - - abstract_pd_server_1b - - network.outpoing.packets_pd_server_1b_pd_server_1b_port network.outpoing.packets_pd_server_1b_port_1: - abstract_pd_server_1b - - network.outpoing.packets_pd_server_1b_pd_server_1b_port - feature_pd_server_1b_port_0: - - abstract_pd_server_1b - - feature_pd_server_1b_pd_server_1b_port + - network.outpoing.packets_pd_server_1b_pd_server_1b_port_1 feature_pd_server_1b_port_1: - abstract_pd_server_1b - - feature_pd_server_1b_pd_server_1b_port + - feature_pd_server_1b_pd_server_1b_port_1 attachment_packet_internal_network: - packet_internal_network - attachment @@ -330,12 +321,24 @@ topology_template: binding_server_1b_pd_1: - abstract_pd_server_1b - binding_pd_server_1b - network.outgoing.bytes_pd_server_1b_port_0: + network.outgoing.bytes_pd_server_1b_1_port_1: - abstract_pd_server_1b - - network.outgoing.bytes_pd_server_1b_pd_server_1b_port + - network.outgoing.bytes_pd_server_1b_pd_server_1b_port_1 + network.outgoing.packets.rate_pd_server_1b_1_port_1: + - abstract_pd_server_1b + - network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port_1 + attachment_pd_server_1b_1_port_1: + - abstract_pd_server_1b + - attachment_pd_server_1b_pd_server_1b_port_1 network.outgoing.bytes_pd_server_1b_port_1: - abstract_pd_server_1b - - network.outgoing.bytes_pd_server_1b_pd_server_1b_port + - network.outgoing.bytes_pd_server_1b_pd_server_1b_port_1 + network.incoming.packets.rate_pd_server_1b_1_port_1: + - abstract_pd_server_1b + - network.incoming.packets.rate_pd_server_1b_pd_server_1b_port_1 + network.incoming.bytes.rate_pd_server_1b_1_port_1: + - abstract_pd_server_1b + - network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port_1 link_packet_external_network: - packet_external_network - link @@ -344,13 +347,10 @@ topology_template: - memory.resident_pd_server_1b attachment_pd_server_1b_port_1: - abstract_pd_server_1b - - attachment_pd_server_1b_pd_server_1b_port + - attachment_pd_server_1b_pd_server_1b_port_1 network.outgoing.packets.rate_pd_server_1b_port_1: - abstract_pd_server_1b - - network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port - network.outgoing.packets.rate_pd_server_1b_port_0: - - abstract_pd_server_1b - - network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port + - network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port_1 memory.resident_server_1b_pd_1: - abstract_pd_server_1b - memory.resident_pd_server_1b @@ -360,21 +360,24 @@ topology_template: disk.device.read.bytes_server_1b_pd_0: - abstract_pd_server_1b - disk.device.read.bytes_pd_server_1b - attachment_pd_server_1b_port_0: - - abstract_pd_server_1b - - attachment_pd_server_1b_pd_server_1b_port disk.ephemeral.size_server_1b_pd_0: - abstract_pd_server_1b - disk.ephemeral.size_pd_server_1b disk.ephemeral.size_server_1b_pd_1: - abstract_pd_server_1b - disk.ephemeral.size_pd_server_1b + network.incoming.bytes_pd_server_1b_1_port_1: + - abstract_pd_server_1b + - network.incoming.bytes_pd_server_1b_pd_server_1b_port_1 end_point_packet_internal_network: - packet_internal_network - end_point feature_packet_internal_network: - packet_internal_network - feature + network.outgoing.bytes.rate_pd_server_1b_1_port_1: + - abstract_pd_server_1b + - network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port_1 instance_server_1b_pd_0: - abstract_pd_server_1b - instance_pd_server_1b @@ -389,13 +392,7 @@ topology_template: - disk.device.capacity_pd_server_1b network.outgoing.bytes.rate_pd_server_1b_port_1: - abstract_pd_server_1b - - network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port - network.outgoing.bytes.rate_pd_server_1b_port_0: - - abstract_pd_server_1b - - network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port - network.incoming.packets.rate_pd_server_1b_port_0: - - abstract_pd_server_1b - - network.incoming.packets.rate_pd_server_1b_pd_server_1b_port + - network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port_1 os_server_1b_pd_1: - abstract_pd_server_1b - os_pd_server_1b @@ -408,9 +405,12 @@ topology_template: disk.read.bytes_server_1b_pd_0: - abstract_pd_server_1b - disk.read.bytes_pd_server_1b + network.outpoing.packets_pd_server_1b_1_port_1: + - abstract_pd_server_1b + - network.outpoing.packets_pd_server_1b_pd_server_1b_port_1 network.incoming.packets.rate_pd_server_1b_port_1: - abstract_pd_server_1b - - network.incoming.packets.rate_pd_server_1b_pd_server_1b_port + - network.incoming.packets.rate_pd_server_1b_pd_server_1b_port_1 disk.read.bytes_server_1b_pd_1: - abstract_pd_server_1b - disk.read.bytes_pd_server_1b @@ -419,16 +419,13 @@ topology_template: - endpoint_pd_server_1b network.incoming.bytes_pd_server_1b_port_1: - abstract_pd_server_1b - - network.incoming.bytes_pd_server_1b_pd_server_1b_port + - network.incoming.bytes_pd_server_1b_pd_server_1b_port_1 host_server_1b_pd_1: - abstract_pd_server_1b - host_pd_server_1b host_server_1b_pd_0: - abstract_pd_server_1b - host_pd_server_1b - network.incoming.bytes_pd_server_1b_port_0: - - abstract_pd_server_1b - - network.incoming.bytes_pd_server_1b_pd_server_1b_port disk.root.size_server_1b_pd_1: - abstract_pd_server_1b - disk.root.size_pd_server_1b @@ -456,18 +453,21 @@ topology_template: disk.allocation_server_1b_pd_1: - abstract_pd_server_1b - disk.allocation_pd_server_1b + binding_pd_server_1b_1_port_1: + - abstract_pd_server_1b + - binding_pd_server_1b_pd_server_1b_port_1 disk.allocation_server_1b_pd_0: - abstract_pd_server_1b - disk.allocation_pd_server_1b - binding_pd_server_1b_port_0: + forwarder_pd_server_1b_1_port_1: - abstract_pd_server_1b - - binding_pd_server_1b_pd_server_1b_port + - forwarder_pd_server_1b_pd_server_1b_port_1 disk.device.latency_server_1b_pd_1: - abstract_pd_server_1b - disk.device.latency_pd_server_1b binding_pd_server_1b_port_1: - abstract_pd_server_1b - - binding_pd_server_1b_pd_server_1b_port + - binding_pd_server_1b_pd_server_1b_port_1 disk.device.read.requests.rate_server_1b_pd_0: - abstract_pd_server_1b - disk.device.read.requests.rate_pd_server_1b @@ -492,6 +492,9 @@ topology_template: cpu.delta_server_1b_pd_0: - abstract_pd_server_1b - cpu.delta_pd_server_1b + network.incoming.packets_pd_server_1b_1_port_1: + - abstract_pd_server_1b + - network.incoming.packets_pd_server_1b_pd_server_1b_port_1 cpu.delta_server_1b_pd_1: - abstract_pd_server_1b - cpu.delta_pd_server_1b @@ -504,15 +507,15 @@ topology_template: disk.device.read.requests_server_1b_pd_0: - abstract_pd_server_1b - disk.device.read.requests_pd_server_1b + feature_pd_server_1b_1_port_1: + - abstract_pd_server_1b + - feature_pd_server_1b_pd_server_1b_port_1 network.incoming.packets_pd_server_1b_port_1: - abstract_pd_server_1b - - network.incoming.packets_pd_server_1b_pd_server_1b_port + - network.incoming.packets_pd_server_1b_pd_server_1b_port_1 vcpus_server_1b_pd_1: - abstract_pd_server_1b - vcpus_pd_server_1b - network.incoming.packets_pd_server_1b_port_0: - - abstract_pd_server_1b - - network.incoming.packets_pd_server_1b_pd_server_1b_port disk.read.bytes.rate_server_1b_pd_1: - abstract_pd_server_1b - disk.read.bytes.rate_pd_server_1b @@ -530,16 +533,13 @@ topology_template: - attachment network.incoming.bytes.rate_pd_server_1b_port_1: - abstract_pd_server_1b - - network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port + - network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port_1 disk.latency_server_1b_pd_1: - abstract_pd_server_1b - disk.latency_pd_server_1b disk.latency_server_1b_pd_0: - abstract_pd_server_1b - disk.latency_pd_server_1b - network.incoming.bytes.rate_pd_server_1b_port_0: - - abstract_pd_server_1b - - network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port requirements: dependency_test_resourceGroup_1: - test_resourceGroup_1 @@ -556,15 +556,15 @@ topology_template: dependency_template_Vlan_vmi_1_test_resourceGroup_1: - test_resourceGroup_1 - dependency_template_Vlan_vmi_1 - dependency_pd_server_1b_port_0: - - abstract_pd_server_1b - - dependency_pd_server_1b_pd_server_1b_port local_storage_server_1b_pd_1: - abstract_pd_server_1b - local_storage_pd_server_1b dependency_server_1b_pd_0: - abstract_pd_server_1b - dependency_pd_server_1b + dependency_pd_server_1b_1_port_1: + - abstract_pd_server_1b + - dependency_pd_server_1b_pd_server_1b_port_1 dependency_server_1b_pd_1: - abstract_pd_server_1b - dependency_pd_server_1b @@ -573,7 +573,7 @@ topology_template: - dependency_template_Vlan_vmi_1 dependency_pd_server_1b_port_1: - abstract_pd_server_1b - - dependency_pd_server_1b_pd_server_1b_port + - dependency_pd_server_1b_pd_server_1b_port_1 dependency_packet_external_network: - packet_external_network - - dependency \ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/in/nested_pattern5_levelTwo.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/in/nested_pattern5_levelTwo.yml index 68afa6b380..f8df24b534 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/in/nested_pattern5_levelTwo.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/in/nested_pattern5_levelTwo.yml @@ -66,7 +66,7 @@ resources: networks: - port: { get_resource: ps_server_1b_port_1 } - ps_server_1b_port_2: + ps_server_1b_1_port_1: type: OS::Neutron::Port properties: network: {get_resource: packet_int_network} @@ -81,7 +81,7 @@ resources: availability_zone: { get_param: availability_zone_0 } flavor: { get_param: ps_server_1b_flavor } networks: - - port: { get_resource: ps_server_1b_port_2 } + - port: { get_resource: ps_server_1b_1_port_1 } test_resourceGroup_1: type: OS::Heat::ResourceGroup 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/GlobalSubstitutionTypesServiceTemplate.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/GlobalSubstitutionTypesServiceTemplate.yaml index fcbfe72539..3c0d996aeb 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/GlobalSubstitutionTypesServiceTemplate.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/GlobalSubstitutionTypesServiceTemplate.yaml @@ -157,7 +157,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_ps_server_1b_port_2_test_nested_level2: + - dependency_ps_server_1b_1_port_1_test_nested_level2: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn @@ -199,14 +199,14 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_ps_server_1b_port_2_test_nested_level2: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + scalable_server_1b_ps_1_test_nested_level2: + type: tosca.capabilities.Scalable occurrences: - 1 - UNBOUNDED - scalable_server_1b_ps_1_test_nested_level2: - type: tosca.capabilities.Scalable + network.outgoing.bytes.rate_ps_server_1b_1_port_1_test_nested_level2: + 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 @@ -239,6 +239,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets_ps_server_1b_1_port_1_test_nested_level2: + 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_server_1b_ps_2_test_nested_level2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -283,12 +289,22 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_ps_server_1b_1_port_1_test_nested_level2: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED network.outpoing.packets_pd_server_1b_port_0: 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_ps_server_1b_1_port_1_test_nested_level2: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED cpu_util_server_1b_ps_2_test_nested_level2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -301,6 +317,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_ps_server_1b_1_port_1_test_nested_level2: + 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_pd_server_1b_port_0: type: tosca.capabilities.Node occurrences: @@ -322,12 +344,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_ps_server_1b_port_2_test_nested_level2: - 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_server_1b_ps_1_test_nested_level2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -373,12 +389,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_ps_server_1b_port_2_test_nested_level2: - 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_server_1b_ps_1_test_nested_level2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -478,6 +488,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.packets.rate_ps_server_1b_1_port_1_test_nested_level2: + 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_server_1b_pd_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -536,23 +552,12 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_ps_server_1b_port_2_test_nested_level2: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.allocation_server_1b_ps_1_test_nested_level2: 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_ps_server_1b_port_2_test_nested_level2: - 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_server_1b_ps_1_test_nested_level2: type: tosca.capabilities.Endpoint.Admin occurrences: @@ -586,11 +591,6 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_ps_server_1b_port_2_test_nested_level2: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED disk.write.bytes_server_1b_pd_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -626,6 +626,20 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_ps_server_1b_1_port_1_test_nested_level2: + 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 + network.incoming.bytes_ps_server_1b_1_port_1_test_nested_level2: + 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_server_1b_pd_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -649,12 +663,24 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets.rate_ps_server_1b_1_port_1_test_nested_level2: + 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_server_1b_ps_1_test_nested_level2: 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_ps_server_1b_1_port_1_test_nested_level2: + 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_server_1b_ps_1_test_nested_level2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -852,12 +878,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_ps_server_1b_port_2_test_nested_level2: - 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_server_1b_pd_0: type: tosca.capabilities.OperatingSystem occurrences: @@ -947,14 +967,6 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_ps_server_1b_port_2_test_nested_level2: - 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 disk.ephemeral.size_server_1b_ps_1_test_nested_level2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -996,6 +1008,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes.rate_ps_server_1b_1_port_1_test_nested_level2: + 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_server_1b_ps_2_test_nested_level2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1086,29 +1104,23 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_ps_server_1b_port_2_test_nested_level2: + disk.write.requests_server_1b_pd_0: 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_server_1b_pd_0: + disk.device.allocation_server_1b_ps_1_test_nested_level2: 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 - attachment_ps_server_1b_port_2_test_nested_level2: + attachment_ps_server_1b_1_port_1_test_nested_level2: type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - disk.device.allocation_server_1b_ps_1_test_nested_level2: - 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_server_1b_ps_2_test_nested_level2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1126,12 +1138,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_ps_server_1b_port_2_test_nested_level2: - 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_server_1b_ps_2_test_nested_level2: type: tosca.capabilities.OperatingSystem occurrences: @@ -1213,12 +1219,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_ps_server_1b_port_2_test_nested_level2: - 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_pd_server_1b_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1252,6 +1252,14 @@ node_types: status: SUPPORTED entry_schema: type: float + port_pd_server_1b_port_0_subnetpoolid: + type: string + required: true + status: SUPPORTED + port_pd_server_1b_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED index_value: type: integer description: Index value of this substitution service template runtime instance @@ -1260,108 +1268,100 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 + port_pd_server_1b_port_0_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd_server_1b_port_0_network_role_tag: + type: string + required: true + status: SUPPORTED vm_flavor_name: type: string required: true status: SUPPORTED - port_pd_server_1b_port_vlan_requirements: + port_pd_server_1b_port_0_order: + type: integer + required: true + status: SUPPORTED + port_pd_server_1b_port_0_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: string subinterface_nested_vlan_net1: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd_server_1b_port_related_networks: + port_pd_server_1b_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd_server_1b_port_network_role_tag: - type: string - required: true - status: SUPPORTED + type: org.openecomp.datatypes.network.VlanRequirements vm_image_name: type: string required: true status: SUPPORTED - port_pd_server_1b_port_replacement_policy: + port_pd_server_1b_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd_server_1b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_pd_server_1b_port_network_role: - type: string - required: true - status: SUPPORTED + type: org.openecomp.datatypes.network.RelatedNetworksAssignments subinterface_nested_vlan_parent_interface: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd_server_1b_port_fixed_ips: + port_pd_server_1b_port_0_replacement_policy: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_pd_server_1b_port_network: - type: list + type: string + port_pd_server_1b_port_0_network_role: + type: string + required: true + status: SUPPORTED + port_pd_server_1b_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: string compute_pd_server_1b_availability_zone: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd_server_1b_port_order: - type: integer - required: true - status: SUPPORTED - port_pd_server_1b_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_pd_server_1b_port_ip_requirements: + port_pd_server_1b_port_0_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd_server_1b_port_subnetpoolid: - type: string - required: true - status: SUPPORTED + type: org.openecomp.datatypes.heat.neutron.port.FixedIps requirements: - - dependency_pd_server_1b_pd_server_1b_port_nested_vlan: + - dependency_pd_server_1b_pd_server_1b_port_0_nested_vlan: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - dependency_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: + - dependency_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_0_nested_vlan: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: + - subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_0_nested_vlan: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -1381,14 +1381,14 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_1b_pd_server_1b_port: + - dependency_pd_server_1b_pd_server_1b_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_1b_pd_server_1b_port: + - link_pd_server_1b_pd_server_1b_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -1401,11 +1401,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_1b_pd_server_1b_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED host_pd_server_1b: type: tosca.capabilities.Container valid_source_types: @@ -1425,34 +1420,31 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port: + cpu.delta_pd_server_1b: 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_pd_server_1b: + disk.device.read.requests_pd_server_1b: 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_pd_server_1b_pd_server_1b_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - network.incoming.bytes_pd_server_1b_pd_server_1b_port: + network.incoming.packets.rate_pd_server_1b_pd_server_1b_port_0: 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_pd_server_1b: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_pd_server_1b_pd_server_1b_port_0: + 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: - - 1 + - 0 - UNBOUNDED feature_pd_server_1b: type: tosca.capabilities.Node @@ -1465,14 +1457,6 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_1b_pd_server_1b_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 cpu_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1508,7 +1492,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_1b_pd_server_1b_port: + network.incoming.bytes_pd_server_1b_pd_server_1b_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1538,14 +1522,15 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.usage_pd_server_1b: + network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port_0: 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 - attachment_pd_server_1b_pd_server_1b_port: - type: tosca.capabilities.Attachment + disk.device.usage_pd_server_1b: + 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 @@ -1561,13 +1546,23 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_pd_server_1b_pd_server_1b_port_0_nested_vlan: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.ephemeral.size_pd_server_1b: 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_pd_server_1b_pd_server_1b_port: + forwarder_pd_server_1b_pd_server_1b_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes_pd_server_1b_pd_server_1b_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1584,18 +1579,19 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: - type: tosca.capabilities.Node + disk.device.write.bytes.rate_pd_server_1b: + 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_pd_server_1b: + disk.root.size_pd_server_1b: 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_pd_server_1b: + network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1607,6 +1603,11 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_pd_server_1b_pd_server_1b_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.write.bytes_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1630,15 +1631,14 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_1b_pd_server_1b_port: + instance_pd_server_1b: 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 - instance_pd_server_1b: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_0_nested_vlan: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -1653,24 +1653,24 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_1b_pd_server_1b_port: + network.outpoing.packets_pd_server_1b_pd_server_1b_port_0: 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_pd_server_1b: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_pd_server_1b_pd_server_1b_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - feature_pd_server_1b_pd_server_1b_port_nested_vlan: - type: tosca.capabilities.Node + memory.resident_pd_server_1b: + 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_pd_server_1b_pd_server_1b_port: + network.incoming.packets_pd_server_1b_pd_server_1b_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1694,19 +1694,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port: + disk.capacity_pd_server_1b: 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_pd_server_1b: + disk.usage_pd_server_1b: 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_pd_server_1b: + network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1814,7 +1814,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_ps_server_1b_port_2: + - dependency_ps_server_1b_1_port_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn @@ -1850,14 +1850,6 @@ node_types: - 0 - UNBOUNDED capabilities: - binding_ps_server_1b_port_2: - 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 disk.device.latency_server_1b_ps_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1932,12 +1924,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_ps_server_1b_port_2: - 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_server_1b_ps_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1967,12 +1953,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_ps_server_1b_port_2: - 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_ps_server_1b_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2085,33 +2065,28 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_ps_server_1b_port_2: - type: org.openecomp.capabilities.Forwarder + link_packet_int_network: + type: tosca.capabilities.network.Linkable occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_ps_server_1b_port_2: + instance_server_1b_ps_2: 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 - link_packet_int_network: - type: tosca.capabilities.network.Linkable - occurrences: + feature_template_Vlan_vmi_1_test_resourceGroup_1: + type: tosca.capabilities.Node + occurrences: - 1 - UNBOUNDED - instance_server_1b_ps_2: + network.outgoing.packets.rate_ps_server_1b_1_port_1: 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_template_Vlan_vmi_1_test_resourceGroup_1: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.device.capacity_server_1b_ps_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2129,7 +2104,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_ps_server_1b_port_2: + network.outgoing.bytes_ps_server_1b_1_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2159,20 +2134,26 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_ps_server_1b_port_2: + network.outpoing.packets_ps_server_1b_port_1: 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_ps_server_1b_port_1: + endpoint_server_1b_ps_1: + type: tosca.capabilities.Endpoint.Admin + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets.rate_ps_server_1b_1_port_1: 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_server_1b_ps_1: - type: tosca.capabilities.Endpoint.Admin + network.incoming.bytes.rate_ps_server_1b_1_port_1: + 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 @@ -2213,14 +2194,13 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_packet_int_network: - type: tosca.capabilities.Node + attachment_ps_server_1b_1_port_1: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_ps_server_1b_port_2: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_packet_int_network: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -2271,6 +2251,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_ps_server_1b_1_port_1: + 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_server_1b_ps_2: type: tosca.capabilities.Scalable occurrences: @@ -2304,12 +2290,24 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes.rate_ps_server_1b_1_port_1: + 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_server_1b_ps_2: 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_ps_server_1b_1_port_1: + 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_server_1b_ps_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2358,12 +2356,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_ps_server_1b_port_2: - 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_server_1b_ps_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2431,13 +2423,14 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_ps_server_1b_port_2: + attachment_packet_ext_network: type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - attachment_packet_ext_network: - type: tosca.capabilities.Attachment + network.incoming.packets_ps_server_1b_1_port_1: + 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 @@ -2451,11 +2444,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_ps_server_1b_port_2: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_ps_server_1b_1_port_1: + 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: - - 1 + - 0 - UNBOUNDED network.outgoing.bytes_ps_server_1b_port_1: type: org.openecomp.capabilities.metric.Ceilometer @@ -2463,6 +2458,11 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_ps_server_1b_1_port_1: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.usage_server_1b_ps_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2475,6 +2475,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_ps_server_1b_1_port_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.read.bytes_server_1b_ps_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2509,11 +2514,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_ps_server_1b_port_2: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.device.read.bytes.rate_server_1b_ps_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2529,26 +2529,16 @@ node_types: org.openecomp.resource.abstract.nodes.ps_server_1b_1: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_ps_server_1b_port_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_ps_server_1b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_ps_server_1b_port_network_role_tag: + port_ps_server_1b_port_1_network_role_tag: type: string required: true status: SUPPORTED - port_ps_server_1b_port_fixed_ips: + port_ps_server_1b_port_1_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps + type: org.openecomp.datatypes.network.RelatedNetworksAssignments index_value: type: integer description: Index value of this substitution service template runtime instance @@ -2557,60 +2547,70 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_ps_server_1b_port_order: - type: integer + port_ps_server_1b_port_1_ip_requirements: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements vm_flavor_name: type: string required: true status: SUPPORTED - port_ps_server_1b_port_related_networks: - type: list + port_ps_server_1b_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_ps_server_1b_port_network: + port_ps_server_1b_port_1_network_role: + type: string + required: true + status: SUPPORTED + vm_image_name: + type: string + required: true + status: SUPPORTED + port_ps_server_1b_port_1_replacement_policy: type: list required: true status: SUPPORTED entry_schema: type: string - port_ps_server_1b_port_exCP_naming: + port_ps_server_1b_port_1_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_ps_server_1b_port_ip_requirements: + port_ps_server_1b_port_1_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - vm_image_name: - type: string + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_ps_server_1b_port_1_order: + type: integer required: true status: SUPPORTED - port_ps_server_1b_port_network_role: + port_ps_server_1b_port_1_subnetpoolid: type: string required: true status: SUPPORTED - port_ps_server_1b_port_replacement_policy: + port_ps_server_1b_port_1_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_ps_server_1b_port_subnetpoolid: - type: string - required: true - status: SUPPORTED compute_ps_server_1b_availability_zone: type: list required: true status: SUPPORTED entry_schema: type: string + port_ps_server_1b_port_1_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements compute_ps_server_1b_name: type: list required: true @@ -2632,14 +2632,14 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_ps_server_1b_ps_server_1b_port: + - dependency_ps_server_1b_ps_server_1b_port_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_ps_server_1b_ps_server_1b_port: + - link_ps_server_1b_ps_server_1b_port_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -2681,30 +2681,31 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.read.bytes.rate_ps_server_1b: + network.outgoing.bytes_ps_server_1b_ps_server_1b_port_1: 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_ps_server_1b: + disk.device.read.bytes.rate_ps_server_1b: 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.iops_ps_server_1b: + disk.device.latency_ps_server_1b: 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 - attachment_ps_server_1b_ps_server_1b_port: - type: tosca.capabilities.Attachment + network.outgoing.packets.rate_ps_server_1b_ps_server_1b_port_1: + 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.packets.rate_ps_server_1b_ps_server_1b_port: + disk.device.iops_ps_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2716,11 +2717,6 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_ps_server_1b_ps_server_1b_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED instance_ps_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2782,7 +2778,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_ps_server_1b_ps_server_1b_port: + network.incoming.bytes_ps_server_1b_ps_server_1b_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2800,12 +2796,23 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_ps_server_1b_ps_server_1b_port_1: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED disk.device.write.requests.rate_ps_server_1b: 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_ps_server_1b_ps_server_1b_port_1: + 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_ps_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2847,25 +2854,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_ps_server_1b_ps_server_1b_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_ps_server_1b_ps_server_1b_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.incoming.packets_ps_server_1b_ps_server_1b_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_ps_server_1b_ps_server_1b_port: + network.outgoing.bytes.rate_ps_server_1b_ps_server_1b_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2881,6 +2870,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_ps_server_1b_ps_server_1b_port_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.iops_ps_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2899,12 +2893,20 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_ps_server_1b_ps_server_1b_port: + network.incoming.packets.rate_ps_server_1b_ps_server_1b_port_1: 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_ps_server_1b_ps_server_1b_port_1: + 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 memory.usage_ps_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2917,23 +2919,24 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_ps_server_1b_ps_server_1b_port_1: + 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_ps_server_1b: type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_ps_server_1b_ps_server_1b_port: + vcpus_ps_server_1b: 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_ps_server_1b_ps_server_1b_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - vcpus_ps_server_1b: + network.incoming.bytes.rate_ps_server_1b_ps_server_1b_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2951,43 +2954,30 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_ps_server_1b_ps_server_1b_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 + feature_ps_server_1b_ps_server_1b_port_1: + type: tosca.capabilities.Node occurrences: - - 0 + - 1 - UNBOUNDED org.openecomp.resource.abstract.nodes.ps_server_1b: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_ps_server_1b_port_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_ps_server_1b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_ps_server_1b_port_1_network_role_tag: + type: string required: true status: SUPPORTED - subinterface_nested_vlan_service_template_filter_count: + port_ps_server_1b_port_1_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: float - port_ps_server_1b_port_network_role_tag: - type: string - required: true - status: SUPPORTED - port_ps_server_1b_port_fixed_ips: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + subinterface_nested_vlan_service_template_filter_count: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps + type: float index_value: type: integer description: Index value of this substitution service template runtime instance @@ -2996,72 +2986,82 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_ps_server_1b_port_order: - type: integer + port_ps_server_1b_port_1_ip_requirements: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements vm_flavor_name: type: string required: true status: SUPPORTED - port_ps_server_1b_port_related_networks: + port_ps_server_1b_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_ps_server_1b_port_1_network_role: + type: string + required: true + status: SUPPORTED + subinterface_nested_vlan_net1: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_ps_server_1b_port_network: + type: string + vm_image_name: + type: string + required: true + status: SUPPORTED + port_ps_server_1b_port_1_replacement_policy: type: list required: true status: SUPPORTED entry_schema: type: string - port_ps_server_1b_port_exCP_naming: + port_ps_server_1b_port_1_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - subinterface_nested_vlan_net1: + port_ps_server_1b_port_1_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: string - port_ps_server_1b_port_ip_requirements: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + subinterface_nested_vlan_parent_interface: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - vm_image_name: - type: string + type: string + port_ps_server_1b_port_1_order: + type: integer required: true status: SUPPORTED - port_ps_server_1b_port_network_role: + port_ps_server_1b_port_1_subnetpoolid: type: string required: true status: SUPPORTED - port_ps_server_1b_port_replacement_policy: + port_ps_server_1b_port_1_network: type: list required: true status: SUPPORTED entry_schema: type: string - subinterface_nested_vlan_parent_interface: + compute_ps_server_1b_availability_zone: type: list required: true status: SUPPORTED entry_schema: type: string - port_ps_server_1b_port_subnetpoolid: - type: string - required: true - status: SUPPORTED - compute_ps_server_1b_availability_zone: + port_ps_server_1b_port_1_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string + type: org.openecomp.datatypes.network.VlanRequirements compute_ps_server_1b_name: type: list required: true @@ -3083,34 +3083,34 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_ps_server_1b_ps_server_1b_port_nested_vlan: + - dependency_ps_server_1b_ps_server_1b_port_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - dependency_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: + - link_ps_server_1b_ps_server_1b_port_1: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 + - dependency_ps_server_1b_ps_server_1b_port_1_nested_vlan: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - subinterface_link_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - - dependency_ps_server_1b_ps_server_1b_port: + - dependency_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_1_nested_vlan: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_ps_server_1b_ps_server_1b_port: + - subinterface_link_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_1_nested_vlan: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -3129,6 +3129,11 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_1_nested_vlan: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.device.allocation_ps_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3152,30 +3157,31 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.read.bytes.rate_ps_server_1b: + network.outgoing.bytes_ps_server_1b_ps_server_1b_port_1: 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_ps_server_1b: + disk.device.read.bytes.rate_ps_server_1b: 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.iops_ps_server_1b: + disk.device.latency_ps_server_1b: 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 - attachment_ps_server_1b_ps_server_1b_port: - type: tosca.capabilities.Attachment + network.outgoing.packets.rate_ps_server_1b_ps_server_1b_port_1: + 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.packets.rate_ps_server_1b_ps_server_1b_port: + disk.device.iops_ps_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -3187,11 +3193,6 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_ps_server_1b_ps_server_1b_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED instance_ps_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3241,11 +3242,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_ps_server_1b_ps_server_1b_port_nested_vlan: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.device.read.requests.rate_ps_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3258,7 +3254,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_ps_server_1b_ps_server_1b_port: + network.incoming.bytes_ps_server_1b_ps_server_1b_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -3276,72 +3272,70 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.write.requests.rate_ps_server_1b: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_ps_server_1b_ps_server_1b_port_1: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - disk.root.size_ps_server_1b: + disk.device.write.requests.rate_ps_server_1b: 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_ps_server_1b: - type: tosca.capabilities.network.Bindable + network.incoming.packets_ps_server_1b_ps_server_1b_port_1: + 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_ps_server_1b: + disk.root.size_ps_server_1b: 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_ps_server_1b: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_ps_server_1b_ps_server_1b_port_1_nested_vlan: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.write.bytes_ps_server_1b: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_ps_server_1b: + type: tosca.capabilities.network.Bindable occurrences: - 1 - UNBOUNDED - disk.device.write.bytes.rate_ps_server_1b: + memory.resident_ps_server_1b: 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_ps_server_1b: + memory_ps_server_1b: 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_ps_server_1b_ps_server_1b_port: + disk.write.bytes_ps_server_1b: 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_ps_server_1b_ps_server_1b_port: + disk.device.write.bytes.rate_ps_server_1b: 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_ps_server_1b_ps_server_1b_port: + disk.read.bytes_ps_server_1b: 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_ps_server_1b_ps_server_1b_port: + network.outgoing.bytes.rate_ps_server_1b_ps_server_1b_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -3357,6 +3351,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_ps_server_1b_ps_server_1b_port_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.iops_ps_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3375,12 +3374,20 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_ps_server_1b_ps_server_1b_port: + network.incoming.packets.rate_ps_server_1b_ps_server_1b_port_1: 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_ps_server_1b_ps_server_1b_port_1: + 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 memory.usage_ps_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3393,23 +3400,24 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_ps_server_1b_ps_server_1b_port_1: + 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_ps_server_1b: type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_ps_server_1b_ps_server_1b_port: + vcpus_ps_server_1b: 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_ps_server_1b_ps_server_1b_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - vcpus_ps_server_1b: + network.incoming.bytes.rate_ps_server_1b_ps_server_1b_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -3427,15 +3435,7 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_ps_server_1b_ps_server_1b_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 - feature_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: + feature_ps_server_1b_ps_server_1b_port_1: type: tosca.capabilities.Node occurrences: - 1 @@ -3506,4 +3506,4 @@ node_types: type: tosca.capabilities.Node occurrences: - 1 - - UNBOUNDED \ No newline at end of file + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/Nested_pd_server_1bServiceTemplate.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_pd_server_1bServiceTemplate.yaml index 17f0ff073f..92de2147d9 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_pd_server_1bServiceTemplate.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_pd_server_1bServiceTemplate.yaml @@ -21,6 +21,12 @@ topology_template: required: true entry_schema: type: float + port_pd_server_1b_port_0_subnetpoolid: + type: string + required: true + port_pd_server_1b_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -28,77 +34,71 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 + port_pd_server_1b_port_0_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd_server_1b_port_0_network_role_tag: + type: string + required: true vm_flavor_name: type: string required: true - port_pd_server_1b_port_vlan_requirements: + port_pd_server_1b_port_0_order: + type: integer + required: true + port_pd_server_1b_port_0_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: string subinterface_nested_vlan_net1: type: list required: true entry_schema: type: string - port_pd_server_1b_port_related_networks: + port_pd_server_1b_port_0_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd_server_1b_port_network_role_tag: - type: string - required: true + type: org.openecomp.datatypes.network.VlanRequirements vm_image_name: type: string required: true - port_pd_server_1b_port_replacement_policy: + port_pd_server_1b_port_0_related_networks: type: list required: true entry_schema: - type: string - port_pd_server_1b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_pd_server_1b_port_network_role: - type: string - required: true + type: org.openecomp.datatypes.network.RelatedNetworksAssignments subinterface_nested_vlan_parent_interface: type: list required: true entry_schema: type: string - port_pd_server_1b_port_fixed_ips: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_pd_server_1b_port_network: + port_pd_server_1b_port_0_replacement_policy: type: list required: true entry_schema: type: string + port_pd_server_1b_port_0_network_role: + type: string + required: true + port_pd_server_1b_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true compute_pd_server_1b_availability_zone: type: list required: true entry_schema: type: string - port_pd_server_1b_port_order: - type: integer - required: true - port_pd_server_1b_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_pd_server_1b_port_ip_requirements: + port_pd_server_1b_port_0_fixed_ips: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd_server_1b_port_subnetpoolid: - type: string - required: true + type: org.openecomp.datatypes.heat.neutron.port.FixedIps node_templates: - pd_server_1b_pd_server_1b_port_nested_vlan: + pd_server_1b_pd_server_1b_port_0_nested_vlan: type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested_vlan directives: - substitutable @@ -121,7 +121,7 @@ topology_template: requirements: - binding_template_Vlan_vmi_1: capability: tosca.capabilities.network.Bindable - node: pd_server_1b_pd_server_1b_port + node: pd_server_1b_pd_server_1b_port_0 relationship: tosca.relationships.network.BindsTo pd_server_1b: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server_1b @@ -138,39 +138,39 @@ topology_template: get_input: - compute_pd_server_1b_name - index_value - pd_server_1b_pd_server_1b_port: + pd_server_1b_pd_server_1b_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_pd_server_1b_port_replacement_policy + - port_pd_server_1b_port_0_replacement_policy - index_value mac_requirements: - get_input: port_pd_server_1b_port_mac_requirements + get_input: port_pd_server_1b_port_0_mac_requirements order: - get_input: port_pd_server_1b_port_order + get_input: port_pd_server_1b_port_0_order exCP_naming: - get_input: port_pd_server_1b_port_exCP_naming + get_input: port_pd_server_1b_port_0_exCP_naming vlan_requirements: - get_input: port_pd_server_1b_port_vlan_requirements + get_input: port_pd_server_1b_port_0_vlan_requirements subinterface_indicator: true ip_requirements: - get_input: port_pd_server_1b_port_ip_requirements + get_input: port_pd_server_1b_port_0_ip_requirements related_networks: - get_input: port_pd_server_1b_port_related_networks + get_input: port_pd_server_1b_port_0_related_networks network_role_tag: - get_input: port_pd_server_1b_port_network_role_tag + get_input: port_pd_server_1b_port_0_network_role_tag network_role: - get_input: port_pd_server_1b_port_network_role + get_input: port_pd_server_1b_port_0_network_role fixed_ips: get_input: - - port_pd_server_1b_port_fixed_ips + - port_pd_server_1b_port_0_fixed_ips - index_value subnetpoolid: - get_input: port_pd_server_1b_port_subnetpoolid + get_input: port_pd_server_1b_port_0_subnetpoolid network: get_input: - - port_pd_server_1b_port_network + - port_pd_server_1b_port_0_network - index_value requirements: - binding: @@ -183,9 +183,6 @@ topology_template: disk.device.read.bytes_pd_server_1b: - pd_server_1b - disk.device.read.bytes - feature_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - feature host_pd_server_1b: - pd_server_1b - host @@ -195,30 +192,24 @@ topology_template: disk.allocation_pd_server_1b: - pd_server_1b - disk.allocation - network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.incoming.bytes.rate cpu.delta_pd_server_1b: - pd_server_1b - cpu.delta - forwarder_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - forwarder - network.incoming.bytes_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.incoming.bytes disk.device.read.requests_pd_server_1b: - pd_server_1b - disk.device.read.requests + network.incoming.packets.rate_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - network.incoming.packets.rate + binding_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - binding feature_pd_server_1b: - pd_server_1b - feature disk.device.iops_pd_server_1b: - pd_server_1b - disk.device.iops - binding_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - binding cpu_pd_server_1b: - pd_server_1b - cpu @@ -237,9 +228,9 @@ topology_template: memory.usage_pd_server_1b: - pd_server_1b - memory.usage - network.outpoing.packets_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.outpoing.packets + network.incoming.bytes_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - network.incoming.bytes memory_pd_server_1b: - pd_server_1b - memory @@ -252,42 +243,51 @@ topology_template: disk.read.bytes_pd_server_1b: - pd_server_1b - disk.read.bytes + network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - network.incoming.bytes.rate disk.device.usage_pd_server_1b: - pd_server_1b - disk.device.usage - attachment_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - attachment disk.device.write.requests_pd_server_1b: - pd_server_1b - disk.device.write.requests disk.latency_pd_server_1b: - pd_server_1b - disk.latency + feature_pd_server_1b_pd_server_1b_port_0_nested_vlan: + - pd_server_1b_pd_server_1b_port_0_nested_vlan + - feature disk.ephemeral.size_pd_server_1b: - pd_server_1b - disk.ephemeral.size - network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.outgoing.bytes.rate + forwarder_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - forwarder + network.outgoing.bytes_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - network.outgoing.bytes scalable_pd_server_1b: - pd_server_1b - scalable disk.write.requests_pd_server_1b: - pd_server_1b - disk.write.requests - feature_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: - - pd_server_1b_pd_server_1b_port_nested_vlan - - feature_template_Vlan_vmi_1 disk.device.write.bytes.rate_pd_server_1b: - pd_server_1b - disk.device.write.bytes.rate disk.root.size_pd_server_1b: - pd_server_1b - disk.root.size + network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - network.outgoing.bytes.rate disk.iops_pd_server_1b: - pd_server_1b - disk.iops + feature_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - feature disk.write.bytes_pd_server_1b: - pd_server_1b - disk.write.bytes @@ -300,29 +300,29 @@ topology_template: vcpus_pd_server_1b: - pd_server_1b - vcpus - network.incoming.packets.rate_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.incoming.packets.rate instance_pd_server_1b: - pd_server_1b - instance + feature_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_0_nested_vlan: + - pd_server_1b_pd_server_1b_port_0_nested_vlan + - feature_template_Vlan_vmi_1 binding_pd_server_1b: - pd_server_1b - binding cpu_util_pd_server_1b: - pd_server_1b - cpu_util - network.outgoing.bytes_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.outgoing.bytes + network.outpoing.packets_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - network.outpoing.packets + attachment_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - attachment memory.resident_pd_server_1b: - pd_server_1b - memory.resident - feature_pd_server_1b_pd_server_1b_port_nested_vlan: - - pd_server_1b_pd_server_1b_port_nested_vlan - - feature - network.incoming.packets_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port + network.incoming.packets_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 - network.incoming.packets disk.device.write.requests.rate_pd_server_1b: - pd_server_1b @@ -333,15 +333,15 @@ topology_template: disk.read.requests_pd_server_1b: - pd_server_1b - disk.read.requests - network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.outgoing.packets.rate disk.capacity_pd_server_1b: - pd_server_1b - disk.capacity disk.usage_pd_server_1b: - pd_server_1b - disk.usage + network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - network.outgoing.packets.rate disk.write.requests.rate_pd_server_1b: - pd_server_1b - disk.write.requests.rate @@ -352,18 +352,18 @@ topology_template: local_storage_pd_server_1b: - pd_server_1b - local_storage - link_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - link - dependency_pd_server_1b_pd_server_1b_port_nested_vlan: - - pd_server_1b_pd_server_1b_port_nested_vlan + subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_0_nested_vlan: + - pd_server_1b_pd_server_1b_port_0_nested_vlan + - subinterface_link_template_Vlan_vmi_1 + dependency_pd_server_1b_pd_server_1b_port_0_nested_vlan: + - pd_server_1b_pd_server_1b_port_0_nested_vlan + - dependency + dependency_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 - dependency - dependency_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: - - pd_server_1b_pd_server_1b_port_nested_vlan + link_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - link + dependency_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_0_nested_vlan: + - pd_server_1b_pd_server_1b_port_0_nested_vlan - dependency_template_Vlan_vmi_1 - subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: - - pd_server_1b_pd_server_1b_port_nested_vlan - - subinterface_link_template_Vlan_vmi_1 - dependency_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - 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/complexVFCWithDiffSubInfConnectivityScenario/out/Nested_ps_server_1bServiceTemplate.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_ps_server_1bServiceTemplate.yaml index 2cdd4ed59a..9b142fd46b 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_ps_server_1bServiceTemplate.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_ps_server_1bServiceTemplate.yaml @@ -11,27 +11,19 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_ps_server_1b_port_vlan_requirements: + port_ps_server_1b_port_1_network_role_tag: + type: string + required: true + port_ps_server_1b_port_1_related_networks: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_ps_server_1b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true + type: org.openecomp.datatypes.network.RelatedNetworksAssignments subinterface_nested_vlan_service_template_filter_count: type: list required: true entry_schema: type: float - port_ps_server_1b_port_network_role_tag: - type: string - required: true - port_ps_server_1b_port_fixed_ips: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps index_value: type: integer description: Index value of this substitution service template runtime instance @@ -39,59 +31,67 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_ps_server_1b_port_order: - type: integer + port_ps_server_1b_port_1_ip_requirements: + type: list required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements vm_flavor_name: type: string required: true - port_ps_server_1b_port_related_networks: + port_ps_server_1b_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_ps_server_1b_port_1_network_role: + type: string + required: true + subinterface_nested_vlan_net1: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_ps_server_1b_port_network: + type: string + vm_image_name: + type: string + required: true + port_ps_server_1b_port_1_replacement_policy: type: list required: true entry_schema: type: string - port_ps_server_1b_port_exCP_naming: + port_ps_server_1b_port_1_exCP_naming: type: org.openecomp.datatypes.Naming required: true - subinterface_nested_vlan_net1: + port_ps_server_1b_port_1_fixed_ips: type: list required: true entry_schema: - type: string - port_ps_server_1b_port_ip_requirements: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + subinterface_nested_vlan_parent_interface: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - vm_image_name: - type: string + type: string + port_ps_server_1b_port_1_order: + type: integer required: true - port_ps_server_1b_port_network_role: + port_ps_server_1b_port_1_subnetpoolid: type: string required: true - port_ps_server_1b_port_replacement_policy: + port_ps_server_1b_port_1_network: type: list required: true entry_schema: type: string - subinterface_nested_vlan_parent_interface: + compute_ps_server_1b_availability_zone: type: list required: true entry_schema: type: string - port_ps_server_1b_port_subnetpoolid: - type: string - required: true - compute_ps_server_1b_availability_zone: + port_ps_server_1b_port_1_vlan_requirements: type: list required: true entry_schema: - type: string + type: org.openecomp.datatypes.network.VlanRequirements compute_ps_server_1b_name: type: list required: true @@ -113,70 +113,70 @@ topology_template: get_input: - compute_ps_server_1b_name - index_value - ps_server_1b_ps_server_1b_port_nested_vlan: - type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested_vlan - directives: - - substitutable - properties: - service_template_filter: - count: - get_input: - - subinterface_nested_vlan_service_template_filter_count - - index_value - substitute_service_template: nested_vlanServiceTemplate.yaml - mandatory: true - parent_interface: - get_input: - - subinterface_nested_vlan_parent_interface - - index_value - net1: - get_input: - - subinterface_nested_vlan_net1 - - index_value - requirements: - - binding_template_Vlan_vmi_1: - capability: tosca.capabilities.network.Bindable - node: ps_server_1b_ps_server_1b_port - relationship: tosca.relationships.network.BindsTo - ps_server_1b_ps_server_1b_port: + ps_server_1b_ps_server_1b_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_ps_server_1b_port_replacement_policy + - port_ps_server_1b_port_1_replacement_policy - index_value mac_requirements: - get_input: port_ps_server_1b_port_mac_requirements + get_input: port_ps_server_1b_port_1_mac_requirements order: - get_input: port_ps_server_1b_port_order + get_input: port_ps_server_1b_port_1_order exCP_naming: - get_input: port_ps_server_1b_port_exCP_naming + get_input: port_ps_server_1b_port_1_exCP_naming vlan_requirements: - get_input: port_ps_server_1b_port_vlan_requirements + get_input: port_ps_server_1b_port_1_vlan_requirements subinterface_indicator: true ip_requirements: - get_input: port_ps_server_1b_port_ip_requirements + get_input: port_ps_server_1b_port_1_ip_requirements related_networks: - get_input: port_ps_server_1b_port_related_networks + get_input: port_ps_server_1b_port_1_related_networks network_role_tag: - get_input: port_ps_server_1b_port_network_role_tag + get_input: port_ps_server_1b_port_1_network_role_tag network_role: - get_input: port_ps_server_1b_port_network_role + get_input: port_ps_server_1b_port_1_network_role fixed_ips: get_input: - - port_ps_server_1b_port_fixed_ips + - port_ps_server_1b_port_1_fixed_ips - index_value subnetpoolid: - get_input: port_ps_server_1b_port_subnetpoolid + get_input: port_ps_server_1b_port_1_subnetpoolid network: get_input: - - port_ps_server_1b_port_network + - port_ps_server_1b_port_1_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: ps_server_1b relationship: tosca.relationships.network.BindsTo + ps_server_1b_ps_server_1b_port_1_nested_vlan: + type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested_vlan + directives: + - substitutable + properties: + service_template_filter: + count: + get_input: + - subinterface_nested_vlan_service_template_filter_count + - index_value + substitute_service_template: nested_vlanServiceTemplate.yaml + mandatory: true + parent_interface: + get_input: + - subinterface_nested_vlan_parent_interface + - index_value + net1: + get_input: + - subinterface_nested_vlan_net1 + - index_value + requirements: + - binding_template_Vlan_vmi_1: + capability: tosca.capabilities.network.Bindable + node: ps_server_1b_ps_server_1b_port_1 + relationship: tosca.relationships.network.BindsTo substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.ps_server_1b capabilities: @@ -186,6 +186,9 @@ topology_template: disk.device.usage_ps_server_1b: - ps_server_1b - disk.device.usage + feature_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_1_nested_vlan: + - ps_server_1b_ps_server_1b_port_1_nested_vlan + - feature_template_Vlan_vmi_1 disk.device.allocation_ps_server_1b: - ps_server_1b - disk.device.allocation @@ -198,27 +201,24 @@ topology_template: scalable_ps_server_1b: - ps_server_1b - scalable + network.outgoing.bytes_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 + - network.outgoing.bytes disk.device.read.bytes.rate_ps_server_1b: - ps_server_1b - disk.device.read.bytes.rate disk.device.latency_ps_server_1b: - ps_server_1b - disk.device.latency + network.outgoing.packets.rate_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 + - network.outgoing.packets.rate disk.device.iops_ps_server_1b: - ps_server_1b - disk.device.iops - attachment_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - attachment - network.outgoing.packets.rate_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - network.outgoing.packets.rate disk.device.capacity_ps_server_1b: - ps_server_1b - disk.device.capacity - forwarder_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - forwarder instance_ps_server_1b: - ps_server_1b - instance @@ -243,17 +243,14 @@ topology_template: disk.read.requests_ps_server_1b: - ps_server_1b - disk.read.requests - feature_ps_server_1b_ps_server_1b_port_nested_vlan: - - ps_server_1b_ps_server_1b_port_nested_vlan - - feature disk.device.read.requests.rate_ps_server_1b: - ps_server_1b - disk.device.read.requests.rate disk.capacity_ps_server_1b: - ps_server_1b - disk.capacity - network.incoming.bytes_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port + network.incoming.bytes_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 - network.incoming.bytes disk.write.requests.rate_ps_server_1b: - ps_server_1b @@ -261,12 +258,21 @@ topology_template: disk.device.read.bytes_ps_server_1b: - ps_server_1b - disk.device.read.bytes + attachment_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 + - attachment disk.device.write.requests.rate_ps_server_1b: - ps_server_1b - disk.device.write.requests.rate + network.incoming.packets_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 + - network.incoming.packets disk.root.size_ps_server_1b: - ps_server_1b - disk.root.size + feature_ps_server_1b_ps_server_1b_port_1_nested_vlan: + - ps_server_1b_ps_server_1b_port_1_nested_vlan + - feature binding_ps_server_1b: - ps_server_1b - binding @@ -285,17 +291,8 @@ topology_template: disk.read.bytes_ps_server_1b: - ps_server_1b - disk.read.bytes - network.incoming.packets.rate_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - network.incoming.packets.rate - network.outgoing.bytes_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - network.outgoing.bytes - network.incoming.packets_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - network.incoming.packets - network.outgoing.bytes.rate_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port + network.outgoing.bytes.rate_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 - network.outgoing.bytes.rate feature_ps_server_1b: - ps_server_1b @@ -303,6 +300,9 @@ topology_template: os_ps_server_1b: - ps_server_1b - os + forwarder_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 + - forwarder disk.iops_ps_server_1b: - ps_server_1b - disk.iops @@ -312,58 +312,58 @@ topology_template: disk.write.requests_ps_server_1b: - ps_server_1b - disk.write.requests - network.outpoing.packets_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - network.outpoing.packets + network.incoming.packets.rate_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 + - network.incoming.packets.rate + binding_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 + - binding memory.usage_ps_server_1b: - ps_server_1b - memory.usage disk.latency_ps_server_1b: - ps_server_1b - disk.latency + network.outpoing.packets_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 + - network.outpoing.packets endpoint_ps_server_1b: - ps_server_1b - endpoint - network.incoming.bytes.rate_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - network.incoming.bytes.rate - feature_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - feature vcpus_ps_server_1b: - ps_server_1b - vcpus + network.incoming.bytes.rate_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 + - network.incoming.bytes.rate cpu.delta_ps_server_1b: - ps_server_1b - cpu.delta disk.ephemeral.size_ps_server_1b: - ps_server_1b - disk.ephemeral.size - binding_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - binding - feature_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: - - ps_server_1b_ps_server_1b_port_nested_vlan - - feature_template_Vlan_vmi_1 + feature_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 + - feature requirements: - dependency_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: - - ps_server_1b_ps_server_1b_port_nested_vlan - - dependency_template_Vlan_vmi_1 - subinterface_link_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: - - ps_server_1b_ps_server_1b_port_nested_vlan + subinterface_link_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_1_nested_vlan: + - ps_server_1b_ps_server_1b_port_1_nested_vlan - subinterface_link_template_Vlan_vmi_1 + link_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 + - link local_storage_ps_server_1b: - ps_server_1b - local_storage - dependency_ps_server_1b_ps_server_1b_port_nested_vlan: - - ps_server_1b_ps_server_1b_port_nested_vlan + dependency_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 - dependency - dependency_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port + dependency_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_1_nested_vlan: + - ps_server_1b_ps_server_1b_port_1_nested_vlan + - dependency_template_Vlan_vmi_1 + dependency_ps_server_1b_ps_server_1b_port_1_nested_vlan: + - ps_server_1b_ps_server_1b_port_1_nested_vlan - dependency - link_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - link dependency_ps_server_1b: - ps_server_1b - - dependency \ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/Nested_ps_server_1b_1ServiceTemplate.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_ps_server_1b_1ServiceTemplate.yaml index 258a426b3c..56530f684e 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_ps_server_1b_1ServiceTemplate.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_ps_server_1b_1ServiceTemplate.yaml @@ -11,22 +11,14 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_ps_server_1b_port_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_ps_server_1b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_ps_server_1b_port_network_role_tag: + port_ps_server_1b_port_1_network_role_tag: type: string required: true - port_ps_server_1b_port_fixed_ips: + port_ps_server_1b_port_1_related_networks: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps + type: org.openecomp.datatypes.network.RelatedNetworksAssignments index_value: type: integer description: Index value of this substitution service template runtime instance @@ -34,49 +26,57 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_ps_server_1b_port_order: - type: integer + port_ps_server_1b_port_1_ip_requirements: + type: list required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements vm_flavor_name: type: string required: true - port_ps_server_1b_port_related_networks: - type: list + port_ps_server_1b_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_ps_server_1b_port_network: + port_ps_server_1b_port_1_network_role: + type: string + required: true + vm_image_name: + type: string + required: true + port_ps_server_1b_port_1_replacement_policy: type: list required: true entry_schema: type: string - port_ps_server_1b_port_exCP_naming: + port_ps_server_1b_port_1_exCP_naming: type: org.openecomp.datatypes.Naming required: true - port_ps_server_1b_port_ip_requirements: + port_ps_server_1b_port_1_fixed_ips: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - vm_image_name: - type: string + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_ps_server_1b_port_1_order: + type: integer required: true - port_ps_server_1b_port_network_role: + port_ps_server_1b_port_1_subnetpoolid: type: string required: true - port_ps_server_1b_port_replacement_policy: + port_ps_server_1b_port_1_network: type: list required: true entry_schema: type: string - port_ps_server_1b_port_subnetpoolid: - type: string - required: true compute_ps_server_1b_availability_zone: type: list required: true entry_schema: type: string + port_ps_server_1b_port_1_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements compute_ps_server_1b_name: type: list required: true @@ -98,39 +98,39 @@ topology_template: get_input: - compute_ps_server_1b_name - index_value - ps_server_1b_ps_server_1b_port: + ps_server_1b_ps_server_1b_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_ps_server_1b_port_replacement_policy + - port_ps_server_1b_port_1_replacement_policy - index_value mac_requirements: - get_input: port_ps_server_1b_port_mac_requirements + get_input: port_ps_server_1b_port_1_mac_requirements order: - get_input: port_ps_server_1b_port_order + get_input: port_ps_server_1b_port_1_order exCP_naming: - get_input: port_ps_server_1b_port_exCP_naming + get_input: port_ps_server_1b_port_1_exCP_naming vlan_requirements: - get_input: port_ps_server_1b_port_vlan_requirements + get_input: port_ps_server_1b_port_1_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_ps_server_1b_port_ip_requirements + get_input: port_ps_server_1b_port_1_ip_requirements related_networks: - get_input: port_ps_server_1b_port_related_networks + get_input: port_ps_server_1b_port_1_related_networks network_role_tag: - get_input: port_ps_server_1b_port_network_role_tag + get_input: port_ps_server_1b_port_1_network_role_tag network_role: - get_input: port_ps_server_1b_port_network_role + get_input: port_ps_server_1b_port_1_network_role fixed_ips: get_input: - - port_ps_server_1b_port_fixed_ips + - port_ps_server_1b_port_1_fixed_ips - index_value subnetpoolid: - get_input: port_ps_server_1b_port_subnetpoolid + get_input: port_ps_server_1b_port_1_subnetpoolid network: get_input: - - port_ps_server_1b_port_network + - port_ps_server_1b_port_1_network - index_value requirements: - binding: @@ -158,27 +158,24 @@ topology_template: scalable_ps_server_1b: - ps_server_1b - scalable + network.outgoing.bytes_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 + - network.outgoing.bytes disk.device.read.bytes.rate_ps_server_1b: - ps_server_1b - disk.device.read.bytes.rate disk.device.latency_ps_server_1b: - ps_server_1b - disk.device.latency + network.outgoing.packets.rate_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 + - network.outgoing.packets.rate disk.device.iops_ps_server_1b: - ps_server_1b - disk.device.iops - attachment_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - attachment - network.outgoing.packets.rate_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - network.outgoing.packets.rate disk.device.capacity_ps_server_1b: - ps_server_1b - disk.device.capacity - forwarder_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - forwarder instance_ps_server_1b: - ps_server_1b - instance @@ -209,8 +206,8 @@ topology_template: disk.capacity_ps_server_1b: - ps_server_1b - disk.capacity - network.incoming.bytes_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port + network.incoming.bytes_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 - network.incoming.bytes disk.write.requests.rate_ps_server_1b: - ps_server_1b @@ -218,9 +215,15 @@ topology_template: disk.device.read.bytes_ps_server_1b: - ps_server_1b - disk.device.read.bytes + attachment_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 + - attachment disk.device.write.requests.rate_ps_server_1b: - ps_server_1b - disk.device.write.requests.rate + network.incoming.packets_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 + - network.incoming.packets disk.root.size_ps_server_1b: - ps_server_1b - disk.root.size @@ -242,17 +245,8 @@ topology_template: disk.read.bytes_ps_server_1b: - ps_server_1b - disk.read.bytes - network.incoming.packets.rate_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - network.incoming.packets.rate - network.outgoing.bytes_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - network.outgoing.bytes - network.incoming.packets_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - network.incoming.packets - network.outgoing.bytes.rate_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port + network.outgoing.bytes.rate_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 - network.outgoing.bytes.rate feature_ps_server_1b: - ps_server_1b @@ -260,6 +254,9 @@ topology_template: os_ps_server_1b: - ps_server_1b - os + forwarder_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 + - forwarder disk.iops_ps_server_1b: - ps_server_1b - disk.iops @@ -269,46 +266,49 @@ topology_template: disk.write.requests_ps_server_1b: - ps_server_1b - disk.write.requests - network.outpoing.packets_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - network.outpoing.packets + network.incoming.packets.rate_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 + - network.incoming.packets.rate + binding_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 + - binding memory.usage_ps_server_1b: - ps_server_1b - memory.usage disk.latency_ps_server_1b: - ps_server_1b - disk.latency + network.outpoing.packets_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 + - network.outpoing.packets endpoint_ps_server_1b: - ps_server_1b - endpoint - network.incoming.bytes.rate_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - network.incoming.bytes.rate - feature_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - feature vcpus_ps_server_1b: - ps_server_1b - vcpus + network.incoming.bytes.rate_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 + - network.incoming.bytes.rate cpu.delta_ps_server_1b: - ps_server_1b - cpu.delta disk.ephemeral.size_ps_server_1b: - ps_server_1b - disk.ephemeral.size - binding_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - binding + feature_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 + - feature requirements: + link_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 + - link local_storage_ps_server_1b: - ps_server_1b - local_storage - dependency_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port + dependency_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 - dependency - link_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - link dependency_ps_server_1b: - ps_server_1b - - dependency \ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/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/complexVFCWithDiffSubInfConnectivityScenario/out/nested_pattern5ServiceTemplate.yaml index 5b9bd4c74d..b71828bdba 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_pattern5ServiceTemplate.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_pattern5ServiceTemplate.yaml @@ -95,34 +95,34 @@ topology_template: - 0 subinterface_nested_vlan_service_template_filter_count: - 9 + port_pd_server_1b_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false vm_flavor_name: get_input: pd_server_1b_flavor + port_pd_server_1b_port_0_network: + - packet_internal_network subinterface_nested_vlan_net1: - packet_external_network vm_image_name: get_input: pd_server_1b_image - port_pd_server_1b_port_replacement_policy: + subinterface_nested_vlan_parent_interface: + - pd_server_1b_port_0 + port_pd_server_1b_port_0_replacement_policy: - AUTO - port_pd_server_1b_port_mac_requirements: + port_pd_server_1b_port_0_mac_requirements: mac_count_required: is_required: false - subinterface_nested_vlan_parent_interface: - - pd_server_1b_port_0 - port_pd_server_1b_port_fixed_ips: + compute_pd_server_1b_availability_zone: + - get_input: availability_zone_0 + port_pd_server_1b_port_0_fixed_ips: - ip_address: get_input: - pd_server_1b_ips - 0 - port_pd_server_1b_port_network: - - packet_internal_network - compute_pd_server_1b_availability_zone: - - get_input: availability_zone_0 - port_pd_server_1b_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false service_template_filter: substitute_service_template: Nested_pd_server_1bServiceTemplate.yaml count: 1 @@ -132,11 +132,11 @@ topology_template: - service_template_filter - index_value requirements: - - link_pd_server_1b_pd_server_1b_port: + - link_pd_server_1b_pd_server_1b_port_0: capability: tosca.capabilities.network.Linkable node: packet_internal_network relationship: tosca.relationships.network.LinksTo - - subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: + - subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_0_nested_vlan: capability: tosca.capabilities.network.Linkable node: packet_external_network relationship: tosca.relationships.network.LinksTo @@ -157,12 +157,12 @@ topology_template: disk.device.write.bytes.rate_server_1b_ps_1_test_nested_level2: - test_nested_level2 - disk.device.write.bytes.rate_server_1b_ps_1 - network.outgoing.packets.rate_ps_server_1b_port_2_test_nested_level2: - - test_nested_level2 - - network.outgoing.packets.rate_ps_server_1b_port_2 scalable_server_1b_ps_1_test_nested_level2: - test_nested_level2 - scalable_server_1b_ps_1 + network.outgoing.bytes.rate_ps_server_1b_1_port_1_test_nested_level2: + - test_nested_level2 + - network.outgoing.bytes.rate_ps_server_1b_1_port_1 end_point_packet_ext_network_test_nested_level2: - test_nested_level2 - end_point_packet_ext_network @@ -178,6 +178,9 @@ topology_template: disk.device.write.requests_server_1b_pd_0: - abstract_pd_server_1b - disk.device.write.requests_pd_server_1b + network.incoming.packets_ps_server_1b_1_port_1_test_nested_level2: + - test_nested_level2 + - network.incoming.packets_ps_server_1b_1_port_1 disk.read.requests_server_1b_ps_2_test_nested_level2: - test_nested_level2 - disk.read.requests_server_1b_ps_2 @@ -198,22 +201,31 @@ topology_template: - forwarder_ps_server_1b_port_1 forwarder_pd_server_1b_port_0: - abstract_pd_server_1b - - forwarder_pd_server_1b_pd_server_1b_port + - forwarder_pd_server_1b_pd_server_1b_port_0 disk.capacity_server_1b_pd_0: - abstract_pd_server_1b - disk.capacity_pd_server_1b + forwarder_ps_server_1b_1_port_1_test_nested_level2: + - test_nested_level2 + - forwarder_ps_server_1b_1_port_1 network.outpoing.packets_pd_server_1b_port_0: - abstract_pd_server_1b - - network.outpoing.packets_pd_server_1b_pd_server_1b_port + - network.outpoing.packets_pd_server_1b_pd_server_1b_port_0 + feature_ps_server_1b_1_port_1_test_nested_level2: + - test_nested_level2 + - feature_ps_server_1b_1_port_1 cpu_util_server_1b_ps_2_test_nested_level2: - test_nested_level2 - cpu_util_server_1b_ps_2 network.incoming.packets_ps_server_1b_port_1_test_nested_level2: - test_nested_level2 - network.incoming.packets_ps_server_1b_port_1 + network.outpoing.packets_ps_server_1b_1_port_1_test_nested_level2: + - test_nested_level2 + - network.outpoing.packets_ps_server_1b_1_port_1 feature_pd_server_1b_port_0: - abstract_pd_server_1b - - feature_pd_server_1b_pd_server_1b_port + - feature_pd_server_1b_pd_server_1b_port_0 memory_server_1b_ps_1_test_nested_level2: - test_nested_level2 - memory_server_1b_ps_1 @@ -223,9 +235,6 @@ topology_template: os_server_1b_ps_1_test_nested_level2: - test_nested_level2 - os_server_1b_ps_1 - network.incoming.bytes_ps_server_1b_port_2_test_nested_level2: - - test_nested_level2 - - network.incoming.bytes_ps_server_1b_port_2 disk.root.size_server_1b_ps_1_test_nested_level2: - test_nested_level2 - disk.root.size_server_1b_ps_1 @@ -250,9 +259,6 @@ topology_template: disk.write.requests.rate_server_1b_pd_0: - abstract_pd_server_1b - disk.write.requests.rate_pd_server_1b - network.incoming.bytes.rate_ps_server_1b_port_2_test_nested_level2: - - test_nested_level2 - - network.incoming.bytes.rate_ps_server_1b_port_2 disk.latency_server_1b_ps_1_test_nested_level2: - test_nested_level2 - disk.latency_server_1b_ps_1 @@ -304,6 +310,9 @@ topology_template: disk.read.requests_server_1b_pd_0: - abstract_pd_server_1b - disk.read.requests_pd_server_1b + network.outgoing.packets.rate_ps_server_1b_1_port_1_test_nested_level2: + - test_nested_level2 + - network.outgoing.packets.rate_ps_server_1b_1_port_1 disk.device.write.bytes.rate_server_1b_pd_0: - abstract_pd_server_1b - disk.device.write.bytes.rate_pd_server_1b @@ -334,15 +343,9 @@ topology_template: disk.capacity_server_1b_ps_1_test_nested_level2: - test_nested_level2 - disk.capacity_server_1b_ps_1 - feature_ps_server_1b_port_2_test_nested_level2: - - test_nested_level2 - - feature_ps_server_1b_port_2 disk.allocation_server_1b_ps_1_test_nested_level2: - test_nested_level2 - disk.allocation_server_1b_ps_1 - network.outgoing.bytes_ps_server_1b_port_2_test_nested_level2: - - test_nested_level2 - - network.outgoing.bytes_ps_server_1b_port_2 endpoint_server_1b_ps_1_test_nested_level2: - test_nested_level2 - endpoint_server_1b_ps_1 @@ -361,9 +364,6 @@ topology_template: end_point_packet_external_network: - packet_external_network - end_point - forwarder_ps_server_1b_port_2_test_nested_level2: - - test_nested_level2 - - forwarder_ps_server_1b_port_2 disk.write.bytes_server_1b_pd_0: - abstract_pd_server_1b - disk.write.bytes_pd_server_1b @@ -382,6 +382,12 @@ topology_template: disk.device.read.requests_server_1b_ps_2_test_nested_level2: - test_nested_level2 - disk.device.read.requests_server_1b_ps_2 + binding_ps_server_1b_1_port_1_test_nested_level2: + - test_nested_level2 + - binding_ps_server_1b_1_port_1 + network.incoming.bytes_ps_server_1b_1_port_1_test_nested_level2: + - test_nested_level2 + - network.incoming.bytes_ps_server_1b_1_port_1 disk.device.write.requests.rate_server_1b_pd_0: - abstract_pd_server_1b - disk.device.write.requests.rate_pd_server_1b @@ -393,10 +399,16 @@ topology_template: - feature_template_Vlan_vmi_1_test_resourceGroup_1 network.outgoing.bytes_pd_server_1b_port_0: - abstract_pd_server_1b - - network.outgoing.bytes_pd_server_1b_pd_server_1b_port + - network.outgoing.bytes_pd_server_1b_pd_server_1b_port_0 + network.incoming.packets.rate_ps_server_1b_1_port_1_test_nested_level2: + - test_nested_level2 + - network.incoming.packets.rate_ps_server_1b_1_port_1 disk.read.requests_server_1b_ps_1_test_nested_level2: - test_nested_level2 - disk.read.requests_server_1b_ps_1 + network.outgoing.bytes_ps_server_1b_1_port_1_test_nested_level2: + - test_nested_level2 + - network.outgoing.bytes_ps_server_1b_1_port_1 memory.usage_server_1b_ps_1_test_nested_level2: - test_nested_level2 - memory.usage_server_1b_ps_1 @@ -414,7 +426,7 @@ topology_template: - memory.resident_pd_server_1b network.outgoing.packets.rate_pd_server_1b_port_0: - abstract_pd_server_1b - - network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port + - network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port_0 disk.device.read.bytes_server_1b_pd_0: - abstract_pd_server_1b - disk.device.read.bytes_pd_server_1b @@ -426,7 +438,7 @@ topology_template: - vcpus_server_1b_ps_2 attachment_pd_server_1b_port_0: - abstract_pd_server_1b - - attachment_pd_server_1b_pd_server_1b_port + - attachment_pd_server_1b_pd_server_1b_port_0 attachment_packet_ext_network_test_nested_level2: - test_nested_level2 - attachment_packet_ext_network @@ -495,13 +507,10 @@ topology_template: - disk.device.read.requests_server_1b_ps_1 network.outgoing.bytes.rate_pd_server_1b_port_0: - abstract_pd_server_1b - - network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port + - network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port_0 network.incoming.packets.rate_pd_server_1b_port_0: - abstract_pd_server_1b - - network.incoming.packets.rate_pd_server_1b_pd_server_1b_port - network.incoming.packets_ps_server_1b_port_2_test_nested_level2: - - test_nested_level2 - - network.incoming.packets_ps_server_1b_port_2 + - network.incoming.packets.rate_pd_server_1b_pd_server_1b_port_0 os_server_1b_pd_0: - abstract_pd_server_1b - os_pd_server_1b @@ -543,13 +552,10 @@ topology_template: - attachment_packet_int_network network.incoming.bytes_pd_server_1b_port_0: - abstract_pd_server_1b - - network.incoming.bytes_pd_server_1b_pd_server_1b_port + - network.incoming.bytes_pd_server_1b_pd_server_1b_port_0 disk.root.size_server_1b_pd_0: - abstract_pd_server_1b - disk.root.size_pd_server_1b - binding_ps_server_1b_port_2_test_nested_level2: - - test_nested_level2 - - binding_ps_server_1b_port_2 disk.ephemeral.size_server_1b_ps_1_test_nested_level2: - test_nested_level2 - disk.ephemeral.size_server_1b_ps_1 @@ -571,6 +577,9 @@ topology_template: disk.device.usage_server_1b_pd_0: - abstract_pd_server_1b - disk.device.usage_pd_server_1b + network.incoming.bytes.rate_ps_server_1b_1_port_1_test_nested_level2: + - test_nested_level2 + - network.incoming.bytes.rate_ps_server_1b_1_port_1 cpu_server_1b_ps_2_test_nested_level2: - test_nested_level2 - cpu_server_1b_ps_2 @@ -606,7 +615,7 @@ topology_template: - disk.write.bytes_server_1b_ps_2 binding_pd_server_1b_port_0: - abstract_pd_server_1b - - binding_pd_server_1b_pd_server_1b_port + - binding_pd_server_1b_pd_server_1b_port_0 host_server_1b_ps_2_test_nested_level2: - test_nested_level2 - host_server_1b_ps_2 @@ -616,18 +625,15 @@ topology_template: link_packet_internal_network: - packet_internal_network - link - network.incoming.packets.rate_ps_server_1b_port_2_test_nested_level2: - - test_nested_level2 - - network.incoming.packets.rate_ps_server_1b_port_2 disk.write.requests_server_1b_pd_0: - abstract_pd_server_1b - disk.write.requests_pd_server_1b - attachment_ps_server_1b_port_2_test_nested_level2: - - test_nested_level2 - - attachment_ps_server_1b_port_2 disk.device.allocation_server_1b_ps_1_test_nested_level2: - test_nested_level2 - disk.device.allocation_server_1b_ps_1 + attachment_ps_server_1b_1_port_1_test_nested_level2: + - test_nested_level2 + - attachment_ps_server_1b_1_port_1 disk.device.read.bytes.rate_server_1b_ps_2_test_nested_level2: - test_nested_level2 - disk.device.read.bytes.rate_server_1b_ps_2 @@ -637,9 +643,6 @@ topology_template: memory_server_1b_ps_2_test_nested_level2: - test_nested_level2 - memory_server_1b_ps_2 - network.outgoing.bytes.rate_ps_server_1b_port_2_test_nested_level2: - - test_nested_level2 - - network.outgoing.bytes.rate_ps_server_1b_port_2 os_server_1b_ps_2_test_nested_level2: - test_nested_level2 - os_server_1b_ps_2 @@ -666,7 +669,7 @@ topology_template: - disk.device.read.requests_pd_server_1b network.incoming.packets_pd_server_1b_port_0: - abstract_pd_server_1b - - network.incoming.packets_pd_server_1b_pd_server_1b_port + - network.incoming.packets_pd_server_1b_pd_server_1b_port_0 disk.read.bytes.rate_server_1b_pd_0: - abstract_pd_server_1b - disk.read.bytes.rate_pd_server_1b @@ -682,12 +685,9 @@ topology_template: disk.latency_server_1b_pd_0: - abstract_pd_server_1b - disk.latency_pd_server_1b - network.outpoing.packets_ps_server_1b_port_2_test_nested_level2: - - test_nested_level2 - - network.outpoing.packets_ps_server_1b_port_2 network.incoming.bytes.rate_pd_server_1b_port_0: - abstract_pd_server_1b - - network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port + - network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port_0 disk.write.requests.rate_server_1b_ps_2_test_nested_level2: - test_nested_level2 - disk.write.requests.rate_server_1b_ps_2 @@ -695,6 +695,9 @@ topology_template: - test_nested_level2 - disk.write.requests.rate_server_1b_ps_1 requirements: + dependency_ps_server_1b_1_port_1_test_nested_level2: + - test_nested_level2 + - dependency_ps_server_1b_1_port_1 dependency_server_1b_ps_2_test_nested_level2: - test_nested_level2 - dependency_server_1b_ps_2 @@ -706,13 +709,10 @@ topology_template: - dependency_ps_server_1b_port_1 dependency_pd_server_1b_port_0: - abstract_pd_server_1b - - dependency_pd_server_1b_pd_server_1b_port + - dependency_pd_server_1b_pd_server_1b_port_0 dependency_template_Vlan_vmi_1_test_resourceGroup_0: - test_resourceGroup_0 - dependency_template_Vlan_vmi_1 - dependency_ps_server_1b_port_2_test_nested_level2: - - test_nested_level2 - - dependency_ps_server_1b_port_2 dependency_test_resourceGroup_0: - test_resourceGroup_0 - dependency 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 5aa4c84390..08a98daf1f 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 @@ -82,28 +82,28 @@ topology_template: directives: - substitutable properties: - port_ps_server_1b_port_mac_requirements: - mac_count_required: - is_required: false - port_ps_server_1b_port_fixed_ips: - - ip_address: - get_input: - - ps_server_1b_ips - - 1 - vm_flavor_name: - get_input: ps_server_1b_flavor - port_ps_server_1b_port_network: - - packet_int_network - port_ps_server_1b_port_ip_requirements: + port_ps_server_1b_port_1_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false + vm_flavor_name: + get_input: ps_server_1b_flavor + port_ps_server_1b_port_1_mac_requirements: + mac_count_required: + is_required: false vm_image_name: get_input: ps_server_1b_image - port_ps_server_1b_port_replacement_policy: + port_ps_server_1b_port_1_replacement_policy: - AUTO + port_ps_server_1b_port_1_fixed_ips: + - ip_address: + get_input: + - ps_server_1b_ips + - 1 + port_ps_server_1b_port_1_network: + - packet_int_network compute_ps_server_1b_availability_zone: - get_input: availability_zone_0 compute_ps_server_1b_name: @@ -119,7 +119,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_ps_server_1b_ps_server_1b_port: + - link_ps_server_1b_ps_server_1b_port_1: capability: tosca.capabilities.network.Linkable node: packet_int_network relationship: tosca.relationships.network.LinksTo @@ -128,34 +128,34 @@ topology_template: directives: - substitutable properties: - port_ps_server_1b_port_mac_requirements: - mac_count_required: - is_required: false subinterface_nested_vlan_service_template_filter_count: - 9 - port_ps_server_1b_port_fixed_ips: - - ip_address: - get_input: - - ps_server_1b_ips - - 0 - vm_flavor_name: - get_input: ps_server_1b_flavor - port_ps_server_1b_port_network: - - packet_int_network - subinterface_nested_vlan_net1: - - packet_ext_network - port_ps_server_1b_port_ip_requirements: + port_ps_server_1b_port_1_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false + vm_flavor_name: + get_input: ps_server_1b_flavor + port_ps_server_1b_port_1_mac_requirements: + mac_count_required: + is_required: false + subinterface_nested_vlan_net1: + - packet_ext_network vm_image_name: get_input: ps_server_1b_image - port_ps_server_1b_port_replacement_policy: + port_ps_server_1b_port_1_replacement_policy: - AUTO + port_ps_server_1b_port_1_fixed_ips: + - ip_address: + get_input: + - ps_server_1b_ips + - 0 subinterface_nested_vlan_parent_interface: - ps_server_1b_port_1 + port_ps_server_1b_port_1_network: + - packet_int_network compute_ps_server_1b_availability_zone: - get_input: availability_zone_0 compute_ps_server_1b_name: @@ -171,11 +171,11 @@ topology_template: - service_template_filter - index_value requirements: - - link_ps_server_1b_ps_server_1b_port: + - link_ps_server_1b_ps_server_1b_port_1: capability: tosca.capabilities.network.Linkable node: packet_int_network relationship: tosca.relationships.network.LinksTo - - subinterface_link_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: + - subinterface_link_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_1_nested_vlan: capability: tosca.capabilities.network.Linkable node: packet_ext_network relationship: tosca.relationships.network.LinksTo @@ -193,9 +193,6 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.heat.nested_pattern5_levelTwo capabilities: - binding_ps_server_1b_port_2: - - abstract_ps_server_1b_1 - - binding_ps_server_1b_ps_server_1b_port disk.device.latency_server_1b_ps_1: - abstract_ps_server_1b - disk.device.latency_ps_server_1b @@ -219,7 +216,7 @@ topology_template: - disk.device.write.requests.rate_ps_server_1b binding_ps_server_1b_port_1: - abstract_ps_server_1b - - binding_ps_server_1b_ps_server_1b_port + - binding_ps_server_1b_ps_server_1b_port_1 disk.read.bytes_server_1b_ps_1: - abstract_ps_server_1b - disk.read.bytes_ps_server_1b @@ -232,15 +229,12 @@ topology_template: disk.root.size_server_1b_ps_1: - abstract_ps_server_1b - disk.root.size_ps_server_1b - network.incoming.bytes.rate_ps_server_1b_port_2: - - abstract_ps_server_1b_1 - - network.incoming.bytes.rate_ps_server_1b_ps_server_1b_port disk.root.size_server_1b_ps_2: - abstract_ps_server_1b_1 - disk.root.size_ps_server_1b network.incoming.bytes.rate_ps_server_1b_port_1: - abstract_ps_server_1b - - network.incoming.bytes.rate_ps_server_1b_ps_server_1b_port + - network.incoming.bytes.rate_ps_server_1b_ps_server_1b_port_1 disk.device.read.requests.rate_server_1b_ps_1: - abstract_ps_server_1b - disk.device.read.requests.rate_ps_server_1b @@ -250,12 +244,9 @@ topology_template: feature_test_resourceGroup_1: - test_resourceGroup_1 - feature - network.incoming.bytes_ps_server_1b_port_2: - - abstract_ps_server_1b_1 - - network.incoming.bytes_ps_server_1b_ps_server_1b_port network.incoming.bytes_ps_server_1b_port_1: - abstract_ps_server_1b - - network.incoming.bytes_ps_server_1b_ps_server_1b_port + - network.incoming.bytes_ps_server_1b_ps_server_1b_port_1 attachment_packet_int_network: - packet_int_network - attachment @@ -297,7 +288,7 @@ topology_template: - memory_ps_server_1b network.outgoing.packets.rate_ps_server_1b_port_1: - abstract_ps_server_1b - - network.outgoing.packets.rate_ps_server_1b_ps_server_1b_port + - network.outgoing.packets.rate_ps_server_1b_ps_server_1b_port_1 disk.capacity_server_1b_ps_1: - abstract_ps_server_1b - disk.capacity_ps_server_1b @@ -309,13 +300,7 @@ topology_template: - instance_ps_server_1b forwarder_ps_server_1b_port_1: - abstract_ps_server_1b - - forwarder_ps_server_1b_ps_server_1b_port - forwarder_ps_server_1b_port_2: - - abstract_ps_server_1b_1 - - forwarder_ps_server_1b_ps_server_1b_port - network.outgoing.packets.rate_ps_server_1b_port_2: - - abstract_ps_server_1b_1 - - network.outgoing.packets.rate_ps_server_1b_ps_server_1b_port + - forwarder_ps_server_1b_ps_server_1b_port_1 link_packet_int_network: - packet_int_network - link @@ -325,6 +310,9 @@ topology_template: feature_template_Vlan_vmi_1_test_resourceGroup_1: - test_resourceGroup_1 - feature_template_Vlan_vmi_1 + network.outgoing.packets.rate_ps_server_1b_1_port_1: + - abstract_ps_server_1b_1 + - network.outgoing.packets.rate_ps_server_1b_ps_server_1b_port_1 disk.device.capacity_server_1b_ps_1: - abstract_ps_server_1b - disk.device.capacity_ps_server_1b @@ -334,9 +322,9 @@ topology_template: disk.device.capacity_server_1b_ps_2: - abstract_ps_server_1b_1 - disk.device.capacity_ps_server_1b - network.incoming.packets_ps_server_1b_port_2: + network.outgoing.bytes_ps_server_1b_1_port_1: - abstract_ps_server_1b_1 - - network.incoming.packets_ps_server_1b_ps_server_1b_port + - network.outgoing.bytes_ps_server_1b_ps_server_1b_port_1 disk.device.iops_server_1b_ps_2: - abstract_ps_server_1b_1 - disk.device.iops_ps_server_1b @@ -345,19 +333,22 @@ topology_template: - disk.device.iops_ps_server_1b network.incoming.packets_ps_server_1b_port_1: - abstract_ps_server_1b - - network.incoming.packets_ps_server_1b_ps_server_1b_port + - network.incoming.packets_ps_server_1b_ps_server_1b_port_1 network.outgoing.bytes.rate_ps_server_1b_port_1: - abstract_ps_server_1b - - network.outgoing.bytes.rate_ps_server_1b_ps_server_1b_port - network.outpoing.packets_ps_server_1b_port_2: - - abstract_ps_server_1b_1 - - network.outpoing.packets_ps_server_1b_ps_server_1b_port + - network.outgoing.bytes.rate_ps_server_1b_ps_server_1b_port_1 network.outpoing.packets_ps_server_1b_port_1: - abstract_ps_server_1b - - network.outpoing.packets_ps_server_1b_ps_server_1b_port + - network.outpoing.packets_ps_server_1b_ps_server_1b_port_1 endpoint_server_1b_ps_1: - abstract_ps_server_1b - endpoint_ps_server_1b + network.incoming.packets.rate_ps_server_1b_1_port_1: + - abstract_ps_server_1b_1 + - network.incoming.packets.rate_ps_server_1b_ps_server_1b_port_1 + network.incoming.bytes.rate_ps_server_1b_1_port_1: + - abstract_ps_server_1b_1 + - network.incoming.bytes.rate_ps_server_1b_ps_server_1b_port_1 disk.device.allocation_server_1b_ps_1: - abstract_ps_server_1b - disk.device.allocation_ps_server_1b @@ -376,12 +367,12 @@ topology_template: host_server_1b_ps_1: - abstract_ps_server_1b - host_ps_server_1b + attachment_ps_server_1b_1_port_1: + - abstract_ps_server_1b_1 + - attachment_ps_server_1b_ps_server_1b_port_1 feature_packet_int_network: - packet_int_network - feature - network.outgoing.bytes.rate_ps_server_1b_port_2: - - abstract_ps_server_1b_1 - - network.outgoing.bytes.rate_ps_server_1b_ps_server_1b_port disk.write.bytes.rate_server_1b_ps_1: - abstract_ps_server_1b - disk.write.bytes.rate_ps_server_1b @@ -406,6 +397,9 @@ topology_template: scalable_server_1b_ps_1: - abstract_ps_server_1b - scalable_ps_server_1b + network.outpoing.packets_ps_server_1b_1_port_1: + - abstract_ps_server_1b_1 + - network.outpoing.packets_ps_server_1b_ps_server_1b_port_1 scalable_server_1b_ps_2: - abstract_ps_server_1b_1 - scalable_ps_server_1b @@ -424,9 +418,15 @@ topology_template: vcpus_server_1b_ps_1: - abstract_ps_server_1b - vcpus_ps_server_1b + network.outgoing.bytes.rate_ps_server_1b_1_port_1: + - abstract_ps_server_1b_1 + - network.outgoing.bytes.rate_ps_server_1b_ps_server_1b_port_1 vcpus_server_1b_ps_2: - abstract_ps_server_1b_1 - vcpus_ps_server_1b + network.incoming.bytes_ps_server_1b_1_port_1: + - abstract_ps_server_1b_1 + - network.incoming.bytes_ps_server_1b_ps_server_1b_port_1 disk.read.bytes.rate_server_1b_ps_2: - abstract_ps_server_1b_1 - disk.read.bytes.rate_ps_server_1b @@ -451,9 +451,6 @@ topology_template: disk.write.requests_server_1b_ps_2: - abstract_ps_server_1b_1 - disk.write.requests_ps_server_1b - network.incoming.packets.rate_ps_server_1b_port_2: - - abstract_ps_server_1b_1 - - network.incoming.packets.rate_ps_server_1b_ps_server_1b_port disk.latency_server_1b_ps_2: - abstract_ps_server_1b_1 - disk.latency_ps_server_1b @@ -462,7 +459,7 @@ topology_template: - disk.latency_ps_server_1b network.incoming.packets.rate_ps_server_1b_port_1: - abstract_ps_server_1b - - network.incoming.packets.rate_ps_server_1b_ps_server_1b_port + - network.incoming.packets.rate_ps_server_1b_ps_server_1b_port_1 binding_server_1b_ps_1: - abstract_ps_server_1b - binding_ps_server_1b @@ -489,31 +486,37 @@ topology_template: - end_point attachment_ps_server_1b_port_1: - abstract_ps_server_1b - - attachment_ps_server_1b_ps_server_1b_port - attachment_ps_server_1b_port_2: - - abstract_ps_server_1b_1 - - attachment_ps_server_1b_ps_server_1b_port + - attachment_ps_server_1b_ps_server_1b_port_1 attachment_packet_ext_network: - packet_ext_network - attachment + network.incoming.packets_ps_server_1b_1_port_1: + - abstract_ps_server_1b_1 + - network.incoming.packets_ps_server_1b_ps_server_1b_port_1 os_server_1b_ps_2: - abstract_ps_server_1b_1 - os_ps_server_1b os_server_1b_ps_1: - abstract_ps_server_1b - os_ps_server_1b - network.outgoing.bytes_ps_server_1b_port_2: + binding_ps_server_1b_1_port_1: - abstract_ps_server_1b_1 - - network.outgoing.bytes_ps_server_1b_ps_server_1b_port + - binding_ps_server_1b_ps_server_1b_port_1 network.outgoing.bytes_ps_server_1b_port_1: - abstract_ps_server_1b - - network.outgoing.bytes_ps_server_1b_ps_server_1b_port + - network.outgoing.bytes_ps_server_1b_ps_server_1b_port_1 + feature_ps_server_1b_1_port_1: + - abstract_ps_server_1b_1 + - feature_ps_server_1b_ps_server_1b_port_1 disk.usage_server_1b_ps_2: - abstract_ps_server_1b_1 - disk.usage_ps_server_1b disk.usage_server_1b_ps_1: - abstract_ps_server_1b - disk.usage_ps_server_1b + forwarder_ps_server_1b_1_port_1: + - abstract_ps_server_1b_1 + - forwarder_ps_server_1b_ps_server_1b_port_1 disk.device.read.bytes_server_1b_ps_2: - abstract_ps_server_1b_1 - disk.device.read.bytes_ps_server_1b @@ -531,10 +534,7 @@ topology_template: - feature feature_ps_server_1b_port_1: - abstract_ps_server_1b - - feature_ps_server_1b_ps_server_1b_port - feature_ps_server_1b_port_2: - - abstract_ps_server_1b_1 - - feature_ps_server_1b_ps_server_1b_port + - feature_ps_server_1b_ps_server_1b_port_1 disk.device.read.bytes.rate_server_1b_ps_1: - abstract_ps_server_1b - disk.device.read.bytes.rate_ps_server_1b @@ -545,18 +545,18 @@ topology_template: dependency_test_resourceGroup_1: - test_resourceGroup_1 - dependency - dependency_ps_server_1b_port_2: - - abstract_ps_server_1b_1 - - dependency_ps_server_1b_ps_server_1b_port dependency_ps_server_1b_port_1: - abstract_ps_server_1b - - dependency_ps_server_1b_ps_server_1b_port + - dependency_ps_server_1b_ps_server_1b_port_1 dependency_packet_int_network: - packet_int_network - dependency local_storage_server_1b_ps_1: - abstract_ps_server_1b - local_storage_ps_server_1b + dependency_ps_server_1b_1_port_1: + - abstract_ps_server_1b_1 + - dependency_ps_server_1b_ps_server_1b_port_1 dependency_packet_ext_network: - packet_ext_network - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/in/nested_pattern5_levelTwo.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/in/nested_pattern5_levelTwo.yml index dc8f67e346..bf477345de 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/in/nested_pattern5_levelTwo.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/in/nested_pattern5_levelTwo.yml @@ -66,7 +66,7 @@ resources: networks: - port: { get_resource: ps_server_1b_port_1 } - ps_server_1b_port_2: + ps_server_1b_1_port_1: type: OS::Neutron::Port properties: network: {get_resource: packet_int_network} @@ -81,7 +81,7 @@ resources: availability_zone: { get_param: availability_zone_0 } flavor: { get_param: ps_server_1b_flavor } networks: - - port: { get_resource: ps_server_1b_port_2 } + - port: { get_resource: ps_server_1b_1_port_1 } test_resourceGroup_1: type: OS::Heat::ResourceGroup @@ -100,5 +100,5 @@ resources: resource_def: type: nested_vlan.yml properties: - parent_interface: { get_resource: ps_server_1b_port_2} + parent_interface: { get_resource: ps_server_1b_1_port_1} net1: { get_resource: packet_ext_network} \ 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/complexVFCWithDiffSubInfCountScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml index 519a0da24b..e44facaecf 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -171,7 +171,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_ps_server_1b_port_2_test_nested_level2: + - dependency_ps_server_1b_1_port_1_test_nested_level2: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn @@ -213,14 +213,14 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_ps_server_1b_port_2_test_nested_level2: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + scalable_server_1b_ps_1_test_nested_level2: + type: tosca.capabilities.Scalable occurrences: - 1 - UNBOUNDED - scalable_server_1b_ps_1_test_nested_level2: - type: tosca.capabilities.Scalable + network.outgoing.bytes.rate_ps_server_1b_1_port_1_test_nested_level2: + 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 @@ -253,6 +253,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets_ps_server_1b_1_port_1_test_nested_level2: + 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_server_1b_ps_2_test_nested_level2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -297,12 +303,22 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_ps_server_1b_1_port_1_test_nested_level2: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED network.outpoing.packets_pd_server_1b_port_0: 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_ps_server_1b_1_port_1_test_nested_level2: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED cpu_util_server_1b_ps_2_test_nested_level2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -315,6 +331,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_ps_server_1b_1_port_1_test_nested_level2: + 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_pd_server_1b_port_0: type: tosca.capabilities.Node occurrences: @@ -336,12 +358,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_ps_server_1b_port_2_test_nested_level2: - 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_server_1b_ps_1_test_nested_level2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -387,12 +403,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_ps_server_1b_port_2_test_nested_level2: - 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_server_1b_ps_1_test_nested_level2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -497,6 +507,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.packets.rate_ps_server_1b_1_port_1_test_nested_level2: + 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_server_1b_pd_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -555,23 +571,12 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_ps_server_1b_port_2_test_nested_level2: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.allocation_server_1b_ps_1_test_nested_level2: 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_ps_server_1b_port_2_test_nested_level2: - 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_server_1b_ps_1_test_nested_level2: type: tosca.capabilities.Endpoint.Admin occurrences: @@ -600,11 +605,6 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_ps_server_1b_port_2_test_nested_level2: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED disk.write.bytes_server_1b_pd_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -640,6 +640,20 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_ps_server_1b_1_port_1_test_nested_level2: + 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 + network.incoming.bytes_ps_server_1b_1_port_1_test_nested_level2: + 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_server_1b_pd_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -658,12 +672,24 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets.rate_ps_server_1b_1_port_1_test_nested_level2: + 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_server_1b_ps_1_test_nested_level2: 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_ps_server_1b_1_port_1_test_nested_level2: + 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_server_1b_ps_1_test_nested_level2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -866,12 +892,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_ps_server_1b_port_2_test_nested_level2: - 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_server_1b_pd_0: type: tosca.capabilities.OperatingSystem occurrences: @@ -966,14 +986,6 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_ps_server_1b_port_2_test_nested_level2: - 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 disk.ephemeral.size_server_1b_ps_1_test_nested_level2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1015,6 +1027,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes.rate_ps_server_1b_1_port_1_test_nested_level2: + 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_server_1b_ps_2_test_nested_level2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1105,29 +1123,23 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_ps_server_1b_port_2_test_nested_level2: + disk.write.requests_server_1b_pd_0: 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_server_1b_pd_0: + disk.device.allocation_server_1b_ps_1_test_nested_level2: 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 - attachment_ps_server_1b_port_2_test_nested_level2: + attachment_ps_server_1b_1_port_1_test_nested_level2: type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - disk.device.allocation_server_1b_ps_1_test_nested_level2: - 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_server_1b_ps_2_test_nested_level2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1145,12 +1157,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_ps_server_1b_port_2_test_nested_level2: - 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_server_1b_ps_2_test_nested_level2: type: tosca.capabilities.OperatingSystem occurrences: @@ -1237,12 +1243,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_ps_server_1b_port_2_test_nested_level2: - 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_pd_server_1b_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1276,6 +1276,14 @@ node_types: status: SUPPORTED entry_schema: type: float + port_pd_server_1b_port_0_subnetpoolid: + type: string + required: true + status: SUPPORTED + port_pd_server_1b_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED index_value: type: integer description: Index value of this substitution service template runtime instance @@ -1284,108 +1292,100 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 + port_pd_server_1b_port_0_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd_server_1b_port_0_network_role_tag: + type: string + required: true + status: SUPPORTED vm_flavor_name: type: string required: true status: SUPPORTED - port_pd_server_1b_port_vlan_requirements: + port_pd_server_1b_port_0_order: + type: integer + required: true + status: SUPPORTED + port_pd_server_1b_port_0_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: string subinterface_nested_vlan_net1: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd_server_1b_port_related_networks: + port_pd_server_1b_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd_server_1b_port_network_role_tag: - type: string - required: true - status: SUPPORTED + type: org.openecomp.datatypes.network.VlanRequirements vm_image_name: type: string required: true status: SUPPORTED - port_pd_server_1b_port_replacement_policy: + port_pd_server_1b_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd_server_1b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_pd_server_1b_port_network_role: - type: string - required: true - status: SUPPORTED + type: org.openecomp.datatypes.network.RelatedNetworksAssignments subinterface_nested_vlan_parent_interface: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd_server_1b_port_fixed_ips: + port_pd_server_1b_port_0_replacement_policy: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_pd_server_1b_port_network: - type: list + type: string + port_pd_server_1b_port_0_network_role: + type: string + required: true + status: SUPPORTED + port_pd_server_1b_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: string compute_pd_server_1b_availability_zone: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd_server_1b_port_order: - type: integer - required: true - status: SUPPORTED - port_pd_server_1b_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_pd_server_1b_port_ip_requirements: + port_pd_server_1b_port_0_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd_server_1b_port_subnetpoolid: - type: string - required: true - status: SUPPORTED + type: org.openecomp.datatypes.heat.neutron.port.FixedIps requirements: - - dependency_pd_server_1b_pd_server_1b_port_nested_vlan: + - dependency_pd_server_1b_pd_server_1b_port_0_nested_vlan: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - dependency_template_subint_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: + - dependency_template_subint_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_0_nested_vlan: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - subinterface_link_template_subint_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: + - subinterface_link_template_subint_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_0_nested_vlan: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -1405,14 +1405,14 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_1b_pd_server_1b_port: + - dependency_pd_server_1b_pd_server_1b_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_1b_pd_server_1b_port: + - link_pd_server_1b_pd_server_1b_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -1425,11 +1425,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_1b_pd_server_1b_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED host_pd_server_1b: type: tosca.capabilities.Container valid_source_types: @@ -1449,34 +1444,31 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port: + cpu.delta_pd_server_1b: 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_pd_server_1b: + disk.device.read.requests_pd_server_1b: 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_pd_server_1b_pd_server_1b_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - network.incoming.bytes_pd_server_1b_pd_server_1b_port: + network.incoming.packets.rate_pd_server_1b_pd_server_1b_port_0: 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_pd_server_1b: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_pd_server_1b_pd_server_1b_port_0: + 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: - - 1 + - 0 - UNBOUNDED feature_pd_server_1b: type: tosca.capabilities.Node @@ -1489,14 +1481,6 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_1b_pd_server_1b_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 cpu_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1509,6 +1493,11 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_template_subint_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_0_nested_vlan: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.device.read.requests.rate_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1532,7 +1521,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_1b_pd_server_1b_port: + network.incoming.bytes_pd_server_1b_pd_server_1b_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1562,14 +1551,15 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.usage_pd_server_1b: + network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port_0: 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 - attachment_pd_server_1b_pd_server_1b_port: - type: tosca.capabilities.Attachment + disk.device.usage_pd_server_1b: + 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 @@ -1585,13 +1575,23 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_pd_server_1b_pd_server_1b_port_0_nested_vlan: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.ephemeral.size_pd_server_1b: 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_pd_server_1b_pd_server_1b_port: + forwarder_pd_server_1b_pd_server_1b_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes_pd_server_1b_pd_server_1b_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1620,12 +1620,23 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port_0: + 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.iops_pd_server_1b: 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_pd_server_1b_pd_server_1b_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.write.bytes_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1649,12 +1660,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_1b_pd_server_1b_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 instance_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1666,35 +1671,30 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_template_subint_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED cpu_util_pd_server_1b: 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_pd_server_1b_pd_server_1b_port: + network.outpoing.packets_pd_server_1b_pd_server_1b_port_0: 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_pd_server_1b: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_pd_server_1b_pd_server_1b_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - feature_pd_server_1b_pd_server_1b_port_nested_vlan: - type: tosca.capabilities.Node + memory.resident_pd_server_1b: + 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_pd_server_1b_pd_server_1b_port: + network.incoming.packets_pd_server_1b_pd_server_1b_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1718,19 +1718,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port: + disk.capacity_pd_server_1b: 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_pd_server_1b: + disk.usage_pd_server_1b: 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_pd_server_1b: + network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1852,7 +1852,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_ps_server_1b_port_2: + - dependency_ps_server_1b_1_port_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn @@ -1888,14 +1888,6 @@ node_types: - 0 - UNBOUNDED capabilities: - binding_ps_server_1b_port_2: - 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 disk.device.latency_server_1b_ps_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1970,12 +1962,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_ps_server_1b_port_2: - 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_server_1b_ps_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2005,12 +1991,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_ps_server_1b_port_2: - 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_ps_server_1b_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2123,23 +2103,18 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_ps_server_1b_port_2: - type: org.openecomp.capabilities.Forwarder + link_packet_int_network: + type: tosca.capabilities.network.Linkable occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_ps_server_1b_port_2: + instance_server_1b_ps_2: 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 - link_packet_int_network: - type: tosca.capabilities.network.Linkable - occurrences: - - 1 - - UNBOUNDED - instance_server_1b_ps_2: + network.outgoing.packets.rate_ps_server_1b_1_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2162,7 +2137,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_ps_server_1b_port_2: + network.outgoing.bytes_ps_server_1b_1_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2192,20 +2167,26 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_ps_server_1b_port_2: + network.outpoing.packets_ps_server_1b_port_1: 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_ps_server_1b_port_1: + endpoint_server_1b_ps_1: + type: tosca.capabilities.Endpoint.Admin + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets.rate_ps_server_1b_1_port_1: 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_server_1b_ps_1: - type: tosca.capabilities.Endpoint.Admin + network.incoming.bytes.rate_ps_server_1b_1_port_1: + 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 @@ -2246,14 +2227,13 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_packet_int_network: - type: tosca.capabilities.Node + attachment_ps_server_1b_1_port_1: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_ps_server_1b_port_2: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_packet_int_network: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -2304,6 +2284,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_ps_server_1b_1_port_1: + 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_server_1b_ps_2: type: tosca.capabilities.Scalable occurrences: @@ -2337,6 +2323,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes.rate_ps_server_1b_1_port_1: + 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_server_1b_ps_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2348,6 +2340,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes_ps_server_1b_1_port_1: + 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_template_subint_Vlan_vmi_1_test_resourceGroup_1: type: tosca.capabilities.Node occurrences: @@ -2401,12 +2399,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_ps_server_1b_port_2: - 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_server_1b_ps_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2474,13 +2466,14 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_ps_server_1b_port_2: + attachment_packet_ext_network: type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - attachment_packet_ext_network: - type: tosca.capabilities.Attachment + network.incoming.packets_ps_server_1b_1_port_1: + 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 @@ -2494,20 +2487,27 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_ps_server_1b_1_port_1: + 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 feature_test_resourceGroup_2: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_ps_server_1b_port_2: + network.outgoing.bytes_ps_server_1b_port_1: 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_ps_server_1b_port_1: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_ps_server_1b_1_port_1: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -2523,6 +2523,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_ps_server_1b_1_port_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.read.bytes_server_1b_ps_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2557,11 +2562,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_ps_server_1b_port_2: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.device.read.bytes.rate_server_1b_ps_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2577,32 +2577,22 @@ node_types: org.openecomp.resource.abstract.nodes.ps_server_1b: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_ps_server_1b_port_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_ps_server_1b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_ps_server_1b_port_1_network_role_tag: + type: string required: true status: SUPPORTED - subinterface_nested_vlan_service_template_filter_count: + port_ps_server_1b_port_1_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: float - port_ps_server_1b_port_network_role_tag: - type: string - required: true - status: SUPPORTED - port_ps_server_1b_port_fixed_ips: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + subinterface_nested_vlan_service_template_filter_count: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps + type: float index_value: type: integer description: Index value of this substitution service template runtime instance @@ -2611,72 +2601,82 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_ps_server_1b_port_order: - type: integer + port_ps_server_1b_port_1_ip_requirements: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements vm_flavor_name: type: string required: true status: SUPPORTED - port_ps_server_1b_port_related_networks: + port_ps_server_1b_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_ps_server_1b_port_1_network_role: + type: string + required: true + status: SUPPORTED + subinterface_nested_vlan_net1: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_ps_server_1b_port_network: + type: string + vm_image_name: + type: string + required: true + status: SUPPORTED + port_ps_server_1b_port_1_replacement_policy: type: list required: true status: SUPPORTED entry_schema: type: string - port_ps_server_1b_port_exCP_naming: + port_ps_server_1b_port_1_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - subinterface_nested_vlan_net1: + port_ps_server_1b_port_1_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: string - port_ps_server_1b_port_ip_requirements: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + subinterface_nested_vlan_parent_interface: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - vm_image_name: - type: string + type: string + port_ps_server_1b_port_1_order: + type: integer required: true status: SUPPORTED - port_ps_server_1b_port_network_role: + port_ps_server_1b_port_1_subnetpoolid: type: string required: true status: SUPPORTED - port_ps_server_1b_port_replacement_policy: + port_ps_server_1b_port_1_network: type: list required: true status: SUPPORTED entry_schema: type: string - subinterface_nested_vlan_parent_interface: + compute_ps_server_1b_availability_zone: type: list required: true status: SUPPORTED entry_schema: type: string - port_ps_server_1b_port_subnetpoolid: - type: string - required: true - status: SUPPORTED - compute_ps_server_1b_availability_zone: + port_ps_server_1b_port_1_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string + type: org.openecomp.datatypes.network.VlanRequirements compute_ps_server_1b_name: type: list required: true @@ -2698,34 +2698,34 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_ps_server_1b_ps_server_1b_port_nested_vlan: + - dependency_ps_server_1b_ps_server_1b_port_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - dependency_template_subint_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: + - link_ps_server_1b_ps_server_1b_port_1: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 + - dependency_ps_server_1b_ps_server_1b_port_1_nested_vlan: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - subinterface_link_template_subint_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - - dependency_ps_server_1b_ps_server_1b_port: + - dependency_template_subint_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_1_nested_vlan: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_ps_server_1b_ps_server_1b_port: + - subinterface_link_template_subint_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_1_nested_vlan: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -2767,30 +2767,31 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.read.bytes.rate_ps_server_1b: + network.outgoing.bytes_ps_server_1b_ps_server_1b_port_1: 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_ps_server_1b: + disk.device.read.bytes.rate_ps_server_1b: 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.iops_ps_server_1b: + disk.device.latency_ps_server_1b: 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 - attachment_ps_server_1b_ps_server_1b_port: - type: tosca.capabilities.Attachment + network.outgoing.packets.rate_ps_server_1b_ps_server_1b_port_1: + 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.packets.rate_ps_server_1b_ps_server_1b_port: + disk.device.iops_ps_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2802,11 +2803,6 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_ps_server_1b_ps_server_1b_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED instance_ps_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2856,11 +2852,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_ps_server_1b_ps_server_1b_port_nested_vlan: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.device.read.requests.rate_ps_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2873,7 +2864,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_ps_server_1b_ps_server_1b_port: + network.incoming.bytes_ps_server_1b_ps_server_1b_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2891,19 +2882,30 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_ps_server_1b_ps_server_1b_port_1: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED disk.device.write.requests.rate_ps_server_1b: 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_ps_server_1b_ps_server_1b_port_1: + 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_ps_server_1b: 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_template_subint_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: + feature_ps_server_1b_ps_server_1b_port_1_nested_vlan: type: tosca.capabilities.Node occurrences: - 1 @@ -2943,25 +2945,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_ps_server_1b_ps_server_1b_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_ps_server_1b_ps_server_1b_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.incoming.packets_ps_server_1b_ps_server_1b_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_ps_server_1b_ps_server_1b_port: + network.outgoing.bytes.rate_ps_server_1b_ps_server_1b_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2977,6 +2961,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_ps_server_1b_ps_server_1b_port_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.iops_ps_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2995,12 +2984,20 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_ps_server_1b_ps_server_1b_port: + network.incoming.packets.rate_ps_server_1b_ps_server_1b_port_1: 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_ps_server_1b_ps_server_1b_port_1: + 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 memory.usage_ps_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3013,18 +3010,18 @@ node_types: occurrences: - 1 - UNBOUNDED - endpoint_ps_server_1b: - type: tosca.capabilities.Endpoint.Admin + network.outpoing.packets_ps_server_1b_ps_server_1b_port_1: + 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_ps_server_1b_ps_server_1b_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + endpoint_ps_server_1b: + type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED - feature_ps_server_1b_ps_server_1b_port: + feature_template_subint_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_1_nested_vlan: type: tosca.capabilities.Node occurrences: - 1 @@ -3035,6 +3032,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes.rate_ps_server_1b_ps_server_1b_port_1: + 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_ps_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3047,13 +3050,10 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_ps_server_1b_ps_server_1b_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 + feature_ps_server_1b_ps_server_1b_port_1: + type: tosca.capabilities.Node occurrences: - - 0 + - 1 - UNBOUNDED org.openecomp.resource.abstract.nodes.heat.subinterface.nested_vlan: derived_from: org.openecomp.resource.abstract.nodes.AbstractSubstitute @@ -3121,4 +3121,4 @@ node_types: type: tosca.capabilities.Node occurrences: - 1 - - UNBOUNDED \ No newline at end of file + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/Nested_pd_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/Nested_pd_server_1bServiceTemplate.yaml index aade6f5ee0..5d0a28208d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/Nested_pd_server_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/Nested_pd_server_1bServiceTemplate.yaml @@ -21,6 +21,12 @@ topology_template: required: true entry_schema: type: float + port_pd_server_1b_port_0_subnetpoolid: + type: string + required: true + port_pd_server_1b_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -28,77 +34,71 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 + port_pd_server_1b_port_0_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd_server_1b_port_0_network_role_tag: + type: string + required: true vm_flavor_name: type: string required: true - port_pd_server_1b_port_vlan_requirements: + port_pd_server_1b_port_0_order: + type: integer + required: true + port_pd_server_1b_port_0_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: string subinterface_nested_vlan_net1: type: list required: true entry_schema: type: string - port_pd_server_1b_port_related_networks: + port_pd_server_1b_port_0_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd_server_1b_port_network_role_tag: - type: string - required: true + type: org.openecomp.datatypes.network.VlanRequirements vm_image_name: type: string required: true - port_pd_server_1b_port_replacement_policy: + port_pd_server_1b_port_0_related_networks: type: list required: true entry_schema: - type: string - port_pd_server_1b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_pd_server_1b_port_network_role: - type: string - required: true + type: org.openecomp.datatypes.network.RelatedNetworksAssignments subinterface_nested_vlan_parent_interface: type: list required: true entry_schema: type: string - port_pd_server_1b_port_fixed_ips: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_pd_server_1b_port_network: + port_pd_server_1b_port_0_replacement_policy: type: list required: true entry_schema: type: string + port_pd_server_1b_port_0_network_role: + type: string + required: true + port_pd_server_1b_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true compute_pd_server_1b_availability_zone: type: list required: true entry_schema: type: string - port_pd_server_1b_port_order: - type: integer - required: true - port_pd_server_1b_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_pd_server_1b_port_ip_requirements: + port_pd_server_1b_port_0_fixed_ips: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd_server_1b_port_subnetpoolid: - type: string - required: true + type: org.openecomp.datatypes.heat.neutron.port.FixedIps node_templates: - pd_server_1b_pd_server_1b_port_nested_vlan: + pd_server_1b_pd_server_1b_port_0_nested_vlan: type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested_vlan directives: - substitutable @@ -121,7 +121,7 @@ topology_template: requirements: - binding_template_subint_Vlan_vmi_1: capability: tosca.capabilities.network.Bindable - node: pd_server_1b_pd_server_1b_port + node: pd_server_1b_pd_server_1b_port_0 relationship: tosca.relationships.network.BindsTo pd_server_1b: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server_1b @@ -138,39 +138,39 @@ topology_template: get_input: - compute_pd_server_1b_name - index_value - pd_server_1b_pd_server_1b_port: + pd_server_1b_pd_server_1b_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_pd_server_1b_port_replacement_policy + - port_pd_server_1b_port_0_replacement_policy - index_value mac_requirements: - get_input: port_pd_server_1b_port_mac_requirements + get_input: port_pd_server_1b_port_0_mac_requirements order: - get_input: port_pd_server_1b_port_order + get_input: port_pd_server_1b_port_0_order exCP_naming: - get_input: port_pd_server_1b_port_exCP_naming + get_input: port_pd_server_1b_port_0_exCP_naming vlan_requirements: - get_input: port_pd_server_1b_port_vlan_requirements + get_input: port_pd_server_1b_port_0_vlan_requirements subinterface_indicator: true ip_requirements: - get_input: port_pd_server_1b_port_ip_requirements + get_input: port_pd_server_1b_port_0_ip_requirements related_networks: - get_input: port_pd_server_1b_port_related_networks + get_input: port_pd_server_1b_port_0_related_networks network_role_tag: - get_input: port_pd_server_1b_port_network_role_tag + get_input: port_pd_server_1b_port_0_network_role_tag network_role: - get_input: port_pd_server_1b_port_network_role + get_input: port_pd_server_1b_port_0_network_role fixed_ips: get_input: - - port_pd_server_1b_port_fixed_ips + - port_pd_server_1b_port_0_fixed_ips - index_value subnetpoolid: - get_input: port_pd_server_1b_port_subnetpoolid + get_input: port_pd_server_1b_port_0_subnetpoolid network: get_input: - - port_pd_server_1b_port_network + - port_pd_server_1b_port_0_network - index_value requirements: - binding: @@ -183,9 +183,6 @@ topology_template: disk.device.read.bytes_pd_server_1b: - pd_server_1b - disk.device.read.bytes - feature_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - feature host_pd_server_1b: - pd_server_1b - host @@ -195,36 +192,33 @@ topology_template: disk.allocation_pd_server_1b: - pd_server_1b - disk.allocation - network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.incoming.bytes.rate cpu.delta_pd_server_1b: - pd_server_1b - cpu.delta - forwarder_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - forwarder - network.incoming.bytes_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.incoming.bytes disk.device.read.requests_pd_server_1b: - pd_server_1b - disk.device.read.requests + network.incoming.packets.rate_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - network.incoming.packets.rate + binding_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - binding feature_pd_server_1b: - pd_server_1b - feature disk.device.iops_pd_server_1b: - pd_server_1b - disk.device.iops - binding_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - binding cpu_pd_server_1b: - pd_server_1b - cpu disk.write.bytes.rate_pd_server_1b: - pd_server_1b - disk.write.bytes.rate + feature_template_subint_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_0_nested_vlan: + - pd_server_1b_pd_server_1b_port_0_nested_vlan + - feature_template_subint_Vlan_vmi_1 disk.device.read.requests.rate_pd_server_1b: - pd_server_1b - disk.device.read.requests.rate @@ -237,9 +231,9 @@ topology_template: memory.usage_pd_server_1b: - pd_server_1b - memory.usage - network.outpoing.packets_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.outpoing.packets + network.incoming.bytes_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - network.incoming.bytes memory_pd_server_1b: - pd_server_1b - memory @@ -252,24 +246,30 @@ topology_template: disk.read.bytes_pd_server_1b: - pd_server_1b - disk.read.bytes + network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - network.incoming.bytes.rate disk.device.usage_pd_server_1b: - pd_server_1b - disk.device.usage - attachment_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - attachment disk.device.write.requests_pd_server_1b: - pd_server_1b - disk.device.write.requests disk.latency_pd_server_1b: - pd_server_1b - disk.latency + feature_pd_server_1b_pd_server_1b_port_0_nested_vlan: + - pd_server_1b_pd_server_1b_port_0_nested_vlan + - feature disk.ephemeral.size_pd_server_1b: - pd_server_1b - disk.ephemeral.size - network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.outgoing.bytes.rate + forwarder_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - forwarder + network.outgoing.bytes_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - network.outgoing.bytes scalable_pd_server_1b: - pd_server_1b - scalable @@ -282,9 +282,15 @@ topology_template: disk.root.size_pd_server_1b: - pd_server_1b - disk.root.size + network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - network.outgoing.bytes.rate disk.iops_pd_server_1b: - pd_server_1b - disk.iops + feature_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - feature disk.write.bytes_pd_server_1b: - pd_server_1b - disk.write.bytes @@ -297,32 +303,26 @@ topology_template: vcpus_pd_server_1b: - pd_server_1b - vcpus - network.incoming.packets.rate_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.incoming.packets.rate instance_pd_server_1b: - pd_server_1b - instance binding_pd_server_1b: - pd_server_1b - binding - feature_template_subint_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: - - pd_server_1b_pd_server_1b_port_nested_vlan - - feature_template_subint_Vlan_vmi_1 cpu_util_pd_server_1b: - pd_server_1b - cpu_util - network.outgoing.bytes_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.outgoing.bytes + network.outpoing.packets_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - network.outpoing.packets + attachment_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - attachment memory.resident_pd_server_1b: - pd_server_1b - memory.resident - feature_pd_server_1b_pd_server_1b_port_nested_vlan: - - pd_server_1b_pd_server_1b_port_nested_vlan - - feature - network.incoming.packets_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port + network.incoming.packets_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 - network.incoming.packets disk.device.write.requests.rate_pd_server_1b: - pd_server_1b @@ -333,37 +333,37 @@ topology_template: disk.read.requests_pd_server_1b: - pd_server_1b - disk.read.requests - network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.outgoing.packets.rate disk.capacity_pd_server_1b: - pd_server_1b - disk.capacity disk.usage_pd_server_1b: - pd_server_1b - disk.usage + network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - network.outgoing.packets.rate disk.write.requests.rate_pd_server_1b: - pd_server_1b - disk.write.requests.rate requirements: + subinterface_link_template_subint_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_0_nested_vlan: + - pd_server_1b_pd_server_1b_port_0_nested_vlan + - subinterface_link_template_subint_Vlan_vmi_1 dependency_pd_server_1b: - pd_server_1b - dependency local_storage_pd_server_1b: - pd_server_1b - local_storage - link_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - link - dependency_pd_server_1b_pd_server_1b_port_nested_vlan: - - pd_server_1b_pd_server_1b_port_nested_vlan + dependency_template_subint_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_0_nested_vlan: + - pd_server_1b_pd_server_1b_port_0_nested_vlan + - dependency_template_subint_Vlan_vmi_1 + dependency_pd_server_1b_pd_server_1b_port_0_nested_vlan: + - pd_server_1b_pd_server_1b_port_0_nested_vlan - dependency - subinterface_link_template_subint_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: - - pd_server_1b_pd_server_1b_port_nested_vlan - - subinterface_link_template_subint_Vlan_vmi_1 - dependency_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port + dependency_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 - dependency - dependency_template_subint_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: - - pd_server_1b_pd_server_1b_port_nested_vlan - - dependency_template_subint_Vlan_vmi_1 \ No newline at end of file + link_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - link diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/Nested_ps_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/Nested_ps_server_1bServiceTemplate.yaml index 1e89da0a89..5bcbd384c3 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/Nested_ps_server_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/Nested_ps_server_1bServiceTemplate.yaml @@ -11,27 +11,19 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_ps_server_1b_port_vlan_requirements: + port_ps_server_1b_port_1_network_role_tag: + type: string + required: true + port_ps_server_1b_port_1_related_networks: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_ps_server_1b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true + type: org.openecomp.datatypes.network.RelatedNetworksAssignments subinterface_nested_vlan_service_template_filter_count: type: list required: true entry_schema: type: float - port_ps_server_1b_port_network_role_tag: - type: string - required: true - port_ps_server_1b_port_fixed_ips: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps index_value: type: integer description: Index value of this substitution service template runtime instance @@ -39,59 +31,67 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_ps_server_1b_port_order: - type: integer + port_ps_server_1b_port_1_ip_requirements: + type: list required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements vm_flavor_name: type: string required: true - port_ps_server_1b_port_related_networks: + port_ps_server_1b_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_ps_server_1b_port_1_network_role: + type: string + required: true + subinterface_nested_vlan_net1: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_ps_server_1b_port_network: + type: string + vm_image_name: + type: string + required: true + port_ps_server_1b_port_1_replacement_policy: type: list required: true entry_schema: type: string - port_ps_server_1b_port_exCP_naming: + port_ps_server_1b_port_1_exCP_naming: type: org.openecomp.datatypes.Naming required: true - subinterface_nested_vlan_net1: + port_ps_server_1b_port_1_fixed_ips: type: list required: true entry_schema: - type: string - port_ps_server_1b_port_ip_requirements: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + subinterface_nested_vlan_parent_interface: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - vm_image_name: - type: string + type: string + port_ps_server_1b_port_1_order: + type: integer required: true - port_ps_server_1b_port_network_role: + port_ps_server_1b_port_1_subnetpoolid: type: string required: true - port_ps_server_1b_port_replacement_policy: + port_ps_server_1b_port_1_network: type: list required: true entry_schema: type: string - subinterface_nested_vlan_parent_interface: + compute_ps_server_1b_availability_zone: type: list required: true entry_schema: type: string - port_ps_server_1b_port_subnetpoolid: - type: string - required: true - compute_ps_server_1b_availability_zone: + port_ps_server_1b_port_1_vlan_requirements: type: list required: true entry_schema: - type: string + type: org.openecomp.datatypes.network.VlanRequirements compute_ps_server_1b_name: type: list required: true @@ -113,70 +113,70 @@ topology_template: get_input: - compute_ps_server_1b_name - index_value - ps_server_1b_ps_server_1b_port_nested_vlan: - type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested_vlan - directives: - - substitutable - properties: - service_template_filter: - count: - get_input: - - subinterface_nested_vlan_service_template_filter_count - - index_value - substitute_service_template: nested_vlanServiceTemplate.yaml - mandatory: true - parent_interface: - get_input: - - subinterface_nested_vlan_parent_interface - - index_value - net1: - get_input: - - subinterface_nested_vlan_net1 - - index_value - requirements: - - binding_template_subint_Vlan_vmi_1: - capability: tosca.capabilities.network.Bindable - node: ps_server_1b_ps_server_1b_port - relationship: tosca.relationships.network.BindsTo - ps_server_1b_ps_server_1b_port: + ps_server_1b_ps_server_1b_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_ps_server_1b_port_replacement_policy + - port_ps_server_1b_port_1_replacement_policy - index_value mac_requirements: - get_input: port_ps_server_1b_port_mac_requirements + get_input: port_ps_server_1b_port_1_mac_requirements order: - get_input: port_ps_server_1b_port_order + get_input: port_ps_server_1b_port_1_order exCP_naming: - get_input: port_ps_server_1b_port_exCP_naming + get_input: port_ps_server_1b_port_1_exCP_naming vlan_requirements: - get_input: port_ps_server_1b_port_vlan_requirements + get_input: port_ps_server_1b_port_1_vlan_requirements subinterface_indicator: true ip_requirements: - get_input: port_ps_server_1b_port_ip_requirements + get_input: port_ps_server_1b_port_1_ip_requirements related_networks: - get_input: port_ps_server_1b_port_related_networks + get_input: port_ps_server_1b_port_1_related_networks network_role_tag: - get_input: port_ps_server_1b_port_network_role_tag + get_input: port_ps_server_1b_port_1_network_role_tag network_role: - get_input: port_ps_server_1b_port_network_role + get_input: port_ps_server_1b_port_1_network_role fixed_ips: get_input: - - port_ps_server_1b_port_fixed_ips + - port_ps_server_1b_port_1_fixed_ips - index_value subnetpoolid: - get_input: port_ps_server_1b_port_subnetpoolid + get_input: port_ps_server_1b_port_1_subnetpoolid network: get_input: - - port_ps_server_1b_port_network + - port_ps_server_1b_port_1_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: ps_server_1b relationship: tosca.relationships.network.BindsTo + ps_server_1b_ps_server_1b_port_1_nested_vlan: + type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested_vlan + directives: + - substitutable + properties: + service_template_filter: + count: + get_input: + - subinterface_nested_vlan_service_template_filter_count + - index_value + substitute_service_template: nested_vlanServiceTemplate.yaml + mandatory: true + parent_interface: + get_input: + - subinterface_nested_vlan_parent_interface + - index_value + net1: + get_input: + - subinterface_nested_vlan_net1 + - index_value + requirements: + - binding_template_subint_Vlan_vmi_1: + capability: tosca.capabilities.network.Bindable + node: ps_server_1b_ps_server_1b_port_1 + relationship: tosca.relationships.network.BindsTo substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.ps_server_1b capabilities: @@ -198,27 +198,24 @@ topology_template: scalable_ps_server_1b: - ps_server_1b - scalable + network.outgoing.bytes_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 + - network.outgoing.bytes disk.device.read.bytes.rate_ps_server_1b: - ps_server_1b - disk.device.read.bytes.rate disk.device.latency_ps_server_1b: - ps_server_1b - disk.device.latency + network.outgoing.packets.rate_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 + - network.outgoing.packets.rate disk.device.iops_ps_server_1b: - ps_server_1b - disk.device.iops - attachment_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - attachment - network.outgoing.packets.rate_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - network.outgoing.packets.rate disk.device.capacity_ps_server_1b: - ps_server_1b - disk.device.capacity - forwarder_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - forwarder instance_ps_server_1b: - ps_server_1b - instance @@ -243,17 +240,14 @@ topology_template: disk.read.requests_ps_server_1b: - ps_server_1b - disk.read.requests - feature_ps_server_1b_ps_server_1b_port_nested_vlan: - - ps_server_1b_ps_server_1b_port_nested_vlan - - feature disk.device.read.requests.rate_ps_server_1b: - ps_server_1b - disk.device.read.requests.rate disk.capacity_ps_server_1b: - ps_server_1b - disk.capacity - network.incoming.bytes_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port + network.incoming.bytes_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 - network.incoming.bytes disk.write.requests.rate_ps_server_1b: - ps_server_1b @@ -261,15 +255,21 @@ topology_template: disk.device.read.bytes_ps_server_1b: - ps_server_1b - disk.device.read.bytes + attachment_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 + - attachment disk.device.write.requests.rate_ps_server_1b: - ps_server_1b - disk.device.write.requests.rate + network.incoming.packets_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 + - network.incoming.packets disk.root.size_ps_server_1b: - ps_server_1b - disk.root.size - feature_template_subint_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: - - ps_server_1b_ps_server_1b_port_nested_vlan - - feature_template_subint_Vlan_vmi_1 + feature_ps_server_1b_ps_server_1b_port_1_nested_vlan: + - ps_server_1b_ps_server_1b_port_1_nested_vlan + - feature binding_ps_server_1b: - ps_server_1b - binding @@ -288,17 +288,8 @@ topology_template: disk.read.bytes_ps_server_1b: - ps_server_1b - disk.read.bytes - network.incoming.packets.rate_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - network.incoming.packets.rate - network.outgoing.bytes_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - network.outgoing.bytes - network.incoming.packets_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - network.incoming.packets - network.outgoing.bytes.rate_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port + network.outgoing.bytes.rate_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 - network.outgoing.bytes.rate feature_ps_server_1b: - ps_server_1b @@ -306,6 +297,9 @@ topology_template: os_ps_server_1b: - ps_server_1b - os + forwarder_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 + - forwarder disk.iops_ps_server_1b: - ps_server_1b - disk.iops @@ -315,55 +309,61 @@ topology_template: disk.write.requests_ps_server_1b: - ps_server_1b - disk.write.requests - network.outpoing.packets_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - network.outpoing.packets + network.incoming.packets.rate_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 + - network.incoming.packets.rate + binding_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 + - binding memory.usage_ps_server_1b: - ps_server_1b - memory.usage disk.latency_ps_server_1b: - ps_server_1b - disk.latency + network.outpoing.packets_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 + - network.outpoing.packets endpoint_ps_server_1b: - ps_server_1b - endpoint - network.incoming.bytes.rate_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - network.incoming.bytes.rate - feature_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - feature + feature_template_subint_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_1_nested_vlan: + - ps_server_1b_ps_server_1b_port_1_nested_vlan + - feature_template_subint_Vlan_vmi_1 vcpus_ps_server_1b: - ps_server_1b - vcpus + network.incoming.bytes.rate_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 + - network.incoming.bytes.rate cpu.delta_ps_server_1b: - ps_server_1b - cpu.delta disk.ephemeral.size_ps_server_1b: - ps_server_1b - disk.ephemeral.size - binding_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - binding + feature_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 + - feature requirements: + subinterface_link_template_subint_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_1_nested_vlan: + - ps_server_1b_ps_server_1b_port_1_nested_vlan + - subinterface_link_template_subint_Vlan_vmi_1 + link_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 + - link local_storage_ps_server_1b: - ps_server_1b - local_storage - dependency_ps_server_1b_ps_server_1b_port_nested_vlan: - - ps_server_1b_ps_server_1b_port_nested_vlan + dependency_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 - dependency - dependency_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port + dependency_ps_server_1b_ps_server_1b_port_1_nested_vlan: + - ps_server_1b_ps_server_1b_port_1_nested_vlan - dependency - link_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - link - dependency_template_subint_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: - - ps_server_1b_ps_server_1b_port_nested_vlan + dependency_template_subint_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_1_nested_vlan: + - ps_server_1b_ps_server_1b_port_1_nested_vlan - dependency_template_subint_Vlan_vmi_1 - subinterface_link_template_subint_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: - - ps_server_1b_ps_server_1b_port_nested_vlan - - subinterface_link_template_subint_Vlan_vmi_1 dependency_ps_server_1b: - ps_server_1b - - dependency \ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/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/complexVFCWithDiffSubInfCountScenario/out/nested_pattern5ServiceTemplate.yaml index 3993f75f99..7ee8455f3e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/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/complexVFCWithDiffSubInfCountScenario/out/nested_pattern5ServiceTemplate.yaml @@ -101,34 +101,34 @@ topology_template: - 0 subinterface_nested_vlan_service_template_filter_count: - 9 + port_pd_server_1b_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false vm_flavor_name: get_input: pd_server_1b_flavor + port_pd_server_1b_port_0_network: + - packet_internal_network subinterface_nested_vlan_net1: - packet_external_network vm_image_name: get_input: pd_server_1b_image - port_pd_server_1b_port_replacement_policy: + subinterface_nested_vlan_parent_interface: + - pd_server_1b_port_0 + port_pd_server_1b_port_0_replacement_policy: - AUTO - port_pd_server_1b_port_mac_requirements: + port_pd_server_1b_port_0_mac_requirements: mac_count_required: is_required: false - subinterface_nested_vlan_parent_interface: - - pd_server_1b_port_0 - port_pd_server_1b_port_fixed_ips: + compute_pd_server_1b_availability_zone: + - get_input: availability_zone_0 + port_pd_server_1b_port_0_fixed_ips: - ip_address: get_input: - pd_server_1b_ips - 0 - port_pd_server_1b_port_network: - - packet_internal_network - compute_pd_server_1b_availability_zone: - - get_input: availability_zone_0 - port_pd_server_1b_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false service_template_filter: substitute_service_template: Nested_pd_server_1bServiceTemplate.yaml count: 1 @@ -138,11 +138,11 @@ topology_template: - service_template_filter - index_value requirements: - - link_pd_server_1b_pd_server_1b_port: + - link_pd_server_1b_pd_server_1b_port_0: capability: tosca.capabilities.network.Linkable node: packet_internal_network relationship: tosca.relationships.network.LinksTo - - subinterface_link_template_subint_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: + - subinterface_link_template_subint_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_0_nested_vlan: capability: tosca.capabilities.network.Linkable node: packet_external_network relationship: tosca.relationships.network.LinksTo @@ -174,12 +174,12 @@ topology_template: disk.device.write.bytes.rate_server_1b_ps_1_test_nested_level2: - test_nested_level2 - disk.device.write.bytes.rate_server_1b_ps_1 - network.outgoing.packets.rate_ps_server_1b_port_2_test_nested_level2: - - test_nested_level2 - - network.outgoing.packets.rate_ps_server_1b_port_2 scalable_server_1b_ps_1_test_nested_level2: - test_nested_level2 - scalable_server_1b_ps_1 + network.outgoing.bytes.rate_ps_server_1b_1_port_1_test_nested_level2: + - test_nested_level2 + - network.outgoing.bytes.rate_ps_server_1b_1_port_1 end_point_packet_ext_network_test_nested_level2: - test_nested_level2 - end_point_packet_ext_network @@ -195,6 +195,9 @@ topology_template: disk.device.write.requests_server_1b_pd_0: - abstract_pd_server_1b - disk.device.write.requests_pd_server_1b + network.incoming.packets_ps_server_1b_1_port_1_test_nested_level2: + - test_nested_level2 + - network.incoming.packets_ps_server_1b_1_port_1 disk.read.requests_server_1b_ps_2_test_nested_level2: - test_nested_level2 - disk.read.requests_server_1b_ps_2 @@ -215,22 +218,31 @@ topology_template: - forwarder_ps_server_1b_port_1 forwarder_pd_server_1b_port_0: - abstract_pd_server_1b - - forwarder_pd_server_1b_pd_server_1b_port + - forwarder_pd_server_1b_pd_server_1b_port_0 disk.capacity_server_1b_pd_0: - abstract_pd_server_1b - disk.capacity_pd_server_1b + forwarder_ps_server_1b_1_port_1_test_nested_level2: + - test_nested_level2 + - forwarder_ps_server_1b_1_port_1 network.outpoing.packets_pd_server_1b_port_0: - abstract_pd_server_1b - - network.outpoing.packets_pd_server_1b_pd_server_1b_port + - network.outpoing.packets_pd_server_1b_pd_server_1b_port_0 + feature_ps_server_1b_1_port_1_test_nested_level2: + - test_nested_level2 + - feature_ps_server_1b_1_port_1 cpu_util_server_1b_ps_2_test_nested_level2: - test_nested_level2 - cpu_util_server_1b_ps_2 network.incoming.packets_ps_server_1b_port_1_test_nested_level2: - test_nested_level2 - network.incoming.packets_ps_server_1b_port_1 + network.outpoing.packets_ps_server_1b_1_port_1_test_nested_level2: + - test_nested_level2 + - network.outpoing.packets_ps_server_1b_1_port_1 feature_pd_server_1b_port_0: - abstract_pd_server_1b - - feature_pd_server_1b_pd_server_1b_port + - feature_pd_server_1b_pd_server_1b_port_0 memory_server_1b_ps_1_test_nested_level2: - test_nested_level2 - memory_server_1b_ps_1 @@ -240,9 +252,6 @@ topology_template: os_server_1b_ps_1_test_nested_level2: - test_nested_level2 - os_server_1b_ps_1 - network.incoming.bytes_ps_server_1b_port_2_test_nested_level2: - - test_nested_level2 - - network.incoming.bytes_ps_server_1b_port_2 disk.root.size_server_1b_ps_1_test_nested_level2: - test_nested_level2 - disk.root.size_server_1b_ps_1 @@ -267,9 +276,6 @@ topology_template: disk.write.requests.rate_server_1b_pd_0: - abstract_pd_server_1b - disk.write.requests.rate_pd_server_1b - network.incoming.bytes.rate_ps_server_1b_port_2_test_nested_level2: - - test_nested_level2 - - network.incoming.bytes.rate_ps_server_1b_port_2 disk.latency_server_1b_ps_1_test_nested_level2: - test_nested_level2 - disk.latency_server_1b_ps_1 @@ -324,6 +330,9 @@ topology_template: disk.read.requests_server_1b_pd_0: - abstract_pd_server_1b - disk.read.requests_pd_server_1b + network.outgoing.packets.rate_ps_server_1b_1_port_1_test_nested_level2: + - test_nested_level2 + - network.outgoing.packets.rate_ps_server_1b_1_port_1 disk.device.write.bytes.rate_server_1b_pd_0: - abstract_pd_server_1b - disk.device.write.bytes.rate_pd_server_1b @@ -354,15 +363,9 @@ topology_template: disk.capacity_server_1b_ps_1_test_nested_level2: - test_nested_level2 - disk.capacity_server_1b_ps_1 - feature_ps_server_1b_port_2_test_nested_level2: - - test_nested_level2 - - feature_ps_server_1b_port_2 disk.allocation_server_1b_ps_1_test_nested_level2: - test_nested_level2 - disk.allocation_server_1b_ps_1 - network.outgoing.bytes_ps_server_1b_port_2_test_nested_level2: - - test_nested_level2 - - network.outgoing.bytes_ps_server_1b_port_2 endpoint_server_1b_ps_1_test_nested_level2: - test_nested_level2 - endpoint_server_1b_ps_1 @@ -378,9 +381,6 @@ topology_template: end_point_packet_external_network: - packet_external_network - end_point - forwarder_ps_server_1b_port_2_test_nested_level2: - - test_nested_level2 - - forwarder_ps_server_1b_port_2 disk.write.bytes_server_1b_pd_0: - abstract_pd_server_1b - disk.write.bytes_pd_server_1b @@ -399,6 +399,12 @@ topology_template: disk.device.read.requests_server_1b_ps_2_test_nested_level2: - test_nested_level2 - disk.device.read.requests_server_1b_ps_2 + binding_ps_server_1b_1_port_1_test_nested_level2: + - test_nested_level2 + - binding_ps_server_1b_1_port_1 + network.incoming.bytes_ps_server_1b_1_port_1_test_nested_level2: + - test_nested_level2 + - network.incoming.bytes_ps_server_1b_1_port_1 disk.device.write.requests.rate_server_1b_pd_0: - abstract_pd_server_1b - disk.device.write.requests.rate_pd_server_1b @@ -407,10 +413,16 @@ topology_template: - disk.device.iops_server_1b_ps_2 network.outgoing.bytes_pd_server_1b_port_0: - abstract_pd_server_1b - - network.outgoing.bytes_pd_server_1b_pd_server_1b_port + - network.outgoing.bytes_pd_server_1b_pd_server_1b_port_0 + network.incoming.packets.rate_ps_server_1b_1_port_1_test_nested_level2: + - test_nested_level2 + - network.incoming.packets.rate_ps_server_1b_1_port_1 disk.read.requests_server_1b_ps_1_test_nested_level2: - test_nested_level2 - disk.read.requests_server_1b_ps_1 + network.outgoing.bytes_ps_server_1b_1_port_1_test_nested_level2: + - test_nested_level2 + - network.outgoing.bytes_ps_server_1b_1_port_1 memory.usage_server_1b_ps_1_test_nested_level2: - test_nested_level2 - memory.usage_server_1b_ps_1 @@ -428,7 +440,7 @@ topology_template: - memory.resident_pd_server_1b network.outgoing.packets.rate_pd_server_1b_port_0: - abstract_pd_server_1b - - network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port + - network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port_0 disk.device.read.bytes_server_1b_pd_0: - abstract_pd_server_1b - disk.device.read.bytes_pd_server_1b @@ -440,7 +452,7 @@ topology_template: - vcpus_server_1b_ps_2 attachment_pd_server_1b_port_0: - abstract_pd_server_1b - - attachment_pd_server_1b_pd_server_1b_port + - attachment_pd_server_1b_pd_server_1b_port_0 attachment_packet_ext_network_test_nested_level2: - test_nested_level2 - attachment_packet_ext_network @@ -512,13 +524,10 @@ topology_template: - disk.device.read.requests_server_1b_ps_1 network.outgoing.bytes.rate_pd_server_1b_port_0: - abstract_pd_server_1b - - network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port + - network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port_0 network.incoming.packets.rate_pd_server_1b_port_0: - abstract_pd_server_1b - - network.incoming.packets.rate_pd_server_1b_pd_server_1b_port - network.incoming.packets_ps_server_1b_port_2_test_nested_level2: - - test_nested_level2 - - network.incoming.packets_ps_server_1b_port_2 + - network.incoming.packets.rate_pd_server_1b_pd_server_1b_port_0 os_server_1b_pd_0: - abstract_pd_server_1b - os_pd_server_1b @@ -563,13 +572,10 @@ topology_template: - attachment_packet_int_network network.incoming.bytes_pd_server_1b_port_0: - abstract_pd_server_1b - - network.incoming.bytes_pd_server_1b_pd_server_1b_port + - network.incoming.bytes_pd_server_1b_pd_server_1b_port_0 disk.root.size_server_1b_pd_0: - abstract_pd_server_1b - disk.root.size_pd_server_1b - binding_ps_server_1b_port_2_test_nested_level2: - - test_nested_level2 - - binding_ps_server_1b_port_2 disk.ephemeral.size_server_1b_ps_1_test_nested_level2: - test_nested_level2 - disk.ephemeral.size_server_1b_ps_1 @@ -591,6 +597,9 @@ topology_template: disk.device.usage_server_1b_pd_0: - abstract_pd_server_1b - disk.device.usage_pd_server_1b + network.incoming.bytes.rate_ps_server_1b_1_port_1_test_nested_level2: + - test_nested_level2 + - network.incoming.bytes.rate_ps_server_1b_1_port_1 cpu_server_1b_ps_2_test_nested_level2: - test_nested_level2 - cpu_server_1b_ps_2 @@ -626,7 +635,7 @@ topology_template: - disk.write.bytes_server_1b_ps_2 binding_pd_server_1b_port_0: - abstract_pd_server_1b - - binding_pd_server_1b_pd_server_1b_port + - binding_pd_server_1b_pd_server_1b_port_0 host_server_1b_ps_2_test_nested_level2: - test_nested_level2 - host_server_1b_ps_2 @@ -636,18 +645,15 @@ topology_template: link_packet_internal_network: - packet_internal_network - link - network.incoming.packets.rate_ps_server_1b_port_2_test_nested_level2: - - test_nested_level2 - - network.incoming.packets.rate_ps_server_1b_port_2 disk.write.requests_server_1b_pd_0: - abstract_pd_server_1b - disk.write.requests_pd_server_1b - attachment_ps_server_1b_port_2_test_nested_level2: - - test_nested_level2 - - attachment_ps_server_1b_port_2 disk.device.allocation_server_1b_ps_1_test_nested_level2: - test_nested_level2 - disk.device.allocation_server_1b_ps_1 + attachment_ps_server_1b_1_port_1_test_nested_level2: + - test_nested_level2 + - attachment_ps_server_1b_1_port_1 disk.device.read.bytes.rate_server_1b_ps_2_test_nested_level2: - test_nested_level2 - disk.device.read.bytes.rate_server_1b_ps_2 @@ -657,9 +663,6 @@ topology_template: memory_server_1b_ps_2_test_nested_level2: - test_nested_level2 - memory_server_1b_ps_2 - network.outgoing.bytes.rate_ps_server_1b_port_2_test_nested_level2: - - test_nested_level2 - - network.outgoing.bytes.rate_ps_server_1b_port_2 os_server_1b_ps_2_test_nested_level2: - test_nested_level2 - os_server_1b_ps_2 @@ -689,7 +692,7 @@ topology_template: - disk.device.read.requests_pd_server_1b network.incoming.packets_pd_server_1b_port_0: - abstract_pd_server_1b - - network.incoming.packets_pd_server_1b_pd_server_1b_port + - network.incoming.packets_pd_server_1b_pd_server_1b_port_0 disk.read.bytes.rate_server_1b_pd_0: - abstract_pd_server_1b - disk.read.bytes.rate_pd_server_1b @@ -705,12 +708,9 @@ topology_template: disk.latency_server_1b_pd_0: - abstract_pd_server_1b - disk.latency_pd_server_1b - network.outpoing.packets_ps_server_1b_port_2_test_nested_level2: - - test_nested_level2 - - network.outpoing.packets_ps_server_1b_port_2 network.incoming.bytes.rate_pd_server_1b_port_0: - abstract_pd_server_1b - - network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port + - network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port_0 disk.write.requests.rate_server_1b_ps_2_test_nested_level2: - test_nested_level2 - disk.write.requests.rate_server_1b_ps_2 @@ -718,6 +718,9 @@ topology_template: - test_nested_level2 - disk.write.requests.rate_server_1b_ps_1 requirements: + dependency_ps_server_1b_1_port_1_test_nested_level2: + - test_nested_level2 + - dependency_ps_server_1b_1_port_1 dependency_server_1b_ps_2_test_nested_level2: - test_nested_level2 - dependency_server_1b_ps_2 @@ -735,10 +738,7 @@ topology_template: - dependency_ps_server_1b_port_1 dependency_pd_server_1b_port_0: - abstract_pd_server_1b - - dependency_pd_server_1b_pd_server_1b_port - dependency_ps_server_1b_port_2_test_nested_level2: - - test_nested_level2 - - dependency_ps_server_1b_port_2 + - dependency_pd_server_1b_pd_server_1b_port_0 dependency_test_resourceGroup_2_test_nested_level2: - test_nested_level2 - dependency_test_resourceGroup_2 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/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/complexVFCWithDiffSubInfCountScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml index 2bba8fd0f1..385411612c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/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/complexVFCWithDiffSubInfCountScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml @@ -78,34 +78,34 @@ topology_template: directives: - substitutable properties: - port_ps_server_1b_port_mac_requirements: - mac_count_required: - is_required: false subinterface_nested_vlan_service_template_filter_count: - 9 - port_ps_server_1b_port_fixed_ips: - - ip_address: - get_input: - - ps_server_1b_ips - - 0 - vm_flavor_name: - get_input: ps_server_1b_flavor - port_ps_server_1b_port_network: - - packet_int_network - subinterface_nested_vlan_net1: - - packet_ext_network - port_ps_server_1b_port_ip_requirements: + port_ps_server_1b_port_1_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false + vm_flavor_name: + get_input: ps_server_1b_flavor + port_ps_server_1b_port_1_mac_requirements: + mac_count_required: + is_required: false + subinterface_nested_vlan_net1: + - packet_ext_network vm_image_name: get_input: ps_server_1b_image - port_ps_server_1b_port_replacement_policy: + port_ps_server_1b_port_1_replacement_policy: - AUTO + port_ps_server_1b_port_1_fixed_ips: + - ip_address: + get_input: + - ps_server_1b_ips + - 0 subinterface_nested_vlan_parent_interface: - ps_server_1b_port_1 + port_ps_server_1b_port_1_network: + - packet_int_network compute_ps_server_1b_availability_zone: - get_input: availability_zone_0 compute_ps_server_1b_name: @@ -121,11 +121,11 @@ topology_template: - service_template_filter - index_value requirements: - - link_ps_server_1b_ps_server_1b_port: + - link_ps_server_1b_ps_server_1b_port_1: capability: tosca.capabilities.network.Linkable node: packet_int_network relationship: tosca.relationships.network.LinksTo - - subinterface_link_template_subint_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: + - subinterface_link_template_subint_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_1_nested_vlan: capability: tosca.capabilities.network.Linkable node: packet_ext_network relationship: tosca.relationships.network.LinksTo @@ -144,34 +144,34 @@ topology_template: directives: - substitutable properties: - port_ps_server_1b_port_mac_requirements: - mac_count_required: - is_required: false subinterface_nested_vlan_service_template_filter_count: - 19 - port_ps_server_1b_port_fixed_ips: - - ip_address: - get_input: - - ps_server_1b_ips - - 1 - vm_flavor_name: - get_input: ps_server_1b_flavor - port_ps_server_1b_port_network: - - packet_int_network - subinterface_nested_vlan_net1: - - packet_ext_network - port_ps_server_1b_port_ip_requirements: + port_ps_server_1b_port_1_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false + vm_flavor_name: + get_input: ps_server_1b_flavor + port_ps_server_1b_port_1_mac_requirements: + mac_count_required: + is_required: false + subinterface_nested_vlan_net1: + - packet_ext_network vm_image_name: get_input: ps_server_1b_image - port_ps_server_1b_port_replacement_policy: + port_ps_server_1b_port_1_replacement_policy: - AUTO + port_ps_server_1b_port_1_fixed_ips: + - ip_address: + get_input: + - ps_server_1b_ips + - 1 subinterface_nested_vlan_parent_interface: - - ps_server_1b_port_2 + - ps_server_1b_1_port_1 + port_ps_server_1b_port_1_network: + - packet_int_network compute_ps_server_1b_availability_zone: - get_input: availability_zone_0 compute_ps_server_1b_name: @@ -187,11 +187,11 @@ topology_template: - service_template_filter - index_value requirements: - - link_ps_server_1b_ps_server_1b_port: + - link_ps_server_1b_ps_server_1b_port_1: capability: tosca.capabilities.network.Linkable node: packet_int_network relationship: tosca.relationships.network.LinksTo - - subinterface_link_template_subint_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: + - subinterface_link_template_subint_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_1_nested_vlan: capability: tosca.capabilities.network.Linkable node: packet_ext_network relationship: tosca.relationships.network.LinksTo @@ -207,7 +207,6 @@ topology_template: subinterface_role: Vlan members: - abstract_ps_server_1b_0 - - abstract_ps_server_1b_1 nested_pattern5_levelTwo_group: type: org.openecomp.groups.heat.HeatStack properties: @@ -221,9 +220,6 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.heat.nested_pattern5_levelTwo capabilities: - binding_ps_server_1b_port_2: - - abstract_ps_server_1b_1 - - binding_ps_server_1b_ps_server_1b_port disk.device.latency_server_1b_ps_1: - abstract_ps_server_1b_0 - disk.device.latency_ps_server_1b @@ -247,7 +243,7 @@ topology_template: - disk.device.write.requests.rate_ps_server_1b binding_ps_server_1b_port_1: - abstract_ps_server_1b_0 - - binding_ps_server_1b_ps_server_1b_port + - binding_ps_server_1b_ps_server_1b_port_1 disk.read.bytes_server_1b_ps_1: - abstract_ps_server_1b_0 - disk.read.bytes_ps_server_1b @@ -260,15 +256,12 @@ topology_template: disk.root.size_server_1b_ps_1: - abstract_ps_server_1b_0 - disk.root.size_ps_server_1b - network.incoming.bytes.rate_ps_server_1b_port_2: - - abstract_ps_server_1b_1 - - network.incoming.bytes.rate_ps_server_1b_ps_server_1b_port disk.root.size_server_1b_ps_2: - abstract_ps_server_1b_1 - disk.root.size_ps_server_1b network.incoming.bytes.rate_ps_server_1b_port_1: - abstract_ps_server_1b_0 - - network.incoming.bytes.rate_ps_server_1b_ps_server_1b_port + - network.incoming.bytes.rate_ps_server_1b_ps_server_1b_port_1 disk.device.read.requests.rate_server_1b_ps_1: - abstract_ps_server_1b_0 - disk.device.read.requests.rate_ps_server_1b @@ -278,12 +271,9 @@ topology_template: feature_test_resourceGroup_1: - test_resourceGroup_1 - feature - network.incoming.bytes_ps_server_1b_port_2: - - abstract_ps_server_1b_1 - - network.incoming.bytes_ps_server_1b_ps_server_1b_port network.incoming.bytes_ps_server_1b_port_1: - abstract_ps_server_1b_0 - - network.incoming.bytes_ps_server_1b_ps_server_1b_port + - network.incoming.bytes_ps_server_1b_ps_server_1b_port_1 attachment_packet_int_network: - packet_int_network - attachment @@ -325,7 +315,7 @@ topology_template: - memory_ps_server_1b network.outgoing.packets.rate_ps_server_1b_port_1: - abstract_ps_server_1b_0 - - network.outgoing.packets.rate_ps_server_1b_ps_server_1b_port + - network.outgoing.packets.rate_ps_server_1b_ps_server_1b_port_1 disk.capacity_server_1b_ps_1: - abstract_ps_server_1b_0 - disk.capacity_ps_server_1b @@ -337,19 +327,16 @@ topology_template: - instance_ps_server_1b forwarder_ps_server_1b_port_1: - abstract_ps_server_1b_0 - - forwarder_ps_server_1b_ps_server_1b_port - forwarder_ps_server_1b_port_2: - - abstract_ps_server_1b_1 - - forwarder_ps_server_1b_ps_server_1b_port - network.outgoing.packets.rate_ps_server_1b_port_2: - - abstract_ps_server_1b_1 - - network.outgoing.packets.rate_ps_server_1b_ps_server_1b_port + - forwarder_ps_server_1b_ps_server_1b_port_1 link_packet_int_network: - packet_int_network - link instance_server_1b_ps_2: - abstract_ps_server_1b_1 - instance_ps_server_1b + network.outgoing.packets.rate_ps_server_1b_1_port_1: + - abstract_ps_server_1b_1 + - network.outgoing.packets.rate_ps_server_1b_ps_server_1b_port_1 disk.device.capacity_server_1b_ps_1: - abstract_ps_server_1b_0 - disk.device.capacity_ps_server_1b @@ -359,9 +346,9 @@ topology_template: disk.device.capacity_server_1b_ps_2: - abstract_ps_server_1b_1 - disk.device.capacity_ps_server_1b - network.incoming.packets_ps_server_1b_port_2: + network.outgoing.bytes_ps_server_1b_1_port_1: - abstract_ps_server_1b_1 - - network.incoming.packets_ps_server_1b_ps_server_1b_port + - network.outgoing.bytes_ps_server_1b_ps_server_1b_port_1 disk.device.iops_server_1b_ps_2: - abstract_ps_server_1b_1 - disk.device.iops_ps_server_1b @@ -370,19 +357,22 @@ topology_template: - disk.device.iops_ps_server_1b network.incoming.packets_ps_server_1b_port_1: - abstract_ps_server_1b_0 - - network.incoming.packets_ps_server_1b_ps_server_1b_port + - network.incoming.packets_ps_server_1b_ps_server_1b_port_1 network.outgoing.bytes.rate_ps_server_1b_port_1: - abstract_ps_server_1b_0 - - network.outgoing.bytes.rate_ps_server_1b_ps_server_1b_port - network.outpoing.packets_ps_server_1b_port_2: - - abstract_ps_server_1b_1 - - network.outpoing.packets_ps_server_1b_ps_server_1b_port + - network.outgoing.bytes.rate_ps_server_1b_ps_server_1b_port_1 network.outpoing.packets_ps_server_1b_port_1: - abstract_ps_server_1b_0 - - network.outpoing.packets_ps_server_1b_ps_server_1b_port + - network.outpoing.packets_ps_server_1b_ps_server_1b_port_1 endpoint_server_1b_ps_1: - abstract_ps_server_1b_0 - endpoint_ps_server_1b + network.incoming.packets.rate_ps_server_1b_1_port_1: + - abstract_ps_server_1b_1 + - network.incoming.packets.rate_ps_server_1b_ps_server_1b_port_1 + network.incoming.bytes.rate_ps_server_1b_1_port_1: + - abstract_ps_server_1b_1 + - network.incoming.bytes.rate_ps_server_1b_ps_server_1b_port_1 disk.device.allocation_server_1b_ps_1: - abstract_ps_server_1b_0 - disk.device.allocation_ps_server_1b @@ -401,12 +391,12 @@ topology_template: host_server_1b_ps_1: - abstract_ps_server_1b_0 - host_ps_server_1b + attachment_ps_server_1b_1_port_1: + - abstract_ps_server_1b_1 + - attachment_ps_server_1b_ps_server_1b_port_1 feature_packet_int_network: - packet_int_network - feature - network.outgoing.bytes.rate_ps_server_1b_port_2: - - abstract_ps_server_1b_1 - - network.outgoing.bytes.rate_ps_server_1b_ps_server_1b_port disk.write.bytes.rate_server_1b_ps_1: - abstract_ps_server_1b_0 - disk.write.bytes.rate_ps_server_1b @@ -431,6 +421,9 @@ topology_template: scalable_server_1b_ps_1: - abstract_ps_server_1b_0 - scalable_ps_server_1b + network.outpoing.packets_ps_server_1b_1_port_1: + - abstract_ps_server_1b_1 + - network.outpoing.packets_ps_server_1b_ps_server_1b_port_1 scalable_server_1b_ps_2: - abstract_ps_server_1b_1 - scalable_ps_server_1b @@ -449,12 +442,18 @@ topology_template: vcpus_server_1b_ps_1: - abstract_ps_server_1b_0 - vcpus_ps_server_1b + network.outgoing.bytes.rate_ps_server_1b_1_port_1: + - abstract_ps_server_1b_1 + - network.outgoing.bytes.rate_ps_server_1b_ps_server_1b_port_1 vcpus_server_1b_ps_2: - abstract_ps_server_1b_1 - vcpus_ps_server_1b feature_template_subint_Vlan_vmi_1_test_resourceGroup_2: - test_resourceGroup_2 - feature_template_subint_Vlan_vmi_1 + network.incoming.bytes_ps_server_1b_1_port_1: + - abstract_ps_server_1b_1 + - network.incoming.bytes_ps_server_1b_ps_server_1b_port_1 feature_template_subint_Vlan_vmi_1_test_resourceGroup_1: - test_resourceGroup_1 - feature_template_subint_Vlan_vmi_1 @@ -482,9 +481,6 @@ topology_template: disk.write.requests_server_1b_ps_2: - abstract_ps_server_1b_1 - disk.write.requests_ps_server_1b - network.incoming.packets.rate_ps_server_1b_port_2: - - abstract_ps_server_1b_1 - - network.incoming.packets.rate_ps_server_1b_ps_server_1b_port disk.latency_server_1b_ps_2: - abstract_ps_server_1b_1 - disk.latency_ps_server_1b @@ -493,7 +489,7 @@ topology_template: - disk.latency_ps_server_1b network.incoming.packets.rate_ps_server_1b_port_1: - abstract_ps_server_1b_0 - - network.incoming.packets.rate_ps_server_1b_ps_server_1b_port + - network.incoming.packets.rate_ps_server_1b_ps_server_1b_port_1 binding_server_1b_ps_1: - abstract_ps_server_1b_0 - binding_ps_server_1b @@ -520,34 +516,40 @@ topology_template: - end_point attachment_ps_server_1b_port_1: - abstract_ps_server_1b_0 - - attachment_ps_server_1b_ps_server_1b_port - attachment_ps_server_1b_port_2: - - abstract_ps_server_1b_1 - - attachment_ps_server_1b_ps_server_1b_port + - attachment_ps_server_1b_ps_server_1b_port_1 attachment_packet_ext_network: - packet_ext_network - attachment + network.incoming.packets_ps_server_1b_1_port_1: + - abstract_ps_server_1b_1 + - network.incoming.packets_ps_server_1b_ps_server_1b_port_1 os_server_1b_ps_2: - abstract_ps_server_1b_1 - os_ps_server_1b os_server_1b_ps_1: - abstract_ps_server_1b_0 - os_ps_server_1b + binding_ps_server_1b_1_port_1: + - abstract_ps_server_1b_1 + - binding_ps_server_1b_ps_server_1b_port_1 feature_test_resourceGroup_2: - test_resourceGroup_2 - feature - network.outgoing.bytes_ps_server_1b_port_2: - - abstract_ps_server_1b_1 - - network.outgoing.bytes_ps_server_1b_ps_server_1b_port network.outgoing.bytes_ps_server_1b_port_1: - abstract_ps_server_1b_0 - - network.outgoing.bytes_ps_server_1b_ps_server_1b_port + - network.outgoing.bytes_ps_server_1b_ps_server_1b_port_1 + feature_ps_server_1b_1_port_1: + - abstract_ps_server_1b_1 + - feature_ps_server_1b_ps_server_1b_port_1 disk.usage_server_1b_ps_2: - abstract_ps_server_1b_1 - disk.usage_ps_server_1b disk.usage_server_1b_ps_1: - abstract_ps_server_1b_0 - disk.usage_ps_server_1b + forwarder_ps_server_1b_1_port_1: + - abstract_ps_server_1b_1 + - forwarder_ps_server_1b_ps_server_1b_port_1 disk.device.read.bytes_server_1b_ps_2: - abstract_ps_server_1b_1 - disk.device.read.bytes_ps_server_1b @@ -565,10 +567,7 @@ topology_template: - feature feature_ps_server_1b_port_1: - abstract_ps_server_1b_0 - - feature_ps_server_1b_ps_server_1b_port - feature_ps_server_1b_port_2: - - abstract_ps_server_1b_1 - - feature_ps_server_1b_ps_server_1b_port + - feature_ps_server_1b_ps_server_1b_port_1 disk.device.read.bytes.rate_server_1b_ps_1: - abstract_ps_server_1b_0 - disk.device.read.bytes.rate_ps_server_1b @@ -579,21 +578,21 @@ topology_template: dependency_test_resourceGroup_1: - test_resourceGroup_1 - dependency - dependency_ps_server_1b_port_2: - - abstract_ps_server_1b_1 - - dependency_ps_server_1b_ps_server_1b_port dependency_test_resourceGroup_2: - test_resourceGroup_2 - dependency dependency_ps_server_1b_port_1: - abstract_ps_server_1b_0 - - dependency_ps_server_1b_ps_server_1b_port + - dependency_ps_server_1b_ps_server_1b_port_1 dependency_packet_int_network: - packet_int_network - dependency local_storage_server_1b_ps_1: - abstract_ps_server_1b_0 - local_storage_ps_server_1b + dependency_ps_server_1b_1_port_1: + - abstract_ps_server_1b_1 + - dependency_ps_server_1b_ps_server_1b_port_1 dependency_packet_ext_network: - packet_ext_network - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRole/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRole/out/GlobalSubstitutionTypesServiceTemplate.yaml index 43ce925d02..b63bc3034c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRole/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRole/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,10 +8,6 @@ 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_vdbe_untr_1_subports_ip_address: type: list required: true @@ -52,10 +48,6 @@ node_types: status: SUPPORTED entry_schema: type: string - port_vdbe_untr_port_order: - type: integer - required: true - status: SUPPORTED subinterface_vdbe_untr_1_subports_mac_address: type: list required: true @@ -72,10 +64,6 @@ node_types: type: string required: true status: SUPPORTED - port_vdbe_untr_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED subinterface_vdbe_untr_1_subports_aap_untrusted_v6_ip_prefix_len: type: list required: true @@ -100,6 +88,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_vdbe_untr_port_1_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments subinterface_vdbe_untr_1_subports_aap_address_mode: type: list required: true @@ -112,22 +106,20 @@ node_types: status: SUPPORTED entry_schema: type: json - subinterface_vdbe_untr_1_subports_vn_network_list: - type: list + port_vdbe_untr_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: string - port_vdbe_untr_port_name: + port_vdbe_untr_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + subinterface_vdbe_untr_1_subports_vn_network_list: type: list required: true status: SUPPORTED entry_schema: type: string - port_vdbe_untr_port_network_role: - type: string - required: true - status: SUPPORTED subinterface_vdbe_untr_2_subports_vn_network_list: type: list required: true @@ -170,24 +162,12 @@ node_types: status: SUPPORTED entry_schema: type: string - port_vdbe_untr_port_related_networks: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments subinterface_vdbe_untr_2_subports_aap_sec_untrusted_ip_prefix_len: 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 subinterface_vdbe_untr_1_subports_vlan_tag_list: type: list required: true @@ -206,18 +186,38 @@ node_types: status: SUPPORTED entry_schema: type: string - port_vdbe_untr_port_subnetpoolid: + port_vdbe_untr_port_1_name: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_vdbe_untr_port_1_network_role: + type: string + required: true + status: SUPPORTED + port_vdbe_untr_port_1_network_role_tag: type: string required: true status: SUPPORTED + port_vdbe_untr_port_1_order: + type: integer + required: true + status: SUPPORTED subinterface_vdbe_untr_1_subports_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 + port_vdbe_untr_port_1_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_vdbe_untr_port_1_subnetpoolid: + type: string required: true status: SUPPORTED index_value: @@ -246,7 +246,7 @@ node_types: status: SUPPORTED entry_schema: type: float - port_vdbe_untr_port_vlan_requirements: + port_vdbe_untr_port_1_vlan_requirements: type: list required: true status: SUPPORTED @@ -289,101 +289,89 @@ node_types: entry_schema: type: string requirements: - - dependency_vdbe_vdbe_untr_port_vdbe_untr_1_subports: + - dependency_vdbe: 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_vdbe_untr_1_subports: + - local_storage_vdbe: + capability: tosca.capabilities.Attachment + node: tosca.nodes.BlockStorage + relationship: tosca.relationships.AttachesTo + occurrences: + - 0 + - UNBOUNDED + - dependency_vdbe_vdbe_untr_port_1: 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_vdbe_untr_1_subports: + - link_vdbe_vdbe_untr_port_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_vdbe_vdbe_untr_port_vdbe_untr_2_subports: + - dependency_vdbe_vdbe_untr_port_1_vdbe_untr_1_subports: 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_vdbe_untr_2_subports: + - dependency_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_1_vdbe_untr_1_subports: 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_vdbe_untr_2_subports: + - subinterface_link_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_1_vdbe_untr_1_subports: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_vdbe: + - dependency_vdbe_vdbe_untr_port_1_vdbe_untr_2_subports: 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: + - dependency_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_1_vdbe_untr_2_subports: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_vdbe_vdbe_untr_port: + - subinterface_link_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_1_vdbe_untr_2_subports: 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. + forwarder_vdbe_vdbe_untr_port_1: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - feature_vdbe: + feature_vdbe_vdbe_untr_port_1_vdbe_untr_1_subports: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - feature_vdbe_vdbe_untr_port: + feature_vdbe: 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. @@ -431,13 +419,24 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_vdbe_vdbe_untr_port_1: + type: tosca.capabilities.Node + 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: + network.incoming.bytes.rate_vdbe_vdbe_untr_port_1: + 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_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -460,64 +459,49 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.capacity_vdbe: + network.outgoing.packets.rate_vdbe_vdbe_untr_port_1: 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: + 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.usage_vdbe: + network.outgoing.bytes_vdbe_vdbe_untr_port_1: 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: + 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 - network.outpoing.packets_vdbe_vdbe_untr_port: + 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 - network.outgoing.bytes.rate_vdbe_vdbe_untr_port: + 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 - feature_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_vdbe_untr_1_subports: - type: tosca.capabilities.Node - 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 - feature_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_vdbe_untr_2_subports: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - binding_vdbe_vdbe_untr_port: + binding_vdbe_vdbe_untr_port_1: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface @@ -525,13 +509,24 @@ node_types: occurrences: - 0 - UNBOUNDED + network.incoming.bytes_vdbe_vdbe_untr_port_1: + 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_1_vdbe_untr_1_subports: + type: tosca.capabilities.Node + occurrences: + - 1 + - 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: + network.outgoing.bytes.rate_vdbe_vdbe_untr_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -597,14 +592,8 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_vdbe_vdbe_untr_port_vdbe_untr_1_subports: - type: tosca.capabilities.Node - 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. + attachment_vdbe_vdbe_untr_port_1: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED @@ -627,28 +616,45 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_vdbe_vdbe_untr_port_1: + 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 + network.incoming.packets_vdbe_vdbe_untr_port_1: + 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_vdbe_untr_2_subports: + feature_vdbe_vdbe_untr_port_1_vdbe_untr_2_subports: type: tosca.capabilities.Node 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 + feature_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_1_vdbe_untr_2_subports: + type: tosca.capabilities.Node + 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. @@ -684,12 +690,6 @@ node_types: 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.nested: derived_from: org.openecomp.resource.abstract.nodes.AbstractSubstitute properties: @@ -801,4 +801,4 @@ node_types: type: tosca.capabilities.Node occurrences: - 1 - - UNBOUNDED \ No newline at end of file + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRole/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRole/out/MainServiceTemplate.yaml index 32ad867f3c..0944af6c71 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRole/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRole/out/MainServiceTemplate.yaml @@ -457,16 +457,11 @@ topology_template: - get_input: aap_address_mode subinterface_vdbe_untr_2_subports_vlan_tag_list: - get_input: untrusted_vlan_tags + port_vdbe_untr_port_1_mac_requirements: + mac_count_required: + is_required: false subinterface_vdbe_untr_1_subports_vn_network_list: - get_input: untrusted_vn_networks - 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_vdbe_untr_2_subports_vn_network_list: - get_input: untrusted_vn_networks subinterface_vdbe_untr_1_subports_aap_untrusted_v6_ip_prefix: @@ -483,22 +478,27 @@ topology_template: - get_input: vdbe_aap_sec_untrusted_ip_prefix_len subinterface_vdbe_untr_2_subports_aap_sec_untrusted_ip_prefix_len: - get_input: vdbe_aap_sec_untrusted_ip_prefix_len - port_vdbe_untr_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false subinterface_vdbe_untr_1_subports_vlan_tag_list: - get_input: untrusted_vlan_tags subinterface_vdbe_untr_2_subports_aap_untrusted_ip_prefix: - get_input: vdbe_aap_untrusted_ip_prefix subinterface_vdbe_untr_1_subports_aap_untrusted_ip_prefix: - get_input: vdbe_aap_untrusted_ip_prefix + port_vdbe_untr_port_1_name: + - str_replace: + template: VM_NAMEDBE001p1n004 + params: + DBE: + get_input: vdbe_device_name + VM_NAME: + get_input: vdbe_name_1 subinterface_vdbe_untr_1_subports_ip_v6_address: - get_input: vdbe_untrusted_v6_ip_1 - port_vdbe_untr_port_mac_requirements: - mac_count_required: + port_vdbe_untr_port_1_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: is_required: false subinterface_vdbe_untr_1_subports_parent_interface: - vdbe_1_untr_port_1 @@ -552,4 +552,4 @@ topology_template: get_input: untr_vfc_instance_group_function subinterface_role: untr members: - - abstract_vdbe \ No newline at end of file + - abstract_vdbe diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRole/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/vfcInstanceGroup/oneSubInterfaceNetworkRole/out/Nested_vdbeServiceTemplate.yaml index dccbc264f1..699f13b97c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRole/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/vfcInstanceGroup/oneSubInterfaceNetworkRole/out/Nested_vdbeServiceTemplate.yaml @@ -11,9 +11,6 @@ node_types: 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_vdbe_untr_1_subports_ip_address: type: list required: true @@ -47,9 +44,6 @@ topology_template: required: true entry_schema: type: string - port_vdbe_untr_port_order: - type: integer - required: true subinterface_vdbe_untr_1_subports_mac_address: type: list required: true @@ -63,9 +57,6 @@ topology_template: vm_image_name: type: string required: true - port_vdbe_untr_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true subinterface_vdbe_untr_1_subports_aap_untrusted_v6_ip_prefix_len: type: list required: true @@ -86,6 +77,11 @@ topology_template: required: true entry_schema: type: string + port_vdbe_untr_port_1_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments subinterface_vdbe_untr_1_subports_aap_address_mode: type: list required: true @@ -96,19 +92,17 @@ topology_template: required: true entry_schema: type: json - subinterface_vdbe_untr_1_subports_vn_network_list: - type: list + port_vdbe_untr_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: string - port_vdbe_untr_port_name: + port_vdbe_untr_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + subinterface_vdbe_untr_1_subports_vn_network_list: type: list required: true entry_schema: type: string - port_vdbe_untr_port_network_role: - type: string - required: true subinterface_vdbe_untr_2_subports_vn_network_list: type: list required: true @@ -144,21 +138,11 @@ topology_template: required: true entry_schema: type: string - port_vdbe_untr_port_related_networks: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments subinterface_vdbe_untr_2_subports_aap_sec_untrusted_ip_prefix_len: 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 subinterface_vdbe_untr_1_subports_vlan_tag_list: type: list required: true @@ -174,16 +158,32 @@ topology_template: required: true entry_schema: type: string - port_vdbe_untr_port_subnetpoolid: + port_vdbe_untr_port_1_name: + type: list + required: true + entry_schema: + type: string + port_vdbe_untr_port_1_network_role: type: string required: true + port_vdbe_untr_port_1_network_role_tag: + type: string + required: true + port_vdbe_untr_port_1_order: + type: integer + required: true subinterface_vdbe_untr_1_subports_ip_v6_address: type: list required: true entry_schema: type: string - port_vdbe_untr_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_vdbe_untr_port_1_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_vdbe_untr_port_1_subnetpoolid: + type: string required: true index_value: type: integer @@ -207,7 +207,7 @@ topology_template: required: true entry_schema: type: float - port_vdbe_untr_port_vlan_requirements: + port_vdbe_untr_port_1_vlan_requirements: type: list required: true entry_schema: @@ -243,7 +243,57 @@ topology_template: entry_schema: type: string node_templates: - vdbe_vdbe_untr_port_vdbe_untr_1_subports: + 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_1: + type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port + properties: + exCP_naming: + get_input: port_vdbe_untr_port_1_exCP_naming + vlan_requirements: + get_input: port_vdbe_untr_port_1_vlan_requirements + subinterface_indicator: true + related_networks: + get_input: port_vdbe_untr_port_1_related_networks + ip_requirements: + get_input: port_vdbe_untr_port_1_ip_requirements + network_role_tag: + get_input: port_vdbe_untr_port_1_network_role_tag + mac_requirements: + get_input: port_vdbe_untr_port_1_mac_requirements + order: + get_input: port_vdbe_untr_port_1_order + network_role: + get_input: port_vdbe_untr_port_1_network_role + subnetpoolid: + get_input: port_vdbe_untr_port_1_subnetpoolid + name: + get_input: + - port_vdbe_untr_port_1_name + - index_value + requirements: + - binding: + capability: tosca.capabilities.network.Bindable + node: vdbe + relationship: tosca.relationships.network.BindsTo + vdbe_vdbe_untr_port_1_vdbe_untr_1_subports: type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested directives: - substitutable @@ -323,9 +373,9 @@ topology_template: requirements: - binding_vdbe_0_subint_untr_vmi_0: capability: tosca.capabilities.network.Bindable - node: vdbe_vdbe_untr_port + node: vdbe_vdbe_untr_port_1 relationship: tosca.relationships.network.BindsTo - vdbe_vdbe_untr_port_vdbe_untr_2_subports: + vdbe_vdbe_untr_port_1_vdbe_untr_2_subports: type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested directives: - substitutable @@ -404,76 +454,20 @@ topology_template: 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: true - related_networks: - get_input: port_vdbe_untr_port_related_networks - 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 + node: vdbe_vdbe_untr_port_1 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 + forwarder_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - forwarder + feature_vdbe_vdbe_untr_port_1_vdbe_untr_1_subports: + - vdbe_vdbe_untr_port_1_vdbe_untr_1_subports + - feature 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 @@ -498,12 +492,18 @@ topology_template: disk.device.write.requests.rate_vdbe: - vdbe - disk.device.write.requests.rate + feature_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - feature disk.write.bytes.rate_vdbe: - vdbe - disk.write.bytes.rate - network.incoming.packets_vdbe_vdbe_untr_port: - - vdbe_vdbe_untr_port - - network.incoming.packets + network.incoming.bytes.rate_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - network.incoming.bytes.rate + network.incoming.packets.rate_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - network.incoming.packets.rate scalable_vdbe: - vdbe - scalable @@ -513,9 +513,15 @@ topology_template: disk.device.write.requests_vdbe: - vdbe - disk.device.write.requests + network.outgoing.packets.rate_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - network.outgoing.packets.rate disk.device.capacity_vdbe: - vdbe - disk.device.capacity + network.outgoing.bytes_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - network.outgoing.bytes disk.device.allocation_vdbe: - vdbe - disk.device.allocation @@ -525,33 +531,24 @@ topology_template: 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 - feature_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_vdbe_untr_1_subports: - - vdbe_vdbe_untr_port_vdbe_untr_1_subports - - feature_vdbe_0_subint_untr_vmi_0 disk.read.requests_vdbe: - vdbe - disk.read.requests - forwarder_vdbe_vdbe_untr_port: - - vdbe_vdbe_untr_port - - forwarder - feature_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_vdbe_untr_2_subports: - - vdbe_vdbe_untr_port_vdbe_untr_2_subports - - feature_vdbe_0_subint_untr_vmi_0 - binding_vdbe_vdbe_untr_port: - - vdbe_vdbe_untr_port + binding_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 - binding + network.incoming.bytes_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - network.incoming.bytes + feature_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_1_vdbe_untr_1_subports: + - vdbe_vdbe_untr_port_1_vdbe_untr_1_subports + - feature_vdbe_0_subint_untr_vmi_0 instance_vdbe: - vdbe - instance - network.incoming.bytes.rate_vdbe_vdbe_untr_port: - - vdbe_vdbe_untr_port - - network.incoming.bytes.rate + network.outgoing.bytes.rate_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - network.outgoing.bytes.rate cpu.delta_vdbe: - vdbe - cpu.delta @@ -582,12 +579,9 @@ topology_template: disk.latency_vdbe: - vdbe - disk.latency - feature_vdbe_vdbe_untr_port_vdbe_untr_1_subports: - - vdbe_vdbe_untr_port_vdbe_untr_1_subports - - feature - network.incoming.bytes_vdbe_vdbe_untr_port: - - vdbe_vdbe_untr_port - - network.incoming.bytes + attachment_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - attachment disk.capacity_vdbe: - vdbe - disk.capacity @@ -597,18 +591,27 @@ topology_template: disk.allocation_vdbe: - vdbe - disk.allocation + network.outpoing.packets_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - network.outpoing.packets disk.read.bytes.rate_vdbe: - vdbe - disk.read.bytes.rate + network.incoming.packets_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - network.incoming.packets + feature_vdbe_vdbe_untr_port_1_vdbe_untr_2_subports: + - vdbe_vdbe_untr_port_1_vdbe_untr_2_subports + - feature os_vdbe: - vdbe - os - feature_vdbe_vdbe_untr_port_vdbe_untr_2_subports: - - vdbe_vdbe_untr_port_vdbe_untr_2_subports - - feature disk.device.read.requests_vdbe: - vdbe - disk.device.read.requests + feature_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_1_vdbe_untr_2_subports: + - vdbe_vdbe_untr_port_1_vdbe_untr_2_subports + - feature_vdbe_0_subint_untr_vmi_0 disk.root.size_vdbe: - vdbe - disk.root.size @@ -627,37 +630,34 @@ topology_template: 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_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 - dependency - link_vdbe_vdbe_untr_port: - - vdbe_vdbe_untr_port + link_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 - link - dependency_vdbe_vdbe_untr_port_vdbe_untr_1_subports: - - vdbe_vdbe_untr_port_vdbe_untr_1_subports - - dependency - subinterface_link_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_vdbe_untr_1_subports: - - vdbe_vdbe_untr_port_vdbe_untr_1_subports - - subinterface_link_vdbe_0_subint_untr_vmi_0 - dependency_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_vdbe_untr_2_subports: - - vdbe_vdbe_untr_port_vdbe_untr_2_subports - - dependency_vdbe_0_subint_untr_vmi_0 local_storage_vdbe: - vdbe - local_storage - dependency_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_vdbe_untr_1_subports: - - vdbe_vdbe_untr_port_vdbe_untr_1_subports + dependency_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_1_vdbe_untr_1_subports: + - vdbe_vdbe_untr_port_1_vdbe_untr_1_subports - dependency_vdbe_0_subint_untr_vmi_0 - dependency_vdbe_vdbe_untr_port_vdbe_untr_2_subports: - - vdbe_vdbe_untr_port_vdbe_untr_2_subports + subinterface_link_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_1_vdbe_untr_1_subports: + - vdbe_vdbe_untr_port_1_vdbe_untr_1_subports + - subinterface_link_vdbe_0_subint_untr_vmi_0 + dependency_vdbe_vdbe_untr_port_1_vdbe_untr_2_subports: + - vdbe_vdbe_untr_port_1_vdbe_untr_2_subports + - dependency + dependency_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_1_vdbe_untr_2_subports: + - vdbe_vdbe_untr_port_1_vdbe_untr_2_subports + - dependency_vdbe_0_subint_untr_vmi_0 + dependency_vdbe_vdbe_untr_port_1_vdbe_untr_1_subports: + - vdbe_vdbe_untr_port_1_vdbe_untr_1_subports - dependency - subinterface_link_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_vdbe_untr_2_subports: - - vdbe_vdbe_untr_port_vdbe_untr_2_subports + subinterface_link_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_1_vdbe_untr_2_subports: + - vdbe_vdbe_untr_port_1_vdbe_untr_2_subports - subinterface_link_vdbe_0_subint_untr_vmi_0 dependency_vdbe: - vdbe - - dependency \ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/in/main.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/in/main.yml index 0a6b109e67..1c98fa09e7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/in/main.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/in/main.yml @@ -136,7 +136,7 @@ resources: name: get_param: vdbe_name_1 networks: - - port: {get_resource: vdbe_2_untr_port_2} + - port: {get_resource: vdbe_2_untr_port_1} vdbe_1_untr_port_1: type: OS::Neutron::Port properties: @@ -149,7 +149,7 @@ resources: get_param: vdbe_name_1 template: VM_NAMEDBE001p1n004 - vdbe_2_untr_port_2: + vdbe_2_untr_port_1: type: OS::Neutron::Port properties: name: @@ -236,7 +236,7 @@ resources: mac_address: get_param: vdbe_hw_untr_mac_1 parent_interface: - get_resource: vdbe_2_untr_port_2 + get_resource: vdbe_2_untr_port_1 subinterfaces_name_prefix: str_replace: params: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/out/GlobalSubstitutionTypesServiceTemplate.yaml index ae99281d24..acb814e35d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,10 +8,6 @@ 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_nested_parent_interface: type: list required: true @@ -30,10 +26,6 @@ node_types: status: SUPPORTED entry_schema: type: json - port_vdbe_untr_port_subnetpoolid: - type: string - required: true - status: SUPPORTED compute_vdbe_availability_zone: type: list required: true @@ -52,12 +44,22 @@ node_types: status: SUPPORTED entry_schema: type: string + port_vdbe_untr_port_1_name: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_vdbe_untr_port_1_network_role: + type: string + required: true + status: SUPPORTED vm_flavor_name: type: string required: true status: SUPPORTED - port_vdbe_untr_port_order: - type: integer + port_vdbe_untr_port_1_network_role_tag: + type: string required: true status: SUPPORTED subinterface_nested_aap_untrusted_ip_prefix: @@ -66,12 +68,12 @@ node_types: status: SUPPORTED entry_schema: type: string - vm_image_name: - type: string + port_vdbe_untr_port_1_order: + type: integer required: true status: SUPPORTED - port_vdbe_untr_port_exCP_naming: - type: org.openecomp.datatypes.Naming + vm_image_name: + type: string required: true status: SUPPORTED subinterface_nested_aap_sec_untrusted_ip_prefix_len: @@ -110,16 +112,36 @@ node_types: status: SUPPORTED entry_schema: type: string + port_vdbe_untr_port_1_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments subinterface_nested_ip_v6_address: type: list required: true status: SUPPORTED entry_schema: type: string - port_vdbe_untr_port_mac_requirements: + port_vdbe_untr_port_1_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_vdbe_untr_port_1_subnetpoolid: + type: string + required: true + status: SUPPORTED + port_vdbe_untr_port_1_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED + port_vdbe_untr_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED index_value: type: integer description: Index value of this substitution service template runtime instance @@ -140,22 +162,12 @@ node_types: status: SUPPORTED entry_schema: type: string - port_vdbe_untr_port_name: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_vdbe_untr_port_vlan_requirements: + port_vdbe_untr_port_1_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 subinterface_nested_aap_untrusted_ip_prefix_len: type: list required: true @@ -180,76 +192,57 @@ node_types: status: SUPPORTED entry_schema: type: string - port_vdbe_untr_port_related_networks: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_vdbe_untr_port_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements requirements: - - dependency_vdbe: + - dependency_vdbe_vdbe_untr_port_1_nested: 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: + - dependency_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_1_nested: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_vdbe_vdbe_untr_port: + - subinterface_link_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_1_nested: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_vdbe_vdbe_untr_port_nested: + - dependency_vdbe: 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_nested: + - local_storage_vdbe: + capability: tosca.capabilities.Attachment + node: tosca.nodes.BlockStorage + relationship: tosca.relationships.AttachesTo + occurrences: + - 0 + - UNBOUNDED + - dependency_vdbe_vdbe_untr_port_1: 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_nested: + - link_vdbe_vdbe_untr_port_1: 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. + forwarder_vdbe_vdbe_untr_port_1: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED @@ -258,16 +251,6 @@ node_types: 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. @@ -279,6 +262,11 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_1_nested: + type: tosca.capabilities.Node + 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. @@ -315,20 +303,26 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_vdbe_vdbe_untr_port_1: + type: tosca.capabilities.Node + 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: + network.incoming.bytes.rate_vdbe_vdbe_untr_port_1: 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_nested: - type: tosca.capabilities.Node + network.incoming.packets.rate_vdbe_vdbe_untr_port_1: + 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 @@ -349,37 +343,37 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.capacity_vdbe: + network.outgoing.packets.rate_vdbe_vdbe_untr_port_1: 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: + 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.usage_vdbe: + network.outgoing.bytes_vdbe_vdbe_untr_port_1: 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: + 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 - network.outpoing.packets_vdbe_vdbe_untr_port: + 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 - network.outgoing.bytes.rate_vdbe_vdbe_untr_port: + 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: @@ -391,12 +385,7 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_vdbe_vdbe_untr_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - binding_vdbe_vdbe_untr_port: + binding_vdbe_vdbe_untr_port_1: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface @@ -404,13 +393,19 @@ node_types: occurrences: - 0 - UNBOUNDED + network.incoming.bytes_vdbe_vdbe_untr_port_1: + 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 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: + network.outgoing.bytes.rate_vdbe_vdbe_untr_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -440,11 +435,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_vdbe_vdbe_untr_port_nested: - type: tosca.capabilities.Node - 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. @@ -481,9 +471,8 @@ node_types: 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. + attachment_vdbe_vdbe_untr_port_1: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED @@ -506,17 +495,34 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_vdbe_vdbe_untr_port_1: + 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 + network.incoming.packets_vdbe_vdbe_untr_port_1: + 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 + feature_vdbe_vdbe_untr_port_1_nested: + type: tosca.capabilities.Node + 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. @@ -558,12 +564,6 @@ node_types: 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.nested: derived_from: org.openecomp.resource.abstract.nodes.AbstractSubstitute properties: @@ -675,4 +675,4 @@ node_types: type: tosca.capabilities.Node occurrences: - 1 - - UNBOUNDED \ No newline at end of file + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/out/MainServiceTemplate.yaml index 5dac40ecee..03b085ff1f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/out/MainServiceTemplate.yaml @@ -417,6 +417,14 @@ topology_template: - get_input: untrusted_num_vn subinterface_nested_aap_untrusted_v6_ip_prefix_len: - get_input: vdbe_aap_untrusted_v6_ip_prefix_len + port_vdbe_untr_port_1_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 subinterface_nested_aap_untrusted_ip_prefix: @@ -442,21 +450,19 @@ topology_template: - get_input: vdbe_untrusted_ip_1 subinterface_nested_ip_v6_address: - get_input: vdbe_untrusted_v6_ip_1 - port_vdbe_untr_port_mac_requirements: + port_vdbe_untr_port_1_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_vdbe_untr_port_1_mac_requirements: mac_count_required: is_required: false subinterface_nested_vmac_address: - get_input: vdbe_untrusted_vmac_address subinterface_nested_vn_network_list: - get_input: untrusted_vn_networks - 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_nested_aap_untrusted_ip_prefix_len: - get_input: vdbe_aap_untrusted_ip_prefix_len subinterface_nested_counter: @@ -474,12 +480,6 @@ topology_template: get_input: vdbe_name_1 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 service_template_filter: substitute_service_template: Nested_vdbeServiceTemplate.yaml count: 1 @@ -503,7 +503,7 @@ topology_template: - substitutable properties: subinterface_nested_parent_interface: - - vdbe_2_untr_port_2 + - vdbe_2_untr_port_1 subinterface_nested_aap_address_mode: - get_input: aap_address_mode subinterface_nested_vlan_tag_list: @@ -514,6 +514,14 @@ topology_template: - 5 subinterface_nested_aap_untrusted_v6_ip_prefix_len: - get_input: vdbe_aap_untrusted_v6_ip_prefix_len + port_vdbe_untr_port_1_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 subinterface_nested_aap_untrusted_ip_prefix: @@ -539,21 +547,19 @@ topology_template: - get_input: vdbe_untrusted_ip_1 subinterface_nested_ip_v6_address: - get_input: vdbe_untrusted_v6_ip_1 - port_vdbe_untr_port_mac_requirements: + port_vdbe_untr_port_1_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_vdbe_untr_port_1_mac_requirements: mac_count_required: is_required: false subinterface_nested_vmac_address: - get_input: vdbe_untrusted_vmac_address subinterface_nested_vn_network_list: - get_input: untrusted_vn_networks - 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_nested_aap_untrusted_ip_prefix_len: - get_input: vdbe_aap_untrusted_ip_prefix_len subinterface_nested_counter: @@ -568,12 +574,6 @@ topology_template: get_input: vdbe_name_1 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 service_template_filter: substitute_service_template: Nested_vdbeServiceTemplate.yaml count: 1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/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/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/out/Nested_vdbeServiceTemplate.yaml index d962ae0bac..397bf3a939 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/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/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/out/Nested_vdbeServiceTemplate.yaml @@ -11,9 +11,6 @@ node_types: 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_nested_parent_interface: type: list required: true @@ -29,9 +26,6 @@ topology_template: required: true entry_schema: type: json - port_vdbe_untr_port_subnetpoolid: - type: string - required: true compute_vdbe_availability_zone: type: list required: true @@ -47,23 +41,31 @@ topology_template: required: true entry_schema: type: string + port_vdbe_untr_port_1_name: + type: list + required: true + entry_schema: + type: string + port_vdbe_untr_port_1_network_role: + type: string + required: true vm_flavor_name: type: string required: true - port_vdbe_untr_port_order: - type: integer + port_vdbe_untr_port_1_network_role_tag: + type: string required: true subinterface_nested_aap_untrusted_ip_prefix: type: list required: true entry_schema: type: string + port_vdbe_untr_port_1_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_nested_aap_sec_untrusted_ip_prefix_len: type: list required: true @@ -94,14 +96,30 @@ topology_template: required: true entry_schema: type: string + port_vdbe_untr_port_1_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments subinterface_nested_ip_v6_address: type: list required: true entry_schema: type: string - port_vdbe_untr_port_mac_requirements: + port_vdbe_untr_port_1_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_vdbe_untr_port_1_subnetpoolid: + type: string + required: true + port_vdbe_untr_port_1_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true + port_vdbe_untr_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -119,19 +137,11 @@ topology_template: required: true entry_schema: type: string - port_vdbe_untr_port_name: - type: list - required: true - entry_schema: - type: string - port_vdbe_untr_port_vlan_requirements: + port_vdbe_untr_port_1_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_vdbe_untr_port_network_role: - type: string - required: true subinterface_nested_aap_untrusted_ip_prefix_len: type: list required: true @@ -152,68 +162,8 @@ topology_template: required: true entry_schema: type: string - port_vdbe_untr_port_related_networks: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - 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: true - related_networks: - get_input: port_vdbe_untr_port_related_networks - 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 - vdbe_vdbe_untr_port_nested: + vdbe_vdbe_untr_port_1_nested: type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested directives: - substitutable @@ -292,32 +242,76 @@ topology_template: requirements: - binding_vdbe_0_subint_untr_vmi_0: capability: tosca.capabilities.network.Bindable - node: vdbe_vdbe_untr_port + node: vdbe_vdbe_untr_port_1 + 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_1: + type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port + properties: + exCP_naming: + get_input: port_vdbe_untr_port_1_exCP_naming + vlan_requirements: + get_input: port_vdbe_untr_port_1_vlan_requirements + subinterface_indicator: true + related_networks: + get_input: port_vdbe_untr_port_1_related_networks + ip_requirements: + get_input: port_vdbe_untr_port_1_ip_requirements + network_role_tag: + get_input: port_vdbe_untr_port_1_network_role_tag + mac_requirements: + get_input: port_vdbe_untr_port_1_mac_requirements + order: + get_input: port_vdbe_untr_port_1_order + network_role: + get_input: port_vdbe_untr_port_1_network_role + subnetpoolid: + get_input: port_vdbe_untr_port_1_subnetpoolid + name: + get_input: + - port_vdbe_untr_port_1_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 + forwarder_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - forwarder 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 + feature_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_1_nested: + - vdbe_vdbe_untr_port_1_nested + - feature_vdbe_0_subint_untr_vmi_0 disk.ephemeral.size_vdbe: - vdbe - disk.ephemeral.size @@ -336,15 +330,18 @@ topology_template: disk.device.write.requests.rate_vdbe: - vdbe - disk.device.write.requests.rate + feature_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - feature disk.write.bytes.rate_vdbe: - vdbe - disk.write.bytes.rate - network.incoming.packets_vdbe_vdbe_untr_port: - - vdbe_vdbe_untr_port - - network.incoming.packets - feature_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_nested: - - vdbe_vdbe_untr_port_nested - - feature_vdbe_0_subint_untr_vmi_0 + network.incoming.bytes.rate_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - network.incoming.bytes.rate + network.incoming.packets.rate_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - network.incoming.packets.rate scalable_vdbe: - vdbe - scalable @@ -354,9 +351,15 @@ topology_template: disk.device.write.requests_vdbe: - vdbe - disk.device.write.requests + network.outgoing.packets.rate_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - network.outgoing.packets.rate disk.device.capacity_vdbe: - vdbe - disk.device.capacity + network.outgoing.bytes_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - network.outgoing.bytes disk.device.allocation_vdbe: - vdbe - disk.device.allocation @@ -366,27 +369,21 @@ topology_template: 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_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 - binding + network.incoming.bytes_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - network.incoming.bytes instance_vdbe: - vdbe - instance - network.incoming.bytes.rate_vdbe_vdbe_untr_port: - - vdbe_vdbe_untr_port - - network.incoming.bytes.rate + network.outgoing.bytes.rate_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - network.outgoing.bytes.rate cpu.delta_vdbe: - vdbe - cpu.delta @@ -399,9 +396,6 @@ topology_template: memory.resident_vdbe: - vdbe - memory.resident - feature_vdbe_vdbe_untr_port_nested: - - vdbe_vdbe_untr_port_nested - - feature disk.write.requests.rate_vdbe: - vdbe - disk.write.requests.rate @@ -420,9 +414,9 @@ topology_template: disk.latency_vdbe: - vdbe - disk.latency - network.incoming.bytes_vdbe_vdbe_untr_port: - - vdbe_vdbe_untr_port - - network.incoming.bytes + attachment_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - attachment disk.capacity_vdbe: - vdbe - disk.capacity @@ -432,12 +426,21 @@ topology_template: disk.allocation_vdbe: - vdbe - disk.allocation + network.outpoing.packets_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - network.outpoing.packets disk.read.bytes.rate_vdbe: - vdbe - disk.read.bytes.rate + network.incoming.packets_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - network.incoming.packets os_vdbe: - vdbe - os + feature_vdbe_vdbe_untr_port_1_nested: + - vdbe_vdbe_untr_port_1_nested + - feature disk.device.read.requests_vdbe: - vdbe - disk.device.read.requests @@ -459,28 +462,25 @@ topology_template: 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_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_1_nested: + - vdbe_vdbe_untr_port_1_nested + - dependency_vdbe_0_subint_untr_vmi_0 + subinterface_link_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_1_nested: + - vdbe_vdbe_untr_port_1_nested + - subinterface_link_vdbe_0_subint_untr_vmi_0 + dependency_vdbe_vdbe_untr_port_1_nested: + - vdbe_vdbe_untr_port_1_nested + - dependency + dependency_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 - dependency - link_vdbe_vdbe_untr_port: - - vdbe_vdbe_untr_port + link_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 - link local_storage_vdbe: - vdbe - local_storage - dependency_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_nested: - - vdbe_vdbe_untr_port_nested - - dependency_vdbe_0_subint_untr_vmi_0 - subinterface_link_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_nested: - - vdbe_vdbe_untr_port_nested - - subinterface_link_vdbe_0_subint_untr_vmi_0 - dependency_vdbe_vdbe_untr_port_nested: - - vdbe_vdbe_untr_port_nested - - dependency dependency_vdbe: - vdbe - - dependency \ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/in/main.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/in/main.yml index 923c53d41f..5a35661871 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/in/main.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/in/main.yml @@ -136,7 +136,7 @@ resources: name: get_param: vdbe_name_1 networks: - - port: {get_resource: vdbe_2_untr_port_2} + - port: {get_resource: vdbe_2_untr_port_1} vdbe_1_untr_port_1: type: OS::Neutron::Port properties: @@ -149,7 +149,7 @@ resources: get_param: vdbe_name_1 template: VM_NAMEDBE001p1n004 - vdbe_2_untr_port_2: + vdbe_2_untr_port_1: type: OS::Neutron::Port properties: name: @@ -236,7 +236,7 @@ resources: mac_address: get_param: vdbe_hw_untr_mac_1 parent_interface: - get_resource: vdbe_2_untr_port_2 + get_resource: vdbe_2_untr_port_1 subinterfaces_name_prefix: str_replace: params: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/GlobalSubstitutionTypesServiceTemplate.yaml index f514c6153c..39cfc595b6 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -120,10 +120,6 @@ 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 @@ -136,10 +132,6 @@ node_types: 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 @@ -152,11 +144,25 @@ node_types: status: SUPPORTED entry_schema: type: string + port_vdbe_untr_port_1_name: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_vdbe_untr_port_1_network_role: + type: string + required: true + status: SUPPORTED vm_flavor_name: type: string required: true status: SUPPORTED - port_vdbe_untr_port_order: + port_vdbe_untr_port_1_network_role_tag: + type: string + required: true + status: SUPPORTED + port_vdbe_untr_port_1_order: type: integer required: true status: SUPPORTED @@ -164,10 +170,6 @@ node_types: 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 @@ -210,6 +212,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_vdbe_untr_port_1_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments subinterface_nested1_aap_untrusted_ip_prefix_len: type: list required: true @@ -222,10 +230,24 @@ node_types: status: SUPPORTED entry_schema: type: string - port_vdbe_untr_port_mac_requirements: + port_vdbe_untr_port_1_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_vdbe_untr_port_1_subnetpoolid: + type: string + required: true + status: SUPPORTED + port_vdbe_untr_port_1_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED + port_vdbe_untr_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED index_value: type: integer description: Index value of this substitution service template runtime instance @@ -234,13 +256,7 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_vdbe_untr_port_name: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_vdbe_untr_port_vlan_requirements: + port_vdbe_untr_port_1_vlan_requirements: type: list required: true status: SUPPORTED @@ -252,10 +268,6 @@ node_types: 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 @@ -280,40 +292,28 @@ node_types: status: SUPPORTED entry_schema: type: string - port_vdbe_untr_port_related_networks: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments 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: + - dependency_vdbe_vdbe_untr_port_1_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: + - dependency_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_1_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: + - subinterface_link_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_1_nested1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -333,47 +333,35 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_vdbe_vdbe_untr_port: + - dependency_vdbe_vdbe_untr_port_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_vdbe_vdbe_untr_port: + - link_vdbe_vdbe_untr_port_1: 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. + forwarder_vdbe_vdbe_untr_port_1: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - feature_vdbe: + feature_vdbe_vdbe_untr_port_1_nested1: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - feature_vdbe_vdbe_untr_port: + feature_vdbe: 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. @@ -421,13 +409,24 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_vdbe_vdbe_untr_port_1: + type: tosca.capabilities.Node + 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: + network.incoming.bytes.rate_vdbe_vdbe_untr_port_1: + 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_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -450,42 +449,37 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.capacity_vdbe: + network.outgoing.packets.rate_vdbe_vdbe_untr_port_1: 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: + 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.usage_vdbe: + network.outgoing.bytes_vdbe_vdbe_untr_port_1: 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: + 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 - network.outpoing.packets_vdbe_vdbe_untr_port: + 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 - network.outgoing.bytes.rate_vdbe_vdbe_untr_port: + 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: @@ -497,12 +491,7 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_vdbe_vdbe_untr_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - binding_vdbe_vdbe_untr_port: + binding_vdbe_vdbe_untr_port_1: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface @@ -510,13 +499,19 @@ node_types: occurrences: - 0 - UNBOUNDED + network.incoming.bytes_vdbe_vdbe_untr_port_1: + 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 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: + network.outgoing.bytes.rate_vdbe_vdbe_untr_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -540,11 +535,6 @@ node_types: 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. @@ -587,9 +577,8 @@ node_types: 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. + attachment_vdbe_vdbe_untr_port_1: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED @@ -612,12 +601,29 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_vdbe_vdbe_untr_port_1: + 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 + network.incoming.packets_vdbe_vdbe_untr_port_1: + 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_1_nested1: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED os_vdbe: type: tosca.capabilities.OperatingSystem occurrences: @@ -664,12 +670,6 @@ node_types: 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: @@ -785,20 +785,12 @@ node_types: 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 subinterface_nested2_subinterfaces_name_prefix: type: list required: true status: SUPPORTED entry_schema: type: string - port_vdbe_untr_port_subnetpoolid: - type: string - required: true - status: SUPPORTED compute_vdbe_availability_zone: type: list required: true @@ -811,6 +803,16 @@ node_types: status: SUPPORTED entry_schema: type: string + port_vdbe_untr_port_1_name: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_vdbe_untr_port_1_network_role: + type: string + required: true + status: SUPPORTED vm_flavor_name: type: string required: true @@ -821,28 +823,28 @@ node_types: status: SUPPORTED entry_schema: type: string + port_vdbe_untr_port_1_network_role_tag: + type: string + required: true + status: SUPPORTED subinterface_nested2_aap_sec_untrusted_ip_prefix: type: list required: true status: SUPPORTED entry_schema: type: string - port_vdbe_untr_port_order: - type: integer - required: true - status: SUPPORTED subinterface_nested2_vmac_address: type: list required: true status: SUPPORTED entry_schema: type: string - vm_image_name: - type: string + port_vdbe_untr_port_1_order: + type: integer required: true status: SUPPORTED - port_vdbe_untr_port_exCP_naming: - type: org.openecomp.datatypes.Naming + vm_image_name: + type: string required: true status: SUPPORTED compute_vdbe_metadata: @@ -851,6 +853,12 @@ node_types: status: SUPPORTED entry_schema: type: json + port_vdbe_untr_port_1_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments subinterface_nested2_aap_sec_untrusted_ip_prefix_len: type: list required: true @@ -863,10 +871,24 @@ node_types: status: SUPPORTED entry_schema: type: string - port_vdbe_untr_port_mac_requirements: + port_vdbe_untr_port_1_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_vdbe_untr_port_1_subnetpoolid: + type: string + required: true + status: SUPPORTED + port_vdbe_untr_port_1_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED + port_vdbe_untr_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED subinterface_nested2_ip_address: type: list required: true @@ -881,34 +903,24 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_vdbe_untr_port_name: + port_vdbe_untr_port_1_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string + type: org.openecomp.datatypes.network.VlanRequirements subinterface_nested2_vlan_tag_list: type: list required: true status: SUPPORTED entry_schema: type: json - port_vdbe_untr_port_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements subinterface_nested2_aap_untrusted_ip_prefix_len: type: list required: true status: SUPPORTED entry_schema: type: string - port_vdbe_untr_port_network_role: - type: string - required: true - status: SUPPORTED subinterface_nested2_service_template_filter_count: type: list required: true @@ -957,34 +969,22 @@ node_types: status: SUPPORTED entry_schema: type: string - port_vdbe_untr_port_related_networks: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - 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_nested2: + - dependency_vdbe_vdbe_untr_port_1_nested2: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - dependency_vdbe_0_subint_oam_vmi_0_vdbe_vdbe_untr_port_nested2: + - dependency_vdbe_0_subint_oam_vmi_0_vdbe_vdbe_untr_port_1_nested2: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - subinterface_link_vdbe_0_subint_oam_vmi_0_vdbe_vdbe_untr_port_nested2: + - subinterface_link_vdbe_0_subint_oam_vmi_0_vdbe_vdbe_untr_port_1_nested2: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -1004,29 +1004,27 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_vdbe_vdbe_untr_port: + - dependency_vdbe_vdbe_untr_port_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_vdbe_vdbe_untr_port: + - link_vdbe_vdbe_untr_port_1: 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. + feature_vdbe_vdbe_untr_port_1_nested2: + type: tosca.capabilities.Node 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. + forwarder_vdbe_vdbe_untr_port_1: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED @@ -1035,16 +1033,6 @@ node_types: 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. @@ -1092,13 +1080,24 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_vdbe_vdbe_untr_port_1: + type: tosca.capabilities.Node + 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: + network.incoming.bytes.rate_vdbe_vdbe_untr_port_1: + 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_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1121,37 +1120,37 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.capacity_vdbe: + network.outgoing.packets.rate_vdbe_vdbe_untr_port_1: 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: + 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.usage_vdbe: + network.outgoing.bytes_vdbe_vdbe_untr_port_1: 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: + 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 - network.outpoing.packets_vdbe_vdbe_untr_port: + 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 - network.outgoing.bytes.rate_vdbe_vdbe_untr_port: + 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: @@ -1163,12 +1162,7 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_vdbe_vdbe_untr_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - binding_vdbe_vdbe_untr_port: + binding_vdbe_vdbe_untr_port_1: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface @@ -1176,13 +1170,19 @@ node_types: occurrences: - 0 - UNBOUNDED + network.incoming.bytes_vdbe_vdbe_untr_port_1: + 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 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: + network.outgoing.bytes.rate_vdbe_vdbe_untr_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1194,6 +1194,11 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_vdbe_0_subint_oam_vmi_0_vdbe_vdbe_untr_port_1_nested2: + type: tosca.capabilities.Node + 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. @@ -1212,11 +1217,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_vdbe_vdbe_untr_port_nested2: - type: tosca.capabilities.Node - 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. @@ -1253,9 +1253,8 @@ node_types: 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. + attachment_vdbe_vdbe_untr_port_1: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED @@ -1278,8 +1277,9 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_vdbe_0_subint_oam_vmi_0_vdbe_vdbe_untr_port_nested2: - type: tosca.capabilities.Node + network.outpoing.packets_vdbe_vdbe_untr_port_1: + 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 @@ -1289,6 +1289,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets_vdbe_vdbe_untr_port_1: + 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: @@ -1335,9 +1341,3 @@ node_types: 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/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/MainServiceTemplate.yaml index e71657f3c9..88088e4d67 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/MainServiceTemplate.yaml @@ -432,10 +432,18 @@ topology_template: - get_input: availability_zone_1 subinterface_nested2_aap_untrusted_v6_ip_prefix: - get_input: vdbe_aap_untrusted_v6_ip_prefix + port_vdbe_untr_port_1_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 subinterface_nested2_parent_interface: - - vdbe_2_untr_port_2 + - vdbe_2_untr_port_1 subinterface_nested2_aap_sec_untrusted_ip_prefix: - get_input: vdbe_aap_sec_untrusted_ip_prefix subinterface_nested2_vmac_address: @@ -453,19 +461,17 @@ topology_template: - get_input: vdbe_aap_sec_untrusted_ip_prefix_len subinterface_nested2_mac_address: - get_input: vdbe_hw_untr_mac_1 - port_vdbe_untr_port_mac_requirements: + port_vdbe_untr_port_1_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_vdbe_untr_port_1_mac_requirements: mac_count_required: is_required: false subinterface_nested2_ip_address: - get_input: vdbe_untrusted_ip_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 subinterface_nested2_vlan_tag_list: - get_input: untrusted_vlan_tags subinterface_nested2_aap_untrusted_ip_prefix_len: @@ -486,12 +492,6 @@ topology_template: - get_input: aap_address_mode subinterface_nested2_vn_network_list: - get_input: untrusted_vn_networks - port_vdbe_untr_port_ip_requirements: - - ip_version: 4 - 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 @@ -513,6 +513,14 @@ topology_template: - get_input: untrusted_vn_networks compute_vdbe_availability_zone: - get_input: availability_zone_1 + port_vdbe_untr_port_1_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: @@ -546,17 +554,15 @@ topology_template: - 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: + port_vdbe_untr_port_1_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_vdbe_untr_port_1_mac_requirements: mac_count_required: is_required: false - 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: @@ -569,12 +575,6 @@ topology_template: - 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 service_template_filter: substitute_service_template: Nested_vdbeServiceTemplate.yaml count: 1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/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/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/Nested_vdbeServiceTemplate.yaml index 67fb90607c..f36cad822b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/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/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/Nested_vdbeServiceTemplate.yaml @@ -11,9 +11,6 @@ node_types: 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 @@ -24,9 +21,6 @@ topology_template: required: true entry_schema: type: string - port_vdbe_untr_port_subnetpoolid: - type: string - required: true subinterface_nested1_vn_network_list: type: list required: true @@ -37,18 +31,26 @@ topology_template: required: true entry_schema: type: string + port_vdbe_untr_port_1_name: + type: list + required: true + entry_schema: + type: string + port_vdbe_untr_port_1_network_role: + type: string + required: true vm_flavor_name: type: string required: true - port_vdbe_untr_port_order: + port_vdbe_untr_port_1_network_role_tag: + type: string + required: true + port_vdbe_untr_port_1_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 @@ -84,6 +86,11 @@ topology_template: required: true entry_schema: type: string + port_vdbe_untr_port_1_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments subinterface_nested1_aap_untrusted_ip_prefix_len: type: list required: true @@ -94,9 +101,20 @@ topology_template: required: true entry_schema: type: string - port_vdbe_untr_port_mac_requirements: + port_vdbe_untr_port_1_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_vdbe_untr_port_1_subnetpoolid: + type: string + required: true + port_vdbe_untr_port_1_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true + port_vdbe_untr_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -104,12 +122,7 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_vdbe_untr_port_name: - type: list - required: true - entry_schema: - type: string - port_vdbe_untr_port_vlan_requirements: + port_vdbe_untr_port_1_vlan_requirements: type: list required: true entry_schema: @@ -119,9 +132,6 @@ topology_template: 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 @@ -142,23 +152,13 @@ topology_template: required: true entry_schema: type: string - port_vdbe_untr_port_related_networks: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments 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: + vdbe_vdbe_untr_port_1_nested1: type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested1 directives: - substitutable @@ -238,7 +238,7 @@ topology_template: requirements: - binding_vdbe_0_subint_untr_vmi_0: capability: tosca.capabilities.network.Bindable - node: vdbe_vdbe_untr_port + node: vdbe_vdbe_untr_port_1 relationship: tosca.relationships.network.BindsTo vdbe: type: org.openecomp.resource.vfc.compute.nodes.heat.vdbe @@ -259,31 +259,31 @@ topology_template: get_input: - compute_vdbe_name - index_value - vdbe_vdbe_untr_port: + vdbe_vdbe_untr_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_vdbe_untr_port_exCP_naming + get_input: port_vdbe_untr_port_1_exCP_naming vlan_requirements: - get_input: port_vdbe_untr_port_vlan_requirements + get_input: port_vdbe_untr_port_1_vlan_requirements subinterface_indicator: true related_networks: - get_input: port_vdbe_untr_port_related_networks + get_input: port_vdbe_untr_port_1_related_networks ip_requirements: - get_input: port_vdbe_untr_port_ip_requirements + get_input: port_vdbe_untr_port_1_ip_requirements network_role_tag: - get_input: port_vdbe_untr_port_network_role_tag + get_input: port_vdbe_untr_port_1_network_role_tag mac_requirements: - get_input: port_vdbe_untr_port_mac_requirements + get_input: port_vdbe_untr_port_1_mac_requirements order: - get_input: port_vdbe_untr_port_order + get_input: port_vdbe_untr_port_1_order network_role: - get_input: port_vdbe_untr_port_network_role + get_input: port_vdbe_untr_port_1_network_role subnetpoolid: - get_input: port_vdbe_untr_port_subnetpoolid + get_input: port_vdbe_untr_port_1_subnetpoolid name: get_input: - - port_vdbe_untr_port_name + - port_vdbe_untr_port_1_name - index_value requirements: - binding: @@ -293,21 +293,15 @@ topology_template: 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 + forwarder_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - forwarder + feature_vdbe_vdbe_untr_port_1_nested1: + - vdbe_vdbe_untr_port_1_nested1 + - feature 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 @@ -332,12 +326,18 @@ topology_template: disk.device.write.requests.rate_vdbe: - vdbe - disk.device.write.requests.rate + feature_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - feature disk.write.bytes.rate_vdbe: - vdbe - disk.write.bytes.rate - network.incoming.packets_vdbe_vdbe_untr_port: - - vdbe_vdbe_untr_port - - network.incoming.packets + network.incoming.bytes.rate_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - network.incoming.bytes.rate + network.incoming.packets.rate_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - network.incoming.packets.rate scalable_vdbe: - vdbe - scalable @@ -347,12 +347,15 @@ topology_template: disk.device.write.requests_vdbe: - vdbe - disk.device.write.requests + network.outgoing.packets.rate_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - network.outgoing.packets.rate 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 + network.outgoing.bytes_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - network.outgoing.bytes disk.device.allocation_vdbe: - vdbe - disk.device.allocation @@ -362,27 +365,21 @@ topology_template: 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_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 - binding + network.incoming.bytes_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - network.incoming.bytes instance_vdbe: - vdbe - instance - network.incoming.bytes.rate_vdbe_vdbe_untr_port: - - vdbe_vdbe_untr_port - - network.incoming.bytes.rate + network.outgoing.bytes.rate_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - network.outgoing.bytes.rate cpu.delta_vdbe: - vdbe - cpu.delta @@ -392,9 +389,6 @@ topology_template: 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 @@ -416,9 +410,9 @@ topology_template: disk.latency_vdbe: - vdbe - disk.latency - network.incoming.bytes_vdbe_vdbe_untr_port: - - vdbe_vdbe_untr_port - - network.incoming.bytes + attachment_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - attachment disk.capacity_vdbe: - vdbe - disk.capacity @@ -428,9 +422,18 @@ topology_template: disk.allocation_vdbe: - vdbe - disk.allocation + network.outpoing.packets_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - network.outpoing.packets disk.read.bytes.rate_vdbe: - vdbe - disk.read.bytes.rate + network.incoming.packets_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - network.incoming.packets + feature_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_1_nested1: + - vdbe_vdbe_untr_port_1_nested1 + - feature_vdbe_0_subint_untr_vmi_0 os_vdbe: - vdbe - os @@ -455,28 +458,25 @@ topology_template: 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_vdbe_vdbe_untr_port_1_nested1: + - vdbe_vdbe_untr_port_1_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_vdbe_vdbe_untr_port_1_nested1: + - vdbe_vdbe_untr_port_1_nested1 - dependency_vdbe_0_subint_untr_vmi_0 - link_vdbe_vdbe_untr_port: - - vdbe_vdbe_untr_port + dependency_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - dependency + dependency_vdbe_vdbe_untr_port_1_nested1: + - vdbe_vdbe_untr_port_1_nested1 + - dependency + link_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 - link local_storage_vdbe: - vdbe - local_storage - dependency_vdbe_vdbe_untr_port_nested1: - - vdbe_vdbe_untr_port_nested1 - - dependency dependency_vdbe: - vdbe - - dependency \ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/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/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/Nested_vdbe_1ServiceTemplate.yaml index f6128a3dc0..443dcd5610 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/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/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/Nested_vdbe_1ServiceTemplate.yaml @@ -11,17 +11,11 @@ node_types: 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_nested2_subinterfaces_name_prefix: type: list required: true entry_schema: type: string - port_vdbe_untr_port_subnetpoolid: - type: string - required: true compute_vdbe_availability_zone: type: list required: true @@ -32,6 +26,14 @@ topology_template: required: true entry_schema: type: string + port_vdbe_untr_port_1_name: + type: list + required: true + entry_schema: + type: string + port_vdbe_untr_port_1_network_role: + type: string + required: true vm_flavor_name: type: string required: true @@ -40,30 +42,35 @@ topology_template: required: true entry_schema: type: string + port_vdbe_untr_port_1_network_role_tag: + type: string + required: true subinterface_nested2_aap_sec_untrusted_ip_prefix: type: list required: true entry_schema: type: string - port_vdbe_untr_port_order: - type: integer - required: true subinterface_nested2_vmac_address: type: list required: true entry_schema: type: string + port_vdbe_untr_port_1_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 + port_vdbe_untr_port_1_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments subinterface_nested2_aap_sec_untrusted_ip_prefix_len: type: list required: true @@ -74,9 +81,20 @@ topology_template: required: true entry_schema: type: string - port_vdbe_untr_port_mac_requirements: + port_vdbe_untr_port_1_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_vdbe_untr_port_1_subnetpoolid: + type: string + required: true + port_vdbe_untr_port_1_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true + port_vdbe_untr_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true subinterface_nested2_ip_address: type: list required: true @@ -89,29 +107,21 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_vdbe_untr_port_name: + port_vdbe_untr_port_1_vlan_requirements: type: list required: true entry_schema: - type: string + type: org.openecomp.datatypes.network.VlanRequirements subinterface_nested2_vlan_tag_list: type: list required: true entry_schema: type: json - port_vdbe_untr_port_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements subinterface_nested2_aap_untrusted_ip_prefix_len: type: list required: true entry_schema: type: string - port_vdbe_untr_port_network_role: - type: string - required: true subinterface_nested2_service_template_filter_count: type: list required: true @@ -152,18 +162,8 @@ topology_template: required: true entry_schema: type: string - port_vdbe_untr_port_related_networks: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_vdbe_untr_port_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements node_templates: - vdbe_vdbe_untr_port_nested2: + vdbe_vdbe_untr_port_1_nested2: type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested2 directives: - substitutable @@ -242,7 +242,7 @@ topology_template: requirements: - binding_vdbe_0_subint_oam_vmi_0: capability: tosca.capabilities.network.Bindable - node: vdbe_vdbe_untr_port + node: vdbe_vdbe_untr_port_1 relationship: tosca.relationships.network.BindsTo vdbe: type: org.openecomp.resource.vfc.compute.nodes.heat.vdbe @@ -263,31 +263,31 @@ topology_template: get_input: - compute_vdbe_name - index_value - vdbe_vdbe_untr_port: + vdbe_vdbe_untr_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_vdbe_untr_port_exCP_naming + get_input: port_vdbe_untr_port_1_exCP_naming vlan_requirements: - get_input: port_vdbe_untr_port_vlan_requirements + get_input: port_vdbe_untr_port_1_vlan_requirements subinterface_indicator: true related_networks: - get_input: port_vdbe_untr_port_related_networks + get_input: port_vdbe_untr_port_1_related_networks ip_requirements: - get_input: port_vdbe_untr_port_ip_requirements + get_input: port_vdbe_untr_port_1_ip_requirements network_role_tag: - get_input: port_vdbe_untr_port_network_role_tag + get_input: port_vdbe_untr_port_1_network_role_tag mac_requirements: - get_input: port_vdbe_untr_port_mac_requirements + get_input: port_vdbe_untr_port_1_mac_requirements order: - get_input: port_vdbe_untr_port_order + get_input: port_vdbe_untr_port_1_order network_role: - get_input: port_vdbe_untr_port_network_role + get_input: port_vdbe_untr_port_1_network_role subnetpoolid: - get_input: port_vdbe_untr_port_subnetpoolid + get_input: port_vdbe_untr_port_1_subnetpoolid name: get_input: - - port_vdbe_untr_port_name + - port_vdbe_untr_port_1_name - index_value requirements: - binding: @@ -297,21 +297,15 @@ topology_template: 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_untr_port_1_nested2: + - vdbe_vdbe_untr_port_1_nested2 + - feature + forwarder_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - forwarder 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 @@ -336,12 +330,18 @@ topology_template: disk.device.write.requests.rate_vdbe: - vdbe - disk.device.write.requests.rate + feature_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - feature disk.write.bytes.rate_vdbe: - vdbe - disk.write.bytes.rate - network.incoming.packets_vdbe_vdbe_untr_port: - - vdbe_vdbe_untr_port - - network.incoming.packets + network.incoming.bytes.rate_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - network.incoming.bytes.rate + network.incoming.packets.rate_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - network.incoming.packets.rate scalable_vdbe: - vdbe - scalable @@ -351,9 +351,15 @@ topology_template: disk.device.write.requests_vdbe: - vdbe - disk.device.write.requests + network.outgoing.packets.rate_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - network.outgoing.packets.rate disk.device.capacity_vdbe: - vdbe - disk.device.capacity + network.outgoing.bytes_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - network.outgoing.bytes disk.device.allocation_vdbe: - vdbe - disk.device.allocation @@ -363,30 +369,27 @@ topology_template: 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_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 - binding + network.incoming.bytes_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - network.incoming.bytes instance_vdbe: - vdbe - instance - network.incoming.bytes.rate_vdbe_vdbe_untr_port: - - vdbe_vdbe_untr_port - - network.incoming.bytes.rate + network.outgoing.bytes.rate_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - network.outgoing.bytes.rate cpu.delta_vdbe: - vdbe - cpu.delta + feature_vdbe_0_subint_oam_vmi_0_vdbe_vdbe_untr_port_1_nested2: + - vdbe_vdbe_untr_port_1_nested2 + - feature_vdbe_0_subint_oam_vmi_0 disk.device.read.bytes.rate_vdbe: - vdbe - disk.device.read.bytes.rate @@ -396,9 +399,6 @@ topology_template: memory.resident_vdbe: - vdbe - memory.resident - feature_vdbe_vdbe_untr_port_nested2: - - vdbe_vdbe_untr_port_nested2 - - feature disk.write.requests.rate_vdbe: - vdbe - disk.write.requests.rate @@ -417,9 +417,9 @@ topology_template: disk.latency_vdbe: - vdbe - disk.latency - network.incoming.bytes_vdbe_vdbe_untr_port: - - vdbe_vdbe_untr_port - - network.incoming.bytes + attachment_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - attachment disk.capacity_vdbe: - vdbe - disk.capacity @@ -429,12 +429,15 @@ topology_template: disk.allocation_vdbe: - vdbe - disk.allocation - feature_vdbe_0_subint_oam_vmi_0_vdbe_vdbe_untr_port_nested2: - - vdbe_vdbe_untr_port_nested2 - - feature_vdbe_0_subint_oam_vmi_0 + network.outpoing.packets_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - network.outpoing.packets disk.read.bytes.rate_vdbe: - vdbe - disk.read.bytes.rate + network.incoming.packets_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - network.incoming.packets os_vdbe: - vdbe - os @@ -459,28 +462,25 @@ topology_template: 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_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 - dependency - dependency_vdbe_0_subint_oam_vmi_0_vdbe_vdbe_untr_port_nested2: - - vdbe_vdbe_untr_port_nested2 - - dependency_vdbe_0_subint_oam_vmi_0 - subinterface_link_vdbe_0_subint_oam_vmi_0_vdbe_vdbe_untr_port_nested2: - - vdbe_vdbe_untr_port_nested2 - - subinterface_link_vdbe_0_subint_oam_vmi_0 - link_vdbe_vdbe_untr_port: - - vdbe_vdbe_untr_port + dependency_vdbe_vdbe_untr_port_1_nested2: + - vdbe_vdbe_untr_port_1_nested2 + - dependency + link_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 - link + subinterface_link_vdbe_0_subint_oam_vmi_0_vdbe_vdbe_untr_port_1_nested2: + - vdbe_vdbe_untr_port_1_nested2 + - subinterface_link_vdbe_0_subint_oam_vmi_0 local_storage_vdbe: - vdbe - local_storage - dependency_vdbe_vdbe_untr_port_nested2: - - vdbe_vdbe_untr_port_nested2 - - dependency + dependency_vdbe_0_subint_oam_vmi_0_vdbe_vdbe_untr_port_1_nested2: + - vdbe_vdbe_untr_port_1_nested2 + - dependency_vdbe_0_subint_oam_vmi_0 dependency_vdbe: - vdbe - - dependency \ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/vdbeav/in/vdbeav_base_heat_template.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/vdbeav/in/vdbeav_base_heat_template.yaml index ba730546ea..be85be4308 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/vdbeav/in/vdbeav_base_heat_template.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/vdbeav/in/vdbeav_base_heat_template.yaml @@ -252,7 +252,7 @@ resources: network: get_resource: fabric_int_net type: "OS::Neutron::Subnet" - vdbe_0_untr_vmi_0: + vdbe_0_untr_vmi_1: properties: name: str_replace: @@ -502,7 +502,7 @@ resources: get_resource: vdbe_fabr_0_port - port: - get_resource: vdbe_0_untr_vmi_0 + get_resource: vdbe_0_untr_vmi_1 - port: get_resource: vdbe_trst_0_port @@ -772,7 +772,7 @@ resources: get_param: trusted_net_name type: "OS::ContrailV2::InstanceIp" vdbe_untr_0_subports: - depends_on: vdbe_0_untr_vmi_0 + depends_on: vdbe_0_untr_vmi_1 properties: count: get_param: untrusted_num_vn @@ -800,7 +800,7 @@ resources: mac_address: get_param: vdbe_hw_untr_mac_0 parent_interface: - get_resource: vdbe_0_untr_vmi_0 + get_resource: vdbe_0_untr_vmi_1 subinterfaces_name_prefix: str_replace: params: @@ -865,13 +865,13 @@ resources: type: "OS::Heat::ResourceGroup" vdbe_untrusted_Iip_0: depends_on: - - vdbe_0_untr_vmi_0 + - vdbe_0_untr_vmi_1 properties: instance_ip_address: get_param: vdbe_untrusted_ip_0 virtual_machine_interface_refs: - - get_resource: vdbe_0_untr_vmi_0 + get_resource: vdbe_0_untr_vmi_1 virtual_network_refs: - get_param: untrusted_net_name @@ -891,14 +891,14 @@ resources: type: "OS::ContrailV2::InstanceIp" vdbe_untrusted_v6_Iip_0: depends_on: - - vdbe_0_untr_vmi_0 + - vdbe_0_untr_vmi_1 properties: instance_ip_address: get_param: vdbe_untrusted_v6_ip_0 instance_ip_family: v6 virtual_machine_interface_refs: - - get_resource: vdbe_0_untr_vmi_0 + get_resource: vdbe_0_untr_vmi_1 virtual_network_refs: - get_param: untrusted_net_name diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/vdbeav/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/vdbeav/out/GlobalSubstitutionTypesServiceTemplate.yaml index 8e98129bbc..b90adc25b2 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/vdbeav/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/vdbeav/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -122,16 +122,6 @@ node_types: org.openecomp.resource.abstract.nodes.vdbe: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_vdbe_untr_vmi_virtual_machine_interface_allowed_address_pairs: - type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs - required: true - status: SUPPORTED - port_vdbe_untr_vmi_related_networks: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments subinterface_vdbeav_subinterface_heat_template_aap_address_mode: type: list required: true @@ -178,6 +168,12 @@ node_types: type: string required: true status: SUPPORTED + port_vdbe_untr_vmi_1_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_vdbe_ctrl_0_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -214,18 +210,28 @@ node_types: status: SUPPORTED entry_schema: type: json + port_vdbe_untr_vmi_1_name: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_vdbe_untr_vmi_1_order: + type: integer + required: true + status: SUPPORTED port_vdbe_trst_0_port_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_vdbe_untr_vmi_ip_requirements: + port_vdbe_untr_vmi_1_virtual_network_refs: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: json subinterface_vdbeav_subinterface_heat_template_parent_interface: type: list required: true @@ -280,14 +286,14 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_vdbe_untr_vmi_network_role: - type: string - required: true - status: SUPPORTED port_vdbe_trst_0_port_order: type: integer required: true status: SUPPORTED + port_vdbe_untr_vmi_1_virtual_machine_interface_allowed_address_pairs: + type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs + required: true + status: SUPPORTED port_vdbe_oam_0_port_network_role_tag: type: string required: true @@ -298,6 +304,14 @@ node_types: status: SUPPORTED entry_schema: type: json + port_vdbe_untr_vmi_1_network_role: + type: string + required: true + status: SUPPORTED + port_vdbe_untr_vmi_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED subinterface_vdbeav_subinterface_heat_template_subinterfaces_name_prefix: type: list required: true @@ -320,12 +334,6 @@ node_types: type: string required: true status: SUPPORTED - port_vdbe_untr_vmi_name: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string subinterface_vdbeav_subinterface_heat_template_aap_untrusted_ip_prefix_len: type: list required: true @@ -350,10 +358,6 @@ node_types: status: SUPPORTED entry_schema: type: string - port_vdbe_untr_vmi_subnetpoolid: - type: string - required: true - status: SUPPORTED port_vdbe_oam_0_port_network_role: type: string required: true @@ -378,7 +382,13 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_vdbe_untr_vmi_network_role_tag: + port_vdbe_untr_vmi_1_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_vdbe_untr_vmi_1_subnetpoolid: type: string required: true status: SUPPORTED @@ -414,12 +424,10 @@ node_types: status: SUPPORTED entry_schema: type: string - port_vdbe_untr_vmi_virtual_machine_interface_mac_addresses: - type: list + port_vdbe_untr_vmi_1_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json compute_vdbe_scheduler_hints: type: list required: true @@ -448,26 +456,16 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_vdbe_untr_vmi_virtual_network_refs: - type: list - required: true - status: SUPPORTED - entry_schema: - type: json - port_vdbe_untr_vmi_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED port_vdbe_fabr_0_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_vdbe_trst_0_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_vdbe_untr_vmi_1_network_role_tag: + type: string required: true status: SUPPORTED - port_vdbe_untr_vmi_order: - type: integer + port_vdbe_trst_0_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED port_vdbe_oam_0_port_name: @@ -496,10 +494,18 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_vdbe_untr_vmi_exCP_naming: - type: org.openecomp.datatypes.Naming + port_vdbe_untr_vmi_1_ip_requirements: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_vdbe_untr_vmi_1_virtual_machine_interface_mac_addresses: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json subinterface_vdbeav_subinterface_heat_template_aap_untrusted_v6_ip_prefix: type: list required: true @@ -548,12 +554,6 @@ node_types: type: integer required: true status: SUPPORTED - port_vdbe_untr_vmi_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements requirements: - dependency_vdbe_vdbe_fabr_0_port: capability: tosca.capabilities.Node @@ -568,94 +568,94 @@ node_types: occurrences: - 1 - 1 - - dependency_vdbe_vdbe_oam_0_port: + - dependency_vdbe_vdbe_untr_vmi_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_vdbe_vdbe_oam_0_port: + - link_vdbe_vdbe_untr_vmi_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_vdbe_vdbe_trst_0_port: + - dependency_vdbe_vdbe_oam_0_port: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_vdbe_vdbe_trst_0_port: + - link_vdbe_vdbe_oam_0_port: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_vdbe: + - dependency_vdbe_vdbe_trst_0_port: 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 + - link_vdbe_vdbe_trst_0_port: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo occurrences: - - 0 - - UNBOUNDED - - dependency_vdbe_vdbe_untr_vmi: + - 1 + - 1 + - dependency_vdbe_vdbe_untr_vmi_1_vdbeav_subinterface_heat_template: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_vdbe_vdbe_untr_vmi: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - - dependency_vdbe_vdbe_ctrl_0_port: + - dependency_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_vmi_1_vdbeav_subinterface_heat_template: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_vdbe_vdbe_ctrl_0_port: + - subinterface_link_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_vmi_1_vdbeav_subinterface_heat_template: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_vdbe_vdbe_untr_vmi_vdbeav_subinterface_heat_template: + - dependency_vdbe: 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_vmi_vdbeav_subinterface_heat_template: + - local_storage_vdbe: + capability: tosca.capabilities.Attachment + node: tosca.nodes.BlockStorage + relationship: tosca.relationships.AttachesTo + occurrences: + - 0 + - UNBOUNDED + - dependency_vdbe_vdbe_ctrl_0_port: 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_vmi_vdbeav_subinterface_heat_template: + - link_vdbe_vdbe_ctrl_0_port: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: - network.incoming.packets.rate_vdbe_vdbe_untr_vmi: + network.outgoing.packets.rate_vdbe_vdbe_untr_vmi_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -755,6 +755,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets_vdbe_vdbe_untr_vmi_1: + 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: @@ -797,31 +803,31 @@ node_types: occurrences: - 1 - UNBOUNDED - instance_vdbe: + network.outpoing.packets_vdbe_vdbe_untr_vmi_1: 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_oam_0_port: + 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 - memory.resident_vdbe: + network.incoming.packets_vdbe_vdbe_oam_0_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.outpoing.packets_vdbe_vdbe_trst_0_port: + 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 - network.incoming.bytes.rate_vdbe_vdbe_untr_vmi: + network.outpoing.packets_vdbe_vdbe_trst_0_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: @@ -856,18 +862,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_vdbe_vdbe_trst_0_port: + network.outgoing.bytes_vdbe_vdbe_untr_vmi_1: 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_vmi_vdbeav_subinterface_heat_template: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - network.outgoing.bytes.rate_vdbe_vdbe_untr_vmi: + network.outgoing.bytes.rate_vdbe_vdbe_trst_0_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: @@ -908,11 +909,6 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_vdbe_vdbe_untr_vmi: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED network.incoming.packets.rate_vdbe_vdbe_trst_0_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -948,12 +944,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_vdbe_vdbe_untr_vmi: - 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. @@ -983,14 +973,15 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_vdbe_vdbe_oam_0_port: + network.outgoing.bytes.rate_vdbe_vdbe_untr_vmi_1: 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_vmi: - type: tosca.capabilities.Node + network.outpoing.packets_vdbe_vdbe_oam_0_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 @@ -1031,11 +1022,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_vdbe_vdbe_untr_vmi_vdbeav_subinterface_heat_template: - type: tosca.capabilities.Node - 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. @@ -1071,12 +1057,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_vdbe_vdbe_untr_vmi: - 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_fabr_0_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1107,26 +1087,12 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_vdbe_vdbe_untr_vmi: - 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 - binding_vdbe_vdbe_untr_vmi: - 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 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. @@ -1156,6 +1122,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes.rate_vdbe_vdbe_untr_vmi_1: + 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_trst_0_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1168,6 +1140,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_vdbe_vdbe_untr_vmi_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED binding_vdbe_vdbe_fabr_0_port: type: tosca.capabilities.network.Bindable valid_source_types: @@ -1176,6 +1153,12 @@ node_types: occurrences: - 0 - UNBOUNDED + network.incoming.packets.rate_vdbe_vdbe_untr_vmi_1: + 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. @@ -1197,18 +1180,30 @@ node_types: occurrences: - 0 - UNBOUNDED - network.outgoing.packets.rate_vdbe_vdbe_untr_vmi: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_vdbe_vdbe_untr_vmi_1: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + feature_vdbe_vdbe_untr_vmi_1_vdbeav_subinterface_heat_template: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.incoming.bytes_vdbe_vdbe_untr_vmi: + network.incoming.bytes_vdbe_vdbe_untr_vmi_1: 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_vdbe_untr_vmi_1: + 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 feature_vdbe_vdbe_fabr_0_port: type: tosca.capabilities.Node occurrences: @@ -1225,6 +1220,11 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_vmi_1_vdbeav_subinterface_heat_template: + type: tosca.capabilities.Node + 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. @@ -1240,16 +1240,6 @@ node_types: org.openecomp.resource.abstract.nodes.vdbe_1: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_vdbe_untr_vmi_virtual_machine_interface_allowed_address_pairs: - type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs - required: true - status: SUPPORTED - port_vdbe_untr_vmi_related_networks: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments subinterface_vdbeav_subinterface_heat_template_aap_address_mode: type: list required: true @@ -1280,6 +1270,12 @@ node_types: type: string required: true status: SUPPORTED + port_vdbe_untr_vmi_1_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_vdbe_oam_1_port_name: type: list required: true @@ -1320,22 +1316,32 @@ node_types: status: SUPPORTED entry_schema: type: string + port_vdbe_untr_vmi_1_name: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_vdbe_untr_vmi_1_order: + type: integer + required: true + status: SUPPORTED port_vdbe_trst_1_port_network_role: type: string required: true status: SUPPORTED - port_vdbe_untr_vmi_ip_requirements: + port_vdbe_ctrl_1_port_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_vdbe_ctrl_1_port_related_networks: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_vdbe_untr_vmi_1_virtual_network_refs: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments + type: json port_vdbe_fabr_1_port_name: type: list required: true @@ -1376,22 +1382,30 @@ node_types: type: string required: true status: SUPPORTED - port_vdbe_untr_vmi_network_role: - type: string - required: true - status: SUPPORTED port_vdbe_fabr_1_port_virtual_network_refs: type: list required: true status: SUPPORTED entry_schema: type: json + port_vdbe_untr_vmi_1_virtual_machine_interface_allowed_address_pairs: + type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs + required: true + status: SUPPORTED subinterface_vdbeav_subinterface_heat_template_vn_network_list: type: list required: true status: SUPPORTED entry_schema: type: json + port_vdbe_untr_vmi_1_network_role: + type: string + required: true + status: SUPPORTED + port_vdbe_untr_vmi_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED port_vdbe_trst_1_port_vlan_requirements: type: list required: true @@ -1416,12 +1430,6 @@ node_types: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_vdbe_untr_vmi_name: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string port_vdbe_trst_1_port_network_role_tag: type: string required: true @@ -1446,17 +1454,19 @@ node_types: type: integer required: true status: SUPPORTED - port_vdbe_untr_vmi_subnetpoolid: - type: string - required: true - status: SUPPORTED subinterface_vdbeav_subinterface_heat_template_service_template_filter_count: type: list required: true status: SUPPORTED entry_schema: type: float - port_vdbe_untr_vmi_network_role_tag: + port_vdbe_untr_vmi_1_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_vdbe_untr_vmi_1_subnetpoolid: type: string required: true status: SUPPORTED @@ -1506,12 +1516,10 @@ node_types: status: SUPPORTED entry_schema: type: string - port_vdbe_untr_vmi_virtual_machine_interface_mac_addresses: - type: list + port_vdbe_untr_vmi_1_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json port_vdbe_ctrl_1_port_name: type: list required: true @@ -1538,17 +1546,11 @@ node_types: status: SUPPORTED entry_schema: type: string - port_vdbe_untr_vmi_virtual_network_refs: - type: list - required: true - status: SUPPORTED - entry_schema: - type: json - port_vdbe_untr_vmi_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_vdbe_fabr_1_port_network_role: + type: string required: true status: SUPPORTED - port_vdbe_fabr_1_port_network_role: + port_vdbe_untr_vmi_1_network_role_tag: type: string required: true status: SUPPORTED @@ -1558,10 +1560,6 @@ node_types: status: SUPPORTED entry_schema: type: json - port_vdbe_untr_vmi_order: - type: integer - required: true - status: SUPPORTED subinterface_vdbeav_subinterface_heat_template_aap_sec_untrusted_ip_prefix: type: list required: true @@ -1582,6 +1580,12 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 + port_vdbe_untr_vmi_1_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements port_vdbe_fabr_1_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -1592,11 +1596,13 @@ node_types: status: SUPPORTED entry_schema: type: json - port_vdbe_untr_vmi_exCP_naming: - type: org.openecomp.datatypes.Naming + port_vdbe_ctrl_1_port_virtual_network_refs: + type: list required: true status: SUPPORTED - port_vdbe_ctrl_1_port_virtual_network_refs: + entry_schema: + type: json + port_vdbe_untr_vmi_1_virtual_machine_interface_mac_addresses: type: list required: true status: SUPPORTED @@ -1666,107 +1672,101 @@ node_types: status: SUPPORTED entry_schema: type: string - port_vdbe_untr_vmi_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements requirements: - - dependency_vdbe: + - dependency_vdbe_vdbe_untr_vmi_1: 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 + - link_vdbe_vdbe_untr_vmi_1: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 + - dependency_vdbe_vdbe_untr_vmi_1_vdbeav_subinterface_heat_template: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - dependency_vdbe_vdbe_trst_1_port: + - dependency_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_vmi_1_vdbeav_subinterface_heat_template: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_vdbe_vdbe_trst_1_port: + - subinterface_link_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_vmi_1_vdbeav_subinterface_heat_template: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_vdbe_vdbe_oam_1_port: + - dependency_vdbe: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_vdbe_vdbe_oam_1_port: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo + - local_storage_vdbe: + capability: tosca.capabilities.Attachment + node: tosca.nodes.BlockStorage + relationship: tosca.relationships.AttachesTo occurrences: - - 1 - - 1 - - dependency_vdbe_vdbe_untr_vmi: + - 0 + - UNBOUNDED + - dependency_vdbe_vdbe_trst_1_port: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_vdbe_vdbe_untr_vmi: + - link_vdbe_vdbe_trst_1_port: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_vdbe_vdbe_fabr_1_port: + - dependency_vdbe_vdbe_oam_1_port: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_vdbe_vdbe_fabr_1_port: + - link_vdbe_vdbe_oam_1_port: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_vdbe_vdbe_ctrl_1_port: + - dependency_vdbe_vdbe_fabr_1_port: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_vdbe_vdbe_ctrl_1_port: + - link_vdbe_vdbe_fabr_1_port: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_vdbe_vdbe_untr_vmi_vdbeav_subinterface_heat_template: - 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_vmi_vdbeav_subinterface_heat_template: + - dependency_vdbe_vdbe_ctrl_1_port: 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_vmi_vdbeav_subinterface_heat_template: + - link_vdbe_vdbe_ctrl_1_port: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -1787,20 +1787,20 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_vdbe_vdbe_fabr_1_port: + network.outgoing.packets.rate_vdbe_vdbe_untr_vmi_1: 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_trst_1_port: - type: org.openecomp.capabilities.Forwarder + network.outgoing.bytes.rate_vdbe_vdbe_fabr_1_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.incoming.packets.rate_vdbe_vdbe_untr_vmi: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_vdbe_vdbe_trst_1_port: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED @@ -1874,6 +1874,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets_vdbe_vdbe_untr_vmi_1: + 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_trst_1_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1927,6 +1933,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_vdbe_vdbe_untr_vmi_1: + 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_oam_1_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1971,12 +1983,6 @@ node_types: occurrences: - 0 - UNBOUNDED - network.incoming.bytes.rate_vdbe_vdbe_untr_vmi: - 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. @@ -2001,24 +2007,19 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_vmi_vdbeav_subinterface_heat_template: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - network.outpoing.packets_vdbe_vdbe_fabr_1_port: + network.outgoing.bytes_vdbe_vdbe_untr_vmi_1: 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_oam_1_port: + network.outpoing.packets_vdbe_vdbe_fabr_1_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_vmi: + network.outpoing.packets_vdbe_vdbe_oam_1_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: @@ -2046,11 +2047,6 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_vdbe_vdbe_untr_vmi: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED network.incoming.bytes_vdbe_vdbe_trst_1_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2063,12 +2059,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_vdbe_vdbe_untr_vmi: - 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. @@ -2104,14 +2094,15 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_vdbe_vdbe_trst_1_port: + network.outgoing.bytes.rate_vdbe_vdbe_untr_vmi_1: 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_vmi: - type: tosca.capabilities.Node + network.outgoing.packets.rate_vdbe_vdbe_trst_1_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 @@ -2145,11 +2136,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_vdbe_vdbe_untr_vmi_vdbeav_subinterface_heat_template: - type: tosca.capabilities.Node - 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. @@ -2202,12 +2188,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_vdbe_vdbe_untr_vmi: - 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_fabr_1_port: type: org.openecomp.capabilities.Forwarder occurrences: @@ -2231,26 +2211,12 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_vdbe_vdbe_untr_vmi: - 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 - binding_vdbe_vdbe_untr_vmi: - 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 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. @@ -2282,6 +2248,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes.rate_vdbe_vdbe_untr_vmi_1: + 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_vdbe_ctrl_1_port: type: tosca.capabilities.network.Bindable valid_source_types: @@ -2295,6 +2267,17 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_vdbe_vdbe_untr_vmi_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets.rate_vdbe_vdbe_untr_vmi_1: + 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. @@ -2314,24 +2297,41 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_vdbe_vdbe_untr_vmi: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_vdbe_vdbe_untr_vmi_1: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.incoming.bytes_vdbe_vdbe_untr_vmi: + feature_vdbe_vdbe_untr_vmi_1_vdbeav_subinterface_heat_template: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes_vdbe_vdbe_untr_vmi_1: 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_vdbe_untr_vmi_1: + 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 network.incoming.bytes_vdbe_vdbe_ctrl_1_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_0_subint_untr_vmi_0_vdbe_vdbe_untr_vmi_1_vdbeav_subinterface_heat_template: + type: tosca.capabilities.Node + 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. @@ -2354,4 +2354,4 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - - UNBOUNDED \ No newline at end of file + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/vdbeav/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/vdbeav/out/MainServiceTemplate.yaml index c0685e95b0..e56c23ffd7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/vdbeav/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/vdbeav/out/MainServiceTemplate.yaml @@ -903,6 +903,16 @@ topology_template: get_input: vnf_name subinterface_vdbeav_subinterface_heat_template_aap_sec_untrusted_ip_prefix_len: - get_input: vdbe_aap_sec_untrusted_ip_prefix_len + port_vdbe_untr_vmi_1_name: + - str_replace: + template: VM_NAMEDBE001p1n004 + params: + DBE: + get_input: vdbe_device_name + VM_NAME: + get_input: vdbe_name_1 + port_vdbe_untr_vmi_1_virtual_network_refs: + - - get_input: untrusted_net_name port_vdbe_fabr_1_port_name: - str_replace: template: VM_NAMEDBE001p1n003 @@ -922,14 +932,6 @@ topology_template: subinterface_vdbeav_subinterface_heat_template_vn_network_list: - get_input: untrusted_vn_networks subinterface_vdbeav_subinterface_heat_template_subinterfaces_name_prefix: - - str_replace: - template: VM_NAMEDBE001p1n004 - params: - DBE: - get_input: vdbe_device_name - VM_NAME: - get_input: vdbe_name_1 - port_vdbe_untr_vmi_name: - str_replace: template: VM_NAMEDBE001p1n004 params: @@ -949,8 +951,6 @@ topology_template: - get_input: vdbe_untrusted_ip_1 subinterface_vdbeav_subinterface_heat_template_vmac_address: - get_input: vdbe_untrusted_vmac_address - port_vdbe_untr_vmi_virtual_machine_interface_mac_addresses: - - - get_input: vdbe_hw_untr_mac_1 port_vdbe_ctrl_1_port_name: - str_replace: template: VM_NAMEDBE001p1n002 @@ -963,8 +963,6 @@ topology_template: - group: vdbe_ServerGroup_group subinterface_vdbeav_subinterface_heat_template_aap_untrusted_v6_ip_prefix_len: - get_input: vdbe_aap_untrusted_v6_ip_prefix_len - port_vdbe_untr_vmi_virtual_network_refs: - - - get_input: untrusted_net_name port_vdbe_trst_1_port_virtual_machine_interface_mac_addresses: - - get_input: vdbe_hw_trst_mac_1 subinterface_vdbeav_subinterface_heat_template_aap_sec_untrusted_ip_prefix: @@ -973,6 +971,8 @@ topology_template: - - get_input: oam_net_name port_vdbe_ctrl_1_port_virtual_network_refs: - - control_int_net + port_vdbe_untr_vmi_1_virtual_machine_interface_mac_addresses: + - - get_input: vdbe_hw_untr_mac_1 subinterface_vdbeav_subinterface_heat_template_aap_untrusted_v6_ip_prefix: - get_input: vdbe_aap_untrusted_v6_ip_prefix subinterface_vdbeav_subinterface_heat_template_ip_v6_address: @@ -1030,6 +1030,14 @@ topology_template: - get_input: vdbe_aap_sec_untrusted_ip_prefix_len port_vdbe_oam_0_port_virtual_network_refs: - - get_input: oam_net_name + port_vdbe_untr_vmi_1_name: + - str_replace: + template: VM_NAMEDBE001p1n004 + params: + DBE: + get_input: vdbe_device_name + VM_NAME: + get_input: vdbe_name_0 port_vdbe_trst_0_port_name: - str_replace: template: VM_NAMEDBE001p1n005 @@ -1038,8 +1046,10 @@ topology_template: get_input: vdbe_device_name VM_NAME: get_input: vdbe_name_0 + port_vdbe_untr_vmi_1_virtual_network_refs: + - - get_input: untrusted_net_name subinterface_vdbeav_subinterface_heat_template_parent_interface: - - vdbe_0_untr_vmi_0 + - vdbe_0_untr_vmi_1 subinterface_vdbeav_subinterface_heat_template_aap_untrusted_ip_prefix: - get_input: vdbe_aap_untrusted_ip_prefix subinterface_vdbeav_subinterface_heat_template_vlan_tag_list: @@ -1047,14 +1057,6 @@ topology_template: subinterface_vdbeav_subinterface_heat_template_vn_network_list: - get_input: untrusted_vn_networks subinterface_vdbeav_subinterface_heat_template_subinterfaces_name_prefix: - - str_replace: - template: VM_NAMEDBE001p1n004 - params: - DBE: - get_input: vdbe_device_name - VM_NAME: - get_input: vdbe_name_0 - port_vdbe_untr_vmi_name: - str_replace: template: VM_NAMEDBE001p1n004 params: @@ -1076,14 +1078,10 @@ topology_template: - get_input: vdbe_untrusted_ip_0 subinterface_vdbeav_subinterface_heat_template_vmac_address: - get_input: vdbe_untrusted_vmac_address - port_vdbe_untr_vmi_virtual_machine_interface_mac_addresses: - - - get_input: vdbe_hw_untr_mac_0 compute_vdbe_scheduler_hints: - group: vdbe_ServerGroup_group subinterface_vdbeav_subinterface_heat_template_aap_untrusted_v6_ip_prefix_len: - get_input: vdbe_aap_untrusted_v6_ip_prefix_len - port_vdbe_untr_vmi_virtual_network_refs: - - - get_input: untrusted_net_name port_vdbe_oam_0_port_name: - str_replace: template: VM_NAMEDBE001p1n001 @@ -1096,6 +1094,8 @@ topology_template: - get_input: vdbe_aap_sec_untrusted_ip_prefix port_vdbe_oam_0_port_virtual_machine_interface_mac_addresses: - - get_input: vdbe_oam_mac_0 + port_vdbe_untr_vmi_1_virtual_machine_interface_mac_addresses: + - - get_input: vdbe_hw_untr_mac_0 subinterface_vdbeav_subinterface_heat_template_aap_untrusted_v6_ip_prefix: - get_input: vdbe_aap_untrusted_v6_ip_prefix port_vdbe_fabr_0_port_name: @@ -1171,4 +1171,4 @@ topology_template: properties: container_type: host targets: - - vdbe_ServerGroup_group \ No newline at end of file + - vdbe_ServerGroup_group diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/vdbeav/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/vfcInstanceGroup/vdbeav/out/Nested_vdbeServiceTemplate.yaml index fb09f4ff5a..a6d3c4542f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/vdbeav/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/vfcInstanceGroup/vdbeav/out/Nested_vdbeServiceTemplate.yaml @@ -11,14 +11,6 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_vdbe_untr_vmi_virtual_machine_interface_allowed_address_pairs: - type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs - required: true - port_vdbe_untr_vmi_related_networks: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments subinterface_vdbeav_subinterface_heat_template_aap_address_mode: type: list required: true @@ -56,6 +48,11 @@ topology_template: vm_flavor_name: type: string required: true + port_vdbe_untr_vmi_1_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_vdbe_ctrl_0_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -85,16 +82,24 @@ topology_template: required: true entry_schema: type: json + port_vdbe_untr_vmi_1_name: + type: list + required: true + entry_schema: + type: string + port_vdbe_untr_vmi_1_order: + type: integer + required: true port_vdbe_trst_0_port_name: type: list required: true entry_schema: type: string - port_vdbe_untr_vmi_ip_requirements: + port_vdbe_untr_vmi_1_virtual_network_refs: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: json subinterface_vdbeav_subinterface_heat_template_parent_interface: type: list required: true @@ -139,12 +144,12 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_vdbe_untr_vmi_network_role: - type: string - required: true port_vdbe_trst_0_port_order: type: integer required: true + port_vdbe_untr_vmi_1_virtual_machine_interface_allowed_address_pairs: + type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs + required: true port_vdbe_oam_0_port_network_role_tag: type: string required: true @@ -153,6 +158,12 @@ topology_template: required: true entry_schema: type: json + port_vdbe_untr_vmi_1_network_role: + type: string + required: true + port_vdbe_untr_vmi_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true subinterface_vdbeav_subinterface_heat_template_subinterfaces_name_prefix: type: list required: true @@ -170,11 +181,6 @@ topology_template: port_vdbe_ctrl_0_port_subnetpoolid: type: string required: true - port_vdbe_untr_vmi_name: - type: list - required: true - entry_schema: - type: string subinterface_vdbeav_subinterface_heat_template_aap_untrusted_ip_prefix_len: type: list required: true @@ -195,9 +201,6 @@ topology_template: required: true entry_schema: type: string - port_vdbe_untr_vmi_subnetpoolid: - type: string - required: true port_vdbe_oam_0_port_network_role: type: string required: true @@ -217,7 +220,12 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_vdbe_untr_vmi_network_role_tag: + port_vdbe_untr_vmi_1_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_vdbe_untr_vmi_1_subnetpoolid: type: string required: true port_vdbe_fabr_0_port_related_networks: @@ -246,11 +254,9 @@ topology_template: required: true entry_schema: type: string - port_vdbe_untr_vmi_virtual_machine_interface_mac_addresses: - type: list + port_vdbe_untr_vmi_1_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json compute_vdbe_scheduler_hints: type: list required: true @@ -274,23 +280,15 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_vdbe_untr_vmi_virtual_network_refs: - type: list - required: true - entry_schema: - type: json - port_vdbe_untr_vmi_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true port_vdbe_fabr_0_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true + port_vdbe_untr_vmi_1_network_role_tag: + type: string + required: true port_vdbe_trst_0_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true - port_vdbe_untr_vmi_order: - type: integer - required: true port_vdbe_oam_0_port_name: type: list required: true @@ -313,9 +311,16 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_vdbe_untr_vmi_exCP_naming: - type: org.openecomp.datatypes.Naming + port_vdbe_untr_vmi_1_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_vdbe_untr_vmi_1_virtual_machine_interface_mac_addresses: + type: list required: true + entry_schema: + type: json subinterface_vdbeav_subinterface_heat_template_aap_untrusted_v6_ip_prefix: type: list required: true @@ -355,11 +360,6 @@ topology_template: port_vdbe_oam_0_port_order: type: integer required: true - port_vdbe_untr_vmi_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements node_templates: vdbe_vdbe_fabr_0_port: type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface @@ -396,6 +396,49 @@ topology_template: capability: tosca.capabilities.network.Bindable node: vdbe relationship: tosca.relationships.network.BindsTo + vdbe_vdbe_untr_vmi_1: + type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface + properties: + mac_requirements: + get_input: port_vdbe_untr_vmi_1_mac_requirements + order: + get_input: port_vdbe_untr_vmi_1_order + exCP_naming: + get_input: port_vdbe_untr_vmi_1_exCP_naming + virtual_machine_interface_allowed_address_pairs: + get_input: + - port_vdbe_untr_vmi_1_virtual_machine_interface_allowed_address_pairs + - index_value + vlan_requirements: + get_input: port_vdbe_untr_vmi_1_vlan_requirements + subinterface_indicator: true + related_networks: + get_input: port_vdbe_untr_vmi_1_related_networks + virtual_network_refs: + get_input: + - port_vdbe_untr_vmi_1_virtual_network_refs + - index_value + ip_requirements: + get_input: port_vdbe_untr_vmi_1_ip_requirements + network_role_tag: + get_input: port_vdbe_untr_vmi_1_network_role_tag + virtual_machine_interface_mac_addresses: + get_input: + - port_vdbe_untr_vmi_1_virtual_machine_interface_mac_addresses + - index_value + network_role: + get_input: port_vdbe_untr_vmi_1_network_role + subnetpoolid: + get_input: port_vdbe_untr_vmi_1_subnetpoolid + name: + get_input: + - port_vdbe_untr_vmi_1_name + - index_value + requirements: + - binding: + capability: tosca.capabilities.network.Bindable + node: vdbe + relationship: tosca.relationships.network.BindsTo vdbe_vdbe_oam_0_port: type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface properties: @@ -478,108 +521,7 @@ topology_template: capability: tosca.capabilities.network.Bindable node: vdbe 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 - scheduler_hints: - get_input: - - compute_vdbe_scheduler_hints - - index_value - vdbe_vdbe_untr_vmi: - type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface - properties: - mac_requirements: - get_input: port_vdbe_untr_vmi_mac_requirements - order: - get_input: port_vdbe_untr_vmi_order - exCP_naming: - get_input: port_vdbe_untr_vmi_exCP_naming - virtual_machine_interface_allowed_address_pairs: - get_input: - - port_vdbe_untr_vmi_virtual_machine_interface_allowed_address_pairs - - index_value - vlan_requirements: - get_input: port_vdbe_untr_vmi_vlan_requirements - subinterface_indicator: true - related_networks: - get_input: port_vdbe_untr_vmi_related_networks - virtual_network_refs: - get_input: - - port_vdbe_untr_vmi_virtual_network_refs - - index_value - ip_requirements: - get_input: port_vdbe_untr_vmi_ip_requirements - network_role_tag: - get_input: port_vdbe_untr_vmi_network_role_tag - virtual_machine_interface_mac_addresses: - get_input: - - port_vdbe_untr_vmi_virtual_machine_interface_mac_addresses - - index_value - network_role: - get_input: port_vdbe_untr_vmi_network_role - subnetpoolid: - get_input: port_vdbe_untr_vmi_subnetpoolid - name: - get_input: - - port_vdbe_untr_vmi_name - - index_value - requirements: - - binding: - capability: tosca.capabilities.network.Bindable - node: vdbe - relationship: tosca.relationships.network.BindsTo - vdbe_vdbe_ctrl_0_port: - type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface - properties: - mac_requirements: - get_input: port_vdbe_ctrl_0_port_mac_requirements - order: - get_input: port_vdbe_ctrl_0_port_order - exCP_naming: - get_input: port_vdbe_ctrl_0_port_exCP_naming - vlan_requirements: - get_input: port_vdbe_ctrl_0_port_vlan_requirements - subinterface_indicator: false - virtual_network_refs: - get_input: - - port_vdbe_ctrl_0_port_virtual_network_refs - - index_value - ip_requirements: - get_input: port_vdbe_ctrl_0_port_ip_requirements - related_networks: - get_input: port_vdbe_ctrl_0_port_related_networks - network_role_tag: - get_input: port_vdbe_ctrl_0_port_network_role_tag - network_role: - get_input: port_vdbe_ctrl_0_port_network_role - subnetpoolid: - get_input: port_vdbe_ctrl_0_port_subnetpoolid - name: - get_input: - - port_vdbe_ctrl_0_port_name - - index_value - requirements: - - binding: - capability: tosca.capabilities.network.Bindable - node: vdbe - relationship: tosca.relationships.network.BindsTo - vdbe_vdbe_untr_vmi_vdbeav_subinterface_heat_template: + vdbe_vdbe_untr_vmi_1_vdbeav_subinterface_heat_template: type: org.openecomp.resource.abstract.nodes.heat.subinterface.vdbeav_subinterface_heat_template directives: - substitutable @@ -659,14 +601,72 @@ topology_template: requirements: - binding_vdbe_0_subint_untr_vmi_0: capability: tosca.capabilities.network.Bindable - node: vdbe_vdbe_untr_vmi + node: vdbe_vdbe_untr_vmi_1 + 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 + scheduler_hints: + get_input: + - compute_vdbe_scheduler_hints + - index_value + vdbe_vdbe_ctrl_0_port: + type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface + properties: + mac_requirements: + get_input: port_vdbe_ctrl_0_port_mac_requirements + order: + get_input: port_vdbe_ctrl_0_port_order + exCP_naming: + get_input: port_vdbe_ctrl_0_port_exCP_naming + vlan_requirements: + get_input: port_vdbe_ctrl_0_port_vlan_requirements + subinterface_indicator: false + virtual_network_refs: + get_input: + - port_vdbe_ctrl_0_port_virtual_network_refs + - index_value + ip_requirements: + get_input: port_vdbe_ctrl_0_port_ip_requirements + related_networks: + get_input: port_vdbe_ctrl_0_port_related_networks + network_role_tag: + get_input: port_vdbe_ctrl_0_port_network_role_tag + network_role: + get_input: port_vdbe_ctrl_0_port_network_role + subnetpoolid: + get_input: port_vdbe_ctrl_0_port_subnetpoolid + name: + get_input: + - port_vdbe_ctrl_0_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.incoming.packets.rate_vdbe_vdbe_untr_vmi: - - vdbe_vdbe_untr_vmi - - network.incoming.packets.rate + network.outgoing.packets.rate_vdbe_vdbe_untr_vmi_1: + - vdbe_vdbe_untr_vmi_1 + - network.outgoing.packets.rate network.incoming.packets_vdbe_vdbe_trst_0_port: - vdbe_vdbe_trst_0_port - network.incoming.packets @@ -715,6 +715,9 @@ topology_template: disk.device.latency_vdbe: - vdbe - disk.device.latency + network.incoming.packets_vdbe_vdbe_untr_vmi_1: + - vdbe_vdbe_untr_vmi_1 + - network.incoming.packets scalable_vdbe: - vdbe - scalable @@ -736,6 +739,9 @@ topology_template: feature_vdbe_vdbe_oam_0_port: - vdbe_vdbe_oam_0_port - feature + network.outpoing.packets_vdbe_vdbe_untr_vmi_1: + - vdbe_vdbe_untr_vmi_1 + - network.outpoing.packets instance_vdbe: - vdbe - instance @@ -748,9 +754,6 @@ topology_template: network.outpoing.packets_vdbe_vdbe_trst_0_port: - vdbe_vdbe_trst_0_port - network.outpoing.packets - network.incoming.bytes.rate_vdbe_vdbe_untr_vmi: - - vdbe_vdbe_untr_vmi - - network.incoming.bytes.rate cpu_vdbe: - vdbe - cpu @@ -766,15 +769,12 @@ topology_template: disk.latency_vdbe: - vdbe - disk.latency + network.outgoing.bytes_vdbe_vdbe_untr_vmi_1: + - vdbe_vdbe_untr_vmi_1 + - network.outgoing.bytes network.outgoing.bytes.rate_vdbe_vdbe_trst_0_port: - vdbe_vdbe_trst_0_port - network.outgoing.bytes.rate - feature_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_vmi_vdbeav_subinterface_heat_template: - - vdbe_vdbe_untr_vmi_vdbeav_subinterface_heat_template - - feature_vdbe_0_subint_untr_vmi_0 - network.outgoing.bytes.rate_vdbe_vdbe_untr_vmi: - - vdbe_vdbe_untr_vmi - - network.outgoing.bytes.rate network.outgoing.bytes_vdbe_vdbe_trst_0_port: - vdbe_vdbe_trst_0_port - network.outgoing.bytes @@ -793,9 +793,6 @@ topology_template: os_vdbe: - vdbe - os - forwarder_vdbe_vdbe_untr_vmi: - - vdbe_vdbe_untr_vmi - - forwarder network.incoming.packets.rate_vdbe_vdbe_trst_0_port: - vdbe_vdbe_trst_0_port - network.incoming.packets.rate @@ -814,9 +811,6 @@ topology_template: network.incoming.packets_vdbe_vdbe_ctrl_0_port: - vdbe_vdbe_ctrl_0_port - network.incoming.packets - network.outgoing.bytes_vdbe_vdbe_untr_vmi: - - vdbe_vdbe_untr_vmi - - network.outgoing.bytes memory_vdbe: - vdbe - memory @@ -832,12 +826,12 @@ topology_template: disk.ephemeral.size_vdbe: - vdbe - disk.ephemeral.size + network.outgoing.bytes.rate_vdbe_vdbe_untr_vmi_1: + - vdbe_vdbe_untr_vmi_1 + - network.outgoing.bytes.rate network.outpoing.packets_vdbe_vdbe_oam_0_port: - vdbe_vdbe_oam_0_port - network.outpoing.packets - feature_vdbe_vdbe_untr_vmi: - - vdbe_vdbe_untr_vmi - - feature disk.device.write.requests.rate_vdbe: - vdbe - disk.device.write.requests.rate @@ -856,9 +850,6 @@ topology_template: disk.write.bytes.rate_vdbe: - vdbe - disk.write.bytes.rate - feature_vdbe_vdbe_untr_vmi_vdbeav_subinterface_heat_template: - - vdbe_vdbe_untr_vmi_vdbeav_subinterface_heat_template - - feature disk.device.write.requests_vdbe: - vdbe - disk.device.write.requests @@ -877,9 +868,6 @@ topology_template: forwarder_vdbe_vdbe_oam_0_port: - vdbe_vdbe_oam_0_port - forwarder - network.outpoing.packets_vdbe_vdbe_untr_vmi: - - vdbe_vdbe_untr_vmi - - network.outpoing.packets network.incoming.packets_vdbe_vdbe_fabr_0_port: - vdbe_vdbe_fabr_0_port - network.incoming.packets @@ -895,15 +883,9 @@ topology_template: disk.device.write.bytes.rate_vdbe: - vdbe - disk.device.write.bytes.rate - network.incoming.packets_vdbe_vdbe_untr_vmi: - - vdbe_vdbe_untr_vmi - - network.incoming.packets disk.write.requests.rate_vdbe: - vdbe - disk.write.requests.rate - binding_vdbe_vdbe_untr_vmi: - - vdbe_vdbe_untr_vmi - - binding disk.device.usage_vdbe: - vdbe - disk.device.usage @@ -919,15 +901,24 @@ topology_template: network.incoming.packets.rate_vdbe_vdbe_oam_0_port: - vdbe_vdbe_oam_0_port - network.incoming.packets.rate + network.incoming.bytes.rate_vdbe_vdbe_untr_vmi_1: + - vdbe_vdbe_untr_vmi_1 + - network.incoming.bytes.rate network.incoming.bytes_vdbe_vdbe_trst_0_port: - vdbe_vdbe_trst_0_port - network.incoming.bytes network.outgoing.packets.rate_vdbe_vdbe_oam_0_port: - vdbe_vdbe_oam_0_port - network.outgoing.packets.rate + forwarder_vdbe_vdbe_untr_vmi_1: + - vdbe_vdbe_untr_vmi_1 + - forwarder binding_vdbe_vdbe_fabr_0_port: - vdbe_vdbe_fabr_0_port - binding + network.incoming.packets.rate_vdbe_vdbe_untr_vmi_1: + - vdbe_vdbe_untr_vmi_1 + - network.incoming.packets.rate disk.capacity_vdbe: - vdbe - disk.capacity @@ -937,12 +928,18 @@ topology_template: binding_vdbe_vdbe_trst_0_port: - vdbe_vdbe_trst_0_port - binding - network.outgoing.packets.rate_vdbe_vdbe_untr_vmi: - - vdbe_vdbe_untr_vmi - - network.outgoing.packets.rate - network.incoming.bytes_vdbe_vdbe_untr_vmi: - - vdbe_vdbe_untr_vmi + feature_vdbe_vdbe_untr_vmi_1: + - vdbe_vdbe_untr_vmi_1 + - feature + feature_vdbe_vdbe_untr_vmi_1_vdbeav_subinterface_heat_template: + - vdbe_vdbe_untr_vmi_1_vdbeav_subinterface_heat_template + - feature + network.incoming.bytes_vdbe_vdbe_untr_vmi_1: + - vdbe_vdbe_untr_vmi_1 - network.incoming.bytes + binding_vdbe_vdbe_untr_vmi_1: + - vdbe_vdbe_untr_vmi_1 + - binding feature_vdbe_vdbe_fabr_0_port: - vdbe_vdbe_fabr_0_port - feature @@ -952,6 +949,9 @@ topology_template: forwarder_vdbe_vdbe_trst_0_port: - vdbe_vdbe_trst_0_port - forwarder + feature_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_vmi_1_vdbeav_subinterface_heat_template: + - vdbe_vdbe_untr_vmi_1_vdbeav_subinterface_heat_template + - feature_vdbe_0_subint_untr_vmi_0 disk.device.read.requests_vdbe: - vdbe - disk.device.read.requests @@ -959,6 +959,12 @@ topology_template: - vdbe - disk.read.bytes requirements: + dependency_vdbe_vdbe_untr_vmi_1: + - vdbe_vdbe_untr_vmi_1 + - dependency + dependency_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_vmi_1_vdbeav_subinterface_heat_template: + - vdbe_vdbe_untr_vmi_1_vdbeav_subinterface_heat_template + - dependency_vdbe_0_subint_untr_vmi_0 link_vdbe_vdbe_ctrl_0_port: - vdbe_vdbe_ctrl_0_port - link @@ -980,27 +986,21 @@ topology_template: link_vdbe_vdbe_oam_0_port: - vdbe_vdbe_oam_0_port - link + dependency_vdbe_vdbe_untr_vmi_1_vdbeav_subinterface_heat_template: + - vdbe_vdbe_untr_vmi_1_vdbeav_subinterface_heat_template + - dependency + subinterface_link_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_vmi_1_vdbeav_subinterface_heat_template: + - vdbe_vdbe_untr_vmi_1_vdbeav_subinterface_heat_template + - subinterface_link_vdbe_0_subint_untr_vmi_0 dependency_vdbe: - vdbe - dependency dependency_vdbe_vdbe_ctrl_0_port: - vdbe_vdbe_ctrl_0_port - dependency - link_vdbe_vdbe_untr_vmi: - - vdbe_vdbe_untr_vmi - - link - dependency_vdbe_vdbe_untr_vmi_vdbeav_subinterface_heat_template: - - vdbe_vdbe_untr_vmi_vdbeav_subinterface_heat_template - - dependency dependency_vdbe_vdbe_trst_0_port: - vdbe_vdbe_trst_0_port - dependency - dependency_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_vmi_vdbeav_subinterface_heat_template: - - vdbe_vdbe_untr_vmi_vdbeav_subinterface_heat_template - - dependency_vdbe_0_subint_untr_vmi_0 - dependency_vdbe_vdbe_untr_vmi: - - vdbe_vdbe_untr_vmi - - dependency - subinterface_link_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_vmi_vdbeav_subinterface_heat_template: - - vdbe_vdbe_untr_vmi_vdbeav_subinterface_heat_template - - subinterface_link_vdbe_0_subint_untr_vmi_0 \ No newline at end of file + link_vdbe_vdbe_untr_vmi_1: + - vdbe_vdbe_untr_vmi_1 + - link diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/vdbeav/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/vfcInstanceGroup/vdbeav/out/Nested_vdbe_1ServiceTemplate.yaml index f95d633e60..7b8fb7622d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/vdbeav/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/vfcInstanceGroup/vdbeav/out/Nested_vdbe_1ServiceTemplate.yaml @@ -11,14 +11,6 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_vdbe_untr_vmi_virtual_machine_interface_allowed_address_pairs: - type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs - required: true - port_vdbe_untr_vmi_related_networks: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments subinterface_vdbeav_subinterface_heat_template_aap_address_mode: type: list required: true @@ -43,6 +35,11 @@ topology_template: vm_flavor_name: type: string required: true + port_vdbe_untr_vmi_1_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_vdbe_oam_1_port_name: type: list required: true @@ -75,19 +72,27 @@ topology_template: required: true entry_schema: type: string + port_vdbe_untr_vmi_1_name: + type: list + required: true + entry_schema: + type: string + port_vdbe_untr_vmi_1_order: + type: integer + required: true port_vdbe_trst_1_port_network_role: type: string required: true - port_vdbe_untr_vmi_ip_requirements: + port_vdbe_ctrl_1_port_related_networks: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_vdbe_ctrl_1_port_related_networks: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_vdbe_untr_vmi_1_virtual_network_refs: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments + type: json port_vdbe_fabr_1_port_name: type: list required: true @@ -120,19 +125,25 @@ topology_template: port_vdbe_oam_1_port_network_role: type: string required: true - port_vdbe_untr_vmi_network_role: - type: string - required: true port_vdbe_fabr_1_port_virtual_network_refs: type: list required: true entry_schema: type: json + port_vdbe_untr_vmi_1_virtual_machine_interface_allowed_address_pairs: + type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs + required: true subinterface_vdbeav_subinterface_heat_template_vn_network_list: type: list required: true entry_schema: type: json + port_vdbe_untr_vmi_1_network_role: + type: string + required: true + port_vdbe_untr_vmi_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true port_vdbe_trst_1_port_vlan_requirements: type: list required: true @@ -152,11 +163,6 @@ topology_template: port_vdbe_ctrl_1_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true - port_vdbe_untr_vmi_name: - type: list - required: true - entry_schema: - type: string port_vdbe_trst_1_port_network_role_tag: type: string required: true @@ -176,15 +182,17 @@ topology_template: port_vdbe_trst_1_port_order: type: integer required: true - port_vdbe_untr_vmi_subnetpoolid: - type: string - required: true subinterface_vdbeav_subinterface_heat_template_service_template_filter_count: type: list required: true entry_schema: type: float - port_vdbe_untr_vmi_network_role_tag: + port_vdbe_untr_vmi_1_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_vdbe_untr_vmi_1_subnetpoolid: type: string required: true port_vdbe_fabr_1_port_ip_requirements: @@ -225,11 +233,9 @@ topology_template: required: true entry_schema: type: string - port_vdbe_untr_vmi_virtual_machine_interface_mac_addresses: - type: list + port_vdbe_untr_vmi_1_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json port_vdbe_ctrl_1_port_name: type: list required: true @@ -251,25 +257,17 @@ topology_template: required: true entry_schema: type: string - port_vdbe_untr_vmi_virtual_network_refs: - type: list - required: true - entry_schema: - type: json - port_vdbe_untr_vmi_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true port_vdbe_fabr_1_port_network_role: type: string required: true + port_vdbe_untr_vmi_1_network_role_tag: + type: string + required: true port_vdbe_trst_1_port_virtual_machine_interface_mac_addresses: type: list required: true entry_schema: type: json - port_vdbe_untr_vmi_order: - type: integer - required: true subinterface_vdbeav_subinterface_heat_template_aap_sec_untrusted_ip_prefix: type: list required: true @@ -287,6 +285,11 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 + port_vdbe_untr_vmi_1_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements port_vdbe_fabr_1_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -295,14 +298,16 @@ topology_template: required: true entry_schema: type: json - port_vdbe_untr_vmi_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true port_vdbe_ctrl_1_port_virtual_network_refs: type: list required: true entry_schema: type: json + port_vdbe_untr_vmi_1_virtual_machine_interface_mac_addresses: + type: list + required: true + entry_schema: + type: json port_vdbe_oam_1_port_order: type: integer required: true @@ -355,12 +360,132 @@ topology_template: required: true entry_schema: type: string - port_vdbe_untr_vmi_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements node_templates: + vdbe_vdbe_untr_vmi_1: + type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface + properties: + mac_requirements: + get_input: port_vdbe_untr_vmi_1_mac_requirements + order: + get_input: port_vdbe_untr_vmi_1_order + exCP_naming: + get_input: port_vdbe_untr_vmi_1_exCP_naming + virtual_machine_interface_allowed_address_pairs: + get_input: + - port_vdbe_untr_vmi_1_virtual_machine_interface_allowed_address_pairs + - index_value + vlan_requirements: + get_input: port_vdbe_untr_vmi_1_vlan_requirements + subinterface_indicator: true + related_networks: + get_input: port_vdbe_untr_vmi_1_related_networks + virtual_network_refs: + get_input: + - port_vdbe_untr_vmi_1_virtual_network_refs + - index_value + ip_requirements: + get_input: port_vdbe_untr_vmi_1_ip_requirements + network_role_tag: + get_input: port_vdbe_untr_vmi_1_network_role_tag + virtual_machine_interface_mac_addresses: + get_input: + - port_vdbe_untr_vmi_1_virtual_machine_interface_mac_addresses + - index_value + network_role: + get_input: port_vdbe_untr_vmi_1_network_role + subnetpoolid: + get_input: port_vdbe_untr_vmi_1_subnetpoolid + name: + get_input: + - port_vdbe_untr_vmi_1_name + - index_value + requirements: + - binding: + capability: tosca.capabilities.network.Bindable + node: vdbe + relationship: tosca.relationships.network.BindsTo + vdbe_vdbe_untr_vmi_1_vdbeav_subinterface_heat_template: + type: org.openecomp.resource.abstract.nodes.heat.subinterface.vdbeav_subinterface_heat_template + directives: + - substitutable + properties: + aap_untrusted_ip_prefix: + get_input: + - subinterface_vdbeav_subinterface_heat_template_aap_untrusted_ip_prefix + - index_value + aap_sec_untrusted_ip_prefix: + get_input: + - subinterface_vdbeav_subinterface_heat_template_aap_sec_untrusted_ip_prefix + - index_value + ip_v6_address: + get_input: + - subinterface_vdbeav_subinterface_heat_template_ip_v6_address + - index_value + counter: + get_property: + - SELF + - service_template_filter + - index_value + ip_address: + get_input: + - subinterface_vdbeav_subinterface_heat_template_ip_address + - index_value + subinterfaces_name_prefix: + get_input: + - subinterface_vdbeav_subinterface_heat_template_subinterfaces_name_prefix + - index_value + aap_address_mode: + get_input: + - subinterface_vdbeav_subinterface_heat_template_aap_address_mode + - index_value + service_template_filter: + count: + get_input: + - subinterface_vdbeav_subinterface_heat_template_service_template_filter_count + - index_value + substitute_service_template: vdbeav_subinterface_heat_templateServiceTemplate.yaml + mandatory: false + aap_untrusted_v6_ip_prefix: + get_input: + - subinterface_vdbeav_subinterface_heat_template_aap_untrusted_v6_ip_prefix + - index_value + parent_interface: + get_input: + - subinterface_vdbeav_subinterface_heat_template_parent_interface + - index_value + vn_network_list: + get_input: + - subinterface_vdbeav_subinterface_heat_template_vn_network_list + - index_value + mac_address: + get_input: + - subinterface_vdbeav_subinterface_heat_template_mac_address + - index_value + vlan_tag_list: + get_input: + - subinterface_vdbeav_subinterface_heat_template_vlan_tag_list + - index_value + aap_sec_untrusted_ip_prefix_len: + get_input: + - subinterface_vdbeav_subinterface_heat_template_aap_sec_untrusted_ip_prefix_len + - index_value + vmac_address: + get_input: + - subinterface_vdbeav_subinterface_heat_template_vmac_address + - index_value + aap_untrusted_v6_ip_prefix_len: + get_input: + - subinterface_vdbeav_subinterface_heat_template_aap_untrusted_v6_ip_prefix_len + - index_value + aap_untrusted_ip_prefix_len: + get_input: + - subinterface_vdbeav_subinterface_heat_template_aap_untrusted_ip_prefix_len + - index_value + requirements: + - binding_vdbe_0_subint_untr_vmi_0: + capability: tosca.capabilities.network.Bindable + node: vdbe_vdbe_untr_vmi_1 + relationship: tosca.relationships.network.BindsTo vdbe: type: org.openecomp.resource.vfc.compute.nodes.heat.vdbe properties: @@ -466,49 +591,6 @@ topology_template: capability: tosca.capabilities.network.Bindable node: vdbe relationship: tosca.relationships.network.BindsTo - vdbe_vdbe_untr_vmi: - type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface - properties: - mac_requirements: - get_input: port_vdbe_untr_vmi_mac_requirements - order: - get_input: port_vdbe_untr_vmi_order - exCP_naming: - get_input: port_vdbe_untr_vmi_exCP_naming - virtual_machine_interface_allowed_address_pairs: - get_input: - - port_vdbe_untr_vmi_virtual_machine_interface_allowed_address_pairs - - index_value - vlan_requirements: - get_input: port_vdbe_untr_vmi_vlan_requirements - subinterface_indicator: true - related_networks: - get_input: port_vdbe_untr_vmi_related_networks - virtual_network_refs: - get_input: - - port_vdbe_untr_vmi_virtual_network_refs - - index_value - ip_requirements: - get_input: port_vdbe_untr_vmi_ip_requirements - network_role_tag: - get_input: port_vdbe_untr_vmi_network_role_tag - virtual_machine_interface_mac_addresses: - get_input: - - port_vdbe_untr_vmi_virtual_machine_interface_mac_addresses - - index_value - network_role: - get_input: port_vdbe_untr_vmi_network_role - subnetpoolid: - get_input: port_vdbe_untr_vmi_subnetpoolid - name: - get_input: - - port_vdbe_untr_vmi_name - - index_value - requirements: - - binding: - capability: tosca.capabilities.network.Bindable - node: vdbe - relationship: tosca.relationships.network.BindsTo vdbe_vdbe_fabr_1_port: type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface properties: @@ -579,88 +661,6 @@ topology_template: capability: tosca.capabilities.network.Bindable node: vdbe relationship: tosca.relationships.network.BindsTo - vdbe_vdbe_untr_vmi_vdbeav_subinterface_heat_template: - type: org.openecomp.resource.abstract.nodes.heat.subinterface.vdbeav_subinterface_heat_template - directives: - - substitutable - properties: - aap_untrusted_ip_prefix: - get_input: - - subinterface_vdbeav_subinterface_heat_template_aap_untrusted_ip_prefix - - index_value - aap_sec_untrusted_ip_prefix: - get_input: - - subinterface_vdbeav_subinterface_heat_template_aap_sec_untrusted_ip_prefix - - index_value - ip_v6_address: - get_input: - - subinterface_vdbeav_subinterface_heat_template_ip_v6_address - - index_value - counter: - get_property: - - SELF - - service_template_filter - - index_value - ip_address: - get_input: - - subinterface_vdbeav_subinterface_heat_template_ip_address - - index_value - subinterfaces_name_prefix: - get_input: - - subinterface_vdbeav_subinterface_heat_template_subinterfaces_name_prefix - - index_value - aap_address_mode: - get_input: - - subinterface_vdbeav_subinterface_heat_template_aap_address_mode - - index_value - service_template_filter: - count: - get_input: - - subinterface_vdbeav_subinterface_heat_template_service_template_filter_count - - index_value - substitute_service_template: vdbeav_subinterface_heat_templateServiceTemplate.yaml - mandatory: false - aap_untrusted_v6_ip_prefix: - get_input: - - subinterface_vdbeav_subinterface_heat_template_aap_untrusted_v6_ip_prefix - - index_value - parent_interface: - get_input: - - subinterface_vdbeav_subinterface_heat_template_parent_interface - - index_value - vn_network_list: - get_input: - - subinterface_vdbeav_subinterface_heat_template_vn_network_list - - index_value - mac_address: - get_input: - - subinterface_vdbeav_subinterface_heat_template_mac_address - - index_value - vlan_tag_list: - get_input: - - subinterface_vdbeav_subinterface_heat_template_vlan_tag_list - - index_value - aap_sec_untrusted_ip_prefix_len: - get_input: - - subinterface_vdbeav_subinterface_heat_template_aap_sec_untrusted_ip_prefix_len - - index_value - vmac_address: - get_input: - - subinterface_vdbeav_subinterface_heat_template_vmac_address - - index_value - aap_untrusted_v6_ip_prefix_len: - get_input: - - subinterface_vdbeav_subinterface_heat_template_aap_untrusted_v6_ip_prefix_len - - index_value - aap_untrusted_ip_prefix_len: - get_input: - - subinterface_vdbeav_subinterface_heat_template_aap_untrusted_ip_prefix_len - - index_value - requirements: - - binding_vdbe_0_subint_untr_vmi_0: - capability: tosca.capabilities.network.Bindable - node: vdbe_vdbe_untr_vmi - relationship: tosca.relationships.network.BindsTo substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.vdbe_1 capabilities: @@ -670,15 +670,15 @@ topology_template: network.outpoing.packets_vdbe_vdbe_ctrl_1_port: - vdbe_vdbe_ctrl_1_port - network.outpoing.packets + network.outgoing.packets.rate_vdbe_vdbe_untr_vmi_1: + - vdbe_vdbe_untr_vmi_1 + - network.outgoing.packets.rate network.outgoing.bytes.rate_vdbe_vdbe_fabr_1_port: - vdbe_vdbe_fabr_1_port - network.outgoing.bytes.rate forwarder_vdbe_vdbe_trst_1_port: - vdbe_vdbe_trst_1_port - forwarder - network.incoming.packets.rate_vdbe_vdbe_untr_vmi: - - vdbe_vdbe_untr_vmi - - network.incoming.packets.rate feature_vdbe: - vdbe - feature @@ -715,6 +715,9 @@ topology_template: network.incoming.packets.rate_vdbe_vdbe_oam_1_port: - vdbe_vdbe_oam_1_port - network.incoming.packets.rate + network.incoming.packets_vdbe_vdbe_untr_vmi_1: + - vdbe_vdbe_untr_vmi_1 + - network.incoming.packets network.incoming.packets_vdbe_vdbe_trst_1_port: - vdbe_vdbe_trst_1_port - network.incoming.packets @@ -742,6 +745,9 @@ topology_template: network.outgoing.bytes.rate_vdbe_vdbe_ctrl_1_port: - vdbe_vdbe_ctrl_1_port - network.outgoing.bytes.rate + network.outpoing.packets_vdbe_vdbe_untr_vmi_1: + - vdbe_vdbe_untr_vmi_1 + - network.outpoing.packets network.outgoing.bytes.rate_vdbe_vdbe_oam_1_port: - vdbe_vdbe_oam_1_port - network.outgoing.bytes.rate @@ -763,9 +769,6 @@ topology_template: binding_vdbe_vdbe_fabr_1_port: - vdbe_vdbe_fabr_1_port - binding - network.incoming.bytes.rate_vdbe_vdbe_untr_vmi: - - vdbe_vdbe_untr_vmi - - network.incoming.bytes.rate cpu_vdbe: - vdbe - cpu @@ -778,18 +781,15 @@ topology_template: disk.latency_vdbe: - vdbe - disk.latency - feature_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_vmi_vdbeav_subinterface_heat_template: - - vdbe_vdbe_untr_vmi_vdbeav_subinterface_heat_template - - feature_vdbe_0_subint_untr_vmi_0 + network.outgoing.bytes_vdbe_vdbe_untr_vmi_1: + - vdbe_vdbe_untr_vmi_1 + - network.outgoing.bytes network.outpoing.packets_vdbe_vdbe_fabr_1_port: - vdbe_vdbe_fabr_1_port - network.outpoing.packets network.outpoing.packets_vdbe_vdbe_oam_1_port: - vdbe_vdbe_oam_1_port - network.outpoing.packets - network.outgoing.bytes.rate_vdbe_vdbe_untr_vmi: - - vdbe_vdbe_untr_vmi - - network.outgoing.bytes.rate disk.allocation_vdbe: - vdbe - disk.allocation @@ -802,18 +802,12 @@ topology_template: os_vdbe: - vdbe - os - forwarder_vdbe_vdbe_untr_vmi: - - vdbe_vdbe_untr_vmi - - forwarder network.incoming.bytes_vdbe_vdbe_trst_1_port: - vdbe_vdbe_trst_1_port - network.incoming.bytes disk.root.size_vdbe: - vdbe - disk.root.size - network.outgoing.bytes_vdbe_vdbe_untr_vmi: - - vdbe_vdbe_untr_vmi - - network.outgoing.bytes memory_vdbe: - vdbe - memory @@ -832,12 +826,12 @@ topology_template: disk.ephemeral.size_vdbe: - vdbe - disk.ephemeral.size + network.outgoing.bytes.rate_vdbe_vdbe_untr_vmi_1: + - vdbe_vdbe_untr_vmi_1 + - network.outgoing.bytes.rate network.outgoing.packets.rate_vdbe_vdbe_trst_1_port: - vdbe_vdbe_trst_1_port - network.outgoing.packets.rate - feature_vdbe_vdbe_untr_vmi: - - vdbe_vdbe_untr_vmi - - feature network.incoming.bytes.rate_vdbe_vdbe_trst_1_port: - vdbe_vdbe_trst_1_port - network.incoming.bytes.rate @@ -853,9 +847,6 @@ topology_template: disk.write.bytes.rate_vdbe: - vdbe - disk.write.bytes.rate - feature_vdbe_vdbe_untr_vmi_vdbeav_subinterface_heat_template: - - vdbe_vdbe_untr_vmi_vdbeav_subinterface_heat_template - - feature disk.device.write.requests_vdbe: - vdbe - disk.device.write.requests @@ -883,9 +874,6 @@ topology_template: network.incoming.packets_vdbe_vdbe_ctrl_1_port: - vdbe_vdbe_ctrl_1_port - network.incoming.packets - network.outpoing.packets_vdbe_vdbe_untr_vmi: - - vdbe_vdbe_untr_vmi - - network.outpoing.packets forwarder_vdbe_vdbe_fabr_1_port: - vdbe_vdbe_fabr_1_port - forwarder @@ -898,15 +886,9 @@ topology_template: disk.device.write.bytes.rate_vdbe: - vdbe - disk.device.write.bytes.rate - network.incoming.packets_vdbe_vdbe_untr_vmi: - - vdbe_vdbe_untr_vmi - - network.incoming.packets disk.write.requests.rate_vdbe: - vdbe - disk.write.requests.rate - binding_vdbe_vdbe_untr_vmi: - - vdbe_vdbe_untr_vmi - - binding disk.device.usage_vdbe: - vdbe - disk.device.usage @@ -922,12 +904,21 @@ topology_template: network.outgoing.bytes_vdbe_vdbe_trst_1_port: - vdbe_vdbe_trst_1_port - network.outgoing.bytes + network.incoming.bytes.rate_vdbe_vdbe_untr_vmi_1: + - vdbe_vdbe_untr_vmi_1 + - network.incoming.bytes.rate binding_vdbe_vdbe_ctrl_1_port: - vdbe_vdbe_ctrl_1_port - binding feature_vdbe_vdbe_oam_1_port: - vdbe_vdbe_oam_1_port - feature + forwarder_vdbe_vdbe_untr_vmi_1: + - vdbe_vdbe_untr_vmi_1 + - forwarder + network.incoming.packets.rate_vdbe_vdbe_untr_vmi_1: + - vdbe_vdbe_untr_vmi_1 + - network.incoming.packets.rate disk.capacity_vdbe: - vdbe - disk.capacity @@ -937,15 +928,24 @@ topology_template: network.incoming.packets_vdbe_vdbe_oam_1_port: - vdbe_vdbe_oam_1_port - network.incoming.packets - network.outgoing.packets.rate_vdbe_vdbe_untr_vmi: - - vdbe_vdbe_untr_vmi - - network.outgoing.packets.rate - network.incoming.bytes_vdbe_vdbe_untr_vmi: - - vdbe_vdbe_untr_vmi + feature_vdbe_vdbe_untr_vmi_1: + - vdbe_vdbe_untr_vmi_1 + - feature + feature_vdbe_vdbe_untr_vmi_1_vdbeav_subinterface_heat_template: + - vdbe_vdbe_untr_vmi_1_vdbeav_subinterface_heat_template + - feature + network.incoming.bytes_vdbe_vdbe_untr_vmi_1: + - vdbe_vdbe_untr_vmi_1 - network.incoming.bytes + binding_vdbe_vdbe_untr_vmi_1: + - vdbe_vdbe_untr_vmi_1 + - binding network.incoming.bytes_vdbe_vdbe_ctrl_1_port: - vdbe_vdbe_ctrl_1_port - network.incoming.bytes + feature_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_vmi_1_vdbeav_subinterface_heat_template: + - vdbe_vdbe_untr_vmi_1_vdbeav_subinterface_heat_template + - feature_vdbe_0_subint_untr_vmi_0 disk.device.read.requests_vdbe: - vdbe - disk.device.read.requests @@ -962,6 +962,12 @@ topology_template: dependency_vdbe_vdbe_fabr_1_port: - vdbe_vdbe_fabr_1_port - dependency + dependency_vdbe_vdbe_untr_vmi_1: + - vdbe_vdbe_untr_vmi_1 + - dependency + dependency_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_vmi_1_vdbeav_subinterface_heat_template: + - vdbe_vdbe_untr_vmi_1_vdbeav_subinterface_heat_template + - dependency_vdbe_0_subint_untr_vmi_0 dependency_vdbe_vdbe_trst_1_port: - vdbe_vdbe_trst_1_port - dependency @@ -971,36 +977,30 @@ topology_template: link_vdbe_vdbe_ctrl_1_port: - vdbe_vdbe_ctrl_1_port - link + dependency_vdbe_vdbe_untr_vmi_1_vdbeav_subinterface_heat_template: + - vdbe_vdbe_untr_vmi_1_vdbeav_subinterface_heat_template + - dependency + subinterface_link_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_vmi_1_vdbeav_subinterface_heat_template: + - vdbe_vdbe_untr_vmi_1_vdbeav_subinterface_heat_template + - subinterface_link_vdbe_0_subint_untr_vmi_0 dependency_vdbe: - vdbe - dependency link_vdbe_vdbe_fabr_1_port: - vdbe_vdbe_fabr_1_port - link - link_vdbe_vdbe_untr_vmi: - - vdbe_vdbe_untr_vmi - - link link_vdbe_vdbe_trst_1_port: - vdbe_vdbe_trst_1_port - link - dependency_vdbe_vdbe_untr_vmi_vdbeav_subinterface_heat_template: - - vdbe_vdbe_untr_vmi_vdbeav_subinterface_heat_template - - dependency - dependency_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_vmi_vdbeav_subinterface_heat_template: - - vdbe_vdbe_untr_vmi_vdbeav_subinterface_heat_template - - dependency_vdbe_0_subint_untr_vmi_0 + link_vdbe_vdbe_untr_vmi_1: + - vdbe_vdbe_untr_vmi_1 + - link dependency_vdbe_vdbe_oam_1_port: - vdbe_vdbe_oam_1_port - dependency - dependency_vdbe_vdbe_untr_vmi: - - vdbe_vdbe_untr_vmi - - dependency dependency_vdbe_vdbe_ctrl_1_port: - vdbe_vdbe_ctrl_1_port - dependency - subinterface_link_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_vmi_vdbeav_subinterface_heat_template: - - vdbe_vdbe_untr_vmi_vdbeav_subinterface_heat_template - - subinterface_link_vdbe_0_subint_untr_vmi_0 link_vdbe_vdbe_oam_1_port: - vdbe_vdbe_oam_1_port - - link \ No newline at end of file + - link diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/in/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/in/MainServiceTemplate.yaml index 98e3bacbad..0673c7c66a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/in/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/in/MainServiceTemplate.yaml @@ -287,7 +287,7 @@ topology_template: type: string description: Internal1_external node_templates: - FSB2_Internal_2: + FSB1_0_Internal_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_address: @@ -298,7 +298,7 @@ topology_template: capability: tosca.capabilities.network.Bindable node: FSB1_template relationship: tosca.relationships.network.BindsTo - FSB2_Internal_1: + FSB1_1_Internal_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_address: @@ -423,8 +423,8 @@ topology_template: description: | Version 2.0 02-09-2016 (Authors: John Doe, user PROD) members: - - FSB2_Internal_2 - - FSB2_Internal_1 + - FSB1_0_Internal_port_0 + - FSB1_1_Internal_port_0 - FSB1_Internal_1 - FSB1_OAM - FSB1_template \ 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/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/out/GlobalSubstitutionTypesServiceTemplate.yaml index 793c3bdd7c..ec3577ad8b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,120 +8,116 @@ node_types: org.openecomp.resource.abstract.nodes.FSB1: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_FSB1_Internal_ip_requirements: + compute_FSB1_metadata: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_FSB1_Internal_subnetpoolid: + type: json + port_FSB1_0_Internal_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_FSB2_Internal_2_subnetpoolid: + vm_flavor_name: type: string required: true status: SUPPORTED - compute_FSB1_metadata: + port_FSB1_Internal_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_FSB1_OAM_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: json - port_FSB2_Internal_2_order: - type: integer + type: org.openecomp.datatypes.network.VlanRequirements + port_FSB1_1_Internal_port_0_network: + type: list required: true status: SUPPORTED - vm_flavor_name: - type: string + entry_schema: + type: string + port_FSB1_0_Internal_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_FSB1_Internal_related_networks: - type: list + port_FSB1_1_Internal_port_0_mac_address: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_FSB1_OAM_vlan_requirements: + port_FSB1_0_Internal_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_FSB1_Internal_vlan_requirements: - type: list + port_FSB1_1_Internal_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_FSB1_Internal_network: + port_FSB1_Internal_1_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: string - port_FSB2_Internal_1_order: - type: integer + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_FSB1_Internal_1_network_role_tag: + type: string required: true status: SUPPORTED - port_FSB2_Internal_2_ip_requirements: - type: list + port_FSB1_1_Internal_port_0_network_role: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements port_FSB1_OAM_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_FSB2_Internal_2_related_networks: - type: list + port_FSB1_1_Internal_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_FSB2_Internal_1_network: + port_FSB1_Internal_1_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_FSB2_Internal_2_network_role: - type: string + port_FSB1_0_Internal_port_0_ip_requirements: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements port_FSB1_OAM_network_role: type: string required: true status: SUPPORTED - port_FSB2_Internal_1_network_role: + port_FSB1_1_Internal_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_FSB2_Internal_2_network_role_tag: - type: string - required: true - status: SUPPORTED - port_FSB2_Internal_1_subnetpoolid: - type: string - required: true - status: SUPPORTED - port_FSB1_Internal_mac_address: - type: string + port_FSB1_1_Internal_port_0_related_networks: + type: list required: true status: SUPPORTED - port_FSB2_Internal_2_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_FSB1_Internal_1_ip_requirements: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements port_FSB1_OAM_subnetpoolid: type: string required: true status: SUPPORTED - port_FSB2_Internal_1_exCP_naming: - type: org.openecomp.datatypes.Naming + port_FSB1_1_Internal_port_0_order: + type: integer required: true status: SUPPORTED port_FSB1_OAM_exCP_naming: @@ -134,44 +130,50 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_FSB2_Internal_1_mac_address: + port_FSB1_1_Internal_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_FSB2_Internal_2_mac_address: + port_FSB1_0_Internal_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_FSB2_Internal_1_ip_requirements: + port_FSB1_0_Internal_port_0_mac_address: + type: string + required: true + status: SUPPORTED + port_FSB1_0_Internal_port_0_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_FSB2_Internal_2_vlan_requirements: + type: string + port_FSB1_1_Internal_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_FSB1_Internal_network_role_tag: - type: string + type: org.openecomp.datatypes.network.IpRequirements + port_FSB1_OAM_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_FSB1_Internal_exCP_naming: + port_FSB1_0_Internal_port_0_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_FSB2_Internal_1_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_FSB1_Internal_1_vlan_requirements: + type: list required: true status: SUPPORTED - port_FSB1_Internal_network_role: - type: string + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_FSB1_Internal_1_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_FSB1_OAM_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_FSB1_Internal_1_network_role: + type: string required: true status: SUPPORTED compute_FSB1_availability_zone: @@ -188,36 +190,36 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_FSB1_OAM_order: - type: integer + port_FSB1_0_Internal_port_0_network_role: + type: string required: true status: SUPPORTED - port_FSB2_Internal_1_vlan_requirements: + port_FSB1_1_Internal_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_FSB2_Internal_2_network: - type: list + port_FSB1_OAM_order: + type: integer required: true status: SUPPORTED - entry_schema: - type: string - port_FSB2_Internal_1_network_role_tag: + port_FSB1_Internal_1_mac_address: type: string required: true status: SUPPORTED - port_FSB1_Internal_order: + port_FSB1_0_Internal_port_0_order: type: integer required: true status: SUPPORTED - port_FSB2_Internal_1_related_networks: - type: list + port_FSB1_Internal_1_order: + type: integer + required: true + status: SUPPORTED + port_FSB1_Internal_1_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_FSB1_OAM_related_networks: type: list required: true @@ -228,10 +230,6 @@ node_types: type: string required: true status: SUPPORTED - port_FSB1_Internal_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED compute_FSB1_name: type: list required: true @@ -244,45 +242,34 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_FSB2_Internal_2_exCP_naming: - type: org.openecomp.datatypes.Naming + port_FSB1_0_Internal_port_0_related_networks: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments requirements: - - dependency_FSB1_FSB1_Internal: - capability: tosca.capabilities.Node - node: tosca.nodes.Root - relationship: tosca.relationships.DependsOn - occurrences: - - 0 - - UNBOUNDED - - link_FSB1_FSB1_Internal: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - - dependency_FSB1_FSB2_Internal_1: + - dependency_FSB1_FSB1_1_Internal_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_FSB1_FSB2_Internal_1: + - link_FSB1_FSB1_1_Internal_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_FSB1_FSB2_Internal_2: + - dependency_FSB1_FSB1_Internal_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_FSB1_FSB2_Internal_2: + - link_FSB1_FSB1_Internal_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -315,6 +302,19 @@ node_types: occurrences: - 0 - UNBOUNDED + - dependency_FSB1_FSB1_0_Internal_port_0: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - link_FSB1_FSB1_0_Internal_port_0: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 capabilities: network.incoming.bytes.rate_FSB1_FSB1_OAM: type: org.openecomp.capabilities.metric.Ceilometer @@ -322,217 +322,199 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_FSB1_FSB1_OAM: + network.outgoing.packets.rate_FSB1_FSB1_1_Internal_port_0: 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_FSB1: + network.outgoing.bytes_FSB1_FSB1_OAM: 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_FSB1: + network.incoming.bytes.rate_FSB1_FSB1_1_Internal_port_0: 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_FSB1: + network.outgoing.bytes_FSB1_FSB1_1_Internal_port_0: 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_FSB1_FSB2_Internal_2: - 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 - binding_FSB1_FSB2_Internal_1: - 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 - disk.allocation_FSB1: + disk.capacity_FSB1: 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_FSB1: + disk.read.bytes.rate_FSB1: 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_FSB1: + network.outgoing.bytes.rate_FSB1_FSB1_1_Internal_port_0: 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_FSB1: + disk.device.latency_FSB1: 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_FSB1: + network.incoming.bytes_FSB1_FSB1_Internal_1: 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_FSB1_FSB1_OAM: + disk.allocation_FSB1: 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_FSB1: + disk.read.bytes_FSB1: 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_FSB1_FSB2_Internal_2: + disk.device.capacity_FSB1: 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_FSB1_FSB2_Internal_1: + forwarder_FSB1_FSB1_1_Internal_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + cpu_util_FSB1: 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_FSB1: - type: tosca.capabilities.Node + disk.device.write.requests.rate_FSB1: + 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_FSB1_FSB1_Internal: + network.outpoing.packets_FSB1_FSB1_1_Internal_port_0: 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_FSB1_FSB1_Internal: + network.outgoing.bytes_FSB1_FSB1_Internal_1: 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_FSB1_FSB2_Internal_1: + network.outgoing.bytes.rate_FSB1_FSB1_OAM: 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_FSB1_FSB2_Internal_2: + disk.root.size_FSB1: 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_FSB1_FSB1_OAM: - type: org.openecomp.capabilities.Forwarder + feature_FSB1_FSB1_0_Internal_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - memory.resident_FSB1: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_FSB1: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_FSB1_FSB1_OAM: + network.incoming.bytes.rate_FSB1_FSB1_Internal_1: 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_FSB1_FSB1_Internal: + forwarder_FSB1_FSB1_OAM: type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - cpu_FSB1: + memory.resident_FSB1: 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_FSB1: + network.incoming.packets.rate_FSB1_FSB1_OAM: 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_FSB1_FSB1_OAM: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - instance_FSB1: + cpu_FSB1: 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_FSB1: + disk.write.requests.rate_FSB1: 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_FSB1_FSB2_Internal_2: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_FSB1_FSB1_OAM: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_FSB1_FSB2_Internal_1: + instance_FSB1: 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_FSB1_FSB2_Internal_2: + disk.device.read.bytes.rate_FSB1: 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_FSB1_FSB2_Internal_1: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_FSB1_FSB1_1_Internal_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_FSB1_FSB2_Internal_2: + cpu.delta_FSB1: 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_FSB1: + network.incoming.packets.rate_FSB1_FSB1_0_Internal_port_0: 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_FSB1_FSB2_Internal_1: + network.outgoing.packets.rate_FSB1_FSB1_0_Internal_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -544,7 +526,7 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_FSB1_FSB1_Internal: + binding_FSB1_FSB1_0_Internal_port_0: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface @@ -558,11 +540,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_FSB1_FSB1_Internal: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.device.read.requests_FSB1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -586,13 +563,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_FSB1_FSB2_Internal_1: - 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.packets.rate_FSB1_FSB2_Internal_2: + network.incoming.bytes.rate_FSB1_FSB1_0_Internal_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -612,19 +583,25 @@ node_types: occurrences: - 0 - UNBOUNDED + network.outpoing.packets_FSB1_FSB1_Internal_1: + 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 attachment_FSB1_FSB1_OAM: type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - network.incoming.packets_FSB1_FSB1_Internal: + network.incoming.packets.rate_FSB1_FSB1_Internal_1: 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 - attachment_FSB1_FSB1_Internal: - type: tosca.capabilities.Attachment + feature_FSB1_FSB1_Internal_1: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -646,9 +623,8 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_FSB1_FSB1_Internal: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_FSB1_FSB1_Internal_1: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED @@ -664,6 +640,18 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets_FSB1_FSB1_0_Internal_port_0: + 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_FSB1_FSB1_Internal_1: + 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_FSB1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -675,25 +663,41 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes.rate_FSB1_FSB1_0_Internal_port_0: + 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_FSB1: 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 + attachment_FSB1_FSB1_Internal_1: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED network.outpoing.packets_FSB1_FSB1_OAM: 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_FSB1_FSB2_Internal_1: + network.outgoing.packets.rate_FSB1_FSB1_Internal_1: 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_FSB1_FSB2_Internal_2: + attachment_FSB1_FSB1_0_Internal_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes.rate_FSB1_FSB1_Internal_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -717,68 +721,63 @@ node_types: occurrences: - 1 - UNBOUNDED - vcpus_FSB1: + network.incoming.bytes_FSB1_FSB1_0_Internal_port_0: 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_FSB1: + vcpus_FSB1: 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_FSB1_FSB1_Internal: + disk.write.requests_FSB1: 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_FSB1: + network.outgoing.bytes_FSB1_FSB1_0_Internal_port_0: 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_FSB1_FSB1_Internal: + network.incoming.packets_FSB1_FSB1_1_Internal_port_0: 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_FSB1: - type: tosca.capabilities.Endpoint.Admin - occurrences: - - 1 - - UNBOUNDED - network.outgoing.packets.rate_FSB1_FSB1_Internal: + disk.device.write.bytes.rate_FSB1: 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_FSB1_FSB2_Internal_2: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + endpoint_FSB1: + type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_FSB1_FSB2_Internal_1: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_FSB1_FSB1_1_Internal_port_0: + 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: - - 1 + - 0 - UNBOUNDED - network.incoming.bytes.rate_FSB1_FSB1_Internal: + disk.latency_FSB1: 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_FSB1: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_FSB1_FSB1_1_Internal_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED @@ -788,40 +787,46 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_FSB1_FSB2_Internal_2: - type: tosca.capabilities.Node + forwarder_FSB1_FSB1_0_Internal_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - disk.read.requests_FSB1: + network.outpoing.packets_FSB1_FSB1_0_Internal_port_0: 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_FSB1: + network.incoming.bytes_FSB1_FSB1_1_Internal_port_0: 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 - attachment_FSB1_FSB2_Internal_1: - type: tosca.capabilities.Attachment + disk.read.requests_FSB1: + 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_FSB1_FSB2_Internal_2: - type: org.openecomp.capabilities.Forwarder + binding_FSB1_FSB1_Internal_1: + 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: - - 1 + - 0 - UNBOUNDED - feature_FSB1_FSB2_Internal_1: - type: tosca.capabilities.Node + disk.device.write.requests_FSB1: + 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 - attachment_FSB1_FSB2_Internal_2: - type: tosca.capabilities.Attachment + network.incoming.packets.rate_FSB1_FSB1_1_Internal_port_0: + 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 @@ -831,11 +836,6 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_FSB1_FSB2_Internal_1: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED disk.device.iops_FSB1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/out/SubstitutionServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/out/SubstitutionServiceTemplate.yaml index 20ecc5780f..d30822dae7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/out/SubstitutionServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/out/SubstitutionServiceTemplate.yaml @@ -11,97 +11,94 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_FSB1_Internal_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_FSB1_Internal_subnetpoolid: - type: string - required: true - port_FSB2_Internal_2_subnetpoolid: - type: string - required: true compute_FSB1_metadata: type: list required: true entry_schema: type: json - port_FSB2_Internal_2_order: - type: integer + port_FSB1_0_Internal_port_0_subnetpoolid: + type: string required: true vm_flavor_name: type: string required: true - port_FSB1_Internal_related_networks: - type: list + port_FSB1_Internal_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_FSB1_OAM_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_FSB1_Internal_vlan_requirements: + port_FSB1_1_Internal_port_0_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_FSB1_Internal_network: + type: string + port_FSB1_0_Internal_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_FSB1_1_Internal_port_0_mac_address: + type: string + required: true + port_FSB1_0_Internal_port_0_vlan_requirements: type: list required: true entry_schema: - type: string - port_FSB2_Internal_1_order: - type: integer + type: org.openecomp.datatypes.network.VlanRequirements + port_FSB1_1_Internal_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_FSB2_Internal_2_ip_requirements: + port_FSB1_Internal_1_related_networks: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_FSB1_Internal_1_network_role_tag: + type: string + required: true + port_FSB1_1_Internal_port_0_network_role: + type: string + required: true port_FSB1_OAM_network: type: list required: true entry_schema: type: string - port_FSB2_Internal_2_related_networks: - type: list + port_FSB1_1_Internal_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_FSB2_Internal_1_network: + port_FSB1_Internal_1_network: type: list required: true entry_schema: type: string - port_FSB2_Internal_2_network_role: - type: string + port_FSB1_0_Internal_port_0_ip_requirements: + type: list required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements port_FSB1_OAM_network_role: type: string required: true - port_FSB2_Internal_1_network_role: - type: string - required: true - port_FSB2_Internal_2_network_role_tag: - type: string - required: true - port_FSB2_Internal_1_subnetpoolid: + port_FSB1_1_Internal_port_0_subnetpoolid: type: string required: true - port_FSB1_Internal_mac_address: - type: string + port_FSB1_1_Internal_port_0_related_networks: + type: list required: true - port_FSB2_Internal_2_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_FSB1_Internal_1_ip_requirements: + type: list required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements port_FSB1_OAM_subnetpoolid: type: string required: true - port_FSB2_Internal_1_exCP_naming: - type: org.openecomp.datatypes.Naming + port_FSB1_1_Internal_port_0_order: + type: integer required: true port_FSB1_OAM_exCP_naming: type: org.openecomp.datatypes.Naming @@ -111,36 +108,41 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_FSB2_Internal_1_mac_address: + port_FSB1_1_Internal_port_0_network_role_tag: type: string required: true - port_FSB2_Internal_2_mac_address: + port_FSB1_0_Internal_port_0_network_role_tag: type: string required: true - port_FSB2_Internal_1_ip_requirements: + port_FSB1_0_Internal_port_0_mac_address: + type: string + required: true + port_FSB1_0_Internal_port_0_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_FSB2_Internal_2_vlan_requirements: + type: string + port_FSB1_1_Internal_port_0_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_FSB1_Internal_network_role_tag: - type: string + type: org.openecomp.datatypes.network.IpRequirements + port_FSB1_OAM_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_FSB1_Internal_exCP_naming: + port_FSB1_0_Internal_port_0_exCP_naming: type: org.openecomp.datatypes.Naming required: true - port_FSB2_Internal_1_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_FSB1_Internal_1_vlan_requirements: + type: list required: true - port_FSB1_Internal_network_role: - type: string + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_FSB1_Internal_1_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - port_FSB1_OAM_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_FSB1_Internal_1_network_role: + type: string required: true compute_FSB1_availability_zone: type: list @@ -154,30 +156,29 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_FSB1_OAM_order: - type: integer + port_FSB1_0_Internal_port_0_network_role: + type: string required: true - port_FSB2_Internal_1_vlan_requirements: + port_FSB1_1_Internal_port_0_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_FSB2_Internal_2_network: - type: list + port_FSB1_OAM_order: + type: integer required: true - entry_schema: - type: string - port_FSB2_Internal_1_network_role_tag: + port_FSB1_Internal_1_mac_address: type: string required: true - port_FSB1_Internal_order: + port_FSB1_0_Internal_port_0_order: type: integer required: true - port_FSB2_Internal_1_related_networks: - type: list + port_FSB1_Internal_1_order: + type: integer + required: true + port_FSB1_Internal_1_subnetpoolid: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_FSB1_OAM_related_networks: type: list required: true @@ -186,9 +187,6 @@ topology_template: port_FSB1_OAM_network_role_tag: type: string required: true - port_FSB1_Internal_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true compute_FSB1_name: type: list required: true @@ -199,103 +197,72 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_FSB2_Internal_2_exCP_naming: - type: org.openecomp.datatypes.Naming + port_FSB1_0_Internal_port_0_related_networks: + type: list required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments node_templates: - FSB1_FSB1_Internal: - type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port - properties: - mac_requirements: - get_input: port_FSB1_Internal_mac_requirements - order: - get_input: port_FSB1_Internal_order - mac_address: - get_input: port_FSB1_Internal_mac_address - exCP_naming: - get_input: port_FSB1_Internal_exCP_naming - vlan_requirements: - get_input: port_FSB1_Internal_vlan_requirements - subinterface_indicator: false - ip_requirements: - get_input: port_FSB1_Internal_ip_requirements - related_networks: - get_input: port_FSB1_Internal_related_networks - network_role_tag: - get_input: port_FSB1_Internal_network_role_tag - network_role: - get_input: port_FSB1_Internal_network_role - subnetpoolid: - get_input: port_FSB1_Internal_subnetpoolid - network: - get_input: - - port_FSB1_Internal_network - - index_value - requirements: - - binding: - capability: tosca.capabilities.network.Bindable - node: FSB1 - relationship: tosca.relationships.network.BindsTo - FSB1_FSB2_Internal_1: + FSB1_FSB1_1_Internal_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_requirements: - get_input: port_FSB2_Internal_1_mac_requirements + get_input: port_FSB1_1_Internal_port_0_mac_requirements order: - get_input: port_FSB2_Internal_1_order + get_input: port_FSB1_1_Internal_port_0_order mac_address: - get_input: port_FSB2_Internal_1_mac_address + get_input: port_FSB1_1_Internal_port_0_mac_address exCP_naming: - get_input: port_FSB2_Internal_1_exCP_naming + get_input: port_FSB1_1_Internal_port_0_exCP_naming vlan_requirements: - get_input: port_FSB2_Internal_1_vlan_requirements + get_input: port_FSB1_1_Internal_port_0_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_FSB2_Internal_1_ip_requirements + get_input: port_FSB1_1_Internal_port_0_ip_requirements related_networks: - get_input: port_FSB2_Internal_1_related_networks + get_input: port_FSB1_1_Internal_port_0_related_networks network_role_tag: - get_input: port_FSB2_Internal_1_network_role_tag + get_input: port_FSB1_1_Internal_port_0_network_role_tag network_role: - get_input: port_FSB2_Internal_1_network_role + get_input: port_FSB1_1_Internal_port_0_network_role subnetpoolid: - get_input: port_FSB2_Internal_1_subnetpoolid + get_input: port_FSB1_1_Internal_port_0_subnetpoolid network: get_input: - - port_FSB2_Internal_1_network + - port_FSB1_1_Internal_port_0_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: FSB1 relationship: tosca.relationships.network.BindsTo - FSB1_FSB2_Internal_2: + FSB1_FSB1_Internal_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_requirements: - get_input: port_FSB2_Internal_2_mac_requirements + get_input: port_FSB1_Internal_1_mac_requirements order: - get_input: port_FSB2_Internal_2_order + get_input: port_FSB1_Internal_1_order mac_address: - get_input: port_FSB2_Internal_2_mac_address + get_input: port_FSB1_Internal_1_mac_address exCP_naming: - get_input: port_FSB2_Internal_2_exCP_naming + get_input: port_FSB1_Internal_1_exCP_naming vlan_requirements: - get_input: port_FSB2_Internal_2_vlan_requirements + get_input: port_FSB1_Internal_1_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_FSB2_Internal_2_ip_requirements + get_input: port_FSB1_Internal_1_ip_requirements related_networks: - get_input: port_FSB2_Internal_2_related_networks + get_input: port_FSB1_Internal_1_related_networks network_role_tag: - get_input: port_FSB2_Internal_2_network_role_tag + get_input: port_FSB1_Internal_1_network_role_tag network_role: - get_input: port_FSB2_Internal_2_network_role + get_input: port_FSB1_Internal_1_network_role subnetpoolid: - get_input: port_FSB2_Internal_2_subnetpoolid + get_input: port_FSB1_Internal_1_subnetpoolid network: get_input: - - port_FSB2_Internal_2_network + - port_FSB1_Internal_1_network - index_value requirements: - binding: @@ -361,30 +328,72 @@ topology_template: nimbus-ethernet: type: tosca.artifacts.Deployment file: ../Artifacts/nimbus-ethernet + FSB1_FSB1_0_Internal_port_0: + type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port + properties: + mac_requirements: + get_input: port_FSB1_0_Internal_port_0_mac_requirements + order: + get_input: port_FSB1_0_Internal_port_0_order + mac_address: + get_input: port_FSB1_0_Internal_port_0_mac_address + exCP_naming: + get_input: port_FSB1_0_Internal_port_0_exCP_naming + vlan_requirements: + get_input: port_FSB1_0_Internal_port_0_vlan_requirements + subinterface_indicator: false + ip_requirements: + get_input: port_FSB1_0_Internal_port_0_ip_requirements + related_networks: + get_input: port_FSB1_0_Internal_port_0_related_networks + network_role_tag: + get_input: port_FSB1_0_Internal_port_0_network_role_tag + network_role: + get_input: port_FSB1_0_Internal_port_0_network_role + subnetpoolid: + get_input: port_FSB1_0_Internal_port_0_subnetpoolid + network: + get_input: + - port_FSB1_0_Internal_port_0_network + - index_value + requirements: + - binding: + capability: tosca.capabilities.network.Bindable + node: FSB1 + relationship: tosca.relationships.network.BindsTo substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.FSB1 capabilities: network.incoming.bytes.rate_FSB1_FSB1_OAM: - FSB1_FSB1_OAM - network.incoming.bytes.rate + network.outgoing.packets.rate_FSB1_FSB1_1_Internal_port_0: + - FSB1_FSB1_1_Internal_port_0 + - network.outgoing.packets.rate network.outgoing.bytes_FSB1_FSB1_OAM: - FSB1_FSB1_OAM - network.outgoing.bytes + network.incoming.bytes.rate_FSB1_FSB1_1_Internal_port_0: + - FSB1_FSB1_1_Internal_port_0 + - network.incoming.bytes.rate + network.outgoing.bytes_FSB1_FSB1_1_Internal_port_0: + - FSB1_FSB1_1_Internal_port_0 + - network.outgoing.bytes disk.capacity_FSB1: - FSB1 - disk.capacity disk.read.bytes.rate_FSB1: - FSB1 - disk.read.bytes.rate + network.outgoing.bytes.rate_FSB1_FSB1_1_Internal_port_0: + - FSB1_FSB1_1_Internal_port_0 + - network.outgoing.bytes.rate disk.device.latency_FSB1: - FSB1 - disk.device.latency - binding_FSB1_FSB2_Internal_2: - - FSB1_FSB2_Internal_2 - - binding - binding_FSB1_FSB2_Internal_1: - - FSB1_FSB2_Internal_1 - - binding + network.incoming.bytes_FSB1_FSB1_Internal_1: + - FSB1_FSB1_Internal_1 + - network.incoming.bytes disk.allocation_FSB1: - FSB1 - disk.allocation @@ -394,39 +403,36 @@ topology_template: disk.device.capacity_FSB1: - FSB1 - disk.device.capacity + forwarder_FSB1_FSB1_1_Internal_port_0: + - FSB1_FSB1_1_Internal_port_0 + - forwarder cpu_util_FSB1: - FSB1 - cpu_util disk.device.write.requests.rate_FSB1: - FSB1 - disk.device.write.requests.rate + network.outpoing.packets_FSB1_FSB1_1_Internal_port_0: + - FSB1_FSB1_1_Internal_port_0 + - network.outpoing.packets + network.outgoing.bytes_FSB1_FSB1_Internal_1: + - FSB1_FSB1_Internal_1 + - network.outgoing.bytes network.outgoing.bytes.rate_FSB1_FSB1_OAM: - FSB1_FSB1_OAM - network.outgoing.bytes.rate disk.root.size_FSB1: - FSB1 - disk.root.size - network.incoming.packets.rate_FSB1_FSB2_Internal_2: - - FSB1_FSB2_Internal_2 - - network.incoming.packets.rate - network.incoming.packets.rate_FSB1_FSB2_Internal_1: - - FSB1_FSB2_Internal_1 - - network.incoming.packets.rate + feature_FSB1_FSB1_0_Internal_port_0: + - FSB1_FSB1_0_Internal_port_0 + - feature feature_FSB1: - FSB1 - feature - network.incoming.packets.rate_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal - - network.incoming.packets.rate - network.outgoing.bytes_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal - - network.outgoing.bytes - network.incoming.packets_FSB1_FSB2_Internal_1: - - FSB1_FSB2_Internal_1 - - network.incoming.packets - network.incoming.packets_FSB1_FSB2_Internal_2: - - FSB1_FSB2_Internal_2 - - network.incoming.packets + network.incoming.bytes.rate_FSB1_FSB1_Internal_1: + - FSB1_FSB1_Internal_1 + - network.incoming.bytes.rate forwarder_FSB1_FSB1_OAM: - FSB1_FSB1_OAM - forwarder @@ -436,9 +442,6 @@ topology_template: network.incoming.packets.rate_FSB1_FSB1_OAM: - FSB1_FSB1_OAM - network.incoming.packets.rate - forwarder_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal - - forwarder cpu_FSB1: - FSB1 - cpu @@ -454,39 +457,27 @@ topology_template: disk.device.read.bytes.rate_FSB1: - FSB1 - disk.device.read.bytes.rate - network.outpoing.packets_FSB1_FSB2_Internal_2: - - FSB1_FSB2_Internal_2 - - network.outpoing.packets - network.outgoing.bytes.rate_FSB1_FSB2_Internal_1: - - FSB1_FSB2_Internal_1 - - network.outgoing.bytes.rate - network.outgoing.bytes.rate_FSB1_FSB2_Internal_2: - - FSB1_FSB2_Internal_2 - - network.outgoing.bytes.rate - network.outgoing.bytes_FSB1_FSB2_Internal_1: - - FSB1_FSB2_Internal_1 - - network.outgoing.bytes - network.outgoing.bytes_FSB1_FSB2_Internal_2: - - FSB1_FSB2_Internal_2 - - network.outgoing.bytes + feature_FSB1_FSB1_1_Internal_port_0: + - FSB1_FSB1_1_Internal_port_0 + - feature cpu.delta_FSB1: - FSB1 - cpu.delta - network.outpoing.packets_FSB1_FSB2_Internal_1: - - FSB1_FSB2_Internal_1 - - network.outpoing.packets + network.incoming.packets.rate_FSB1_FSB1_0_Internal_port_0: + - FSB1_FSB1_0_Internal_port_0 + - network.incoming.packets.rate + network.outgoing.packets.rate_FSB1_FSB1_0_Internal_port_0: + - FSB1_FSB1_0_Internal_port_0 + - network.outgoing.packets.rate disk.write.bytes_FSB1: - FSB1 - disk.write.bytes - binding_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal + binding_FSB1_FSB1_0_Internal_port_0: + - FSB1_FSB1_0_Internal_port_0 - binding disk.device.read.requests.rate_FSB1: - FSB1 - disk.device.read.requests.rate - feature_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal - - feature disk.device.read.requests_FSB1: - FSB1 - disk.device.read.requests @@ -499,27 +490,27 @@ topology_template: disk.device.write.bytes_FSB1: - FSB1 - disk.device.write.bytes - network.outgoing.packets.rate_FSB1_FSB2_Internal_1: - - FSB1_FSB2_Internal_1 - - network.outgoing.packets.rate - network.outgoing.packets.rate_FSB1_FSB2_Internal_2: - - FSB1_FSB2_Internal_2 - - network.outgoing.packets.rate + network.incoming.bytes.rate_FSB1_FSB1_0_Internal_port_0: + - FSB1_FSB1_0_Internal_port_0 + - network.incoming.bytes.rate network.outgoing.packets.rate_FSB1_FSB1_OAM: - FSB1_FSB1_OAM - network.outgoing.packets.rate binding_FSB1_FSB1_OAM: - FSB1_FSB1_OAM - binding + network.outpoing.packets_FSB1_FSB1_Internal_1: + - FSB1_FSB1_Internal_1 + - network.outpoing.packets attachment_FSB1_FSB1_OAM: - FSB1_FSB1_OAM - attachment - network.incoming.packets_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal - - network.incoming.packets - attachment_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal - - attachment + network.incoming.packets.rate_FSB1_FSB1_Internal_1: + - FSB1_FSB1_Internal_1 + - network.incoming.packets.rate + feature_FSB1_FSB1_Internal_1: + - FSB1_FSB1_Internal_1 + - feature network.incoming.bytes_FSB1_FSB1_OAM: - FSB1_FSB1_OAM - network.incoming.bytes @@ -529,33 +520,48 @@ topology_template: network.incoming.packets_FSB1_FSB1_OAM: - FSB1_FSB1_OAM - network.incoming.packets - network.outpoing.packets_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal - - network.outpoing.packets + forwarder_FSB1_FSB1_Internal_1: + - FSB1_FSB1_Internal_1 + - forwarder disk.device.read.bytes_FSB1: - FSB1 - disk.device.read.bytes disk.device.usage_FSB1: - FSB1 - disk.device.usage + network.incoming.packets_FSB1_FSB1_0_Internal_port_0: + - FSB1_FSB1_0_Internal_port_0 + - network.incoming.packets + network.incoming.packets_FSB1_FSB1_Internal_1: + - FSB1_FSB1_Internal_1 + - network.incoming.packets disk.write.bytes.rate_FSB1: - FSB1 - disk.write.bytes.rate scalable_FSB1: - FSB1 - scalable + network.outgoing.bytes.rate_FSB1_FSB1_0_Internal_port_0: + - FSB1_FSB1_0_Internal_port_0 + - network.outgoing.bytes.rate disk.usage_FSB1: - FSB1 - disk.usage + attachment_FSB1_FSB1_Internal_1: + - FSB1_FSB1_Internal_1 + - attachment network.outpoing.packets_FSB1_FSB1_OAM: - FSB1_FSB1_OAM - network.outpoing.packets - network.incoming.bytes_FSB1_FSB2_Internal_1: - - FSB1_FSB2_Internal_1 - - network.incoming.bytes - network.incoming.bytes_FSB1_FSB2_Internal_2: - - FSB1_FSB2_Internal_2 - - network.incoming.bytes + network.outgoing.packets.rate_FSB1_FSB1_Internal_1: + - FSB1_FSB1_Internal_1 + - network.outgoing.packets.rate + attachment_FSB1_FSB1_0_Internal_port_0: + - FSB1_FSB1_0_Internal_port_0 + - attachment + network.outgoing.bytes.rate_FSB1_FSB1_Internal_1: + - FSB1_FSB1_Internal_1 + - network.outgoing.bytes.rate host_FSB1: - FSB1 - host @@ -565,100 +571,94 @@ topology_template: os_FSB1: - FSB1 - os + network.incoming.bytes_FSB1_FSB1_0_Internal_port_0: + - FSB1_FSB1_0_Internal_port_0 + - network.incoming.bytes vcpus_FSB1: - FSB1 - vcpus disk.write.requests_FSB1: - FSB1 - disk.write.requests - network.incoming.bytes_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal - - network.incoming.bytes + network.outgoing.bytes_FSB1_FSB1_0_Internal_port_0: + - FSB1_FSB1_0_Internal_port_0 + - network.outgoing.bytes + network.incoming.packets_FSB1_FSB1_1_Internal_port_0: + - FSB1_FSB1_1_Internal_port_0 + - network.incoming.packets disk.device.write.bytes.rate_FSB1: - FSB1 - disk.device.write.bytes.rate - network.outgoing.bytes.rate_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal - - network.outgoing.bytes.rate endpoint_FSB1: - FSB1 - endpoint - network.outgoing.packets.rate_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal - - network.outgoing.packets.rate - network.incoming.bytes.rate_FSB1_FSB2_Internal_2: - - FSB1_FSB2_Internal_2 - - network.incoming.bytes.rate - network.incoming.bytes.rate_FSB1_FSB2_Internal_1: - - FSB1_FSB2_Internal_1 - - network.incoming.bytes.rate - network.incoming.bytes.rate_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal - - network.incoming.bytes.rate + binding_FSB1_FSB1_1_Internal_port_0: + - FSB1_FSB1_1_Internal_port_0 + - binding disk.latency_FSB1: - FSB1 - disk.latency + attachment_FSB1_FSB1_1_Internal_port_0: + - FSB1_FSB1_1_Internal_port_0 + - attachment memory.usage_FSB1: - FSB1 - memory.usage - feature_FSB1_FSB2_Internal_2: - - FSB1_FSB2_Internal_2 - - feature + forwarder_FSB1_FSB1_0_Internal_port_0: + - FSB1_FSB1_0_Internal_port_0 + - forwarder + network.outpoing.packets_FSB1_FSB1_0_Internal_port_0: + - FSB1_FSB1_0_Internal_port_0 + - network.outpoing.packets + network.incoming.bytes_FSB1_FSB1_1_Internal_port_0: + - FSB1_FSB1_1_Internal_port_0 + - network.incoming.bytes disk.read.requests_FSB1: - FSB1 - disk.read.requests + binding_FSB1_FSB1_Internal_1: + - FSB1_FSB1_Internal_1 + - binding disk.device.write.requests_FSB1: - FSB1 - disk.device.write.requests - attachment_FSB1_FSB2_Internal_1: - - FSB1_FSB2_Internal_1 - - attachment - forwarder_FSB1_FSB2_Internal_2: - - FSB1_FSB2_Internal_2 - - forwarder - feature_FSB1_FSB2_Internal_1: - - FSB1_FSB2_Internal_1 - - feature - attachment_FSB1_FSB2_Internal_2: - - FSB1_FSB2_Internal_2 - - attachment + network.incoming.packets.rate_FSB1_FSB1_1_Internal_port_0: + - FSB1_FSB1_1_Internal_port_0 + - network.incoming.packets.rate disk.iops_FSB1: - FSB1 - disk.iops - forwarder_FSB1_FSB2_Internal_1: - - FSB1_FSB2_Internal_1 - - forwarder disk.device.iops_FSB1: - FSB1 - disk.device.iops requirements: - link_FSB1_FSB2_Internal_2: - - FSB1_FSB2_Internal_2 + link_FSB1_FSB1_Internal_1: + - FSB1_FSB1_Internal_1 - link + dependency_FSB1_FSB1_1_Internal_port_0: + - FSB1_FSB1_1_Internal_port_0 + - dependency link_FSB1_FSB1_OAM: - FSB1_FSB1_OAM - link + link_FSB1_FSB1_1_Internal_port_0: + - FSB1_FSB1_1_Internal_port_0 + - link dependency_FSB1_FSB1_OAM: - FSB1_FSB1_OAM - dependency dependency_FSB1: - FSB1 - dependency - link_FSB1_FSB2_Internal_1: - - FSB1_FSB2_Internal_1 - - link - dependency_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal + dependency_FSB1_FSB1_0_Internal_port_0: + - FSB1_FSB1_0_Internal_port_0 - dependency - link_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal + link_FSB1_FSB1_0_Internal_port_0: + - FSB1_FSB1_0_Internal_port_0 - link local_storage_FSB1: - FSB1 - local_storage - dependency_FSB1_FSB2_Internal_2: - - FSB1_FSB2_Internal_2 - - dependency - dependency_FSB1_FSB2_Internal_1: - - FSB1_FSB2_Internal_1 + dependency_FSB1_FSB1_Internal_1: + - FSB1_FSB1_Internal_1 - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/in/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/in/MainServiceTemplate.yaml index 6755ef4b77..9d1263448b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/in/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/in/MainServiceTemplate.yaml @@ -287,7 +287,7 @@ topology_template: type: string description: Internal1_external node_templates: - FSB2_Internal_2: + FSB_1_Internal_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_address: @@ -298,7 +298,7 @@ topology_template: capability: tosca.capabilities.network.Bindable node: FSB1_template relationship: tosca.relationships.network.BindsTo - FSB1_Internal_1: + FSB_1_Internal_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_address: @@ -412,7 +412,7 @@ topology_template: description: | Version 2.0 02-09-2016 (Authors: John Doe, user PROD) members: - - FSB2_Internal_2 - - FSB1_Internal_1 + - FSB_1_Internal_port_0 + - FSB_1_Internal_port_1 - FSB1_OAM - FSB1_template \ 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/creSubstitutionServiceTemplate/WithIndex/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/out/GlobalSubstitutionTypesServiceTemplate.yaml index 42008cf2fd..ac0f7726a0 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,24 +8,14 @@ node_types: org.openecomp.resource.abstract.nodes.FSB1: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_FSB1_Internal_mac_address: - type: string - required: true - status: SUPPORTED - port_FSB1_Internal_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_FSB2_Internal_related_networks: + port_FSB_Internal_port_1_related_networks: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_FSB1_Internal_subnetpoolid: - type: string + port_FSB_Internal_port_1_order: + type: integer required: true status: SUPPORTED port_FSB1_OAM_subnetpoolid: @@ -38,85 +28,81 @@ node_types: status: SUPPORTED entry_schema: type: json - port_FSB2_Internal_vlan_requirements: + port_FSB_Internal_port_1_network_role: + type: string + required: true + status: SUPPORTED + port_FSB_Internal_port_0_network_role: + type: string + required: true + status: SUPPORTED + port_FSB_Internal_port_0_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_FSB2_Internal_order: - type: integer + type: string + port_FSB_Internal_port_1_network_role_tag: + type: string required: true status: SUPPORTED port_FSB1_OAM_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED + port_FSB_Internal_port_0_mac_address: + type: string + required: true + status: SUPPORTED port_FSB1_OAM_ip_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_FSB2_Internal_ip_requirements: + port_FSB_Internal_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: org.openecomp.datatypes.network.VlanRequirements vm_flavor_name: type: string required: true status: SUPPORTED - port_FSB2_Internal_network_role: + port_FSB_Internal_port_1_mac_address: type: string required: true status: SUPPORTED - port_FSB1_Internal_related_networks: + port_FSB_Internal_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_FSB1_Internal_network_role_tag: - type: string - required: true - status: SUPPORTED port_FSB1_OAM_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_FSB1_Internal_vlan_requirements: + port_FSB_Internal_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_FSB2_Internal_subnetpoolid: - type: string - required: true - status: SUPPORTED - port_FSB1_Internal_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_FSB1_Internal_network_role: - type: string - required: true - status: SUPPORTED + type: org.openecomp.datatypes.network.IpRequirements port_FSB1_OAM_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - compute_FSB1_availability_zone: + port_FSB_Internal_port_1_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_FSB1_Internal_network: + type: org.openecomp.datatypes.network.VlanRequirements + compute_FSB1_availability_zone: type: list required: true status: SUPPORTED @@ -134,38 +120,38 @@ node_types: type: integer required: true status: SUPPORTED - port_FSB2_Internal_mac_requirements: + port_FSB_Internal_port_0_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_FSB2_Internal_mac_address: - type: string - required: true - status: SUPPORTED port_FSB1_OAM_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_FSB2_Internal_exCP_naming: - type: org.openecomp.datatypes.Naming + port_FSB_Internal_port_0_order: + type: integer required: true status: SUPPORTED - port_FSB1_Internal_order: - type: integer + port_FSB_Internal_port_1_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_FSB_Internal_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED port_FSB1_OAM_network_role: type: string required: true status: SUPPORTED - port_FSB2_Internal_network: - type: list + port_FSB_Internal_port_0_network_role_tag: + type: string required: true status: SUPPORTED - entry_schema: - type: string port_FSB1_OAM_related_networks: type: list required: true @@ -176,61 +162,75 @@ node_types: type: string required: true status: SUPPORTED - port_FSB1_Internal_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED compute_FSB1_name: type: list required: true status: SUPPORTED entry_schema: type: string + port_FSB_Internal_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED port_FSB1_OAM_fixed_ips: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_FSB2_Internal_network_role_tag: + port_FSB_Internal_port_0_subnetpoolid: + type: string + required: true + status: SUPPORTED + port_FSB_Internal_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_FSB_Internal_port_1_network: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_FSB_Internal_port_1_subnetpoolid: type: string required: true status: SUPPORTED requirements: - - dependency_FSB1_FSB1_Internal: + - dependency_FSB1_FSB1_OAM: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_FSB1_FSB1_Internal: + - link_FSB1_FSB1_OAM: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_FSB1_FSB2_Internal: + - dependency_FSB1_FSB_1_Internal_port_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_FSB1_FSB2_Internal: + - link_FSB1_FSB_1_Internal_port_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_FSB1_FSB1_OAM: + - dependency_FSB1_FSB_1_Internal_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_FSB1_FSB1_OAM: + - link_FSB1_FSB_1_Internal_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -263,13 +263,29 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_FSB1_FSB2_Internal: - 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 + network.outgoing.packets.rate_FSB1_FSB_1_Internal_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - - 0 + - 1 + - UNBOUNDED + network.outgoing.packets.rate_FSB1_FSB_1_Internal_port_1: + 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_FSB1_FSB_1_Internal_port_1: + 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_FSB1_FSB_1_Internal_port_0: + 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_FSB1: type: org.openecomp.capabilities.metric.Ceilometer @@ -283,6 +299,16 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_FSB1_FSB_1_Internal_port_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + forwarder_FSB1_FSB_1_Internal_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.latency_FSB1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -331,128 +357,110 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_FSB1_FSB2_Internal: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED feature_FSB1: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_FSB1_FSB1_Internal: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_FSB1_FSB1_OAM: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_FSB1_FSB1_Internal: + memory.resident_FSB1: 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_FSB1_FSB2_Internal: - type: tosca.capabilities.Node + network.incoming.packets.rate_FSB1_FSB1_OAM: + 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 - attachment_FSB1_FSB2_Internal: - type: tosca.capabilities.Attachment + cpu_FSB1: + 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_FSB1_FSB2_Internal: + disk.write.requests.rate_FSB1: 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_FSB1_FSB1_OAM: - type: org.openecomp.capabilities.Forwarder + feature_FSB1_FSB1_OAM: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - memory.resident_FSB1: + instance_FSB1: 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_FSB1_FSB1_OAM: + disk.device.read.bytes.rate_FSB1: 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_FSB1_FSB1_Internal: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - network.incoming.packets.rate_FSB1_FSB2_Internal: + cpu.delta_FSB1: 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_FSB1: + disk.write.bytes_FSB1: 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_FSB1: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_FSB1_FSB_1_Internal_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - feature_FSB1_FSB1_OAM: - type: tosca.capabilities.Node + network.incoming.bytes.rate_FSB1_FSB_1_Internal_port_0: + 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 - instance_FSB1: + disk.device.read.requests.rate_FSB1: 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_FSB1: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_FSB1_FSB_1_Internal_port_1: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - cpu.delta_FSB1: + network.incoming.bytes.rate_FSB1_FSB_1_Internal_port_1: 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_FSB1: + network.outgoing.bytes.rate_FSB1_FSB_1_Internal_port_0: 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_FSB1_FSB1_Internal: - 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 - disk.device.read.requests.rate_FSB1: + network.outgoing.bytes.rate_FSB1_FSB_1_Internal_port_1: 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_FSB1_FSB1_Internal: + feature_FSB1_FSB_1_Internal_port_0: type: tosca.capabilities.Node occurrences: - 1 @@ -463,6 +471,11 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_FSB1_FSB_1_Internal_port_1: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.ephemeral.size_FSB1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -499,42 +512,43 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_FSB1_FSB1_Internal: + network.incoming.bytes_FSB1_FSB_1_Internal_port_0: 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 - attachment_FSB1_FSB1_Internal: - type: tosca.capabilities.Attachment + network.incoming.bytes_FSB1_FSB_1_Internal_port_1: + 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_FSB1_FSB1_OAM: + network.incoming.packets_FSB1_FSB_1_Internal_port_1: 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_FSB1: + network.incoming.bytes_FSB1_FSB1_OAM: 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_FSB1_FSB1_OAM: + network.incoming.packets_FSB1_FSB_1_Internal_port_0: 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_FSB1_FSB1_Internal: + memory_FSB1: 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_FSB1_FSB2_Internal: + network.incoming.packets_FSB1_FSB1_OAM: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -569,6 +583,22 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_FSB1_FSB_1_Internal_port_1: + 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 + binding_FSB1_FSB_1_Internal_port_0: + 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 network.outpoing.packets_FSB1_FSB1_OAM: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -605,19 +635,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_FSB1_FSB2_Internal: - 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_FSB1_FSB1_Internal: - 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_FSB1_FSB2_Internal: + network.outgoing.bytes_FSB1_FSB_1_Internal_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -629,29 +647,11 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_FSB1_FSB1_Internal: - 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_FSB1: type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_FSB1_FSB1_Internal: - 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_FSB1_FSB1_Internal: - 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_FSB1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -670,19 +670,19 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.write.requests_FSB1: + network.incoming.packets.rate_FSB1_FSB_1_Internal_port_1: 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_FSB1_FSB2_Internal: + disk.device.write.requests_FSB1: 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_FSB1_FSB2_Internal: + network.incoming.packets.rate_FSB1_FSB_1_Internal_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -694,7 +694,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_FSB1_FSB2_Internal: + network.outgoing.bytes_FSB1_FSB_1_Internal_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/out/SubstitutionServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/out/SubstitutionServiceTemplate.yaml index 99e7fd0762..0739631901 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/out/SubstitutionServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/out/SubstitutionServiceTemplate.yaml @@ -11,21 +11,13 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_FSB1_Internal_mac_address: - type: string - required: true - port_FSB1_Internal_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_FSB2_Internal_related_networks: + port_FSB_Internal_port_1_related_networks: type: list required: true entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_FSB1_Internal_subnetpoolid: - type: string + port_FSB_Internal_port_1_order: + type: integer required: true port_FSB1_OAM_subnetpoolid: type: string @@ -35,69 +27,66 @@ topology_template: required: true entry_schema: type: json - port_FSB2_Internal_vlan_requirements: + port_FSB_Internal_port_1_network_role: + type: string + required: true + port_FSB_Internal_port_0_network_role: + type: string + required: true + port_FSB_Internal_port_0_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_FSB2_Internal_order: - type: integer + type: string + port_FSB_Internal_port_1_network_role_tag: + type: string required: true port_FSB1_OAM_exCP_naming: type: org.openecomp.datatypes.Naming required: true + port_FSB_Internal_port_0_mac_address: + type: string + required: true port_FSB1_OAM_ip_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_FSB2_Internal_ip_requirements: + port_FSB_Internal_port_0_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: org.openecomp.datatypes.network.VlanRequirements vm_flavor_name: type: string required: true - port_FSB2_Internal_network_role: + port_FSB_Internal_port_1_mac_address: type: string required: true - port_FSB1_Internal_related_networks: + port_FSB_Internal_port_0_related_networks: type: list required: true entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_FSB1_Internal_network_role_tag: - type: string - required: true port_FSB1_OAM_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_FSB1_Internal_vlan_requirements: + port_FSB_Internal_port_0_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_FSB2_Internal_subnetpoolid: - type: string - required: true - port_FSB1_Internal_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_FSB1_Internal_network_role: - type: string - required: true + type: org.openecomp.datatypes.network.IpRequirements port_FSB1_OAM_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true - compute_FSB1_availability_zone: + port_FSB_Internal_port_1_vlan_requirements: type: list required: true entry_schema: - type: string - port_FSB1_Internal_network: + type: org.openecomp.datatypes.network.VlanRequirements + compute_FSB1_availability_zone: type: list required: true entry_schema: @@ -112,31 +101,31 @@ topology_template: port_FSB1_OAM_order: type: integer required: true - port_FSB2_Internal_mac_requirements: + port_FSB_Internal_port_0_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true - port_FSB2_Internal_mac_address: - type: string - required: true port_FSB1_OAM_network: type: list required: true entry_schema: type: string - port_FSB2_Internal_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_FSB1_Internal_order: + port_FSB_Internal_port_0_order: type: integer required: true + port_FSB_Internal_port_1_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_FSB_Internal_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true port_FSB1_OAM_network_role: type: string required: true - port_FSB2_Internal_network: - type: list + port_FSB_Internal_port_0_network_role_tag: + type: string required: true - entry_schema: - type: string port_FSB1_OAM_related_networks: type: list required: true @@ -145,118 +134,129 @@ topology_template: port_FSB1_OAM_network_role_tag: type: string required: true - port_FSB1_Internal_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true compute_FSB1_name: type: list required: true entry_schema: type: string + port_FSB_Internal_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true port_FSB1_OAM_fixed_ips: type: list required: true entry_schema: type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_FSB2_Internal_network_role_tag: + port_FSB_Internal_port_0_subnetpoolid: + type: string + required: true + port_FSB_Internal_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_FSB_Internal_port_1_network: + type: list + required: true + entry_schema: + type: string + port_FSB_Internal_port_1_subnetpoolid: type: string required: true node_templates: - FSB1_FSB1_Internal: + FSB1_FSB1_OAM: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_requirements: - get_input: port_FSB1_Internal_mac_requirements + get_input: port_FSB1_OAM_mac_requirements order: - get_input: port_FSB1_Internal_order - mac_address: - get_input: port_FSB1_Internal_mac_address + get_input: port_FSB1_OAM_order exCP_naming: - get_input: port_FSB1_Internal_exCP_naming + get_input: port_FSB1_OAM_exCP_naming vlan_requirements: - get_input: port_FSB1_Internal_vlan_requirements + get_input: port_FSB1_OAM_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_FSB1_Internal_ip_requirements + get_input: port_FSB1_OAM_ip_requirements related_networks: - get_input: port_FSB1_Internal_related_networks + get_input: port_FSB1_OAM_related_networks network_role_tag: - get_input: port_FSB1_Internal_network_role_tag + get_input: port_FSB1_OAM_network_role_tag network_role: - get_input: port_FSB1_Internal_network_role + get_input: port_FSB1_OAM_network_role + fixed_ips: + get_input: + - port_FSB1_OAM_fixed_ips + - index_value subnetpoolid: - get_input: port_FSB1_Internal_subnetpoolid + get_input: port_FSB1_OAM_subnetpoolid network: get_input: - - port_FSB1_Internal_network + - port_FSB1_OAM_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: FSB1 relationship: tosca.relationships.network.BindsTo - FSB1_FSB2_Internal: + FSB1_FSB_1_Internal_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_requirements: - get_input: port_FSB2_Internal_mac_requirements + get_input: port_FSB_Internal_port_1_mac_requirements order: - get_input: port_FSB2_Internal_order + get_input: port_FSB_Internal_port_1_order mac_address: - get_input: port_FSB2_Internal_mac_address + get_input: port_FSB_Internal_port_1_mac_address exCP_naming: - get_input: port_FSB2_Internal_exCP_naming + get_input: port_FSB_Internal_port_1_exCP_naming vlan_requirements: - get_input: port_FSB2_Internal_vlan_requirements + get_input: port_FSB_Internal_port_1_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_FSB2_Internal_ip_requirements + get_input: port_FSB_Internal_port_1_ip_requirements related_networks: - get_input: port_FSB2_Internal_related_networks + get_input: port_FSB_Internal_port_1_related_networks network_role_tag: - get_input: port_FSB2_Internal_network_role_tag + get_input: port_FSB_Internal_port_1_network_role_tag network_role: - get_input: port_FSB2_Internal_network_role + get_input: port_FSB_Internal_port_1_network_role subnetpoolid: - get_input: port_FSB2_Internal_subnetpoolid + get_input: port_FSB_Internal_port_1_subnetpoolid network: get_input: - - port_FSB2_Internal_network + - port_FSB_Internal_port_1_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: FSB1 relationship: tosca.relationships.network.BindsTo - FSB1_FSB1_OAM: + FSB1_FSB_1_Internal_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_requirements: - get_input: port_FSB1_OAM_mac_requirements + get_input: port_FSB_Internal_port_0_mac_requirements order: - get_input: port_FSB1_OAM_order + get_input: port_FSB_Internal_port_0_order + mac_address: + get_input: port_FSB_Internal_port_0_mac_address exCP_naming: - get_input: port_FSB1_OAM_exCP_naming + get_input: port_FSB_Internal_port_0_exCP_naming vlan_requirements: - get_input: port_FSB1_OAM_vlan_requirements + get_input: port_FSB_Internal_port_0_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_FSB1_OAM_ip_requirements + get_input: port_FSB_Internal_port_0_ip_requirements related_networks: - get_input: port_FSB1_OAM_related_networks + get_input: port_FSB_Internal_port_0_related_networks network_role_tag: - get_input: port_FSB1_OAM_network_role_tag + get_input: port_FSB_Internal_port_0_network_role_tag network_role: - get_input: port_FSB1_OAM_network_role - fixed_ips: - get_input: - - port_FSB1_OAM_fixed_ips - - index_value + get_input: port_FSB_Internal_port_0_network_role subnetpoolid: - get_input: port_FSB1_OAM_subnetpoolid + get_input: port_FSB_Internal_port_0_subnetpoolid network: get_input: - - port_FSB1_OAM_network + - port_FSB_Internal_port_0_network - index_value requirements: - binding: @@ -296,15 +296,30 @@ topology_template: network.outgoing.bytes_FSB1_FSB1_OAM: - FSB1_FSB1_OAM - network.outgoing.bytes - binding_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal - - binding + network.outgoing.packets.rate_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 + - network.outgoing.packets.rate + network.outgoing.packets.rate_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 + - network.outgoing.packets.rate + network.outpoing.packets_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 + - network.outpoing.packets + network.outpoing.packets_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 + - network.outpoing.packets disk.capacity_FSB1: - FSB1 - disk.capacity disk.read.bytes.rate_FSB1: - FSB1 - disk.read.bytes.rate + forwarder_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 + - forwarder + forwarder_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 + - forwarder disk.device.latency_FSB1: - FSB1 - disk.device.latency @@ -329,27 +344,9 @@ topology_template: disk.root.size_FSB1: - FSB1 - disk.root.size - forwarder_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal - - forwarder feature_FSB1: - FSB1 - feature - network.incoming.packets.rate_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal - - network.incoming.packets.rate - network.outgoing.bytes_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal - - network.outgoing.bytes - feature_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal - - feature - attachment_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal - - attachment - network.incoming.packets_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal - - network.incoming.packets forwarder_FSB1_FSB1_OAM: - FSB1_FSB1_OAM - forwarder @@ -359,12 +356,6 @@ topology_template: network.incoming.packets.rate_FSB1_FSB1_OAM: - FSB1_FSB1_OAM - network.incoming.packets.rate - forwarder_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal - - forwarder - network.incoming.packets.rate_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal - - network.incoming.packets.rate cpu_FSB1: - FSB1 - cpu @@ -386,18 +377,36 @@ topology_template: disk.write.bytes_FSB1: - FSB1 - disk.write.bytes - binding_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal - - binding + attachment_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 + - attachment + network.incoming.bytes.rate_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 + - network.incoming.bytes.rate disk.device.read.requests.rate_FSB1: - FSB1 - disk.device.read.requests.rate - feature_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal + attachment_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 + - attachment + network.incoming.bytes.rate_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 + - network.incoming.bytes.rate + network.outgoing.bytes.rate_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 + - network.outgoing.bytes.rate + network.outgoing.bytes.rate_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 + - network.outgoing.bytes.rate + feature_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 - feature disk.device.read.requests_FSB1: - FSB1 - disk.device.read.requests + feature_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 + - feature disk.ephemeral.size_FSB1: - FSB1 - disk.ephemeral.size @@ -416,27 +425,27 @@ topology_template: attachment_FSB1_FSB1_OAM: - FSB1_FSB1_OAM - attachment - network.incoming.packets_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal + network.incoming.bytes_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 + - network.incoming.bytes + network.incoming.bytes_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 + - network.incoming.bytes + network.incoming.packets_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 - network.incoming.packets - attachment_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal - - attachment network.incoming.bytes_FSB1_FSB1_OAM: - FSB1_FSB1_OAM - network.incoming.bytes + network.incoming.packets_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 + - network.incoming.packets memory_FSB1: - FSB1 - memory network.incoming.packets_FSB1_FSB1_OAM: - FSB1_FSB1_OAM - network.incoming.packets - network.outpoing.packets_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal - - network.outpoing.packets - network.outgoing.bytes.rate_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal - - network.outgoing.bytes.rate disk.device.read.bytes_FSB1: - FSB1 - disk.device.read.bytes @@ -452,6 +461,12 @@ topology_template: disk.usage_FSB1: - FSB1 - disk.usage + binding_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 + - binding + binding_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 + - binding network.outpoing.packets_FSB1_FSB1_OAM: - FSB1_FSB1_OAM - network.outpoing.packets @@ -470,30 +485,15 @@ topology_template: disk.write.requests_FSB1: - FSB1 - disk.write.requests - network.outgoing.bytes_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal + network.outgoing.bytes_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 - network.outgoing.bytes - network.incoming.bytes_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal - - network.incoming.bytes - network.outpoing.packets_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal - - network.outpoing.packets disk.device.write.bytes.rate_FSB1: - FSB1 - disk.device.write.bytes.rate - network.outgoing.bytes.rate_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal - - network.outgoing.bytes.rate endpoint_FSB1: - FSB1 - endpoint - network.outgoing.packets.rate_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal - - network.outgoing.packets.rate - network.incoming.bytes.rate_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal - - network.incoming.bytes.rate disk.latency_FSB1: - FSB1 - disk.latency @@ -503,21 +503,21 @@ topology_template: disk.read.requests_FSB1: - FSB1 - disk.read.requests + network.incoming.packets.rate_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 + - network.incoming.packets.rate disk.device.write.requests_FSB1: - FSB1 - disk.device.write.requests - network.incoming.bytes.rate_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal - - network.incoming.bytes.rate - network.incoming.bytes_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal - - network.incoming.bytes + network.incoming.packets.rate_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 + - network.incoming.packets.rate disk.iops_FSB1: - FSB1 - disk.iops - network.outgoing.packets.rate_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal - - network.outgoing.packets.rate + network.outgoing.bytes_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 + - network.outgoing.bytes disk.device.iops_FSB1: - FSB1 - disk.device.iops @@ -528,21 +528,21 @@ topology_template: dependency_FSB1_FSB1_OAM: - FSB1_FSB1_OAM - dependency + dependency_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 + - dependency dependency_FSB1: - FSB1 - dependency - link_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal - - link - dependency_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal + dependency_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 - dependency - link_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal - - link local_storage_FSB1: - FSB1 - local_storage - dependency_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal - - dependency + link_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 + - link + link_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 + - link diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/consolidation/in/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/consolidation/in/MainServiceTemplate.yaml index f7c9292c6a..8ccf596a8a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/consolidation/in/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/consolidation/in/MainServiceTemplate.yaml @@ -106,7 +106,7 @@ topology_template: type: string description: prop node_templates: - FSB2_Internal_2: + FSB_1_Internal_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: network: Internal2-net @@ -115,7 +115,7 @@ topology_template: capability: tosca.capabilities.network.Bindable node: FSB1_template relationship: tosca.relationships.network.BindsTo - FSB2_Internal_1: + FSB_2_Internal_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_address: @@ -125,7 +125,7 @@ topology_template: capability: tosca.capabilities.network.Bindable node: FSB2_template relationship: tosca.relationships.network.BindsTo - FSB1_Internal_1: + FSB_1_Internal_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_address: @@ -140,7 +140,7 @@ topology_template: capability: tosca.capabilities.network.Linkable node: jsa_net1 relationship: tosca.relationships.network.LinksTo - FSB1_Internal_2: + FSB_2_Internal_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_address: @@ -161,7 +161,7 @@ topology_template: shared: true network_name: get_attribute: - - FSB1_Internal_1 + - FSB_1_Internal_port_1 - network_id dhcp_agent_ids: get_attribute: @@ -169,11 +169,11 @@ topology_template: - addresses tenant_id: get_attribute: - - FSB2_Internal_2 + - FSB_1_Internal_port_0 - network_id qos_policy: get_attribute: - - FSB2_Internal_2 + - FSB_1_Internal_port_0 - network_id FSB1_template: type: org.openecomp.resource.vfc.nodes.heat.FSB1 @@ -258,8 +258,8 @@ topology_template: cmaui_volume1: type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume properties: - volume_type: {get_attribute: [ FSB1_template, addresses, {get_attribute: [ FSB2_Internal_2,tenant_id ] } ]} - size: { get_attribute: [FSB1_Internal_1, device_owner, get_input: [CMAUI_volume_type,{get_attribute: [FSB1_Internal_2,status ] }], 0, "OS-EXT-IPS-MAC:mac_addr"] } + volume_type: {get_attribute: [ FSB1_template, addresses, {get_attribute: [ FSB_1_Internal_port_0,tenant_id ] } ]} + size: { get_attribute: [FSB_1_Internal_port_1, device_owner, get_input: [CMAUI_volume_type,{get_attribute: [FSB_2_Internal_port_1,status ] }], 0, "OS-EXT-IPS-MAC:mac_addr"] } cmaui_volume2: type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume properties: @@ -269,8 +269,8 @@ topology_template: cmaui_volume3: type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume properties: - volume_type: {get_attribute: [ FSB2_template, addresses, {get_attribute: [ FSB2_Internal_1,tenant_id ] } ]} - size: { get_attribute: [FSB1_Internal_2, device_owner, get_input: [CMAUI_volume_type,{get_attribute: [FSB2_template,status ] }], 0, "OS-EXT-IPS-MAC:mac_addr"] } + volume_type: {get_attribute: [ FSB2_template, addresses, {get_attribute: [ FSB_2_Internal_port_0,tenant_id ] } ]} + size: { get_attribute: [FSB_2_Internal_port_1, device_owner, get_input: [CMAUI_volume_type,{get_attribute: [FSB2_template,status ] }], 0, "OS-EXT-IPS-MAC:mac_addr"] } groups: ep-jsa_net_group: type: org.openecomp.groups.heat.HeatStack @@ -279,9 +279,9 @@ topology_template: description: | Version 2.0 02-09-2016 (Authors: John Doe, user PROD) members: - - FSB2_Internal_2 - - FSB2_Internal_1 - - FSB1_Internal_1 - - FSB1_Internal_2 + - FSB_1_Internal_port_0 + - FSB_2_Internal_port_0 + - FSB_1_Internal_port_1 + - FSB_2_Internal_port_1 - FSB1_template - FSB2_template \ 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/creSubstitutionServiceTemplate/WithOutputParameters/consolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/consolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml index 316771995c..65fe7d2736 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/consolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/consolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,24 +8,14 @@ node_types: org.openecomp.resource.abstract.nodes.FSB1: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_FSB1_Internal_mac_address: - type: string - required: true - status: SUPPORTED - port_FSB1_Internal_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_FSB2_Internal_related_networks: + port_FSB_Internal_port_1_related_networks: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_FSB1_Internal_subnetpoolid: - type: string + port_FSB_Internal_port_1_order: + type: integer required: true status: SUPPORTED compute_FSB1_metadata: @@ -34,65 +24,61 @@ node_types: status: SUPPORTED entry_schema: type: json - port_FSB2_Internal_vlan_requirements: - type: list + port_FSB_Internal_port_1_network_role: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_FSB2_Internal_order: - type: integer + port_FSB_Internal_port_0_network_role: + type: string required: true status: SUPPORTED - port_FSB2_Internal_ip_requirements: + port_FSB_Internal_port_0_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - vm_flavor_name: + type: string + port_FSB_Internal_port_1_network_role_tag: type: string required: true status: SUPPORTED - port_FSB2_Internal_network_role: + port_FSB_Internal_port_0_mac_address: type: string required: true status: SUPPORTED - port_FSB1_Internal_related_networks: + port_FSB_Internal_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_FSB1_Internal_network_role_tag: + type: org.openecomp.datatypes.network.VlanRequirements + vm_flavor_name: type: string required: true status: SUPPORTED - port_FSB1_Internal_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_FSB2_Internal_subnetpoolid: + port_FSB_Internal_port_1_mac_address: type: string required: true status: SUPPORTED - port_FSB1_Internal_exCP_naming: - type: org.openecomp.datatypes.Naming + port_FSB_Internal_port_0_related_networks: + type: list required: true status: SUPPORTED - port_FSB1_Internal_network_role: - type: string + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_FSB_Internal_port_0_ip_requirements: + type: list required: true status: SUPPORTED - compute_FSB1_availability_zone: + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_FSB_Internal_port_1_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_FSB1_Internal_network: + type: org.openecomp.datatypes.network.VlanRequirements + compute_FSB1_availability_zone: type: list required: true status: SUPPORTED @@ -106,47 +92,61 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_FSB2_Internal_mac_requirements: + port_FSB_Internal_port_0_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_FSB2_Internal_mac_address: - type: string + port_FSB_Internal_port_0_order: + type: integer required: true status: SUPPORTED - port_FSB2_Internal_exCP_naming: + port_FSB_Internal_port_1_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_FSB_Internal_port_0_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_FSB1_Internal_order: - type: integer + port_FSB_Internal_port_0_network_role_tag: + type: string required: true status: SUPPORTED - port_FSB2_Internal_network: + compute_FSB1_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_FSB1_Internal_mac_requirements: + port_FSB_Internal_port_1_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - compute_FSB1_name: + port_FSB_Internal_port_0_subnetpoolid: + type: string + required: true + status: SUPPORTED + port_FSB_Internal_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_FSB_Internal_port_1_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_FSB2_Internal_network_role_tag: + port_FSB_Internal_port_1_subnetpoolid: type: string required: true status: SUPPORTED attributes: - FSB1_FSB2_Internal_tenant_id: + FSB1_FSB_1_Internal_port_1_network_id: type: string status: SUPPORTED - FSB1_FSB1_Internal_network_id: + FSB1_FSB_1_Internal_port_1_device_owner: type: string status: SUPPORTED FSB1_user_data_format: @@ -160,37 +160,28 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.heat.novaServer.network.AddressInfo - FSB1_FSB2_Internal_network_id: - type: string - status: SUPPORTED - FSB1_FSB1_Internal_status: - type: string - status: SUPPORTED - FSB1_FSB1_Internal_device_owner: - type: string - status: SUPPORTED requirements: - - dependency_FSB1_FSB1_Internal: + - dependency_FSB1_FSB_1_Internal_port_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_FSB1_FSB1_Internal: + - link_FSB1_FSB_1_Internal_port_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_FSB1_FSB2_Internal: + - dependency_FSB1_FSB_1_Internal_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_FSB1_FSB2_Internal: + - link_FSB1_FSB_1_Internal_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -211,13 +202,29 @@ node_types: - 0 - UNBOUNDED capabilities: - binding_FSB1_FSB2_Internal: - 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 + network.outgoing.packets.rate_FSB1_FSB_1_Internal_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - - 0 + - 1 + - UNBOUNDED + network.outgoing.packets.rate_FSB1_FSB_1_Internal_port_1: + 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_FSB1_FSB_1_Internal_port_1: + 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_FSB1_FSB_1_Internal_port_0: + 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_FSB1: type: org.openecomp.capabilities.metric.Ceilometer @@ -231,6 +238,16 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_FSB1_FSB_1_Internal_port_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + forwarder_FSB1_FSB_1_Internal_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.latency_FSB1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -273,112 +290,94 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_FSB1_FSB2_Internal: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED feature_FSB1: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_FSB1_FSB1_Internal: + memory.resident_FSB1: 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_FSB1_FSB1_Internal: + cpu_FSB1: 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_FSB1_FSB2_Internal: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - attachment_FSB1_FSB2_Internal: - type: tosca.capabilities.Attachment + disk.write.requests.rate_FSB1: + 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_FSB1_FSB2_Internal: + instance_FSB1: 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_FSB1: + disk.device.read.bytes.rate_FSB1: 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_FSB1_FSB1_Internal: - type: org.openecomp.capabilities.Forwarder + cpu.delta_FSB1: + 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_FSB1_FSB2_Internal: + disk.write.bytes_FSB1: 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_FSB1: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_FSB1_FSB_1_Internal_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - disk.write.requests.rate_FSB1: + network.incoming.bytes.rate_FSB1_FSB_1_Internal_port_0: 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 - instance_FSB1: + disk.device.read.requests.rate_FSB1: 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_FSB1: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_FSB1_FSB_1_Internal_port_1: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - cpu.delta_FSB1: + network.incoming.bytes.rate_FSB1_FSB_1_Internal_port_1: 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_FSB1: + network.outgoing.bytes.rate_FSB1_FSB_1_Internal_port_0: 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_FSB1_FSB1_Internal: - 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 - disk.device.read.requests.rate_FSB1: + network.outgoing.bytes.rate_FSB1_FSB_1_Internal_port_1: 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_FSB1_FSB1_Internal: + feature_FSB1_FSB_1_Internal_port_0: type: tosca.capabilities.Node occurrences: - 1 @@ -389,6 +388,11 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_FSB1_FSB_1_Internal_port_1: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.ephemeral.size_FSB1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -406,30 +410,31 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_FSB1_FSB1_Internal: + network.incoming.bytes_FSB1_FSB_1_Internal_port_0: 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 - attachment_FSB1_FSB1_Internal: - type: tosca.capabilities.Attachment + network.incoming.bytes_FSB1_FSB_1_Internal_port_1: + 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_FSB1: + network.incoming.packets_FSB1_FSB_1_Internal_port_1: 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_FSB1_FSB1_Internal: + network.incoming.packets_FSB1_FSB_1_Internal_port_0: 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_FSB1_FSB2_Internal: + memory_FSB1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -464,6 +469,22 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_FSB1_FSB_1_Internal_port_1: + 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 + binding_FSB1_FSB_1_Internal_port_0: + 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 host_FSB1: type: tosca.capabilities.Container valid_source_types: @@ -494,19 +515,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_FSB1_FSB2_Internal: - 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_FSB1_FSB1_Internal: - 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_FSB1_FSB2_Internal: + network.outgoing.bytes_FSB1_FSB_1_Internal_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -518,29 +527,11 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_FSB1_FSB1_Internal: - 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_FSB1: type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_FSB1_FSB1_Internal: - 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_FSB1_FSB1_Internal: - 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_FSB1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -559,19 +550,19 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.write.requests_FSB1: + network.incoming.packets.rate_FSB1_FSB_1_Internal_port_1: 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_FSB1_FSB2_Internal: + disk.device.write.requests_FSB1: 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_FSB1_FSB2_Internal: + network.incoming.packets.rate_FSB1_FSB_1_Internal_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -583,7 +574,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_FSB1_FSB2_Internal: + network.outgoing.bytes_FSB1_FSB_1_Internal_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/consolidation/out/SubstitutionServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/consolidation/out/SubstitutionServiceTemplate.yaml index aa9a7167f6..83b377cf40 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/consolidation/out/SubstitutionServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/consolidation/out/SubstitutionServiceTemplate.yaml @@ -11,74 +11,63 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_FSB1_Internal_mac_address: - type: string - required: true - port_FSB1_Internal_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_FSB2_Internal_related_networks: + port_FSB_Internal_port_1_related_networks: type: list required: true entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_FSB1_Internal_subnetpoolid: - type: string + port_FSB_Internal_port_1_order: + type: integer required: true compute_FSB1_metadata: type: list required: true entry_schema: type: json - port_FSB2_Internal_vlan_requirements: + port_FSB_Internal_port_1_network_role: + type: string + required: true + port_FSB_Internal_port_0_network_role: + type: string + required: true + port_FSB_Internal_port_0_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_FSB2_Internal_order: - type: integer + type: string + port_FSB_Internal_port_1_network_role_tag: + type: string + required: true + port_FSB_Internal_port_0_mac_address: + type: string required: true - port_FSB2_Internal_ip_requirements: + port_FSB_Internal_port_0_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: org.openecomp.datatypes.network.VlanRequirements vm_flavor_name: type: string required: true - port_FSB2_Internal_network_role: + port_FSB_Internal_port_1_mac_address: type: string required: true - port_FSB1_Internal_related_networks: + port_FSB_Internal_port_0_related_networks: type: list required: true entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_FSB1_Internal_network_role_tag: - type: string - required: true - port_FSB1_Internal_vlan_requirements: + port_FSB_Internal_port_0_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_FSB2_Internal_subnetpoolid: - type: string - required: true - port_FSB1_Internal_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_FSB1_Internal_network_role: - type: string - required: true - compute_FSB1_availability_zone: + type: org.openecomp.datatypes.network.IpRequirements + port_FSB_Internal_port_1_vlan_requirements: type: list required: true entry_schema: - type: string - port_FSB1_Internal_network: + type: org.openecomp.datatypes.network.VlanRequirements + compute_FSB1_availability_zone: type: list required: true entry_schema: @@ -90,95 +79,106 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_FSB2_Internal_mac_requirements: + port_FSB_Internal_port_0_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true - port_FSB2_Internal_mac_address: - type: string + port_FSB_Internal_port_0_order: + type: integer + required: true + port_FSB_Internal_port_1_ip_requirements: + type: list required: true - port_FSB2_Internal_exCP_naming: + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_FSB_Internal_port_0_exCP_naming: type: org.openecomp.datatypes.Naming required: true - port_FSB1_Internal_order: - type: integer + port_FSB_Internal_port_0_network_role_tag: + type: string required: true - port_FSB2_Internal_network: + compute_FSB1_name: type: list required: true entry_schema: type: string - port_FSB1_Internal_mac_requirements: + port_FSB_Internal_port_1_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true - compute_FSB1_name: + port_FSB_Internal_port_0_subnetpoolid: + type: string + required: true + port_FSB_Internal_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_FSB_Internal_port_1_network: type: list required: true entry_schema: type: string - port_FSB2_Internal_network_role_tag: + port_FSB_Internal_port_1_subnetpoolid: type: string required: true node_templates: - FSB1_FSB1_Internal: + FSB1_FSB_1_Internal_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_requirements: - get_input: port_FSB1_Internal_mac_requirements + get_input: port_FSB_Internal_port_1_mac_requirements order: - get_input: port_FSB1_Internal_order + get_input: port_FSB_Internal_port_1_order mac_address: - get_input: port_FSB1_Internal_mac_address + get_input: port_FSB_Internal_port_1_mac_address exCP_naming: - get_input: port_FSB1_Internal_exCP_naming + get_input: port_FSB_Internal_port_1_exCP_naming vlan_requirements: - get_input: port_FSB1_Internal_vlan_requirements + get_input: port_FSB_Internal_port_1_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_FSB1_Internal_ip_requirements + get_input: port_FSB_Internal_port_1_ip_requirements related_networks: - get_input: port_FSB1_Internal_related_networks + get_input: port_FSB_Internal_port_1_related_networks network_role_tag: - get_input: port_FSB1_Internal_network_role_tag + get_input: port_FSB_Internal_port_1_network_role_tag network_role: - get_input: port_FSB1_Internal_network_role + get_input: port_FSB_Internal_port_1_network_role subnetpoolid: - get_input: port_FSB1_Internal_subnetpoolid + get_input: port_FSB_Internal_port_1_subnetpoolid network: get_input: - - port_FSB1_Internal_network + - port_FSB_Internal_port_1_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: FSB1 relationship: tosca.relationships.network.BindsTo - FSB1_FSB2_Internal: + FSB1_FSB_1_Internal_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_requirements: - get_input: port_FSB2_Internal_mac_requirements + get_input: port_FSB_Internal_port_0_mac_requirements order: - get_input: port_FSB2_Internal_order + get_input: port_FSB_Internal_port_0_order mac_address: - get_input: port_FSB2_Internal_mac_address + get_input: port_FSB_Internal_port_0_mac_address exCP_naming: - get_input: port_FSB2_Internal_exCP_naming + get_input: port_FSB_Internal_port_0_exCP_naming vlan_requirements: - get_input: port_FSB2_Internal_vlan_requirements + get_input: port_FSB_Internal_port_0_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_FSB2_Internal_ip_requirements + get_input: port_FSB_Internal_port_0_ip_requirements related_networks: - get_input: port_FSB2_Internal_related_networks + get_input: port_FSB_Internal_port_0_related_networks network_role_tag: - get_input: port_FSB2_Internal_network_role_tag + get_input: port_FSB_Internal_port_0_network_role_tag network_role: - get_input: port_FSB2_Internal_network_role + get_input: port_FSB_Internal_port_0_network_role subnetpoolid: - get_input: port_FSB2_Internal_subnetpoolid + get_input: port_FSB_Internal_port_0_subnetpoolid network: get_input: - - port_FSB2_Internal_network + - port_FSB_Internal_port_0_network - index_value requirements: - binding: @@ -210,18 +210,18 @@ topology_template: type: tosca.artifacts.Deployment file: ../Artifacts/nimbus-ethernet outputs: - FSB1_FSB2_Internal_tenant_id: + FSB1_FSB_1_Internal_port_1_network_id: type: string value: get_attribute: - - FSB1_FSB2_Internal - - tenant_id - FSB1_FSB1_Internal_network_id: + - FSB1_FSB_1_Internal_port_1 + - network_id + FSB1_FSB_1_Internal_port_1_device_owner: type: string value: get_attribute: - - FSB1_FSB1_Internal - - network_id + - FSB1_FSB_1_Internal_port_1 + - device_owner FSB1_user_data_format: type: string value: @@ -242,36 +242,33 @@ topology_template: - addresses entry_schema: type: org.openecomp.datatypes.heat.novaServer.network.AddressInfo - FSB1_FSB2_Internal_network_id: - type: string - value: - get_attribute: - - FSB1_FSB2_Internal - - network_id - FSB1_FSB1_Internal_status: - type: string - value: - get_attribute: - - FSB1_FSB1_Internal - - status - FSB1_FSB1_Internal_device_owner: - type: string - value: - get_attribute: - - FSB1_FSB1_Internal - - device_owner substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.FSB1 capabilities: - binding_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal - - binding + network.outgoing.packets.rate_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 + - network.outgoing.packets.rate + network.outgoing.packets.rate_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 + - network.outgoing.packets.rate + network.outpoing.packets_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 + - network.outpoing.packets + network.outpoing.packets_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 + - network.outpoing.packets disk.capacity_FSB1: - FSB1 - disk.capacity disk.read.bytes.rate_FSB1: - FSB1 - disk.read.bytes.rate + forwarder_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 + - forwarder + forwarder_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 + - forwarder disk.device.latency_FSB1: - FSB1 - disk.device.latency @@ -293,36 +290,12 @@ topology_template: disk.root.size_FSB1: - FSB1 - disk.root.size - forwarder_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal - - forwarder feature_FSB1: - FSB1 - feature - network.incoming.packets.rate_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal - - network.incoming.packets.rate - network.outgoing.bytes_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal - - network.outgoing.bytes - feature_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal - - feature - attachment_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal - - attachment - network.incoming.packets_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal - - network.incoming.packets memory.resident_FSB1: - FSB1 - memory.resident - forwarder_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal - - forwarder - network.incoming.packets.rate_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal - - network.incoming.packets.rate cpu_FSB1: - FSB1 - cpu @@ -341,18 +314,36 @@ topology_template: disk.write.bytes_FSB1: - FSB1 - disk.write.bytes - binding_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal - - binding + attachment_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 + - attachment + network.incoming.bytes.rate_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 + - network.incoming.bytes.rate disk.device.read.requests.rate_FSB1: - FSB1 - disk.device.read.requests.rate - feature_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal + attachment_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 + - attachment + network.incoming.bytes.rate_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 + - network.incoming.bytes.rate + network.outgoing.bytes.rate_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 + - network.outgoing.bytes.rate + network.outgoing.bytes.rate_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 + - network.outgoing.bytes.rate + feature_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 - feature disk.device.read.requests_FSB1: - FSB1 - disk.device.read.requests + feature_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 + - feature disk.ephemeral.size_FSB1: - FSB1 - disk.ephemeral.size @@ -362,21 +353,21 @@ topology_template: disk.device.write.bytes_FSB1: - FSB1 - disk.device.write.bytes - network.incoming.packets_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal + network.incoming.bytes_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 + - network.incoming.bytes + network.incoming.bytes_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 + - network.incoming.bytes + network.incoming.packets_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 + - network.incoming.packets + network.incoming.packets_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 - network.incoming.packets - attachment_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal - - attachment memory_FSB1: - FSB1 - memory - network.outpoing.packets_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal - - network.outpoing.packets - network.outgoing.bytes.rate_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal - - network.outgoing.bytes.rate disk.device.read.bytes_FSB1: - FSB1 - disk.device.read.bytes @@ -392,6 +383,12 @@ topology_template: disk.usage_FSB1: - FSB1 - disk.usage + binding_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 + - binding + binding_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 + - binding host_FSB1: - FSB1 - host @@ -407,30 +404,15 @@ topology_template: disk.write.requests_FSB1: - FSB1 - disk.write.requests - network.outgoing.bytes_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal + network.outgoing.bytes_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 - network.outgoing.bytes - network.incoming.bytes_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal - - network.incoming.bytes - network.outpoing.packets_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal - - network.outpoing.packets disk.device.write.bytes.rate_FSB1: - FSB1 - disk.device.write.bytes.rate - network.outgoing.bytes.rate_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal - - network.outgoing.bytes.rate endpoint_FSB1: - FSB1 - endpoint - network.outgoing.packets.rate_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal - - network.outgoing.packets.rate - network.incoming.bytes.rate_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal - - network.incoming.bytes.rate disk.latency_FSB1: - FSB1 - disk.latency @@ -440,40 +422,40 @@ topology_template: disk.read.requests_FSB1: - FSB1 - disk.read.requests + network.incoming.packets.rate_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 + - network.incoming.packets.rate disk.device.write.requests_FSB1: - FSB1 - disk.device.write.requests - network.incoming.bytes.rate_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal - - network.incoming.bytes.rate - network.incoming.bytes_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal - - network.incoming.bytes + network.incoming.packets.rate_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 + - network.incoming.packets.rate disk.iops_FSB1: - FSB1 - disk.iops - network.outgoing.packets.rate_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal - - network.outgoing.packets.rate + network.outgoing.bytes_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 + - network.outgoing.bytes disk.device.iops_FSB1: - FSB1 - disk.device.iops requirements: + dependency_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 + - dependency dependency_FSB1: - FSB1 - dependency - link_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal - - link - dependency_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal + dependency_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 - dependency - link_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal - - link local_storage_FSB1: - FSB1 - local_storage - dependency_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal - - dependency + link_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 + - link + link_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 + - link diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml index a6fed8e0de..c746391eb3 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,23 +8,17 @@ node_types: org.openecomp.resource.abstract.nodes.FSB1: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_FSB1_Internal_mac_address: - type: string - required: true - status: SUPPORTED - port_FSB1_Internal_ip_requirements: + port_FSB1_Internal_1_ip_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_FSB2_Internal_related_networks: - type: list + port_FSB2_Internal_2_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_FSB1_Internal_subnetpoolid: + port_FSB2_Internal_2_subnetpoolid: type: string required: true status: SUPPORTED @@ -38,16 +32,6 @@ node_types: status: SUPPORTED entry_schema: type: json - port_FSB2_Internal_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_FSB2_Internal_order: - type: integer - required: true - status: SUPPORTED port_FSB1_OAM_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -58,65 +42,63 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_FSB2_Internal_ip_requirements: - type: list + port_FSB2_Internal_2_order: + type: integer required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements vm_flavor_name: type: string required: true status: SUPPORTED - port_FSB2_Internal_network_role: + port_FSB1_Internal_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_FSB2_Internal_2_mac_address: type: string required: true status: SUPPORTED - port_FSB1_Internal_related_networks: + port_FSB2_Internal_2_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_FSB1_Internal_network_role_tag: - type: string - required: true - status: SUPPORTED + type: org.openecomp.datatypes.network.VlanRequirements port_FSB1_OAM_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_FSB1_Internal_vlan_requirements: + port_FSB1_OAM_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_FSB1_Internal_1_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_FSB2_Internal_subnetpoolid: - type: string - required: true - status: SUPPORTED - port_FSB1_Internal_exCP_naming: + port_FSB1_Internal_1_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_FSB1_Internal_network_role: + port_FSB1_Internal_1_network_role: type: string required: true status: SUPPORTED - port_FSB1_OAM_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - compute_FSB1_availability_zone: + port_FSB1_Internal_1_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: string - port_FSB1_Internal_network: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_FSB1_Internal_1_network_role_tag: + type: string + required: true + status: SUPPORTED + compute_FSB1_availability_zone: type: list required: true status: SUPPORTED @@ -130,15 +112,17 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_FSB1_OAM_order: - type: integer + port_FSB2_Internal_2_ip_requirements: + type: list required: true status: SUPPORTED - port_FSB2_Internal_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_FSB1_OAM_order: + type: integer required: true status: SUPPORTED - port_FSB2_Internal_mac_address: + port_FSB1_Internal_1_mac_address: type: string required: true status: SUPPORTED @@ -148,24 +132,40 @@ node_types: status: SUPPORTED entry_schema: type: string - port_FSB2_Internal_exCP_naming: - type: org.openecomp.datatypes.Naming + port_FSB2_Internal_2_related_networks: + type: list required: true status: SUPPORTED - port_FSB1_Internal_order: + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_FSB1_Internal_1_network: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_FSB2_Internal_2_network: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_FSB2_Internal_2_network_role: + type: string + required: true + status: SUPPORTED + port_FSB1_Internal_1_order: type: integer required: true status: SUPPORTED - port_FSB1_OAM_network_role: + port_FSB1_Internal_1_subnetpoolid: type: string required: true status: SUPPORTED - port_FSB2_Internal_network: - type: list + port_FSB1_OAM_network_role: + type: string required: true status: SUPPORTED - entry_schema: - type: string port_FSB1_OAM_related_networks: type: list required: true @@ -176,10 +176,6 @@ node_types: type: string required: true status: SUPPORTED - port_FSB1_Internal_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED compute_FSB1_name: type: list required: true @@ -192,17 +188,15 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_FSB2_Internal_network_role_tag: + port_FSB2_Internal_2_network_role_tag: type: string required: true status: SUPPORTED - attributes: - FSB1_FSB2_Internal_tenant_id: - type: string - status: SUPPORTED - FSB1_FSB1_Internal_network_id: - type: string + port_FSB2_Internal_2_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true status: SUPPORTED + attributes: FSB1_accessIPv6: type: string status: SUPPORTED @@ -214,34 +208,28 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.heat.novaServer.network.AddressInfo - FSB1_FSB2_Internal_network_id: - type: string - status: SUPPORTED - FSB1_FSB1_Internal_device_owner: - type: string - status: SUPPORTED requirements: - - dependency_FSB1_FSB1_Internal: + - dependency_FSB1_FSB2_Internal_2: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_FSB1_FSB1_Internal: + - link_FSB1_FSB2_Internal_2: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_FSB1_FSB2_Internal: + - dependency_FSB1_FSB1_Internal_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_FSB1_FSB2_Internal: + - link_FSB1_FSB1_Internal_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -287,14 +275,6 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_FSB1_FSB2_Internal: - 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 disk.capacity_FSB1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -313,6 +293,20 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_FSB1_FSB2_Internal_2: + 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 + network.incoming.bytes_FSB1_FSB1_Internal_1: + 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.allocation_FSB1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -343,51 +337,42 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_FSB1_FSB1_OAM: + network.outgoing.bytes_FSB1_FSB1_Internal_1: 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_FSB1: + network.outgoing.bytes.rate_FSB1_FSB1_OAM: 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_FSB1_FSB2_Internal: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - feature_FSB1: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - network.incoming.packets.rate_FSB1_FSB1_Internal: + disk.root.size_FSB1: 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_FSB1_FSB1_Internal: + network.incoming.packets.rate_FSB1_FSB2_Internal_2: 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_FSB1_FSB2_Internal: + feature_FSB1: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - attachment_FSB1_FSB2_Internal: - type: tosca.capabilities.Attachment + network.incoming.bytes.rate_FSB1_FSB1_Internal_1: + 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_FSB1_FSB2_Internal: + network.incoming.packets_FSB1_FSB2_Internal_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -410,17 +395,6 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_FSB1_FSB1_Internal: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - network.incoming.packets.rate_FSB1_FSB2_Internal: - 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_FSB1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -450,34 +424,39 @@ node_types: occurrences: - 1 - UNBOUNDED - cpu.delta_FSB1: + network.outpoing.packets_FSB1_FSB2_Internal_2: 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_FSB1: + network.outgoing.bytes.rate_FSB1_FSB2_Internal_2: 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_FSB1_FSB1_Internal: - 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 + network.outgoing.bytes_FSB1_FSB2_Internal_2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - - 0 + - 1 - UNBOUNDED - disk.device.read.requests.rate_FSB1: + cpu.delta_FSB1: 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_FSB1_FSB1_Internal: - type: tosca.capabilities.Node + disk.write.bytes_FSB1: + 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_FSB1: + 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 @@ -504,6 +483,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.packets.rate_FSB1_FSB2_Internal_2: + 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.packets.rate_FSB1_FSB1_OAM: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -518,19 +503,25 @@ node_types: occurrences: - 0 - UNBOUNDED + network.outpoing.packets_FSB1_FSB1_Internal_1: + 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 attachment_FSB1_FSB1_OAM: type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - network.incoming.packets_FSB1_FSB1_Internal: + network.incoming.packets.rate_FSB1_FSB1_Internal_1: 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 - attachment_FSB1_FSB1_Internal: - type: tosca.capabilities.Attachment + feature_FSB1_FSB1_Internal_1: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -552,25 +543,24 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_FSB1_FSB1_Internal: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_FSB1_FSB1_Internal_1: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_FSB1_FSB2_Internal: + disk.device.read.bytes_FSB1: 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_FSB1: + disk.device.usage_FSB1: 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_FSB1: + network.incoming.packets_FSB1_FSB1_Internal_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -593,67 +583,66 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_FSB1_FSB1_OAM: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_FSB1_FSB1_Internal_1: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - host_FSB1: - type: tosca.capabilities.Container - valid_source_types: - - tosca.nodes.SoftwareComponent + network.outpoing.packets_FSB1_FSB1_OAM: + 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_FSB1: + network.outgoing.packets.rate_FSB1_FSB1_Internal_1: 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_FSB1: - type: tosca.capabilities.OperatingSystem + network.incoming.bytes_FSB1_FSB2_Internal_2: + 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_FSB1: + network.outgoing.bytes.rate_FSB1_FSB1_Internal_1: 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_FSB1: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + host_FSB1: + type: tosca.capabilities.Container + valid_source_types: + - tosca.nodes.SoftwareComponent occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_FSB1_FSB2_Internal: + disk.device.allocation_FSB1: 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_FSB1_FSB1_Internal: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + os_FSB1: + type: tosca.capabilities.OperatingSystem occurrences: - 1 - UNBOUNDED - network.outpoing.packets_FSB1_FSB2_Internal: + vcpus_FSB1: 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_FSB1: + disk.write.requests_FSB1: 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_FSB1_FSB1_Internal: + disk.device.write.bytes.rate_FSB1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -664,27 +653,26 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_FSB1_FSB1_Internal: + network.incoming.bytes.rate_FSB1_FSB2_Internal_2: 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_FSB1_FSB1_Internal: + disk.latency_FSB1: 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_FSB1: + memory.usage_FSB1: 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_FSB1: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_FSB1_FSB2_Internal_2: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -694,31 +682,31 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.write.requests_FSB1: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_FSB1_FSB1_Internal_1: + 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: - - 1 + - 0 - UNBOUNDED - network.incoming.bytes.rate_FSB1_FSB2_Internal: + disk.device.write.requests_FSB1: 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_FSB1_FSB2_Internal: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_FSB1_FSB2_Internal_2: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - disk.iops_FSB1: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_FSB1_FSB2_Internal_2: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_FSB1_FSB2_Internal: + disk.iops_FSB1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/out/SubstitutionServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/out/SubstitutionServiceTemplate.yaml index d8e84c2056..3e537aff10 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/out/SubstitutionServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/out/SubstitutionServiceTemplate.yaml @@ -11,20 +11,15 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_FSB1_Internal_mac_address: - type: string - required: true - port_FSB1_Internal_ip_requirements: + port_FSB1_Internal_1_ip_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_FSB2_Internal_related_networks: - type: list + port_FSB2_Internal_2_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_FSB1_Internal_subnetpoolid: + port_FSB2_Internal_2_subnetpoolid: type: string required: true port_FSB1_OAM_subnetpoolid: @@ -35,14 +30,6 @@ topology_template: required: true entry_schema: type: json - port_FSB2_Internal_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_FSB2_Internal_order: - type: integer - required: true port_FSB1_OAM_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -51,53 +38,51 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_FSB2_Internal_ip_requirements: - type: list + port_FSB2_Internal_2_order: + type: integer required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements vm_flavor_name: type: string required: true - port_FSB2_Internal_network_role: + port_FSB1_Internal_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_FSB2_Internal_2_mac_address: type: string required: true - port_FSB1_Internal_related_networks: + port_FSB2_Internal_2_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_FSB1_Internal_network_role_tag: - type: string - required: true + type: org.openecomp.datatypes.network.VlanRequirements port_FSB1_OAM_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_FSB1_Internal_vlan_requirements: + port_FSB1_OAM_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_FSB1_Internal_1_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_FSB2_Internal_subnetpoolid: - type: string - required: true - port_FSB1_Internal_exCP_naming: + port_FSB1_Internal_1_exCP_naming: type: org.openecomp.datatypes.Naming required: true - port_FSB1_Internal_network_role: + port_FSB1_Internal_1_network_role: type: string required: true - port_FSB1_OAM_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - compute_FSB1_availability_zone: + port_FSB1_Internal_1_related_networks: type: list required: true entry_schema: - type: string - port_FSB1_Internal_network: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_FSB1_Internal_1_network_role_tag: + type: string + required: true + compute_FSB1_availability_zone: type: list required: true entry_schema: @@ -109,13 +94,15 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 + port_FSB2_Internal_2_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements port_FSB1_OAM_order: type: integer required: true - port_FSB2_Internal_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_FSB2_Internal_mac_address: + port_FSB1_Internal_1_mac_address: type: string required: true port_FSB1_OAM_network: @@ -123,20 +110,33 @@ topology_template: required: true entry_schema: type: string - port_FSB2_Internal_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_FSB1_Internal_order: - type: integer + port_FSB2_Internal_2_related_networks: + type: list required: true - port_FSB1_OAM_network_role: - type: string + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_FSB1_Internal_1_network: + type: list required: true - port_FSB2_Internal_network: + entry_schema: + type: string + port_FSB2_Internal_2_network: type: list required: true entry_schema: type: string + port_FSB2_Internal_2_network_role: + type: string + required: true + port_FSB1_Internal_1_order: + type: integer + required: true + port_FSB1_Internal_1_subnetpoolid: + type: string + required: true + port_FSB1_OAM_network_role: + type: string + required: true port_FSB1_OAM_related_networks: type: list required: true @@ -145,9 +145,6 @@ topology_template: port_FSB1_OAM_network_role_tag: type: string required: true - port_FSB1_Internal_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true compute_FSB1_name: type: list required: true @@ -158,70 +155,73 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_FSB2_Internal_network_role_tag: + port_FSB2_Internal_2_network_role_tag: type: string required: true + port_FSB2_Internal_2_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true node_templates: - FSB1_FSB1_Internal: + FSB1_FSB2_Internal_2: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_requirements: - get_input: port_FSB1_Internal_mac_requirements + get_input: port_FSB2_Internal_2_mac_requirements order: - get_input: port_FSB1_Internal_order + get_input: port_FSB2_Internal_2_order mac_address: - get_input: port_FSB1_Internal_mac_address + get_input: port_FSB2_Internal_2_mac_address exCP_naming: - get_input: port_FSB1_Internal_exCP_naming + get_input: port_FSB2_Internal_2_exCP_naming vlan_requirements: - get_input: port_FSB1_Internal_vlan_requirements + get_input: port_FSB2_Internal_2_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_FSB1_Internal_ip_requirements + get_input: port_FSB2_Internal_2_ip_requirements related_networks: - get_input: port_FSB1_Internal_related_networks + get_input: port_FSB2_Internal_2_related_networks network_role_tag: - get_input: port_FSB1_Internal_network_role_tag + get_input: port_FSB2_Internal_2_network_role_tag network_role: - get_input: port_FSB1_Internal_network_role + get_input: port_FSB2_Internal_2_network_role subnetpoolid: - get_input: port_FSB1_Internal_subnetpoolid + get_input: port_FSB2_Internal_2_subnetpoolid network: get_input: - - port_FSB1_Internal_network + - port_FSB2_Internal_2_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: FSB1 relationship: tosca.relationships.network.BindsTo - FSB1_FSB2_Internal: + FSB1_FSB1_Internal_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_requirements: - get_input: port_FSB2_Internal_mac_requirements + get_input: port_FSB1_Internal_1_mac_requirements order: - get_input: port_FSB2_Internal_order + get_input: port_FSB1_Internal_1_order mac_address: - get_input: port_FSB2_Internal_mac_address + get_input: port_FSB1_Internal_1_mac_address exCP_naming: - get_input: port_FSB2_Internal_exCP_naming + get_input: port_FSB1_Internal_1_exCP_naming vlan_requirements: - get_input: port_FSB2_Internal_vlan_requirements + get_input: port_FSB1_Internal_1_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_FSB2_Internal_ip_requirements + get_input: port_FSB1_Internal_1_ip_requirements related_networks: - get_input: port_FSB2_Internal_related_networks + get_input: port_FSB1_Internal_1_related_networks network_role_tag: - get_input: port_FSB2_Internal_network_role_tag + get_input: port_FSB1_Internal_1_network_role_tag network_role: - get_input: port_FSB2_Internal_network_role + get_input: port_FSB1_Internal_1_network_role subnetpoolid: - get_input: port_FSB2_Internal_subnetpoolid + get_input: port_FSB1_Internal_1_subnetpoolid network: get_input: - - port_FSB2_Internal_network + - port_FSB1_Internal_1_network - index_value requirements: - binding: @@ -288,18 +288,6 @@ topology_template: type: tosca.artifacts.Deployment file: ../Artifacts/nimbus-ethernet outputs: - FSB1_FSB2_Internal_tenant_id: - type: string - value: - get_attribute: - - FSB1_FSB2_Internal - - tenant_id - FSB1_FSB1_Internal_network_id: - type: string - value: - get_attribute: - - FSB1_FSB1_Internal - - network_id FSB1_accessIPv6: type: string value: @@ -320,18 +308,6 @@ topology_template: - addresses entry_schema: type: org.openecomp.datatypes.heat.novaServer.network.AddressInfo - FSB1_FSB2_Internal_network_id: - type: string - value: - get_attribute: - - FSB1_FSB2_Internal - - network_id - FSB1_FSB1_Internal_device_owner: - type: string - value: - get_attribute: - - FSB1_FSB1_Internal - - device_owner substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.FSB1 capabilities: @@ -341,9 +317,6 @@ topology_template: network.outgoing.bytes_FSB1_FSB1_OAM: - FSB1_FSB1_OAM - network.outgoing.bytes - binding_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal - - binding disk.capacity_FSB1: - FSB1 - disk.capacity @@ -353,6 +326,12 @@ topology_template: disk.device.latency_FSB1: - FSB1 - disk.device.latency + binding_FSB1_FSB2_Internal_2: + - FSB1_FSB2_Internal_2 + - binding + network.incoming.bytes_FSB1_FSB1_Internal_1: + - FSB1_FSB1_Internal_1 + - network.incoming.bytes disk.allocation_FSB1: - FSB1 - disk.allocation @@ -368,32 +347,26 @@ topology_template: disk.device.write.requests.rate_FSB1: - FSB1 - disk.device.write.requests.rate + network.outgoing.bytes_FSB1_FSB1_Internal_1: + - FSB1_FSB1_Internal_1 + - network.outgoing.bytes network.outgoing.bytes.rate_FSB1_FSB1_OAM: - FSB1_FSB1_OAM - network.outgoing.bytes.rate disk.root.size_FSB1: - FSB1 - disk.root.size - forwarder_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal - - forwarder + network.incoming.packets.rate_FSB1_FSB2_Internal_2: + - FSB1_FSB2_Internal_2 + - network.incoming.packets.rate feature_FSB1: - FSB1 - feature - network.incoming.packets.rate_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal - - network.incoming.packets.rate - network.outgoing.bytes_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal - - network.outgoing.bytes - feature_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal - - feature - attachment_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal - - attachment - network.incoming.packets_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal + network.incoming.bytes.rate_FSB1_FSB1_Internal_1: + - FSB1_FSB1_Internal_1 + - network.incoming.bytes.rate + network.incoming.packets_FSB1_FSB2_Internal_2: + - FSB1_FSB2_Internal_2 - network.incoming.packets forwarder_FSB1_FSB1_OAM: - FSB1_FSB1_OAM @@ -404,12 +377,6 @@ topology_template: network.incoming.packets.rate_FSB1_FSB1_OAM: - FSB1_FSB1_OAM - network.incoming.packets.rate - forwarder_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal - - forwarder - network.incoming.packets.rate_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal - - network.incoming.packets.rate cpu_FSB1: - FSB1 - cpu @@ -425,21 +392,24 @@ topology_template: disk.device.read.bytes.rate_FSB1: - FSB1 - disk.device.read.bytes.rate + network.outpoing.packets_FSB1_FSB2_Internal_2: + - FSB1_FSB2_Internal_2 + - network.outpoing.packets + network.outgoing.bytes.rate_FSB1_FSB2_Internal_2: + - FSB1_FSB2_Internal_2 + - network.outgoing.bytes.rate + network.outgoing.bytes_FSB1_FSB2_Internal_2: + - FSB1_FSB2_Internal_2 + - network.outgoing.bytes cpu.delta_FSB1: - FSB1 - cpu.delta disk.write.bytes_FSB1: - FSB1 - disk.write.bytes - binding_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal - - binding disk.device.read.requests.rate_FSB1: - FSB1 - disk.device.read.requests.rate - feature_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal - - feature disk.device.read.requests_FSB1: - FSB1 - disk.device.read.requests @@ -452,21 +422,27 @@ topology_template: disk.device.write.bytes_FSB1: - FSB1 - disk.device.write.bytes + network.outgoing.packets.rate_FSB1_FSB2_Internal_2: + - FSB1_FSB2_Internal_2 + - network.outgoing.packets.rate network.outgoing.packets.rate_FSB1_FSB1_OAM: - FSB1_FSB1_OAM - network.outgoing.packets.rate binding_FSB1_FSB1_OAM: - FSB1_FSB1_OAM - binding + network.outpoing.packets_FSB1_FSB1_Internal_1: + - FSB1_FSB1_Internal_1 + - network.outpoing.packets attachment_FSB1_FSB1_OAM: - FSB1_FSB1_OAM - attachment - network.incoming.packets_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal - - network.incoming.packets - attachment_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal - - attachment + network.incoming.packets.rate_FSB1_FSB1_Internal_1: + - FSB1_FSB1_Internal_1 + - network.incoming.packets.rate + feature_FSB1_FSB1_Internal_1: + - FSB1_FSB1_Internal_1 + - feature network.incoming.bytes_FSB1_FSB1_OAM: - FSB1_FSB1_OAM - network.incoming.bytes @@ -476,18 +452,18 @@ topology_template: network.incoming.packets_FSB1_FSB1_OAM: - FSB1_FSB1_OAM - network.incoming.packets - network.outpoing.packets_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal - - network.outpoing.packets - network.outgoing.bytes.rate_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal - - network.outgoing.bytes.rate + forwarder_FSB1_FSB1_Internal_1: + - FSB1_FSB1_Internal_1 + - forwarder disk.device.read.bytes_FSB1: - FSB1 - disk.device.read.bytes disk.device.usage_FSB1: - FSB1 - disk.device.usage + network.incoming.packets_FSB1_FSB1_Internal_1: + - FSB1_FSB1_Internal_1 + - network.incoming.packets disk.write.bytes.rate_FSB1: - FSB1 - disk.write.bytes.rate @@ -497,9 +473,21 @@ topology_template: disk.usage_FSB1: - FSB1 - disk.usage + attachment_FSB1_FSB1_Internal_1: + - FSB1_FSB1_Internal_1 + - attachment network.outpoing.packets_FSB1_FSB1_OAM: - FSB1_FSB1_OAM - network.outpoing.packets + network.outgoing.packets.rate_FSB1_FSB1_Internal_1: + - FSB1_FSB1_Internal_1 + - network.outgoing.packets.rate + network.incoming.bytes_FSB1_FSB2_Internal_2: + - FSB1_FSB2_Internal_2 + - network.incoming.bytes + network.outgoing.bytes.rate_FSB1_FSB1_Internal_1: + - FSB1_FSB1_Internal_1 + - network.outgoing.bytes.rate host_FSB1: - FSB1 - host @@ -515,29 +503,14 @@ topology_template: disk.write.requests_FSB1: - FSB1 - disk.write.requests - network.outgoing.bytes_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal - - network.outgoing.bytes - network.incoming.bytes_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal - - network.incoming.bytes - network.outpoing.packets_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal - - network.outpoing.packets disk.device.write.bytes.rate_FSB1: - FSB1 - disk.device.write.bytes.rate - network.outgoing.bytes.rate_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal - - network.outgoing.bytes.rate endpoint_FSB1: - FSB1 - endpoint - network.outgoing.packets.rate_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal - - network.outgoing.packets.rate - network.incoming.bytes.rate_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal + network.incoming.bytes.rate_FSB1_FSB2_Internal_2: + - FSB1_FSB2_Internal_2 - network.incoming.bytes.rate disk.latency_FSB1: - FSB1 @@ -545,28 +518,37 @@ topology_template: memory.usage_FSB1: - FSB1 - memory.usage + feature_FSB1_FSB2_Internal_2: + - FSB1_FSB2_Internal_2 + - feature disk.read.requests_FSB1: - FSB1 - disk.read.requests + binding_FSB1_FSB1_Internal_1: + - FSB1_FSB1_Internal_1 + - binding disk.device.write.requests_FSB1: - FSB1 - disk.device.write.requests - network.incoming.bytes.rate_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal - - network.incoming.bytes.rate - network.incoming.bytes_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal - - network.incoming.bytes + forwarder_FSB1_FSB2_Internal_2: + - FSB1_FSB2_Internal_2 + - forwarder + attachment_FSB1_FSB2_Internal_2: + - FSB1_FSB2_Internal_2 + - attachment disk.iops_FSB1: - FSB1 - disk.iops - network.outgoing.packets.rate_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal - - network.outgoing.packets.rate disk.device.iops_FSB1: - FSB1 - disk.device.iops requirements: + link_FSB1_FSB1_Internal_1: + - FSB1_FSB1_Internal_1 + - link + link_FSB1_FSB2_Internal_2: + - FSB1_FSB2_Internal_2 + - link link_FSB1_FSB1_OAM: - FSB1_FSB1_OAM - link @@ -576,18 +558,12 @@ topology_template: dependency_FSB1: - FSB1 - dependency - link_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal - - link - dependency_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal - - dependency - link_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal - - link local_storage_FSB1: - FSB1 - local_storage - dependency_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal + dependency_FSB1_FSB2_Internal_2: + - FSB1_FSB2_Internal_2 + - dependency + dependency_FSB1_FSB1_Internal_1: + - FSB1_FSB1_Internal_1 - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/in/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/in/MainServiceTemplate.yaml index d8a7a103fd..c99b60175a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/in/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/in/MainServiceTemplate.yaml @@ -106,7 +106,7 @@ topology_template: type: string description: prop node_templates: - FSB2_Internal_2: + FSB_1_Internal_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: network: Internal2-net @@ -116,7 +116,7 @@ topology_template: capability: tosca.capabilities.network.Bindable node: FSB1_template relationship: tosca.relationships.network.BindsTo - FSB2_Internal_1: + FSB_2_Internal_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_address: @@ -126,12 +126,12 @@ topology_template: capability: tosca.capabilities.network.Bindable node: FSB2_template relationship: tosca.relationships.network.BindsTo - FSB1_Internal_1: + FSB_1_Internal_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_address: get_input: fsb1-Internal1-mac - network: {get_attribute: [FSB2_Internal_1, att]} + network: {get_attribute: [FSB_2_Internal_port_0, att]} requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -141,12 +141,12 @@ topology_template: capability: tosca.capabilities.network.Linkable node: jsa_net1 relationship: tosca.relationships.network.LinksTo - FSB1_Internal_2: + FSB_2_Internal_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_address: get_input: fsb1-Internal1-mac - network: {get_attribute: [FSB2_Internal_1, att]} + network: {get_attribute: [FSB_2_Internal_port_0, att]} requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -162,7 +162,7 @@ topology_template: shared: true network_name: get_attribute: - - FSB1_Internal_1 + - FSB_1_Internal_port_1 - network_id dhcp_agent_ids: get_attribute: @@ -170,11 +170,11 @@ topology_template: - addresses tenant_id: get_attribute: - - FSB2_Internal_2 + - FSB_1_Internal_port_0 - network_id qos_policy: get_attribute: - - FSB2_Internal_2 + - FSB_1_Internal_port_0 - network_id FSB1_template: type: org.openecomp.resource.vfc.nodes.heat.FSB1 @@ -239,7 +239,7 @@ topology_template: availability_zone: get_input: fsb_zone name: - get_attribute: [FSB1_Internal_1, name] + get_attribute: [FSB_1_Internal_port_1, name] artifacts: nimbus-ethernet-gw: type: tosca.artifacts.Deployment @@ -259,8 +259,8 @@ topology_template: cmaui_volume1: type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume properties: - volume_type: {get_attribute: [ FSB1_template, addresses, {get_attribute: [ FSB2_Internal_2,tenant_id ] } ]} - size: { get_attribute: [FSB1_Internal_1, device_owner, get_input: [CMAUI_volume_type,{get_attribute: [FSB1_Internal_2,status ] }], 0, "OS-EXT-IPS-MAC:mac_addr"] } + volume_type: {get_attribute: [ FSB1_template, addresses, {get_attribute: [ FSB_1_Internal_port_0,tenant_id ] } ]} + size: { get_attribute: [FSB_1_Internal_port_1, device_owner, get_input: [CMAUI_volume_type,{get_attribute: [FSB_2_Internal_port_1,status ] }], 0, "OS-EXT-IPS-MAC:mac_addr"] } cmaui_volume2: type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume properties: @@ -270,8 +270,8 @@ topology_template: cmaui_volume3: type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume properties: - volume_type: {get_attribute: [ FSB2_template, addresses, {get_attribute: [ FSB2_Internal_1,tenant_id ] } ]} - size: { get_attribute: [FSB1_Internal_2, device_owner, get_input: [CMAUI_volume_type,{get_attribute: [FSB2_template,status ] }], 0, "OS-EXT-IPS-MAC:mac_addr"] } + volume_type: {get_attribute: [ FSB2_template, addresses, {get_attribute: [ FSB_2_Internal_port_0,tenant_id ] } ]} + size: { get_attribute: [FSB_2_Internal_port_1, device_owner, get_input: [CMAUI_volume_type,{get_attribute: [FSB2_template,status ] }], 0, "OS-EXT-IPS-MAC:mac_addr"] } groups: ep-jsa_net_group: type: org.openecomp.groups.heat.HeatStack @@ -280,9 +280,9 @@ topology_template: description: | Version 2.0 02-09-2016 (Authors: John Doe, user PROD) members: - - FSB2_Internal_2 - - FSB2_Internal_1 - - FSB1_Internal_1 - - FSB1_Internal_2 + - FSB_1_Internal_port_0 + - FSB_2_Internal_port_0 + - FSB_1_Internal_port_1 + - FSB_2_Internal_port_1 - FSB1_template - FSB2_template \ 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/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml index f20b53326b..1a7ae59586 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,24 +8,14 @@ node_types: org.openecomp.resource.abstract.nodes.FSB1: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_FSB1_Internal_mac_address: - type: string - required: true - status: SUPPORTED - port_FSB1_Internal_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_FSB2_Internal_related_networks: + port_FSB_Internal_port_1_related_networks: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_FSB1_Internal_subnetpoolid: - type: string + port_FSB_Internal_port_1_order: + type: integer required: true status: SUPPORTED compute_FSB1_metadata: @@ -34,58 +24,60 @@ node_types: status: SUPPORTED entry_schema: type: json - port_FSB2_Internal_vlan_requirements: - type: list + port_FSB_Internal_port_1_network_role: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_FSB2_Internal_order: - type: integer + port_FSB_Internal_port_0_network_role: + type: string required: true status: SUPPORTED - port_FSB2_Internal_ip_requirements: + port_FSB_Internal_port_0_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - vm_flavor_name: + type: string + port_FSB_Internal_port_1_network_role_tag: type: string required: true status: SUPPORTED - port_FSB2_Internal_network_role: + port_FSB_Internal_port_0_mac_address: type: string required: true status: SUPPORTED - port_FSB1_Internal_related_networks: + port_FSB_Internal_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_FSB1_Internal_network_role_tag: + type: org.openecomp.datatypes.network.VlanRequirements + vm_flavor_name: type: string required: true status: SUPPORTED - port_FSB1_Internal_vlan_requirements: - type: list + port_FSB_Internal_port_1_mac_address: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_FSB2_Internal_subnetpoolid: - type: string + port_FSB_Internal_port_0_related_networks: + type: list required: true status: SUPPORTED - port_FSB1_Internal_exCP_naming: - type: org.openecomp.datatypes.Naming + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_FSB_Internal_port_0_ip_requirements: + type: list required: true status: SUPPORTED - port_FSB1_Internal_network_role: - type: string + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_FSB_Internal_port_1_vlan_requirements: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements compute_FSB1_availability_zone: type: list required: true @@ -100,47 +92,55 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_FSB2_Internal_mac_requirements: + port_FSB_Internal_port_0_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_FSB2_Internal_mac_address: - type: string + port_FSB_Internal_port_0_order: + type: integer required: true status: SUPPORTED - port_FSB2_Internal_exCP_naming: + port_FSB_Internal_port_1_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_FSB_Internal_port_0_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_FSB1_Internal_order: - type: integer + port_FSB_Internal_port_0_network_role_tag: + type: string required: true status: SUPPORTED - port_FSB2_Internal_network: + compute_FSB1_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_FSB1_Internal_mac_requirements: + port_FSB_Internal_port_1_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - compute_FSB1_name: - type: list + port_FSB_Internal_port_0_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: string - port_FSB2_Internal_network_role_tag: + port_FSB_Internal_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_FSB_Internal_port_1_subnetpoolid: type: string required: true status: SUPPORTED attributes: - FSB1_FSB2_Internal_tenant_id: + FSB1_FSB_1_Internal_port_1_network_id: type: string status: SUPPORTED - FSB1_FSB1_Internal_network_id: + FSB1_FSB_1_Internal_port_1_device_owner: type: string status: SUPPORTED FSB1_user_data_format: @@ -154,37 +154,28 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.heat.novaServer.network.AddressInfo - FSB1_FSB2_Internal_network_id: - type: string - status: SUPPORTED - FSB1_FSB1_Internal_status: - type: string - status: SUPPORTED - FSB1_FSB1_Internal_device_owner: - type: string - status: SUPPORTED requirements: - - dependency_FSB1_FSB1_Internal: + - dependency_FSB1_FSB_1_Internal_port_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_FSB1_FSB1_Internal: + - link_FSB1_FSB_1_Internal_port_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_FSB1_FSB2_Internal: + - dependency_FSB1_FSB_1_Internal_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_FSB1_FSB2_Internal: + - link_FSB1_FSB_1_Internal_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -205,13 +196,29 @@ node_types: - 0 - UNBOUNDED capabilities: - binding_FSB1_FSB2_Internal: - 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 + network.outgoing.packets.rate_FSB1_FSB_1_Internal_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - - 0 + - 1 + - UNBOUNDED + network.outgoing.packets.rate_FSB1_FSB_1_Internal_port_1: + 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_FSB1_FSB_1_Internal_port_1: + 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_FSB1_FSB_1_Internal_port_0: + 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_FSB1: type: org.openecomp.capabilities.metric.Ceilometer @@ -225,6 +232,16 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_FSB1_FSB_1_Internal_port_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + forwarder_FSB1_FSB_1_Internal_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.latency_FSB1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -267,112 +284,94 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_FSB1_FSB2_Internal: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED feature_FSB1: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_FSB1_FSB1_Internal: + memory.resident_FSB1: 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_FSB1_FSB1_Internal: + cpu_FSB1: 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_FSB1_FSB2_Internal: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - attachment_FSB1_FSB2_Internal: - type: tosca.capabilities.Attachment + disk.write.requests.rate_FSB1: + 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_FSB1_FSB2_Internal: + instance_FSB1: 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_FSB1: + disk.device.read.bytes.rate_FSB1: 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_FSB1_FSB1_Internal: - type: org.openecomp.capabilities.Forwarder + cpu.delta_FSB1: + 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_FSB1_FSB2_Internal: + disk.write.bytes_FSB1: 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_FSB1: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_FSB1_FSB_1_Internal_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - disk.write.requests.rate_FSB1: + network.incoming.bytes.rate_FSB1_FSB_1_Internal_port_0: 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 - instance_FSB1: + disk.device.read.requests.rate_FSB1: 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_FSB1: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_FSB1_FSB_1_Internal_port_1: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - cpu.delta_FSB1: + network.incoming.bytes.rate_FSB1_FSB_1_Internal_port_1: 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_FSB1: + network.outgoing.bytes.rate_FSB1_FSB_1_Internal_port_0: 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_FSB1_FSB1_Internal: - 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 - disk.device.read.requests.rate_FSB1: + network.outgoing.bytes.rate_FSB1_FSB_1_Internal_port_1: 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_FSB1_FSB1_Internal: + feature_FSB1_FSB_1_Internal_port_0: type: tosca.capabilities.Node occurrences: - 1 @@ -383,6 +382,11 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_FSB1_FSB_1_Internal_port_1: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.ephemeral.size_FSB1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -400,30 +404,31 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_FSB1_FSB1_Internal: + network.incoming.bytes_FSB1_FSB_1_Internal_port_0: 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 - attachment_FSB1_FSB1_Internal: - type: tosca.capabilities.Attachment + network.incoming.bytes_FSB1_FSB_1_Internal_port_1: + 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_FSB1: + network.incoming.packets_FSB1_FSB_1_Internal_port_1: 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_FSB1_FSB1_Internal: + network.incoming.packets_FSB1_FSB_1_Internal_port_0: 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_FSB1_FSB2_Internal: + memory_FSB1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -458,6 +463,22 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_FSB1_FSB_1_Internal_port_1: + 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 + binding_FSB1_FSB_1_Internal_port_0: + 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 host_FSB1: type: tosca.capabilities.Container valid_source_types: @@ -488,19 +509,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_FSB1_FSB2_Internal: - 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_FSB1_FSB1_Internal: - 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_FSB1_FSB2_Internal: + network.outgoing.bytes_FSB1_FSB_1_Internal_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -512,29 +521,11 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_FSB1_FSB1_Internal: - 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_FSB1: type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_FSB1_FSB1_Internal: - 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_FSB1_FSB1_Internal: - 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_FSB1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -553,19 +544,19 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.write.requests_FSB1: + network.incoming.packets.rate_FSB1_FSB_1_Internal_port_1: 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_FSB1_FSB2_Internal: + disk.device.write.requests_FSB1: 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_FSB1_FSB2_Internal: + network.incoming.packets.rate_FSB1_FSB_1_Internal_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -577,7 +568,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_FSB1_FSB2_Internal: + network.outgoing.bytes_FSB1_FSB_1_Internal_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/out/SubstitutionServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/out/SubstitutionServiceTemplate.yaml index 3e648300da..f18caf42b7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/out/SubstitutionServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/out/SubstitutionServiceTemplate.yaml @@ -11,68 +11,62 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_FSB1_Internal_mac_address: - type: string - required: true - port_FSB1_Internal_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_FSB2_Internal_related_networks: + port_FSB_Internal_port_1_related_networks: type: list required: true entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_FSB1_Internal_subnetpoolid: - type: string + port_FSB_Internal_port_1_order: + type: integer required: true compute_FSB1_metadata: type: list required: true entry_schema: type: json - port_FSB2_Internal_vlan_requirements: + port_FSB_Internal_port_1_network_role: + type: string + required: true + port_FSB_Internal_port_0_network_role: + type: string + required: true + port_FSB_Internal_port_0_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_FSB2_Internal_order: - type: integer + type: string + port_FSB_Internal_port_1_network_role_tag: + type: string + required: true + port_FSB_Internal_port_0_mac_address: + type: string required: true - port_FSB2_Internal_ip_requirements: + port_FSB_Internal_port_0_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: org.openecomp.datatypes.network.VlanRequirements vm_flavor_name: type: string required: true - port_FSB2_Internal_network_role: + port_FSB_Internal_port_1_mac_address: type: string required: true - port_FSB1_Internal_related_networks: + port_FSB_Internal_port_0_related_networks: type: list required: true entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_FSB1_Internal_network_role_tag: - type: string + port_FSB_Internal_port_0_ip_requirements: + type: list required: true - port_FSB1_Internal_vlan_requirements: + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_FSB_Internal_port_1_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_FSB2_Internal_subnetpoolid: - type: string - required: true - port_FSB1_Internal_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_FSB1_Internal_network_role: - type: string - required: true compute_FSB1_availability_zone: type: list required: true @@ -85,99 +79,105 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_FSB2_Internal_mac_requirements: + port_FSB_Internal_port_0_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true - port_FSB2_Internal_mac_address: - type: string - required: true - port_FSB2_Internal_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_FSB1_Internal_order: + port_FSB_Internal_port_0_order: type: integer required: true - port_FSB2_Internal_network: + port_FSB_Internal_port_1_ip_requirements: type: list required: true entry_schema: - type: string - port_FSB1_Internal_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + type: org.openecomp.datatypes.network.IpRequirements + port_FSB_Internal_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_FSB_Internal_port_0_network_role_tag: + type: string required: true compute_FSB1_name: type: list required: true entry_schema: type: string - port_FSB2_Internal_network_role_tag: + port_FSB_Internal_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_FSB_Internal_port_0_subnetpoolid: + type: string + required: true + port_FSB_Internal_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_FSB_Internal_port_1_subnetpoolid: type: string required: true node_templates: - FSB1_FSB1_Internal: + FSB1_FSB_1_Internal_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_requirements: - get_input: port_FSB1_Internal_mac_requirements + get_input: port_FSB_Internal_port_1_mac_requirements order: - get_input: port_FSB1_Internal_order + get_input: port_FSB_Internal_port_1_order mac_address: - get_input: port_FSB1_Internal_mac_address + get_input: port_FSB_Internal_port_1_mac_address exCP_naming: - get_input: port_FSB1_Internal_exCP_naming + get_input: port_FSB_Internal_port_1_exCP_naming vlan_requirements: - get_input: port_FSB1_Internal_vlan_requirements + get_input: port_FSB_Internal_port_1_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_FSB1_Internal_ip_requirements + get_input: port_FSB_Internal_port_1_ip_requirements related_networks: - get_input: port_FSB1_Internal_related_networks + get_input: port_FSB_Internal_port_1_related_networks network_role_tag: - get_input: port_FSB1_Internal_network_role_tag + get_input: port_FSB_Internal_port_1_network_role_tag network_role: - get_input: port_FSB1_Internal_network_role + get_input: port_FSB_Internal_port_1_network_role subnetpoolid: - get_input: port_FSB1_Internal_subnetpoolid + get_input: port_FSB_Internal_port_1_subnetpoolid network: get_attribute: - - FSB1_FSB2_Internal + - FSB1_FSB_2_Internal_port_0 - att requirements: - binding: capability: tosca.capabilities.network.Bindable node: FSB1 relationship: tosca.relationships.network.BindsTo - FSB1_FSB2_Internal: + FSB1_FSB_1_Internal_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_requirements: - get_input: port_FSB2_Internal_mac_requirements + get_input: port_FSB_Internal_port_0_mac_requirements order: - get_input: port_FSB2_Internal_order + get_input: port_FSB_Internal_port_0_order mac_address: - get_input: port_FSB2_Internal_mac_address + get_input: port_FSB_Internal_port_0_mac_address exCP_naming: - get_input: port_FSB2_Internal_exCP_naming + get_input: port_FSB_Internal_port_0_exCP_naming vlan_requirements: - get_input: port_FSB2_Internal_vlan_requirements + get_input: port_FSB_Internal_port_0_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_FSB2_Internal_ip_requirements + get_input: port_FSB_Internal_port_0_ip_requirements related_networks: - get_input: port_FSB2_Internal_related_networks + get_input: port_FSB_Internal_port_0_related_networks network_role_tag: - get_input: port_FSB2_Internal_network_role_tag + get_input: port_FSB_Internal_port_0_network_role_tag network_role: - get_input: port_FSB2_Internal_network_role + get_input: port_FSB_Internal_port_0_network_role subnetpoolid: - get_input: port_FSB2_Internal_subnetpoolid + get_input: port_FSB_Internal_port_0_subnetpoolid device_id: get_attribute: - FSB1 - att network: get_input: - - port_FSB2_Internal_network + - port_FSB_Internal_port_0_network - index_value requirements: - binding: @@ -199,7 +199,7 @@ topology_template: - index_value name: get_attribute: - - FSB1_FSB1_Internal + - FSB1_FSB_1_Internal_port_1 - name artifacts: nimbus-ethernet-gw: @@ -209,18 +209,18 @@ topology_template: type: tosca.artifacts.Deployment file: ../Artifacts/nimbus-ethernet outputs: - FSB1_FSB2_Internal_tenant_id: + FSB1_FSB_1_Internal_port_1_network_id: type: string value: get_attribute: - - FSB1_FSB2_Internal - - tenant_id - FSB1_FSB1_Internal_network_id: + - FSB1_FSB_1_Internal_port_1 + - network_id + FSB1_FSB_1_Internal_port_1_device_owner: type: string value: get_attribute: - - FSB1_FSB1_Internal - - network_id + - FSB1_FSB_1_Internal_port_1 + - device_owner FSB1_user_data_format: type: string value: @@ -241,36 +241,33 @@ topology_template: - addresses entry_schema: type: org.openecomp.datatypes.heat.novaServer.network.AddressInfo - FSB1_FSB2_Internal_network_id: - type: string - value: - get_attribute: - - FSB1_FSB2_Internal - - network_id - FSB1_FSB1_Internal_status: - type: string - value: - get_attribute: - - FSB1_FSB1_Internal - - status - FSB1_FSB1_Internal_device_owner: - type: string - value: - get_attribute: - - FSB1_FSB1_Internal - - device_owner substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.FSB1 capabilities: - binding_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal - - binding + network.outgoing.packets.rate_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 + - network.outgoing.packets.rate + network.outgoing.packets.rate_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 + - network.outgoing.packets.rate + network.outpoing.packets_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 + - network.outpoing.packets + network.outpoing.packets_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 + - network.outpoing.packets disk.capacity_FSB1: - FSB1 - disk.capacity disk.read.bytes.rate_FSB1: - FSB1 - disk.read.bytes.rate + forwarder_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 + - forwarder + forwarder_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 + - forwarder disk.device.latency_FSB1: - FSB1 - disk.device.latency @@ -292,36 +289,12 @@ topology_template: disk.root.size_FSB1: - FSB1 - disk.root.size - forwarder_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal - - forwarder feature_FSB1: - FSB1 - feature - network.incoming.packets.rate_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal - - network.incoming.packets.rate - network.outgoing.bytes_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal - - network.outgoing.bytes - feature_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal - - feature - attachment_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal - - attachment - network.incoming.packets_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal - - network.incoming.packets memory.resident_FSB1: - FSB1 - memory.resident - forwarder_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal - - forwarder - network.incoming.packets.rate_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal - - network.incoming.packets.rate cpu_FSB1: - FSB1 - cpu @@ -340,18 +313,36 @@ topology_template: disk.write.bytes_FSB1: - FSB1 - disk.write.bytes - binding_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal - - binding + attachment_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 + - attachment + network.incoming.bytes.rate_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 + - network.incoming.bytes.rate disk.device.read.requests.rate_FSB1: - FSB1 - disk.device.read.requests.rate - feature_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal + attachment_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 + - attachment + network.incoming.bytes.rate_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 + - network.incoming.bytes.rate + network.outgoing.bytes.rate_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 + - network.outgoing.bytes.rate + network.outgoing.bytes.rate_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 + - network.outgoing.bytes.rate + feature_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 - feature disk.device.read.requests_FSB1: - FSB1 - disk.device.read.requests + feature_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 + - feature disk.ephemeral.size_FSB1: - FSB1 - disk.ephemeral.size @@ -361,21 +352,21 @@ topology_template: disk.device.write.bytes_FSB1: - FSB1 - disk.device.write.bytes - network.incoming.packets_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal + network.incoming.bytes_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 + - network.incoming.bytes + network.incoming.bytes_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 + - network.incoming.bytes + network.incoming.packets_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 + - network.incoming.packets + network.incoming.packets_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 - network.incoming.packets - attachment_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal - - attachment memory_FSB1: - FSB1 - memory - network.outpoing.packets_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal - - network.outpoing.packets - network.outgoing.bytes.rate_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal - - network.outgoing.bytes.rate disk.device.read.bytes_FSB1: - FSB1 - disk.device.read.bytes @@ -391,6 +382,12 @@ topology_template: disk.usage_FSB1: - FSB1 - disk.usage + binding_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 + - binding + binding_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 + - binding host_FSB1: - FSB1 - host @@ -406,30 +403,15 @@ topology_template: disk.write.requests_FSB1: - FSB1 - disk.write.requests - network.outgoing.bytes_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal + network.outgoing.bytes_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 - network.outgoing.bytes - network.incoming.bytes_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal - - network.incoming.bytes - network.outpoing.packets_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal - - network.outpoing.packets disk.device.write.bytes.rate_FSB1: - FSB1 - disk.device.write.bytes.rate - network.outgoing.bytes.rate_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal - - network.outgoing.bytes.rate endpoint_FSB1: - FSB1 - endpoint - network.outgoing.packets.rate_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal - - network.outgoing.packets.rate - network.incoming.bytes.rate_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal - - network.incoming.bytes.rate disk.latency_FSB1: - FSB1 - disk.latency @@ -439,40 +421,40 @@ topology_template: disk.read.requests_FSB1: - FSB1 - disk.read.requests + network.incoming.packets.rate_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 + - network.incoming.packets.rate disk.device.write.requests_FSB1: - FSB1 - disk.device.write.requests - network.incoming.bytes.rate_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal - - network.incoming.bytes.rate - network.incoming.bytes_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal - - network.incoming.bytes + network.incoming.packets.rate_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 + - network.incoming.packets.rate disk.iops_FSB1: - FSB1 - disk.iops - network.outgoing.packets.rate_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal - - network.outgoing.packets.rate + network.outgoing.bytes_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 + - network.outgoing.bytes disk.device.iops_FSB1: - FSB1 - disk.device.iops requirements: + dependency_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 + - dependency dependency_FSB1: - FSB1 - dependency - link_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal - - link - dependency_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal + dependency_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 - dependency - link_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal - - link local_storage_FSB1: - FSB1 - local_storage - dependency_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal - - dependency + link_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 + - link + link_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 + - link diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/in/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/in/MainServiceTemplate.yaml index f80a76a708..5c1c77bb46 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/in/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/in/MainServiceTemplate.yaml @@ -287,7 +287,7 @@ topology_template: type: string description: Internal1_external node_templates: - FSB2_Internal_2: + FSB_1_Internal_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_address: @@ -298,7 +298,7 @@ topology_template: capability: tosca.capabilities.network.Bindable node: FSB1_template relationship: tosca.relationships.network.BindsTo - FSB1_Internal_1: + FSB_1_Internal_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_address: @@ -335,7 +335,7 @@ topology_template: shared: true network_name: get_attribute: - - FSB1_Internal_1 + - FSB_1_Internal_port_1 - network_id dhcp_agent_ids: get_attribute: @@ -343,11 +343,11 @@ topology_template: - addresses tenant_id: get_attribute: - - FSB2_Internal_2 + - FSB_1_Internal_port_0 - network_id qos_policy: get_attribute: - - FSB2_Internal_2 + - FSB_1_Internal_port_0 - network_id FSB1_template: type: org.openecomp.resource.vfc.nodes.heat.FSB1 @@ -355,11 +355,11 @@ topology_template: flavor: get_input: fsb1-flavor availability_zone: - get_attribute: [ FSB1_Internal_1, myAttr, get_attribute: [FSB1_Internal_1, index] ] + get_attribute: [ FSB_1_Internal_port_1, myAttr, get_attribute: [FSB_1_Internal_port_1, index] ] metadata: - get_attribute: [ FSB1_Internal_1, myAttr, get_input: index ] + get_attribute: [ FSB_1_Internal_port_1, myAttr, get_input: index ] name: - get_attribute: [ FSB1_Internal_1, myAttr, get_attribute: [jsa_net1, index] ] + get_attribute: [ FSB_1_Internal_port_1, myAttr, get_attribute: [jsa_net1, index] ] artifacts: nimbus-ethernet-gw: type: tosca.artifacts.Deployment @@ -379,8 +379,8 @@ topology_template: cmaui_volume1: type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume properties: - volume_type: {get_attribute: [ FSB1_template, addresses, {get_attribute: [ FSB2_Internal_2,tenant_id ] } ]} - size: { get_attribute: [FSB1_Internal_1, device_owner, get_input: [CMAUI_volume_type,{get_attribute: [FSB1_OAM,status ] }], 0, "OS-EXT-IPS-MAC:mac_addr"] } + volume_type: {get_attribute: [ FSB1_template, addresses, {get_attribute: [ FSB_1_Internal_port_0,tenant_id ] } ]} + size: { get_attribute: [FSB_1_Internal_port_1, device_owner, get_input: [CMAUI_volume_type,{get_attribute: [FSB1_OAM,status ] }], 0, "OS-EXT-IPS-MAC:mac_addr"] } cmaui_volume2: type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume properties: @@ -395,7 +395,7 @@ topology_template: description: | Version 2.0 02-09-2016 (Authors: John Doe, user PROD) members: - - FSB2_Internal_2 - - FSB1_Internal_1 + - FSB_1_Internal_port_0 + - FSB_1_Internal_port_1 - FSB1_OAM - FSB1_template \ 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/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml index 647db5b03f..bc1bf735a3 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,108 +8,94 @@ node_types: org.openecomp.resource.abstract.nodes.FSB1: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_FSB1_Internal_mac_address: - type: string - required: true - status: SUPPORTED - port_FSB1_Internal_ip_requirements: + port_FSB_Internal_port_1_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_FSB2_Internal_related_networks: - type: list + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_FSB_Internal_port_1_order: + type: integer required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_FSB1_Internal_subnetpoolid: + port_FSB1_OAM_subnetpoolid: type: string required: true status: SUPPORTED - port_FSB1_OAM_subnetpoolid: + port_FSB_Internal_port_1_network_role: type: string required: true status: SUPPORTED - port_FSB2_Internal_vlan_requirements: - type: list + port_FSB_Internal_port_0_network_role: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_FSB2_Internal_order: - type: integer + port_FSB_Internal_port_1_network_role_tag: + type: string required: true status: SUPPORTED + port_FSB_Internal_port_0_network: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string port_FSB1_OAM_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED + port_FSB_Internal_port_0_mac_address: + type: string + required: true + status: SUPPORTED port_FSB1_OAM_ip_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_FSB2_Internal_ip_requirements: + port_FSB_Internal_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: org.openecomp.datatypes.network.VlanRequirements vm_flavor_name: type: string required: true status: SUPPORTED - port_FSB2_Internal_network_role: + port_FSB_Internal_port_1_mac_address: type: string required: true status: SUPPORTED - port_FSB1_Internal_related_networks: + port_FSB_Internal_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_FSB1_Internal_network_role_tag: - type: string - required: true - status: SUPPORTED port_FSB1_OAM_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_FSB1_Internal_vlan_requirements: + port_FSB_Internal_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_FSB2_Internal_subnetpoolid: - type: string - required: true - status: SUPPORTED - port_FSB1_Internal_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_FSB1_Internal_network_role: - type: string - required: true - status: SUPPORTED + type: org.openecomp.datatypes.network.IpRequirements port_FSB1_OAM_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_FSB1_Internal_network: + port_FSB_Internal_port_1_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string + type: org.openecomp.datatypes.network.VlanRequirements index_value: type: integer description: Index value of this substitution service template runtime instance @@ -122,38 +108,38 @@ node_types: type: integer required: true status: SUPPORTED - port_FSB2_Internal_mac_requirements: + port_FSB_Internal_port_0_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_FSB2_Internal_mac_address: - type: string - required: true - status: SUPPORTED port_FSB1_OAM_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_FSB2_Internal_exCP_naming: - type: org.openecomp.datatypes.Naming + port_FSB_Internal_port_0_order: + type: integer required: true status: SUPPORTED - port_FSB1_Internal_order: - type: integer + port_FSB_Internal_port_1_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_FSB_Internal_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED port_FSB1_OAM_network_role: type: string required: true status: SUPPORTED - port_FSB2_Internal_network: - type: list + port_FSB_Internal_port_0_network_role_tag: + type: string required: true status: SUPPORTED - entry_schema: - type: string port_FSB1_OAM_related_networks: type: list required: true @@ -164,7 +150,7 @@ node_types: type: string required: true status: SUPPORTED - port_FSB1_Internal_mac_requirements: + port_FSB_Internal_port_1_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED @@ -174,15 +160,29 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_FSB2_Internal_network_role_tag: + port_FSB_Internal_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_FSB_Internal_port_0_subnetpoolid: + type: string + required: true + status: SUPPORTED + port_FSB_Internal_port_1_network: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_FSB_Internal_port_1_subnetpoolid: type: string required: true status: SUPPORTED attributes: - FSB1_FSB2_Internal_tenant_id: + FSB1_FSB_1_Internal_port_1_network_id: type: string status: SUPPORTED - FSB1_FSB1_Internal_network_id: + FSB1_FSB_1_Internal_port_1_device_owner: type: string status: SUPPORTED FSB1_accessIPv6: @@ -196,47 +196,41 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.heat.novaServer.network.AddressInfo - FSB1_FSB2_Internal_network_id: - type: string - status: SUPPORTED - FSB1_FSB1_Internal_device_owner: - type: string - status: SUPPORTED requirements: - - dependency_FSB1_FSB1_Internal: + - dependency_FSB1_FSB1_OAM: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_FSB1_FSB1_Internal: + - link_FSB1_FSB1_OAM: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_FSB1_FSB2_Internal: + - dependency_FSB1_FSB_1_Internal_port_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_FSB1_FSB2_Internal: + - link_FSB1_FSB_1_Internal_port_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_FSB1_FSB1_OAM: + - dependency_FSB1_FSB_1_Internal_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_FSB1_FSB1_OAM: + - link_FSB1_FSB_1_Internal_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -269,13 +263,29 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_FSB1_FSB2_Internal: - 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 + network.outgoing.packets.rate_FSB1_FSB_1_Internal_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - - 0 + - 1 + - UNBOUNDED + network.outgoing.packets.rate_FSB1_FSB_1_Internal_port_1: + 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_FSB1_FSB_1_Internal_port_1: + 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_FSB1_FSB_1_Internal_port_0: + 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_FSB1: type: org.openecomp.capabilities.metric.Ceilometer @@ -289,6 +299,16 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_FSB1_FSB_1_Internal_port_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + forwarder_FSB1_FSB_1_Internal_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.latency_FSB1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -337,128 +357,110 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_FSB1_FSB2_Internal: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED feature_FSB1: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_FSB1_FSB1_Internal: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_FSB1_FSB1_OAM: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_FSB1_FSB1_Internal: + memory.resident_FSB1: 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_FSB1_FSB2_Internal: - type: tosca.capabilities.Node + network.incoming.packets.rate_FSB1_FSB1_OAM: + 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 - attachment_FSB1_FSB2_Internal: - type: tosca.capabilities.Attachment + cpu_FSB1: + 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_FSB1_FSB2_Internal: + disk.write.requests.rate_FSB1: 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_FSB1_FSB1_OAM: - type: org.openecomp.capabilities.Forwarder + feature_FSB1_FSB1_OAM: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - memory.resident_FSB1: + instance_FSB1: 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_FSB1_FSB1_OAM: + disk.device.read.bytes.rate_FSB1: 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_FSB1_FSB1_Internal: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - network.incoming.packets.rate_FSB1_FSB2_Internal: + cpu.delta_FSB1: 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_FSB1: + disk.write.bytes_FSB1: 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_FSB1: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_FSB1_FSB_1_Internal_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - feature_FSB1_FSB1_OAM: - type: tosca.capabilities.Node + network.incoming.bytes.rate_FSB1_FSB_1_Internal_port_0: + 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 - instance_FSB1: + disk.device.read.requests.rate_FSB1: 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_FSB1: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_FSB1_FSB_1_Internal_port_1: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - cpu.delta_FSB1: + network.incoming.bytes.rate_FSB1_FSB_1_Internal_port_1: 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_FSB1: + network.outgoing.bytes.rate_FSB1_FSB_1_Internal_port_0: 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_FSB1_FSB1_Internal: - 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 - disk.device.read.requests.rate_FSB1: + network.outgoing.bytes.rate_FSB1_FSB_1_Internal_port_1: 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_FSB1_FSB1_Internal: + feature_FSB1_FSB_1_Internal_port_0: type: tosca.capabilities.Node occurrences: - 1 @@ -469,6 +471,11 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_FSB1_FSB_1_Internal_port_1: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.ephemeral.size_FSB1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -505,42 +512,43 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_FSB1_FSB1_Internal: + network.incoming.bytes_FSB1_FSB_1_Internal_port_0: 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 - attachment_FSB1_FSB1_Internal: - type: tosca.capabilities.Attachment + network.incoming.bytes_FSB1_FSB_1_Internal_port_1: + 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_FSB1_FSB1_OAM: + network.incoming.packets_FSB1_FSB_1_Internal_port_1: 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_FSB1: + network.incoming.bytes_FSB1_FSB1_OAM: 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_FSB1_FSB1_OAM: + network.incoming.packets_FSB1_FSB_1_Internal_port_0: 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_FSB1_FSB1_Internal: + memory_FSB1: 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_FSB1_FSB2_Internal: + network.incoming.packets_FSB1_FSB1_OAM: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -575,6 +583,22 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_FSB1_FSB_1_Internal_port_1: + 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 + binding_FSB1_FSB_1_Internal_port_0: + 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 network.outpoing.packets_FSB1_FSB1_OAM: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -611,19 +635,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_FSB1_FSB2_Internal: - 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_FSB1_FSB1_Internal: - 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_FSB1_FSB2_Internal: + network.outgoing.bytes_FSB1_FSB_1_Internal_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -635,29 +647,11 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_FSB1_FSB1_Internal: - 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_FSB1: type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_FSB1_FSB1_Internal: - 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_FSB1_FSB1_Internal: - 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_FSB1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -676,19 +670,19 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.write.requests_FSB1: + network.incoming.packets.rate_FSB1_FSB_1_Internal_port_1: 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_FSB1_FSB2_Internal: + disk.device.write.requests_FSB1: 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_FSB1_FSB2_Internal: + network.incoming.packets.rate_FSB1_FSB_1_Internal_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -700,7 +694,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_FSB1_FSB2_Internal: + network.outgoing.bytes_FSB1_FSB_1_Internal_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/out/SubstitutionServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/out/SubstitutionServiceTemplate.yaml index 33e1cb9752..0c023468a9 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/out/SubstitutionServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/out/SubstitutionServiceTemplate.yaml @@ -11,87 +11,76 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_FSB1_Internal_mac_address: - type: string - required: true - port_FSB1_Internal_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_FSB2_Internal_related_networks: + port_FSB_Internal_port_1_related_networks: type: list required: true entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_FSB1_Internal_subnetpoolid: - type: string + port_FSB_Internal_port_1_order: + type: integer required: true port_FSB1_OAM_subnetpoolid: type: string required: true - port_FSB2_Internal_vlan_requirements: + port_FSB_Internal_port_1_network_role: + type: string + required: true + port_FSB_Internal_port_0_network_role: + type: string + required: true + port_FSB_Internal_port_1_network_role_tag: + type: string + required: true + port_FSB_Internal_port_0_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_FSB2_Internal_order: - type: integer - required: true + type: string port_FSB1_OAM_exCP_naming: type: org.openecomp.datatypes.Naming required: true + port_FSB_Internal_port_0_mac_address: + type: string + required: true port_FSB1_OAM_ip_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_FSB2_Internal_ip_requirements: + port_FSB_Internal_port_0_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: org.openecomp.datatypes.network.VlanRequirements vm_flavor_name: type: string required: true - port_FSB2_Internal_network_role: + port_FSB_Internal_port_1_mac_address: type: string required: true - port_FSB1_Internal_related_networks: + port_FSB_Internal_port_0_related_networks: type: list required: true entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_FSB1_Internal_network_role_tag: - type: string - required: true port_FSB1_OAM_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_FSB1_Internal_vlan_requirements: + port_FSB_Internal_port_0_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_FSB2_Internal_subnetpoolid: - type: string - required: true - port_FSB1_Internal_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_FSB1_Internal_network_role: - type: string - required: true + type: org.openecomp.datatypes.network.IpRequirements port_FSB1_OAM_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true - port_FSB1_Internal_network: + port_FSB_Internal_port_1_vlan_requirements: type: list required: true entry_schema: - type: string + type: org.openecomp.datatypes.network.VlanRequirements index_value: type: integer description: Index value of this substitution service template runtime instance @@ -102,31 +91,31 @@ topology_template: port_FSB1_OAM_order: type: integer required: true - port_FSB2_Internal_mac_requirements: + port_FSB_Internal_port_0_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true - port_FSB2_Internal_mac_address: - type: string - required: true port_FSB1_OAM_network: type: list required: true entry_schema: type: string - port_FSB2_Internal_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_FSB1_Internal_order: + port_FSB_Internal_port_0_order: type: integer required: true + port_FSB_Internal_port_1_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_FSB_Internal_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true port_FSB1_OAM_network_role: type: string required: true - port_FSB2_Internal_network: - type: list + port_FSB_Internal_port_0_network_role_tag: + type: string required: true - entry_schema: - type: string port_FSB1_OAM_related_networks: type: list required: true @@ -135,7 +124,7 @@ topology_template: port_FSB1_OAM_network_role_tag: type: string required: true - port_FSB1_Internal_mac_requirements: + port_FSB_Internal_port_1_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true port_FSB1_OAM_fixed_ips: @@ -143,105 +132,116 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_FSB2_Internal_network_role_tag: + port_FSB_Internal_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_FSB_Internal_port_0_subnetpoolid: + type: string + required: true + port_FSB_Internal_port_1_network: + type: list + required: true + entry_schema: + type: string + port_FSB_Internal_port_1_subnetpoolid: type: string required: true node_templates: - FSB1_FSB1_Internal: + FSB1_FSB1_OAM: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_requirements: - get_input: port_FSB1_Internal_mac_requirements + get_input: port_FSB1_OAM_mac_requirements order: - get_input: port_FSB1_Internal_order - mac_address: - get_input: port_FSB1_Internal_mac_address + get_input: port_FSB1_OAM_order exCP_naming: - get_input: port_FSB1_Internal_exCP_naming + get_input: port_FSB1_OAM_exCP_naming vlan_requirements: - get_input: port_FSB1_Internal_vlan_requirements + get_input: port_FSB1_OAM_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_FSB1_Internal_ip_requirements + get_input: port_FSB1_OAM_ip_requirements related_networks: - get_input: port_FSB1_Internal_related_networks + get_input: port_FSB1_OAM_related_networks network_role_tag: - get_input: port_FSB1_Internal_network_role_tag + get_input: port_FSB1_OAM_network_role_tag network_role: - get_input: port_FSB1_Internal_network_role + get_input: port_FSB1_OAM_network_role + fixed_ips: + get_input: + - port_FSB1_OAM_fixed_ips + - index_value subnetpoolid: - get_input: port_FSB1_Internal_subnetpoolid + get_input: port_FSB1_OAM_subnetpoolid network: get_input: - - port_FSB1_Internal_network + - port_FSB1_OAM_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: FSB1 relationship: tosca.relationships.network.BindsTo - FSB1_FSB2_Internal: + FSB1_FSB_1_Internal_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_requirements: - get_input: port_FSB2_Internal_mac_requirements + get_input: port_FSB_Internal_port_1_mac_requirements order: - get_input: port_FSB2_Internal_order + get_input: port_FSB_Internal_port_1_order mac_address: - get_input: port_FSB2_Internal_mac_address + get_input: port_FSB_Internal_port_1_mac_address exCP_naming: - get_input: port_FSB2_Internal_exCP_naming + get_input: port_FSB_Internal_port_1_exCP_naming vlan_requirements: - get_input: port_FSB2_Internal_vlan_requirements + get_input: port_FSB_Internal_port_1_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_FSB2_Internal_ip_requirements + get_input: port_FSB_Internal_port_1_ip_requirements related_networks: - get_input: port_FSB2_Internal_related_networks + get_input: port_FSB_Internal_port_1_related_networks network_role_tag: - get_input: port_FSB2_Internal_network_role_tag + get_input: port_FSB_Internal_port_1_network_role_tag network_role: - get_input: port_FSB2_Internal_network_role + get_input: port_FSB_Internal_port_1_network_role subnetpoolid: - get_input: port_FSB2_Internal_subnetpoolid + get_input: port_FSB_Internal_port_1_subnetpoolid network: get_input: - - port_FSB2_Internal_network + - port_FSB_Internal_port_1_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: FSB1 relationship: tosca.relationships.network.BindsTo - FSB1_FSB1_OAM: + FSB1_FSB_1_Internal_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_requirements: - get_input: port_FSB1_OAM_mac_requirements + get_input: port_FSB_Internal_port_0_mac_requirements order: - get_input: port_FSB1_OAM_order + get_input: port_FSB_Internal_port_0_order + mac_address: + get_input: port_FSB_Internal_port_0_mac_address exCP_naming: - get_input: port_FSB1_OAM_exCP_naming + get_input: port_FSB_Internal_port_0_exCP_naming vlan_requirements: - get_input: port_FSB1_OAM_vlan_requirements + get_input: port_FSB_Internal_port_0_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_FSB1_OAM_ip_requirements + get_input: port_FSB_Internal_port_0_ip_requirements related_networks: - get_input: port_FSB1_OAM_related_networks + get_input: port_FSB_Internal_port_0_related_networks network_role_tag: - get_input: port_FSB1_OAM_network_role_tag + get_input: port_FSB_Internal_port_0_network_role_tag network_role: - get_input: port_FSB1_OAM_network_role - fixed_ips: - get_input: - - port_FSB1_OAM_fixed_ips - - index_value + get_input: port_FSB_Internal_port_0_network_role subnetpoolid: - get_input: port_FSB1_OAM_subnetpoolid + get_input: port_FSB_Internal_port_0_subnetpoolid network: get_input: - - port_FSB1_OAM_network + - port_FSB_Internal_port_0_network - index_value requirements: - binding: @@ -253,10 +253,10 @@ topology_template: properties: availability_zone: get_attribute: - - FSB1_FSB1_Internal + - FSB1_FSB_1_Internal_port_1 - myAttr - get_attribute: - - FSB1_FSB1_Internal + - FSB1_FSB_1_Internal_port_1 - index flavor: get_input: vm_flavor_name @@ -268,18 +268,18 @@ topology_template: type: tosca.artifacts.Deployment file: ../Artifacts/nimbus-ethernet outputs: - FSB1_FSB2_Internal_tenant_id: + FSB1_FSB_1_Internal_port_1_network_id: type: string value: get_attribute: - - FSB1_FSB2_Internal - - tenant_id - FSB1_FSB1_Internal_network_id: + - FSB1_FSB_1_Internal_port_1 + - network_id + FSB1_FSB_1_Internal_port_1_device_owner: type: string value: get_attribute: - - FSB1_FSB1_Internal - - network_id + - FSB1_FSB_1_Internal_port_1 + - device_owner FSB1_accessIPv6: type: string value: @@ -300,18 +300,6 @@ topology_template: - addresses entry_schema: type: org.openecomp.datatypes.heat.novaServer.network.AddressInfo - FSB1_FSB2_Internal_network_id: - type: string - value: - get_attribute: - - FSB1_FSB2_Internal - - network_id - FSB1_FSB1_Internal_device_owner: - type: string - value: - get_attribute: - - FSB1_FSB1_Internal - - device_owner substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.FSB1 capabilities: @@ -321,15 +309,30 @@ topology_template: network.outgoing.bytes_FSB1_FSB1_OAM: - FSB1_FSB1_OAM - network.outgoing.bytes - binding_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal - - binding + network.outgoing.packets.rate_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 + - network.outgoing.packets.rate + network.outgoing.packets.rate_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 + - network.outgoing.packets.rate + network.outpoing.packets_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 + - network.outpoing.packets + network.outpoing.packets_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 + - network.outpoing.packets disk.capacity_FSB1: - FSB1 - disk.capacity disk.read.bytes.rate_FSB1: - FSB1 - disk.read.bytes.rate + forwarder_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 + - forwarder + forwarder_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 + - forwarder disk.device.latency_FSB1: - FSB1 - disk.device.latency @@ -354,27 +357,9 @@ topology_template: disk.root.size_FSB1: - FSB1 - disk.root.size - forwarder_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal - - forwarder feature_FSB1: - FSB1 - feature - network.incoming.packets.rate_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal - - network.incoming.packets.rate - network.outgoing.bytes_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal - - network.outgoing.bytes - feature_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal - - feature - attachment_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal - - attachment - network.incoming.packets_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal - - network.incoming.packets forwarder_FSB1_FSB1_OAM: - FSB1_FSB1_OAM - forwarder @@ -384,12 +369,6 @@ topology_template: network.incoming.packets.rate_FSB1_FSB1_OAM: - FSB1_FSB1_OAM - network.incoming.packets.rate - forwarder_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal - - forwarder - network.incoming.packets.rate_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal - - network.incoming.packets.rate cpu_FSB1: - FSB1 - cpu @@ -411,18 +390,36 @@ topology_template: disk.write.bytes_FSB1: - FSB1 - disk.write.bytes - binding_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal - - binding + attachment_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 + - attachment + network.incoming.bytes.rate_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 + - network.incoming.bytes.rate disk.device.read.requests.rate_FSB1: - FSB1 - disk.device.read.requests.rate - feature_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal + attachment_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 + - attachment + network.incoming.bytes.rate_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 + - network.incoming.bytes.rate + network.outgoing.bytes.rate_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 + - network.outgoing.bytes.rate + network.outgoing.bytes.rate_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 + - network.outgoing.bytes.rate + feature_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 - feature disk.device.read.requests_FSB1: - FSB1 - disk.device.read.requests + feature_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 + - feature disk.ephemeral.size_FSB1: - FSB1 - disk.ephemeral.size @@ -441,27 +438,27 @@ topology_template: attachment_FSB1_FSB1_OAM: - FSB1_FSB1_OAM - attachment - network.incoming.packets_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal + network.incoming.bytes_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 + - network.incoming.bytes + network.incoming.bytes_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 + - network.incoming.bytes + network.incoming.packets_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 - network.incoming.packets - attachment_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal - - attachment network.incoming.bytes_FSB1_FSB1_OAM: - FSB1_FSB1_OAM - network.incoming.bytes + network.incoming.packets_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 + - network.incoming.packets memory_FSB1: - FSB1 - memory network.incoming.packets_FSB1_FSB1_OAM: - FSB1_FSB1_OAM - network.incoming.packets - network.outpoing.packets_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal - - network.outpoing.packets - network.outgoing.bytes.rate_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal - - network.outgoing.bytes.rate disk.device.read.bytes_FSB1: - FSB1 - disk.device.read.bytes @@ -477,6 +474,12 @@ topology_template: disk.usage_FSB1: - FSB1 - disk.usage + binding_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 + - binding + binding_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 + - binding network.outpoing.packets_FSB1_FSB1_OAM: - FSB1_FSB1_OAM - network.outpoing.packets @@ -495,30 +498,15 @@ topology_template: disk.write.requests_FSB1: - FSB1 - disk.write.requests - network.outgoing.bytes_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal + network.outgoing.bytes_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 - network.outgoing.bytes - network.incoming.bytes_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal - - network.incoming.bytes - network.outpoing.packets_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal - - network.outpoing.packets disk.device.write.bytes.rate_FSB1: - FSB1 - disk.device.write.bytes.rate - network.outgoing.bytes.rate_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal - - network.outgoing.bytes.rate endpoint_FSB1: - FSB1 - endpoint - network.outgoing.packets.rate_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal - - network.outgoing.packets.rate - network.incoming.bytes.rate_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal - - network.incoming.bytes.rate disk.latency_FSB1: - FSB1 - disk.latency @@ -528,21 +516,21 @@ topology_template: disk.read.requests_FSB1: - FSB1 - disk.read.requests + network.incoming.packets.rate_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 + - network.incoming.packets.rate disk.device.write.requests_FSB1: - FSB1 - disk.device.write.requests - network.incoming.bytes.rate_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal - - network.incoming.bytes.rate - network.incoming.bytes_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal - - network.incoming.bytes + network.incoming.packets.rate_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 + - network.incoming.packets.rate disk.iops_FSB1: - FSB1 - disk.iops - network.outgoing.packets.rate_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal - - network.outgoing.packets.rate + network.outgoing.bytes_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 + - network.outgoing.bytes disk.device.iops_FSB1: - FSB1 - disk.device.iops @@ -553,21 +541,21 @@ topology_template: dependency_FSB1_FSB1_OAM: - FSB1_FSB1_OAM - dependency + dependency_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 + - dependency dependency_FSB1: - FSB1 - dependency - link_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal - - link - dependency_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal + dependency_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 - dependency - link_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal - - link local_storage_FSB1: - FSB1 - local_storage - dependency_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal - - dependency + link_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 + - link + link_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 + - link diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/oneComputeMultiplePortsDiffType/in/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/oneComputeMultiplePortsDiffType/in/MainServiceTemplate.yaml index d15b80d448..9960d9bd30 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/oneComputeMultiplePortsDiffType/in/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/oneComputeMultiplePortsDiffType/in/MainServiceTemplate.yaml @@ -67,7 +67,7 @@ topology_template: type: string description: prop node_templates: - FSB2_Internal_2: + FSB_2_Internal_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_address: @@ -78,7 +78,7 @@ topology_template: capability: tosca.capabilities.network.Bindable node: FSB1_template relationship: tosca.relationships.network.BindsTo - FSB1_Internal_1: + FSB_1_Internal_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_address: @@ -115,7 +115,7 @@ topology_template: shared: true network_name: get_attribute: - - FSB1_Internal_1 + - FSB_1_Internal_port_1 - network_id dhcp_agent_ids: get_attribute: @@ -123,11 +123,11 @@ topology_template: - addresses tenant_id: get_attribute: - - FSB2_Internal_2 + - FSB_2_Internal_port_0 - network_id qos_policy: get_attribute: - - FSB2_Internal_2 + - FSB_2_Internal_port_0 - network_id FSB1_template: type: org.openecomp.resource.vfc.nodes.heat.FSB @@ -181,7 +181,7 @@ topology_template: description: | Version 2.0 02-09-2016 (Authors: John Doe, user PROD) members: - - FSB2_Internal_2 - - FSB1_Internal_1 + - FSB_2_Internal_port_0 + - FSB_1_Internal_port_1 - FSB1_OAM - FSB1_template \ 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 62e3c5574a..609d952fd6 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 @@ -68,7 +68,7 @@ topology_template: type: string description: prop node_templates: - FSB2_Internal_2: + FSB_2_Internal_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_address: @@ -79,7 +79,7 @@ topology_template: capability: tosca.capabilities.network.Bindable node: FSB1_template relationship: tosca.relationships.network.BindsTo - FSB1_Internal_1: + FSB_1_Internal_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_address: @@ -116,7 +116,7 @@ topology_template: shared: true network_name: get_attribute: - - FSB1_Internal_1 + - FSB_1_Internal_port_1 - network_id dhcp_agent_ids: get_attribute: @@ -124,11 +124,11 @@ topology_template: - addresses tenant_id: get_attribute: - - FSB2_Internal_2 + - FSB_2_Internal_port_0 - network_id qos_policy: get_attribute: - - FSB2_Internal_2 + - FSB_2_Internal_port_0 - network_id FSB1_template: type: org.openecomp.resource.vfc.nodes.heat.FSB @@ -179,22 +179,20 @@ topology_template: directives: - substitutable properties: - port_FSB1_Internal_mac_address: - get_input: fsb1-Internal1-mac + port_FSB_Internal_port_0_network: + - Internal2-net + port_FSB_Internal_port_0_mac_address: + get_input: fsb1-Internal2-mac vm_flavor_name: get_input: fsb-flavor + port_FSB_Internal_port_1_mac_address: + get_input: fsb1-Internal1-mac vm_image_name: get_input: fsb-image compute_FSB_admin_pass: - STATIC-DATA-FSB1 - port_FSB1_Internal_network: - - Internal1-net - port_FSB2_Internal_mac_address: - get_input: fsb1-Internal2-mac port_FSB1_OAM_network: - jsa_net1 - port_FSB2_Internal_network: - - Internal2-net compute_FSB_metadata: - write_files: - path: /path1/etc/sysconfig/network-scripts/ifcfg-eth0 @@ -206,6 +204,8 @@ topology_template: get_input: fsb1-oam-ip compute_FSB_name: - get_input: fsb1-name + port_FSB_Internal_port_1_network: + - Internal1-net service_template_filter: substitute_service_template: Nested_FSBServiceTemplate.yaml count: 1 @@ -222,7 +222,7 @@ topology_template: description: | Version 2.0 02-09-2016 (Authors: John Doe, user PROD) members: - - FSB2_Internal_2 - - FSB1_Internal_1 + - FSB_2_Internal_port_0 + - FSB_1_Internal_port_1 - FSB1_OAM - FSB1_template diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/twoComputesMultiplePorts/in/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/twoComputesMultiplePorts/in/MainServiceTemplate.yaml index 646d5e4091..017dd970be 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/twoComputesMultiplePorts/in/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/twoComputesMultiplePorts/in/MainServiceTemplate.yaml @@ -87,7 +87,7 @@ topology_template: type: string description: prop node_templates: - FSB2_Internal_2: + FSB_2_Internal_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_address: @@ -98,7 +98,7 @@ topology_template: capability: tosca.capabilities.network.Bindable node: FSB2_template relationship: tosca.relationships.network.BindsTo - FSB2_Internal_1: + FSB_1_Internal_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_address: @@ -109,7 +109,7 @@ topology_template: capability: tosca.capabilities.network.Bindable node: FSB1_template relationship: tosca.relationships.network.BindsTo - FSB1_Internal_2: + FSB_2_Internal_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_address: @@ -124,7 +124,7 @@ topology_template: capability: tosca.capabilities.network.Linkable node: jsa_net1 relationship: tosca.relationships.network.LinksTo - FSB1_Internal_1: + FSB_1_Internal_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_address: @@ -145,7 +145,7 @@ topology_template: shared: true network_name: get_attribute: - - FSB1_Internal_1 + - FSB1_0_Internal_port_0 - network_id dhcp_agent_ids: get_attribute: @@ -153,11 +153,11 @@ topology_template: - addresses tenant_id: get_attribute: - - FSB2_Internal_2 + - FSB2_1_Internal_port_0 - network_id qos_policy: get_attribute: - - FSB2_Internal_2 + - FSB2_1_Internal_port_0 - network_id FSB1_template: type: org.openecomp.resource.vfc.nodes.heat.FSB @@ -242,9 +242,9 @@ topology_template: description: | Version 2.0 02-09-2016 (Authors: John Doe, user PROD) members: - - FSB1_Internal_1 - - FSB1_Internal_2 - - FSB2_Internal_1 - - FSB2_Internal_2 + - FSB_2_Internal_port_0 + - FSB_1_Internal_port_0 + - FSB_2_Internal_port_1 + - FSB_1_Internal_port_1 - FSB1_template - FSB2_template \ 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/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 ca75560607..dc3eca36bd 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 @@ -88,7 +88,7 @@ topology_template: type: string description: prop node_templates: - FSB2_Internal_2: + FSB_2_Internal_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_address: @@ -99,7 +99,7 @@ topology_template: capability: tosca.capabilities.network.Bindable node: FSB2_template relationship: tosca.relationships.network.BindsTo - FSB2_Internal_1: + FSB_1_Internal_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_address: @@ -110,7 +110,7 @@ topology_template: capability: tosca.capabilities.network.Bindable node: FSB1_template relationship: tosca.relationships.network.BindsTo - FSB1_Internal_2: + FSB_2_Internal_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_address: @@ -125,7 +125,7 @@ topology_template: capability: tosca.capabilities.network.Linkable node: jsa_net1 relationship: tosca.relationships.network.LinksTo - FSB1_Internal_1: + FSB_1_Internal_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_address: @@ -146,7 +146,7 @@ topology_template: shared: true network_name: get_attribute: - - FSB1_Internal_1 + - FSB1_0_Internal_port_0 - network_id dhcp_agent_ids: get_attribute: @@ -154,11 +154,11 @@ topology_template: - addresses tenant_id: get_attribute: - - FSB2_Internal_2 + - FSB2_1_Internal_port_0 - network_id qos_policy: get_attribute: - - FSB2_Internal_2 + - FSB2_1_Internal_port_0 - network_id FSB1_template: type: org.openecomp.resource.vfc.nodes.heat.FSB @@ -240,26 +240,23 @@ topology_template: directives: - substitutable properties: - port_FSB1_Internal_mac_address: - get_input: fsb1-Internal1-mac + port_FSB_Internal_port_0_network: + - Internal2-net-fsb2-Internal1 + - Internal2-net-fsb2-Internal2 compute_FSB_user_data: - OPTIONAL-DATA-FSB1 - null + port_FSB_Internal_port_0_mac_address: + get_input: fsb2-Internal1-mac vm_flavor_name: get_input: fsb-flavor + port_FSB_Internal_port_1_mac_address: + get_input: fsb1-Internal1-mac vm_image_name: get_input: fsb-image compute_FSB_admin_pass: - STATIC-DATA-FSB1 - STATIC-DATA-FSB2 - port_FSB1_Internal_network: - - Internal1-net-fsb1-Internal1 - - Internal1-net-fsb1-Internal2 - port_FSB2_Internal_mac_address: - get_input: fsb2-Internal1-mac - port_FSB2_Internal_network: - - Internal2-net-fsb2-Internal1 - - Internal2-net-fsb2-Internal2 compute_FSB_metadata: - write_files: - path: /path1/etc/sysconfig/network-scripts/ifcfg-eth0 @@ -273,6 +270,9 @@ topology_template: compute_FSB_name: - get_input: fsb1-name - get_input: fsb2-name + port_FSB_Internal_port_1_network: + - Internal1-net-fsb1-Internal1 + - Internal1-net-fsb1-Internal2 service_template_filter: substitute_service_template: Nested_FSBServiceTemplate.yaml count: 2 @@ -289,9 +289,9 @@ topology_template: description: | Version 2.0 02-09-2016 (Authors: John Doe, user PROD) members: - - FSB1_Internal_1 - - FSB1_Internal_2 - - FSB2_Internal_1 - - FSB2_Internal_2 + - FSB_2_Internal_port_0 + - FSB_1_Internal_port_0 + - FSB_2_Internal_port_1 + - FSB_1_Internal_port_1 - FSB1_template - FSB2_template 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 51410677fb..67a0db2542 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 @@ -150,133 +150,133 @@ topology_template: availability_zone: get_attribute: - abstract_FSB1 - - FSB1_FSB1_Port_ip_address + - FSB1_FSB1_Port_1_ip_address backup_id: get_attribute: - abstract_FSB1 - - FSB1_FSB1_Port_network + - FSB1_FSB1_Port_1_network image: get_attribute: - abstract_FSB1 - - FSB1_FSB1_Port_admin_state_up + - FSB1_FSB1_Port_1_admin_state_up metadata: get_attribute: - abstract_FSB1 - - FSB1_FSB1_Port_allowed_address_pairs + - FSB1_FSB1_Port_1_allowed_address_pairs multiattach: get_attribute: - abstract_FSB1 - - FSB1_FSB1_Port_binding:vnic_type + - FSB1_FSB1_Port_1_binding:vnic_type name: get_attribute: - abstract_FSB1 - - FSB1_FSB1_Port_device_id + - FSB1_FSB1_Port_1_device_id read_only: get_attribute: - abstract_FSB1 - - FSB1_FSB1_Port_device_owner + - FSB1_FSB1_Port_1_device_owner scheduler_hints: get_attribute: - abstract_FSB1 - - FSB1_FSB1_Port_fixed_ips + - FSB1_FSB1_Port_1_fixed_ips snapshot_id: get_attribute: - abstract_FSB1 - - FSB1_FSB1_Port_name + - FSB1_FSB1_Port_1_name source_volid: get_attribute: - abstract_FSB1 - - FSB1_FSB1_Port_port_security_enabled + - FSB1_FSB1_Port_1_port_security_enabled volume_id: get_attribute: - abstract_FSB1 - - FSB1_FSB1_Port_qos_policy + - FSB1_FSB1_Port_1_qos_policy volume_type: get_attribute: - abstract_FSB1 - - FSB1_FSB1_Port_security_groups + - FSB1_FSB1_Port_1_security_groups delete_on_termination: get_attribute: - abstract_FSB1 - - FSB1_FSB1_Port_value_specs + - FSB1_FSB1_Port_1_value_specs volume_size: get_attribute: - abstract_FSB1 - - FSB1_FSB1_Port_replacement_policy + - FSB1_FSB1_Port_1_replacement_policy device_type: get_attribute: - abstract_FSB1 - - FSB1_FSB1_Port_show + - FSB1_FSB1_Port_1_show disk_bus: get_attribute: - abstract_FSB1 - - FSB1_FSB1_Port_subnets + - FSB1_FSB1_Port_1_subnets swap_size: get_attribute: - abstract_FSB1 - - FSB1_FSB1_Port_tenant_id + - FSB1_FSB1_Port_1_tenant_id cmaui_volume_test_contrailv2_VMI_properties: type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume properties: availability_zone: get_attribute: - abstract_FSB1 - - FSB1_VMI_virtual_machine_interface_mac_addresses + - FSB1_VMI_1_virtual_machine_interface_mac_addresses description: get_attribute: - abstract_FSB1 - - FSB1_VMI_virtual_network_refs + - FSB1_VMI_1_virtual_network_refs image: get_attribute: - abstract_FSB1 - - FSB1_VMI_port_tuple_refs + - FSB1_VMI_1_port_tuple_refs metadata: get_attribute: - abstract_FSB1 - - FSB1_VMI_security_group_refs + - FSB1_VMI_1_security_group_refs multiattach: get_attribute: - abstract_FSB1 - - FSB1_VMI_virtual_machine_interface_properties + - FSB1_VMI_1_virtual_machine_interface_properties name: get_attribute: - abstract_FSB1 - - FSB1_VMI_name + - FSB1_VMI_1_name size: get_attribute: - abstract_FSB1 - - FSB1_VMI_virtual_machine_interface_allowed_address_pairs + - FSB1_VMI_1_virtual_machine_interface_allowed_address_pairs created_at: get_attribute: - abstract_FSB1 - - FSB1_VMI_fq_name + - FSB1_VMI_1_fq_name display_description: get_attribute: - abstract_FSB1 - - FSB1_VMI_show + - FSB1_VMI_1_show abstract_FSB1: type: org.openecomp.resource.abstract.nodes.FSB1 directives: - substitutable properties: - port_FSB1_Port_network: - - Internal1-net vm_flavor_name: get_input: fsb1-flavor - port_FSB1_Port_mac_address: - get_input: fsb1-Internal1-mac - compute_FSB1_availability_zone: - - get_input: fsb_zone - port_VMI_port_tuple_refs: - - - get_input: port_name - port_VMI_name: + port_VMI_1_virtual_network_refs: + - - get_input: network_name + port_VMI_1_name: - str_replace: template: VM_NAME_PORT_3 params: VM_NAME: get_input: vipr_atm_name_0 - port_VMI_virtual_network_refs: - - - get_input: network_name + port_FSB1_Port_1_mac_address: + get_input: fsb1-Internal1-mac + port_FSB1_Port_1_network: + - Internal1-net + compute_FSB1_availability_zone: + - get_input: fsb_zone + port_VMI_1_port_tuple_refs: + - - get_input: port_name service_template_filter: substitute_service_template: Nested_FSB1ServiceTemplate.yaml count: 1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updGroupsConnectivity/consolidation/in/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updGroupsConnectivity/consolidation/in/MainServiceTemplate.yaml index e6047b0c75..8df31996f6 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updGroupsConnectivity/consolidation/in/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updGroupsConnectivity/consolidation/in/MainServiceTemplate.yaml @@ -97,7 +97,7 @@ topology_template: type: string description: prop node_templates: - FSB2_Internal_2: + FSB_2_Internal_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_address: @@ -112,7 +112,7 @@ topology_template: capability: tosca.capabilities.network.Linkable node: jsa_net relationship: tosca.relationships.network.LinksTo - FSB2_Internal_1: + FSB_1_Internal_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_address: @@ -127,7 +127,7 @@ topology_template: capability: tosca.capabilities.network.Linkable node: jsa_net relationship: tosca.relationships.network.LinksTo - FSB1_Internal_2: + FSB_2_Internal_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_address: @@ -142,7 +142,7 @@ topology_template: capability: tosca.capabilities.network.Linkable node: jsa_net1 relationship: tosca.relationships.network.LinksTo - FSB1_Internal_1: + FSB_1_Internal_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_address: @@ -169,7 +169,7 @@ topology_template: shared: true network_name: get_attribute: - - FSB1_Internal_1 + - FSB_1_Internal_port_1 - network_id dhcp_agent_ids: get_attribute: @@ -177,11 +177,11 @@ topology_template: - addresses tenant_id: get_attribute: - - FSB2_Internal_2 + - FSB_2_Internal_port_0 - network_id qos_policy: get_attribute: - - FSB2_Internal_2 + - FSB_2_Internal_port_0 - network_id FSB1_template: type: org.openecomp.resource.vfc.nodes.heat.FSB @@ -249,10 +249,10 @@ topology_template: description: | Version 2.0 02-09-2016 (Authors: John Doe, user PROD) members: - - FSB1_Internal_1 - - FSB1_Internal_2 - - FSB2_Internal_1 - - FSB2_Internal_2 + - FSB_1_Internal_port_1 + - FSB_2_Internal_port_1 + - FSB_1_Internal_port_0 + - FSB_2_Internal_port_0 - FSB1_template - FSB2_template - jsa_net 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 d4722c1b28..816656eedf 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 @@ -98,7 +98,7 @@ topology_template: type: string description: prop node_templates: - FSB2_Internal_2: + FSB_2_Internal_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_address: @@ -113,7 +113,7 @@ topology_template: capability: tosca.capabilities.network.Linkable node: jsa_net relationship: tosca.relationships.network.LinksTo - FSB2_Internal_1: + FSB_1_Internal_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_address: @@ -128,7 +128,7 @@ topology_template: capability: tosca.capabilities.network.Linkable node: jsa_net relationship: tosca.relationships.network.LinksTo - FSB1_Internal_2: + FSB_2_Internal_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_address: @@ -143,7 +143,7 @@ topology_template: capability: tosca.capabilities.network.Linkable node: jsa_net1 relationship: tosca.relationships.network.LinksTo - FSB1_Internal_1: + FSB_1_Internal_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_address: @@ -171,7 +171,7 @@ topology_template: network_name: get_attribute: - abstract_FSB - - FSB_FSB1_Internal_network_id + - FSB_FSB_Internal_port_1_network_id dhcp_agent_ids: get_attribute: - abstract_FSB @@ -179,11 +179,11 @@ topology_template: tenant_id: get_attribute: - abstract_FSB - - FSB_FSB2_Internal_network_id + - FSB_FSB_Internal_port_0_network_id qos_policy: get_attribute: - abstract_FSB - - FSB_FSB2_Internal_network_id + - FSB_FSB_Internal_port_0_network_id FSB1_template: type: org.openecomp.resource.vfc.nodes.heat.FSB properties: @@ -237,26 +237,23 @@ topology_template: directives: - substitutable properties: - port_FSB1_Internal_mac_address: - get_input: fsb1-Internal1-mac + port_FSB_Internal_port_0_network: + - Internal2-net-fsb2-Internal1 + - Internal2-net-fsb2-Internal2 compute_FSB_user_data: - STATIC-DATA-FSB1 - STATIC-DATA-FSB2 + port_FSB_Internal_port_0_mac_address: + get_input: fsb2-Internal1-mac vm_flavor_name: get_input: fsb-flavor + port_FSB_Internal_port_1_mac_address: + get_input: fsb1-Internal1-mac vm_image_name: get_input: fsb-image compute_FSB_admin_pass: - OPTIONAL-DATA-FSB1 - null - port_FSB1_Internal_network: - - Internal1-net-fsb1-Internal1 - - Internal1-net-fsb1-Internal2 - port_FSB2_Internal_mac_address: - get_input: fsb2-Internal1-mac - port_FSB2_Internal_network: - - Internal2-net-fsb2-Internal1 - - Internal2-net-fsb2-Internal2 compute_FSB_metadata: - write_files: - path: /path1/etc/sysconfig/network-scripts/ifcfg-eth0 @@ -270,6 +267,9 @@ topology_template: compute_FSB_name: - get_input: fsb1-name - get_input: fsb2-name + port_FSB_Internal_port_1_network: + - Internal1-net-fsb1-Internal1 + - Internal1-net-fsb1-Internal2 service_template_filter: substitute_service_template: Nested_FSBServiceTemplate.yaml count: 2 @@ -283,13 +283,13 @@ topology_template: capability: tosca.capabilities.Node node: packet_mirror_network relationship: tosca.relationships.DependsOn - - link_FSB_FSB1_Internal: + - link_FSB_FSB_Internal_port_0: capability: tosca.capabilities.network.Linkable - node: jsa_net1 + node: jsa_net relationship: tosca.relationships.network.LinksTo - - link_FSB_FSB2_Internal: + - link_FSB_FSB_Internal_port_1: capability: tosca.capabilities.network.Linkable - node: jsa_net + node: jsa_net1 relationship: tosca.relationships.network.LinksTo groups: FE_SMP_Affinity_group: @@ -307,10 +307,10 @@ topology_template: description: | Version 2.0 02-09-2016 (Authors: John Doe, user PROD) members: - - FSB1_Internal_1 - - FSB1_Internal_2 - - FSB2_Internal_1 - - FSB2_Internal_2 + - FSB_1_Internal_port_1 + - FSB_2_Internal_port_1 + - FSB_1_Internal_port_0 + - FSB_2_Internal_port_0 - FSB1_template - FSB2_template - jsa_net diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedIn/consolidation/in/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedIn/consolidation/in/MainServiceTemplate.yaml index 4f01d254bd..b2c19fa9d3 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedIn/consolidation/in/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedIn/consolidation/in/MainServiceTemplate.yaml @@ -97,7 +97,7 @@ topology_template: type: string description: prop node_templates: - FSB2_Internal_2: + FSB_2_Internal_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_address: @@ -112,7 +112,7 @@ topology_template: capability: tosca.capabilities.network.Linkable node: jsa_net relationship: tosca.relationships.network.LinksTo - FSB2_Internal_1: + FSB_1_Internal_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_address: @@ -127,7 +127,7 @@ topology_template: capability: tosca.capabilities.network.Linkable node: jsa_net relationship: tosca.relationships.network.LinksTo - FSB1_Internal_2: + FSB_2_Internal_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_address: @@ -142,7 +142,7 @@ topology_template: capability: tosca.capabilities.network.Linkable node: jsa_net1 relationship: tosca.relationships.network.LinksTo - FSB1_Internal_1: + FSB_1_Internal_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_address: @@ -169,7 +169,7 @@ topology_template: shared: true network_name: get_attribute: - - FSB1_Internal_1 + - FSB_1_Internal_port_1 - network_id dhcp_agent_ids: get_attribute: @@ -177,11 +177,11 @@ topology_template: - addresses tenant_id: get_attribute: - - FSB2_Internal_2 + - FSB_2_Internal_port_0 - network_id qos_policy: get_attribute: - - FSB2_Internal_2 + - FSB_2_Internal_port_0 - network_id FSB1_template: type: org.openecomp.resource.vfc.nodes.heat.FSB @@ -242,11 +242,11 @@ topology_template: requirements: - port: capability: tosca.capabilities.Attachment - node: FSB1_Internal_1 + node: FSB_1_Internal_port_1 relationship: org.openecomp.relationships.AttachesTo - port: capability: tosca.capabilities.Attachment - node: FSB1_Internal_2 + node: FSB_2_Internal_port_1 relationship: org.openecomp.relationships.AttachesTo groups: ep-jsa_net_group: @@ -256,10 +256,10 @@ topology_template: description: | Version 2.0 02-09-2016 (Authors: John Doe, user PROD) members: - - FSB1_Internal_1 - - FSB1_Internal_2 - - FSB2_Internal_1 - - FSB2_Internal_2 + - FSB_1_Internal_port_1 + - FSB_2_Internal_port_1 + - FSB_1_Internal_port_0 + - FSB_2_Internal_port_0 - FSB1_template - FSB2_template - jsa_net 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 df2509108f..bd3873ee80 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 @@ -98,7 +98,7 @@ topology_template: type: string description: prop node_templates: - FSB2_Internal_2: + FSB_2_Internal_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_address: @@ -113,7 +113,7 @@ topology_template: capability: tosca.capabilities.network.Linkable node: jsa_net relationship: tosca.relationships.network.LinksTo - FSB2_Internal_1: + FSB_1_Internal_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_address: @@ -128,7 +128,7 @@ topology_template: capability: tosca.capabilities.network.Linkable node: jsa_net relationship: tosca.relationships.network.LinksTo - FSB1_Internal_2: + FSB_2_Internal_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_address: @@ -143,7 +143,7 @@ topology_template: capability: tosca.capabilities.network.Linkable node: jsa_net1 relationship: tosca.relationships.network.LinksTo - FSB1_Internal_1: + FSB_1_Internal_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_address: @@ -171,7 +171,7 @@ topology_template: network_name: get_attribute: - abstract_FSB - - FSB_FSB1_Internal_network_id + - FSB_FSB_Internal_port_1_network_id dhcp_agent_ids: get_attribute: - abstract_FSB @@ -179,11 +179,11 @@ topology_template: tenant_id: get_attribute: - abstract_FSB - - FSB_FSB2_Internal_network_id + - FSB_FSB_Internal_port_0_network_id qos_policy: get_attribute: - abstract_FSB - - FSB_FSB2_Internal_network_id + - FSB_FSB_Internal_port_0_network_id FSB1_template: type: org.openecomp.resource.vfc.nodes.heat.FSB properties: @@ -242,7 +242,7 @@ topology_template: port_range_min: 1 requirements: - port: - capability: attachment_FSB_FSB1_Internal + capability: attachment_FSB_FSB_Internal_port_1 node: abstract_FSB relationship: org.openecomp.relationships.AttachesTo abstract_FSB: @@ -250,26 +250,23 @@ topology_template: directives: - substitutable properties: - port_FSB1_Internal_mac_address: - get_input: fsb1-Internal1-mac + port_FSB_Internal_port_0_network: + - Internal2-net-fsb2-Internal1 + - Internal2-net-fsb2-Internal2 compute_FSB_user_data: - OPTIONAL-DATA-FSB1 - null + port_FSB_Internal_port_0_mac_address: + get_input: fsb2-Internal1-mac vm_flavor_name: get_input: fsb-flavor + port_FSB_Internal_port_1_mac_address: + get_input: fsb1-Internal1-mac vm_image_name: get_input: fsb-image compute_FSB_admin_pass: - STATIC-DATA-FSB1 - STATIC-DATA-FSB2 - port_FSB1_Internal_network: - - Internal1-net-fsb1-Internal1 - - Internal1-net-fsb1-Internal2 - port_FSB2_Internal_mac_address: - get_input: fsb2-Internal1-mac - port_FSB2_Internal_network: - - Internal2-net-fsb2-Internal1 - - Internal2-net-fsb2-Internal2 compute_FSB_metadata: - write_files: - path: /path1/etc/sysconfig/network-scripts/ifcfg-eth0 @@ -283,6 +280,9 @@ topology_template: compute_FSB_name: - get_input: fsb1-name - get_input: fsb2-name + port_FSB_Internal_port_1_network: + - Internal1-net-fsb1-Internal1 + - Internal1-net-fsb1-Internal2 service_template_filter: substitute_service_template: Nested_FSBServiceTemplate.yaml count: 2 @@ -292,13 +292,13 @@ topology_template: - service_template_filter - index_value requirements: - - link_FSB_FSB1_Internal: + - link_FSB_FSB_Internal_port_0: capability: tosca.capabilities.network.Linkable - node: jsa_net1 + node: jsa_net relationship: tosca.relationships.network.LinksTo - - link_FSB_FSB2_Internal: + - link_FSB_FSB_Internal_port_1: capability: tosca.capabilities.network.Linkable - node: jsa_net + node: jsa_net1 relationship: tosca.relationships.network.LinksTo groups: ep-jsa_net_group: @@ -308,10 +308,10 @@ topology_template: description: | Version 2.0 02-09-2016 (Authors: John Doe, user PROD) members: - - FSB1_Internal_1 - - FSB1_Internal_2 - - FSB2_Internal_1 - - FSB2_Internal_2 + - FSB_1_Internal_port_1 + - FSB_2_Internal_port_1 + - FSB_1_Internal_port_0 + - FSB_2_Internal_port_0 - FSB1_template - FSB2_template - jsa_net diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedOut/consolidation/in/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedOut/consolidation/in/MainServiceTemplate.yaml index 7c516d8e51..19b50897b3 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedOut/consolidation/in/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedOut/consolidation/in/MainServiceTemplate.yaml @@ -97,7 +97,7 @@ topology_template: type: string description: prop node_templates: - FSB2_Internal_2: + FSB_2_Internal_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_address: @@ -112,7 +112,7 @@ topology_template: capability: tosca.capabilities.network.Linkable node: jsa_net relationship: tosca.relationships.network.LinksTo - FSB2_Internal_1: + FSB_1_Internal_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_address: @@ -127,7 +127,7 @@ topology_template: capability: tosca.capabilities.network.Linkable node: jsa_net relationship: tosca.relationships.network.LinksTo - FSB1_Internal_2: + FSB_2_Internal_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_address: @@ -142,7 +142,7 @@ topology_template: capability: tosca.capabilities.network.Linkable node: jsa_net1 relationship: tosca.relationships.network.LinksTo - FSB1_Internal_1: + FSB_1_Internal_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_address: @@ -169,7 +169,7 @@ topology_template: shared: true network_name: get_attribute: - - FSB1_Internal_1 + - FSB_1_Internal_port_1 - network_id dhcp_agent_ids: get_attribute: @@ -177,11 +177,11 @@ topology_template: - addresses tenant_id: get_attribute: - - FSB2_Internal_2 + - FSB_2_Internal_port_0 - network_id qos_policy: get_attribute: - - FSB2_Internal_2 + - FSB_2_Internal_port_0 - network_id FSB1_template: type: org.openecomp.resource.vfc.nodes.heat.FSB @@ -239,10 +239,10 @@ topology_template: description: | Version 2.0 02-09-2016 (Authors: John Doe, user PROD) members: - - FSB1_Internal_1 - - FSB1_Internal_2 - - FSB2_Internal_1 - - FSB2_Internal_2 + - FSB_1_Internal_port_1 + - FSB_2_Internal_port_1 + - FSB_1_Internal_port_0 + - FSB_2_Internal_port_0 - FSB1_template - FSB2_template - jsa_net 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 5071ce06a4..1091de0a27 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 @@ -98,7 +98,7 @@ topology_template: type: string description: prop node_templates: - FSB2_Internal_2: + FSB_2_Internal_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_address: @@ -113,7 +113,7 @@ topology_template: capability: tosca.capabilities.network.Linkable node: jsa_net relationship: tosca.relationships.network.LinksTo - FSB2_Internal_1: + FSB_1_Internal_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_address: @@ -128,7 +128,7 @@ topology_template: capability: tosca.capabilities.network.Linkable node: jsa_net relationship: tosca.relationships.network.LinksTo - FSB1_Internal_2: + FSB_2_Internal_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_address: @@ -143,7 +143,7 @@ topology_template: capability: tosca.capabilities.network.Linkable node: jsa_net1 relationship: tosca.relationships.network.LinksTo - FSB1_Internal_1: + FSB_1_Internal_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_address: @@ -171,7 +171,7 @@ topology_template: network_name: get_attribute: - abstract_FSB - - FSB_FSB1_Internal_network_id + - FSB_FSB_Internal_port_1_network_id dhcp_agent_ids: get_attribute: - abstract_FSB @@ -179,11 +179,11 @@ topology_template: tenant_id: get_attribute: - abstract_FSB - - FSB_FSB2_Internal_network_id + - FSB_FSB_Internal_port_0_network_id qos_policy: get_attribute: - abstract_FSB - - FSB_FSB2_Internal_network_id + - FSB_FSB_Internal_port_0_network_id FSB1_template: type: org.openecomp.resource.vfc.nodes.heat.FSB properties: @@ -237,26 +237,23 @@ topology_template: directives: - substitutable properties: - port_FSB1_Internal_mac_address: - get_input: fsb1-Internal1-mac + port_FSB_Internal_port_0_network: + - Internal2-net-fsb2-Internal1 + - Internal2-net-fsb2-Internal2 compute_FSB_user_data: - OPTIONAL-DATA-FSB1 - null + port_FSB_Internal_port_0_mac_address: + get_input: fsb2-Internal1-mac vm_flavor_name: get_input: fsb-flavor + port_FSB_Internal_port_1_mac_address: + get_input: fsb1-Internal1-mac vm_image_name: get_input: fsb-image compute_FSB_admin_pass: - STATIC-DATA-FSB1 - STATIC-DATA-FSB2 - port_FSB1_Internal_network: - - Internal1-net-fsb1-Internal1 - - Internal1-net-fsb1-Internal2 - port_FSB2_Internal_mac_address: - get_input: fsb2-Internal1-mac - port_FSB2_Internal_network: - - Internal2-net-fsb2-Internal1 - - Internal2-net-fsb2-Internal2 compute_FSB_metadata: - write_files: - path: /path1/etc/sysconfig/network-scripts/ifcfg-eth0 @@ -270,6 +267,9 @@ topology_template: compute_FSB_name: - get_input: fsb1-name - get_input: fsb2-name + port_FSB_Internal_port_1_network: + - Internal1-net-fsb1-Internal1 + - Internal1-net-fsb1-Internal2 service_template_filter: substitute_service_template: Nested_FSBServiceTemplate.yaml count: 2 @@ -283,13 +283,13 @@ topology_template: capability: tosca.capabilities.Node node: packet_mirror_network relationship: tosca.relationships.DependsOn - - link_FSB_FSB1_Internal: + - link_FSB_FSB_Internal_port_0: capability: tosca.capabilities.network.Linkable - node: jsa_net1 + node: jsa_net relationship: tosca.relationships.network.LinksTo - - link_FSB_FSB2_Internal: + - link_FSB_FSB_Internal_port_1: capability: tosca.capabilities.network.Linkable - node: jsa_net + node: jsa_net1 relationship: tosca.relationships.network.LinksTo groups: ep-jsa_net_group: @@ -299,10 +299,10 @@ topology_template: description: | Version 2.0 02-09-2016 (Authors: John Doe, user PROD) members: - - FSB1_Internal_1 - - FSB1_Internal_2 - - FSB2_Internal_1 - - FSB2_Internal_2 + - FSB_1_Internal_port_1 + - FSB_2_Internal_port_1 + - FSB_1_Internal_port_0 + - FSB_2_Internal_port_0 - FSB1_template - FSB2_template - jsa_net diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedOut/noConsolidation/in/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedOut/noConsolidation/in/MainServiceTemplate.yaml index 122b625268..74ae283a99 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedOut/noConsolidation/in/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedOut/noConsolidation/in/MainServiceTemplate.yaml @@ -72,7 +72,7 @@ topology_template: type: string description: prop node_templates: - FSB2_Internal_2: + FSB_2_Internal_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_address: @@ -83,7 +83,7 @@ topology_template: capability: tosca.capabilities.network.Bindable node: FSB1_template relationship: tosca.relationships.network.BindsTo - FSB1_Internal_1: + FSB_1_Internal_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_address: @@ -120,7 +120,7 @@ topology_template: shared: true network_name: get_attribute: - - FSB1_Internal_1 + - FSB_1_Internal_port_1 - network_id dhcp_agent_ids: get_attribute: @@ -128,11 +128,11 @@ topology_template: - addresses tenant_id: get_attribute: - - FSB2_Internal_2 + - FSB_2_Internal_port_0 - network_id qos_policy: get_attribute: - - FSB2_Internal_2 + - FSB_2_Internal_port_0 - network_id FSB1_template: type: org.openecomp.resource.vfc.nodes.heat.FSB @@ -175,8 +175,8 @@ topology_template: description: | Version 2.0 02-09-2016 (Authors: John Doe, user PROD) members: - - FSB2_Internal_2 - - FSB1_Internal_1 + - FSB_2_Internal_port_0 + - FSB_1_Internal_port_1 - FSB1_OAM - FSB1_template - packet_mirror_network_name \ 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/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 a881a1e458..3b5922aeb3 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 @@ -73,7 +73,7 @@ topology_template: type: string description: prop node_templates: - FSB2_Internal_2: + FSB_2_Internal_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_address: @@ -84,7 +84,7 @@ topology_template: capability: tosca.capabilities.network.Bindable node: FSB1_template relationship: tosca.relationships.network.BindsTo - FSB1_Internal_1: + FSB_1_Internal_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_address: @@ -122,7 +122,7 @@ topology_template: network_name: get_attribute: - abstract_FSB - - FSB_FSB1_Internal_network_id + - FSB_FSB_Internal_port_1_network_id dhcp_agent_ids: get_attribute: - abstract_FSB @@ -130,11 +130,11 @@ topology_template: tenant_id: get_attribute: - abstract_FSB - - FSB_FSB2_Internal_network_id + - FSB_FSB_Internal_port_0_network_id qos_policy: get_attribute: - abstract_FSB - - FSB_FSB2_Internal_network_id + - FSB_FSB_Internal_port_0_network_id FSB1_template: type: org.openecomp.resource.vfc.nodes.heat.FSB properties: @@ -173,22 +173,20 @@ topology_template: directives: - substitutable properties: - port_FSB1_Internal_mac_address: - get_input: fsb1-Internal1-mac + port_FSB_Internal_port_0_network: + - Internal2-net + port_FSB_Internal_port_0_mac_address: + get_input: fsb1-Internal2-mac vm_flavor_name: get_input: fsb-flavor + port_FSB_Internal_port_1_mac_address: + get_input: fsb1-Internal1-mac vm_image_name: get_input: fsb-image compute_FSB_admin_pass: - STATIC-DATA-FSB1 - port_FSB1_Internal_network: - - Internal1-net - port_FSB2_Internal_mac_address: - get_input: fsb1-Internal2-mac port_FSB1_OAM_network: - jsa_net1 - port_FSB2_Internal_network: - - Internal2-net compute_FSB_metadata: - write_files: - path: /path1/etc/sysconfig/network-scripts/ifcfg-eth0 @@ -200,6 +198,8 @@ topology_template: get_input: fsb1-oam-ip compute_FSB_name: - get_input: fsb1-name + port_FSB_Internal_port_1_network: + - Internal1-net service_template_filter: substitute_service_template: Nested_FSBServiceTemplate.yaml count: 1 @@ -213,7 +213,7 @@ topology_template: capability: tosca.capabilities.Node node: packet_mirror_network relationship: tosca.relationships.DependsOn - - link_FSB_FSB1_Internal: + - link_FSB_FSB_Internal_port_1: capability: tosca.capabilities.network.Linkable node: jsa_net1 relationship: tosca.relationships.network.LinksTo @@ -229,8 +229,8 @@ topology_template: description: | Version 2.0 02-09-2016 (Authors: John Doe, user PROD) members: - - FSB2_Internal_2 - - FSB1_Internal_1 + - FSB_2_Internal_port_0 + - FSB_1_Internal_port_1 - FSB1_OAM - FSB1_template - packet_mirror_network_name diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesGetAttrIn/consolidation/in/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesGetAttrIn/consolidation/in/MainServiceTemplate.yaml index 60f0fe8c71..1532ed0890 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesGetAttrIn/consolidation/in/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesGetAttrIn/consolidation/in/MainServiceTemplate.yaml @@ -106,7 +106,7 @@ topology_template: type: string description: prop node_templates: - FSB2_Internal_2: + FSB_1_Internal_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_address: @@ -117,7 +117,7 @@ topology_template: capability: tosca.capabilities.network.Bindable node: FSB1_template relationship: tosca.relationships.network.BindsTo - FSB2_Internal_1: + FSB_2_Internal_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_address: @@ -128,7 +128,7 @@ topology_template: capability: tosca.capabilities.network.Bindable node: FSB2_template relationship: tosca.relationships.network.BindsTo - FSB1_Internal_1: + FSB_1_Internal_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_address: @@ -143,7 +143,7 @@ topology_template: capability: tosca.capabilities.network.Linkable node: jsa_net1 relationship: tosca.relationships.network.LinksTo - FSB1_Internal_2: + FSB_2_Internal_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_address: @@ -164,7 +164,7 @@ topology_template: shared: true network_name: get_attribute: - - FSB1_Internal_1 + - FSB_1_Internal_port_1 - network_id dhcp_agent_ids: get_attribute: @@ -172,11 +172,11 @@ topology_template: - addresses tenant_id: get_attribute: - - FSB2_Internal_2 + - FSB_1_Internal_port_0 - network_id qos_policy: get_attribute: - - FSB2_Internal_2 + - FSB_1_Internal_port_0 - network_id FSB1_template: type: org.openecomp.resource.vfc.nodes.heat.FSB1 @@ -295,8 +295,8 @@ topology_template: cmaui_volume1: type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume properties: - volume_type: {get_attribute: [ FSB1_template, addresses, {get_attribute: [ FSB2_Internal_2,tenant_id ] } ]} - size: { get_attribute: [FSB1_Internal_1, device_owner, get_input: [CMAUI_volume_type,{get_attribute: [FSB1_Internal_2,status ] }], 0, "OS-EXT-IPS-MAC:mac_addr"] } + volume_type: {get_attribute: [ FSB1_template, addresses, {get_attribute: [ FSB_1_Internal_port_0,tenant_id ] } ]} + size: { get_attribute: [FSB_1_Internal_port_1, device_owner, get_input: [CMAUI_volume_type,{get_attribute: [FSB_2_Internal_port_1,status ] }], 0, "OS-EXT-IPS-MAC:mac_addr"] } cmaui_volume2: type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume properties: @@ -306,8 +306,8 @@ topology_template: cmaui_volume3: type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume properties: - volume_type: {get_attribute: [ FSB2_template, addresses, {get_attribute: [ FSB2_Internal_1,tenant_id ] } ]} - size: { get_attribute: [FSB1_Internal_2, device_owner, get_input: [CMAUI_volume_type,{get_attribute: [FSB2_template,user_data_format ] }], 0, "OS-EXT-IPS-MAC:mac_addr"] } + volume_type: {get_attribute: [ FSB2_template, addresses, {get_attribute: [ FSB_2_Internal_port_0,tenant_id ] } ]} + size: { get_attribute: [FSB_2_Internal_port_1, device_owner, get_input: [CMAUI_volume_type,{get_attribute: [FSB2_template,user_data_format ] }], 0, "OS-EXT-IPS-MAC:mac_addr"] } groups: ep-jsa_net_group: type: org.openecomp.groups.heat.HeatStack @@ -316,9 +316,9 @@ topology_template: description: | Version 2.0 02-09-2016 (Authors: John Doe, user PROD) members: - - FSB2_Internal_2 - - FSB2_Internal_1 - - FSB1_Internal_1 - - FSB1_Internal_2 + - FSB_1_Internal_port_0 + - FSB_2_Internal_port_0 + - FSB_1_Internal_port_1 + - FSB_2_Internal_port_1 - FSB1_template - FSB2_template \ 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/updNodesGetAttrIn/consolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesGetAttrIn/consolidation/out/MainServiceTemplate.yaml index 1d388a986d..22fdf971f6 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesGetAttrIn/consolidation/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesGetAttrIn/consolidation/out/MainServiceTemplate.yaml @@ -106,7 +106,7 @@ topology_template: type: string description: prop node_templates: - FSB2_Internal_2: + FSB_1_Internal_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_address: @@ -117,7 +117,7 @@ topology_template: capability: tosca.capabilities.network.Bindable node: FSB1_template relationship: tosca.relationships.network.BindsTo - FSB2_Internal_1: + FSB_2_Internal_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_address: @@ -128,7 +128,7 @@ topology_template: capability: tosca.capabilities.network.Bindable node: FSB2_template relationship: tosca.relationships.network.BindsTo - FSB1_Internal_1: + FSB_1_Internal_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_address: @@ -143,7 +143,7 @@ topology_template: capability: tosca.capabilities.network.Linkable node: jsa_net1 relationship: tosca.relationships.network.LinksTo - FSB1_Internal_2: + FSB_2_Internal_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_address: @@ -165,19 +165,19 @@ topology_template: network_name: get_attribute: - FSB1 - - FSB1_FSB1_Internal_network_id + - FSB1_FSB_1_Internal_port_1_network_id dhcp_agent_ids: get_attribute: - FSB1 - FSB1_addresses tenant_id: get_attribute: - - FSB1 - - FSB1_FSB2_Internal_network_id + - FSB_1_Internal_port_0 + - network_id qos_policy: get_attribute: - - FSB1 - - FSB1_FSB2_Internal_network_id + - FSB_1_Internal_port_0 + - network_id FSB1_template: type: org.openecomp.resource.vfc.nodes.heat.FSB1 properties: @@ -300,17 +300,17 @@ topology_template: - FSB1 - FSB1_addresses - get_attribute: - - FSB1 - - FSB1_FSB2_Internal_tenant_id + - FSB_1_Internal_port_0 + - tenant_id size: get_attribute: - FSB1 - - FSB1_FSB1_Internal_device_owner + - FSB1_FSB_1_Internal_port_1_device_owner - get_input: - CMAUI_volume_type - get_attribute: - - FSB1 - - FSB1_FSB1_Internal_status + - FSB_2_Internal_port_1 + - status - 0 - OS-EXT-IPS-MAC:mac_addr cmaui_volume2: @@ -337,12 +337,12 @@ topology_template: - FSB1 - FSB1_addresses - get_attribute: - - FSB1 - - FSB1_FSB2_Internal_tenant_id + - FSB_2_Internal_port_0 + - tenant_id size: get_attribute: - - FSB1 - - FSB1_FSB1_Internal_device_owner + - FSB_2_Internal_port_1 + - device_owner - get_input: - CMAUI_volume_type - get_attribute: @@ -358,9 +358,9 @@ topology_template: description: | Version 2.0 02-09-2016 (Authors: John Doe, user PROD) members: - - FSB2_Internal_2 - - FSB2_Internal_1 - - FSB1_Internal_1 - - FSB1_Internal_2 + - FSB_1_Internal_port_0 + - FSB_2_Internal_port_0 + - FSB_1_Internal_port_1 + - FSB_2_Internal_port_1 - FSB1_template - FSB2_template diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesGetAttrIn/noConsolidation/in/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesGetAttrIn/noConsolidation/in/MainServiceTemplate.yaml index c6508ed192..3a4a08a0ac 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesGetAttrIn/noConsolidation/in/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesGetAttrIn/noConsolidation/in/MainServiceTemplate.yaml @@ -106,7 +106,7 @@ topology_template: type: string description: prop node_templates: - FSB2_Internal_2: + FSB_2_Internal_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_address: @@ -117,7 +117,7 @@ topology_template: capability: tosca.capabilities.network.Bindable node: FSB1_template relationship: tosca.relationships.network.BindsTo - FSB1_Internal_1: + FSB_1_Internal_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_address: @@ -154,7 +154,7 @@ topology_template: shared: true network_name: get_attribute: - - FSB1_Internal_1 + - FSB_1_Internal_port_1 - network_id dhcp_agent_ids: get_attribute: @@ -162,11 +162,11 @@ topology_template: - addresses tenant_id: get_attribute: - - FSB2_Internal_2 + - FSB_2_Internal_port_0 - network_id qos_policy: get_attribute: - - FSB2_Internal_2 + - FSB_2_Internal_port_0 - network_id FSB1_template: type: org.openecomp.resource.vfc.nodes.heat.FSB1 @@ -174,11 +174,11 @@ topology_template: flavor: get_input: fsb1-flavor availability_zone: - get_attribute: [ FSB1_Internal_1, myAttr, get_attribute: [FSB1_Internal_1, index] ] + get_attribute: [ FSB_1_Internal_port_1, myAttr, get_attribute: [FSB_1_Internal_port_1, index] ] metadata: - get_attribute: [ FSB1_Internal_1, myAttr, get_input: index ] + get_attribute: [ FSB_1_Internal_port_1, myAttr, get_input: index ] name: - get_attribute: [ FSB1_Internal_1, myAttr, get_attribute: [jsa_net1, index] ] + get_attribute: [ FSB_1_Internal_port_1, myAttr, get_attribute: [jsa_net1, index] ] artifacts: nimbus-ethernet-gw: type: tosca.artifacts.Deployment @@ -198,8 +198,8 @@ topology_template: cmaui_volume1: type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume properties: - volume_type: {get_attribute: [ FSB1_template, addresses, {get_attribute: [ FSB2_Internal_2,tenant_id ] } ]} - size: { get_attribute: [FSB1_Internal_1, device_owner, get_input: [CMAUI_volume_type,{get_attribute: [FSB1_OAM,status ] }], 0, "OS-EXT-IPS-MAC:mac_addr"] } + volume_type: {get_attribute: [ FSB1_template, addresses, {get_attribute: [ FSB_2_Internal_port_0,tenant_id ] } ]} + size: { get_attribute: [FSB_1_Internal_port_1, device_owner, get_input: [CMAUI_volume_type,{get_attribute: [FSB1_OAM,status ] }], 0, "OS-EXT-IPS-MAC:mac_addr"] } cmaui_volume2: type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume properties: @@ -214,7 +214,7 @@ topology_template: description: | Version 2.0 02-09-2016 (Authors: John Doe, user PROD) members: - - FSB2_Internal_2 - - FSB1_Internal_1 + - FSB_2_Internal_port_0 + - FSB_1_Internal_port_1 - FSB1_OAM - FSB1_template diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesGetAttrIn/noConsolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesGetAttrIn/noConsolidation/out/MainServiceTemplate.yaml index 787cd5ee2f..d0718df172 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesGetAttrIn/noConsolidation/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesGetAttrIn/noConsolidation/out/MainServiceTemplate.yaml @@ -106,7 +106,7 @@ topology_template: type: string description: prop node_templates: - FSB2_Internal_2: + FSB_2_Internal_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_address: @@ -117,7 +117,7 @@ topology_template: capability: tosca.capabilities.network.Bindable node: FSB1_template relationship: tosca.relationships.network.BindsTo - FSB1_Internal_1: + FSB_1_Internal_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_address: @@ -157,7 +157,7 @@ topology_template: network_name: get_attribute: - FSB1 - - FSB1_FSB1_Internal_network_id + - FSB1_FSB_1_Internal_port_1_network_id dhcp_agent_ids: get_attribute: - FSB1 @@ -165,11 +165,11 @@ topology_template: tenant_id: get_attribute: - FSB1 - - FSB1_FSB2_Internal_network_id + - FSB1_FSB_2_Internal_port_0_network_id qos_policy: get_attribute: - FSB1 - - FSB1_FSB2_Internal_network_id + - FSB1_FSB_2_Internal_port_0_network_id FSB1_template: type: org.openecomp.resource.vfc.nodes.heat.FSB1 properties: @@ -177,19 +177,19 @@ topology_template: get_input: fsb1-flavor availability_zone: get_attribute: - - FSB1_Internal_1 + - FSB_1_Internal_port_1 - myAttr - get_attribute: - - FSB1_Internal_1 + - FSB_1_Internal_port_1 - index metadata: get_attribute: - - FSB1_Internal_1 + - FSB_1_Internal_port_1 - myAttr - get_input: index name: get_attribute: - - FSB1_Internal_1 + - FSB_1_Internal_port_1 - myAttr - get_attribute: - jsa_net1 @@ -219,11 +219,11 @@ topology_template: - FSB1_addresses - get_attribute: - FSB1 - - FSB1_FSB2_Internal_tenant_id + - FSB1_FSB_2_Internal_port_0_tenant_id size: get_attribute: - FSB1 - - FSB1_FSB1_Internal_device_owner + - FSB1_FSB_1_Internal_port_1_device_owner - get_input: - CMAUI_volume_type - get_attribute: @@ -255,7 +255,7 @@ topology_template: description: | Version 2.0 02-09-2016 (Authors: John Doe, user PROD) members: - - FSB2_Internal_2 - - FSB1_Internal_1 + - FSB_2_Internal_port_0 + - FSB_1_Internal_port_1 - FSB1_OAM - FSB1_template diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updOutputGetAttrIn/consolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updOutputGetAttrIn/consolidation/out/MainServiceTemplate.yaml index 73c7302fc1..8dd35a7ea8 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updOutputGetAttrIn/consolidation/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updOutputGetAttrIn/consolidation/out/MainServiceTemplate.yaml @@ -337,7 +337,7 @@ topology_template: - FSB1_addresses - get_attribute: - FSB1 - - FSB1_FSB2_Internal_tenant_id + - FSB1_FSB2_Internal_2_tenant_id complexOutput2: description: cgi fw01 left interface Mac-Address value: @@ -348,7 +348,7 @@ topology_template: - CMAUI_volume_type - get_attribute: - FSB1 - - FSB1_FSB2_Internal_user_data_format + - FSB1_FSB2_Internal_1_user_data_format - 0 - OS-EXT-IPS-MAC:mac_addr complexOutput3: @@ -361,6 +361,6 @@ topology_template: - CMAUI_volume_type - get_attribute: - FSB1 - - FSB1_FSB1_Internal_admin_state_up + - FSB1_FSB1_Internal_1_admin_state_up - 0 - OS-EXT-IPS-MAC:mac_addr diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updOutputGetAttrIn/noConsolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updOutputGetAttrIn/noConsolidation/out/MainServiceTemplate.yaml index a2128485e1..7ace2d34fd 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updOutputGetAttrIn/noConsolidation/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updOutputGetAttrIn/noConsolidation/out/MainServiceTemplate.yaml @@ -268,13 +268,13 @@ topology_template: - FSB1_addresses - get_attribute: - FSB1 - - FSB1_FSB2_Internal_tenant_id + - FSB1_FSB2_Internal_2_tenant_id complexOutput2: description: cgi fw01 left interface Mac-Address value: get_attribute: - FSB1 - - FSB1_FSB1_Internal_device_owner + - FSB1_FSB1_Internal_1_device_owner - get_input: - CMAUI_volume_type - get_attribute: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updVolumes/consolidation/in/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updVolumes/consolidation/in/MainServiceTemplate.yaml index 386bbd0bdf..810968f5ec 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updVolumes/consolidation/in/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updVolumes/consolidation/in/MainServiceTemplate.yaml @@ -97,7 +97,7 @@ topology_template: type: string description: prop node_templates: - FSB2_Internal_2: + FSB_2_Internal_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_address: @@ -112,7 +112,7 @@ topology_template: capability: tosca.capabilities.network.Linkable node: jsa_net relationship: tosca.relationships.network.LinksTo - FSB2_Internal_1: + FSB_1_Internal_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_address: @@ -127,7 +127,7 @@ topology_template: capability: tosca.capabilities.network.Linkable node: jsa_net relationship: tosca.relationships.network.LinksTo - FSB1_Internal_2: + FSB_2_Internal_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_address: @@ -142,7 +142,7 @@ topology_template: capability: tosca.capabilities.network.Linkable node: jsa_net1 relationship: tosca.relationships.network.LinksTo - FSB1_Internal_1: + FSB_1_Internal_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_address: @@ -169,7 +169,7 @@ topology_template: shared: true network_name: get_attribute: - - FSB1_Internal_1 + - FSB_1_Internal_port_1 - network_id dhcp_agent_ids: get_attribute: @@ -177,11 +177,11 @@ topology_template: - addresses tenant_id: get_attribute: - - FSB2_Internal_2 + - FSB_2_Internal_port_0 - network_id qos_policy: get_attribute: - - FSB2_Internal_2 + - FSB_2_Internal_port_0 - network_id FSB1_template: type: org.openecomp.resource.vfc.nodes.heat.FSB @@ -279,10 +279,10 @@ topology_template: description: | Version 2.0 02-09-2016 (Authors: John Doe, user PROD) members: - - FSB1_Internal_1 - - FSB1_Internal_2 - - FSB2_Internal_1 - - FSB2_Internal_2 + - FSB_1_Internal_port_1 + - FSB_2_Internal_port_1 + - FSB_1_Internal_port_0 + - FSB_2_Internal_port_0 - FSB1_template - FSB2_template - jsa_net 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 6ae9f35a2a..808ff5602d 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 @@ -98,7 +98,7 @@ topology_template: type: string description: prop node_templates: - FSB2_Internal_2: + FSB_2_Internal_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_address: @@ -113,7 +113,7 @@ topology_template: capability: tosca.capabilities.network.Linkable node: jsa_net relationship: tosca.relationships.network.LinksTo - FSB2_Internal_1: + FSB_1_Internal_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_address: @@ -128,7 +128,7 @@ topology_template: capability: tosca.capabilities.network.Linkable node: jsa_net relationship: tosca.relationships.network.LinksTo - FSB1_Internal_2: + FSB_2_Internal_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_address: @@ -143,7 +143,7 @@ topology_template: capability: tosca.capabilities.network.Linkable node: jsa_net1 relationship: tosca.relationships.network.LinksTo - FSB1_Internal_1: + FSB_1_Internal_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_address: @@ -171,7 +171,7 @@ topology_template: network_name: get_attribute: - abstract_FSB - - FSB_FSB1_Internal_network_id + - FSB_FSB_Internal_port_1_network_id dhcp_agent_ids: get_attribute: - abstract_FSB @@ -179,11 +179,11 @@ topology_template: tenant_id: get_attribute: - abstract_FSB - - FSB_FSB2_Internal_network_id + - FSB_FSB_Internal_port_0_network_id qos_policy: get_attribute: - abstract_FSB - - FSB_FSB2_Internal_network_id + - FSB_FSB_Internal_port_0_network_id FSB1_template: type: org.openecomp.resource.vfc.nodes.heat.FSB properties: @@ -277,26 +277,23 @@ topology_template: directives: - substitutable properties: - port_FSB1_Internal_mac_address: - get_input: fsb1-Internal1-mac + port_FSB_Internal_port_0_network: + - Internal2-net-fsb2-Internal1 + - Internal2-net-fsb2-Internal2 compute_FSB_user_data: - OPTIONAL-DATA-FSB1 - null + port_FSB_Internal_port_0_mac_address: + get_input: fsb2-Internal1-mac vm_flavor_name: get_input: fsb-flavor + port_FSB_Internal_port_1_mac_address: + get_input: fsb1-Internal1-mac vm_image_name: get_input: fsb-image compute_FSB_admin_pass: - STATIC-DATA-FSB1 - STATIC-DATA-FSB2 - port_FSB1_Internal_network: - - Internal1-net-fsb1-Internal1 - - Internal1-net-fsb1-Internal2 - port_FSB2_Internal_mac_address: - get_input: fsb2-Internal1-mac - port_FSB2_Internal_network: - - Internal2-net-fsb2-Internal1 - - Internal2-net-fsb2-Internal2 compute_FSB_metadata: - write_files: - path: /path1/etc/sysconfig/network-scripts/ifcfg-eth0 @@ -310,6 +307,9 @@ topology_template: compute_FSB_name: - get_input: fsb1-name - get_input: fsb2-name + port_FSB_Internal_port_1_network: + - Internal1-net-fsb1-Internal1 + - Internal1-net-fsb1-Internal2 service_template_filter: substitute_service_template: Nested_FSBServiceTemplate.yaml count: 2 @@ -323,13 +323,13 @@ topology_template: capability: tosca.capabilities.Node node: packet_mirror_network relationship: tosca.relationships.DependsOn - - link_FSB_FSB1_Internal: + - link_FSB_FSB_Internal_port_0: capability: tosca.capabilities.network.Linkable - node: jsa_net1 + node: jsa_net relationship: tosca.relationships.network.LinksTo - - link_FSB_FSB2_Internal: + - link_FSB_FSB_Internal_port_1: capability: tosca.capabilities.network.Linkable - node: jsa_net + node: jsa_net1 relationship: tosca.relationships.network.LinksTo - local_storage_FSB: capability: tosca.capabilities.Attachment @@ -347,10 +347,10 @@ topology_template: description: | Version 2.0 02-09-2016 (Authors: John Doe, user PROD) members: - - FSB1_Internal_1 - - FSB1_Internal_2 - - FSB2_Internal_1 - - FSB2_Internal_2 + - FSB_1_Internal_port_1 + - FSB_2_Internal_port_1 + - FSB_1_Internal_port_0 + - FSB_2_Internal_port_0 - FSB1_template - FSB2_template - jsa_net diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updVolumes/noConsolidation/in/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updVolumes/noConsolidation/in/MainServiceTemplate.yaml index ee6116b1f6..91eb3145c3 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updVolumes/noConsolidation/in/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updVolumes/noConsolidation/in/MainServiceTemplate.yaml @@ -72,7 +72,7 @@ topology_template: type: string description: prop node_templates: - FSB2_Internal_2: + FSB_2_Internal_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_address: @@ -83,7 +83,7 @@ topology_template: capability: tosca.capabilities.network.Bindable node: FSB1_template relationship: tosca.relationships.network.BindsTo - FSB1_Internal_1: + FSB_1_Internal_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_address: @@ -120,7 +120,7 @@ topology_template: shared: true network_name: get_attribute: - - FSB1_Internal_1 + - FSB_1_Internal_port_1 - network_id dhcp_agent_ids: get_attribute: @@ -128,11 +128,11 @@ topology_template: - addresses tenant_id: get_attribute: - - FSB2_Internal_2 + - FSB_2_Internal_port_0 - network_id qos_policy: get_attribute: - - FSB2_Internal_2 + - FSB_2_Internal_port_0 - network_id FSB1_template: type: org.openecomp.resource.vfc.nodes.heat.FSB @@ -195,8 +195,8 @@ topology_template: description: | Version 2.0 02-09-2016 (Authors: John Doe, user PROD) members: - - FSB2_Internal_2 - - FSB1_Internal_1 + - FSB_2_Internal_port_0 + - FSB_1_Internal_port_1 - FSB1_OAM - FSB1_template - packet_mirror_network_name \ 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/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 99365a8f15..bb7a1a5c6e 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 @@ -73,7 +73,7 @@ topology_template: type: string description: prop node_templates: - FSB2_Internal_2: + FSB_2_Internal_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_address: @@ -84,7 +84,7 @@ topology_template: capability: tosca.capabilities.network.Bindable node: FSB1_template relationship: tosca.relationships.network.BindsTo - FSB1_Internal_1: + FSB_1_Internal_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_address: @@ -122,7 +122,7 @@ topology_template: network_name: get_attribute: - abstract_FSB - - FSB_FSB1_Internal_network_id + - FSB_FSB_Internal_port_1_network_id dhcp_agent_ids: get_attribute: - abstract_FSB @@ -130,11 +130,11 @@ topology_template: tenant_id: get_attribute: - abstract_FSB - - FSB_FSB2_Internal_network_id + - FSB_FSB_Internal_port_0_network_id qos_policy: get_attribute: - abstract_FSB - - FSB_FSB2_Internal_network_id + - FSB_FSB_Internal_port_0_network_id FSB1_template: type: org.openecomp.resource.vfc.nodes.heat.FSB properties: @@ -193,22 +193,20 @@ topology_template: directives: - substitutable properties: - port_FSB1_Internal_mac_address: - get_input: fsb1-Internal1-mac + port_FSB_Internal_port_0_network: + - Internal2-net + port_FSB_Internal_port_0_mac_address: + get_input: fsb1-Internal2-mac vm_flavor_name: get_input: fsb-flavor + port_FSB_Internal_port_1_mac_address: + get_input: fsb1-Internal1-mac vm_image_name: get_input: fsb-image compute_FSB_admin_pass: - STATIC-DATA-FSB1 - port_FSB1_Internal_network: - - Internal1-net - port_FSB2_Internal_mac_address: - get_input: fsb1-Internal2-mac port_FSB1_OAM_network: - jsa_net1 - port_FSB2_Internal_network: - - Internal2-net compute_FSB_metadata: - write_files: - path: /path1/etc/sysconfig/network-scripts/ifcfg-eth0 @@ -220,6 +218,8 @@ topology_template: get_input: fsb1-oam-ip compute_FSB_name: - get_input: fsb1-name + port_FSB_Internal_port_1_network: + - Internal1-net service_template_filter: substitute_service_template: Nested_FSBServiceTemplate.yaml count: 1 @@ -233,7 +233,7 @@ topology_template: capability: tosca.capabilities.Node node: packet_mirror_network relationship: tosca.relationships.DependsOn - - link_FSB_FSB1_Internal: + - link_FSB_FSB_Internal_port_1: capability: tosca.capabilities.network.Linkable node: jsa_net1 relationship: tosca.relationships.network.LinksTo @@ -257,8 +257,8 @@ topology_template: description: | Version 2.0 02-09-2016 (Authors: John Doe, user PROD) members: - - FSB2_Internal_2 - - FSB1_Internal_1 + - FSB_2_Internal_port_0 + - FSB_1_Internal_port_1 - FSB1_OAM - FSB1_template - packet_mirror_network_name -- cgit 1.2.3-korg