From 94802b9b83a0a9edea77cbff76639aaefeca8d8e Mon Sep 17 00:00:00 2001
From: talio <tali.orenbach@amdocs.com>
Date: Tue, 14 Nov 2017 10:18:03 +0200
Subject: forwarder test fix

fix translator tests with forwarder capability

Issue-Id : SDC-653

Change-Id: I59db23acb0e2c3b5920bf24662374fee950d479b
Signed-off-by: talio <tali.orenbach@amdocs.com>
---
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |   20 +
 .../nested-pcm_v0.1ServiceTemplate.yaml            |    8 +-
 .../nested-pcm_v0.1_2ServiceTemplate.yaml          |    8 +-
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |    7 +-
 .../mvs.nested.heatServiceTemplate.yaml            |    5 +-
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |   30 +
 .../nested2levelServiceTemplate.yaml               |    8 +-
 .../expectedoutputfiles/nestedServiceTemplate.yaml |   14 +-
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |  616 +++++----
 .../expectedoutputfiles/MainServiceTemplate.yaml   |   12 +-
 .../nested2levelServiceTemplate.yaml               |   14 +-
 .../nested3levelServiceTemplate.yaml               |    8 +-
 .../expectedoutputfiles/nestedServiceTemplate.yaml |  462 +++----
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |  100 ++
 ...ule_1_perimeta_swmu_a_childServiceTemplate.yaml |   20 +-
 ...ule_1_perimeta_swmu_b_childServiceTemplate.yaml |   20 +-
 ...odule_2_perimeta_sw_a_childServiceTemplate.yaml |   14 +-
 ...odule_2_perimeta_sw_b_childServiceTemplate.yaml |   14 +-
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |   30 +
 .../nested-pcm_v0.1ServiceTemplate.yaml            |   14 +-
 .../nested-pcm_v0.1_2ServiceTemplate.yaml          |    8 +-
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |    7 +-
 .../mvs.nested.heatServiceTemplate.yaml            |    5 +-
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |   12 +-
 .../dns_nested_01ServiceTemplate.yaml              |    8 +-
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |    7 +-
 .../mvs.nested.heatServiceTemplate.yaml            |    5 +-
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |    7 +-
 .../mvs.nested.heatServiceTemplate.yaml            |    5 +-
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |   10 +
 .../nested-pcm_v0.1ServiceTemplate.yaml            |    8 +-
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |   10 +
 .../nested-pcm_v0.1ServiceTemplate.yaml            |    8 +-
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |   30 +
 .../expectedOutput/MainServiceTemplate.yaml        |    2 +-
 .../expectedOutput/eca_oamServiceTemplate.yaml     |   20 +-
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |   12 +-
 .../expectedoutputfiles/nestedServiceTemplate.yaml |    8 +-
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |   12 +-
 .../expectedoutputfiles/nestedServiceTemplate.yaml |    8 +-
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |  102 +-
 .../nested1ServiceTemplate.yaml                    |   26 +-
 .../nested2ServiceTemplate.yaml                    |   20 +-
 .../nested3ServiceTemplate.yaml                    |   14 +-
 .../nested4ServiceTemplate.yaml                    |    8 +-
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |   27 +-
 .../nested1ServiceTemplate.yaml                    |   14 +-
 .../nested2ServiceTemplate.yaml                    |    5 +-
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |  107 +-
 .../nested1ServiceTemplate.yaml                    |   29 +-
 .../nested2ServiceTemplate.yaml                    |   20 +-
 .../nested3ServiceTemplate.yaml                    |   14 +-
 .../nested4ServiceTemplate.yaml                    |    8 +-
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |   10 +
 .../nested-pcm_v0.1ServiceTemplate.yaml            |    6 +
 .../OCS-fw2ServiceTemplate.yaml                    |    2 +-
 .../OCS-fw2_service_instance3ServiceTemplate.yaml  |    2 +-
 .../OCS-fw3ServiceTemplate.yaml                    |    2 +-
 .../OCS-fw3_service_instance4ServiceTemplate.yaml  |    2 +-
 .../expectedoutputfiles/OCS-fwServiceTemplate.yaml |    2 +-
 .../OCS-fw_service_instance1ServiceTemplate.yaml   |    2 +-
 .../OCS-fw_service_instance2ServiceTemplate.yaml   |    2 +-
 .../OCS-fw2ServiceTemplate.yaml                    |    2 +-
 .../OCS-fw2_service_instance3ServiceTemplate.yaml  |    2 +-
 .../OCS-fw3ServiceTemplate.yaml                    |    2 +-
 .../OCS-fw3_service_instance4ServiceTemplate.yaml  |    2 +-
 .../expectedoutputfiles/OCS-fwServiceTemplate.yaml |    2 +-
 .../OCS-fw_service_instance1ServiceTemplate.yaml   |    2 +-
 .../OCS-fw_service_instance2ServiceTemplate.yaml   |    2 +-
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |    2 +-
 .../OCS-fw_service_instanceServiceTemplate.yaml    |    2 +-
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |   45 +
 .../out/Nested_appServiceTemplate.yaml             |    9 +
 .../out/Nested_ioxServiceTemplate.yaml             |    9 +
 .../out/Nested_pltServiceTemplate.yaml             |    9 +
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |    7 +-
 .../out/Nested_pd_serverServiceTemplate.yaml       |    5 +-
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |    7 +-
 .../out/Nested_pd_serverServiceTemplate.yaml       |    5 +-
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |    7 +-
 .../out/Nested_pd_serverServiceTemplate.yaml       |    5 +-
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |    7 +-
 .../out/Nested_pd_serverServiceTemplate.yaml       |    5 +-
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |  102 +-
 ...ested_1c1_scalling_instanceServiceTemplate.yaml |    6 +
 ...Nested_1c2_catalog_instanceServiceTemplate.yaml |    6 +
 .../out/Nested_a_single_1aServiceTemplate.yaml     |    6 +
 .../out/Nested_b_single_1bServiceTemplate.yaml     |    6 +
 .../out/Nested_b_single_1b_1ServiceTemplate.yaml   |    6 +
 .../out/Nested_pcma_serverServiceTemplate.yaml     |    6 +
 .../out/Nested_pcma_server_1ServiceTemplate.yaml   |    6 +
 .../out/nested-no_vfc_v0.1ServiceTemplate.yaml     |   12 +
 .../out/nested-pcm_v0.1ServiceTemplate.yaml        |    8 +-
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |  102 +-
 ...ested_1c1_scalling_instanceServiceTemplate.yaml |    6 +
 ...Nested_1c2_catalog_instanceServiceTemplate.yaml |    6 +
 .../out/Nested_a_single_1aServiceTemplate.yaml     |    6 +
 .../out/Nested_b_single_1bServiceTemplate.yaml     |    6 +
 .../out/Nested_b_single_1b_1ServiceTemplate.yaml   |    6 +
 .../out/Nested_pcma_serverServiceTemplate.yaml     |    8 +-
 .../out/Nested_pcma_server_1ServiceTemplate.yaml   |    8 +-
 .../out/nested-no-novaServiceTemplate.yaml         |    2 +-
 .../out/nested-no_vfc_v0.1ServiceTemplate.yaml     |   14 +-
 .../out/nested-pcm_v0.1ServiceTemplate.yaml        |    6 +
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |  102 +-
 ...ested_1c1_scalling_instanceServiceTemplate.yaml |    6 +
 ...Nested_1c2_catalog_instanceServiceTemplate.yaml |    6 +
 .../out/Nested_a_single_1aServiceTemplate.yaml     |    6 +
 .../out/Nested_b_single_1bServiceTemplate.yaml     |    6 +
 .../out/Nested_b_single_1b_1ServiceTemplate.yaml   |    6 +
 .../out/Nested_pcma_serverServiceTemplate.yaml     |    6 +
 .../out/Nested_pcma_server_1ServiceTemplate.yaml   |    6 +
 .../out/nested-no_vfc_v0.1ServiceTemplate.yaml     |   12 +
 .../out/nested-pcm_v0.1ServiceTemplate.yaml        |    8 +-
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |  147 ++-
 ...sted_1c11_scalling_instanceServiceTemplate.yaml |    3 +
 ...sted_1c12_scalling_instanceServiceTemplate.yaml |    3 +
 ...Nested_1c2_catalog_instanceServiceTemplate.yaml |    6 +
 ...Nested_2c2_catalog_instanceServiceTemplate.yaml |    6 +
 .../out/Nested_a_single_1aServiceTemplate.yaml     |    6 +
 .../out/Nested_a_single_2aServiceTemplate.yaml     |    3 +
 .../out/Nested_b_single_1bServiceTemplate.yaml     |    6 +
 .../out/Nested_b_single_1b_1ServiceTemplate.yaml   |    6 +
 .../out/Nested_b_single_2bServiceTemplate.yaml     |    6 +
 .../out/Nested_b_single_2b_1ServiceTemplate.yaml   |    6 +
 .../out/Nested_pcma_serverServiceTemplate.yaml     |    6 +
 .../out/Nested_pcma_server_1ServiceTemplate.yaml   |    6 +
 .../out/nested-no_vfc_v0.1ServiceTemplate.yaml     |   12 +
 .../out/nested-pcm_v0.1ServiceTemplate.yaml        |    8 +-
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |  207 ++-
 .../out/Nested_cmaui_1c1_mainServiceTemplate.yaml  |    3 +
 .../Nested_cmaui_1c1_main_1ServiceTemplate.yaml    |    3 +
 .../Nested_cmaui_1c1_nested2ServiceTemplate.yaml   |    3 +
 .../Nested_pd_server_main_1bServiceTemplate.yaml   |    5 +-
 .../Nested_pd_server_main_1b_1ServiceTemplate.yaml |    3 +
 ...Nested_pd_server_nested2_1bServiceTemplate.yaml |    3 +
 .../Nested_ps_server_main_1bServiceTemplate.yaml   |    5 +-
 .../Nested_ps_server_main_1b_1ServiceTemplate.yaml |    3 +
 ...Nested_ps_server_nested2_1bServiceTemplate.yaml |    3 +
 .../nested-pattern-4-same-typeServiceTemplate.yaml |    8 +-
 .../out/nested-pattern-4ServiceTemplate.yaml       |    8 +-
 .../out/nested1-no-computeServiceTemplate.yaml     |    6 +
 .../out/nested1ServiceTemplate.yaml                |   44 +-
 .../out/nested2ServiceTemplate.yaml                |   26 +-
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |   80 ++
 .../out/Nested_oam_serverServiceTemplate.yaml      |    3 +
 .../out/Nested_pd_serverServiceTemplate.yaml       |    3 +
 .../out/Nested_ps_serverServiceTemplate.yaml       |    3 +
 .../out/Nested_sm_serverServiceTemplate.yaml       |    3 +
 .../out/nested1ServiceTemplate.yaml                |   18 +
 .../out/nested2ServiceTemplate.yaml                |   12 +
 .../out/nested3ServiceTemplate.yaml                |    6 +
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |  100 ++
 .../out/Nested_cmauiServiceTemplate.yaml           |    3 +
 .../out/Nested_cmaui_1ServiceTemplate.yaml         |    3 +
 .../out/Nested_oamServiceTemplate.yaml             |    3 +
 .../out/Nested_oam_1ServiceTemplate.yaml           |    3 +
 .../out/Nested_pd_serverServiceTemplate.yaml       |    3 +
 .../out/Nested_pd_server_1ServiceTemplate.yaml     |    3 +
 .../out/Nested_psServiceTemplate.yaml              |    3 +
 .../out/Nested_ps_1ServiceTemplate.yaml            |    3 +
 .../out/nested1ServiceTemplate.yaml                |   18 +
 .../out/nested2ServiceTemplate.yaml                |   12 +
 .../out/nested3ServiceTemplate.yaml                |    6 +
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |  102 +-
 .../out/Nested_pd_serverServiceTemplate.yaml       |    5 +-
 .../out/Nested_pd_server_1ServiceTemplate.yaml     |    5 +-
 .../out/Nested_pd_server_2ServiceTemplate.yaml     |    3 +
 .../out/Nested_pd_server_3ServiceTemplate.yaml     |    3 +
 .../out/Nested_pd_server_4ServiceTemplate.yaml     |    5 +-
 .../out/Nested_pd_server_5ServiceTemplate.yaml     |    5 +-
 .../out/Nested_pd_server_6ServiceTemplate.yaml     |    3 +
 .../out/Nested_pd_server_7ServiceTemplate.yaml     |    3 +
 .../out/nested1ServiceTemplate.yaml                |   20 +-
 .../out/nested2ServiceTemplate.yaml                |   14 +-
 .../out/nested3ServiceTemplate.yaml                |    8 +-
 .../GlobalSubstitutionTypesServiceTemplate.yaml    | 1344 +++++++++++---------
 .../out/Nested_BE_1c1ServiceTemplate.yaml          |    3 +
 .../out/Nested_cmaui_1c1ServiceTemplate.yaml       |    3 +
 .../out/Nested_oam_server_1c2ServiceTemplate.yaml  |    3 +
 .../out/Nested_osm_server_1c2ServiceTemplate.yaml  |    3 +
 .../out/Nested_pd_server_1bServiceTemplate.yaml    |    5 +-
 .../out/Nested_pd_server_1b_1ServiceTemplate.yaml  |    5 +-
 .../out/Nested_rd_server_1bServiceTemplate.yaml    |    3 +
 .../out/Nested_rd_server_1b_1ServiceTemplate.yaml  |    3 +
 .../out/nested-no-computeServiceTemplate.yaml      |    8 +-
 .../out/nested-pattern-4ServiceTemplate.yaml       |    6 +
 .../out/nested1ServiceTemplate.yaml                | 1114 ++++++++--------
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |   50 +
 .../out/Nested_cmaui_1c1ServiceTemplate.yaml       |    3 +
 .../out/Nested_oam_server_1c2ServiceTemplate.yaml  |    3 +
 .../out/Nested_pd_server_1bServiceTemplate.yaml    |    3 +
 .../out/Nested_ps_server_1bServiceTemplate.yaml    |    3 +
 .../out/nested1ServiceTemplate.yaml                |   18 +
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |   72 +-
 .../out/Nested_cmaui_1c1ServiceTemplate.yaml       |    3 +
 .../out/Nested_oam_server_1c2ServiceTemplate.yaml  |    3 +
 .../out/Nested_pd_server_1bServiceTemplate.yaml    |    3 +
 .../out/Nested_ps_server_1bServiceTemplate.yaml    |    3 +
 .../out/nested-no-computeServiceTemplate.yaml      |    8 +-
 .../out/nested-pattern-4ServiceTemplate.yaml       |    6 +
 .../out/nested1ServiceTemplate.yaml                |   18 +
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |   15 +
 .../out/Nested_cmauiServiceTemplate.yaml           |    3 +
 .../out/nested1ServiceTemplate.yaml                |    6 +
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |   10 +
 .../out/nested1ServiceTemplate.yaml                |    6 +
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |   15 +
 .../out/Nested_cmauiServiceTemplate.yaml           |    3 +
 .../out/nested1ServiceTemplate.yaml                |    6 +
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |   20 +
 .../out/Nested_pd_serverServiceTemplate.yaml       |    3 +
 .../out/Nested_ps_serverServiceTemplate.yaml       |    3 +
 .../out/nested1ServiceTemplate.yaml                |    6 +
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |   40 +
 .../out/Nested_oam_serverServiceTemplate.yaml      |    3 +
 .../out/Nested_pd_serverServiceTemplate.yaml       |    3 +
 .../out/Nested_ps_serverServiceTemplate.yaml       |    3 +
 .../out/Nested_sm_serverServiceTemplate.yaml       |    3 +
 .../out/nested-other-file-1BServiceTemplate.yaml   |    6 +
 .../out/nested-same-file-1BServiceTemplate.yaml    |    6 +
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |   40 +
 .../out/Nested_oam_serverServiceTemplate.yaml      |    3 +
 .../out/Nested_pd_serverServiceTemplate.yaml       |    3 +
 .../out/Nested_ps_serverServiceTemplate.yaml       |    3 +
 .../out/Nested_sm_serverServiceTemplate.yaml       |    3 +
 .../out/nested-other-file-1BServiceTemplate.yaml   |    6 +
 .../out/nested-same-file-1BServiceTemplate.yaml    |    6 +
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |   22 +-
 .../out/nested-pcm_v0.1ServiceTemplate.yaml        |    8 +-
 .../out/nested-pcm_v0.2ServiceTemplate.yaml        |    8 +-
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |  832 +++++++-----
 .../out/Nested_cdiServiceTemplate.yaml             |    6 +
 .../out/Nested_cdi_1ServiceTemplate.yaml           |    6 +
 .../out/Nested_cifServiceTemplate.yaml             |  237 ++--
 .../out/Nested_cif_1ServiceTemplate.yaml           |  237 ++--
 .../out/Nested_lbdServiceTemplate.yaml             |    9 +
 .../out/Nested_lbd_1ServiceTemplate.yaml           |    9 +
 .../out/Nested_oamServiceTemplate.yaml             |    6 +
 .../out/Nested_oam_1ServiceTemplate.yaml           |    6 +
 .../out/Nested_oam_2ServiceTemplate.yaml           |    6 +
 .../out/nested_cscfServiceTemplate.yaml            |    3 +
 .../out/nested_tdcoreServiceTemplate.yaml          |    6 +
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |   57 +-
 .../out/nested_vson_serverServiceTemplate.yaml     |    5 +-
 ...nested_vson_server_from_volServiceTemplate.yaml |    5 +-
 ...nested_vson_server_with_volServiceTemplate.yaml |    5 +-
 ...rver_with_vol_dual_ip_stackServiceTemplate.yaml |    3 +
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |  776 ++++++-----
 .../out/Nested_cmauiServiceTemplate.yaml           |    6 +
 .../out/Nested_cmaui_1ServiceTemplate.yaml         |    6 +
 .../out/Nested_cmaui_2ServiceTemplate.yaml         |    6 +
 .../out/nested1ServiceTemplate.yaml                |   54 +-
 .../out/nested2ServiceTemplate.yaml                |  504 ++++----
 .../out/nested3ServiceTemplate.yaml                |   14 +-
 .../out/nested4ServiceTemplate.yaml                |    8 +-
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |   40 +
 .../out/nested-oam_v0.1ServiceTemplate.yaml        |    6 +
 .../out/nested-pcm_v0.1ServiceTemplate.yaml        |    6 +
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |   32 +-
 .../out/nested-oam_v0.1ServiceTemplate.yaml        |    8 +-
 .../out/nested-pcm_v0.1ServiceTemplate.yaml        |    6 +
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |   32 +-
 .../out/nested-oam_v0.1ServiceTemplate.yaml        |    8 +-
 .../out/nested-pcm_v0.1ServiceTemplate.yaml        |    6 +
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |   15 +
 .../out/Nested_computeServiceTemplate.yaml         |    3 +
 .../out/nested-pcm_v0.1ServiceTemplate.yaml        |    6 +
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |   10 +
 .../out/nested-pcm_v0.1ServiceTemplate.yaml        |    6 +
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |   15 +
 .../out/Nested_pcm_serverServiceTemplate.yaml      |    3 +
 .../out/nested-pcm_v0.1ServiceTemplate.yaml        |    6 +
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |   20 +
 .../out/Nested_pcm_serverServiceTemplate.yaml      |    3 +
 .../out/Nested_pd_serverServiceTemplate.yaml       |    3 +
 .../out/nested-pcm_v0.1ServiceTemplate.yaml        |    6 +
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |   32 +-
 .../out/nested-pcm_v0.1ServiceTemplate.yaml        |    6 +
 .../out/nested-pcm_v0.2ServiceTemplate.yaml        |    8 +-
 .../out/nested-pcm_v0.3ServiceTemplate.yaml        |    8 +-
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |   32 +-
 .../out/nested-pcm_v0.1ServiceTemplate.yaml        |    8 +-
 .../out/nested-pcm_v0.2ServiceTemplate.yaml        |    6 +
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |   20 +
 .../out/nested-pcm_v0.1ServiceTemplate.yaml        |    6 +
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |    5 +
 .../out/Nested_pd_serverServiceTemplate.yaml       |    5 +-
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |    5 +
 .../out/Nested_pd_serverServiceTemplate.yaml       |    5 +-
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |    5 +
 .../out/Nested_pd_serverServiceTemplate.yaml       |    5 +-
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |    5 +
 .../out/Nested_pd_serverServiceTemplate.yaml       |    5 +-
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |    5 +
 .../out/Nested_pd_serverServiceTemplate.yaml       |    5 +-
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |    5 +
 .../out/Nested_pd_serverServiceTemplate.yaml       |    5 +-
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |    5 +
 .../out/Nested_pd_serverServiceTemplate.yaml       |    5 +-
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |    5 +
 .../out/Nested_pd_serverServiceTemplate.yaml       |    5 +-
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |   10 +
 .../out/Nested_pd_serverServiceTemplate.yaml       |    5 +-
 .../out/Nested_ps_serverServiceTemplate.yaml       |    5 +-
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |   10 +
 .../out/Nested_pd_serverServiceTemplate.yaml       |    5 +-
 .../out/Nested_ps_serverServiceTemplate.yaml       |    5 +-
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |   10 +
 .../out/Nested_pd_serverServiceTemplate.yaml       |    6 +
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |    5 +
 .../out/Nested_smpServiceTemplate.yaml             |    3 +
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |   10 +
 .../out/Nested_pd_serverServiceTemplate.yaml       |    6 +
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |   10 +
 .../out/Nested_pd_serverServiceTemplate.yaml       |    6 +
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |   10 +
 .../out/Nested_pd_serverServiceTemplate.yaml       |    6 +
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |   10 +
 .../out/Nested_pd_serverServiceTemplate.yaml       |    6 +
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |   20 +
 .../out/Nested_pd_serverServiceTemplate.yaml       |    6 +
 .../out/nested-pcm_v0.1ServiceTemplate.yaml        |    6 +
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |   10 +
 .../out/Nested_pd_serverServiceTemplate.yaml       |    6 +
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |   10 +
 .../out/Nested_pd_serverServiceTemplate.yaml       |    6 +
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |   10 +
 .../out/Nested_pd_serverServiceTemplate.yaml       |    6 +
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |   10 +
 .../out/Nested_pd_serverServiceTemplate.yaml       |    6 +
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |   10 +
 .../out/Nested_pd_serverServiceTemplate.yaml       |    6 +
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |   10 +
 .../out/Nested_pd_serverServiceTemplate.yaml       |    6 +
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |   10 +
 .../out/Nested_pd_serverServiceTemplate.yaml       |    6 +
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |   10 +
 .../out/Nested_pd_serverServiceTemplate.yaml       |    6 +
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |   10 +
 .../out/Nested_pd_serverServiceTemplate.yaml       |    6 +
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |   10 +
 .../out/Nested_pd_serverServiceTemplate.yaml       |    6 +
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |   10 +
 .../out/Nested_pd_serverServiceTemplate.yaml       |    6 +
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |   15 +
 .../out/Nested_oam_serverServiceTemplate.yaml      |    3 +
 .../out/Nested_pd_serverServiceTemplate.yaml       |    3 +
 .../out/Nested_ps_serverServiceTemplate.yaml       |    3 +
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |   15 +
 .../out/Nested_oam_serverServiceTemplate.yaml      |    3 +
 .../out/Nested_pd_serverServiceTemplate.yaml       |    3 +
 .../out/Nested_ps_serverServiceTemplate.yaml       |    3 +
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |   15 +
 .../out/Nested_pd_serverServiceTemplate.yaml       |    3 +
 .../out/Nested_pd_server_1ServiceTemplate.yaml     |    3 +
 .../out/Nested_pd_server_2ServiceTemplate.yaml     |    3 +
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |   20 +
 .../out/Nested_pd_serverServiceTemplate.yaml       |    3 +
 .../out/Nested_pd_server_1ServiceTemplate.yaml     |    3 +
 .../out/Nested_pd_server_2ServiceTemplate.yaml     |    6 +
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |   10 +
 .../out/Nested_pd_serverServiceTemplate.yaml       |    3 +
 .../out/Nested_ps_serverServiceTemplate.yaml       |    3 +
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |   10 +
 .../out/Nested_pd_serverServiceTemplate.yaml       |    3 +
 .../out/Nested_ps_serverServiceTemplate.yaml       |    3 +
 ...SR_CPM_base_template_nestedServiceTemplate.yaml |    8 +-
 .../VSR_IOM_template_nestedServiceTemplate.yaml    |   20 +-
 ...SR_CPM_base_template_nestedServiceTemplate.yaml |    8 +-
 .../VSR_IOM_template_nestedServiceTemplate.yaml    |   20 +-
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |   70 +
 .../out/nested-oam_v1.0ServiceTemplate.yaml        |    8 +-
 .../out/nested-pcm_v1.0ServiceTemplate.yaml        |    8 +-
 .../out/nested-ppd_v1.0ServiceTemplate.yaml        |   26 +-
 .../out/nested-pps_v1.0ServiceTemplate.yaml        |    5 +-
 .../out/nested-psm_v1.0ServiceTemplate.yaml        |    5 +-
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |  102 +-
 .../nested1ServiceTemplate.yaml                    |   26 +-
 .../nested2ServiceTemplate.yaml                    |   20 +-
 .../nested3ServiceTemplate.yaml                    |   14 +-
 .../nested4ServiceTemplate.yaml                    |    8 +-
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |   12 +-
 .../expectedoutputfiles/nestedServiceTemplate.yaml |    8 +-
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |  102 +-
 .../nested1ServiceTemplate.yaml                    |   26 +-
 .../nested2ServiceTemplate.yaml                    |   20 +-
 .../nested3ServiceTemplate.yaml                    |   14 +-
 .../nested4ServiceTemplate.yaml                    |    8 +-
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |    7 +-
 .../expectedoutputfiles/nestedServiceTemplate.yaml |    5 +-
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |    7 +-
 .../expectedoutputfiles/nestedServiceTemplate.yaml |    5 +-
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |  102 +-
 .../nested1ServiceTemplate.yaml                    |   26 +-
 .../nested2ServiceTemplate.yaml                    |   20 +-
 .../nested3ServiceTemplate.yaml                    |   14 +-
 .../nested4ServiceTemplate.yaml                    |    8 +-
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |   12 +-
 .../expectedoutputfiles/nestedServiceTemplate.yaml |    8 +-
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |   12 +-
 .../expectedoutputfiles/nestedServiceTemplate.yaml |    8 +-
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |    7 +-
 .../expectedoutputfiles/nestedServiceTemplate.yaml |    5 +-
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |   22 +-
 .../nested1ServiceTemplate.yaml                    |   11 +-
 .../nested2ServiceTemplate.yaml                    |    5 +-
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |   12 +-
 .../expectedoutputfiles/nestedServiceTemplate.yaml |    8 +-
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |  741 ++++++-----
 .../nested1ServiceTemplate.yaml                    |   47 +-
 .../nested2ServiceTemplate.yaml                    |  498 ++++----
 .../nested3ServiceTemplate.yaml                    |   14 +-
 .../nested4ServiceTemplate.yaml                    |    8 +-
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |   22 +-
 .../nested1ServiceTemplate.yaml                    |   11 +-
 .../nested2ServiceTemplate.yaml                    |    5 +-
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |  737 ++++++-----
 .../nested1ServiceTemplate.yaml                    |   47 +-
 .../nested2ServiceTemplate.yaml                    |  498 ++++----
 .../nested3ServiceTemplate.yaml                    |   14 +-
 .../nested4ServiceTemplate.yaml                    |    8 +-
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |    5 +
 .../expectedoutputfiles/nestedServiceTemplate.yaml |    3 +
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |   17 +-
 .../nested1ServiceTemplate.yaml                    |   11 +-
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |  752 ++++++-----
 .../nested1ServiceTemplate.yaml                    |   54 +-
 .../nested2ServiceTemplate.yaml                    |  504 ++++----
 .../nested3ServiceTemplate.yaml                    |   14 +-
 .../nested4ServiceTemplate.yaml                    |    8 +-
 ...d_On_Module_QRouterTemplateServiceTemplate.yaml |    8 +-
 ..._On_Module_vLBAgentTemplateServiceTemplate.yaml |   11 +-
 ...FEAdd_On_Module_vLBTemplateServiceTemplate.yaml |   11 +-
 ...dd_On_Module_vProbeTemplateServiceTemplate.yaml |   11 +-
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |   57 +-
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |   17 +-
 .../expectedoutputfiles/nestedServiceTemplate.yaml |   11 +-
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |   12 +-
 .../expectedoutputfiles/nestedServiceTemplate.yaml |    8 +-
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |  752 ++++++-----
 .../nested1ServiceTemplate.yaml                    |   54 +-
 .../nested2ServiceTemplate.yaml                    |  504 ++++----
 .../nested3ServiceTemplate.yaml                    |   14 +-
 .../nested4ServiceTemplate.yaml                    |    8 +-
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |   12 +-
 .../expectedoutputfiles/nestedServiceTemplate.yaml |    8 +-
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |   20 +
 .../out/SubstitutionServiceTemplate.yaml           |   12 +
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |   15 +
 .../WithIndex/out/SubstitutionServiceTemplate.yaml |    9 +
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |   10 +
 .../out/SubstitutionServiceTemplate.yaml           |    6 +
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |   15 +
 .../out/SubstitutionServiceTemplate.yaml           |    9 +
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |   10 +
 .../out/SubstitutionServiceTemplate.yaml           |    6 +
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |   15 +
 .../out/SubstitutionServiceTemplate.yaml           |    9 +
 .../GlobalSubstitutionTypesServiceTemplate.yaml    |    7 +-
 .../out/nestedServiceTemplate.yaml                 |    5 +-
 461 files changed, 11579 insertions(+), 5315 deletions(-)

(limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src')

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index 0c8f667dce..e8e9adfc58 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -334,6 +334,16 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pcm_port_0:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      forwarder_pcm_port_1:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.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.
@@ -904,12 +914,22 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pcm_port_00:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       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:
         - 1
         - UNBOUNDED
+      forwarder_pcm_port_01:
+        type: org.openecomp.capabilities.Forwarder
+        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.
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml
index 7e74985b6b..4fec5b52c3 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml
@@ -326,9 +326,15 @@ topology_template:
       disk.device.usage_server_pcm_1:
       - server_pcm_1
       - disk.device.usage
+      forwarder_pcm_port_00:
+      - pcm_port_00
+      - forwarder
       disk.device.write.requests_server_pcm_1:
       - server_pcm_1
       - disk.device.write.requests
+      forwarder_pcm_port_01:
+      - pcm_port_01
+      - forwarder
       disk.write.bytes_server_pcm_1:
       - server_pcm_1
       - disk.write.bytes
@@ -377,4 +383,4 @@ topology_template:
       - link
       local_storage_server_pcm_1:
       - server_pcm_1
-      - 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/heat/nested/multi/expectedoutputfiles/nested-pcm_v0.1_2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/expectedoutputfiles/nested-pcm_v0.1_2ServiceTemplate.yaml
index b373c12e48..c8f63361d5 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/expectedoutputfiles/nested-pcm_v0.1_2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/expectedoutputfiles/nested-pcm_v0.1_2ServiceTemplate.yaml
@@ -270,6 +270,12 @@ topology_template:
       cpu.delta_server_pcm_2:
       - server_pcm_2
       - cpu.delta
+      forwarder_pcm_port_0:
+      - pcm_port_0
+      - forwarder
+      forwarder_pcm_port_1:
+      - pcm_port_1
+      - forwarder
       disk.device.write.requests.rate_server_pcm_2:
       - server_pcm_2
       - disk.device.write.requests.rate
@@ -363,4 +369,4 @@ topology_template:
       - dependency
       local_storage_server_pcm_2:
       - server_pcm_2
-      - 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/heat/nested/multiple_resource_groups/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multiple_resource_groups/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index e2c3da021d..83f1db7e2e 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multiple_resource_groups/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multiple_resource_groups/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -436,6 +436,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_mgmt_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       cpu.delta_vnfci:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -477,4 +482,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/heat/nested/multiple_resource_groups/expectedoutputfiles/mvs.nested.heatServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multiple_resource_groups/expectedoutputfiles/mvs.nested.heatServiceTemplate.yaml
index 85bd55e44b..ea7b1c9be0 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multiple_resource_groups/expectedoutputfiles/mvs.nested.heatServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multiple_resource_groups/expectedoutputfiles/mvs.nested.heatServiceTemplate.yaml
@@ -420,6 +420,9 @@ topology_template:
       vcpus_vnfci:
       - vnfci
       - vcpus
+      forwarder_mgmt_port:
+      - mgmt_port
+      - forwarder
       cpu.delta_vnfci:
       - vnfci
       - cpu.delta
@@ -459,4 +462,4 @@ topology_template:
       - link
       dependency_boot_volume:
       - boot_volume
-      - 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/heat/nested/nested2levels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index 59633bad64..29f9f0e07e 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -331,6 +331,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_11_test_nested2:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       memory.usage_server_cmaui_2_test_nested2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -696,6 +701,16 @@ 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_server_cmaui_2_test_nested2:
         type: tosca.capabilities.Node
         occurrences:
@@ -886,6 +901,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_22_test_nested2:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       memory.usage_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.
@@ -1197,6 +1217,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_11:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.capacity_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.
@@ -1280,6 +1305,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_22:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       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.
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/expectedoutputfiles/nested2levelServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/expectedoutputfiles/nested2levelServiceTemplate.yaml
index 43b1696867..f360724a3b 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/expectedoutputfiles/nested2levelServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/expectedoutputfiles/nested2levelServiceTemplate.yaml
@@ -247,6 +247,9 @@ topology_template:
       disk.ephemeral.size_server_cmaui_2:
       - server_cmaui_2
       - disk.ephemeral.size
+      forwarder_cmaui_port_11:
+      - cmaui_port_11
+      - forwarder
       disk.capacity_server_cmaui_2:
       - server_cmaui_2
       - disk.capacity
@@ -289,6 +292,9 @@ topology_template:
       disk.read.bytes.rate_server_cmaui_2:
       - server_cmaui_2
       - disk.read.bytes.rate
+      forwarder_cmaui_port_22:
+      - cmaui_port_22
+      - forwarder
       cpu.delta_server_cmaui_2:
       - server_cmaui_2
       - cpu.delta
@@ -343,4 +349,4 @@ topology_template:
       - local_storage
       dependency_server_cmaui_2:
       - server_cmaui_2
-      - 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/heat/nested/nested2levels/expectedoutputfiles/nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/expectedoutputfiles/nestedServiceTemplate.yaml
index e3f39a1a70..aa8cf3245c 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/expectedoutputfiles/nestedServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/expectedoutputfiles/nestedServiceTemplate.yaml
@@ -251,6 +251,9 @@ topology_template:
       network.incoming.packets_cmaui_port_2:
       - cmaui_port_2
       - network.incoming.packets
+      forwarder_cmaui_port_11_test_nested2:
+      - test_nested2
+      - forwarder_cmaui_port_11
       memory.usage_server_cmaui_2_test_nested2:
       - test_nested2
       - memory.usage_server_cmaui_2
@@ -440,6 +443,12 @@ topology_template:
       os_server_cmaui_1:
       - server_cmaui_1
       - os
+      forwarder_cmaui_port_2:
+      - cmaui_port_2
+      - forwarder
+      forwarder_cmaui_port_1:
+      - cmaui_port_1
+      - forwarder
       feature_server_cmaui_2_test_nested2:
       - test_nested2
       - feature_server_cmaui_2
@@ -536,6 +545,9 @@ topology_template:
       disk.latency_server_cmaui_1:
       - server_cmaui_1
       - disk.latency
+      forwarder_cmaui_port_22_test_nested2:
+      - test_nested2
+      - forwarder_cmaui_port_22
       memory.usage_server_cmaui_1:
       - server_cmaui_1
       - memory.usage
@@ -578,4 +590,4 @@ topology_template:
       - dependency
       dependency_cmaui_port_2:
       - cmaui_port_2
-      - 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/heat/nested/nested3levels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index c81dd65a22..a04551ad57 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -198,12 +198,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.usage_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.usage_server_cmaui_3_test_nested3_test_nested2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -250,18 +244,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      memory_server_cmaui_3_test_nested3_test_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_cmaui_port_222_test_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.write.bytes.rate_server_cmaui_2_test_nested2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -273,50 +255,24 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      binding_cmaui_port_322_test_nested3_test_nested2:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
       disk.root.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
-      disk.device.write.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:
-        - 1
-        - UNBOUNDED
       network.outpoing.packets_cmaui_port_311_test_nested3_test_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
-      binding_cmaui_port_311_test_nested3_test_nested2:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
       network.outpoing.packets_cmaui_port_322_test_nested3_test_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.bytes.rate_server_cmaui_2_test_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.iops_server_cmaui_2_test_nested2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -365,828 +321,932 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.iops_server_cmaui_1:
+      network.incoming.packets_cmaui_port_311_test_nested3_test_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.packets_cmaui_port_311_test_nested3_test_nested2:
+      disk.latency_server_cmaui_3_test_nested3_test_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.allocation_server_cmaui_3_test_nested3_test_nested2:
+      disk.device.read.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.latency_server_cmaui_3_test_nested3_test_nested2:
+      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.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.allocation_server_cmaui_2_test_nested2:
+      host_server_cmaui_3_test_nested3_test_nested2:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.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.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes.rate_server_cmaui_1:
+      disk.device.read.bytes.rate_server_cmaui_2_test_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.read.bytes_server_cmaui_1:
+      disk.write.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:
         - 1
         - UNBOUNDED
-      host_server_cmaui_3_test_nested3_test_nested2:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
+      network.outgoing.packets.rate_cmaui_port_211_test_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.bytes_server_cmaui_1:
+      disk.device.read.bytes.rate_server_cmaui_3_test_nested3_test_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_server_cmaui_2_test_nested2:
+      cpu.delta_server_cmaui_2_test_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.bytes.rate_server_cmaui_2_test_nested2:
+      instance_server_cmaui_2_test_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.bytes_server_cmaui_2_test_nested2:
+      network.incoming.packets.rate_cmaui_port_311_test_nested3_test_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.rate_server_cmaui_1:
+      memory.usage_server_cmaui_2_test_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_211_test_nested2:
+      disk.write.requests.rate_server_cmaui_2_test_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
-      endpoint_server_cmaui_2_test_nested2:
-        type: tosca.capabilities.Endpoint.Admin
+      disk.capacity_server_cmaui_3_test_nested3_test_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.bytes.rate_server_cmaui_3_test_nested3_test_nested2:
+      disk.device.write.bytes_server_cmaui_2_test_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_cmaui_2_test_nested2:
+      disk.write.requests_server_cmaui_3_test_nested3_test_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_cmaui_2_test_nested2:
+      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
-      cpu_server_cmaui_1:
+      disk.latency_server_cmaui_2_test_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.packets.rate_cmaui_port_311_test_nested3_test_nested2:
+      network.incoming.bytes.rate_cmaui_port_211_test_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_cmaui_port_211_test_nested2:
-        type: tosca.capabilities.Node
+      binding_server_cmaui_2_test_nested2:
+        type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_cmaui_port_2:
+      binding_cmaui_port_1:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.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
+        occurrences:
+        - 0
+        - UNBOUNDED
+      binding_server_cmaui_3_test_nested3_test_nested2:
+        type: tosca.capabilities.network.Bindable
+        occurrences:
+        - 1
+        - UNBOUNDED
+      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
-      memory.usage_server_cmaui_2_test_nested2:
+      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.write.requests.rate_server_cmaui_2_test_nested2:
+      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.capacity_server_cmaui_3_test_nested3_test_nested2:
+      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.packets_cmaui_port_1:
+      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.device.write.bytes_server_cmaui_2_test_nested2:
+      network.incoming.packets_cmaui_port_222_test_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_server_cmaui_3_test_nested3_test_nested2:
+      network.incoming.packets.rate_cmaui_port_322_test_nested3_test_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.ephemeral.size_server_cmaui_1:
+      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
-      disk.capacity_server_cmaui_2_test_nested2:
+      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
-      disk.capacity_server_cmaui_1:
+      disk.read.bytes_server_cmaui_3_test_nested3_test_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.write.requests.rate_server_cmaui_3_test_nested3_test_nested2:
+      memory.resident_server_cmaui_3_test_nested3_test_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.latency_server_cmaui_2_test_nested2:
+      attachment_cmaui_port_222_test_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.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes.rate_server_cmaui_2_test_nested2:
+      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
-      network.incoming.bytes.rate_cmaui_port_211_test_nested2:
+      feature_server_cmaui_3_test_nested3_test_nested2:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.incoming.bytes.rate_cmaui_port_222_test_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.ephemeral.size_server_cmaui_3_test_nested3_test_nested2:
+      attachment_cmaui_port_311_test_nested3_test_nested2:
+        type: tosca.capabilities.Attachment
+        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
+      attachment_cmaui_port_322_test_nested3_test_nested2:
+        type: tosca.capabilities.Attachment
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.capacity_server_cmaui_3_test_nested3_test_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_server_cmaui_2_test_nested2:
+      network.incoming.packets_cmaui_port_211_test_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
-      binding_cmaui_port_211_test_nested2:
+      binding_server_cmaui_1:
         type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
         occurrences:
-        - 0
+        - 1
         - UNBOUNDED
-      binding_server_cmaui_2_test_nested2:
-        type: tosca.capabilities.network.Bindable
+      network.incoming.bytes_cmaui_port_311_test_nested3_test_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_cmaui_2_test_nested2:
-        type: tosca.capabilities.OperatingSystem
+      scalable_server_cmaui_2_test_nested2:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_cmaui_port_211_test_nested2:
-        type: tosca.capabilities.Attachment
+      feature_test_nested2:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      binding_cmaui_port_1:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+      scalable_server_cmaui_1:
+        type: tosca.capabilities.Scalable
         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
+      disk.write.requests_server_cmaui_2_test_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:
-        - 0
+        - 1
         - UNBOUNDED
-      disk.ephemeral.size_server_cmaui_2_test_nested2:
+      disk.read.requests_server_cmaui_2_test_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.iops_server_cmaui_1:
+      endpoint_server_cmaui_1:
+        type: tosca.capabilities.Endpoint.Admin
+        occurrences:
+        - 1
+        - UNBOUNDED
+      memory.resident_server_cmaui_2_test_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
-      vcpus_server_cmaui_2_test_nested2:
+      disk.usage_server_cmaui_2_test_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
-      binding_server_cmaui_3_test_nested3_test_nested2:
-        type: tosca.capabilities.network.Bindable
+      disk.device.read.requests_server_cmaui_3_test_nested3_test_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.write.requests_server_cmaui_1:
+      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.rate_server_cmaui_2_test_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_cmaui_port_2:
+      feature_server_cmaui_2_test_nested2:
+        type: tosca.capabilities.Node
+        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.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes.rate_server_cmaui_1:
+      network.outgoing.bytes_cmaui_port_311_test_nested3_test_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_cmaui_1:
+      memory_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.read.requests_server_cmaui_3_test_nested3_test_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_cmaui_port_322_test_nested3_test_nested2:
+      instance_server_cmaui_3_test_nested3_test_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_port_2:
+      disk.write.requests.rate_server_cmaui_3_test_nested3_test_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_server_cmaui_3_test_nested3_test_nested2:
+      network.outgoing.bytes.rate_cmaui_port_311_test_nested3_test_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_port_1:
+      disk.device.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
-      network.incoming.packets_cmaui_port_222_test_nested2:
+      disk.device.latency_server_cmaui_2_test_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.packets.rate_cmaui_port_222_test_nested2:
+      disk.usage_server_cmaui_3_test_nested3_test_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.packets.rate_cmaui_port_322_test_nested3_test_nested2:
+      network.outgoing.bytes.rate_cmaui_port_322_test_nested3_test_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_311_test_nested3_test_nested2:
+      network.outpoing.packets_cmaui_port_211_test_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_cmaui_port_222_test_nested2:
+      disk.device.allocation_server_cmaui_2_test_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_322_test_nested3_test_nested2:
+      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
-      disk.write.bytes.rate_server_cmaui_1:
+      scalable_server_cmaui_3_test_nested3_test_nested2:
+        type: tosca.capabilities.Scalable
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.write.bytes_server_cmaui_3_test_nested3_test_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.write.bytes_server_cmaui_1:
+      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.read.bytes_server_cmaui_3_test_nested3_test_nested2:
+      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
-      memory.resident_server_cmaui_3_test_nested3_test_nested2:
+      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
-      disk.device.latency_server_cmaui_3_test_nested3_test_nested2:
+      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
-      attachment_cmaui_port_222_test_nested2:
-        type: tosca.capabilities.Attachment
+      disk.device.usage_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_222_test_nested2:
+      memory_server_cmaui_3_test_nested3_test_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.packets.rate_cmaui_port_1:
+      network.outgoing.bytes_cmaui_port_222_test_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.packets.rate_cmaui_port_2:
+      binding_cmaui_port_322_test_nested3_test_nested2:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
+      disk.device.write.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:
         - 1
         - UNBOUNDED
-      feature_server_cmaui_3_test_nested3_test_nested2:
-        type: tosca.capabilities.Node
+      binding_cmaui_port_311_test_nested3_test_nested2:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
+      disk.write.bytes.rate_server_cmaui_2_test_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
+      forwarder_cmaui_port_311_test_nested3_test_nested2:
+        type: org.openecomp.capabilities.Forwarder
+        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.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.allocation_server_cmaui_3_test_nested3_test_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_222_test_nested2:
+      disk.allocation_server_cmaui_2_test_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_311_test_nested3_test_nested2:
-        type: tosca.capabilities.Attachment
+      cpu_server_cmaui_2_test_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_cmaui_port_1:
-        type: tosca.capabilities.Node
+      disk.device.read.bytes_server_cmaui_2_test_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_cmaui_port_2:
-        type: tosca.capabilities.Node
+      endpoint_server_cmaui_2_test_nested2:
+        type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes_server_cmaui_1:
+      cpu_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_server_cmaui_1:
+      feature_cmaui_port_211_test_nested2:
         type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.allocation_server_cmaui_1:
+      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
-      attachment_cmaui_port_322_test_nested3_test_nested2:
-        type: tosca.capabilities.Attachment
+      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.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.capacity_server_cmaui_3_test_nested3_test_nested2:
+      disk.capacity_server_cmaui_2_test_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_cmaui_2_test_nested2:
+      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
-      network.incoming.packets_cmaui_port_211_test_nested2:
+      disk.device.write.requests.rate_server_cmaui_3_test_nested3_test_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.iops_server_cmaui_2_test_nested2:
+      disk.read.bytes.rate_server_cmaui_2_test_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
-      binding_server_cmaui_1:
-        type: tosca.capabilities.network.Bindable
+      disk.ephemeral.size_server_cmaui_3_test_nested3_test_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_port_311_test_nested3_test_nested2:
+      disk.device.read.requests_server_cmaui_2_test_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
-      scalable_server_cmaui_2_test_nested2:
-        type: tosca.capabilities.Scalable
+      binding_cmaui_port_211_test_nested2:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
         occurrences:
-        - 1
+        - 0
         - UNBOUNDED
-      network.incoming.bytes_cmaui_port_322_test_nested3_test_nested2:
-        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_port_211_test_nested2:
+        type: org.openecomp.capabilities.Forwarder
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_cmaui_port_2:
-        type: tosca.capabilities.Attachment
+      os_server_cmaui_2_test_nested2:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      feature_test_nested2:
-        type: tosca.capabilities.Node
+      attachment_cmaui_port_211_test_nested2:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      scalable_server_cmaui_1:
-        type: tosca.capabilities.Scalable
+      disk.ephemeral.size_server_cmaui_2_test_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_cmaui_3_test_nested3_test_nested2:
+      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.packets.rate_cmaui_port_1:
+      vcpus_server_cmaui_2_test_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_2:
+      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
-      attachment_cmaui_port_1:
-        type: tosca.capabilities.Attachment
+      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.usage_server_cmaui_3_test_nested3_test_nested2:
+      network.outgoing.bytes_cmaui_port_322_test_nested3_test_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_server_cmaui_2_test_nested2:
+      cpu_server_cmaui_3_test_nested3_test_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.root.size_server_cmaui_3_test_nested3_test_nested2:
+      network.incoming.packets.rate_cmaui_port_222_test_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_server_cmaui_1:
+      network.incoming.bytes.rate_cmaui_port_311_test_nested3_test_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.write.bytes.rate_server_cmaui_3_test_nested3_test_nested2:
+      network.outgoing.bytes.rate_cmaui_port_222_test_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.usage_server_cmaui_1:
+      network.incoming.bytes.rate_cmaui_port_322_test_nested3_test_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_cmaui_port_222_test_nested2:
-        type: tosca.capabilities.Node
+      forwarder_cmaui_port_222_test_nested2:
+        type: org.openecomp.capabilities.Forwarder
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.requests_server_cmaui_2_test_nested2:
+      disk.device.latency_server_cmaui_3_test_nested3_test_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
-      endpoint_server_cmaui_1:
-        type: tosca.capabilities.Endpoint.Admin
+      network.incoming.bytes_cmaui_port_222_test_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_cmaui_2_test_nested2:
+      disk.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
-      disk.device.read.requests.rate_server_cmaui_2_test_nested2:
-        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_cmaui_1:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      memory.resident_server_cmaui_2_test_nested2:
+      disk.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.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.usage_server_cmaui_2_test_nested2:
+      cpu_util_server_cmaui_2_test_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_server_cmaui_3_test_nested3_test_nested2:
+      disk.device.iops_server_cmaui_2_test_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_cmaui_3_test_nested3_test_nested2:
-        type: tosca.capabilities.OperatingSystem
+      network.incoming.bytes_cmaui_port_322_test_nested3_test_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_cmaui_1:
-        type: tosca.capabilities.OperatingSystem
+      attachment_cmaui_port_2:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_cmaui_port_211_test_nested2:
+      disk.device.read.requests.rate_server_cmaui_3_test_nested3_test_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.write.requests.rate_server_cmaui_2_test_nested2:
+      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
-      feature_server_cmaui_2_test_nested2:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      memory_server_cmaui_2_test_nested2:
+      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
-      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.
+      attachment_cmaui_port_1:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_cmaui_port_311_test_nested3_test_nested2:
+      disk.device.usage_server_cmaui_3_test_nested3_test_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.bytes.rate_server_cmaui_3_test_nested3_test_nested2:
+      disk.root.size_server_cmaui_3_test_nested3_test_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
-      memory_server_cmaui_1:
+      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.device.iops_server_cmaui_3_test_nested3_test_nested2:
+      disk.device.write.bytes.rate_server_cmaui_3_test_nested3_test_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.write.requests_server_cmaui_2_test_nested2:
+      disk.usage_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
-      host_server_cmaui_1:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
-        occurrences:
-        - 1
-        - UNBOUNDED
-      network.incoming.packets.rate_cmaui_port_211_test_nested2:
-        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_port_222_test_nested2:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes_server_cmaui_2_test_nested2:
+      disk.device.capacity_server_cmaui_2_test_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.allocation_server_cmaui_3_test_nested3_test_nested2:
+      disk.device.read.requests.rate_server_cmaui_2_test_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
-      vcpus_server_cmaui_3_test_nested3_test_nested2:
-        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_cmaui_3_test_nested3_test_nested2:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_cmaui_port_211_test_nested2:
-        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_cmaui_1:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests_server_cmaui_3_test_nested3_test_nested2:
+      network.outgoing.bytes.rate_cmaui_port_211_test_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.read.requests_server_cmaui_3_test_nested3_test_nested2:
+      memory_server_cmaui_2_test_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_cmaui_3_test_nested3_test_nested2:
+      disk.write.bytes.rate_server_cmaui_3_test_nested3_test_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.rate_server_cmaui_3_test_nested3_test_nested2:
+      disk.device.iops_server_cmaui_3_test_nested3_test_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_cmaui_port_311_test_nested3_test_nested2:
+      disk.device.write.requests_server_cmaui_2_test_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_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.
+      host_server_cmaui_1:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.latency_server_cmaui_2_test_nested2:
+      network.incoming.packets.rate_cmaui_port_211_test_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.usage_server_cmaui_3_test_nested3_test_nested2:
+      disk.read.bytes_server_cmaui_2_test_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_cmaui_port_322_test_nested3_test_nested2:
+      disk.allocation_server_cmaui_3_test_nested3_test_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.bytes_server_cmaui_3_test_nested3_test_nested2:
+      vcpus_server_cmaui_3_test_nested3_test_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_cmaui_port_211_test_nested2:
+      network.outgoing.bytes_cmaui_port_211_test_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.write.bytes_server_cmaui_3_test_nested3_test_nested2:
+      disk.device.write.requests_server_cmaui_3_test_nested3_test_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.allocation_server_cmaui_2_test_nested2:
+      disk.device.read.bytes_server_cmaui_3_test_nested3_test_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_cmaui_1:
+      disk.device.write.bytes_server_cmaui_3_test_nested3_test_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:
@@ -1211,8 +1271,8 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      scalable_server_cmaui_3_test_nested3_test_nested2:
-        type: tosca.capabilities.Scalable
+      forwarder_cmaui_port_322_test_nested3_test_nested2:
+        type: org.openecomp.capabilities.Forwarder
         occurrences:
         - 1
         - UNBOUNDED
@@ -1240,42 +1300,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes_server_cmaui_3_test_nested3_test_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.read.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.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.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
-      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.write.bytes_server_cmaui_2_test_nested2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1411,6 +1441,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_311:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       feature_server_cmaui_3:
         type: tosca.capabilities.Node
         occurrences:
@@ -1686,6 +1721,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_322:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.write.requests_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -2036,6 +2076,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_222:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.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.
@@ -2184,6 +2229,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_322_test_nested3:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       binding_cmaui_port_322_test_nested3:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
@@ -2536,6 +2586,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_211:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.outgoing.packets.rate_cmaui_port_322_test_nested3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -2595,6 +2650,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_311_test_nested3:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       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.
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/MainServiceTemplate.yaml
index ed19586cc8..66880be377 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/MainServiceTemplate.yaml
@@ -102,10 +102,6 @@ topology_template:
           remote_ip_prefix: ::/0
           direction: ingress
       requirements:
-      - port:
-          capability: attachment_cmaui_port_211_test_nested2
-          node: test_nested
-          relationship: org.openecomp.relationships.AttachesTo
       - port:
           capability: attachment_cmaui_port_222_test_nested2
           node: test_nested
@@ -118,6 +114,10 @@ topology_template:
           capability: attachment_cmaui_port_322_test_nested3_test_nested2
           node: test_nested
           relationship: org.openecomp.relationships.AttachesTo
+      - port:
+          capability: attachment_cmaui_port_211_test_nested2
+          node: test_nested
+          relationship: org.openecomp.relationships.AttachesTo
       - port:
           capability: attachment_cmaui_port_2
           node: test_nested
@@ -199,11 +199,11 @@ topology_template:
           direction: ingress
       requirements:
       - port:
-          capability: attachment_cmaui_port_211_test_nested2
+          capability: attachment_cmaui_port_311_test_nested3_test_nested2
           node: test_nested
           relationship: org.openecomp.relationships.AttachesTo
       - port:
-          capability: attachment_cmaui_port_311_test_nested3_test_nested2
+          capability: attachment_cmaui_port_211_test_nested2
           node: test_nested
           relationship: org.openecomp.relationships.AttachesTo
       - port:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/nested2levelServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/nested2levelServiceTemplate.yaml
index 12b75836dc..6eaa43fa49 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/nested2levelServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/nested2levelServiceTemplate.yaml
@@ -214,6 +214,9 @@ topology_template:
       disk.device.capacity_server_cmaui_2:
       - server_cmaui_2
       - disk.device.capacity
+      forwarder_cmaui_port_222:
+      - cmaui_port_222
+      - forwarder
       disk.device.read.bytes.rate_server_cmaui_2:
       - server_cmaui_2
       - disk.device.read.bytes.rate
@@ -289,6 +292,9 @@ topology_template:
       scalable_server_cmaui_3_test_nested3:
       - test_nested3
       - scalable_server_cmaui_3
+      forwarder_cmaui_port_322_test_nested3:
+      - test_nested3
+      - forwarder_cmaui_port_322
       binding_cmaui_port_322_test_nested3:
       - test_nested3
       - binding_cmaui_port_322
@@ -469,6 +475,9 @@ topology_template:
       host_server_cmaui_2:
       - server_cmaui_2
       - host
+      forwarder_cmaui_port_211:
+      - cmaui_port_211
+      - forwarder
       network.outgoing.packets.rate_cmaui_port_322_test_nested3:
       - test_nested3
       - network.outgoing.packets.rate_cmaui_port_322
@@ -499,6 +508,9 @@ topology_template:
       disk.device.read.requests_server_cmaui_2:
       - server_cmaui_2
       - disk.device.read.requests
+      forwarder_cmaui_port_311_test_nested3:
+      - test_nested3
+      - forwarder_cmaui_port_311
       disk.read.bytes.rate_server_cmaui_2:
       - server_cmaui_2
       - disk.read.bytes.rate
@@ -568,4 +580,4 @@ topology_template:
       - dependency_cmaui_port_322
       dependency_server_cmaui_2:
       - server_cmaui_2
-      - 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/heat/nested/nested3levels/expectedoutputfiles/nested3levelServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/nested3levelServiceTemplate.yaml
index ae64c41e8c..59344ca13c 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/nested3levelServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/nested3levelServiceTemplate.yaml
@@ -142,6 +142,9 @@ topology_template:
       disk.device.write.bytes_server_cmaui_3:
       - server_cmaui_3
       - disk.device.write.bytes
+      forwarder_cmaui_port_311:
+      - cmaui_port_311
+      - forwarder
       feature_server_cmaui_3:
       - server_cmaui_3
       - feature
@@ -283,6 +286,9 @@ topology_template:
       disk.read.bytes.rate_server_cmaui_3:
       - server_cmaui_3
       - disk.read.bytes.rate
+      forwarder_cmaui_port_322:
+      - cmaui_port_322
+      - forwarder
       disk.device.write.requests_server_cmaui_3:
       - server_cmaui_3
       - disk.device.write.requests
@@ -343,4 +349,4 @@ topology_template:
       - dependency
       dependency_cmaui_port_322:
       - cmaui_port_322
-      - 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/heat/nested/nested3levels/expectedoutputfiles/nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/nestedServiceTemplate.yaml
index 59c7bc8292..dccdb95085 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/nestedServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/nestedServiceTemplate.yaml
@@ -154,9 +154,6 @@ topology_template:
       network.outpoing.packets_cmaui_port_222_test_nested2:
       - test_nested2
       - network.outpoing.packets_cmaui_port_222
-      disk.device.usage_server_cmaui_1:
-      - server_cmaui_1
-      - disk.device.usage
       memory.usage_server_cmaui_3_test_nested3_test_nested2:
       - test_nested2
       - memory.usage_server_cmaui_3_test_nested3
@@ -181,39 +178,21 @@ topology_template:
       feature_cmaui_port_311_test_nested3_test_nested2:
       - test_nested2
       - feature_cmaui_port_311_test_nested3
-      memory_server_cmaui_3_test_nested3_test_nested2:
-      - test_nested2
-      - memory_server_cmaui_3_test_nested3
-      network.outgoing.bytes_cmaui_port_222_test_nested2:
-      - test_nested2
-      - network.outgoing.bytes_cmaui_port_222
       disk.device.write.bytes.rate_server_cmaui_2_test_nested2:
       - test_nested2
       - disk.device.write.bytes.rate_server_cmaui_2
       feature_cmaui_port_322_test_nested3_test_nested2:
       - test_nested2
       - feature_cmaui_port_322_test_nested3
-      binding_cmaui_port_322_test_nested3_test_nested2:
-      - test_nested2
-      - binding_cmaui_port_322_test_nested3
       disk.root.size_server_cmaui_1:
       - server_cmaui_1
       - disk.root.size
-      disk.device.write.requests.rate_server_cmaui_1:
-      - server_cmaui_1
-      - disk.device.write.requests.rate
       network.outpoing.packets_cmaui_port_311_test_nested3_test_nested2:
       - test_nested2
       - network.outpoing.packets_cmaui_port_311_test_nested3
-      binding_cmaui_port_311_test_nested3_test_nested2:
-      - test_nested2
-      - binding_cmaui_port_311_test_nested3
       network.outpoing.packets_cmaui_port_322_test_nested3_test_nested2:
       - test_nested2
       - network.outpoing.packets_cmaui_port_322_test_nested3
-      disk.write.bytes.rate_server_cmaui_2_test_nested2:
-      - test_nested2
-      - disk.write.bytes.rate_server_cmaui_2
       disk.iops_server_cmaui_2_test_nested2:
       - test_nested2
       - disk.iops_server_cmaui_2
@@ -238,21 +217,12 @@ topology_template:
       cpu.delta_server_cmaui_3_test_nested3_test_nested2:
       - test_nested2
       - cpu.delta_server_cmaui_3_test_nested3
-      disk.device.iops_server_cmaui_1:
-      - server_cmaui_1
-      - disk.device.iops
       network.incoming.packets_cmaui_port_311_test_nested3_test_nested2:
       - test_nested2
       - network.incoming.packets_cmaui_port_311_test_nested3
-      disk.device.allocation_server_cmaui_3_test_nested3_test_nested2:
-      - test_nested2
-      - disk.device.allocation_server_cmaui_3_test_nested3
       disk.latency_server_cmaui_3_test_nested3_test_nested2:
       - test_nested2
       - disk.latency_server_cmaui_3_test_nested3
-      disk.allocation_server_cmaui_2_test_nested2:
-      - test_nested2
-      - disk.allocation_server_cmaui_2
       disk.device.read.bytes.rate_server_cmaui_1:
       - server_cmaui_1
       - disk.device.read.bytes.rate
@@ -265,24 +235,15 @@ topology_template:
       disk.device.read.bytes_server_cmaui_1:
       - server_cmaui_1
       - disk.device.read.bytes
-      cpu_server_cmaui_2_test_nested2:
-      - test_nested2
-      - cpu_server_cmaui_2
       disk.device.read.bytes.rate_server_cmaui_2_test_nested2:
       - test_nested2
       - disk.device.read.bytes.rate_server_cmaui_2
-      disk.device.read.bytes_server_cmaui_2_test_nested2:
-      - test_nested2
-      - disk.device.read.bytes_server_cmaui_2
       disk.write.requests.rate_server_cmaui_1:
       - server_cmaui_1
       - disk.write.requests.rate
       network.outgoing.packets.rate_cmaui_port_211_test_nested2:
       - test_nested2
       - network.outgoing.packets.rate_cmaui_port_211
-      endpoint_server_cmaui_2_test_nested2:
-      - test_nested2
-      - endpoint_server_cmaui_2
       disk.device.read.bytes.rate_server_cmaui_3_test_nested3_test_nested2:
       - test_nested2
       - disk.device.read.bytes.rate_server_cmaui_3_test_nested3
@@ -292,18 +253,9 @@ topology_template:
       instance_server_cmaui_2_test_nested2:
       - test_nested2
       - instance_server_cmaui_2
-      cpu_server_cmaui_1:
-      - server_cmaui_1
-      - cpu
       network.incoming.packets.rate_cmaui_port_311_test_nested3_test_nested2:
       - test_nested2
       - network.incoming.packets.rate_cmaui_port_311_test_nested3
-      feature_cmaui_port_211_test_nested2:
-      - test_nested2
-      - feature_cmaui_port_211
-      network.incoming.packets_cmaui_port_2:
-      - cmaui_port_2
-      - network.incoming.packets
       memory.usage_server_cmaui_2_test_nested2:
       - test_nested2
       - memory.usage_server_cmaui_2
@@ -313,9 +265,6 @@ topology_template:
       disk.capacity_server_cmaui_3_test_nested3_test_nested2:
       - test_nested2
       - disk.capacity_server_cmaui_3_test_nested3
-      network.incoming.packets_cmaui_port_1:
-      - cmaui_port_1
-      - network.incoming.packets
       disk.device.write.bytes_server_cmaui_2_test_nested2:
       - test_nested2
       - disk.device.write.bytes_server_cmaui_2
@@ -325,105 +274,45 @@ topology_template:
       disk.ephemeral.size_server_cmaui_1:
       - server_cmaui_1
       - disk.ephemeral.size
-      disk.capacity_server_cmaui_2_test_nested2:
-      - test_nested2
-      - disk.capacity_server_cmaui_2
-      disk.capacity_server_cmaui_1:
-      - server_cmaui_1
-      - disk.capacity
-      disk.device.write.requests.rate_server_cmaui_3_test_nested3_test_nested2:
-      - test_nested2
-      - disk.device.write.requests.rate_server_cmaui_3_test_nested3
       disk.latency_server_cmaui_2_test_nested2:
       - test_nested2
       - disk.latency_server_cmaui_2
-      disk.read.bytes.rate_server_cmaui_2_test_nested2:
-      - test_nested2
-      - disk.read.bytes.rate_server_cmaui_2
       network.incoming.bytes.rate_cmaui_port_211_test_nested2:
       - test_nested2
       - network.incoming.bytes.rate_cmaui_port_211
-      disk.ephemeral.size_server_cmaui_3_test_nested3_test_nested2:
-      - test_nested2
-      - disk.ephemeral.size_server_cmaui_3_test_nested3
-      disk.device.read.requests_server_cmaui_2_test_nested2:
-      - test_nested2
-      - disk.device.read.requests_server_cmaui_2
-      binding_cmaui_port_211_test_nested2:
-      - test_nested2
-      - binding_cmaui_port_211
       binding_server_cmaui_2_test_nested2:
       - test_nested2
       - binding_server_cmaui_2
-      os_server_cmaui_2_test_nested2:
-      - test_nested2
-      - os_server_cmaui_2
-      attachment_cmaui_port_211_test_nested2:
-      - test_nested2
-      - attachment_cmaui_port_211
       binding_cmaui_port_1:
       - cmaui_port_1
       - binding
       binding_cmaui_port_2:
       - cmaui_port_2
       - binding
-      disk.ephemeral.size_server_cmaui_2_test_nested2:
-      - test_nested2
-      - disk.ephemeral.size_server_cmaui_2
-      disk.iops_server_cmaui_1:
-      - server_cmaui_1
-      - disk.iops
-      vcpus_server_cmaui_2_test_nested2:
-      - test_nested2
-      - vcpus_server_cmaui_2
       binding_server_cmaui_3_test_nested3_test_nested2:
       - test_nested2
       - binding_server_cmaui_3_test_nested3
       disk.device.write.requests_server_cmaui_1:
       - server_cmaui_1
       - disk.device.write.requests
-      network.outgoing.bytes.rate_cmaui_port_2:
-      - cmaui_port_2
-      - network.outgoing.bytes.rate
       disk.device.write.bytes.rate_server_cmaui_1:
       - server_cmaui_1
       - disk.device.write.bytes.rate
       cpu_util_server_cmaui_1:
       - server_cmaui_1
       - cpu_util
-      network.outgoing.bytes.rate_cmaui_port_1:
-      - cmaui_port_1
-      - network.outgoing.bytes.rate
-      network.outgoing.bytes_cmaui_port_322_test_nested3_test_nested2:
-      - test_nested2
-      - network.outgoing.bytes_cmaui_port_322_test_nested3
       network.incoming.bytes_cmaui_port_2:
       - cmaui_port_2
       - network.incoming.bytes
-      cpu_server_cmaui_3_test_nested3_test_nested2:
-      - test_nested2
-      - cpu_server_cmaui_3_test_nested3
       network.incoming.bytes_cmaui_port_1:
       - cmaui_port_1
       - network.incoming.bytes
       network.incoming.packets_cmaui_port_222_test_nested2:
       - test_nested2
       - network.incoming.packets_cmaui_port_222
-      network.incoming.packets.rate_cmaui_port_222_test_nested2:
-      - test_nested2
-      - network.incoming.packets.rate_cmaui_port_222
       network.incoming.packets.rate_cmaui_port_322_test_nested3_test_nested2:
       - test_nested2
       - network.incoming.packets.rate_cmaui_port_322_test_nested3
-      network.incoming.bytes.rate_cmaui_port_311_test_nested3_test_nested2:
-      - test_nested2
-      - network.incoming.bytes.rate_cmaui_port_311_test_nested3
-      network.outgoing.bytes.rate_cmaui_port_222_test_nested2:
-      - test_nested2
-      - network.outgoing.bytes.rate_cmaui_port_222
-      network.incoming.bytes.rate_cmaui_port_322_test_nested3_test_nested2:
-      - test_nested2
-      - network.incoming.bytes.rate_cmaui_port_322_test_nested3
       disk.write.bytes.rate_server_cmaui_1:
       - server_cmaui_1
       - disk.write.bytes.rate
@@ -436,15 +325,9 @@ topology_template:
       memory.resident_server_cmaui_3_test_nested3_test_nested2:
       - test_nested2
       - memory.resident_server_cmaui_3_test_nested3
-      disk.device.latency_server_cmaui_3_test_nested3_test_nested2:
-      - test_nested2
-      - disk.device.latency_server_cmaui_3_test_nested3
       attachment_cmaui_port_222_test_nested2:
       - test_nested2
       - attachment_cmaui_port_222
-      network.incoming.bytes_cmaui_port_222_test_nested2:
-      - test_nested2
-      - network.incoming.bytes_cmaui_port_222
       network.incoming.packets.rate_cmaui_port_1:
       - cmaui_port_1
       - network.incoming.packets.rate
@@ -466,30 +349,15 @@ topology_template:
       feature_cmaui_port_2:
       - cmaui_port_2
       - feature
-      disk.write.bytes_server_cmaui_1:
-      - server_cmaui_1
-      - disk.write.bytes
-      feature_server_cmaui_1:
-      - server_cmaui_1
-      - feature
-      disk.allocation_server_cmaui_1:
-      - server_cmaui_1
-      - disk.allocation
       attachment_cmaui_port_322_test_nested3_test_nested2:
       - test_nested2
       - attachment_cmaui_port_322_test_nested3
       disk.device.capacity_server_cmaui_3_test_nested3_test_nested2:
       - test_nested2
       - disk.device.capacity_server_cmaui_3_test_nested3
-      cpu_util_server_cmaui_2_test_nested2:
-      - test_nested2
-      - cpu_util_server_cmaui_2
       network.incoming.packets_cmaui_port_211_test_nested2:
       - test_nested2
       - network.incoming.packets_cmaui_port_211
-      disk.device.iops_server_cmaui_2_test_nested2:
-      - test_nested2
-      - disk.device.iops_server_cmaui_2
       binding_server_cmaui_1:
       - server_cmaui_1
       - binding
@@ -499,18 +367,249 @@ topology_template:
       scalable_server_cmaui_2_test_nested2:
       - test_nested2
       - scalable_server_cmaui_2
-      network.incoming.bytes_cmaui_port_322_test_nested3_test_nested2:
-      - test_nested2
-      - network.incoming.bytes_cmaui_port_322_test_nested3
-      attachment_cmaui_port_2:
-      - cmaui_port_2
-      - attachment
       feature_test_nested2:
       - test_nested2
       - feature
       scalable_server_cmaui_1:
       - server_cmaui_1
       - scalable
+      disk.write.requests_server_cmaui_2_test_nested2:
+      - test_nested2
+      - disk.write.requests_server_cmaui_2
+      disk.read.requests_server_cmaui_2_test_nested2:
+      - test_nested2
+      - disk.read.requests_server_cmaui_2
+      endpoint_server_cmaui_1:
+      - server_cmaui_1
+      - endpoint
+      memory.resident_server_cmaui_2_test_nested2:
+      - test_nested2
+      - memory.resident_server_cmaui_2
+      disk.usage_server_cmaui_2_test_nested2:
+      - test_nested2
+      - disk.usage_server_cmaui_2
+      disk.device.read.requests_server_cmaui_3_test_nested3_test_nested2:
+      - test_nested2
+      - disk.device.read.requests_server_cmaui_3_test_nested3
+      forwarder_cmaui_port_2:
+      - cmaui_port_2
+      - forwarder
+      forwarder_cmaui_port_1:
+      - cmaui_port_1
+      - forwarder
+      disk.device.write.requests.rate_server_cmaui_2_test_nested2:
+      - test_nested2
+      - disk.device.write.requests.rate_server_cmaui_2
+      feature_server_cmaui_2_test_nested2:
+      - test_nested2
+      - feature_server_cmaui_2
+      disk.device.allocation_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.allocation
+      network.outgoing.bytes_cmaui_port_311_test_nested3_test_nested2:
+      - test_nested2
+      - network.outgoing.bytes_cmaui_port_311_test_nested3
+      memory_server_cmaui_1:
+      - server_cmaui_1
+      - memory
+      disk.read.requests_server_cmaui_3_test_nested3_test_nested2:
+      - test_nested2
+      - disk.read.requests_server_cmaui_3_test_nested3
+      instance_server_cmaui_3_test_nested3_test_nested2:
+      - test_nested2
+      - instance_server_cmaui_3_test_nested3
+      disk.write.requests.rate_server_cmaui_3_test_nested3_test_nested2:
+      - test_nested2
+      - disk.write.requests.rate_server_cmaui_3_test_nested3
+      network.outgoing.bytes.rate_cmaui_port_311_test_nested3_test_nested2:
+      - test_nested2
+      - network.outgoing.bytes.rate_cmaui_port_311_test_nested3
+      disk.device.capacity_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.capacity
+      disk.device.latency_server_cmaui_2_test_nested2:
+      - test_nested2
+      - disk.device.latency_server_cmaui_2
+      disk.usage_server_cmaui_3_test_nested3_test_nested2:
+      - test_nested2
+      - disk.usage_server_cmaui_3_test_nested3
+      network.outgoing.bytes.rate_cmaui_port_322_test_nested3_test_nested2:
+      - test_nested2
+      - network.outgoing.bytes.rate_cmaui_port_322_test_nested3
+      network.outpoing.packets_cmaui_port_211_test_nested2:
+      - test_nested2
+      - network.outpoing.packets_cmaui_port_211
+      disk.device.allocation_server_cmaui_2_test_nested2:
+      - test_nested2
+      - disk.device.allocation_server_cmaui_2
+      instance_server_cmaui_1:
+      - server_cmaui_1
+      - instance
+      scalable_server_cmaui_3_test_nested3_test_nested2:
+      - test_nested2
+      - scalable_server_cmaui_3_test_nested3
+      disk.write.bytes_server_cmaui_3_test_nested3_test_nested2:
+      - test_nested2
+      - disk.write.bytes_server_cmaui_3_test_nested3
+      network.outpoing.packets_cmaui_port_1:
+      - cmaui_port_1
+      - network.outpoing.packets
+      network.outpoing.packets_cmaui_port_2:
+      - cmaui_port_2
+      - network.outpoing.packets
+      disk.device.read.requests_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.read.requests
+      cpu.delta_server_cmaui_1:
+      - server_cmaui_1
+      - cpu.delta
+      disk.device.usage_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.usage
+      memory_server_cmaui_3_test_nested3_test_nested2:
+      - test_nested2
+      - memory_server_cmaui_3_test_nested3
+      network.outgoing.bytes_cmaui_port_222_test_nested2:
+      - test_nested2
+      - network.outgoing.bytes_cmaui_port_222
+      binding_cmaui_port_322_test_nested3_test_nested2:
+      - test_nested2
+      - binding_cmaui_port_322_test_nested3
+      disk.device.write.requests.rate_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.write.requests.rate
+      binding_cmaui_port_311_test_nested3_test_nested2:
+      - test_nested2
+      - binding_cmaui_port_311_test_nested3
+      disk.write.bytes.rate_server_cmaui_2_test_nested2:
+      - test_nested2
+      - disk.write.bytes.rate_server_cmaui_2
+      forwarder_cmaui_port_311_test_nested3_test_nested2:
+      - test_nested2
+      - forwarder_cmaui_port_311_test_nested3
+      disk.device.iops_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.iops
+      disk.device.allocation_server_cmaui_3_test_nested3_test_nested2:
+      - test_nested2
+      - disk.device.allocation_server_cmaui_3_test_nested3
+      disk.allocation_server_cmaui_2_test_nested2:
+      - test_nested2
+      - disk.allocation_server_cmaui_2
+      cpu_server_cmaui_2_test_nested2:
+      - test_nested2
+      - cpu_server_cmaui_2
+      disk.device.read.bytes_server_cmaui_2_test_nested2:
+      - test_nested2
+      - disk.device.read.bytes_server_cmaui_2
+      endpoint_server_cmaui_2_test_nested2:
+      - test_nested2
+      - endpoint_server_cmaui_2
+      cpu_server_cmaui_1:
+      - server_cmaui_1
+      - cpu
+      feature_cmaui_port_211_test_nested2:
+      - test_nested2
+      - feature_cmaui_port_211
+      network.incoming.packets_cmaui_port_2:
+      - cmaui_port_2
+      - network.incoming.packets
+      network.incoming.packets_cmaui_port_1:
+      - cmaui_port_1
+      - network.incoming.packets
+      disk.capacity_server_cmaui_2_test_nested2:
+      - test_nested2
+      - disk.capacity_server_cmaui_2
+      disk.capacity_server_cmaui_1:
+      - server_cmaui_1
+      - disk.capacity
+      disk.device.write.requests.rate_server_cmaui_3_test_nested3_test_nested2:
+      - test_nested2
+      - disk.device.write.requests.rate_server_cmaui_3_test_nested3
+      disk.read.bytes.rate_server_cmaui_2_test_nested2:
+      - test_nested2
+      - disk.read.bytes.rate_server_cmaui_2
+      disk.ephemeral.size_server_cmaui_3_test_nested3_test_nested2:
+      - test_nested2
+      - disk.ephemeral.size_server_cmaui_3_test_nested3
+      disk.device.read.requests_server_cmaui_2_test_nested2:
+      - test_nested2
+      - disk.device.read.requests_server_cmaui_2
+      binding_cmaui_port_211_test_nested2:
+      - test_nested2
+      - binding_cmaui_port_211
+      forwarder_cmaui_port_211_test_nested2:
+      - test_nested2
+      - forwarder_cmaui_port_211
+      os_server_cmaui_2_test_nested2:
+      - test_nested2
+      - os_server_cmaui_2
+      attachment_cmaui_port_211_test_nested2:
+      - test_nested2
+      - attachment_cmaui_port_211
+      disk.ephemeral.size_server_cmaui_2_test_nested2:
+      - test_nested2
+      - disk.ephemeral.size_server_cmaui_2
+      disk.iops_server_cmaui_1:
+      - server_cmaui_1
+      - disk.iops
+      vcpus_server_cmaui_2_test_nested2:
+      - test_nested2
+      - vcpus_server_cmaui_2
+      network.outgoing.bytes.rate_cmaui_port_2:
+      - cmaui_port_2
+      - network.outgoing.bytes.rate
+      network.outgoing.bytes.rate_cmaui_port_1:
+      - cmaui_port_1
+      - network.outgoing.bytes.rate
+      network.outgoing.bytes_cmaui_port_322_test_nested3_test_nested2:
+      - test_nested2
+      - network.outgoing.bytes_cmaui_port_322_test_nested3
+      cpu_server_cmaui_3_test_nested3_test_nested2:
+      - test_nested2
+      - cpu_server_cmaui_3_test_nested3
+      network.incoming.packets.rate_cmaui_port_222_test_nested2:
+      - test_nested2
+      - network.incoming.packets.rate_cmaui_port_222
+      network.incoming.bytes.rate_cmaui_port_311_test_nested3_test_nested2:
+      - test_nested2
+      - network.incoming.bytes.rate_cmaui_port_311_test_nested3
+      network.outgoing.bytes.rate_cmaui_port_222_test_nested2:
+      - test_nested2
+      - network.outgoing.bytes.rate_cmaui_port_222
+      network.incoming.bytes.rate_cmaui_port_322_test_nested3_test_nested2:
+      - test_nested2
+      - network.incoming.bytes.rate_cmaui_port_322_test_nested3
+      forwarder_cmaui_port_222_test_nested2:
+      - test_nested2
+      - forwarder_cmaui_port_222
+      disk.device.latency_server_cmaui_3_test_nested3_test_nested2:
+      - test_nested2
+      - disk.device.latency_server_cmaui_3_test_nested3
+      network.incoming.bytes_cmaui_port_222_test_nested2:
+      - test_nested2
+      - network.incoming.bytes_cmaui_port_222
+      disk.write.bytes_server_cmaui_1:
+      - server_cmaui_1
+      - disk.write.bytes
+      feature_server_cmaui_1:
+      - server_cmaui_1
+      - feature
+      disk.allocation_server_cmaui_1:
+      - server_cmaui_1
+      - disk.allocation
+      cpu_util_server_cmaui_2_test_nested2:
+      - test_nested2
+      - cpu_util_server_cmaui_2
+      disk.device.iops_server_cmaui_2_test_nested2:
+      - test_nested2
+      - disk.device.iops_server_cmaui_2
+      network.incoming.bytes_cmaui_port_322_test_nested3_test_nested2:
+      - test_nested2
+      - network.incoming.bytes_cmaui_port_322_test_nested3
+      attachment_cmaui_port_2:
+      - cmaui_port_2
+      - attachment
       disk.device.read.requests.rate_server_cmaui_3_test_nested3_test_nested2:
       - test_nested2
       - disk.device.read.requests.rate_server_cmaui_3_test_nested3
@@ -526,9 +625,6 @@ topology_template:
       disk.device.usage_server_cmaui_3_test_nested3_test_nested2:
       - test_nested2
       - disk.device.usage_server_cmaui_3_test_nested3
-      disk.write.requests_server_cmaui_2_test_nested2:
-      - test_nested2
-      - disk.write.requests_server_cmaui_2
       disk.root.size_server_cmaui_3_test_nested3_test_nested2:
       - test_nested2
       - disk.root.size_server_cmaui_3_test_nested3
@@ -544,27 +640,12 @@ topology_template:
       feature_cmaui_port_222_test_nested2:
       - test_nested2
       - feature_cmaui_port_222
-      disk.read.requests_server_cmaui_2_test_nested2:
-      - test_nested2
-      - disk.read.requests_server_cmaui_2
-      endpoint_server_cmaui_1:
-      - server_cmaui_1
-      - endpoint
       disk.device.capacity_server_cmaui_2_test_nested2:
       - test_nested2
       - disk.device.capacity_server_cmaui_2
       disk.device.read.requests.rate_server_cmaui_2_test_nested2:
       - test_nested2
       - disk.device.read.requests.rate_server_cmaui_2
-      memory.resident_server_cmaui_2_test_nested2:
-      - test_nested2
-      - memory.resident_server_cmaui_2
-      disk.usage_server_cmaui_2_test_nested2:
-      - test_nested2
-      - disk.usage_server_cmaui_2
-      disk.device.read.requests_server_cmaui_3_test_nested3_test_nested2:
-      - test_nested2
-      - disk.device.read.requests_server_cmaui_3_test_nested3
       os_server_cmaui_3_test_nested3_test_nested2:
       - test_nested2
       - os_server_cmaui_3_test_nested3
@@ -574,27 +655,12 @@ topology_template:
       network.outgoing.bytes.rate_cmaui_port_211_test_nested2:
       - test_nested2
       - network.outgoing.bytes.rate_cmaui_port_211
-      disk.device.write.requests.rate_server_cmaui_2_test_nested2:
-      - test_nested2
-      - disk.device.write.requests.rate_server_cmaui_2
-      feature_server_cmaui_2_test_nested2:
-      - test_nested2
-      - feature_server_cmaui_2
       memory_server_cmaui_2_test_nested2:
       - test_nested2
       - memory_server_cmaui_2
-      disk.device.allocation_server_cmaui_1:
-      - server_cmaui_1
-      - disk.device.allocation
-      network.outgoing.bytes_cmaui_port_311_test_nested3_test_nested2:
-      - test_nested2
-      - network.outgoing.bytes_cmaui_port_311_test_nested3
       disk.write.bytes.rate_server_cmaui_3_test_nested3_test_nested2:
       - test_nested2
       - disk.write.bytes.rate_server_cmaui_3_test_nested3
-      memory_server_cmaui_1:
-      - server_cmaui_1
-      - memory
       disk.device.iops_server_cmaui_3_test_nested3_test_nested2:
       - test_nested2
       - disk.device.iops_server_cmaui_3_test_nested3
@@ -622,45 +688,12 @@ topology_template:
       disk.device.write.requests_server_cmaui_3_test_nested3_test_nested2:
       - test_nested2
       - disk.device.write.requests_server_cmaui_3_test_nested3
-      disk.read.requests_server_cmaui_3_test_nested3_test_nested2:
-      - test_nested2
-      - disk.read.requests_server_cmaui_3_test_nested3
-      instance_server_cmaui_3_test_nested3_test_nested2:
-      - test_nested2
-      - instance_server_cmaui_3_test_nested3
-      disk.write.requests.rate_server_cmaui_3_test_nested3_test_nested2:
-      - test_nested2
-      - disk.write.requests.rate_server_cmaui_3_test_nested3
-      network.outgoing.bytes.rate_cmaui_port_311_test_nested3_test_nested2:
-      - test_nested2
-      - network.outgoing.bytes.rate_cmaui_port_311_test_nested3
-      disk.device.capacity_server_cmaui_1:
-      - server_cmaui_1
-      - disk.device.capacity
-      disk.device.latency_server_cmaui_2_test_nested2:
-      - test_nested2
-      - disk.device.latency_server_cmaui_2
-      disk.usage_server_cmaui_3_test_nested3_test_nested2:
-      - test_nested2
-      - disk.usage_server_cmaui_3_test_nested3
-      network.outgoing.bytes.rate_cmaui_port_322_test_nested3_test_nested2:
-      - test_nested2
-      - network.outgoing.bytes.rate_cmaui_port_322_test_nested3
       disk.device.read.bytes_server_cmaui_3_test_nested3_test_nested2:
       - test_nested2
       - disk.device.read.bytes_server_cmaui_3_test_nested3
-      network.outpoing.packets_cmaui_port_211_test_nested2:
-      - test_nested2
-      - network.outpoing.packets_cmaui_port_211
       disk.device.write.bytes_server_cmaui_3_test_nested3_test_nested2:
       - test_nested2
       - disk.device.write.bytes_server_cmaui_3_test_nested3
-      disk.device.allocation_server_cmaui_2_test_nested2:
-      - test_nested2
-      - disk.device.allocation_server_cmaui_2
-      instance_server_cmaui_1:
-      - server_cmaui_1
-      - instance
       disk.device.read.requests.rate_server_cmaui_1:
       - server_cmaui_1
       - disk.device.read.requests.rate
@@ -670,9 +703,9 @@ topology_template:
       binding_cmaui_port_222_test_nested2:
       - test_nested2
       - binding_cmaui_port_222
-      scalable_server_cmaui_3_test_nested3_test_nested2:
+      forwarder_cmaui_port_322_test_nested3_test_nested2:
       - test_nested2
-      - scalable_server_cmaui_3_test_nested3
+      - forwarder_cmaui_port_322_test_nested3
       network.incoming.bytes.rate_cmaui_port_1:
       - cmaui_port_1
       - network.incoming.bytes.rate
@@ -685,24 +718,9 @@ topology_template:
       vcpus_server_cmaui_1:
       - server_cmaui_1
       - vcpus
-      disk.write.bytes_server_cmaui_3_test_nested3_test_nested2:
-      - test_nested2
-      - disk.write.bytes_server_cmaui_3_test_nested3
       disk.read.bytes.rate_server_cmaui_1:
       - server_cmaui_1
       - disk.read.bytes.rate
-      network.outpoing.packets_cmaui_port_1:
-      - cmaui_port_1
-      - network.outpoing.packets
-      network.outpoing.packets_cmaui_port_2:
-      - cmaui_port_2
-      - network.outpoing.packets
-      disk.device.read.requests_server_cmaui_1:
-      - server_cmaui_1
-      - disk.device.read.requests
-      cpu.delta_server_cmaui_1:
-      - server_cmaui_1
-      - cpu.delta
       disk.write.bytes_server_cmaui_2_test_nested2:
       - test_nested2
       - disk.write.bytes_server_cmaui_2
@@ -781,4 +799,4 @@ topology_template:
       - dependency
       link_cmaui_port_211_test_nested2:
       - test_nested2
-      - link_cmaui_port_211
\ No newline at end of file
+      - link_cmaui_port_211
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index 306576bed5..67df29f6bf 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -380,6 +380,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_perimeta_ssc_a_mgmt_1_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       memory.usage_perimeta_ssc_a_server_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -392,6 +397,21 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_perimeta_ssc_a_unused_0_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      forwarder_perimeta_ssc_a_mgmt_0_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      forwarder_perimeta_ssc_a_untrusted_parent_0_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.read.requests.rate_perimeta_ssc_a_server_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,6 +570,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_perimeta_ssc_a_trusted_0_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.outgoing.bytes.rate_perimeta_ssc_a_unused_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.
@@ -631,6 +656,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_perimeta_ssc_a_ha_0_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.incoming.bytes.rate_perimeta_ssc_a_mgmt_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.
@@ -1211,6 +1241,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_perimeta_ssc_b_mgmt_1_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.outgoing.packets.rate_perimeta_ssc_b_trusted_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.
@@ -1253,6 +1288,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_perimeta_ssc_b_untrusted_parent_0_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       memory_perimeta_ssc_b_server_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1301,6 +1341,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_perimeta_ssc_b_mgmt_0_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.write.requests.rate_perimeta_ssc_b_server_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1524,6 +1569,11 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
+      forwarder_perimeta_ssc_b_ha_0_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.outgoing.bytes.rate_perimeta_ssc_b_mgmt_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.
@@ -1582,6 +1632,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_perimeta_ssc_b_unused_0_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.incoming.packets_perimeta_ssc_b_unused_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.
@@ -1735,6 +1790,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_perimeta_ssc_b_trusted_0_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.outgoing.packets.rate_perimeta_ssc_b_unused_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.
@@ -2286,6 +2346,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_perimeta_rtp_msc_a_mgmt_0_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.incoming.bytes.rate_perimeta_rtp_msc_a_ha_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.
@@ -2304,6 +2369,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_perimeta_rtp_msc_a_untrusted_parent_0_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       attachment_perimeta_rtp_msc_a_trusted_0_port:
         type: tosca.capabilities.Attachment
         occurrences:
@@ -2399,6 +2469,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_perimeta_rtp_msc_a_ha_0_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       scalable_perimeta_rtp_msc_a_server_0:
         type: tosca.capabilities.Scalable
         occurrences:
@@ -2423,6 +2498,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_perimeta_rtp_msc_a_trusted_0_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.incoming.packets.rate_perimeta_rtp_msc_a_untrusted_parent_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.
@@ -2969,6 +3049,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_perimeta_rtp_msc_b_trusted_0_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.incoming.bytes.rate_perimeta_rtp_msc_b_ha_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.
@@ -3080,6 +3165,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_perimeta_rtp_msc_b_mgmt_0_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.incoming.bytes_perimeta_rtp_msc_b_mgmt_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.
@@ -3123,6 +3213,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_perimeta_rtp_msc_b_ha_0_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.outpoing.packets_perimeta_rtp_msc_b_trusted_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.
@@ -3187,6 +3282,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_perimeta_rtp_msc_b_untrusted_parent_0_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.iops_perimeta_rtp_msc_b_server_0:
         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/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/module_1_perimeta_swmu_a_childServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/module_1_perimeta_swmu_a_childServiceTemplate.yaml
index 8f8aae3642..ed4dfdd49b 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/module_1_perimeta_swmu_a_childServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/module_1_perimeta_swmu_a_childServiceTemplate.yaml
@@ -510,12 +510,24 @@ topology_template:
       network.outgoing.bytes_perimeta_ssc_a_ha_0_port:
       - perimeta_ssc_a_ha_0_port
       - network.outgoing.bytes
+      forwarder_perimeta_ssc_a_mgmt_1_port:
+      - perimeta_ssc_a_mgmt_1_port
+      - forwarder
       memory.usage_perimeta_ssc_a_server_0:
       - perimeta_ssc_a_server_0
       - memory.usage
       network.incoming.packets.rate_perimeta_ssc_a_ha_0_port:
       - perimeta_ssc_a_ha_0_port
       - network.incoming.packets.rate
+      forwarder_perimeta_ssc_a_unused_0_port:
+      - perimeta_ssc_a_unused_0_port
+      - forwarder
+      forwarder_perimeta_ssc_a_mgmt_0_port:
+      - perimeta_ssc_a_mgmt_0_port
+      - forwarder
+      forwarder_perimeta_ssc_a_untrusted_parent_0_port:
+      - perimeta_ssc_a_untrusted_parent_0_port
+      - forwarder
       disk.device.read.requests.rate_perimeta_ssc_a_server_0:
       - perimeta_ssc_a_server_0
       - disk.device.read.requests.rate
@@ -597,6 +609,9 @@ topology_template:
       network.incoming.bytes.rate_perimeta_ssc_a_untrusted_parent_0_port:
       - perimeta_ssc_a_untrusted_parent_0_port
       - network.incoming.bytes.rate
+      forwarder_perimeta_ssc_a_trusted_0_port:
+      - perimeta_ssc_a_trusted_0_port
+      - forwarder
       network.outgoing.bytes.rate_perimeta_ssc_a_unused_0_port:
       - perimeta_ssc_a_unused_0_port
       - network.outgoing.bytes.rate
@@ -639,6 +654,9 @@ topology_template:
       disk.device.latency_perimeta_ssc_a_server_0:
       - perimeta_ssc_a_server_0
       - disk.device.latency
+      forwarder_perimeta_ssc_a_ha_0_port:
+      - perimeta_ssc_a_ha_0_port
+      - forwarder
       network.incoming.bytes.rate_perimeta_ssc_a_mgmt_1_port:
       - perimeta_ssc_a_mgmt_1_port
       - network.incoming.bytes.rate
@@ -828,4 +846,4 @@ topology_template:
       - dependency
       dependency_perimeta_ssc_a_server_0:
       - perimeta_ssc_a_server_0
-      - 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/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/module_1_perimeta_swmu_b_childServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/module_1_perimeta_swmu_b_childServiceTemplate.yaml
index 99285a3be6..fffad896af 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/module_1_perimeta_swmu_b_childServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/module_1_perimeta_swmu_b_childServiceTemplate.yaml
@@ -454,6 +454,9 @@ topology_template:
       host_perimeta_ssc_b_server_0:
       - perimeta_ssc_b_server_0
       - host
+      forwarder_perimeta_ssc_b_mgmt_1_port:
+      - perimeta_ssc_b_mgmt_1_port
+      - forwarder
       network.outgoing.packets.rate_perimeta_ssc_b_trusted_0_port:
       - perimeta_ssc_b_trusted_0_port
       - network.outgoing.packets.rate
@@ -475,6 +478,9 @@ topology_template:
       os_perimeta_ssc_b_server_0:
       - perimeta_ssc_b_server_0
       - os
+      forwarder_perimeta_ssc_b_untrusted_parent_0_port:
+      - perimeta_ssc_b_untrusted_parent_0_port
+      - forwarder
       memory_perimeta_ssc_b_server_0:
       - perimeta_ssc_b_server_0
       - memory
@@ -499,6 +505,9 @@ topology_template:
       network.outgoing.packets.rate_perimeta_ssc_b_ha_0_port:
       - perimeta_ssc_b_ha_0_port
       - network.outgoing.packets.rate
+      forwarder_perimeta_ssc_b_mgmt_0_port:
+      - perimeta_ssc_b_mgmt_0_port
+      - forwarder
       disk.write.requests.rate_perimeta_ssc_b_server_0:
       - perimeta_ssc_b_server_0
       - disk.write.requests.rate
@@ -613,6 +622,9 @@ topology_template:
       binding_perimeta_ssc_b_ha_0_port:
       - perimeta_ssc_b_ha_0_port
       - binding
+      forwarder_perimeta_ssc_b_ha_0_port:
+      - perimeta_ssc_b_ha_0_port
+      - forwarder
       network.outgoing.bytes.rate_perimeta_ssc_b_mgmt_1_port:
       - perimeta_ssc_b_mgmt_1_port
       - network.outgoing.bytes.rate
@@ -643,6 +655,9 @@ topology_template:
       disk.device.latency_perimeta_ssc_b_server_0:
       - perimeta_ssc_b_server_0
       - disk.device.latency
+      forwarder_perimeta_ssc_b_unused_0_port:
+      - perimeta_ssc_b_unused_0_port
+      - forwarder
       network.incoming.packets_perimeta_ssc_b_unused_0_port:
       - perimeta_ssc_b_unused_0_port
       - network.incoming.packets
@@ -721,6 +736,9 @@ topology_template:
       network.incoming.packets.rate_perimeta_ssc_b_unused_0_port:
       - perimeta_ssc_b_unused_0_port
       - network.incoming.packets.rate
+      forwarder_perimeta_ssc_b_trusted_0_port:
+      - perimeta_ssc_b_trusted_0_port
+      - forwarder
       network.outgoing.packets.rate_perimeta_ssc_b_unused_0_port:
       - perimeta_ssc_b_unused_0_port
       - network.outgoing.packets.rate
@@ -814,4 +832,4 @@ topology_template:
       - dependency
       link_perimeta_ssc_b_ha_0_port:
       - perimeta_ssc_b_ha_0_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/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/module_2_perimeta_sw_a_childServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/module_2_perimeta_sw_a_childServiceTemplate.yaml
index e1c87c0ea3..370cc8cf86 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/module_2_perimeta_sw_a_childServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/module_2_perimeta_sw_a_childServiceTemplate.yaml
@@ -534,6 +534,9 @@ topology_template:
       network.incoming.bytes.rate_perimeta_rtp_msc_a_untrusted_parent_0_port:
       - perimeta_rtp_msc_a_untrusted_parent_0_port
       - network.incoming.bytes.rate
+      forwarder_perimeta_rtp_msc_a_mgmt_0_port:
+      - perimeta_rtp_msc_a_mgmt_0_port
+      - forwarder
       network.incoming.bytes.rate_perimeta_rtp_msc_a_ha_0_port:
       - perimeta_rtp_msc_a_ha_0_port
       - network.incoming.bytes.rate
@@ -543,6 +546,9 @@ topology_template:
       disk.write.bytes_perimeta_rtp_msc_a_server_0:
       - perimeta_rtp_msc_a_server_0
       - disk.write.bytes
+      forwarder_perimeta_rtp_msc_a_untrusted_parent_0_port:
+      - perimeta_rtp_msc_a_untrusted_parent_0_port
+      - forwarder
       attachment_perimeta_rtp_msc_a_trusted_0_port:
       - perimeta_rtp_msc_a_trusted_0_port
       - attachment
@@ -591,6 +597,9 @@ topology_template:
       network.incoming.packets_perimeta_rtp_msc_a_mgmt_0_port:
       - perimeta_rtp_msc_a_mgmt_0_port
       - network.incoming.packets
+      forwarder_perimeta_rtp_msc_a_ha_0_port:
+      - perimeta_rtp_msc_a_ha_0_port
+      - forwarder
       scalable_perimeta_rtp_msc_a_server_0:
       - perimeta_rtp_msc_a_server_0
       - scalable
@@ -603,6 +612,9 @@ topology_template:
       network.incoming.packets.rate_perimeta_rtp_msc_a_mgmt_0_port:
       - perimeta_rtp_msc_a_mgmt_0_port
       - network.incoming.packets.rate
+      forwarder_perimeta_rtp_msc_a_trusted_0_port:
+      - perimeta_rtp_msc_a_trusted_0_port
+      - forwarder
       network.incoming.packets.rate_perimeta_rtp_msc_a_untrusted_parent_0_port:
       - perimeta_rtp_msc_a_untrusted_parent_0_port
       - network.incoming.packets.rate
@@ -732,4 +744,4 @@ topology_template:
       - link
       dependency_perimeta_rtp_msc_a_mgmt_0_port:
       - perimeta_rtp_msc_a_mgmt_0_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/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/module_2_perimeta_sw_b_childServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/module_2_perimeta_sw_b_childServiceTemplate.yaml
index ce9748e1f7..6b306a47f4 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/module_2_perimeta_sw_b_childServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/module_2_perimeta_sw_b_childServiceTemplate.yaml
@@ -439,6 +439,9 @@ topology_template:
       disk.read.requests_perimeta_rtp_msc_b_server_0:
       - perimeta_rtp_msc_b_server_0
       - disk.read.requests
+      forwarder_perimeta_rtp_msc_b_trusted_0_port:
+      - perimeta_rtp_msc_b_trusted_0_port
+      - forwarder
       network.incoming.bytes.rate_perimeta_rtp_msc_b_ha_0_port:
       - perimeta_rtp_msc_b_ha_0_port
       - network.incoming.bytes.rate
@@ -496,6 +499,9 @@ topology_template:
       disk.capacity_perimeta_rtp_msc_b_server_0:
       - perimeta_rtp_msc_b_server_0
       - disk.capacity
+      forwarder_perimeta_rtp_msc_b_mgmt_0_port:
+      - perimeta_rtp_msc_b_mgmt_0_port
+      - forwarder
       network.incoming.bytes_perimeta_rtp_msc_b_mgmt_0_port:
       - perimeta_rtp_msc_b_mgmt_0_port
       - network.incoming.bytes
@@ -517,6 +523,9 @@ topology_template:
       disk.write.requests.rate_perimeta_rtp_msc_b_server_0:
       - perimeta_rtp_msc_b_server_0
       - disk.write.requests.rate
+      forwarder_perimeta_rtp_msc_b_ha_0_port:
+      - perimeta_rtp_msc_b_ha_0_port
+      - forwarder
       network.outpoing.packets_perimeta_rtp_msc_b_trusted_0_port:
       - perimeta_rtp_msc_b_trusted_0_port
       - network.outpoing.packets
@@ -550,6 +559,9 @@ topology_template:
       network.incoming.packets_perimeta_rtp_msc_b_mgmt_0_port:
       - perimeta_rtp_msc_b_mgmt_0_port
       - network.incoming.packets
+      forwarder_perimeta_rtp_msc_b_untrusted_parent_0_port:
+      - perimeta_rtp_msc_b_untrusted_parent_0_port
+      - forwarder
       disk.device.iops_perimeta_rtp_msc_b_server_0:
       - perimeta_rtp_msc_b_server_0
       - disk.device.iops
@@ -718,4 +730,4 @@ topology_template:
       - link
       link_perimeta_rtp_msc_b_untrusted_parent_0_port:
       - perimeta_rtp_msc_b_untrusted_parent_0_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/heat/nested/recursive/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index 435c42a81c..6fd0ed7829 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -456,6 +456,16 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pcm_port_00:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      forwarder_pcm_port_01:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       instance_server_pcm:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1052,6 +1062,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pcm_port_00_server_pcm_005:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.write.bytes_server_pcm_server_pcm_005:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1325,6 +1340,16 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pcm_port_0:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      forwarder_pcm_port_1:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.outpoing.packets_pcm_port_01_server_pcm_005:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1400,6 +1425,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pcm_port_01_server_pcm_005:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.outgoing.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.
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml
index a1c67fba97..bc34c490e9 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml
@@ -395,6 +395,9 @@ topology_template:
       disk.device.read.bytes.rate_server_pcm_1:
       - server_pcm_1
       - disk.device.read.bytes.rate
+      forwarder_pcm_port_00_server_pcm_005:
+      - server_pcm_005
+      - forwarder_pcm_port_00
       disk.write.bytes_server_pcm_server_pcm_005:
       - server_pcm_005
       - disk.write.bytes_server_pcm
@@ -536,6 +539,12 @@ topology_template:
       cpu.delta_server_pcm_1:
       - server_pcm_1
       - cpu.delta
+      forwarder_pcm_port_0:
+      - pcm_port_0
+      - forwarder
+      forwarder_pcm_port_1:
+      - pcm_port_1
+      - forwarder
       network.outpoing.packets_pcm_port_01_server_pcm_005:
       - server_pcm_005
       - network.outpoing.packets_pcm_port_01
@@ -575,6 +584,9 @@ topology_template:
       disk.device.latency_server_pcm_1:
       - server_pcm_1
       - disk.device.latency
+      forwarder_pcm_port_01_server_pcm_005:
+      - server_pcm_005
+      - forwarder_pcm_port_01
       network.outgoing.bytes.rate_pcm_port_1:
       - pcm_port_1
       - network.outgoing.bytes.rate
@@ -662,4 +674,4 @@ topology_template:
       - dependency
       link_pcm_port_01_server_pcm_005:
       - server_pcm_005
-      - link_pcm_port_01
\ No newline at end of file
+      - link_pcm_port_01
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/nested-pcm_v0.1_2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/nested-pcm_v0.1_2ServiceTemplate.yaml
index 806d12ea62..ca72528fd8 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/nested-pcm_v0.1_2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/nested-pcm_v0.1_2ServiceTemplate.yaml
@@ -336,6 +336,12 @@ topology_template:
       disk.device.capacity_server_pcm:
       - server_pcm
       - disk.device.capacity
+      forwarder_pcm_port_00:
+      - pcm_port_00
+      - forwarder
+      forwarder_pcm_port_01:
+      - pcm_port_01
+      - forwarder
       instance_server_pcm:
       - server_pcm
       - instance
@@ -384,4 +390,4 @@ topology_template:
       - dependency
       dependency_network_2:
       - network_2
-      - 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/heat/nested/resourceGroupIndexVar/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupIndexVar/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index 6549b60e5e..4753f33ebd 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupIndexVar/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupIndexVar/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -414,6 +414,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_mgmt_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       cpu.delta_vnfci:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -450,4 +455,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/heat/nested/resourceGroupIndexVar/expectedoutputfiles/mvs.nested.heatServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupIndexVar/expectedoutputfiles/mvs.nested.heatServiceTemplate.yaml
index 0d84b3fc0e..521c13eab2 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupIndexVar/expectedoutputfiles/mvs.nested.heatServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupIndexVar/expectedoutputfiles/mvs.nested.heatServiceTemplate.yaml
@@ -351,6 +351,9 @@ topology_template:
       vcpus_vnfci:
       - vnfci
       - vcpus
+      forwarder_mgmt_port:
+      - mgmt_port
+      - forwarder
       cpu.delta_vnfci:
       - vnfci
       - cpu.delta
@@ -381,4 +384,4 @@ topology_template:
       - local_storage
       link_mgmt_port:
       - mgmt_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/heat/nested/resourceGroupMDNS/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupMDNS/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index dc01287086..01f6f14f48 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupMDNS/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupMDNS/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -257,6 +257,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_dns_int_bearer_0_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       host_dns_servers:
         type: tosca.capabilities.Container
         valid_source_types:
@@ -436,6 +441,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_dns_oam_protected_0_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.iops_dns_servers:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -514,4 +524,4 @@ node_types:
         type: tosca.capabilities.Scalable
         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/heat/nested/resourceGroupMDNS/expectedoutputfiles/dns_nested_01ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupMDNS/expectedoutputfiles/dns_nested_01ServiceTemplate.yaml
index b777782c3e..020c022d37 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupMDNS/expectedoutputfiles/dns_nested_01ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupMDNS/expectedoutputfiles/dns_nested_01ServiceTemplate.yaml
@@ -269,6 +269,9 @@ topology_template:
       disk.device.capacity_dns_servers:
       - dns_servers
       - disk.device.capacity
+      forwarder_dns_int_bearer_0_port:
+      - dns_int_bearer_0_port
+      - forwarder
       host_dns_servers:
       - dns_servers
       - host
@@ -359,6 +362,9 @@ topology_template:
       disk.device.read.requests_dns_servers:
       - dns_servers
       - disk.device.read.requests
+      forwarder_dns_oam_protected_0_port:
+      - dns_oam_protected_0_port
+      - forwarder
       disk.iops_dns_servers:
       - dns_servers
       - disk.iops
@@ -419,4 +425,4 @@ topology_template:
       - link
       dependency_dns_int_bearer_0_port:
       - dns_int_bearer_0_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/heat/nested/resource_group/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resource_group/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index 6549b60e5e..4753f33ebd 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resource_group/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resource_group/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -414,6 +414,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_mgmt_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       cpu.delta_vnfci:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -450,4 +455,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/heat/nested/resource_group/expectedoutputfiles/mvs.nested.heatServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resource_group/expectedoutputfiles/mvs.nested.heatServiceTemplate.yaml
index 0d84b3fc0e..521c13eab2 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resource_group/expectedoutputfiles/mvs.nested.heatServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resource_group/expectedoutputfiles/mvs.nested.heatServiceTemplate.yaml
@@ -351,6 +351,9 @@ topology_template:
       vcpus_vnfci:
       - vnfci
       - vcpus
+      forwarder_mgmt_port:
+      - mgmt_port
+      - forwarder
       cpu.delta_vnfci:
       - vnfci
       - cpu.delta
@@ -381,4 +384,4 @@ topology_template:
       - local_storage
       link_mgmt_port:
       - mgmt_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/heat/nested/resource_group_with_dynamic_count/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resource_group_with_dynamic_count/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index e2c3da021d..83f1db7e2e 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resource_group_with_dynamic_count/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resource_group_with_dynamic_count/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -436,6 +436,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_mgmt_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       cpu.delta_vnfci:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -477,4 +482,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/heat/nested/resource_group_with_dynamic_count/expectedoutputfiles/mvs.nested.heatServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resource_group_with_dynamic_count/expectedoutputfiles/mvs.nested.heatServiceTemplate.yaml
index 85bd55e44b..ea7b1c9be0 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resource_group_with_dynamic_count/expectedoutputfiles/mvs.nested.heatServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resource_group_with_dynamic_count/expectedoutputfiles/mvs.nested.heatServiceTemplate.yaml
@@ -420,6 +420,9 @@ topology_template:
       vcpus_vnfci:
       - vnfci
       - vcpus
+      forwarder_mgmt_port:
+      - mgmt_port
+      - forwarder
       cpu.delta_vnfci:
       - vnfci
       - cpu.delta
@@ -459,4 +462,4 @@ topology_template:
       - link
       dependency_boot_volume:
       - boot_volume
-      - 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/heat/nested/reusenestedfrommultibase/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/reusenestedfrommultibase/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index 9699fe0770..49b834be32 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/reusenestedfrommultibase/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/reusenestedfrommultibase/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -356,6 +356,16 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pcm_port_0:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      forwarder_pcm_port_1:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.read.bytes.rate_server_pcm:
         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/heat/nested/reusenestedfrommultibase/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/reusenestedfrommultibase/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml
index f0fffa18ed..6283861921 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/reusenestedfrommultibase/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/reusenestedfrommultibase/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml
@@ -290,6 +290,12 @@ topology_template:
       disk.iops_server_pcm:
       - server_pcm
       - disk.iops
+      forwarder_pcm_port_0:
+      - pcm_port_0
+      - forwarder
+      forwarder_pcm_port_1:
+      - pcm_port_1
+      - forwarder
       disk.read.bytes.rate_server_pcm:
       - server_pcm
       - disk.read.bytes.rate
@@ -377,4 +383,4 @@ topology_template:
       - dependency
       dependency_pcm_port_1:
       - pcm_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/heat/nested/single/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/single/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index 9699fe0770..49b834be32 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/single/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/single/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -356,6 +356,16 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pcm_port_0:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      forwarder_pcm_port_1:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.read.bytes.rate_server_pcm:
         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/heat/nested/single/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/single/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml
index f0fffa18ed..6283861921 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/single/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/single/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml
@@ -290,6 +290,12 @@ topology_template:
       disk.iops_server_pcm:
       - server_pcm
       - disk.iops
+      forwarder_pcm_port_0:
+      - pcm_port_0
+      - forwarder
+      forwarder_pcm_port_1:
+      - pcm_port_1
+      - forwarder
       disk.read.bytes.rate_server_pcm:
       - server_pcm
       - disk.read.bytes.rate
@@ -377,4 +383,4 @@ topology_template:
       - dependency
       dependency_pcm_port_1:
       - pcm_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/multiHeat/referencedHeatResources/expectedOutput/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/multiHeat/referencedHeatResources/expectedOutput/GlobalSubstitutionTypesServiceTemplate.yaml
index bcb8046664..62e950b558 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/multiHeat/referencedHeatResources/expectedOutput/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/multiHeat/referencedHeatResources/expectedOutput/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -484,6 +484,11 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
+      forwarder_oam1_mgmt_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.outpoing.packets_oam2_mgmt_port:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -501,6 +506,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_oam2_int_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.write.bytes_oam2_instance:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -737,6 +747,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_oam2_mgmt_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.root.size_arb_instance:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -784,6 +799,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_oam1_int_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.outgoing.packets.rate_oam2_mgmt_port:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1335,6 +1355,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_arb_mgmt_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       vcpus_oam2_instance:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1418,6 +1443,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_arb_int_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.latency_oam2_instance:
         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/multiHeat/referencedHeatResources/expectedOutput/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/multiHeat/referencedHeatResources/expectedOutput/MainServiceTemplate.yaml
index 4f1398af5e..c59a175a47 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/multiHeat/referencedHeatResources/expectedOutput/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/multiHeat/referencedHeatResources/expectedOutput/MainServiceTemplate.yaml
@@ -5131,4 +5131,4 @@ topology_template:
           HOT template that creates Security Group and ECA network
       members:
       - mms_security_group
-      - eca_mgmt_net
\ No newline at end of file
+      - eca_mgmt_net
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/multiHeat/referencedHeatResources/expectedOutput/eca_oamServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/multiHeat/referencedHeatResources/expectedOutput/eca_oamServiceTemplate.yaml
index 663ab05b24..9b69834f06 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/multiHeat/referencedHeatResources/expectedOutput/eca_oamServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/multiHeat/referencedHeatResources/expectedOutput/eca_oamServiceTemplate.yaml
@@ -584,6 +584,9 @@ topology_template:
       binding_arb_mgmt_port:
       - arb_mgmt_port
       - binding
+      forwarder_oam1_mgmt_port:
+      - oam1_mgmt_port
+      - forwarder
       network.outpoing.packets_oam2_mgmt_port:
       - oam2_mgmt_port
       - network.outpoing.packets
@@ -593,6 +596,9 @@ topology_template:
       attachment_arb_int_port:
       - arb_int_port
       - attachment
+      forwarder_oam2_int_port:
+      - oam2_int_port
+      - forwarder
       disk.device.write.bytes_oam2_instance:
       - oam2_instance
       - disk.device.write.bytes
@@ -713,6 +719,9 @@ topology_template:
       scalable_oam1_instance:
       - oam1_instance
       - scalable
+      forwarder_oam2_mgmt_port:
+      - oam2_mgmt_port
+      - forwarder
       disk.root.size_arb_instance:
       - arb_instance
       - disk.root.size
@@ -737,6 +746,9 @@ topology_template:
       disk.device.read.bytes.rate_oam2_instance:
       - oam2_instance
       - disk.device.read.bytes.rate
+      forwarder_oam1_int_port:
+      - oam1_int_port
+      - forwarder
       network.outgoing.packets.rate_oam2_mgmt_port:
       - oam2_mgmt_port
       - network.outgoing.packets.rate
@@ -1016,6 +1028,9 @@ topology_template:
       disk.device.write.requests.rate_arb_instance:
       - arb_instance
       - disk.device.write.requests.rate
+      forwarder_arb_mgmt_port:
+      - arb_mgmt_port
+      - forwarder
       vcpus_oam2_instance:
       - oam2_instance
       - vcpus
@@ -1061,6 +1076,9 @@ topology_template:
       attachment_oam2_int_port:
       - oam2_int_port
       - attachment
+      forwarder_arb_int_port:
+      - arb_int_port
+      - forwarder
       disk.device.latency_oam2_instance:
       - oam2_instance
       - disk.device.latency
@@ -1151,4 +1169,4 @@ topology_template:
       - local_storage
       dependency_arb_int_port:
       - arb_int_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/VMInterfaceToNettworkConnection/nested/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nested/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index 8b2bc096be..27a8565aaa 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nested/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nested/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -165,6 +165,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_template_VMInt_OAM_lb_1:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.outgoing.bytes.rate_template_VMInt_OAM_lb_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -219,6 +224,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_template_VMInt_OAM_lb_2:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.usage_server_cmaui:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -466,4 +476,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/VMInterfaceToNettworkConnection/nested/expectedoutputfiles/nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nested/expectedoutputfiles/nestedServiceTemplate.yaml
index 5c469df2db..e902c09456 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nested/expectedoutputfiles/nestedServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nested/expectedoutputfiles/nestedServiceTemplate.yaml
@@ -160,6 +160,9 @@ topology_template:
       cpu_util_server_cmaui:
       - server_cmaui
       - cpu_util
+      forwarder_template_VMInt_OAM_lb_1:
+      - template_VMInt_OAM_lb_1
+      - forwarder
       network.outgoing.bytes.rate_template_VMInt_OAM_lb_1:
       - template_VMInt_OAM_lb_1
       - network.outgoing.bytes.rate
@@ -187,6 +190,9 @@ topology_template:
       network.incoming.bytes_template_VMInt_OAM_lb_1:
       - template_VMInt_OAM_lb_1
       - network.incoming.bytes
+      forwarder_template_VMInt_OAM_lb_2:
+      - template_VMInt_OAM_lb_2
+      - forwarder
       disk.device.usage_server_cmaui:
       - server_cmaui
       - disk.device.usage
@@ -331,4 +337,4 @@ topology_template:
       - dependency
       dependency_template_VMInt_OAM_lb_2:
       - template_VMInt_OAM_lb_2
-      - 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/VMInterfaceToNettworkConnection/nestedArrayParam/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nestedArrayParam/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index 31a150f54f..ad6cab222e 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nestedArrayParam/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nestedArrayParam/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -166,6 +166,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_template_VMInt_OAM_lb_1:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.outgoing.bytes.rate_template_VMInt_OAM_lb_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -220,6 +225,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_template_VMInt_OAM_lb_2:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.usage_server_cmaui:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -467,4 +477,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/VMInterfaceToNettworkConnection/nestedArrayParam/expectedoutputfiles/nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nestedArrayParam/expectedoutputfiles/nestedServiceTemplate.yaml
index 95cc9a0f70..34b06b1743 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nestedArrayParam/expectedoutputfiles/nestedServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nestedArrayParam/expectedoutputfiles/nestedServiceTemplate.yaml
@@ -165,6 +165,9 @@ topology_template:
       cpu_util_server_cmaui:
       - server_cmaui
       - cpu_util
+      forwarder_template_VMInt_OAM_lb_1:
+      - template_VMInt_OAM_lb_1
+      - forwarder
       network.outgoing.bytes.rate_template_VMInt_OAM_lb_1:
       - template_VMInt_OAM_lb_1
       - network.outgoing.bytes.rate
@@ -192,6 +195,9 @@ topology_template:
       network.incoming.bytes_template_VMInt_OAM_lb_1:
       - template_VMInt_OAM_lb_1
       - network.incoming.bytes
+      forwarder_template_VMInt_OAM_lb_2:
+      - template_VMInt_OAM_lb_2
+      - forwarder
       disk.device.usage_server_cmaui:
       - server_cmaui
       - disk.device.usage
@@ -336,4 +342,4 @@ topology_template:
       - dependency
       dependency_template_VMInt_OAM_lb_2:
       - template_VMInt_OAM_lb_2
-      - 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/VMInterfaceToNettworkConnection/nestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index 8d6c8625e8..8915357694 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -575,6 +575,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_template_VMInt_OAM_lb_4_test_nested2Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       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.
@@ -692,6 +697,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_template_VMInt_OAM_lb_1:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level_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.
@@ -733,6 +743,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_template_VMInt_OAM_lb_2:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       memory_server_cmaui_4_test_nested4Level_test_nested3Level_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.
@@ -783,6 +798,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_template_VMInt_OAM_lb_8_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.usage_server_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.
@@ -837,6 +857,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_template_VMInt_OAM_lb_3_test_nested2Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.write.requests.rate_server_cmaui_3_test_nested3Level_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.
@@ -943,6 +968,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_template_VMInt_OAM_lb_6_test_nested3Level_test_nested2Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.allocation_server_cmaui_3_test_nested3Level_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.
@@ -1372,6 +1402,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_template_VMInt_OAM_lb_5_test_nested3Level_test_nested2Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       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.
@@ -1478,6 +1513,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_template_VMInt_OAM_lb_7_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.usage_server_cmaui_4_test_nested4Level_test_nested3Level_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.
@@ -2047,6 +2087,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_template_VMInt_OAM_lb_7_test_nested4Level_test_nested3Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       feature_test_nested4Level_test_nested3Level:
         type: tosca.capabilities.Node
         occurrences:
@@ -2376,6 +2421,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_template_VMInt_OAM_lb_8_test_nested4Level_test_nested3Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.read.requests.rate_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -2501,6 +2551,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_template_VMInt_OAM_lb_6_test_nested3Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       binding_server_cmaui_2:
         type: tosca.capabilities.network.Bindable
         occurrences:
@@ -2553,6 +2608,16 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_template_VMInt_OAM_lb_4:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      forwarder_template_VMInt_OAM_lb_3:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.read.bytes.rate_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -2647,6 +2712,11 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
+      forwarder_template_VMInt_OAM_lb_5_test_nested3Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       feature_template_VMInt_OAM_lb_3:
         type: tosca.capabilities.Node
         occurrences:
@@ -3574,6 +3644,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_template_VMInt_OAM_lb_6:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.iops_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -3603,6 +3678,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_template_VMInt_OAM_lb_7_test_nested4Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       binding_server_cmaui_3:
         type: tosca.capabilities.network.Bindable
         occurrences:
@@ -3625,6 +3705,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_template_VMInt_OAM_lb_5:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.outgoing.packets.rate_template_VMInt_OAM_lb_8_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -3716,6 +3801,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_template_VMInt_OAM_lb_8_test_nested4Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.read.requests.rate_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -3983,12 +4073,22 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_template_VMInt_OAM_lb_8:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.write.bytes_server_cmaui_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_template_VMInt_OAM_lb_7:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       feature_server_cmaui_4:
         type: tosca.capabilities.Node
         occurrences:
@@ -4338,4 +4438,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/VMInterfaceToNettworkConnection/nestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml
index 7936734b08..ff0d47ba2f 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml
@@ -307,6 +307,9 @@ topology_template:
       network.incoming.bytes.rate_template_VMInt_OAM_lb_8_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.incoming.bytes.rate_template_VMInt_OAM_lb_8_test_nested4Level_test_nested3Level
+      forwarder_template_VMInt_OAM_lb_4_test_nested2Level:
+      - test_nested2Level
+      - forwarder_template_VMInt_OAM_lb_4
       disk.device.write.bytes.rate_server_cmaui_1:
       - server_cmaui_1
       - disk.device.write.bytes.rate
@@ -367,6 +370,9 @@ topology_template:
       network.outgoing.bytes_template_VMInt_OAM_lb_5_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.outgoing.bytes_template_VMInt_OAM_lb_5_test_nested3Level
+      forwarder_template_VMInt_OAM_lb_1:
+      - template_VMInt_OAM_lb_1
+      - forwarder
       disk.device.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - disk.device.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level
@@ -388,6 +394,9 @@ topology_template:
       network.incoming.packets.rate_template_VMInt_OAM_lb_4_test_nested2Level:
       - test_nested2Level
       - network.incoming.packets.rate_template_VMInt_OAM_lb_4
+      forwarder_template_VMInt_OAM_lb_2:
+      - template_VMInt_OAM_lb_2
+      - forwarder
       memory_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - memory_server_cmaui_4_test_nested4Level_test_nested3Level
@@ -415,6 +424,9 @@ topology_template:
       os_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - os_server_cmaui_4_test_nested4Level_test_nested3Level
+      forwarder_template_VMInt_OAM_lb_8_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - forwarder_template_VMInt_OAM_lb_8_test_nested4Level_test_nested3Level
       disk.usage_server_cmaui_2_test_nested2Level:
       - test_nested2Level
       - disk.usage_server_cmaui_2
@@ -442,6 +454,9 @@ topology_template:
       disk.device.write.bytes_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - disk.device.write.bytes_server_cmaui_3_test_nested3Level
+      forwarder_template_VMInt_OAM_lb_3_test_nested2Level:
+      - test_nested2Level
+      - forwarder_template_VMInt_OAM_lb_3
       disk.write.requests.rate_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - disk.write.requests.rate_server_cmaui_3_test_nested3Level
@@ -496,6 +511,9 @@ topology_template:
       disk.write.bytes.rate_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - disk.write.bytes.rate_server_cmaui_3_test_nested3Level
+      forwarder_template_VMInt_OAM_lb_6_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - forwarder_template_VMInt_OAM_lb_6_test_nested3Level
       disk.device.allocation_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - disk.device.allocation_server_cmaui_3_test_nested3Level
@@ -715,6 +733,9 @@ topology_template:
       disk.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - disk.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level
+      forwarder_template_VMInt_OAM_lb_5_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - forwarder_template_VMInt_OAM_lb_5_test_nested3Level
       disk.write.requests_server_cmaui_1:
       - server_cmaui_1
       - disk.write.requests
@@ -769,6 +790,9 @@ topology_template:
       network.outpoing.packets_template_VMInt_OAM_lb_8_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.outpoing.packets_template_VMInt_OAM_lb_8_test_nested4Level_test_nested3Level
+      forwarder_template_VMInt_OAM_lb_7_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - forwarder_template_VMInt_OAM_lb_7_test_nested4Level_test_nested3Level
       disk.usage_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - disk.usage_server_cmaui_4_test_nested4Level_test_nested3Level
@@ -964,4 +988,4 @@ topology_template:
       - dependency_test_nested3Level
       dependency_server_cmaui_1:
       - server_cmaui_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/VMInterfaceToNettworkConnection/nestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml
index 37ec759d13..50ca47a3b3 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml
@@ -221,6 +221,9 @@ topology_template:
       network.outgoing.bytes_template_VMInt_OAM_lb_7_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.outgoing.bytes_template_VMInt_OAM_lb_7_test_nested4Level
+      forwarder_template_VMInt_OAM_lb_7_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - forwarder_template_VMInt_OAM_lb_7_test_nested4Level
       feature_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - feature_test_nested4Level
@@ -386,6 +389,9 @@ topology_template:
       disk.device.write.requests_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - disk.device.write.requests_server_cmaui_3
+      forwarder_template_VMInt_OAM_lb_8_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - forwarder_template_VMInt_OAM_lb_8_test_nested4Level
       disk.device.read.requests.rate_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - disk.device.read.requests.rate_server_cmaui_3
@@ -449,6 +455,9 @@ topology_template:
       disk.device.allocation_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - disk.device.allocation_server_cmaui_4_test_nested4Level
+      forwarder_template_VMInt_OAM_lb_6_test_nested3Level:
+      - test_nested3Level
+      - forwarder_template_VMInt_OAM_lb_6
       binding_server_cmaui_2:
       - server_cmaui_2
       - binding
@@ -476,6 +485,12 @@ topology_template:
       network.incoming.packets.rate_template_VMInt_OAM_lb_5_test_nested3Level:
       - test_nested3Level
       - network.incoming.packets.rate_template_VMInt_OAM_lb_5
+      forwarder_template_VMInt_OAM_lb_4:
+      - template_VMInt_OAM_lb_4
+      - forwarder
+      forwarder_template_VMInt_OAM_lb_3:
+      - template_VMInt_OAM_lb_3
+      - forwarder
       disk.device.read.bytes.rate_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - disk.device.read.bytes.rate_server_cmaui_3
@@ -524,6 +539,9 @@ topology_template:
       binding_template_VMInt_OAM_lb_6_test_nested3Level:
       - test_nested3Level
       - binding_template_VMInt_OAM_lb_6
+      forwarder_template_VMInt_OAM_lb_5_test_nested3Level:
+      - test_nested3Level
+      - forwarder_template_VMInt_OAM_lb_5
       feature_template_VMInt_OAM_lb_3:
       - template_VMInt_OAM_lb_3
       - feature
@@ -764,4 +782,4 @@ topology_template:
       - dependency
       link_template_VMInt_OAM_lb_6_test_nested3Level:
       - test_nested3Level
-      - link_template_VMInt_OAM_lb_6
\ No newline at end of file
+      - link_template_VMInt_OAM_lb_6
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml
index a394a1bde8..c1274f188a 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml
@@ -358,6 +358,9 @@ topology_template:
       disk.device.write.bytes_server_cmaui_3:
       - server_cmaui_3
       - disk.device.write.bytes
+      forwarder_template_VMInt_OAM_lb_6:
+      - template_VMInt_OAM_lb_6
+      - forwarder
       disk.iops_server_cmaui_4_test_nested4Level:
       - test_nested4Level
       - disk.iops_server_cmaui_4
@@ -373,6 +376,9 @@ topology_template:
       disk.allocation_server_cmaui_3:
       - server_cmaui_3
       - disk.allocation
+      forwarder_template_VMInt_OAM_lb_7_test_nested4Level:
+      - test_nested4Level
+      - forwarder_template_VMInt_OAM_lb_7
       binding_server_cmaui_3:
       - server_cmaui_3
       - binding
@@ -385,6 +391,9 @@ topology_template:
       scalable_server_cmaui_3:
       - server_cmaui_3
       - scalable
+      forwarder_template_VMInt_OAM_lb_5:
+      - template_VMInt_OAM_lb_5
+      - forwarder
       network.outgoing.packets.rate_template_VMInt_OAM_lb_8_test_nested4Level:
       - test_nested4Level
       - network.outgoing.packets.rate_template_VMInt_OAM_lb_8
@@ -433,6 +442,9 @@ topology_template:
       disk.device.latency_server_cmaui_4_test_nested4Level:
       - test_nested4Level
       - disk.device.latency_server_cmaui_4
+      forwarder_template_VMInt_OAM_lb_8_test_nested4Level:
+      - test_nested4Level
+      - forwarder_template_VMInt_OAM_lb_8
       disk.device.read.requests.rate_server_cmaui_4_test_nested4Level:
       - test_nested4Level
       - disk.device.read.requests.rate_server_cmaui_4
@@ -553,4 +565,4 @@ topology_template:
       - dependency
       link_template_VMInt_OAM_lb_7_test_nested4Level:
       - test_nested4Level
-      - link_template_VMInt_OAM_lb_7
\ No newline at end of file
+      - link_template_VMInt_OAM_lb_7
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml
index 603537cc99..e4e375c972 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml
@@ -131,9 +131,15 @@ topology_template:
       disk.write.bytes_server_cmaui_4:
       - server_cmaui_4
       - disk.write.bytes
+      forwarder_template_VMInt_OAM_lb_8:
+      - template_VMInt_OAM_lb_8
+      - forwarder
       disk.device.write.bytes_server_cmaui_4:
       - server_cmaui_4
       - disk.device.write.bytes
+      forwarder_template_VMInt_OAM_lb_7:
+      - template_VMInt_OAM_lb_7
+      - forwarder
       feature_server_cmaui_4:
       - server_cmaui_4
       - feature
@@ -329,4 +335,4 @@ topology_template:
       - local_storage
       link_template_VMInt_OAM_lb_8:
       - template_VMInt_OAM_lb_8
-      - 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/VMInterfaceToNettworkConnection/shared/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/shared/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index 1d966f2d29..95b4b656e0 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/shared/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/shared/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -210,6 +210,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_abc_port_1:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.root.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.
@@ -561,6 +566,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_template_VMInt_OAM_lb_1:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       scalable_server_cmaui_1:
         type: tosca.capabilities.Scalable
         occurrences:
@@ -578,6 +588,16 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_template_VMInt_OAM_lb_3:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      forwarder_template_VMInt_OAM_lb_2:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.root.size_server_abc:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1134,6 +1154,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_1:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.read.requests.rate_server_cmaui:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1269,4 +1294,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/VMInterfaceToNettworkConnection/shared/expectedoutputfiles/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/shared/expectedoutputfiles/nested1ServiceTemplate.yaml
index c36dce1d2c..696a130ed4 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/shared/expectedoutputfiles/nested1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/shared/expectedoutputfiles/nested1ServiceTemplate.yaml
@@ -234,6 +234,9 @@ topology_template:
       disk.device.usage_server_abc:
       - server_abc
       - disk.device.usage
+      forwarder_abc_port_1:
+      - abc_port_1
+      - forwarder
       disk.root.size_server_cmaui_1:
       - server_cmaui_1
       - disk.root.size
@@ -411,6 +414,9 @@ topology_template:
       binding_server_cmaui_1:
       - server_cmaui_1
       - binding
+      forwarder_template_VMInt_OAM_lb_1:
+      - template_VMInt_OAM_lb_1
+      - forwarder
       scalable_server_cmaui_1:
       - server_cmaui_1
       - scalable
@@ -420,6 +426,12 @@ topology_template:
       network.outgoing.bytes.rate_template_VMInt_OAM_lb_2:
       - template_VMInt_OAM_lb_2
       - network.outgoing.bytes.rate
+      forwarder_template_VMInt_OAM_lb_3:
+      - template_VMInt_OAM_lb_3
+      - forwarder
+      forwarder_template_VMInt_OAM_lb_2:
+      - template_VMInt_OAM_lb_2
+      - forwarder
       disk.root.size_server_abc:
       - server_abc
       - disk.root.size
@@ -615,4 +627,4 @@ topology_template:
       - local_storage
       local_storage_server_abc:
       - server_abc
-      - 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/VMInterfaceToNettworkConnection/shared/expectedoutputfiles/nested2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/shared/expectedoutputfiles/nested2ServiceTemplate.yaml
index 1d2d9ada48..4d6da778c1 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/shared/expectedoutputfiles/nested2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/shared/expectedoutputfiles/nested2ServiceTemplate.yaml
@@ -191,6 +191,9 @@ topology_template:
       binding_server_cmaui:
       - server_cmaui
       - binding
+      forwarder_cmaui_port_1:
+      - cmaui_port_1
+      - forwarder
       disk.device.read.requests.rate_server_cmaui:
       - server_cmaui
       - disk.device.read.requests.rate
@@ -272,4 +275,4 @@ topology_template:
       - dependency
       link_cmaui_port_1:
       - cmaui_port_1
-      - 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/VMInterfaceToNettworkConnection/sharedNestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/sharedNestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index 5be719ef1a..25fd6ea864 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/sharedNestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/sharedNestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -605,6 +605,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_template_VMInt_OAM_lb_4_test_nested2Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.outpoing.packets_template_VMInt_OAM_lb_30:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -717,6 +722,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_template_VMInt_OAM_lb_1:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level_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.
@@ -771,6 +781,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_template_VMInt_OAM_lb_2:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.usage_server_cmaui:
         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 +861,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_template_VMInt_OAM_lb_8_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       binding_server_cmaui:
         type: tosca.capabilities.network.Bindable
         occurrences:
@@ -905,6 +925,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_template_VMInt_OAM_lb_3_test_nested2Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.write.requests.rate_server_cmaui_3_test_nested3Level_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.
@@ -1017,6 +1042,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_template_VMInt_OAM_lb_6_test_nested3Level_test_nested2Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.allocation_server_cmaui_3_test_nested3Level_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.
@@ -1128,6 +1158,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_template_VMInt_OAM_lb_30:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.write.bytes.rate_server_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.
@@ -1476,6 +1511,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_template_VMInt_OAM_lb_5_test_nested3Level_test_nested2Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.read.bytes_server_cmaui_3_test_nested3Level_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.
@@ -1571,6 +1611,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_template_VMInt_OAM_lb_7_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.usage_server_cmaui_4_test_nested4Level_test_nested3Level_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.
@@ -2126,6 +2171,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_template_VMInt_OAM_lb_7_test_nested4Level_test_nested3Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       feature_test_nested4Level_test_nested3Level:
         type: tosca.capabilities.Node
         occurrences:
@@ -2455,6 +2505,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_template_VMInt_OAM_lb_8_test_nested4Level_test_nested3Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.read.requests.rate_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -2580,6 +2635,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_template_VMInt_OAM_lb_6_test_nested3Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       binding_server_cmaui_2:
         type: tosca.capabilities.network.Bindable
         occurrences:
@@ -2632,6 +2692,16 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_template_VMInt_OAM_lb_4:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      forwarder_template_VMInt_OAM_lb_3:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.read.bytes.rate_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -2726,6 +2796,11 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
+      forwarder_template_VMInt_OAM_lb_5_test_nested3Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       feature_template_VMInt_OAM_lb_3:
         type: tosca.capabilities.Node
         occurrences:
@@ -3653,6 +3728,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_template_VMInt_OAM_lb_6:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.iops_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -3682,6 +3762,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_template_VMInt_OAM_lb_7_test_nested4Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       binding_server_cmaui_3:
         type: tosca.capabilities.network.Bindable
         occurrences:
@@ -3704,6 +3789,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_template_VMInt_OAM_lb_5:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.outgoing.packets.rate_template_VMInt_OAM_lb_8_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -3795,6 +3885,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_template_VMInt_OAM_lb_8_test_nested4Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.read.requests.rate_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -4062,12 +4157,22 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_template_VMInt_OAM_lb_8:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.write.bytes_server_cmaui_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_template_VMInt_OAM_lb_7:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       feature_server_cmaui_4:
         type: tosca.capabilities.Node
         occurrences:
@@ -4417,4 +4522,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/VMInterfaceToNettworkConnection/sharedNestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/sharedNestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml
index 26236a13b4..0d5355310e 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/sharedNestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/sharedNestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml
@@ -328,6 +328,9 @@ topology_template:
       network.incoming.bytes.rate_template_VMInt_OAM_lb_8_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.incoming.bytes.rate_template_VMInt_OAM_lb_8_test_nested4Level_test_nested3Level
+      forwarder_template_VMInt_OAM_lb_4_test_nested2Level:
+      - test_nested2Level
+      - forwarder_template_VMInt_OAM_lb_4
       network.outpoing.packets_template_VMInt_OAM_lb_30:
       - template_VMInt_OAM_lb_30
       - network.outpoing.packets
@@ -385,6 +388,9 @@ topology_template:
       network.outgoing.bytes_template_VMInt_OAM_lb_5_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.outgoing.bytes_template_VMInt_OAM_lb_5_test_nested3Level
+      forwarder_template_VMInt_OAM_lb_1:
+      - template_VMInt_OAM_lb_1
+      - forwarder
       disk.device.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - disk.device.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level
@@ -412,6 +418,9 @@ topology_template:
       disk.usage_server_cmaui:
       - server_cmaui
       - disk.usage
+      forwarder_template_VMInt_OAM_lb_2:
+      - template_VMInt_OAM_lb_2
+      - forwarder
       disk.device.usage_server_cmaui:
       - server_cmaui
       - disk.device.usage
@@ -451,6 +460,9 @@ topology_template:
       os_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - os_server_cmaui_4_test_nested4Level_test_nested3Level
+      forwarder_template_VMInt_OAM_lb_8_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - forwarder_template_VMInt_OAM_lb_8_test_nested4Level_test_nested3Level
       binding_server_cmaui:
       - server_cmaui
       - binding
@@ -481,6 +493,9 @@ topology_template:
       disk.device.write.bytes_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - disk.device.write.bytes_server_cmaui_3_test_nested3Level
+      forwarder_template_VMInt_OAM_lb_3_test_nested2Level:
+      - test_nested2Level
+      - forwarder_template_VMInt_OAM_lb_3
       disk.write.requests.rate_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - disk.write.requests.rate_server_cmaui_3_test_nested3Level
@@ -538,6 +553,9 @@ topology_template:
       disk.write.bytes.rate_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - disk.write.bytes.rate_server_cmaui_3_test_nested3Level
+      forwarder_template_VMInt_OAM_lb_6_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - forwarder_template_VMInt_OAM_lb_6_test_nested3Level
       disk.device.allocation_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - disk.device.allocation_server_cmaui_3_test_nested3Level
@@ -595,6 +613,9 @@ topology_template:
       disk.device.write.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - disk.device.write.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level
+      forwarder_template_VMInt_OAM_lb_30:
+      - template_VMInt_OAM_lb_30
+      - forwarder
       disk.write.bytes.rate_server_cmaui_2_test_nested2Level:
       - test_nested2Level
       - disk.write.bytes.rate_server_cmaui_2
@@ -772,6 +793,9 @@ topology_template:
       disk.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - disk.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level
+      forwarder_template_VMInt_OAM_lb_5_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - forwarder_template_VMInt_OAM_lb_5_test_nested3Level
       disk.read.bytes_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - disk.read.bytes_server_cmaui_3_test_nested3Level
@@ -820,6 +844,9 @@ topology_template:
       network.outpoing.packets_template_VMInt_OAM_lb_8_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.outpoing.packets_template_VMInt_OAM_lb_8_test_nested4Level_test_nested3Level
+      forwarder_template_VMInt_OAM_lb_7_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - forwarder_template_VMInt_OAM_lb_7_test_nested4Level_test_nested3Level
       disk.usage_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - disk.usage_server_cmaui_4_test_nested4Level_test_nested3Level
@@ -1018,4 +1045,4 @@ topology_template:
       - dependency_template_VMInt_OAM_lb_6_test_nested3Level
       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/VMInterfaceToNettworkConnection/sharedNestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/sharedNestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml
index 255b99a357..0d62e47b44 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/sharedNestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/sharedNestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml
@@ -221,6 +221,9 @@ topology_template:
       network.outgoing.bytes_template_VMInt_OAM_lb_7_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.outgoing.bytes_template_VMInt_OAM_lb_7_test_nested4Level
+      forwarder_template_VMInt_OAM_lb_7_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - forwarder_template_VMInt_OAM_lb_7_test_nested4Level
       feature_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - feature_test_nested4Level
@@ -386,6 +389,9 @@ topology_template:
       disk.device.write.requests_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - disk.device.write.requests_server_cmaui_3
+      forwarder_template_VMInt_OAM_lb_8_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - forwarder_template_VMInt_OAM_lb_8_test_nested4Level
       disk.device.read.requests.rate_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - disk.device.read.requests.rate_server_cmaui_3
@@ -449,6 +455,9 @@ topology_template:
       disk.device.allocation_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - disk.device.allocation_server_cmaui_4_test_nested4Level
+      forwarder_template_VMInt_OAM_lb_6_test_nested3Level:
+      - test_nested3Level
+      - forwarder_template_VMInt_OAM_lb_6
       binding_server_cmaui_2:
       - server_cmaui_2
       - binding
@@ -476,6 +485,12 @@ topology_template:
       network.incoming.packets.rate_template_VMInt_OAM_lb_5_test_nested3Level:
       - test_nested3Level
       - network.incoming.packets.rate_template_VMInt_OAM_lb_5
+      forwarder_template_VMInt_OAM_lb_4:
+      - template_VMInt_OAM_lb_4
+      - forwarder
+      forwarder_template_VMInt_OAM_lb_3:
+      - template_VMInt_OAM_lb_3
+      - forwarder
       disk.device.read.bytes.rate_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - disk.device.read.bytes.rate_server_cmaui_3
@@ -524,6 +539,9 @@ topology_template:
       binding_template_VMInt_OAM_lb_6_test_nested3Level:
       - test_nested3Level
       - binding_template_VMInt_OAM_lb_6
+      forwarder_template_VMInt_OAM_lb_5_test_nested3Level:
+      - test_nested3Level
+      - forwarder_template_VMInt_OAM_lb_5
       feature_template_VMInt_OAM_lb_3:
       - template_VMInt_OAM_lb_3
       - feature
@@ -764,4 +782,4 @@ topology_template:
       - dependency
       link_template_VMInt_OAM_lb_6_test_nested3Level:
       - test_nested3Level
-      - link_template_VMInt_OAM_lb_6
\ No newline at end of file
+      - link_template_VMInt_OAM_lb_6
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/sharedNestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/sharedNestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml
index 3280a0e588..b13991b33b 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/sharedNestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/sharedNestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml
@@ -358,6 +358,9 @@ topology_template:
       disk.device.write.bytes_server_cmaui_3:
       - server_cmaui_3
       - disk.device.write.bytes
+      forwarder_template_VMInt_OAM_lb_6:
+      - template_VMInt_OAM_lb_6
+      - forwarder
       disk.iops_server_cmaui_4_test_nested4Level:
       - test_nested4Level
       - disk.iops_server_cmaui_4
@@ -373,6 +376,9 @@ topology_template:
       disk.allocation_server_cmaui_3:
       - server_cmaui_3
       - disk.allocation
+      forwarder_template_VMInt_OAM_lb_7_test_nested4Level:
+      - test_nested4Level
+      - forwarder_template_VMInt_OAM_lb_7
       binding_server_cmaui_3:
       - server_cmaui_3
       - binding
@@ -385,6 +391,9 @@ topology_template:
       scalable_server_cmaui_3:
       - server_cmaui_3
       - scalable
+      forwarder_template_VMInt_OAM_lb_5:
+      - template_VMInt_OAM_lb_5
+      - forwarder
       network.outgoing.packets.rate_template_VMInt_OAM_lb_8_test_nested4Level:
       - test_nested4Level
       - network.outgoing.packets.rate_template_VMInt_OAM_lb_8
@@ -433,6 +442,9 @@ topology_template:
       disk.device.latency_server_cmaui_4_test_nested4Level:
       - test_nested4Level
       - disk.device.latency_server_cmaui_4
+      forwarder_template_VMInt_OAM_lb_8_test_nested4Level:
+      - test_nested4Level
+      - forwarder_template_VMInt_OAM_lb_8
       disk.device.read.requests.rate_server_cmaui_4_test_nested4Level:
       - test_nested4Level
       - disk.device.read.requests.rate_server_cmaui_4
@@ -553,4 +565,4 @@ topology_template:
       - dependency
       link_template_VMInt_OAM_lb_7_test_nested4Level:
       - test_nested4Level
-      - link_template_VMInt_OAM_lb_7
\ No newline at end of file
+      - link_template_VMInt_OAM_lb_7
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/sharedNestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/sharedNestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml
index 4189c1eda5..4ccc594953 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/sharedNestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/sharedNestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml
@@ -131,9 +131,15 @@ topology_template:
       disk.write.bytes_server_cmaui_4:
       - server_cmaui_4
       - disk.write.bytes
+      forwarder_template_VMInt_OAM_lb_8:
+      - template_VMInt_OAM_lb_8
+      - forwarder
       disk.device.write.bytes_server_cmaui_4:
       - server_cmaui_4
       - disk.device.write.bytes
+      forwarder_template_VMInt_OAM_lb_7:
+      - template_VMInt_OAM_lb_7
+      - forwarder
       feature_server_cmaui_4:
       - server_cmaui_4
       - feature
@@ -329,4 +335,4 @@ topology_template:
       - local_storage
       link_template_VMInt_OAM_lb_8:
       - template_VMInt_OAM_lb_8
-      - 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/buildconsolidationdata/getattribute/noneToPortOrCompute/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/buildconsolidationdata/getattribute/noneToPortOrCompute/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index 9699fe0770..49b834be32 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/buildconsolidationdata/getattribute/noneToPortOrCompute/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/buildconsolidationdata/getattribute/noneToPortOrCompute/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -356,6 +356,16 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pcm_port_0:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      forwarder_pcm_port_1:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.read.bytes.rate_server_pcm:
         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/buildconsolidationdata/getattribute/noneToPortOrCompute/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/buildconsolidationdata/getattribute/noneToPortOrCompute/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml
index f0fffa18ed..a31add8507 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/buildconsolidationdata/getattribute/noneToPortOrCompute/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/buildconsolidationdata/getattribute/noneToPortOrCompute/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml
@@ -290,6 +290,12 @@ topology_template:
       disk.iops_server_pcm:
       - server_pcm
       - disk.iops
+      forwarder_pcm_port_0:
+      - pcm_port_0
+      - forwarder
+      forwarder_pcm_port_1:
+      - pcm_port_1
+      - forwarder
       disk.read.bytes.rate_server_pcm:
       - server_pcm
       - disk.read.bytes.rate
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fw2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fw2ServiceTemplate.yaml
index d456191462..51d7b1b0e2 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fw2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fw2ServiceTemplate.yaml
@@ -478,4 +478,4 @@ topology_template:
       - dependency
       network_service_policy_3_test_nested3:
       - test_nested3
-      - network_service_policy_3
\ No newline at end of file
+      - network_service_policy_3
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fw2_service_instance3ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fw2_service_instance3ServiceTemplate.yaml
index 1e540ee891..41554e57e0 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fw2_service_instance3ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fw2_service_instance3ServiceTemplate.yaml
@@ -336,4 +336,4 @@ topology_template:
       - link
       link_port_2:
       - port_2
-      - 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/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fw3ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fw3ServiceTemplate.yaml
index b164684390..ede8467cf5 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fw3ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fw3ServiceTemplate.yaml
@@ -328,4 +328,4 @@ topology_template:
       - dependency
       link_port_2_service_instance4:
       - service_instance4
-      - link_port_2
\ No newline at end of file
+      - link_port_2
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fw3_service_instance4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fw3_service_instance4ServiceTemplate.yaml
index 14b7afc565..0f4867b04a 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fw3_service_instance4ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fw3_service_instance4ServiceTemplate.yaml
@@ -336,4 +336,4 @@ topology_template:
       - link
       link_port_2:
       - port_2
-      - 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/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fwServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fwServiceTemplate.yaml
index dbd3ad9947..1098d6c010 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fwServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fwServiceTemplate.yaml
@@ -538,4 +538,4 @@ topology_template:
       - link_port_2_service_instance4_test_nested3
       dependency_service_instance1:
       - service_instance1
-      - 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/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fw_service_instance1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fw_service_instance1ServiceTemplate.yaml
index 72b97b69a9..b813d27a61 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fw_service_instance1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fw_service_instance1ServiceTemplate.yaml
@@ -336,4 +336,4 @@ topology_template:
       - link
       link_port_2:
       - port_2
-      - 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/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fw_service_instance2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fw_service_instance2ServiceTemplate.yaml
index 1798f33fde..329913a303 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fw_service_instance2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fw_service_instance2ServiceTemplate.yaml
@@ -336,4 +336,4 @@ topology_template:
       - link
       link_port_2:
       - port_2
-      - 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/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fw2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fw2ServiceTemplate.yaml
index d456191462..51d7b1b0e2 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fw2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fw2ServiceTemplate.yaml
@@ -478,4 +478,4 @@ topology_template:
       - dependency
       network_service_policy_3_test_nested3:
       - test_nested3
-      - network_service_policy_3
\ No newline at end of file
+      - network_service_policy_3
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fw2_service_instance3ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fw2_service_instance3ServiceTemplate.yaml
index 1e540ee891..41554e57e0 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fw2_service_instance3ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fw2_service_instance3ServiceTemplate.yaml
@@ -336,4 +336,4 @@ topology_template:
       - link
       link_port_2:
       - port_2
-      - 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/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fw3ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fw3ServiceTemplate.yaml
index b164684390..ede8467cf5 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fw3ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fw3ServiceTemplate.yaml
@@ -328,4 +328,4 @@ topology_template:
       - dependency
       link_port_2_service_instance4:
       - service_instance4
-      - link_port_2
\ No newline at end of file
+      - link_port_2
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fw3_service_instance4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fw3_service_instance4ServiceTemplate.yaml
index 14b7afc565..0f4867b04a 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fw3_service_instance4ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fw3_service_instance4ServiceTemplate.yaml
@@ -336,4 +336,4 @@ topology_template:
       - link
       link_port_2:
       - port_2
-      - 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/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fwServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fwServiceTemplate.yaml
index dbd3ad9947..1098d6c010 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fwServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fwServiceTemplate.yaml
@@ -538,4 +538,4 @@ topology_template:
       - link_port_2_service_instance4_test_nested3
       dependency_service_instance1:
       - service_instance1
-      - 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/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fw_service_instance1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fw_service_instance1ServiceTemplate.yaml
index 72b97b69a9..b813d27a61 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fw_service_instance1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fw_service_instance1ServiceTemplate.yaml
@@ -336,4 +336,4 @@ topology_template:
       - link
       link_port_2:
       - port_2
-      - 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/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fw_service_instance2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fw_service_instance2ServiceTemplate.yaml
index 1798f33fde..329913a303 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fw_service_instance2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fw_service_instance2ServiceTemplate.yaml
@@ -336,4 +336,4 @@ topology_template:
       - link
       link_port_2:
       - port_2
-      - 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/contrail2serviceinstance/sharedNetworkMulti/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/sharedNetworkMulti/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index a1a5a404ba..7a525ebbe2 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/sharedNetworkMulti/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/sharedNetworkMulti/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -44,4 +44,4 @@ node_types:
         - 1
         - 1
   org.openecomp.resource.vfc.nodes.heat.compute_service_template:
-    derived_from: org.openecomp.resource.vfc.nodes.heat.contrail.Compute
\ No newline at end of file
+    derived_from: org.openecomp.resource.vfc.nodes.heat.contrail.Compute
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/sharedNetworkMulti/expectedoutputfiles/OCS-fw_service_instanceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/sharedNetworkMulti/expectedoutputfiles/OCS-fw_service_instanceServiceTemplate.yaml
index e99b179375..51dacb2187 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/sharedNetworkMulti/expectedoutputfiles/OCS-fw_service_instanceServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/sharedNetworkMulti/expectedoutputfiles/OCS-fw_service_instanceServiceTemplate.yaml
@@ -424,4 +424,4 @@ topology_template:
       - link
       link_port_4:
       - port_4
-      - 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/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 f48028d381..cc66cebec3 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
@@ -596,6 +596,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_plt_plt_oam_0_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       binding_plt_plt_data_0_port:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
@@ -725,6 +730,11 @@ node_types:
         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.
@@ -762,6 +772,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_plt_plt_data_0_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
   org.openecomp.resource.abstract.nodes.app:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
@@ -1160,6 +1175,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_app_app_oam_0_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.ephemeral.size_app:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1295,6 +1315,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_app_app_internal_0_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       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.
@@ -1471,6 +1496,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_app_app_data_0_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       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.
@@ -1833,6 +1863,11 @@ node_types:
         - 1
         - 1
     capabilities:
+      forwarder_iox_iox_oam_0_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       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.
@@ -2228,6 +2263,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_iox_iox_data_0_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       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.
@@ -2258,6 +2298,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_iox_iox_internal_0_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.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.
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 096c214eb4..815fcb5582 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
@@ -425,6 +425,9 @@ topology_template:
       disk.device.latency_app:
       - app
       - disk.device.latency
+      forwarder_app_app_oam_0_port:
+      - app_app_oam_0_port
+      - forwarder
       disk.ephemeral.size_app:
       - app
       - disk.ephemeral.size
@@ -494,6 +497,9 @@ topology_template:
       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
       memory_app:
       - app
       - memory
@@ -584,6 +590,9 @@ topology_template:
       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
       disk.write.requests_app:
       - app
       - disk.write.requests
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 a157cf8c26..1527056307 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
@@ -388,6 +388,9 @@ 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
@@ -589,6 +592,9 @@ topology_template:
       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
       disk.device.read.bytes.rate_iox:
       - iox
       - disk.device.read.bytes.rate
@@ -604,6 +610,9 @@ topology_template:
       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
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 c1ef9cb284..1365084d4d 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
@@ -526,6 +526,9 @@ topology_template:
       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
@@ -592,6 +595,9 @@ topology_template:
       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
@@ -610,6 +616,9 @@ topology_template:
       disk.write.requests.rate_plt:
       - plt
       - disk.write.requests.rate
+      forwarder_plt_plt_data_0_port:
+      - plt_plt_data_0_port
+      - forwarder
     requirements:
       local_storage_plt:
       - plt
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 a647fe595e..66a332c26b 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
@@ -367,6 +367,11 @@ node_types:
         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.
@@ -419,4 +424,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/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 575c086ae1..3d9ebd74ae 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
@@ -252,6 +252,9 @@ topology_template:
       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
@@ -291,4 +294,4 @@ topology_template:
       - dependency
       dependency_pd_server:
       - pd_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/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 a647fe595e..66a332c26b 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
@@ -367,6 +367,11 @@ node_types:
         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.
@@ -419,4 +424,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/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 575c086ae1..3d9ebd74ae 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
@@ -252,6 +252,9 @@ topology_template:
       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
@@ -291,4 +294,4 @@ topology_template:
       - dependency
       dependency_pd_server:
       - pd_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/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 a647fe595e..66a332c26b 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
@@ -367,6 +367,11 @@ node_types:
         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.
@@ -419,4 +424,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/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 575c086ae1..3d9ebd74ae 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
@@ -252,6 +252,9 @@ topology_template:
       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
@@ -291,4 +294,4 @@ topology_template:
       - dependency
       dependency_pd_server:
       - pd_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/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 3edec8ebf2..aa0281b2f1 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
@@ -385,6 +385,11 @@ node_types:
         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.
@@ -437,4 +442,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/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 95cde53fa1..67acf54036 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
@@ -279,6 +279,9 @@ topology_template:
       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
@@ -318,4 +321,4 @@ topology_template:
       - dependency
       dependency_pd_server:
       - pd_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/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 0d89b398f9..088c5cb2a0 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
@@ -755,6 +755,26 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pcm_port_2:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      forwarder_pcm_port_3:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      forwarder_pcm_port_0:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      forwarder_pcm_port_1:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.capacity_server_pcma1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1305,12 +1325,22 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pcma_server_pcm_port_2:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       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
+      forwarder_pcma_server_pcm_port_3:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       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.
@@ -2014,6 +2044,16 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pcm_port_00:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      forwarder_pcm_port_01:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       instance_server_pcm:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -2456,6 +2496,11 @@ node_types:
         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:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -2492,6 +2537,11 @@ 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.
@@ -2979,6 +3029,16 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pcma_server_pcm_port_0:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      forwarder_pcma_server_pcm_port_1:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       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.
@@ -3361,6 +3421,11 @@ node_types:
         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:
@@ -3389,6 +3454,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_b_single_1b_1b_t1_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       scalable_b_single_1b:
         type: tosca.capabilities.Scalable
         occurrences:
@@ -4002,6 +4072,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_1c1_scalling_instance_1c1_t2_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.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.
@@ -4049,6 +4124,11 @@ node_types:
         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:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -4561,6 +4641,11 @@ node_types:
         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.
@@ -4649,6 +4734,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_a_single_1a_1a_t2_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.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.
@@ -5050,6 +5140,11 @@ node_types:
         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:
@@ -5078,6 +5173,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_b_single_1b_1b_t1_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       scalable_b_single_1b:
         type: tosca.capabilities.Scalable
         occurrences:
@@ -5416,4 +5516,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/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 c93ba44157..6384eaff7d 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
@@ -286,6 +286,9 @@ topology_template:
       cpu_1c1_scalling_instance:
       - 1c1_scalling_instance
       - cpu
+      forwarder_1c1_scalling_instance_1c1_t2_port:
+      - 1c1_scalling_instance_1c1_t2_port
+      - forwarder
       disk.write.bytes_1c1_scalling_instance:
       - 1c1_scalling_instance
       - disk.write.bytes
@@ -310,6 +313,9 @@ topology_template:
       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
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 89a21731f6..9995398481 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
@@ -323,6 +323,9 @@ topology_template:
       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
@@ -341,6 +344,9 @@ 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
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_a_single_1aServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_a_single_1aServiceTemplate.yaml
index 9ca4a68a67..e3b7ea00c8 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/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/connectivityBetweenPatterns/out/Nested_a_single_1aServiceTemplate.yaml
@@ -251,6 +251,9 @@ topology_template:
       cpu.delta_a_single_1a:
       - a_single_1a
       - cpu.delta
+      forwarder_a_single_1a_1a_t1_port:
+      - a_single_1a_1a_t1_port
+      - forwarder
       disk.device.write.requests_a_single_1a:
       - a_single_1a
       - disk.device.write.requests
@@ -296,6 +299,9 @@ topology_template:
       memory.usage_a_single_1a:
       - a_single_1a
       - memory.usage
+      forwarder_a_single_1a_1a_t2_port:
+      - a_single_1a_1a_t2_port
+      - forwarder
       disk.device.write.requests.rate_a_single_1a:
       - a_single_1a
       - disk.device.write.requests.rate
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 2882f0f5df..222d1f8f1a 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
@@ -213,6 +213,9 @@ topology_template:
       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
@@ -228,6 +231,9 @@ topology_template:
       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
       scalable_b_single_1b:
       - b_single_1b
       - scalable
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 d86e42e84a..5443e13fdf 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
@@ -218,6 +218,9 @@ topology_template:
       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
@@ -233,6 +236,9 @@ topology_template:
       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
       scalable_b_single_1b:
       - b_single_1b
       - scalable
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_serverServiceTemplate.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_serverServiceTemplate.yaml
index 41bef51803..87432d3911 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_serverServiceTemplate.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_serverServiceTemplate.yaml
@@ -327,9 +327,15 @@ topology_template:
       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
       disk.device.read.requests_pcma_server:
       - pcma_server
       - disk.device.read.requests
+      forwarder_pcma_server_pcm_port_3:
+      - pcma_server_pcm_port_3
+      - forwarder
       disk.write.bytes.rate_pcma_server:
       - pcma_server
       - disk.write.bytes.rate
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 0079f2a476..4f927ee3a8 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
@@ -312,6 +312,12 @@ topology_template:
       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
       disk.device.read.requests_pcma_server:
       - pcma_server
       - disk.device.read.requests
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 2d854439a6..8c6d8cd84c 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
@@ -537,6 +537,18 @@ topology_template:
       os_server_pcma2:
       - abstract_pcma_server
       - os_pcma_server
+      forwarder_pcm_port_2:
+      - abstract_pcma_server
+      - forwarder_pcma_server_pcm_port_2
+      forwarder_pcm_port_3:
+      - abstract_pcma_server
+      - forwarder_pcma_server_pcm_port_3
+      forwarder_pcm_port_0:
+      - abstract_pcma_server_1
+      - forwarder_pcma_server_pcm_port_0
+      forwarder_pcm_port_1:
+      - abstract_pcma_server_1
+      - forwarder_pcma_server_pcm_port_1
       disk.capacity_server_pcma1:
       - abstract_pcma_server_1
       - disk.capacity_pcma_server
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-pcm_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-pcm_v0.1ServiceTemplate.yaml
index 2a2b7dcacf..04e97ca016 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/nested-pcm_v0.1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/nested-pcm_v0.1ServiceTemplate.yaml
@@ -414,6 +414,12 @@ topology_template:
       disk.device.capacity_server_pcm:
       - server_pcm
       - disk.device.capacity
+      forwarder_pcm_port_00:
+      - pcm_port_00
+      - forwarder
+      forwarder_pcm_port_01:
+      - pcm_port_01
+      - forwarder
       instance_server_pcm:
       - server_pcm
       - instance
@@ -456,4 +462,4 @@ topology_template:
       - link
       dependency_server_pcm:
       - server_pcm
-      - 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/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 4b764a3b84..9f74e7911a 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
@@ -282,6 +282,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pcm_port_0_0:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.latency_server_pcma2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -483,6 +488,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pcm_port_1_0:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       cpu_util_server_pcma1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -700,6 +710,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pcm_port_2_0:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.write.requests_server_pcma2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -818,6 +833,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pcm_port_3_0:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       feature_pcm_port_1_0:
         type: tosca.capabilities.Node
         occurrences:
@@ -1301,12 +1321,22 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pcma_server_pcm_port_2:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       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
+      forwarder_pcma_server_pcm_port_3:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       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.
@@ -1917,6 +1947,16 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pcm_port_0:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      forwarder_pcm_port_1:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.read.bytes.rate_server_pcm:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -2442,6 +2482,11 @@ node_types:
         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:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -2478,6 +2523,11 @@ 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.
@@ -2965,6 +3015,16 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pcma_server_pcm_port_0:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      forwarder_pcma_server_pcm_port_1:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       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.
@@ -3341,6 +3401,11 @@ node_types:
         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:
@@ -3369,6 +3434,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_b_single_1b_1b_t1_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       scalable_b_single_1b:
         type: tosca.capabilities.Scalable
         occurrences:
@@ -3973,6 +4043,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_1c1_scalling_instance_1c1_t2_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.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.
@@ -4020,6 +4095,11 @@ node_types:
         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:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -4526,6 +4606,11 @@ node_types:
         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.
@@ -4614,6 +4699,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_a_single_1a_1a_t2_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.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.
@@ -5009,6 +5099,11 @@ node_types:
         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:
@@ -5037,6 +5132,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_b_single_1b_1b_t1_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       scalable_b_single_1b:
         type: tosca.capabilities.Scalable
         occurrences:
@@ -5438,4 +5538,4 @@ node_types:
         type: tosca.capabilities.Endpoint
         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/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 9e94593103..045f907605 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
@@ -271,6 +271,9 @@ topology_template:
       cpu_1c1_scalling_instance:
       - 1c1_scalling_instance
       - cpu
+      forwarder_1c1_scalling_instance_1c1_t2_port:
+      - 1c1_scalling_instance_1c1_t2_port
+      - forwarder
       disk.write.bytes_1c1_scalling_instance:
       - 1c1_scalling_instance
       - disk.write.bytes
@@ -295,6 +298,9 @@ topology_template:
       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
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 f686203df4..e761770921 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
@@ -314,6 +314,9 @@ topology_template:
       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
@@ -332,6 +335,9 @@ 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
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 9aa2e2d8e4..c175da1795 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
@@ -242,6 +242,9 @@ topology_template:
       cpu.delta_a_single_1a:
       - a_single_1a
       - cpu.delta
+      forwarder_a_single_1a_1a_t1_port:
+      - a_single_1a_1a_t1_port
+      - forwarder
       disk.device.write.requests_a_single_1a:
       - a_single_1a
       - disk.device.write.requests
@@ -287,6 +290,9 @@ topology_template:
       memory.usage_a_single_1a:
       - a_single_1a
       - memory.usage
+      forwarder_a_single_1a_1a_t2_port:
+      - a_single_1a_1a_t2_port
+      - forwarder
       disk.device.write.requests.rate_a_single_1a:
       - a_single_1a
       - disk.device.write.requests.rate
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 cf69da5d8f..dd68f12949 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
@@ -204,6 +204,9 @@ topology_template:
       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
@@ -219,6 +222,9 @@ topology_template:
       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
       scalable_b_single_1b:
       - b_single_1b
       - scalable
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 9d6e5d9099..60dd00b7a3 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
@@ -209,6 +209,9 @@ topology_template:
       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
@@ -224,6 +227,9 @@ topology_template:
       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
       scalable_b_single_1b:
       - b_single_1b
       - scalable
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 4a2f034765..87432d3911 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
@@ -327,9 +327,15 @@ topology_template:
       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
       disk.device.read.requests_pcma_server:
       - pcma_server
       - disk.device.read.requests
+      forwarder_pcma_server_pcm_port_3:
+      - pcma_server_pcm_port_3
+      - forwarder
       disk.write.bytes.rate_pcma_server:
       - pcma_server
       - disk.write.bytes.rate
@@ -441,4 +447,4 @@ topology_template:
       - link
       link_pcma_server_pcm_port_3:
       - pcma_server_pcm_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/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 0e25828e1d..eda475a577 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
@@ -312,6 +312,12 @@ topology_template:
       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
       disk.device.read.requests_pcma_server:
       - pcma_server
       - disk.device.read.requests
@@ -432,4 +438,4 @@ topology_template:
       - link
       dependency_pcma_server_pcm_port_0:
       - pcma_server_pcm_port_0
-      - 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/mixPatterns/dependencyConnectivity/out/nested-no-novaServiceTemplate.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-novaServiceTemplate.yaml
index 6dcce5e85d..b091afe45f 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-novaServiceTemplate.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-novaServiceTemplate.yaml
@@ -132,4 +132,4 @@ topology_template:
       - port
       dependency_jsa_security_group_1:
       - jsa_security_group_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/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 c66869707d..96bccb85ef 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
@@ -293,6 +293,9 @@ topology_template:
       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
       disk.device.latency_server_pcma2:
       - abstract_pcma_server
       - disk.device.latency_pcma_server
@@ -395,6 +398,9 @@ topology_template:
       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
       cpu_util_server_pcma1:
       - abstract_pcma_server_1
       - cpu_util_pcma_server
@@ -506,6 +512,9 @@ topology_template:
       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
       disk.device.write.requests_server_pcma2:
       - abstract_pcma_server
       - disk.device.write.requests_pcma_server
@@ -566,6 +575,9 @@ topology_template:
       network.incoming.bytes_pcm_port_3_0:
       - abstract_pcma_server
       - network.incoming.bytes_pcma_server_pcm_port_3
+      forwarder_pcm_port_3_0:
+      - abstract_pcma_server
+      - forwarder_pcma_server_pcm_port_3
       feature_pcm_port_1_0:
       - abstract_pcma_server_1
       - feature_pcma_server_pcm_port_1
@@ -653,4 +665,4 @@ topology_template:
       - link_pcma_server_pcm_port_0
       link_pcm_port_3_0:
       - abstract_pcma_server
-      - link_pcma_server_pcm_port_3
\ No newline at end of file
+      - link_pcma_server_pcm_port_3
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/nested-pcm_v0.1ServiceTemplate.yaml
index 198b4c8e9a..d881e9e06f 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/nested-pcm_v0.1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/nested-pcm_v0.1ServiceTemplate.yaml
@@ -365,6 +365,12 @@ topology_template:
       disk.iops_server_pcm:
       - server_pcm
       - disk.iops
+      forwarder_pcm_port_0:
+      - pcm_port_0
+      - forwarder
+      forwarder_pcm_port_1:
+      - pcm_port_1
+      - forwarder
       disk.read.bytes.rate_server_pcm:
       - server_pcm
       - disk.read.bytes.rate
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 49ac20889a..83341fab08 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
@@ -751,6 +751,26 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pcm_port_2:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      forwarder_pcm_port_3:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      forwarder_pcm_port_0:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      forwarder_pcm_port_1:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.capacity_server_pcma1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1301,12 +1321,22 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pcma_server_pcm_port_2:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       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
+      forwarder_pcma_server_pcm_port_3:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       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.
@@ -2006,6 +2036,16 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pcm_port_00:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      forwarder_pcm_port_01:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       instance_server_pcm:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -2442,6 +2482,11 @@ node_types:
         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:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -2478,6 +2523,11 @@ 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.
@@ -2965,6 +3015,16 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pcma_server_pcm_port_0:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      forwarder_pcma_server_pcm_port_1:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       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.
@@ -3341,6 +3401,11 @@ node_types:
         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:
@@ -3369,6 +3434,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_b_single_1b_1b_t1_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       scalable_b_single_1b:
         type: tosca.capabilities.Scalable
         occurrences:
@@ -3973,6 +4043,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_1c1_scalling_instance_1c1_t2_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.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.
@@ -4020,6 +4095,11 @@ node_types:
         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:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -4526,6 +4606,11 @@ node_types:
         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.
@@ -4614,6 +4699,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_a_single_1a_1a_t2_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.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.
@@ -5009,6 +5099,11 @@ node_types:
         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:
@@ -5037,6 +5132,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_b_single_1b_1b_t1_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       scalable_b_single_1b:
         type: tosca.capabilities.Scalable
         occurrences:
@@ -5375,4 +5475,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/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 9e94593103..045f907605 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
@@ -271,6 +271,9 @@ topology_template:
       cpu_1c1_scalling_instance:
       - 1c1_scalling_instance
       - cpu
+      forwarder_1c1_scalling_instance_1c1_t2_port:
+      - 1c1_scalling_instance_1c1_t2_port
+      - forwarder
       disk.write.bytes_1c1_scalling_instance:
       - 1c1_scalling_instance
       - disk.write.bytes
@@ -295,6 +298,9 @@ topology_template:
       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
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 f686203df4..e761770921 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
@@ -314,6 +314,9 @@ topology_template:
       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
@@ -332,6 +335,9 @@ 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
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_a_single_1aServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_a_single_1aServiceTemplate.yaml
index 9aa2e2d8e4..c175da1795 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/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/oneAppearancePerPattern/out/Nested_a_single_1aServiceTemplate.yaml
@@ -242,6 +242,9 @@ topology_template:
       cpu.delta_a_single_1a:
       - a_single_1a
       - cpu.delta
+      forwarder_a_single_1a_1a_t1_port:
+      - a_single_1a_1a_t1_port
+      - forwarder
       disk.device.write.requests_a_single_1a:
       - a_single_1a
       - disk.device.write.requests
@@ -287,6 +290,9 @@ topology_template:
       memory.usage_a_single_1a:
       - a_single_1a
       - memory.usage
+      forwarder_a_single_1a_1a_t2_port:
+      - a_single_1a_1a_t2_port
+      - forwarder
       disk.device.write.requests.rate_a_single_1a:
       - a_single_1a
       - disk.device.write.requests.rate
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 cf69da5d8f..dd68f12949 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
@@ -204,6 +204,9 @@ topology_template:
       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
@@ -219,6 +222,9 @@ topology_template:
       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
       scalable_b_single_1b:
       - b_single_1b
       - scalable
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 9d6e5d9099..60dd00b7a3 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
@@ -209,6 +209,9 @@ topology_template:
       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
@@ -224,6 +227,9 @@ topology_template:
       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
       scalable_b_single_1b:
       - b_single_1b
       - scalable
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_serverServiceTemplate.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_serverServiceTemplate.yaml
index 41bef51803..87432d3911 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_serverServiceTemplate.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_serverServiceTemplate.yaml
@@ -327,9 +327,15 @@ topology_template:
       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
       disk.device.read.requests_pcma_server:
       - pcma_server
       - disk.device.read.requests
+      forwarder_pcma_server_pcm_port_3:
+      - pcma_server_pcm_port_3
+      - forwarder
       disk.write.bytes.rate_pcma_server:
       - pcma_server
       - disk.write.bytes.rate
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 0079f2a476..4f927ee3a8 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
@@ -312,6 +312,12 @@ topology_template:
       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
       disk.device.read.requests_pcma_server:
       - pcma_server
       - disk.device.read.requests
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 676798e9a3..b60c6d29e1 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
@@ -533,6 +533,18 @@ topology_template:
       os_server_pcma2:
       - abstract_pcma_server
       - os_pcma_server
+      forwarder_pcm_port_2:
+      - abstract_pcma_server
+      - forwarder_pcma_server_pcm_port_2
+      forwarder_pcm_port_3:
+      - abstract_pcma_server
+      - forwarder_pcma_server_pcm_port_3
+      forwarder_pcm_port_0:
+      - abstract_pcma_server_1
+      - forwarder_pcma_server_pcm_port_0
+      forwarder_pcm_port_1:
+      - abstract_pcma_server_1
+      - forwarder_pcma_server_pcm_port_1
       disk.capacity_server_pcma1:
       - abstract_pcma_server_1
       - disk.capacity_pcma_server
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-pcm_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-pcm_v0.1ServiceTemplate.yaml
index 293a19f311..a99b0d53d2 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/nested-pcm_v0.1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/nested-pcm_v0.1ServiceTemplate.yaml
@@ -410,6 +410,12 @@ topology_template:
       disk.device.capacity_server_pcm:
       - server_pcm
       - disk.device.capacity
+      forwarder_pcm_port_00:
+      - pcm_port_00
+      - forwarder
+      forwarder_pcm_port_01:
+      - pcm_port_01
+      - forwarder
       instance_server_pcm:
       - server_pcm
       - instance
@@ -452,4 +458,4 @@ topology_template:
       - link
       dependency_server_pcm:
       - server_pcm
-      - 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/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 963fe97ca1..0c12ab2a37 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
@@ -755,6 +755,26 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pcm_port_2:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      forwarder_pcm_port_3:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      forwarder_pcm_port_0:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      forwarder_pcm_port_1:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.capacity_server_pcma1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1091,6 +1111,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_1c12_scalling_instance_1c1_t1_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.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.
@@ -1883,6 +1908,16 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pcm_port_00:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      forwarder_pcm_port_01:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       instance_server_pcm:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -2177,6 +2212,11 @@ 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:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -2752,12 +2792,22 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pcma_server_pcm_port_2:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       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
+      forwarder_pcma_server_pcm_port_3:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       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.
@@ -3461,6 +3511,16 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pcm_port_00:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      forwarder_pcm_port_01:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       instance_server_pcm:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -3764,6 +3824,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_2c2_catalog_instance_2c202_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       host_2c2_catalog_instance:
         type: tosca.capabilities.Container
         valid_source_types:
@@ -3930,6 +3995,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_2c2_catalog_instance_1c201_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.ephemeral.size_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.
@@ -4289,6 +4359,11 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
+      forwarder_1c2_catalog_instance_1c201_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       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.
@@ -4478,6 +4553,11 @@ node_types:
         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.
@@ -4779,6 +4859,11 @@ 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.
@@ -5402,6 +5487,16 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pcma_server_pcm_port_0:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      forwarder_pcma_server_pcm_port_1:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       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.
@@ -5790,6 +5885,11 @@ node_types:
         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:
@@ -5818,6 +5918,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_b_single_1b_1b_t1_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       scalable_b_single_1b:
         type: tosca.capabilities.Scalable
         occurrences:
@@ -6409,6 +6514,11 @@ node_types:
         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.
@@ -6497,6 +6607,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_a_single_1a_1a_t2_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.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.
@@ -6892,6 +7007,11 @@ node_types:
         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:
@@ -6920,6 +7040,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_b_single_1b_1b_t1_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       scalable_b_single_1b:
         type: tosca.capabilities.Scalable
         occurrences:
@@ -7444,6 +7569,11 @@ 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.
@@ -7504,6 +7634,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_b_single_2b_1b_t1_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.iops_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.
@@ -7989,6 +8124,11 @@ 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.
@@ -8049,6 +8189,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_b_single_2b_1b_t1_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.iops_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.
@@ -8354,4 +8499,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/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 54a6b19444..8bac2de625 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
@@ -221,6 +221,9 @@ topology_template:
       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
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 3f86be5809..f4efa55581 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
@@ -179,6 +179,9 @@ topology_template:
       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
       disk.device.latency_1c12_scalling_instance:
       - 1c12_scalling_instance
       - disk.device.latency
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 30e5949de0..d770ab9789 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
@@ -246,6 +246,9 @@ topology_template:
       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
@@ -342,6 +345,9 @@ topology_template:
       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
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 f9336d5a69..8c3dc82552 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
@@ -242,6 +242,9 @@ topology_template:
       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
       host_2c2_catalog_instance:
       - 2c2_catalog_instance
       - host
@@ -326,6 +329,9 @@ topology_template:
       cpu_2c2_catalog_instance:
       - 2c2_catalog_instance
       - cpu
+      forwarder_2c2_catalog_instance_1c201_port:
+      - 2c2_catalog_instance_1c201_port
+      - forwarder
       disk.ephemeral.size_2c2_catalog_instance:
       - 2c2_catalog_instance
       - disk.ephemeral.size
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 9ca4a68a67..e3b7ea00c8 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
@@ -251,6 +251,9 @@ topology_template:
       cpu.delta_a_single_1a:
       - a_single_1a
       - cpu.delta
+      forwarder_a_single_1a_1a_t1_port:
+      - a_single_1a_1a_t1_port
+      - forwarder
       disk.device.write.requests_a_single_1a:
       - a_single_1a
       - disk.device.write.requests
@@ -296,6 +299,9 @@ topology_template:
       memory.usage_a_single_1a:
       - a_single_1a
       - memory.usage
+      forwarder_a_single_1a_1a_t2_port:
+      - a_single_1a_1a_t2_port
+      - forwarder
       disk.device.write.requests.rate_a_single_1a:
       - a_single_1a
       - disk.device.write.requests.rate
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 b083ad8301..7a8fab1623 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
@@ -172,6 +172,9 @@ 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
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 ee76003a1f..4763d46ae3 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
@@ -218,6 +218,9 @@ topology_template:
       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
@@ -233,6 +236,9 @@ topology_template:
       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
       scalable_b_single_1b:
       - b_single_1b
       - scalable
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 ecbe6f0402..fda44d67b1 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
@@ -213,6 +213,9 @@ topology_template:
       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
@@ -228,6 +231,9 @@ topology_template:
       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
       scalable_b_single_1b:
       - b_single_1b
       - scalable
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 4f4fb3cd6f..44d41d5090 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
@@ -212,6 +212,9 @@ 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
@@ -242,6 +245,9 @@ topology_template:
       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
       disk.device.iops_b_single_2b:
       - b_single_2b
       - disk.device.iops
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 4c9e8982e0..a78b6fd22e 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
@@ -207,6 +207,9 @@ 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
@@ -237,6 +240,9 @@ topology_template:
       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
       disk.device.iops_b_single_2b:
       - b_single_2b
       - disk.device.iops
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_serverServiceTemplate.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_serverServiceTemplate.yaml
index 41bef51803..87432d3911 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_serverServiceTemplate.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_serverServiceTemplate.yaml
@@ -327,9 +327,15 @@ topology_template:
       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
       disk.device.read.requests_pcma_server:
       - pcma_server
       - disk.device.read.requests
+      forwarder_pcma_server_pcm_port_3:
+      - pcma_server_pcm_port_3
+      - forwarder
       disk.write.bytes.rate_pcma_server:
       - pcma_server
       - disk.write.bytes.rate
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 0079f2a476..4f927ee3a8 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
@@ -312,6 +312,12 @@ topology_template:
       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
       disk.device.read.requests_pcma_server:
       - pcma_server
       - disk.device.read.requests
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 2d854439a6..8c6d8cd84c 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
@@ -537,6 +537,18 @@ topology_template:
       os_server_pcma2:
       - abstract_pcma_server
       - os_pcma_server
+      forwarder_pcm_port_2:
+      - abstract_pcma_server
+      - forwarder_pcma_server_pcm_port_2
+      forwarder_pcm_port_3:
+      - abstract_pcma_server
+      - forwarder_pcma_server_pcm_port_3
+      forwarder_pcm_port_0:
+      - abstract_pcma_server_1
+      - forwarder_pcma_server_pcm_port_0
+      forwarder_pcm_port_1:
+      - abstract_pcma_server_1
+      - forwarder_pcma_server_pcm_port_1
       disk.capacity_server_pcma1:
       - abstract_pcma_server_1
       - disk.capacity_pcma_server
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-pcm_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-pcm_v0.1ServiceTemplate.yaml
index 2a2b7dcacf..04e97ca016 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/nested-pcm_v0.1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/nested-pcm_v0.1ServiceTemplate.yaml
@@ -414,6 +414,12 @@ topology_template:
       disk.device.capacity_server_pcm:
       - server_pcm
       - disk.device.capacity
+      forwarder_pcm_port_00:
+      - pcm_port_00
+      - forwarder
+      forwarder_pcm_port_01:
+      - pcm_port_01
+      - forwarder
       instance_server_pcm:
       - server_pcm
       - instance
@@ -456,4 +462,4 @@ topology_template:
       - link
       dependency_server_pcm:
       - server_pcm
-      - 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/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 12d24c9a64..ae828c197b 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
@@ -271,6 +271,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pd_server_nested2_1b_pd_server_nested2_1b_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.write.bytes_pd_server_nested2_1b:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -564,6 +569,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pd_server_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.incoming.bytes_pd_server_port:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -593,6 +603,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_ps_server_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       attachment_pd_server_port:
         type: tosca.capabilities.Attachment
         occurrences:
@@ -1018,6 +1033,16 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pd_server_pattern4_port_1:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      forwarder_pd_server_pattern4_port_2:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.outgoing.bytes.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.
@@ -1598,6 +1623,16 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pd_server_pattern4_port_01:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      forwarder_pd_server_pattern4_port_02:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.read.bytes.rate_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.
@@ -2142,6 +2177,16 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pd_server_pattern4_port_01:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      forwarder_pd_server_pattern4_port_02:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.read.bytes.rate_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.
@@ -2471,6 +2516,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_1c1_main_cmaui_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       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.
@@ -3416,12 +3466,22 @@ 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:
@@ -3445,6 +3505,11 @@ 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:
@@ -3806,6 +3871,11 @@ node_types:
         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.
@@ -3818,6 +3888,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_ps_server_main_1b_port_1:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       binding_ps_server_main_1b_port_1:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
@@ -3991,6 +4066,11 @@ 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.
@@ -4063,6 +4143,11 @@ node_types:
         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.
@@ -4495,6 +4580,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_ps_server_nested2_1b_port_test_nested2Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.outgoing.packets.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.
@@ -4660,6 +4750,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pd_server_pattern4_port_02_test_nested_pattern_4_main_1:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       memory_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.
@@ -4831,6 +4926,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pd_server_pattern4_port_01_test_nested_pattern_4_main_1:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       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.
@@ -4905,6 +5005,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_1_test_nested2Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.latency_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.
@@ -5243,6 +5348,11 @@ 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.
@@ -5737,6 +5847,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pd_server_main_1b_port_1:
+        type: org.openecomp.capabilities.Forwarder
+        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.
@@ -6641,6 +6756,11 @@ 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
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.allocation_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.
@@ -7066,6 +7186,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_ps_server_main_1b_ps_server_main_1b_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.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.
@@ -7694,6 +7819,11 @@ 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.
@@ -7795,6 +7925,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pd_server_nested2_1b_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       memory.resident_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.
@@ -7842,6 +7977,11 @@ node_types:
         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:
@@ -8287,12 +8427,22 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_2:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.incoming.bytes_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.
         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.
@@ -8621,6 +8771,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_ps_server_nested2_1b_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       attachment_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file:
         type: tosca.capabilities.Attachment
         occurrences:
@@ -9180,6 +9335,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.read.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.
@@ -9256,6 +9416,11 @@ 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.
@@ -9998,6 +10163,11 @@ node_types:
         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:
@@ -10419,6 +10589,11 @@ node_types:
         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:
@@ -10774,6 +10949,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_ps_server_main_1b_ps_server_main_1b_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.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.
@@ -11252,6 +11432,11 @@ 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.
@@ -11798,6 +11983,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_ps_server_nested2_1b_ps_server_nested2_1b_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
   org.openecomp.resource.abstract.nodes.cmaui_1c1_main:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
@@ -12017,6 +12207,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_1c1_main_cmaui_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       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.
@@ -12653,6 +12848,16 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pd_server_pattern4_port_01:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      forwarder_pd_server_pattern4_port_02:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.read.bytes.rate_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.
@@ -12762,4 +12967,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/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 9b9694d6bd..eac65fb38a 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
@@ -184,6 +184,9 @@ 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
       vcpus_cmaui_1c1_main:
       - cmaui_1c1_main
       - vcpus
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 3d5388a9b8..d89d169c09 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
@@ -184,6 +184,9 @@ 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
       vcpus_cmaui_1c1_main:
       - cmaui_1c1_main
       - vcpus
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 6b35975e45..8955ed13c6 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
@@ -223,6 +223,9 @@ topology_template:
       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
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 4439f4e1e8..176b539e5f 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
@@ -259,6 +259,9 @@ topology_template:
       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
@@ -298,4 +301,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_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 c1f087a7f3..ee5a1265f3 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
@@ -259,6 +259,9 @@ topology_template:
       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
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 2c205ebc52..717221622a 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
@@ -208,6 +208,9 @@ topology_template:
       disk.capacity_pd_server_nested2_1b:
       - pd_server_nested2_1b
       - disk.capacity
+      forwarder_pd_server_nested2_1b_pd_server_nested2_1b_port:
+      - pd_server_nested2_1b_pd_server_nested2_1b_port
+      - forwarder
       disk.write.bytes_pd_server_nested2_1b:
       - pd_server_nested2_1b
       - disk.write.bytes
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 150bc51517..157bc91ac1 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
@@ -193,6 +193,9 @@ topology_template:
       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
@@ -298,4 +301,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_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 2aac373139..bc7ddf35ac 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
@@ -193,6 +193,9 @@ topology_template:
       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
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 b8fe67e9ef..7038b40920 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
@@ -286,6 +286,9 @@ topology_template:
       disk.device.write.bytes.rate_ps_server_nested2_1b:
       - ps_server_nested2_1b
       - disk.device.write.bytes.rate
+      forwarder_ps_server_nested2_1b_ps_server_nested2_1b_port:
+      - ps_server_nested2_1b_ps_server_nested2_1b_port
+      - forwarder
     requirements:
       local_storage_ps_server_nested2_1b:
       - ps_server_nested2_1b
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 26fcd68463..1c8510acd2 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
@@ -332,6 +332,12 @@ topology_template:
       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
@@ -422,4 +428,4 @@ topology_template:
       - link
       dependency_server_pd_pattern4_1:
       - server_pd_pattern4_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/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 34a80a963a..101ef1e4b4 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
@@ -347,6 +347,12 @@ topology_template:
       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
       disk.device.read.bytes.rate_server_pd_pattern4:
       - server_pd_pattern4
       - disk.device.read.bytes.rate
@@ -422,4 +428,4 @@ topology_template:
       - 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/nested1-no-computeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested1-no-computeServiceTemplate.yaml
index 39ba825a1f..3e91130783 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested1-no-computeServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested1-no-computeServiceTemplate.yaml
@@ -117,6 +117,9 @@ topology_template:
       network.incoming.packets_pd_server_port:
       - pd_server_port
       - network.incoming.packets
+      forwarder_pd_server_port:
+      - pd_server_port
+      - forwarder
       network.incoming.bytes_pd_server_port:
       - pd_server_port
       - network.incoming.bytes
@@ -132,6 +135,9 @@ topology_template:
       attachment_ps_server_port:
       - ps_server_port
       - attachment
+      forwarder_ps_server_port:
+      - ps_server_port
+      - forwarder
       attachment_pd_server_port:
       - pd_server_port
       - attachment
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 f4bca8d6e4..bd14b2f1df 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
@@ -391,9 +391,15 @@ topology_template:
       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
@@ -406,6 +412,9 @@ 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
@@ -589,12 +598,18 @@ topology_template:
       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
       disk.root.size_server_nested2_1c1_cmaui_1_test_nested2Level:
       - test_nested2Level
       - 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
       binding_ps_server_main_1b_port_1:
       - abstract_ps_server_main_1b
       - binding_ps_server_main_1b_ps_server_main_1b_port
@@ -685,6 +700,9 @@ 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
@@ -721,6 +739,9 @@ topology_template:
       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
@@ -940,6 +961,9 @@ topology_template:
       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
+      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
@@ -1024,6 +1048,9 @@ topology_template:
       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
       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
@@ -1111,6 +1138,9 @@ 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
@@ -1150,6 +1180,9 @@ topology_template:
       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
       disk.latency_server_nested2_pd_1b_test_nested2Level:
       - test_nested2Level
       - disk.latency_server_nested2_pd_1b
@@ -1321,6 +1354,9 @@ topology_template:
       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
@@ -1570,6 +1606,9 @@ topology_template:
       network.incoming.bytes_pd_server_pattern4_port_01_test_nested_pattern_4_nested2_test_nested2Level:
       - test_nested2Level
       - network.incoming.bytes_pd_server_pattern4_port_01_test_nested_pattern_4_nested2
+      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
@@ -2032,6 +2071,9 @@ 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:
+      - test_nested2Level
+      - forwarder_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file
       disk.device.allocation_server_nested2_ps_1b_test_nested2Level:
       - test_nested2Level
       - disk.device.allocation_server_nested2_ps_1b
@@ -2320,4 +2362,4 @@ topology_template:
       - dependency_test_nested_pattern_4_nested2
       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 326bdcf8f3..6b6efc20df 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
@@ -367,6 +367,9 @@ 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
@@ -418,6 +421,9 @@ topology_template:
       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
+      forwarder_pd_server_nested2_1b_port:
+      - abstract_pd_server_nested2_1b
+      - forwarder_pd_server_nested2_1b_pd_server_nested2_1b_port
       memory.resident_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
       - test_nested_pattern_4_same_type_diff_file
       - memory.resident_server_pd_pattern4_1
@@ -442,6 +448,9 @@ topology_template:
       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
@@ -670,9 +679,15 @@ topology_template:
       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
@@ -841,6 +856,9 @@ topology_template:
       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
@@ -1126,6 +1144,9 @@ 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
       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
@@ -1165,6 +1186,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
@@ -1474,4 +1498,4 @@ 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
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/GlobalSubstitutionTypesServiceTemplate.yaml
index e8301c06c2..a0142101d5 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -408,6 +408,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pd_server_pd_server_port:
+        type: org.openecomp.capabilities.Forwarder
+        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.
@@ -796,6 +801,16 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_8:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      forwarder_cmaui_port_7:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.read.requests.rate_server_cmaui:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1344,6 +1359,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_oam_server_oam_server_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.outgoing.bytes.rate_oam_server_oam_server_port:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1764,6 +1784,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_sm_server_port_test_nested2Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.read.requests_server_sm_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.
@@ -1996,6 +2021,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_8_test_resourceGroup_test_nested2Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.read.bytes_server_cmaui_test_resourceGroup_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.
@@ -2180,6 +2210,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_ps_server_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.capacity_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.
@@ -2235,6 +2270,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_oam_server_port_test_nested2Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.capacity_server_ps:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -2640,6 +2680,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_7_test_resourceGroup_test_nested2Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.write.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.
@@ -2952,6 +2997,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pd_server_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.write.bytes.rate_server_oam_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.
@@ -3607,6 +3657,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_oam_server_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       cpu_util_server_sm:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -3631,6 +3686,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_sm_server_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.incoming.bytes_oam_server_port:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -3720,6 +3780,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_8_test_resourceGroup:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       scalable_server_oam:
         type: tosca.capabilities.Scalable
         occurrences:
@@ -4024,6 +4089,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_7_test_resourceGroup:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.write.requests_server_cmaui_test_resourceGroup:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -4571,6 +4641,11 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
+      forwarder_sm_server_sm_server_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.iops_sm_server:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -5016,6 +5091,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_ps_server_ps_server_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       feature_ps_server_ps_server_port:
         type: tosca.capabilities.Node
         occurrences:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/Nested_oam_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/Nested_oam_serverServiceTemplate.yaml
index d90e25d8e8..9080572950 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/Nested_oam_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/Nested_oam_serverServiceTemplate.yaml
@@ -262,6 +262,9 @@ topology_template:
       endpoint_oam_server:
       - oam_server
       - endpoint
+      forwarder_oam_server_oam_server_port:
+      - oam_server_oam_server_port
+      - forwarder
       network.outgoing.bytes.rate_oam_server_oam_server_port:
       - oam_server_oam_server_port
       - network.outgoing.bytes.rate
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/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/portSecurityGroupNetPattern1B/out/Nested_pd_serverServiceTemplate.yaml
index 992d43315e..c07fb4f39c 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/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/portSecurityGroupNetPattern1B/out/Nested_pd_serverServiceTemplate.yaml
@@ -283,6 +283,9 @@ topology_template:
       disk.write.requests_pd_server:
       - pd_server
       - disk.write.requests
+      forwarder_pd_server_pd_server_port:
+      - pd_server_pd_server_port
+      - forwarder
       disk.device.latency_pd_server:
       - pd_server
       - disk.device.latency
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/Nested_ps_serverServiceTemplate.yaml
index 47aed72dbf..03780b84ee 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/Nested_ps_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/Nested_ps_serverServiceTemplate.yaml
@@ -154,6 +154,9 @@ topology_template:
       disk.write.bytes.rate_ps_server:
       - ps_server
       - disk.write.bytes.rate
+      forwarder_ps_server_ps_server_port:
+      - ps_server_ps_server_port
+      - forwarder
       feature_ps_server_ps_server_port:
       - ps_server_ps_server_port
       - feature
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/Nested_sm_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/Nested_sm_serverServiceTemplate.yaml
index bffd6472b8..4a43a24d9a 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/Nested_sm_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/Nested_sm_serverServiceTemplate.yaml
@@ -145,6 +145,9 @@ topology_template:
       binding_sm_server_sm_server_port:
       - sm_server_sm_server_port
       - binding
+      forwarder_sm_server_sm_server_port:
+      - sm_server_sm_server_port
+      - forwarder
       disk.iops_sm_server:
       - sm_server
       - disk.iops
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/nested1ServiceTemplate.yaml
index 18ad097c1a..824b645089 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/nested1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/nested1ServiceTemplate.yaml
@@ -256,6 +256,9 @@ topology_template:
       os_server_cmaui_test_resourceGroup_test_nested2Level:
       - test_nested2Level
       - os_server_cmaui_test_resourceGroup
+      forwarder_sm_server_port_test_nested2Level:
+      - test_nested2Level
+      - forwarder_sm_server_port
       disk.read.requests_server_sm_test_nested2Level:
       - test_nested2Level
       - disk.read.requests_server_sm
@@ -373,6 +376,9 @@ topology_template:
       feature_test_nested2Level:
       - test_nested2Level
       - feature
+      forwarder_cmaui_port_8_test_resourceGroup_test_nested2Level:
+      - test_nested2Level
+      - forwarder_cmaui_port_8_test_resourceGroup
       disk.read.bytes_server_cmaui_test_resourceGroup_test_nested2Level:
       - test_nested2Level
       - disk.read.bytes_server_cmaui_test_resourceGroup
@@ -466,6 +472,9 @@ topology_template:
       network.incoming.bytes_ps_server_port:
       - abstract_ps_server
       - network.incoming.bytes_ps_server_ps_server_port
+      forwarder_ps_server_port:
+      - abstract_ps_server
+      - forwarder_ps_server_ps_server_port
       disk.device.capacity_server_pd:
       - abstract_pd_server
       - disk.device.capacity_pd_server
@@ -493,6 +502,9 @@ topology_template:
       network.incoming.packets.rate_sm_server_port_test_nested2Level:
       - test_nested2Level
       - network.incoming.packets.rate_sm_server_port
+      forwarder_oam_server_port_test_nested2Level:
+      - test_nested2Level
+      - forwarder_oam_server_port
       disk.capacity_server_ps:
       - abstract_ps_server
       - disk.capacity_ps_server
@@ -700,6 +712,9 @@ topology_template:
       disk.device.read.requests_server_cmaui_test_resourceGroup_test_nested2Level:
       - test_nested2Level
       - disk.device.read.requests_server_cmaui_test_resourceGroup
+      forwarder_cmaui_port_7_test_resourceGroup_test_nested2Level:
+      - test_nested2Level
+      - forwarder_cmaui_port_7_test_resourceGroup
       disk.device.write.requests_server_pd:
       - abstract_pd_server
       - disk.device.write.requests_pd_server
@@ -859,6 +874,9 @@ topology_template:
       cpu_util_server_ps:
       - abstract_ps_server
       - cpu_util_ps_server
+      forwarder_pd_server_port:
+      - abstract_pd_server
+      - forwarder_pd_server_pd_server_port
       disk.write.bytes.rate_server_oam_test_nested2Level:
       - test_nested2Level
       - disk.write.bytes.rate_server_oam
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/nested2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/nested2ServiceTemplate.yaml
index 7983fe32f4..c8e50a5f3d 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/nested2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/nested2ServiceTemplate.yaml
@@ -303,6 +303,9 @@ topology_template:
       disk.read.requests_server_oam:
       - abstract_oam_server
       - disk.read.requests_oam_server
+      forwarder_oam_server_port:
+      - abstract_oam_server
+      - forwarder_oam_server_oam_server_port
       cpu_util_server_sm:
       - abstract_sm_server
       - cpu_util_sm_server
@@ -315,6 +318,9 @@ topology_template:
       disk.device.read.bytes_server_oam:
       - abstract_oam_server
       - disk.device.read.bytes_oam_server
+      forwarder_sm_server_port:
+      - abstract_sm_server
+      - forwarder_sm_server_sm_server_port
       network.incoming.bytes_oam_server_port:
       - abstract_oam_server
       - network.incoming.bytes_oam_server_oam_server_port
@@ -360,6 +366,9 @@ topology_template:
       attachment_oam_server_port:
       - abstract_oam_server
       - attachment_oam_server_oam_server_port
+      forwarder_cmaui_port_8_test_resourceGroup:
+      - test_resourceGroup
+      - forwarder_cmaui_port_8
       scalable_server_oam:
       - abstract_oam_server
       - scalable_oam_server
@@ -516,6 +525,9 @@ topology_template:
       network.incoming.packets.rate_cmaui_port_7_test_resourceGroup:
       - test_resourceGroup
       - network.incoming.packets.rate_cmaui_port_7
+      forwarder_cmaui_port_7_test_resourceGroup:
+      - test_resourceGroup
+      - forwarder_cmaui_port_7
       disk.write.requests_server_cmaui_test_resourceGroup:
       - test_resourceGroup
       - disk.write.requests_server_cmaui
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/nested3ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/nested3ServiceTemplate.yaml
index 0c3a66c407..08d2568d80 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/nested3ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/nested3ServiceTemplate.yaml
@@ -320,6 +320,12 @@ topology_template:
       binding_server_cmaui:
       - server_cmaui
       - binding
+      forwarder_cmaui_port_8:
+      - cmaui_port_8
+      - forwarder
+      forwarder_cmaui_port_7:
+      - cmaui_port_7
+      - forwarder
       disk.device.read.requests.rate_server_cmaui:
       - server_cmaui
       - disk.device.read.requests.rate
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 20819de371..edff14322c 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
@@ -260,6 +260,11 @@ 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.
@@ -634,6 +639,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_ps_pd01_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       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.
@@ -1209,6 +1219,11 @@ node_types:
         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.
@@ -1506,6 +1521,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_oam_oam02_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       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.
@@ -2027,6 +2047,11 @@ 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.
@@ -2260,6 +2285,11 @@ 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.
@@ -2793,6 +2823,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_cmaui01_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.outgoing.packets.rate_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.
@@ -3541,6 +3576,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui01_port_1:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.outgoing.bytes.rate_oam02_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.
@@ -3931,6 +3971,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_oam02_port_2_test_nested2Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.incoming.packets_oam01_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.
@@ -4079,6 +4124,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pd02_port_2_test_nested3Level_test_nested2Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.read.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.
@@ -4323,6 +4373,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_oam01_port_1_test_nested2Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       feature_server_oam_1_test_nested2Level:
         type: tosca.capabilities.Node
         occurrences:
@@ -4429,11 +4484,21 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui02_port_2:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       feature_server_oam_2_test_nested2Level:
         type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pd01_port_1_test_nested3Level_test_nested2Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.allocation_server_ps_1_test_nested3Level_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.
@@ -5241,6 +5306,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pd01_port_1_test_nested3Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.latency_server_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.
@@ -5294,6 +5364,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_oam01_port_1:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.read.bytes_server_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.
@@ -5909,6 +5984,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_oam02_port_2:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.incoming.packets.rate_pd01_port_1_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -6343,6 +6423,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pd02_port_2_test_nested3Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.capacity_server_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.
@@ -6624,6 +6709,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_ps_pd02_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.outgoing.bytes.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.
@@ -7509,6 +7599,16 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pd01_port_1:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      forwarder_pd02_port_2:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.incoming.packets_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.
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 f2b127a52a..24d5919d63 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
@@ -151,6 +151,9 @@ 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
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 796de5a6f9..04bbb80287 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
@@ -205,6 +205,9 @@ topology_template:
       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
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 ba64ddf011..89de9a58c7 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
@@ -202,6 +202,9 @@ topology_template:
       disk.write.requests_oam:
       - oam
       - disk.write.requests
+      forwarder_oam_oam02_port:
+      - oam_oam02_port
+      - forwarder
       disk.capacity_oam:
       - oam
       - disk.capacity
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 0e73e79e44..e3171800fb 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
@@ -250,6 +250,9 @@ 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
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 bf1cc92ea6..f31f70b12a 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
@@ -198,6 +198,9 @@ 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
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 a215d7a7fc..7dcab1874c 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
@@ -252,6 +252,9 @@ topology_template:
       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
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 80e2bf544e..416a517339 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
@@ -166,6 +166,9 @@ 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
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 67c4be1f6f..4da339f039 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
@@ -187,6 +187,9 @@ topology_template:
       disk.device.write.bytes_ps:
       - ps
       - disk.device.write.bytes
+      forwarder_ps_pd01_port:
+      - ps_pd01_port
+      - forwarder
       cpu.delta_ps:
       - ps
       - cpu.delta
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 c6daefdd25..aa2ed981f2 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
@@ -342,6 +342,9 @@ topology_template:
       disk.device.write.bytes.rate_server_ps_2_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - disk.device.write.bytes.rate_server_ps_2_test_nested3Level
+      forwarder_cmaui01_port_1:
+      - abstract_cmaui_1
+      - forwarder_cmaui_cmaui01_port
       network.outgoing.bytes.rate_oam02_port_2_test_nested2Level:
       - test_nested2Level
       - network.outgoing.bytes.rate_oam02_port_2
@@ -543,6 +546,9 @@ topology_template:
       vcpus_server_oam_1_test_nested2Level:
       - test_nested2Level
       - vcpus_server_oam_1
+      forwarder_oam02_port_2_test_nested2Level:
+      - test_nested2Level
+      - forwarder_oam02_port_2
       network.incoming.packets_oam01_port_1_test_nested2Level:
       - test_nested2Level
       - network.incoming.packets_oam01_port_1
@@ -618,6 +624,9 @@ topology_template:
       cpu_server_ps_1_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - cpu_server_ps_1_test_nested3Level
+      forwarder_pd02_port_2_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - forwarder_pd02_port_2_test_nested3Level
       disk.device.read.requests_server_cmaui_2:
       - abstract_cmaui
       - disk.device.read.requests_cmaui
@@ -741,6 +750,9 @@ topology_template:
       disk.device.capacity_server_cmaui_2:
       - abstract_cmaui
       - disk.device.capacity_cmaui
+      forwarder_oam01_port_1_test_nested2Level:
+      - test_nested2Level
+      - forwarder_oam01_port_1
       feature_server_oam_1_test_nested2Level:
       - test_nested2Level
       - feature_server_oam_1
@@ -795,9 +807,15 @@ topology_template:
       host_server_oam_2_test_nested2Level:
       - test_nested2Level
       - host_server_oam_2
+      forwarder_cmaui02_port_2:
+      - abstract_cmaui
+      - forwarder_cmaui_cmaui02_port
       feature_server_oam_2_test_nested2Level:
       - test_nested2Level
       - feature_server_oam_2
+      forwarder_pd01_port_1_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - forwarder_pd01_port_1_test_nested3Level
       disk.allocation_server_ps_1_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - disk.allocation_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 6432c9e3f4..07c709079f 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
@@ -178,6 +178,9 @@ topology_template:
       memory.resident_server_ps_2_test_nested3Level:
       - test_nested3Level
       - memory.resident_server_ps_2
+      forwarder_pd01_port_1_test_nested3Level:
+      - test_nested3Level
+      - forwarder_pd01_port_1
       disk.latency_server_oam_1:
       - abstract_oam_1
       - disk.latency_oam
@@ -205,6 +208,9 @@ topology_template:
       disk.device.read.bytes_server_oam_1:
       - abstract_oam_1
       - disk.device.read.bytes_oam
+      forwarder_oam01_port_1:
+      - abstract_oam_1
+      - forwarder_oam_oam01_port
       disk.device.read.bytes_server_oam_2:
       - abstract_oam
       - disk.device.read.bytes_oam
@@ -517,6 +523,9 @@ topology_template:
       cpu_server_ps_2_test_nested3Level:
       - test_nested3Level
       - cpu_server_ps_2
+      forwarder_oam02_port_2:
+      - abstract_oam
+      - forwarder_oam_oam02_port
       network.incoming.packets.rate_pd01_port_1_test_nested3Level:
       - test_nested3Level
       - network.incoming.packets.rate_pd01_port_1
@@ -739,6 +748,9 @@ topology_template:
       disk.device.write.bytes.rate_server_ps_2_test_nested3Level:
       - test_nested3Level
       - disk.device.write.bytes.rate_server_ps_2
+      forwarder_pd02_port_2_test_nested3Level:
+      - test_nested3Level
+      - forwarder_pd02_port_2
       disk.device.capacity_server_oam_2:
       - abstract_oam
       - disk.device.capacity_oam
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 c286cb2347..1a19d76b8c 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
@@ -423,6 +423,12 @@ topology_template:
       vcpus_server_ps_2:
       - abstract_ps
       - vcpus_ps
+      forwarder_pd01_port_1:
+      - abstract_ps_1
+      - forwarder_ps_pd01_port
+      forwarder_pd02_port_2:
+      - abstract_ps
+      - forwarder_ps_pd02_port
       network.incoming.packets_pd01_port_1:
       - abstract_ps_1
       - network.incoming.packets_ps_pd01_port
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 fdc55c8d45..d2e67730bf 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
@@ -367,6 +367,11 @@ node_types:
         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.
@@ -811,6 +816,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pd_server_ps02_port:
+        type: org.openecomp.capabilities.Forwarder
+        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.
@@ -1090,6 +1100,11 @@ 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.
@@ -1612,6 +1627,11 @@ node_types:
         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.
@@ -2027,6 +2047,11 @@ node_types:
         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.
@@ -2335,6 +2360,11 @@ 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.
@@ -2750,6 +2780,11 @@ 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.
@@ -3272,6 +3307,11 @@ node_types:
         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.
@@ -3708,6 +3748,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pd02_port_03_test_nested3Level_test_nested2Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       binding_server_pd_11:
         type: tosca.capabilities.network.Bindable
         occurrences:
@@ -4193,6 +4238,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pd01_port_02_test_nested2Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.iops_server_pd_32_test_nested3Level_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.
@@ -4223,6 +4273,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pd01_port_03_test_nested3Level_test_nested2Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.write.requests_server_pd_31_test_nested3Level_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.
@@ -4322,6 +4377,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pd02_port_02_test_nested2Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.incoming.packets_pd01_port_02_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.
@@ -5339,12 +5399,22 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_ps02_port_01:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.write.bytes_server_pd_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
+      forwarder_pd01_port_01:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.allocation_server_pd_11:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -5951,6 +6021,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pd02_port_03_test_nested3Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.outgoing.bytes.rate_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.
@@ -6287,12 +6362,22 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pd02_port_02:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.latency_server_pd_31_test_nested3Level:
         type: org.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_pd01_port_03_test_nested3Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.latency_server_pd_21:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -6787,6 +6872,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pd01_port_02:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.outgoing.bytes.rate_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.
@@ -7053,6 +7143,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pd02_port_03:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.read.bytes.rate_server_pd_31:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -7467,6 +7562,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pd01_port_03:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.allocation_server_pd_31:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -7524,4 +7624,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/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 575c086ae1..3d9ebd74ae 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
@@ -252,6 +252,9 @@ topology_template:
       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
@@ -291,4 +294,4 @@ topology_template:
       - dependency
       dependency_pd_server:
       - pd_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/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 9ac7e114f5..f45ff43b37 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
@@ -198,6 +198,9 @@ 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
@@ -291,4 +294,4 @@ topology_template:
       - dependency
       dependency_pd_server_pd02_port:
       - pd_server_pd02_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/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 c496b4d837..46b79ee2f3 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
@@ -198,6 +198,9 @@ 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
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 d3ee9a6595..7e44f83659 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
@@ -252,6 +252,9 @@ topology_template:
       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
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 e74e2b0ffb..1747965094 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
@@ -252,6 +252,9 @@ topology_template:
       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
@@ -291,4 +294,4 @@ topology_template:
       - dependency
       dependency_pd_server:
       - pd_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/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 972f5cc7a3..65c26ad0d0 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
@@ -267,6 +267,9 @@ topology_template:
       disk.device.latency_pd_server:
       - pd_server
       - disk.device.latency
+      forwarder_pd_server_ps02_port:
+      - pd_server_ps02_port
+      - forwarder
       disk.latency_pd_server:
       - pd_server
       - disk.latency
@@ -291,4 +294,4 @@ topology_template:
       - dependency
       dependency_pd_server_ps02_port:
       - pd_server_ps02_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/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 41721dfb9c..ea3a5f1999 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
@@ -198,6 +198,9 @@ 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
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 31e3e65ebc..9a3d253413 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
@@ -252,6 +252,9 @@ topology_template:
       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
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 2d2a3d1bbd..c51dcc3d09 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
@@ -231,6 +231,9 @@ topology_template:
       disk.device.read.requests.rate_server_pd_11:
       - abstract_pd_server_4
       - disk.device.read.requests.rate_pd_server
+      forwarder_pd02_port_03_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - forwarder_pd02_port_03_test_nested3Level
       binding_server_pd_11:
       - abstract_pd_server_4
       - binding_pd_server
@@ -480,6 +483,9 @@ topology_template:
       binding_server_pd_22_test_nested2Level:
       - test_nested2Level
       - binding_server_pd_22
+      forwarder_pd01_port_02_test_nested2Level:
+      - test_nested2Level
+      - forwarder_pd01_port_02
       disk.iops_server_pd_32_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - disk.iops_server_pd_32_test_nested3Level
@@ -495,6 +501,9 @@ topology_template:
       disk.write.requests.rate_server_pd_32_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - disk.write.requests.rate_server_pd_32_test_nested3Level
+      forwarder_pd01_port_03_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - forwarder_pd01_port_03_test_nested3Level
       disk.write.requests_server_pd_31_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - disk.write.requests_server_pd_31_test_nested3Level
@@ -546,6 +555,9 @@ topology_template:
       disk.device.read.bytes.rate_server_pd_31_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - disk.device.read.bytes.rate_server_pd_31_test_nested3Level
+      forwarder_pd02_port_02_test_nested2Level:
+      - test_nested2Level
+      - forwarder_pd02_port_02
       network.incoming.packets_pd01_port_02_test_nested2Level:
       - test_nested2Level
       - network.incoming.packets_pd01_port_02
@@ -1062,9 +1074,15 @@ topology_template:
       vcpus_server_pd_11:
       - abstract_pd_server_4
       - vcpus_pd_server
+      forwarder_ps02_port_01:
+      - abstract_pd_server_5
+      - forwarder_pd_server_ps02_port
       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
       disk.allocation_server_pd_11:
       - abstract_pd_server_4
       - disk.allocation_pd_server
@@ -1173,4 +1191,4 @@ topology_template:
       - dependency_server_pd_21
       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/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 3674d5653e..64678af2fe 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
@@ -348,6 +348,9 @@ topology_template:
       disk.device.write.requests.rate_server_pd_22:
       - abstract_pd_server_2
       - disk.device.write.requests.rate_pd_server
+      forwarder_pd02_port_03_test_nested3Level:
+      - test_nested3Level
+      - forwarder_pd02_port_03
       network.outgoing.bytes.rate_pd01_port_02:
       - abstract_pd_server_3
       - network.outgoing.bytes.rate_pd_server_pd01_port
@@ -519,9 +522,15 @@ topology_template:
       disk.write.requests.rate_server_pd_22:
       - abstract_pd_server_2
       - disk.write.requests.rate_pd_server
+      forwarder_pd02_port_02:
+      - abstract_pd_server_2
+      - forwarder_pd_server_pd02_port
       disk.device.latency_server_pd_31_test_nested3Level:
       - test_nested3Level
       - disk.device.latency_server_pd_31
+      forwarder_pd01_port_03_test_nested3Level:
+      - test_nested3Level
+      - forwarder_pd01_port_03
       disk.device.latency_server_pd_21:
       - abstract_pd_server_3
       - disk.device.latency_pd_server
@@ -771,6 +780,9 @@ topology_template:
       network.outgoing.bytes.rate_pd02_port_03_test_nested3Level:
       - test_nested3Level
       - network.outgoing.bytes.rate_pd02_port_03
+      forwarder_pd01_port_02:
+      - abstract_pd_server_3
+      - forwarder_pd_server_pd01_port
       network.outgoing.bytes.rate_pd02_port_02:
       - abstract_pd_server_2
       - network.outgoing.bytes.rate_pd_server_pd02_port
@@ -831,4 +843,4 @@ topology_template:
       - dependency
       dependency_pd01_port_02:
       - abstract_pd_server_3
-      - dependency_pd_server_pd01_port
\ No newline at end of file
+      - dependency_pd_server_pd01_port
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 4d9ad8d576..6a84a53e6e 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
@@ -215,6 +215,9 @@ topology_template:
       memory.usage_server_pd_31:
       - abstract_pd_server
       - memory.usage_pd_server
+      forwarder_pd02_port_03:
+      - abstract_pd_server_1
+      - forwarder_pd_server_pd02_port
       disk.read.bytes.rate_server_pd_31:
       - abstract_pd_server
       - disk.read.bytes.rate_pd_server
@@ -425,6 +428,9 @@ topology_template:
       instance_server_pd_32:
       - abstract_pd_server_1
       - instance_pd_server
+      forwarder_pd01_port_03:
+      - abstract_pd_server
+      - forwarder_pd_server_pd01_port
       disk.device.allocation_server_pd_31:
       - abstract_pd_server
       - disk.device.allocation_pd_server
@@ -479,4 +485,4 @@ topology_template:
       - link_pd_server_pd01_port
       dependency_pd01_port_03:
       - abstract_pd_server
-      - dependency_pd_server_pd01_port
\ No newline at end of file
+      - dependency_pd_server_pd01_port
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 8ad3b6e69a..68d79fd16b 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
@@ -165,6 +165,11 @@ node_types:
         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.
@@ -819,6 +824,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_osm_server_1c2_osm_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       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.
@@ -1169,6 +1179,11 @@ 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.
@@ -1785,6 +1800,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pd_server_port_1:
+        type: org.openecomp.capabilities.Forwarder
+        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.
@@ -1803,6 +1823,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pd_server_port_2:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       feature_server_pd:
         type: tosca.capabilities.Node
         occurrences:
@@ -2006,6 +2031,11 @@ node_types:
         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.
@@ -2537,6 +2567,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_BE_1c1_BE_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       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.
@@ -3007,1783 +3042,1993 @@ node_types:
         - 0
         - UNBOUNDED
     capabilities:
-      disk.device.write.bytes.rate_server_1c2_oam_2:
+      memory_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.read.bytes_server_1c1_cmaui_2:
+      binding_ps_server_1b_port_1:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - 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.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes.rate_server_1c2_oam_1:
+      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.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes_server_1c1_cmaui_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
-      memory_server_pd_nested1_pattern_4:
+      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
-      binding_ps_server_1b_port_1:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+      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:
-        - 0
+        - 1
         - UNBOUNDED
-      disk.iops_server_1c2_oam_2:
+      feature_pd_server_1b_port_1:
+        type: tosca.capabilities.Node
+        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.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.capacity_server_1b_pd_1:
+      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.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.capacity_server_1b_pd_2:
+      disk.device.iops_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.usage_server_1c2_oam_2:
+      disk.read.requests_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.read.requests_server_1c1_cmaui_2:
+      disk.device.write.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
-      feature_server_1c1_cmaui_1:
-        type: tosca.capabilities.Node
+      cpu.delta_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.usage_server_1c2_oam_1:
+      disk.device.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.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_server_1c1_cmaui_2:
-        type: tosca.capabilities.Node
+      scalable_server_1c2_oam_2:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
-      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.
+      scalable_server_1c2_oam_1:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_pd_server_1b_port_1:
+      network.outgoing.packets.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.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_cmaui_port_2:
+      disk.device.read.requests_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.device.capacity_server_pd_nested1_pattern_4:
+      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.read.requests.rate_server_pd_nested1_pattern_4:
+      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.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.iops_server_1c2_oam_1:
+      disk.device.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
-      network.outgoing.bytes_cmaui_port_1:
+      disk.device.read.bytes_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_pd_server_1b_port_1:
-        type: tosca.capabilities.Node
+      disk.device.read.bytes_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.packets.rate_oam_port_2:
+      disk.device.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
-      network.outgoing.bytes_pd_server_port_1_nested1_pattern_4:
+      disk.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
-      binding_server_pd_nested1_pattern_4:
-        type: tosca.capabilities.network.Bindable
+      disk.device.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
-      network.outgoing.packets.rate_oam_port_1:
+      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
-      cpu_server_1b_pd_1:
+      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
-      feature_server_pd_nested1_pattern_4:
-        type: tosca.capabilities.Node
+      binding_cmaui_port_1:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.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
+        occurrences:
+        - 0
+        - UNBOUNDED
+      end_point_packet_internal_network_1:
+        type: tosca.capabilities.Endpoint
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests.rate_server_1c2_oam_1:
+      memory_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_pd_2:
+      memory_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.rate_server_1c2_oam_2:
+      disk.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.read.requests_server_pd_nested1_pattern_4:
+      disk.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_pd_nested1_pattern_4:
+      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
-      disk.read.bytes.rate_server_1c2_oam_1:
+      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
-      memory.usage_server_pd_nested1_pattern_4:
+      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
-      cpu.delta_server_pd_nested1_pattern_4:
+      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
-      scalable_server_pd_nested1_pattern_4:
-        type: tosca.capabilities.Scalable
+      os_server_1c2_oam_1:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes.rate_server_1c2_oam_2:
+      disk.device.iops_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
-      cpu_server_1b_pd_2:
+      disk.device.iops_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.usage_server_pd_nested1_pattern_4:
+      network.outgoing.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.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.iops_server_1b_pd_1:
+      memory.resident_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_pd_server_port_2_nested1_pattern_4:
+      disk.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:
         - 1
         - UNBOUNDED
-      scalable_server_1c2_oam_2:
-        type: tosca.capabilities.Scalable
+      os_server_1c2_oam_2:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      scalable_server_1c2_oam_1:
-        type: tosca.capabilities.Scalable
+      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.
         occurrences:
         - 1
         - UNBOUNDED
-      vcpus_server_pd_nested1_pattern_4:
+      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.outgoing.packets.rate_ps_server_1b_port_1:
+      feature_server_1c2_oam_2:
+        type: tosca.capabilities.Node
+        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.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests_server_pd_nested1_pattern_4:
+      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_pd_server_port_1_nested1_pattern_4:
-        type: tosca.capabilities.Node
+      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.
         occurrences:
         - 1
         - UNBOUNDED
-      link_packet_internal_network_1:
-        type: tosca.capabilities.network.Linkable
+      feature_server_1c2_oam_1:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_pd_server_port_1_nested1_pattern_4:
+      network.outgoing.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
-      disk.device.write.requests_server_1c1_cmaui_2:
+      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.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.
+      host_server_pd_nested1_pattern_4:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes_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_oam_port_2:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes_server_1c1_cmaui_1:
+      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
-      disk.write.bytes_server_1b_pd_1:
+      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.write.bytes_server_1b_pd_2:
+      endpoint_server_pd_nested1_pattern_4:
+        type: tosca.capabilities.Endpoint.Admin
+        occurrences:
+        - 1
+        - UNBOUNDED
+      attachment_oam_port_1:
+        type: tosca.capabilities.Attachment
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.read.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
-      disk.device.usage_server_1c2_oam_2:
+      disk.write.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
-      network.incoming.packets.rate_pd_server_port_2_nested1_pattern_4:
+      disk.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.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.capacity_server_1c2_oam_2:
+      disk.device.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.capacity_server_pd_nested1_pattern_4:
+      disk.device.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
-      disk.device.capacity_server_1c2_oam_1:
+      disk.device.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
-      disk.device.write.requests.rate_server_1b_pd_2:
+      disk.device.latency_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.usage_server_1c2_oam_1:
+      disk.device.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:
         - 1
         - UNBOUNDED
-      disk.latency_server_pd_nested1_pattern_4:
+      disk.write.requests.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.requests.rate_server_1b_pd_1:
+      disk.write.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.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_oam_port_1:
+      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
-      attachment_packet_internal_network_1:
-        type: tosca.capabilities.Attachment
+      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.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_oam_port_2:
+      disk.allocation_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.write.requests.rate_server_pd_nested1_pattern_4:
+      cpu_util_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
-      binding_cmaui_port_1:
+      binding_pd_server_1b_port_1:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
         - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
         occurrences:
         - 0
         - UNBOUNDED
-      binding_cmaui_port_2:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
+      disk.device.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.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.write.requests_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_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.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.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.write.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.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      binding_oam_port_2:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
         - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
         occurrences:
         - 0
         - UNBOUNDED
-      end_point_packet_internal_network_1:
-        type: tosca.capabilities.Endpoint
+      binding_oam_port_1:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
+      disk.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
-      os_server_pd_nested1_pattern_4:
-        type: tosca.capabilities.OperatingSystem
+      disk.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
-      cpu_util_server_1c2_oam_1:
+      host_server_1c1_cmaui_2:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
+        occurrences:
+        - 1
+        - UNBOUNDED
+      host_server_1c1_cmaui_1:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
+        occurrences:
+        - 1
+        - UNBOUNDED
+      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:
         - 1
         - UNBOUNDED
-      cpu_util_server_1c2_oam_2:
+      vcpus_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_port_1:
+      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:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_ps_server_1b_port_1:
+      network.incoming.bytes.rate_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
-      network.outgoing.bytes_pd_server_1b_port_1:
+      disk.latency_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
-      attachment_pd_server_port_1_nested1_pattern_4:
-        type: tosca.capabilities.Attachment
+      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.
         occurrences:
         - 1
         - UNBOUNDED
-      memory_server_1c2_oam_1:
+      disk.root.size_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
-      memory_server_1c2_oam_2:
+      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
-      disk.write.bytes_server_1c2_oam_1:
+      disk.device.write.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.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes_server_1c2_oam_2:
+      cpu_util_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
-      memory.resident_server_1c2_oam_2:
+      disk.device.write.requests_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.resident_server_1c2_oam_1:
+      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.incoming.bytes.rate_pd_server_port_2_nested1_pattern_4:
+      network.outgoing.bytes.rate_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
-      network.incoming.bytes_cmaui_port_2:
+      network.incoming.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
-      network.incoming.bytes_cmaui_port_1:
+      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.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_pd_server_port_2_nested1_pattern_4:
+      memory.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
-      os_server_1c2_oam_1:
-        type: tosca.capabilities.OperatingSystem
+      end_point_packet_external_network_1:
+        type: tosca.capabilities.Endpoint
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.iops_server_1c1_cmaui_2:
+      binding_server_1c1_cmaui_2:
+        type: tosca.capabilities.network.Bindable
+        occurrences:
+        - 1
+        - UNBOUNDED
+      binding_server_1c1_cmaui_1:
+        type: tosca.capabilities.network.Bindable
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.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.device.iops_server_1c1_cmaui_1:
+      disk.device.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_pd_server_1b_port_1:
+      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
-      memory.resident_server_1b_pd_2:
+      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:
+        - 1
+        - UNBOUNDED
+      binding_server_1c2_oam_1:
+        type: tosca.capabilities.network.Bindable
+        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.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.allocation_server_pd_nested1_pattern_4:
+      disk.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
-      os_server_1c2_oam_2:
-        type: tosca.capabilities.OperatingSystem
+      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.
         occurrences:
         - 1
         - UNBOUNDED
-      memory.resident_server_1b_pd_1:
+      disk.device.read.bytes.rate_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.allocation_server_1c1_cmaui_1:
+      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.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.allocation_server_1c1_cmaui_2:
+      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.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes.rate_server_pd_nested1_pattern_4:
+      disk.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:
         - 1
         - UNBOUNDED
-      feature_server_1c2_oam_2:
-        type: tosca.capabilities.Node
+      disk.write.bytes.rate_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.root.size_server_pd_nested1_pattern_4:
+      disk.write.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.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_cmaui_port_1:
+      disk.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
-      vcpus_server_1c1_cmaui_1:
+      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
-      network.incoming.packets.rate_cmaui_port_2:
+      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
-      feature_cmaui_port_1:
-        type: tosca.capabilities.Node
+      disk.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.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_oam_port_2:
+      disk.device.write.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.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_cmaui_port_2:
+      disk.device.write.bytes.rate_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_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
+      feature_server_1b_pd_1:
         type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      feature_server_1c2_oam_1:
+      disk.device.write.requests.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.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.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      feature_server_1b_pd_2:
         type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_oam_port_1:
+      disk.device.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.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.capacity_server_1c1_cmaui_2:
+      disk.device.read.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.
         occurrences:
         - 1
         - UNBOUNDED
-      instance_server_1c1_cmaui_2:
+      disk.device.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
-      instance_server_1c1_cmaui_1:
+      disk.device.read.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
-      network.outgoing.bytes.rate_pd_server_1b_port_1:
+      disk.device.write.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.
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_pd_server_port_2_nested1_pattern_4:
-        type: tosca.capabilities.Attachment
+      disk.device.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
-      host_server_pd_nested1_pattern_4:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
+      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.device.read.requests.rate_server_1c2_oam_1:
+      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.device.read.requests.rate_server_1c2_oam_2:
+      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.
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_oam_port_2:
-        type: tosca.capabilities.Attachment
+      disk.iops_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.allocation_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.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.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.allocation_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.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:
+        type: org.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
-      disk.capacity_server_1c2_oam_1:
+      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
-      os_server_1b_pd_1:
-        type: tosca.capabilities.OperatingSystem
+      network.incoming.bytes_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.capacity_server_1c2_oam_2:
+      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:
         - 1
         - UNBOUNDED
-      endpoint_server_pd_nested1_pattern_4:
-        type: tosca.capabilities.Endpoint.Admin
+      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
-      os_server_1b_pd_2:
-        type: tosca.capabilities.OperatingSystem
+      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.
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_oam_port_1:
-        type: tosca.capabilities.Attachment
+      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
-      disk.device.read.bytes.rate_server_pd_nested1_pattern_4:
+      cpu_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.write.bytes.rate_server_1c2_oam_1:
+      cpu_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.write.bytes.rate_server_1c2_oam_2:
+      disk.write.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.root.size_server_1b_pd_2:
+      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.
         occurrences:
         - 1
         - UNBOUNDED
-      endpoint_server_1c1_cmaui_2:
-        type: tosca.capabilities.Endpoint.Admin
+      attachment_packet_external_network_1:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_ps_server_1b_port_1:
+      disk.device.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.
         occurrences:
         - 1
         - UNBOUNDED
-      host_server_1b_pd_1:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
+      feature_packet_internal_network_1:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.root.size_server_1b_pd_1:
+      disk.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
-      endpoint_server_1c1_cmaui_1:
-        type: tosca.capabilities.Endpoint.Admin
+      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
-      disk.device.usage_server_1c1_cmaui_2:
+      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.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.capacity_server_1c1_cmaui_1:
+      disk.device.write.requests_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.device.usage_server_1c1_cmaui_1:
+      disk.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.
         occurrences:
         - 1
         - UNBOUNDED
-      host_server_1b_pd_2:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
+      endpoint_server_1b_pd_2:
+        type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
-      vcpus_server_1c1_cmaui_2:
+      endpoint_server_1b_pd_1:
+        type: tosca.capabilities.Endpoint.Admin
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.incoming.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
-      disk.device.latency_server_1c2_oam_2:
+      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.device.latency_server_1c2_oam_1:
+      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.write.requests.rate_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
-      disk.write.requests.rate_server_1c1_cmaui_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
-      disk.allocation_server_1b_pd_1:
+      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:
         - 1
         - UNBOUNDED
-      disk.allocation_server_1b_pd_2:
+      network.outgoing.packets.rate_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
-      attachment_ps_server_1b_port_1:
-        type: tosca.capabilities.Attachment
+      feature_packet_external_network_1:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_util_server_1c1_cmaui_2:
+      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.allocation_server_1c2_oam_2:
+      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.allocation_server_1c2_oam_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
-      cpu_util_server_1c1_cmaui_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
-      binding_pd_server_1b_port_1:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
-      disk.device.latency_server_pd_nested1_pattern_4:
+      network.incoming.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
-      disk.write.requests_server_1b_pd_2:
+      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.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests.rate_server_1b_pd_1:
+      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.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests.rate_server_1b_pd_2:
+      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.read.bytes_server_1c2_oam_1:
+      disk.iops_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.outpoing.packets_pd_server_port_2_nested1_pattern_4:
+      disk.iops_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.read.bytes_server_1c2_oam_2:
+      disk.device.read.requests_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.write.requests_server_1b_pd_1:
+      disk.device.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.
         occurrences:
         - 1
         - UNBOUNDED
-      binding_oam_port_2:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+      forwarder_pd_server_port_2_nested1_pattern_4:
+        type: org.openecomp.capabilities.Forwarder
         occurrences:
-        - 0
+        - 1
         - UNBOUNDED
-      disk.write.bytes.rate_server_1c1_cmaui_1:
+      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.write.bytes.rate_server_1c1_cmaui_2:
+      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
-      binding_oam_port_1:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
-      memory.resident_server_pd_nested1_pattern_4:
+      disk.write.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.outgoing.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.
+      feature_pd_server_port_2_nested1_pattern_4:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_ps_server_1b_port_1:
+      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.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes.rate_server_1c1_cmaui_2:
+      disk.read.bytes_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.read.bytes.rate_server_1c1_cmaui_1:
+      disk.device.write.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.allocation_server_pd_nested1_pattern_4:
+      disk.read.bytes_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
-      host_server_1c1_cmaui_2:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
+      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
-      host_server_1c1_cmaui_1:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
+      forwarder_pd_server_1b_port_1:
+        type: org.openecomp.capabilities.Forwarder
         occurrences:
         - 1
         - UNBOUNDED
-      vcpus_server_1b_pd_1:
+      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
-      vcpus_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.
+      feature_server_1c1_cmaui_1:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_cmaui_port_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
-      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.
+      feature_server_1c1_cmaui_2:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.latency_server_1c2_oam_1:
+      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.incoming.bytes.rate_pd_server_port_1_nested1_pattern_4:
+      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.latency_server_1c2_oam_2:
+      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
-      disk.read.bytes.rate_server_1b_pd_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
-      disk.read.bytes.rate_server_1b_pd_1:
+      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
-      memory.usage_server_1b_pd_2:
+      network.outgoing.bytes_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
-      memory.usage_server_1c2_oam_2:
+      binding_server_pd_nested1_pattern_4:
+        type: tosca.capabilities.network.Bindable
+        occurrences:
+        - 1
+        - UNBOUNDED
+      cpu_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
-      memory.usage_server_1b_pd_1:
+      feature_server_pd_nested1_pattern_4:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.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
-      memory.usage_server_1c2_oam_1:
+      disk.device.write.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.read.requests_server_1c2_oam_2:
+      disk.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.latency_server_1b_pd_2:
+      memory.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.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.requests_server_1c2_oam_1:
+      scalable_server_pd_nested1_pattern_4:
+        type: tosca.capabilities.Scalable
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.read.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.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.latency_server_1b_pd_1:
+      cpu_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.device.usage_server_pd_nested1_pattern_4:
+      disk.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.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.root.size_server_1c2_oam_1:
+      network.outgoing.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
-      memory.resident_server_1c1_cmaui_2:
+      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
-      disk.root.size_server_1c2_oam_2:
+      link_packet_internal_network_1:
+        type: tosca.capabilities.network.Linkable
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.write.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.
         occurrences:
         - 1
         - UNBOUNDED
-      memory.resident_server_1c1_cmaui_1:
+      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
-      disk.device.write.requests_server_1b_pd_1:
+      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:
         - 1
         - UNBOUNDED
-      cpu_util_server_pd_nested1_pattern_4:
+      network.incoming.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.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests_server_1b_pd_2:
+      disk.device.write.requests.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.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_oam_port_1:
+      disk.device.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
-      os_server_1c1_cmaui_2:
-        type: tosca.capabilities.OperatingSystem
+      forwarder_pd_server_port_1_nested1_pattern_4:
+        type: org.openecomp.capabilities.Forwarder
         occurrences:
         - 1
         - UNBOUNDED
-      os_server_1c1_cmaui_1:
-        type: tosca.capabilities.OperatingSystem
+      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.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.ephemeral.size_server_pd_nested1_pattern_4:
+      disk.device.write.requests.rate_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
-      instance_server_1c2_oam_1:
+      attachment_packet_internal_network_1:
+        type: tosca.capabilities.Attachment
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.write.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.bytes.rate_pd_server_port_1_nested1_pattern_4:
+      os_server_pd_nested1_pattern_4:
+        type: tosca.capabilities.OperatingSystem
+        occurrences:
+        - 1
+        - UNBOUNDED
+      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
-      instance_server_1c2_oam_2:
+      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
-      network.incoming.bytes.rate_oam_port_2:
+      network.incoming.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
-      memory.usage_server_1c1_cmaui_1:
+      network.outgoing.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.
         occurrences:
         - 1
         - UNBOUNDED
-      memory.usage_server_1c1_cmaui_2:
+      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
-      end_point_packet_external_network_1:
-        type: tosca.capabilities.Endpoint
+      attachment_pd_server_port_1_nested1_pattern_4:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      binding_server_1c1_cmaui_2:
-        type: tosca.capabilities.network.Bindable
+      memory.resident_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
-      memory_server_1c1_cmaui_2:
+      memory.resident_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
-      binding_server_1c1_cmaui_1:
-        type: tosca.capabilities.network.Bindable
+      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.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.iops_server_1c2_oam_2:
+      disk.device.allocation_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.iops_server_1c2_oam_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
-      network.incoming.bytes_pd_server_port_2_nested1_pattern_4:
+      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
-      binding_server_1c2_oam_2:
-        type: tosca.capabilities.network.Bindable
+      feature_cmaui_port_1:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      binding_server_1c2_oam_1:
-        type: tosca.capabilities.network.Bindable
+      feature_cmaui_port_2:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_ps_server_1b_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.write.requests.rate_server_pd_nested1_pattern_4:
+      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
-      disk.device.read.bytes.rate_server_1b_pd_2:
+      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:
         - 1
         - UNBOUNDED
-      disk.write.requests.rate_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.
+      attachment_pd_server_port_2_nested1_pattern_4:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests.rate_server_1b_pd_2:
+      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
-      memory_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.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.
+      os_server_1b_pd_1:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.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.
+      os_server_1b_pd_2:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests_server_1c2_oam_1:
+      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.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes.rate_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.
+      endpoint_server_1c1_cmaui_2:
+        type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_ps_server_1b_port_1:
+      network.incoming.packets.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.
         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.
+      host_server_1b_pd_1:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      disk.usage_server_1b_pd_2:
+      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.
         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.
+      endpoint_server_1c1_cmaui_1:
+        type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
-      vcpus_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.
+      host_server_1b_pd_2:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes.rate_server_1b_pd_1:
+      vcpus_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.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.
+      forwarder_cmaui_port_2:
+        type: org.openecomp.capabilities.Forwarder
         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.
+      forwarder_cmaui_port_1:
+        type: org.openecomp.capabilities.Forwarder
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.allocation_server_1b_pd_1:
+      disk.allocation_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.usage_server_1b_pd_1:
+      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.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.ephemeral.size_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.
+      attachment_ps_server_1b_port_1:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      disk.ephemeral.size_server_1c1_cmaui_2:
+      disk.device.read.requests.rate_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.root.size_server_1c1_cmaui_2:
+      disk.device.read.requests.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.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.root.size_server_1c1_cmaui_1:
+      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.incoming.packets_cmaui_port_2:
+      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
-      disk.read.requests_server_1b_pd_2:
+      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
-      disk.device.write.bytes.rate_server_1c1_cmaui_2:
+      network.outgoing.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
-      disk.device.write.requests_server_1c2_oam_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
-      disk.read.requests_server_1b_pd_1:
+      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:
         - 1
         - UNBOUNDED
-      disk.allocation_server_1c1_cmaui_1:
+      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.device.write.bytes.rate_server_1b_pd_2:
+      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.device.write.bytes.rate_server_1b_pd_1:
+      disk.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.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_util_server_1b_pd_2:
+      disk.read.bytes.rate_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_cmaui_port_1:
+      memory.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:
         - 1
         - UNBOUNDED
-      cpu_util_server_1b_pd_1:
+      memory.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
-      disk.write.requests_server_pd_nested1_pattern_4:
+      memory.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
-      feature_server_1b_pd_1:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.device.write.requests.rate_server_1c1_cmaui_2:
+      memory.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.write.bytes_server_1c1_cmaui_1:
+      disk.read.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.rate_server_1c1_cmaui_1:
+      disk.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
-      feature_server_1b_pd_2:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.device.write.requests_server_1c2_oam_1:
+      disk.read.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.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes.rate_server_1c1_cmaui_1:
+      disk.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.write.bytes_server_1c1_cmaui_2:
+      memory.resident_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.read.requests_server_1c2_oam_1:
+      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
-      disk.device.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.
+      os_server_1c1_cmaui_2:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      host_server_1c2_oam_1:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
+      os_server_1c1_cmaui_1:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests_server_1c2_oam_2:
+      disk.ephemeral.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
-      disk.device.write.bytes_server_1b_pd_1:
+      instance_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
-      host_server_1c2_oam_2:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
+      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:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes_server_pd_nested1_pattern_4:
+      memory_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.packets.rate_oam_port_1:
+      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.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_oam_port_2:
+      disk.device.write.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
-      disk.iops_server_1b_pd_1:
+      disk.write.requests.rate_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
-      cpu_server_pd_nested1_pattern_4:
+      disk.write.requests.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.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.iops_server_1b_pd_2:
+      memory_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.device.read.requests_server_1c1_cmaui_2:
+      disk.read.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
-      disk.allocation_server_1c1_cmaui_2:
+      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.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests_server_1c1_cmaui_1:
+      vcpus_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
-      binding_server_1b_pd_2:
-        type: tosca.capabilities.network.Bindable
+      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.
         occurrences:
         - 1
         - UNBOUNDED
-      binding_server_1b_pd_1:
-        type: tosca.capabilities.network.Bindable
+      disk.device.allocation_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.allocation_server_1c2_oam_2:
+      disk.ephemeral.size_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.device.allocation_server_1c2_oam_1:
+      disk.ephemeral.size_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_2:
+      disk.root.size_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:
+      disk.root.size_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
-      link_packet_external_network_1:
-        type: tosca.capabilities.network.Linkable
+      disk.read.requests_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_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
-      network.incoming.bytes_pd_server_port_1_nested1_pattern_4:
+      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.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_server_1c1_cmaui_2:
+      cpu_util_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_cmaui_port_1:
+      cpu_util_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
-      cpu_server_1c1_cmaui_1:
+      disk.write.requests_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_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.
+      forwarder_ps_server_1b_port_1:
+        type: org.openecomp.capabilities.Forwarder
         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
+      disk.device.write.bytes_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:
-        - 0
+        - 1
         - UNBOUNDED
-      cpu_server_1c2_oam_1:
+      disk.device.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
-      cpu_server_1c2_oam_2:
+      disk.device.write.bytes_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.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.
+      host_server_1c2_oam_1:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      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.
+      host_server_1c2_oam_2:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_pd_server_1b_port_1:
-        type: tosca.capabilities.Attachment
+      cpu_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.write.requests.rate_server_1c2_oam_2:
+      disk.device.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
-      disk.device.read.bytes_server_1b_pd_1:
+      disk.device.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
-      attachment_packet_external_network_1:
-        type: tosca.capabilities.Attachment
+      binding_server_1b_pd_2:
+        type: tosca.capabilities.network.Bindable
         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.
+      binding_server_1b_pd_1:
+        type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes_server_1b_pd_2:
+      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
+        occurrences:
+        - 0
+        - UNBOUNDED
+      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
-      feature_packet_internal_network_1:
-        type: tosca.capabilities.Node
+      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.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.
+      attachment_pd_server_1b_port_1:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      disk.ephemeral.size_server_1b_pd_1:
+      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
-      disk.write.requests.rate_server_1c2_oam_1:
+      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:
@@ -4907,24 +5152,6 @@ node_types:
         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.
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.device.write.requests_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.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.
-        occurrences:
-        - 1
-        - 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.
@@ -4937,70 +5164,24 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      endpoint_server_1b_pd_2:
-        type: tosca.capabilities.Endpoint.Admin
-        occurrences:
-        - 1
-        - UNBOUNDED
       disk.device.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.
         occurrences:
         - 1
         - UNBOUNDED
-      endpoint_server_1b_pd_1:
-        type: tosca.capabilities.Endpoint.Admin
-        occurrences:
-        - 1
-        - UNBOUNDED
       disk.device.read.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
-      network.incoming.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
       disk.device.read.requests.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
-      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:
-        type: org.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.
-        occurrences:
-        - 1
-        - UNBOUNDED
-      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
-      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:
-        - 1
-        - UNBOUNDED
       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.
@@ -5019,12 +5200,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_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.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.
@@ -5043,11 +5218,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      feature_packet_external_network_1:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
       disk.write.bytes_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.
@@ -5070,18 +5240,6 @@ node_types:
         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
-      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
       feature_nested1_pattern_4:
         type: tosca.capabilities.Node
         occurrences:
@@ -5104,12 +5262,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      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
       disk.device.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.
@@ -5133,24 +5285,6 @@ node_types:
         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.
-        occurrences:
-        - 1
-        - UNBOUNDED
-      network.incoming.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.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.
-        occurrences:
-        - 1
-        - UNBOUNDED
       scalable_server_1b_pd_1:
         type: tosca.capabilities.Scalable
         occurrences:
@@ -5173,60 +5307,12 @@ node_types:
         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.
-        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.iops_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.iops_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.device.read.requests_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.device.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.
-        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.
         occurrences:
         - 1
         - UNBOUNDED
-      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_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_pd_server_port_1_nested1_pattern_4:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
@@ -5234,23 +5320,12 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      disk.write.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.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:
         - 1
         - UNBOUNDED
-      feature_pd_server_port_2_nested1_pattern_4:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
       feature_ps_server_1b_port_1:
         type: tosca.capabilities.Node
         occurrences:
@@ -5534,6 +5609,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_rd_server_1b_ps_server_1b_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       memory_rd_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.
@@ -6041,6 +6121,11 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
+      forwarder_rd_server_1b_rd_server_1b_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.iops_rd_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.
@@ -6241,6 +6326,16 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_11:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      forwarder_cmaui_port_12:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       end_point_packet_internal_network:
         type: tosca.capabilities.Endpoint
         occurrences:
@@ -6878,6 +6973,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pd_server_port_1:
+        type: org.openecomp.capabilities.Forwarder
+        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.
@@ -6896,6 +6996,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pd_server_port_2:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       feature_server_pd:
         type: tosca.capabilities.Node
         occurrences:
@@ -7422,6 +7527,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pd_server_port_1:
+        type: org.openecomp.capabilities.Forwarder
+        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.
@@ -7440,6 +7550,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pd_server_port_2:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       feature_server_pd:
         type: tosca.capabilities.Node
         occurrences:
@@ -7849,6 +7964,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_1c1_cmaui_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.write.bytes_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.
@@ -7899,4 +8019,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/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 e691c79b1f..72933b0307 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
@@ -218,6 +218,9 @@ topology_template:
       network.incoming.packets_BE_1c1_BE_port:
       - BE_1c1_BE_port
       - network.incoming.packets
+      forwarder_BE_1c1_BE_port:
+      - BE_1c1_BE_port
+      - forwarder
       disk.device.latency_BE_1c1:
       - BE_1c1
       - disk.device.latency
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 bc2d8eda88..03ec9f9166 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
@@ -266,6 +266,9 @@ topology_template:
       disk.device.write.requests.rate_cmaui_1c1:
       - cmaui_1c1
       - disk.device.write.requests.rate
+      forwarder_cmaui_1c1_cmaui_port:
+      - cmaui_1c1_cmaui_port
+      - forwarder
       disk.device.write.bytes_cmaui_1c1:
       - cmaui_1c1
       - disk.device.write.bytes
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 0010b8586c..f774f9a51b 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
@@ -239,6 +239,9 @@ 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
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 29f72606d6..3e11ea8a55 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
@@ -281,6 +281,9 @@ topology_template:
       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
       disk.device.capacity_osm_server_1c2:
       - osm_server_1c2
       - disk.device.capacity
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 dc28b6c51e..b6c2df19ef 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
@@ -157,6 +157,9 @@ topology_template:
       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
@@ -298,4 +301,4 @@ topology_template:
       - dependency
       link_pd_server_1b_ps_server_1b_port:
       - pd_server_1b_ps_server_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/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 b64b311741..61cb8462b1 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
@@ -158,6 +158,9 @@ topology_template:
       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
@@ -305,4 +308,4 @@ topology_template:
       - link
       dependency_pd_server_1b_pd_server_1b_port:
       - pd_server_1b_pd_server_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/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_rd_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_rd_server_1bServiceTemplate.yaml
index b94ff90054..0f083eeeb2 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_rd_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_rd_server_1bServiceTemplate.yaml
@@ -257,6 +257,9 @@ topology_template:
       binding_rd_server_1b_rd_server_1b_port:
       - rd_server_1b_rd_server_1b_port
       - binding
+      forwarder_rd_server_1b_rd_server_1b_port:
+      - rd_server_1b_rd_server_1b_port
+      - forwarder
       disk.device.iops_rd_server_1b:
       - rd_server_1b
       - disk.device.iops
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_rd_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_rd_server_1b_1ServiceTemplate.yaml
index 03f95284d2..37cc3ce481 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_rd_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_rd_server_1b_1ServiceTemplate.yaml
@@ -208,6 +208,9 @@ topology_template:
       disk.write.bytes.rate_rd_server_1b:
       - rd_server_1b
       - disk.write.bytes.rate
+      forwarder_rd_server_1b_ps_server_1b_port:
+      - rd_server_1b_ps_server_1b_port
+      - forwarder
       memory_rd_server_1b:
       - rd_server_1b
       - memory
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-no-computeServiceTemplate.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-no-computeServiceTemplate.yaml
index 3d08eb04fb..cb521520a9 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-no-computeServiceTemplate.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-no-computeServiceTemplate.yaml
@@ -153,6 +153,12 @@ topology_template:
       network.outpoing.packets_cmaui_port_12:
       - cmaui_port_12
       - network.outpoing.packets
+      forwarder_cmaui_port_11:
+      - cmaui_port_11
+      - forwarder
+      forwarder_cmaui_port_12:
+      - cmaui_port_12
+      - forwarder
       end_point_packet_internal_network:
       - packet_internal_network
       - end_point
@@ -249,4 +255,4 @@ topology_template:
       - binding
       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/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 828ab0dfbd..ec4283632d 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
@@ -377,6 +377,9 @@ topology_template:
       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
@@ -386,6 +389,9 @@ topology_template:
       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
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 b1b6a677d7..5b9038cc4b 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
@@ -427,141 +427,57 @@ topology_template:
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.heat.nested1
     capabilities:
-      disk.device.write.bytes.rate_server_1c2_oam_2:
-      - abstract_oam_server_1c2_1
-      - disk.device.write.bytes.rate_oam_server_1c2
-      disk.read.bytes_server_1c1_cmaui_2:
-      - abstract_cmaui_1c1
-      - disk.read.bytes_cmaui_1c1
-      disk.device.write.bytes.rate_server_1c2_oam_1:
-      - abstract_oam_server_1c2_0
-      - disk.device.write.bytes.rate_oam_server_1c2
-      disk.read.bytes_server_1c1_cmaui_1:
-      - abstract_cmaui_1c1
-      - disk.read.bytes_cmaui_1c1
       memory_server_pd_nested1_pattern_4:
       - nested1_pattern_4
       - memory_server_pd
       binding_ps_server_1b_port_1:
       - abstract_pd_server_1b
       - binding_pd_server_1b_ps_server_1b_port
-      disk.iops_server_1c2_oam_2:
-      - abstract_oam_server_1c2_1
-      - disk.iops_oam_server_1c2
       disk.capacity_server_1b_pd_1:
       - abstract_pd_server_1b_1
       - disk.capacity_pd_server_1b
       disk.capacity_server_1b_pd_2:
       - abstract_pd_server_1b
       - disk.capacity_pd_server_1b
-      disk.usage_server_1c2_oam_2:
-      - abstract_oam_server_1c2_1
-      - disk.usage_oam_server_1c2
       disk.read.requests_server_1c1_cmaui_2:
       - abstract_cmaui_1c1
       - disk.read.requests_cmaui_1c1
-      feature_server_1c1_cmaui_1:
-      - abstract_cmaui_1c1
-      - feature_cmaui_1c1
-      disk.usage_server_1c2_oam_1:
-      - abstract_oam_server_1c2_0
-      - disk.usage_oam_server_1c2
-      feature_server_1c1_cmaui_2:
-      - abstract_cmaui_1c1
-      - feature_cmaui_1c1
       disk.read.requests_server_1c1_cmaui_1:
       - abstract_cmaui_1c1
       - disk.read.requests_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
-      disk.device.capacity_server_pd_nested1_pattern_4:
-      - nested1_pattern_4
-      - disk.device.capacity_server_pd
       disk.device.read.requests.rate_server_pd_nested1_pattern_4:
       - nested1_pattern_4
       - disk.device.read.requests.rate_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
       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.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
       network.outgoing.packets.rate_oam_port_1:
       - abstract_oam_server_1c2_0
       - network.outgoing.packets.rate_oam_server_1c2_oam_port
-      cpu_server_1b_pd_1:
-      - abstract_pd_server_1b_1
-      - cpu_pd_server_1b
-      feature_server_pd_nested1_pattern_4:
-      - nested1_pattern_4
-      - feature_server_pd
-      disk.device.write.requests.rate_server_1c2_oam_1:
-      - abstract_oam_server_1c2_0
-      - disk.device.write.requests.rate_oam_server_1c2
       disk.device.iops_server_1b_pd_2:
       - abstract_pd_server_1b
       - disk.device.iops_pd_server_1b
-      disk.device.write.requests.rate_server_1c2_oam_2:
-      - abstract_oam_server_1c2_1
-      - disk.device.write.requests.rate_oam_server_1c2
       disk.read.requests_server_pd_nested1_pattern_4:
       - nested1_pattern_4
       - disk.read.requests_server_pd
       disk.device.write.bytes_server_pd_nested1_pattern_4:
       - nested1_pattern_4
       - disk.device.write.bytes_server_pd
-      disk.read.bytes.rate_server_1c2_oam_1:
-      - abstract_oam_server_1c2_0
-      - disk.read.bytes.rate_oam_server_1c2
-      memory.usage_server_pd_nested1_pattern_4:
-      - nested1_pattern_4
-      - memory.usage_server_pd
       cpu.delta_server_pd_nested1_pattern_4:
       - nested1_pattern_4
       - cpu.delta_server_pd
-      scalable_server_pd_nested1_pattern_4:
-      - nested1_pattern_4
-      - scalable_server_pd
-      disk.read.bytes.rate_server_1c2_oam_2:
-      - abstract_oam_server_1c2_1
-      - disk.read.bytes.rate_oam_server_1c2
-      cpu_server_1b_pd_2:
-      - abstract_pd_server_1b
-      - cpu_pd_server_1b
-      disk.usage_server_pd_nested1_pattern_4:
-      - nested1_pattern_4
-      - disk.usage_server_pd
       disk.device.iops_server_1b_pd_1:
       - abstract_pd_server_1b_1
       - disk.device.iops_pd_server_1b
-      network.outgoing.bytes_pd_server_port_2_nested1_pattern_4:
-      - nested1_pattern_4
-      - network.outgoing.bytes_pd_server_port_2
       scalable_server_1c2_oam_2:
       - abstract_oam_server_1c2_1
       - scalable_oam_server_1c2
       scalable_server_1c2_oam_1:
       - abstract_oam_server_1c2_0
       - scalable_oam_server_1c2
-      vcpus_server_pd_nested1_pattern_4:
-      - nested1_pattern_4
-      - vcpus_server_pd
       network.outgoing.packets.rate_ps_server_1b_port_1:
       - abstract_pd_server_1b
       - network.outgoing.packets.rate_pd_server_1b_ps_server_1b_port
@@ -571,9 +487,6 @@ topology_template:
       feature_pd_server_port_1_nested1_pattern_4:
       - nested1_pattern_4
       - feature_pd_server_port_1
-      link_packet_internal_network_1:
-      - packet_internal_network_1
-      - link
       network.outpoing.packets_pd_server_port_1_nested1_pattern_4:
       - nested1_pattern_4
       - network.outpoing.packets_pd_server_port_1
@@ -589,18 +502,6 @@ topology_template:
       disk.device.read.bytes_server_1c1_cmaui_1:
       - abstract_cmaui_1c1
       - disk.device.read.bytes_cmaui_1c1
-      disk.write.bytes_server_1b_pd_1:
-      - abstract_pd_server_1b_1
-      - disk.write.bytes_pd_server_1b
-      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.capacity_server_1c2_oam_2:
       - abstract_oam_server_1c2_1
       - disk.device.capacity_oam_server_1c2
@@ -610,30 +511,12 @@ topology_template:
       disk.device.capacity_server_1c2_oam_1:
       - abstract_oam_server_1c2_0
       - disk.device.capacity_oam_server_1c2
-      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
-      disk.latency_server_pd_nested1_pattern_4:
-      - nested1_pattern_4
-      - disk.latency_server_pd
-      disk.device.write.requests.rate_server_1b_pd_1:
-      - abstract_pd_server_1b_1
-      - disk.device.write.requests.rate_pd_server_1b
       network.outpoing.packets_oam_port_1:
       - abstract_oam_server_1c2_0
       - network.outpoing.packets_oam_server_1c2_oam_port
-      attachment_packet_internal_network_1:
-      - packet_internal_network_1
-      - attachment
       network.outpoing.packets_oam_port_2:
       - abstract_oam_server_1c2_1
       - network.outpoing.packets_oam_server_1c2_oam_port
-      disk.write.requests.rate_server_pd_nested1_pattern_4:
-      - nested1_pattern_4
-      - disk.write.requests.rate_server_pd
       binding_cmaui_port_1:
       - abstract_cmaui_1c1
       - binding_cmaui_1c1_cmaui_port
@@ -643,27 +526,6 @@ topology_template:
       end_point_packet_internal_network_1:
       - packet_internal_network_1
       - end_point
-      os_server_pd_nested1_pattern_4:
-      - nested1_pattern_4
-      - os_server_pd
-      cpu_util_server_1c2_oam_1:
-      - abstract_oam_server_1c2_0
-      - cpu_util_oam_server_1c2
-      cpu_util_server_1c2_oam_2:
-      - abstract_oam_server_1c2_1
-      - 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.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_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
       memory_server_1c2_oam_1:
       - abstract_oam_server_1c2_0
       - memory_oam_server_1c2
@@ -676,12 +538,6 @@ topology_template:
       disk.write.bytes_server_1c2_oam_2:
       - abstract_oam_server_1c2_1
       - disk.write.bytes_oam_server_1c2
-      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.incoming.bytes.rate_pd_server_port_2_nested1_pattern_4:
       - nested1_pattern_4
       - network.incoming.bytes.rate_pd_server_port_2
@@ -718,39 +574,21 @@ topology_template:
       memory.resident_server_1b_pd_1:
       - abstract_pd_server_1b_1
       - memory.resident_pd_server_1b
-      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
       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
-      disk.root.size_server_pd_nested1_pattern_4:
-      - nested1_pattern_4
-      - disk.root.size_server_pd
       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.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
       feature_server_1c2_oam_1:
       - abstract_oam_server_1c2_0
       - feature_oam_server_1c2
@@ -760,45 +598,21 @@ topology_template:
       disk.device.capacity_server_1c1_cmaui_2:
       - abstract_cmaui_1c1
       - disk.device.capacity_cmaui_1c1
-      instance_server_1c1_cmaui_2:
-      - abstract_cmaui_1c1
-      - instance_cmaui_1c1
-      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
       host_server_pd_nested1_pattern_4:
       - nested1_pattern_4
       - host_server_pd
-      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.capacity_server_1c2_oam_1:
       - abstract_oam_server_1c2_0
       - disk.capacity_oam_server_1c2
-      os_server_1b_pd_1:
-      - abstract_pd_server_1b_1
-      - os_pd_server_1b
       disk.capacity_server_1c2_oam_2:
       - abstract_oam_server_1c2_1
       - disk.capacity_oam_server_1c2
       endpoint_server_pd_nested1_pattern_4:
       - nested1_pattern_4
       - endpoint_server_pd
-      os_server_1b_pd_2:
-      - abstract_pd_server_1b
-      - os_pd_server_1b
       attachment_oam_port_1:
       - abstract_oam_server_1c2_0
       - attachment_oam_server_1c2_oam_port
@@ -811,24 +625,6 @@ topology_template:
       disk.write.bytes.rate_server_1c2_oam_2:
       - abstract_oam_server_1c2_1
       - disk.write.bytes.rate_oam_server_1c2
-      disk.root.size_server_1b_pd_2:
-      - abstract_pd_server_1b
-      - disk.root.size_pd_server_1b
-      endpoint_server_1c1_cmaui_2:
-      - abstract_cmaui_1c1
-      - 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
-      host_server_1b_pd_1:
-      - abstract_pd_server_1b_1
-      - host_pd_server_1b
-      disk.root.size_server_1b_pd_1:
-      - abstract_pd_server_1b_1
-      - disk.root.size_pd_server_1b
-      endpoint_server_1c1_cmaui_1:
-      - abstract_cmaui_1c1
-      - endpoint_cmaui_1c1
       disk.device.usage_server_1c1_cmaui_2:
       - abstract_cmaui_1c1
       - disk.device.usage_cmaui_1c1
@@ -838,12 +634,6 @@ topology_template:
       disk.device.usage_server_1c1_cmaui_1:
       - abstract_cmaui_1c1
       - disk.device.usage_cmaui_1c1
-      host_server_1b_pd_2:
-      - abstract_pd_server_1b
-      - host_pd_server_1b
-      vcpus_server_1c1_cmaui_2:
-      - abstract_cmaui_1c1
-      - vcpus_cmaui_1c1
       disk.device.latency_server_1c2_oam_2:
       - abstract_oam_server_1c2_1
       - disk.device.latency_oam_server_1c2
@@ -856,15 +646,6 @@ topology_template:
       disk.write.requests.rate_server_1c1_cmaui_1:
       - abstract_cmaui_1c1
       - disk.write.requests.rate_cmaui_1c1
-      disk.allocation_server_1b_pd_1:
-      - abstract_pd_server_1b_1
-      - disk.allocation_pd_server_1b
-      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
       cpu_util_server_1c1_cmaui_2:
       - abstract_cmaui_1c1
       - cpu_util_cmaui_1c1
@@ -886,12 +667,6 @@ topology_template:
       disk.write.requests_server_1b_pd_2:
       - abstract_pd_server_1b
       - disk.write.requests_pd_server_1b
-      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
       disk.read.bytes_server_1c2_oam_1:
       - abstract_oam_server_1c2_0
       - disk.read.bytes_oam_server_1c2
@@ -907,33 +682,15 @@ topology_template:
       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
-      disk.write.bytes.rate_server_1c1_cmaui_2:
-      - abstract_cmaui_1c1
-      - disk.write.bytes.rate_cmaui_1c1
       binding_oam_port_1:
       - abstract_oam_server_1c2_0
       - binding_oam_server_1c2_oam_port
-      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
       disk.read.bytes.rate_server_1c1_cmaui_2:
       - abstract_cmaui_1c1
       - disk.read.bytes.rate_cmaui_1c1
       disk.read.bytes.rate_server_1c1_cmaui_1:
       - abstract_cmaui_1c1
       - disk.read.bytes.rate_cmaui_1c1
-      disk.device.allocation_server_pd_nested1_pattern_4:
-      - nested1_pattern_4
-      - disk.device.allocation_server_pd
       host_server_1c1_cmaui_2:
       - abstract_cmaui_1c1
       - host_cmaui_1c1
@@ -946,12 +703,6 @@ topology_template:
       vcpus_server_1b_pd_2:
       - abstract_pd_server_1b
       - vcpus_pd_server_1b
-      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.latency_server_1c2_oam_1:
       - abstract_oam_server_1c2_0
       - disk.latency_oam_server_1c2
@@ -961,51 +712,15 @@ topology_template:
       disk.latency_server_1c2_oam_2:
       - abstract_oam_server_1c2_1
       - disk.latency_oam_server_1c2
-      disk.read.bytes.rate_server_1b_pd_2:
-      - abstract_pd_server_1b
-      - disk.read.bytes.rate_pd_server_1b
-      disk.read.bytes.rate_server_1b_pd_1:
-      - abstract_pd_server_1b_1
-      - disk.read.bytes.rate_pd_server_1b
-      memory.usage_server_1b_pd_2:
-      - abstract_pd_server_1b
-      - memory.usage_pd_server_1b
-      memory.usage_server_1c2_oam_2:
-      - abstract_oam_server_1c2_1
-      - memory.usage_oam_server_1c2
-      memory.usage_server_1b_pd_1:
-      - abstract_pd_server_1b_1
-      - memory.usage_pd_server_1b
-      memory.usage_server_1c2_oam_1:
-      - abstract_oam_server_1c2_0
-      - memory.usage_oam_server_1c2
-      disk.read.requests_server_1c2_oam_2:
-      - abstract_oam_server_1c2_1
-      - disk.read.requests_oam_server_1c2
-      disk.latency_server_1b_pd_2:
-      - abstract_pd_server_1b
-      - disk.latency_pd_server_1b
-      disk.read.requests_server_1c2_oam_1:
-      - abstract_oam_server_1c2_0
-      - disk.read.requests_oam_server_1c2
-      disk.latency_server_1b_pd_1:
-      - abstract_pd_server_1b_1
-      - disk.latency_pd_server_1b
       disk.device.usage_server_pd_nested1_pattern_4:
       - nested1_pattern_4
       - disk.device.usage_server_pd
       disk.root.size_server_1c2_oam_1:
       - abstract_oam_server_1c2_0
       - disk.root.size_oam_server_1c2
-      memory.resident_server_1c1_cmaui_2:
-      - abstract_cmaui_1c1
-      - memory.resident_cmaui_1c1
       disk.root.size_server_1c2_oam_2:
       - abstract_oam_server_1c2_1
       - disk.root.size_oam_server_1c2
-      memory.resident_server_1c1_cmaui_1:
-      - abstract_cmaui_1c1
-      - memory.resident_cmaui_1c1
       disk.device.write.requests_server_1b_pd_1:
       - abstract_pd_server_1b_1
       - disk.device.write.requests_pd_server_1b
@@ -1018,24 +733,9 @@ topology_template:
       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
-      os_server_1c1_cmaui_1:
-      - abstract_cmaui_1c1
-      - os_cmaui_1c1
-      disk.ephemeral.size_server_pd_nested1_pattern_4:
-      - nested1_pattern_4
-      - disk.ephemeral.size_server_pd
-      instance_server_1c2_oam_1:
-      - abstract_oam_server_1c2_0
-      - instance_oam_server_1c2
       network.outgoing.bytes.rate_pd_server_port_1_nested1_pattern_4:
       - nested1_pattern_4
       - network.outgoing.bytes.rate_pd_server_port_1
-      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
@@ -1051,9 +751,6 @@ topology_template:
       binding_server_1c1_cmaui_2:
       - abstract_cmaui_1c1
       - binding_cmaui_1c1
-      memory_server_1c1_cmaui_2:
-      - abstract_cmaui_1c1
-      - memory_cmaui_1c1
       binding_server_1c1_cmaui_1:
       - abstract_cmaui_1c1
       - binding_cmaui_1c1
@@ -1066,21 +763,582 @@ topology_template:
       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
+      - binding_oam_server_1c2
+      disk.device.read.bytes.rate_server_1b_pd_2:
+      - abstract_pd_server_1b
+      - disk.device.read.bytes.rate_pd_server_1b
+      disk.write.requests_server_1c2_oam_2:
+      - abstract_oam_server_1c2_1
+      - disk.write.requests_oam_server_1c2
+      disk.write.requests_server_1c2_oam_1:
+      - abstract_oam_server_1c2_0
+      - disk.write.requests_oam_server_1c2
+      disk.device.read.bytes.rate_server_1b_pd_1:
+      - abstract_pd_server_1b_1
+      - 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:
+      - nested1_pattern_4
+      - network.outgoing.packets.rate_pd_server_port_2
+      disk.usage_server_1b_pd_2:
+      - abstract_pd_server_1b
+      - disk.usage_pd_server_1b
+      disk.write.bytes.rate_server_1b_pd_1:
+      - abstract_pd_server_1b_1
+      - disk.write.bytes.rate_pd_server_1b
+      disk.write.bytes.rate_server_1b_pd_2:
+      - abstract_pd_server_1b
+      - disk.write.bytes.rate_pd_server_1b
+      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
+      disk.allocation_server_1c1_cmaui_1:
+      - abstract_cmaui_1c1
+      - disk.allocation_cmaui_1c1
+      disk.device.write.bytes.rate_server_1b_pd_2:
+      - abstract_pd_server_1b
+      - disk.device.write.bytes.rate_pd_server_1b
+      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:
+      - abstract_cmaui_1c1
+      - network.incoming.packets_cmaui_1c1_cmaui_port
+      feature_server_1b_pd_1:
+      - abstract_pd_server_1b_1
+      - feature_pd_server_1b
+      disk.device.write.requests.rate_server_1c1_cmaui_2:
+      - abstract_cmaui_1c1
+      - disk.device.write.requests.rate_cmaui_1c1
+      disk.device.write.requests.rate_server_1c1_cmaui_1:
+      - abstract_cmaui_1c1
+      - disk.device.write.requests.rate_cmaui_1c1
+      feature_server_1b_pd_2:
+      - abstract_pd_server_1b
+      - feature_pd_server_1b
+      disk.device.write.requests_server_1c2_oam_1:
+      - abstract_oam_server_1c2_0
+      - disk.device.write.requests_oam_server_1c2
+      disk.device.read.requests_server_1c2_oam_1:
+      - abstract_oam_server_1c2_0
+      - disk.device.read.requests_oam_server_1c2
+      disk.device.write.bytes_server_1b_pd_2:
+      - abstract_pd_server_1b
+      - disk.device.write.bytes_pd_server_1b
+      disk.device.read.requests_server_1c2_oam_2:
+      - abstract_oam_server_1c2_1
+      - disk.device.read.requests_oam_server_1c2
+      disk.device.write.bytes_server_1b_pd_1:
+      - abstract_pd_server_1b_1
+      - disk.device.write.bytes_pd_server_1b
+      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
+      disk.iops_server_1b_pd_2:
+      - abstract_pd_server_1b
+      - disk.iops_pd_server_1b
+      disk.allocation_server_1c1_cmaui_2:
+      - abstract_cmaui_1c1
+      - disk.allocation_cmaui_1c1
+      disk.device.allocation_server_1c2_oam_2:
+      - abstract_oam_server_1c2_1
+      - disk.device.allocation_oam_server_1c2
+      disk.device.allocation_server_1c2_oam_1:
+      - abstract_oam_server_1c2_0
+      - disk.device.allocation_oam_server_1c2
+      disk.write.requests_server_1c1_cmaui_2:
+      - abstract_cmaui_1c1
+      - disk.write.requests_cmaui_1c1
+      disk.write.requests_server_1c1_cmaui_1:
+      - abstract_cmaui_1c1
+      - disk.write.requests_cmaui_1c1
+      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
+      cpu_server_1c2_oam_1:
+      - abstract_oam_server_1c2_0
+      - cpu_oam_server_1c2
+      cpu_server_1c2_oam_2:
+      - abstract_oam_server_1c2_1
+      - cpu_oam_server_1c2
+      disk.write.requests.rate_server_1c2_oam_2:
+      - abstract_oam_server_1c2_1
+      - disk.write.requests.rate_oam_server_1c2
+      disk.device.read.bytes_server_1b_pd_1:
+      - abstract_pd_server_1b_1
+      - disk.device.read.bytes_pd_server_1b
+      attachment_packet_external_network_1:
+      - packet_external_network_1
+      - attachment
+      disk.device.read.bytes_server_1b_pd_2:
+      - abstract_pd_server_1b
+      - disk.device.read.bytes_pd_server_1b
+      feature_packet_internal_network_1:
+      - packet_internal_network_1
+      - feature
+      disk.iops_server_pd_nested1_pattern_4:
+      - nested1_pattern_4
+      - disk.iops_server_pd
+      disk.write.requests.rate_server_1c2_oam_1:
+      - abstract_oam_server_1c2_0
+      - disk.write.requests.rate_oam_server_1c2
+      disk.read.bytes_server_1b_pd_2:
+      - abstract_pd_server_1b
+      - disk.read.bytes_pd_server_1b
+      disk.device.write.requests_server_pd_nested1_pattern_4:
+      - nested1_pattern_4
+      - disk.device.write.requests_server_pd
+      disk.read.bytes_server_1b_pd_1:
+      - abstract_pd_server_1b_1
+      - disk.read.bytes_pd_server_1b
+      endpoint_server_1b_pd_2:
+      - abstract_pd_server_1b
+      - endpoint_pd_server_1b
+      endpoint_server_1b_pd_1:
+      - abstract_pd_server_1b_1
+      - 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
+      instance_server_pd_nested1_pattern_4:
+      - nested1_pattern_4
+      - instance_server_pd
+      disk.latency_server_1c1_cmaui_1:
+      - abstract_cmaui_1c1
+      - disk.latency_cmaui_1c1
+      memory_server_1b_pd_2:
+      - abstract_pd_server_1b
+      - memory_pd_server_1b
+      disk.latency_server_1c1_cmaui_2:
+      - abstract_cmaui_1c1
+      - disk.latency_cmaui_1c1
+      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
+      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
+      disk.read.bytes_server_pd_nested1_pattern_4:
+      - nested1_pattern_4
+      - disk.read.bytes_server_pd
+      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:
+      - 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
+      disk.iops_server_1c1_cmaui_2:
+      - abstract_cmaui_1c1
+      - disk.iops_cmaui_1c1
+      disk.iops_server_1c1_cmaui_1:
+      - abstract_cmaui_1c1
+      - disk.iops_cmaui_1c1
+      disk.device.read.requests_server_1b_pd_2:
+      - abstract_pd_server_1b
+      - disk.device.read.requests_pd_server_1b
+      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
+      disk.write.bytes_server_pd_nested1_pattern_4:
+      - nested1_pattern_4
+      - disk.write.bytes_server_pd
+      feature_pd_server_port_2_nested1_pattern_4:
+      - nested1_pattern_4
+      - feature_pd_server_port_2
+      disk.device.write.bytes.rate_server_1c2_oam_2:
+      - abstract_oam_server_1c2_1
+      - disk.device.write.bytes.rate_oam_server_1c2
+      disk.read.bytes_server_1c1_cmaui_2:
+      - abstract_cmaui_1c1
+      - disk.read.bytes_cmaui_1c1
+      disk.device.write.bytes.rate_server_1c2_oam_1:
+      - abstract_oam_server_1c2_0
+      - disk.device.write.bytes.rate_oam_server_1c2
+      disk.read.bytes_server_1c1_cmaui_1:
+      - abstract_cmaui_1c1
+      - disk.read.bytes_cmaui_1c1
+      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
+      disk.usage_server_1c2_oam_2:
+      - abstract_oam_server_1c2_1
+      - disk.usage_oam_server_1c2
+      feature_server_1c1_cmaui_1:
+      - abstract_cmaui_1c1
+      - feature_cmaui_1c1
+      disk.usage_server_1c2_oam_1:
+      - abstract_oam_server_1c2_0
+      - disk.usage_oam_server_1c2
+      feature_server_1c1_cmaui_2:
+      - abstract_cmaui_1c1
+      - 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
+      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
+      cpu_server_1b_pd_1:
+      - abstract_pd_server_1b_1
+      - cpu_pd_server_1b
+      feature_server_pd_nested1_pattern_4:
+      - nested1_pattern_4
+      - feature_server_pd
+      disk.device.write.requests.rate_server_1c2_oam_1:
+      - abstract_oam_server_1c2_0
+      - disk.device.write.requests.rate_oam_server_1c2
+      disk.device.write.requests.rate_server_1c2_oam_2:
+      - abstract_oam_server_1c2_1
+      - disk.device.write.requests.rate_oam_server_1c2
+      disk.read.bytes.rate_server_1c2_oam_1:
+      - abstract_oam_server_1c2_0
+      - disk.read.bytes.rate_oam_server_1c2
+      memory.usage_server_pd_nested1_pattern_4:
+      - nested1_pattern_4
+      - memory.usage_server_pd
+      scalable_server_pd_nested1_pattern_4:
+      - nested1_pattern_4
+      - scalable_server_pd
+      disk.read.bytes.rate_server_1c2_oam_2:
+      - abstract_oam_server_1c2_1
+      - disk.read.bytes.rate_oam_server_1c2
+      cpu_server_1b_pd_2:
+      - abstract_pd_server_1b
+      - cpu_pd_server_1b
+      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
+      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
+      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
+      disk.device.write.requests.rate_server_1b_pd_1:
+      - abstract_pd_server_1b_1
+      - disk.device.write.requests.rate_pd_server_1b
+      attachment_packet_internal_network_1:
+      - packet_internal_network_1
+      - attachment
+      disk.write.requests.rate_server_pd_nested1_pattern_4:
+      - nested1_pattern_4
+      - disk.write.requests.rate_server_pd
+      os_server_pd_nested1_pattern_4:
+      - nested1_pattern_4
+      - os_server_pd
+      cpu_util_server_1c2_oam_1:
+      - abstract_oam_server_1c2_0
+      - cpu_util_oam_server_1c2
+      cpu_util_server_1c2_oam_2:
+      - abstract_oam_server_1c2_1
+      - 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.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_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
+      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
+      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
+      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
+      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
+      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
+      os_server_1b_pd_1:
+      - abstract_pd_server_1b_1
+      - os_pd_server_1b
+      os_server_1b_pd_2:
+      - abstract_pd_server_1b
+      - os_pd_server_1b
+      disk.root.size_server_1b_pd_2:
+      - abstract_pd_server_1b
+      - disk.root.size_pd_server_1b
+      endpoint_server_1c1_cmaui_2:
+      - abstract_cmaui_1c1
+      - 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
+      host_server_1b_pd_1:
+      - abstract_pd_server_1b_1
+      - host_pd_server_1b
+      disk.root.size_server_1b_pd_1:
+      - abstract_pd_server_1b_1
+      - disk.root.size_pd_server_1b
+      endpoint_server_1c1_cmaui_1:
+      - abstract_cmaui_1c1
+      - endpoint_cmaui_1c1
+      host_server_1b_pd_2:
+      - abstract_pd_server_1b
+      - host_pd_server_1b
+      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:
+      - abstract_cmaui_1c1
+      - forwarder_cmaui_1c1_cmaui_port
+      disk.allocation_server_1b_pd_1:
+      - abstract_pd_server_1b_1
+      - disk.allocation_pd_server_1b
+      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
+      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
+      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
+      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
+      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
+      disk.read.bytes.rate_server_1b_pd_1:
+      - abstract_pd_server_1b_1
+      - disk.read.bytes.rate_pd_server_1b
+      memory.usage_server_1b_pd_2:
+      - abstract_pd_server_1b
+      - memory.usage_pd_server_1b
+      memory.usage_server_1c2_oam_2:
+      - abstract_oam_server_1c2_1
+      - memory.usage_oam_server_1c2
+      memory.usage_server_1b_pd_1:
+      - abstract_pd_server_1b_1
+      - memory.usage_pd_server_1b
+      memory.usage_server_1c2_oam_1:
+      - abstract_oam_server_1c2_0
+      - memory.usage_oam_server_1c2
+      disk.read.requests_server_1c2_oam_2:
+      - abstract_oam_server_1c2_1
+      - disk.read.requests_oam_server_1c2
+      disk.latency_server_1b_pd_2:
+      - abstract_pd_server_1b
+      - disk.latency_pd_server_1b
+      disk.read.requests_server_1c2_oam_1:
+      - abstract_oam_server_1c2_0
+      - disk.read.requests_oam_server_1c2
+      disk.latency_server_1b_pd_1:
+      - abstract_pd_server_1b_1
+      - disk.latency_pd_server_1b
+      memory.resident_server_1c1_cmaui_2:
+      - abstract_cmaui_1c1
+      - memory.resident_cmaui_1c1
+      memory.resident_server_1c1_cmaui_1:
+      - abstract_cmaui_1c1
+      - memory.resident_cmaui_1c1
+      os_server_1c1_cmaui_2:
+      - abstract_cmaui_1c1
+      - os_cmaui_1c1
+      os_server_1c1_cmaui_1:
+      - abstract_cmaui_1c1
+      - os_cmaui_1c1
+      disk.ephemeral.size_server_pd_nested1_pattern_4:
+      - nested1_pattern_4
+      - disk.ephemeral.size_server_pd
+      instance_server_1c2_oam_1:
+      - abstract_oam_server_1c2_0
+      - instance_oam_server_1c2
+      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
       network.incoming.bytes.rate_ps_server_1b_port_1:
       - abstract_pd_server_1b
       - network.incoming.bytes.rate_pd_server_1b_ps_server_1b_port
       disk.device.write.requests.rate_server_pd_nested1_pattern_4:
       - nested1_pattern_4
       - disk.device.write.requests.rate_server_pd
-      disk.device.read.bytes.rate_server_1b_pd_2:
-      - abstract_pd_server_1b
-      - disk.device.read.bytes.rate_pd_server_1b
       disk.write.requests.rate_server_1b_pd_1:
       - abstract_pd_server_1b_1
       - disk.write.requests.rate_pd_server_1b
@@ -1090,48 +1348,21 @@ topology_template:
       memory_server_1c1_cmaui_1:
       - abstract_cmaui_1c1
       - memory_cmaui_1c1
-      disk.write.requests_server_1c2_oam_2:
-      - abstract_oam_server_1c2_1
-      - disk.write.requests_oam_server_1c2
       disk.read.bytes.rate_server_pd_nested1_pattern_4:
       - nested1_pattern_4
       - disk.read.bytes.rate_server_pd
-      disk.write.requests_server_1c2_oam_1:
-      - abstract_oam_server_1c2_0
-      - disk.write.requests_oam_server_1c2
-      disk.device.read.bytes.rate_server_1b_pd_1:
-      - abstract_pd_server_1b_1
-      - 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:
-      - nested1_pattern_4
-      - network.outgoing.packets.rate_pd_server_port_2
-      disk.usage_server_1b_pd_2:
-      - abstract_pd_server_1b
-      - disk.usage_pd_server_1b
       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
-      disk.write.bytes.rate_server_1b_pd_1:
-      - abstract_pd_server_1b_1
-      - disk.write.bytes.rate_pd_server_1b
-      disk.write.bytes.rate_server_1b_pd_2:
-      - abstract_pd_server_1b
-      - disk.write.bytes.rate_pd_server_1b
       disk.device.allocation_server_1b_pd_2:
       - abstract_pd_server_1b
       - disk.device.allocation_pd_server_1b
       disk.device.allocation_server_1b_pd_1:
       - abstract_pd_server_1b_1
       - disk.device.allocation_pd_server_1b
-      disk.usage_server_1b_pd_1:
-      - abstract_pd_server_1b_1
-      - disk.usage_pd_server_1b
       disk.ephemeral.size_server_1c1_cmaui_1:
       - abstract_cmaui_1c1
       - disk.ephemeral.size_cmaui_1c1
@@ -1144,108 +1375,48 @@ topology_template:
       disk.root.size_server_1c1_cmaui_1:
       - abstract_cmaui_1c1
       - disk.root.size_cmaui_1c1
-      network.incoming.packets_cmaui_port_2:
-      - abstract_cmaui_1c1
-      - network.incoming.packets_cmaui_1c1_cmaui_port
       disk.read.requests_server_1b_pd_2:
       - abstract_pd_server_1b
       - disk.read.requests_pd_server_1b
       disk.device.write.bytes.rate_server_1c1_cmaui_2:
       - abstract_cmaui_1c1
       - disk.device.write.bytes.rate_cmaui_1c1
-      disk.device.write.requests_server_1c2_oam_2:
-      - abstract_oam_server_1c2_1
-      - disk.device.write.requests_oam_server_1c2
       disk.read.requests_server_1b_pd_1:
       - abstract_pd_server_1b_1
       - disk.read.requests_pd_server_1b
-      disk.allocation_server_1c1_cmaui_1:
-      - abstract_cmaui_1c1
-      - disk.allocation_cmaui_1c1
-      disk.device.write.bytes.rate_server_1b_pd_2:
-      - abstract_pd_server_1b
-      - disk.device.write.bytes.rate_pd_server_1b
-      disk.device.write.bytes.rate_server_1b_pd_1:
-      - abstract_pd_server_1b_1
-      - disk.device.write.bytes.rate_pd_server_1b
       cpu_util_server_1b_pd_2:
       - abstract_pd_server_1b
       - cpu_util_pd_server_1b
-      network.incoming.packets_cmaui_port_1:
-      - abstract_cmaui_1c1
-      - network.incoming.packets_cmaui_1c1_cmaui_port
       cpu_util_server_1b_pd_1:
       - abstract_pd_server_1b_1
       - cpu_util_pd_server_1b
       disk.write.requests_server_pd_nested1_pattern_4:
       - nested1_pattern_4
       - disk.write.requests_server_pd
-      feature_server_1b_pd_1:
-      - abstract_pd_server_1b_1
-      - feature_pd_server_1b
-      disk.device.write.requests.rate_server_1c1_cmaui_2:
-      - abstract_cmaui_1c1
-      - disk.device.write.requests.rate_cmaui_1c1
+      forwarder_ps_server_1b_port_1:
+      - abstract_pd_server_1b
+      - forwarder_pd_server_1b_ps_server_1b_port
       disk.device.write.bytes_server_1c1_cmaui_1:
       - abstract_cmaui_1c1
       - disk.device.write.bytes_cmaui_1c1
-      disk.device.write.requests.rate_server_1c1_cmaui_1:
-      - abstract_cmaui_1c1
-      - disk.device.write.requests.rate_cmaui_1c1
-      feature_server_1b_pd_2:
-      - abstract_pd_server_1b
-      - feature_pd_server_1b
-      disk.device.write.requests_server_1c2_oam_1:
-      - abstract_oam_server_1c2_0
-      - disk.device.write.requests_oam_server_1c2
       disk.device.write.bytes.rate_server_1c1_cmaui_1:
       - abstract_cmaui_1c1
       - disk.device.write.bytes.rate_cmaui_1c1
       disk.device.write.bytes_server_1c1_cmaui_2:
       - abstract_cmaui_1c1
       - disk.device.write.bytes_cmaui_1c1
-      disk.device.read.requests_server_1c2_oam_1:
-      - abstract_oam_server_1c2_0
-      - disk.device.read.requests_oam_server_1c2
-      disk.device.write.bytes_server_1b_pd_2:
-      - abstract_pd_server_1b
-      - disk.device.write.bytes_pd_server_1b
       host_server_1c2_oam_1:
       - abstract_oam_server_1c2_0
       - host_oam_server_1c2
-      disk.device.read.requests_server_1c2_oam_2:
-      - abstract_oam_server_1c2_1
-      - disk.device.read.requests_oam_server_1c2
-      disk.device.write.bytes_server_1b_pd_1:
-      - abstract_pd_server_1b_1
-      - disk.device.write.bytes_pd_server_1b
       host_server_1c2_oam_2:
       - abstract_oam_server_1c2_1
       - host_oam_server_1c2
-      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
       cpu_server_pd_nested1_pattern_4:
       - nested1_pattern_4
       - cpu_server_pd
-      disk.iops_server_1b_pd_2:
-      - abstract_pd_server_1b
-      - disk.iops_pd_server_1b
       disk.device.read.requests_server_1c1_cmaui_2:
       - abstract_cmaui_1c1
       - disk.device.read.requests_cmaui_1c1
-      disk.allocation_server_1c1_cmaui_2:
-      - abstract_cmaui_1c1
-      - disk.allocation_cmaui_1c1
       disk.device.read.requests_server_1c1_cmaui_1:
       - abstract_cmaui_1c1
       - disk.device.read.requests_cmaui_1c1
@@ -1255,48 +1426,9 @@ topology_template:
       binding_server_1b_pd_1:
       - abstract_pd_server_1b_1
       - binding_pd_server_1b
-      disk.device.allocation_server_1c2_oam_2:
-      - abstract_oam_server_1c2_1
-      - disk.device.allocation_oam_server_1c2
-      disk.device.allocation_server_1c2_oam_1:
-      - abstract_oam_server_1c2_0
-      - disk.device.allocation_oam_server_1c2
-      disk.write.requests_server_1c1_cmaui_2:
-      - abstract_cmaui_1c1
-      - disk.write.requests_cmaui_1c1
-      disk.write.requests_server_1c1_cmaui_1:
-      - abstract_cmaui_1c1
-      - disk.write.requests_cmaui_1c1
-      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
       binding_pd_server_port_2_nested1_pattern_4:
       - nested1_pattern_4
       - binding_pd_server_port_2
-      cpu_server_1c2_oam_1:
-      - abstract_oam_server_1c2_0
-      - cpu_oam_server_1c2
-      cpu_server_1c2_oam_2:
-      - abstract_oam_server_1c2_1
-      - cpu_oam_server_1c2
       disk.device.read.bytes.rate_server_1c1_cmaui_1:
       - abstract_cmaui_1c1
       - disk.device.read.bytes.rate_cmaui_1c1
@@ -1306,33 +1438,12 @@ topology_template:
       attachment_pd_server_1b_port_1:
       - abstract_pd_server_1b_1
       - attachment_pd_server_1b_pd_server_1b_port
-      disk.write.requests.rate_server_1c2_oam_2:
-      - abstract_oam_server_1c2_1
-      - disk.write.requests.rate_oam_server_1c2
-      disk.device.read.bytes_server_1b_pd_1:
-      - abstract_pd_server_1b_1
-      - disk.device.read.bytes_pd_server_1b
-      attachment_packet_external_network_1:
-      - packet_external_network_1
-      - attachment
       cpu.delta_server_1c2_oam_2:
       - abstract_oam_server_1c2_1
       - cpu.delta_oam_server_1c2
-      disk.device.read.bytes_server_1b_pd_2:
-      - abstract_pd_server_1b
-      - disk.device.read.bytes_pd_server_1b
-      feature_packet_internal_network_1:
-      - packet_internal_network_1
-      - feature
-      disk.iops_server_pd_nested1_pattern_4:
-      - nested1_pattern_4
-      - disk.iops_server_pd
       disk.ephemeral.size_server_1b_pd_1:
       - abstract_pd_server_1b_1
       - disk.ephemeral.size_pd_server_1b
-      disk.write.requests.rate_server_1c2_oam_1:
-      - abstract_oam_server_1c2_0
-      - disk.write.requests.rate_oam_server_1c2
       disk.ephemeral.size_server_1b_pd_2:
       - abstract_pd_server_1b
       - disk.ephemeral.size_pd_server_1b
@@ -1393,54 +1504,21 @@ topology_template:
       disk.ephemeral.size_server_1c2_oam_1:
       - abstract_oam_server_1c2_0
       - disk.ephemeral.size_oam_server_1c2
-      disk.read.bytes_server_1b_pd_2:
-      - abstract_pd_server_1b
-      - disk.read.bytes_pd_server_1b
-      disk.device.write.requests_server_pd_nested1_pattern_4:
-      - nested1_pattern_4
-      - disk.device.write.requests_server_pd
-      disk.read.bytes_server_1b_pd_1:
-      - abstract_pd_server_1b_1
-      - disk.read.bytes_pd_server_1b
       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
-      endpoint_server_1b_pd_2:
-      - abstract_pd_server_1b
-      - endpoint_pd_server_1b
       disk.device.read.bytes_server_1c2_oam_2:
       - abstract_oam_server_1c2_1
       - disk.device.read.bytes_oam_server_1c2
-      endpoint_server_1b_pd_1:
-      - abstract_pd_server_1b_1
-      - endpoint_pd_server_1b
       disk.device.read.bytes_server_1c2_oam_1:
       - abstract_oam_server_1c2_0
       - disk.device.read.bytes_oam_server_1c2
-      network.incoming.bytes_pd_server_1b_port_1:
-      - abstract_pd_server_1b_1
-      - network.incoming.bytes_pd_server_1b_pd_server_1b_port
       disk.device.read.requests.rate_server_1c1_cmaui_2:
       - abstract_cmaui_1c1
       - disk.device.read.requests.rate_cmaui_1c1
-      instance_server_pd_nested1_pattern_4:
-      - nested1_pattern_4
-      - instance_server_pd
-      disk.latency_server_1c1_cmaui_1:
-      - abstract_cmaui_1c1
-      - disk.latency_cmaui_1c1
-      memory_server_1b_pd_2:
-      - abstract_pd_server_1b
-      - memory_pd_server_1b
-      disk.latency_server_1c1_cmaui_2:
-      - abstract_cmaui_1c1
-      - disk.latency_cmaui_1c1
-      memory_server_1b_pd_1:
-      - abstract_pd_server_1b_1
-      - memory_pd_server_1b
       cpu.delta_server_1c2_oam_1:
       - abstract_oam_server_1c2_0
       - cpu.delta_oam_server_1c2
@@ -1450,9 +1528,6 @@ topology_template:
       disk.device.usage_server_1b_pd_1:
       - abstract_pd_server_1b_1
       - disk.device.usage_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
       disk.device.usage_server_1b_pd_2:
       - abstract_pd_server_1b
       - disk.device.usage_pd_server_1b
@@ -1462,9 +1537,6 @@ topology_template:
       disk.device.read.bytes.rate_server_1c2_oam_2:
       - abstract_oam_server_1c2_1
       - disk.device.read.bytes.rate_oam_server_1c2
-      feature_packet_external_network_1:
-      - packet_external_network_1
-      - feature
       disk.write.bytes_server_1c1_cmaui_1:
       - abstract_cmaui_1c1
       - disk.write.bytes_cmaui_1c1
@@ -1477,12 +1549,6 @@ topology_template:
       feature_oam_port_1:
       - abstract_oam_server_1c2_0
       - feature_oam_server_1c2_oam_port
-      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_nested1_pattern_4:
       - nested1_pattern_4
       - feature
@@ -1495,9 +1561,6 @@ topology_template:
       scalable_server_1c1_cmaui_1:
       - abstract_cmaui_1c1
       - scalable_cmaui_1c1
-      disk.read.bytes_server_pd_nested1_pattern_4:
-      - nested1_pattern_4
-      - disk.read.bytes_server_pd
       disk.device.latency_server_1c1_cmaui_2:
       - abstract_cmaui_1c1
       - disk.device.latency_cmaui_1c1
@@ -1510,15 +1573,6 @@ topology_template:
       cpu.delta_server_1c1_cmaui_1:
       - abstract_cmaui_1c1
       - cpu.delta_cmaui_1c1
-      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:
-      - abstract_oam_server_1c2_1
-      - network.incoming.packets_oam_server_1c2_oam_port
       scalable_server_1b_pd_1:
       - abstract_pd_server_1b_1
       - scalable_pd_server_1b
@@ -1531,45 +1585,15 @@ topology_template:
       cpu.delta_server_1b_pd_2:
       - abstract_pd_server_1b
       - cpu.delta_pd_server_1b
-      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
-      disk.iops_server_1c1_cmaui_2:
-      - abstract_cmaui_1c1
-      - disk.iops_cmaui_1c1
-      disk.iops_server_1c1_cmaui_1:
-      - abstract_cmaui_1c1
-      - disk.iops_cmaui_1c1
-      disk.device.read.requests_server_1b_pd_2:
-      - abstract_pd_server_1b
-      - disk.device.read.requests_pd_server_1b
-      disk.device.read.requests_server_1b_pd_1:
-      - abstract_pd_server_1b_1
-      - disk.device.read.requests_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
-      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
       binding_pd_server_port_1_nested1_pattern_4:
       - nested1_pattern_4
       - binding_pd_server_port_1
-      disk.write.bytes_server_pd_nested1_pattern_4:
-      - nested1_pattern_4
-      - disk.write.bytes_server_pd
       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
-      feature_pd_server_port_2_nested1_pattern_4:
-      - nested1_pattern_4
-      - feature_pd_server_port_2
       feature_ps_server_1b_port_1:
       - abstract_pd_server_1b
       - feature_pd_server_1b_ps_server_1b_port
@@ -1666,4 +1690,4 @@ 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
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 9c1f678489..878cd77858 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
@@ -303,6 +303,11 @@ 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.
@@ -582,6 +587,11 @@ node_types:
         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.
@@ -1265,6 +1275,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_ps_server_1b_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.write.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.
@@ -1751,6 +1766,16 @@ 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.
@@ -2133,6 +2158,16 @@ 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:
@@ -2648,6 +2683,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pd_server_1b_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.write.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.
@@ -3184,6 +3224,11 @@ 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.
@@ -3791,6 +3836,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_1c1_cmaui_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.write.bytes_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.
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 684d246bf2..26286c35f5 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
@@ -259,6 +259,9 @@ topology_template:
       disk.device.write.requests.rate_cmaui_1c1:
       - cmaui_1c1
       - disk.device.write.requests.rate
+      forwarder_cmaui_1c1_cmaui_port:
+      - cmaui_1c1_cmaui_port
+      - forwarder
       disk.device.write.bytes_cmaui_1c1:
       - cmaui_1c1
       - disk.device.write.bytes
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 eb89f0b0bf..039859ab0b 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
@@ -223,6 +223,9 @@ 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
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_pd_server_1bServiceTemplate.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_pd_server_1bServiceTemplate.yaml
index 1dbe52f405..fbb8c1912d 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_pd_server_1bServiceTemplate.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_pd_server_1bServiceTemplate.yaml
@@ -151,6 +151,9 @@ topology_template:
       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
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_ps_server_1bServiceTemplate.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_ps_server_1bServiceTemplate.yaml
index c97cb23644..9f026f4b2e 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_ps_server_1bServiceTemplate.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_ps_server_1bServiceTemplate.yaml
@@ -166,6 +166,9 @@ topology_template:
       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
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 e214d825ed..dfff65e98a 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
@@ -450,6 +450,9 @@ topology_template:
       disk.device.write.requests.rate_server_1c2_oam_1:
       - abstract_oam_server_1c2_0
       - disk.device.write.requests.rate_oam_server_1c2
+      forwarder_ps_server_1b_port:
+      - abstract_ps_server_1b
+      - forwarder_ps_server_1b_ps_server_1b_port
       disk.device.write.requests.rate_server_1c2_oam_2:
       - abstract_oam_server_1c2_1
       - disk.device.write.requests.rate_oam_server_1c2
@@ -699,6 +702,12 @@ topology_template:
       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
@@ -891,6 +900,12 @@ 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
@@ -1152,6 +1167,9 @@ topology_template:
       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
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 697e58424d..b521dae6db 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
@@ -307,6 +307,11 @@ 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.
@@ -923,6 +928,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pd_server_port_1:
+        type: org.openecomp.capabilities.Forwarder
+        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.
@@ -941,6 +951,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pd_server_port_2:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       feature_server_pd:
         type: tosca.capabilities.Node
         occurrences:
@@ -1132,6 +1147,11 @@ node_types:
         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.
@@ -1628,6 +1648,16 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_01:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      forwarder_cmaui_port_02:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       link_packet_external_network_0:
         type: tosca.capabilities.network.Linkable
         occurrences:
@@ -2095,6 +2125,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_ps_server_1b_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.write.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.
@@ -2581,6 +2616,16 @@ 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.
@@ -2963,6 +3008,16 @@ 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:
@@ -3478,6 +3533,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pd_server_1b_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.write.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.
@@ -4014,6 +4074,11 @@ 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.
@@ -4621,6 +4686,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_1c1_cmaui_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.write.bytes_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.
@@ -4671,4 +4741,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 684d246bf2..26286c35f5 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
@@ -259,6 +259,9 @@ topology_template:
       disk.device.write.requests.rate_cmaui_1c1:
       - cmaui_1c1
       - disk.device.write.requests.rate
+      forwarder_cmaui_1c1_cmaui_port:
+      - cmaui_1c1_cmaui_port
+      - forwarder
       disk.device.write.bytes_cmaui_1c1:
       - cmaui_1c1
       - disk.device.write.bytes
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 e04ee542d9..bd75e5b23f 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
@@ -230,6 +230,9 @@ 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
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_pd_server_1bServiceTemplate.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_pd_server_1bServiceTemplate.yaml
index 1dbe52f405..fbb8c1912d 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_pd_server_1bServiceTemplate.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_pd_server_1bServiceTemplate.yaml
@@ -151,6 +151,9 @@ topology_template:
       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
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_ps_server_1bServiceTemplate.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_ps_server_1bServiceTemplate.yaml
index c97cb23644..9f026f4b2e 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_ps_server_1bServiceTemplate.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_ps_server_1bServiceTemplate.yaml
@@ -166,6 +166,9 @@ topology_template:
       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
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-no-computeServiceTemplate.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-no-computeServiceTemplate.yaml
index be3fbadb31..9a62b2021e 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-no-computeServiceTemplate.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-no-computeServiceTemplate.yaml
@@ -207,6 +207,12 @@ topology_template:
       network.outpoing.packets_cmaui_port_01:
       - cmaui_port_01
       - network.outpoing.packets
+      forwarder_cmaui_port_01:
+      - cmaui_port_01
+      - forwarder
+      forwarder_cmaui_port_02:
+      - cmaui_port_02
+      - forwarder
       link_packet_external_network_0:
       - packet_external_network_0
       - link
@@ -249,4 +255,4 @@ topology_template:
       - dependency
       binding_cmaui_port_02:
       - cmaui_port_02
-      - binding
\ No newline at end of file
+      - binding
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-pattern-4ServiceTemplate.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-pattern-4ServiceTemplate.yaml
index 828ab0dfbd..ec4283632d 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-pattern-4ServiceTemplate.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-pattern-4ServiceTemplate.yaml
@@ -377,6 +377,9 @@ topology_template:
       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
@@ -386,6 +389,9 @@ topology_template:
       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
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 a3bf3f973a..e26f1c9137 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
@@ -457,6 +457,9 @@ topology_template:
       disk.device.write.requests.rate_server_1c2_oam_1:
       - abstract_oam_server_1c2_0
       - disk.device.write.requests.rate_oam_server_1c2
+      forwarder_ps_server_1b_port:
+      - abstract_ps_server_1b
+      - forwarder_ps_server_1b_ps_server_1b_port
       disk.device.write.requests.rate_server_1c2_oam_2:
       - abstract_oam_server_1c2_1
       - disk.device.write.requests.rate_oam_server_1c2
@@ -706,6 +709,12 @@ topology_template:
       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
@@ -898,6 +907,12 @@ 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
@@ -1159,6 +1174,9 @@ topology_template:
       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
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 8fe327f845..d11c757e97 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
@@ -378,6 +378,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_cmaui_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.outgoing.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.
@@ -1017,6 +1022,16 @@ 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:
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 475aefd1e7..628e583cdc 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
@@ -262,6 +262,9 @@ topology_template:
       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
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 89427ca0d8..25ae9137c2 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
@@ -427,6 +427,12 @@ 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
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedNoCompute/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedNoCompute/out/GlobalSubstitutionTypesServiceTemplate.yaml
index e6241b2e11..7e0913eecb 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedNoCompute/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedNoCompute/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -248,6 +248,16 @@ 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
       attachment_packet_external_network:
         type: tosca.capabilities.Attachment
         occurrences:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedNoCompute/out/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedNoCompute/out/nested1ServiceTemplate.yaml
index d12565973c..a6a8cf05fc 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedNoCompute/out/nested1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedNoCompute/out/nested1ServiceTemplate.yaml
@@ -212,6 +212,12 @@ topology_template:
       network.outgoing.bytes.rate_cmaui_port_1:
       - cmaui_port_1
       - network.outgoing.bytes.rate
+      forwarder_cmaui_port_2:
+      - cmaui_port_2
+      - forwarder
+      forwarder_cmaui_port_1:
+      - cmaui_port_1
+      - forwarder
       attachment_packet_external_network:
       - packet_external_network
       - attachment
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 3113acf1d8..5c7b91680c 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
@@ -378,6 +378,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_cmaui_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.outgoing.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.
@@ -982,6 +987,16 @@ 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.
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 475aefd1e7..628e583cdc 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
@@ -262,6 +262,9 @@ topology_template:
       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
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 37bdfde64b..7c212aadc3 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
@@ -344,6 +344,12 @@ 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
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/GlobalSubstitutionTypesServiceTemplate.yaml
index d51e4f4f2f..55cb9b5ba4 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -402,6 +402,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pd_server_pd_server_port:
+        type: org.openecomp.capabilities.Forwarder
+        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.
@@ -921,12 +926,22 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pd_server_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.incoming.bytes_ps_server_port:
         type: org.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_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.capacity_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.
@@ -1312,6 +1327,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_ps_server_ps_server_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       feature_ps_server_ps_server_port:
         type: tosca.capabilities.Node
         occurrences:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/Nested_pd_serverServiceTemplate.yaml
index 449b05d443..599c465504 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/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/oneLevel/nestedSingleSubstitution1B/out/Nested_pd_serverServiceTemplate.yaml
@@ -274,6 +274,9 @@ topology_template:
       disk.write.requests_pd_server:
       - pd_server
       - disk.write.requests
+      forwarder_pd_server_pd_server_port:
+      - pd_server_pd_server_port
+      - forwarder
       disk.device.latency_pd_server:
       - pd_server
       - disk.device.latency
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/Nested_ps_serverServiceTemplate.yaml
index a405b38673..f69a2c1f2b 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/Nested_ps_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/Nested_ps_serverServiceTemplate.yaml
@@ -145,6 +145,9 @@ topology_template:
       disk.write.bytes.rate_ps_server:
       - ps_server
       - disk.write.bytes.rate
+      forwarder_ps_server_ps_server_port:
+      - ps_server_ps_server_port
+      - forwarder
       feature_ps_server_ps_server_port:
       - ps_server_ps_server_port
       - feature
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/nested1ServiceTemplate.yaml
index 81884ac853..83240c60ca 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/nested1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/nested1ServiceTemplate.yaml
@@ -358,9 +358,15 @@ topology_template:
       cpu_util_server_ps:
       - abstract_ps_server
       - cpu_util_ps_server
+      forwarder_pd_server_port:
+      - abstract_pd_server
+      - forwarder_pd_server_pd_server_port
       network.incoming.bytes_ps_server_port:
       - abstract_ps_server
       - network.incoming.bytes_ps_server_ps_server_port
+      forwarder_ps_server_port:
+      - abstract_ps_server
+      - forwarder_ps_server_ps_server_port
       disk.device.capacity_server_pd:
       - abstract_pd_server
       - disk.device.capacity_pd_server
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/GlobalSubstitutionTypesServiceTemplate.yaml
index b5dc2d96c3..b976cba502 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -402,6 +402,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pd_server_pd_server_port:
+        type: org.openecomp.capabilities.Forwarder
+        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.
@@ -665,6 +670,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_oam_server_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       cpu_util_server_sm:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -683,6 +693,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_sm_server_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.incoming.bytes_oam_server_port:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1672,12 +1687,22 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pd_server_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.incoming.bytes_ps_server_port:
         type: org.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_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.capacity_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.
@@ -2275,6 +2300,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_oam_server_oam_server_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.outgoing.bytes.rate_oam_server_oam_server_port:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -2466,6 +2496,11 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
+      forwarder_sm_server_sm_server_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.iops_sm_server:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -2905,6 +2940,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_ps_server_ps_server_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       feature_ps_server_ps_server_port:
         type: tosca.capabilities.Node
         occurrences:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_oam_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_oam_serverServiceTemplate.yaml
index cf1cf7aa80..81e7332182 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_oam_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_oam_serverServiceTemplate.yaml
@@ -253,6 +253,9 @@ topology_template:
       endpoint_oam_server:
       - oam_server
       - endpoint
+      forwarder_oam_server_oam_server_port:
+      - oam_server_oam_server_port
+      - forwarder
       network.outgoing.bytes.rate_oam_server_oam_server_port:
       - oam_server_oam_server_port
       - network.outgoing.bytes.rate
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_pd_serverServiceTemplate.yaml
index 449b05d443..599c465504 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_pd_serverServiceTemplate.yaml
@@ -274,6 +274,9 @@ topology_template:
       disk.write.requests_pd_server:
       - pd_server
       - disk.write.requests
+      forwarder_pd_server_pd_server_port:
+      - pd_server_pd_server_port
+      - forwarder
       disk.device.latency_pd_server:
       - pd_server
       - disk.device.latency
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_ps_serverServiceTemplate.yaml
index a405b38673..f69a2c1f2b 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_ps_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_ps_serverServiceTemplate.yaml
@@ -145,6 +145,9 @@ topology_template:
       disk.write.bytes.rate_ps_server:
       - ps_server
       - disk.write.bytes.rate
+      forwarder_ps_server_ps_server_port:
+      - ps_server_ps_server_port
+      - forwarder
       feature_ps_server_ps_server_port:
       - ps_server_ps_server_port
       - feature
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_sm_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_sm_serverServiceTemplate.yaml
index 6d6a501c4b..bdb3a94e06 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_sm_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_sm_serverServiceTemplate.yaml
@@ -136,6 +136,9 @@ topology_template:
       binding_sm_server_sm_server_port:
       - sm_server_sm_server_port
       - binding
+      forwarder_sm_server_sm_server_port:
+      - sm_server_sm_server_port
+      - forwarder
       disk.iops_sm_server:
       - sm_server
       - disk.iops
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/nested-other-file-1BServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/nested-other-file-1BServiceTemplate.yaml
index a17a475867..3044ae9f59 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/nested-other-file-1BServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/nested-other-file-1BServiceTemplate.yaml
@@ -362,9 +362,15 @@ topology_template:
       cpu_util_server_ps:
       - abstract_ps_server
       - cpu_util_ps_server
+      forwarder_pd_server_port:
+      - abstract_pd_server
+      - forwarder_pd_server_pd_server_port
       network.incoming.bytes_ps_server_port:
       - abstract_ps_server
       - network.incoming.bytes_ps_server_ps_server_port
+      forwarder_ps_server_port:
+      - abstract_ps_server
+      - forwarder_ps_server_ps_server_port
       disk.device.capacity_server_pd:
       - abstract_pd_server
       - disk.device.capacity_pd_server
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/nested-same-file-1BServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/nested-same-file-1BServiceTemplate.yaml
index 72ba7106b1..0429c660e7 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/nested-same-file-1BServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/nested-same-file-1BServiceTemplate.yaml
@@ -230,6 +230,9 @@ topology_template:
       disk.read.requests_server_oam:
       - abstract_oam_server
       - disk.read.requests_oam_server
+      forwarder_oam_server_port:
+      - abstract_oam_server
+      - forwarder_oam_server_oam_server_port
       cpu_util_server_sm:
       - abstract_sm_server
       - cpu_util_sm_server
@@ -239,6 +242,9 @@ topology_template:
       disk.device.read.bytes_server_oam:
       - abstract_oam_server
       - disk.device.read.bytes_oam_server
+      forwarder_sm_server_port:
+      - abstract_sm_server
+      - forwarder_sm_server_sm_server_port
       network.incoming.bytes_oam_server_port:
       - abstract_oam_server
       - network.incoming.bytes_oam_server_oam_server_port
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 9c2d3e605d..effa6970cd 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -408,6 +408,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pd_server_pd_server_port:
+        type: org.openecomp.capabilities.Forwarder
+        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.
@@ -671,6 +676,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_oam_server_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       cpu_util_server_sm:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -689,6 +699,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_sm_server_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.incoming.bytes_oam_server_port:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1678,12 +1693,22 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pd_server_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.incoming.bytes_ps_server_port:
         type: org.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_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.capacity_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.
@@ -2287,6 +2312,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_oam_server_oam_server_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.outgoing.bytes.rate_oam_server_oam_server_port:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -2484,6 +2514,11 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
+      forwarder_sm_server_sm_server_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.iops_sm_server:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -2929,6 +2964,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_ps_server_ps_server_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       feature_ps_server_ps_server_port:
         type: tosca.capabilities.Node
         occurrences:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_oam_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_oam_serverServiceTemplate.yaml
index d90e25d8e8..9080572950 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_oam_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_oam_serverServiceTemplate.yaml
@@ -262,6 +262,9 @@ topology_template:
       endpoint_oam_server:
       - oam_server
       - endpoint
+      forwarder_oam_server_oam_server_port:
+      - oam_server_oam_server_port
+      - forwarder
       network.outgoing.bytes.rate_oam_server_oam_server_port:
       - oam_server_oam_server_port
       - network.outgoing.bytes.rate
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_pd_serverServiceTemplate.yaml
index 992d43315e..c07fb4f39c 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_pd_serverServiceTemplate.yaml
@@ -283,6 +283,9 @@ topology_template:
       disk.write.requests_pd_server:
       - pd_server
       - disk.write.requests
+      forwarder_pd_server_pd_server_port:
+      - pd_server_pd_server_port
+      - forwarder
       disk.device.latency_pd_server:
       - pd_server
       - disk.device.latency
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_ps_serverServiceTemplate.yaml
index 47aed72dbf..03780b84ee 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_ps_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_ps_serverServiceTemplate.yaml
@@ -154,6 +154,9 @@ topology_template:
       disk.write.bytes.rate_ps_server:
       - ps_server
       - disk.write.bytes.rate
+      forwarder_ps_server_ps_server_port:
+      - ps_server_ps_server_port
+      - forwarder
       feature_ps_server_ps_server_port:
       - ps_server_ps_server_port
       - feature
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_sm_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_sm_serverServiceTemplate.yaml
index bffd6472b8..4a43a24d9a 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_sm_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_sm_serverServiceTemplate.yaml
@@ -145,6 +145,9 @@ topology_template:
       binding_sm_server_sm_server_port:
       - sm_server_sm_server_port
       - binding
+      forwarder_sm_server_sm_server_port:
+      - sm_server_sm_server_port
+      - forwarder
       disk.iops_sm_server:
       - sm_server
       - disk.iops
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/nested-other-file-1BServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/nested-other-file-1BServiceTemplate.yaml
index a01666fe5b..f730407335 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/nested-other-file-1BServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/nested-other-file-1BServiceTemplate.yaml
@@ -367,9 +367,15 @@ topology_template:
       cpu_util_server_ps:
       - abstract_ps_server
       - cpu_util_ps_server
+      forwarder_pd_server_port:
+      - abstract_pd_server
+      - forwarder_pd_server_pd_server_port
       network.incoming.bytes_ps_server_port:
       - abstract_ps_server
       - network.incoming.bytes_ps_server_ps_server_port
+      forwarder_ps_server_port:
+      - abstract_ps_server
+      - forwarder_ps_server_ps_server_port
       disk.device.capacity_server_pd:
       - abstract_pd_server
       - disk.device.capacity_pd_server
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/nested-same-file-1BServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/nested-same-file-1BServiceTemplate.yaml
index dbac5b33ff..574225ef0a 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/nested-same-file-1BServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/nested-same-file-1BServiceTemplate.yaml
@@ -235,6 +235,9 @@ topology_template:
       disk.read.requests_server_oam:
       - abstract_oam_server
       - disk.read.requests_oam_server
+      forwarder_oam_server_port:
+      - abstract_oam_server
+      - forwarder_oam_server_oam_server_port
       cpu_util_server_sm:
       - abstract_sm_server
       - cpu_util_sm_server
@@ -244,6 +247,9 @@ topology_template:
       disk.device.read.bytes_server_oam:
       - abstract_oam_server
       - disk.device.read.bytes_oam_server
+      forwarder_sm_server_port:
+      - abstract_sm_server
+      - forwarder_sm_server_sm_server_port
       network.incoming.bytes_oam_server_port:
       - abstract_oam_server
       - network.incoming.bytes_oam_server_oam_server_port
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 9ff008ea80..f5b23edb40 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -427,6 +427,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pcm_port_12:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.allocation_server_pcm:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -511,6 +516,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pcm_port_02:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.capacity_server_pcm:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -976,6 +986,16 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pcm_port_0:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      forwarder_pcm_port_1:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.read.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.
@@ -1417,4 +1437,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/diffNestedFilesWithSameComputeType/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/diffNestedFilesWithSameComputeType/out/nested-pcm_v0.1ServiceTemplate.yaml
index e0431278ab..284d7d06f1 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/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/diffNestedFilesWithSameComputeType/out/nested-pcm_v0.1ServiceTemplate.yaml
@@ -352,6 +352,12 @@ topology_template:
       disk.device.capacity_server_pcm_1:
       - server_pcm_1
       - disk.device.capacity
+      forwarder_pcm_port_0:
+      - pcm_port_0
+      - forwarder
+      forwarder_pcm_port_1:
+      - pcm_port_1
+      - forwarder
       disk.read.requests_server_pcm_1:
       - server_pcm_1
       - disk.read.requests
@@ -445,4 +451,4 @@ topology_template:
       - dependency
       local_storage_server_pcm_1:
       - server_pcm_1
-      - 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/diffNestedFilesWithSameComputeType/out/nested-pcm_v0.2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/nested-pcm_v0.2ServiceTemplate.yaml
index f6d3eae817..c1975a9d23 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/nested-pcm_v0.2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/nested-pcm_v0.2ServiceTemplate.yaml
@@ -358,6 +358,9 @@ topology_template:
       disk.read.bytes.rate_server_pcm:
       - server_pcm
       - disk.read.bytes.rate
+      forwarder_pcm_port_12:
+      - pcm_port_12
+      - forwarder
       disk.device.allocation_server_pcm:
       - server_pcm
       - disk.device.allocation
@@ -400,6 +403,9 @@ topology_template:
       binding_server_pcm:
       - server_pcm
       - binding
+      forwarder_pcm_port_02:
+      - pcm_port_02
+      - forwarder
       disk.device.capacity_server_pcm:
       - server_pcm
       - disk.device.capacity
@@ -445,4 +451,4 @@ topology_template:
       - dependency
       link_pcm_port_02:
       - pcm_port_02
-      - 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/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 08a713b83a..07a842e260 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
@@ -245,6 +245,11 @@ node_types:
         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.
@@ -466,6 +471,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cdi_cdi_internal_0_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       scalable_cdi:
         type: tosca.capabilities.Scalable
         occurrences:
@@ -1093,6 +1103,11 @@ 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.
@@ -1122,6 +1137,11 @@ node_types:
         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.
@@ -1158,6 +1178,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_lbd_lbd_ims_core_1_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.incoming.packets.rate_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.
@@ -1616,6 +1641,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_oam_oam_internal_1_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - 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.
@@ -1934,6 +1964,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_oam_oam_oam_1_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - 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.
@@ -2333,6 +2368,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_oam_oam_internal_2_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.outpoing.packets_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.
@@ -2369,6 +2409,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_oam_oam_oam_2_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.outgoing.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.
@@ -2869,6 +2914,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_tdcore_dpdk_0_port_1:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       vcpus_tdcore_server_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -3012,6 +3062,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_tdcore_internal_0_port_0:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.capacity_tdcore_server_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -3460,6 +3515,11 @@ node_types:
         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:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -3662,6 +3722,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cdi_cdi_internal_1_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       scalable_cdi:
         type: tosca.capabilities.Scalable
         occurrences:
@@ -4374,6 +4439,11 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
+      forwarder_lbd_lbd_ims_core_0_port:
+        type: org.openecomp.capabilities.Forwarder
+        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.
@@ -4473,12 +4543,22 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_lbd_lbd_internal_0_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.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
+      forwarder_lbd_lbd_dpdk_0_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       feature_lbd:
         type: tosca.capabilities.Node
         occurrences:
@@ -5000,35 +5080,18 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      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
       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
-      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.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
-      feature_cif_cif_ims_li_1_port:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
       os_cif:
         type: tosca.capabilities.OperatingSystem
         occurrences:
@@ -5062,12 +5125,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      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
       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.
@@ -5080,48 +5137,18 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_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.outgoing.bytes_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.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.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
-      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:
-        - 1
-        - UNBOUNDED
-      network.outgoing.bytes.rate_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.
-        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.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.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
       feature_cif_cif_oam_1_port_3:
         type: tosca.capabilities.Node
         occurrences:
@@ -5133,12 +5160,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      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:
-        - 1
-        - UNBOUNDED
       feature_cif_cif_oam_1_port_1:
         type: tosca.capabilities.Node
         occurrences:
@@ -5150,30 +5171,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_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.
-        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
-        occurrences:
-        - 0
-        - UNBOUNDED
       network.outgoing.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
-      attachment_cif_cif_ims_core_1_port:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
       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.
@@ -5192,36 +5195,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_cif_cif_oam_1_port_3:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
       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.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
-      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:
-        - tosca.nodes.SoftwareComponent
-        occurrences:
-        - 1
-        - UNBOUNDED
       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.
@@ -5234,12 +5213,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      cpu.delta_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_cif:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -5258,36 +5231,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      scalable_cif:
-        type: tosca.capabilities.Scalable
-        occurrences:
-        - 1
-        - UNBOUNDED
       disk.device.read.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
-      binding_cif_cif_oam_1_port_3:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
-      feature_cif_cif_internal_1_port:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      binding_cif_cif_oam_1_port_1:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
       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.
@@ -5306,12 +5255,6 @@ node_types:
         occurrences:
         - 1
         - 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
       network.outgoing.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.
@@ -5341,18 +5284,6 @@ node_types:
         occurrences:
         - 1
         - 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.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.outpoing.packets_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.
@@ -5382,180 +5313,354 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests_cif:
+      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
-      binding_cif_cif_ims_li_1_port:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+      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:
-        - 0
+        - 1
         - UNBOUNDED
-      memory_cif:
+      network.outpoing.packets_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.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.requests_cif:
+      network.outgoing.bytes.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.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cif_cif_ims_core_1_port:
+      network.outpoing.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.outgoing.bytes.rate_cif_cif_oam_1_port_1:
+      disk.device.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
-      disk.write.bytes_cif:
+      network.outpoing.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
-      network.outpoing.packets_cif_cif_ims_li_1_port:
+      network.incoming.packets.rate_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.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.capacity_cif:
+      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:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_cif_cif_oam_1_port_3:
+      network.incoming.bytes_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.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_cif_cif_ims_li_1_port:
+      network.outgoing.bytes_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.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_cif_cif_oam_1_port_3:
+      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
-      disk.device.capacity_cif:
+      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.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_cif_cif_oam_1_port_1:
+      network.incoming.packets_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
-      network.incoming.packets.rate_cif_cif_internal_1_port:
+      network.outpoing.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.
         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
+      feature_cif:
+        type: tosca.capabilities.Node
         occurrences:
-        - 0
+        - 1
         - UNBOUNDED
-      network.incoming.packets_cif_cif_oam_1_port_1:
+      network.incoming.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.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_cif:
+      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
-      network.incoming.bytes_cif_cif_internal_1_port:
+      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
-      network.outgoing.bytes_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.
+      feature_cif_cif_ims_li_1_port:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes_cif:
+      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
-      disk.device.latency_cif:
+      network.outgoing.bytes_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.outgoing.bytes.rate_cif_cif_ims_core_1_port:
+      network.outgoing.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.packets_cif_cif_ims_core_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:
         - 1
         - UNBOUNDED
-      disk.device.write.requests.rate_cif:
+      network.outgoing.bytes.rate_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.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_cif_cif_internal_1_port:
+      disk.device.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
-      feature_cif:
-        type: tosca.capabilities.Node
+      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:
         - 1
         - UNBOUNDED
-      attachment_cif_cif_internal_1_port:
+      network.incoming.bytes.rate_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.
+        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
+        occurrences:
+        - 0
+        - UNBOUNDED
+      attachment_cif_cif_ims_core_1_port:
         type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_cif_cif_ims_core_1_port:
+      attachment_cif_cif_oam_1_port_3:
+        type: tosca.capabilities.Attachment
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.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
+      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:
+        - tosca.nodes.SoftwareComponent
+        occurrences:
+        - 1
+        - UNBOUNDED
+      forwarder_cif_cif_oam_1_port_3:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      forwarder_cif_cif_oam_1_port_1:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      cpu.delta_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
+      scalable_cif:
+        type: tosca.capabilities.Scalable
+        occurrences:
+        - 1
+        - UNBOUNDED
+      binding_cif_cif_oam_1_port_3:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
+      feature_cif_cif_internal_1_port:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      binding_cif_cif_oam_1_port_1:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.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:
+        type: org.openecomp.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:
+        type: org.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
+        occurrences:
+        - 1
+        - UNBOUNDED
+      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
+      binding_cif_cif_ims_li_1_port:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
+      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
+      network.outgoing.packets.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.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      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
+      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
+      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
+      binding_cif_cif_internal_1_port:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
+      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
+      forwarder_cif_cif_ims_core_1_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      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
+      forwarder_cif_cif_ims_li_1_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      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:
         - 1
         - UNBOUNDED
+      attachment_cif_cif_internal_1_port:
+        type: tosca.capabilities.Attachment
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.incoming.packets_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.
@@ -5943,6 +6048,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cscf_internal_0_port_0:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       cpu.delta_cscf_server_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -6364,6 +6474,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_oam_oam_oam_0_port:
+        type: org.openecomp.capabilities.Forwarder
+        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.
@@ -6622,6 +6737,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_oam_oam_internal_0_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.incoming.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.
@@ -6988,6 +7108,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_tdcore_dpdk_0_port_1:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       vcpus_tdcore_server_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -7131,6 +7256,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_tdcore_internal_0_port_0:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.capacity_tdcore_server_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -7774,518 +7904,561 @@ node_types:
         - 1
         - 1
     capabilities:
-      network.incoming.bytes.rate_cif_cif_internal_0_port:
+      binding_cif:
+        type: tosca.capabilities.network.Bindable
+        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
-      binding_cif_cif_oam_0_port_3:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+      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.
         occurrences:
-        - 0
+        - 1
         - UNBOUNDED
-      binding_cif:
-        type: tosca.capabilities.network.Bindable
+      os_cif:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_util_cif:
+      memory.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.device.read.requests_cif:
+      attachment_cif_cif_internal_0_port:
+        type: tosca.capabilities.Attachment
+        occurrences:
+        - 1
+        - UNBOUNDED
+      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:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes_cif:
+      network.incoming.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
-      network.outgoing.bytes_cif_cif_internal_0_port:
+      network.incoming.bytes.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
-      disk.latency_cif:
+      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.
         occurrences:
         - 1
         - UNBOUNDED
-      os_cif:
-        type: tosca.capabilities.OperatingSystem
+      network.outgoing.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
-      memory.usage_cif:
+      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
-      attachment_cif_cif_internal_0_port:
-        type: tosca.capabilities.Attachment
+      forwarder_cif_cif_ims_core_0_port:
+        type: org.openecomp.capabilities.Forwarder
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_cif_cif_oam_0_port_3:
+      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.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_cif_cif_ims_core_0_port:
+      network.outgoing.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:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_cif_cif_oam_0_port_1:
+      network.outpoing.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_internal_0_port:
-        type: tosca.capabilities.Node
+      network.outpoing.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
-      network.outgoing.packets.rate_cif_cif_internal_0_port:
+      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.packets_cif_cif_oam_0_port_1:
+      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
-      network.incoming.packets_cif_cif_oam_0_port_3:
+      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
-      network.outgoing.bytes.rate_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
-      instance_cif:
+      network.incoming.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.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_cif_cif_ims_li_0_port:
-        type: tosca.capabilities.Node
+      network.incoming.packets_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
-      network.outgoing.bytes_cif_cif_oam_0_port_3:
+      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
-      network.incoming.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:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_cif_cif_oam_0_port_1:
+      network.outgoing.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.
         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
-        occurrences:
-        - 0
-        - UNBOUNDED
-      network.outgoing.bytes.rate_cif_cif_oam_0_port_3:
+      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
-      disk.allocation_cif:
+      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.outpoing.packets_cif_cif_oam_0_port_3:
+      disk.device.read.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.outpoing.packets_cif_cif_oam_0_port_1:
+      network.incoming.bytes_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
-      disk.device.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.
+      attachment_cif_cif_ims_li_0_port:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_cif_cif_ims_li_0_port:
+      network.outgoing.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:
+      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
-      disk.root.size_cif:
+      binding_cif_cif_internal_0_port:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        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.write.requests_cif:
+      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
-      memory.resident_cif:
+      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
-      network.outpoing.packets_cif_cif_internal_0_port:
+      network.incoming.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.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.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.
+      endpoint_cif:
+        type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_cif_cif_ims_core_0_port:
+      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
-      network.outgoing.packets.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.
+      forwarder_cif_cif_ims_li_0_port:
+        type: org.openecomp.capabilities.Forwarder
         occurrences:
         - 1
         - UNBOUNDED
-      disk.usage_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
-      disk.write.bytes.rate_cif:
+      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
-      host_cif:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
+      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
-      disk.ephemeral.size_cif:
+      network.outpoing.packets_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
-      network.outgoing.bytes_cif_cif_ims_li_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.write.requests.rate_cif:
+      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:
         - 1
         - UNBOUNDED
-      cpu.delta_cif:
+      network.outgoing.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
-      disk.read.bytes_cif:
+      disk.device.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
-      scalable_cif:
-        type: tosca.capabilities.Scalable
+      feature_cif_cif_oam_0_port_3:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests.rate_cif:
+      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
-      network.incoming.bytes_cif_cif_internal_0_port:
+      feature_cif_cif_oam_0_port_1:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.incoming.packets.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:
         - 1
         - UNBOUNDED
-      attachment_cif_cif_ims_li_0_port:
-        type: tosca.capabilities.Attachment
+      network.incoming.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.outgoing.packets.rate_cif_cif_ims_li_0_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:
         - 1
         - UNBOUNDED
-      disk.device.allocation_cif:
+      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
-      binding_cif_cif_internal_0_port:
+      forwarder_cif_cif_internal_0_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      forwarder_cif_cif_oam_0_port_1:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      forwarder_cif_cif_oam_0_port_3:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      feature_cif:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      binding_cif_cif_oam_0_port_1:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
         - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
         occurrences:
         - 0
         - UNBOUNDED
-      network.outgoing.packets.rate_cif_cif_ims_core_0_port:
+      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_ims_li_0_port:
+      binding_cif_cif_oam_0_port_3:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
         - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
         occurrences:
         - 0
         - UNBOUNDED
-      disk.device.read.bytes.rate_cif:
+      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
-      vcpus_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
-      network.incoming.packets.rate_cif_cif_internal_0_port:
+      network.outgoing.bytes_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
-      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.
+      feature_cif_cif_internal_0_port:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      endpoint_cif:
-        type: tosca.capabilities.Endpoint.Admin
+      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
-      disk.device.usage_cif:
+      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
-      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.
+      feature_cif_cif_ims_li_0_port:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes.rate_cif:
+      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.packets.rate_cif_cif_oam_0_port_1:
+      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.incoming.bytes_cif_cif_oam_0_port_1:
+      binding_cif_cif_ims_core_0_port:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - 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.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_cif_cif_ims_core_0_port:
+      disk.device.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_cif_cif_oam_0_port_3:
+      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:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_cif_cif_ims_core_0_port:
+      network.outpoing.packets_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
-      disk.write.requests_cif:
+      network.outgoing.packets.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:
         - 1
         - UNBOUNDED
-      memory_cif:
+      disk.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
-      attachment_cif_cif_ims_core_0_port:
-        type: tosca.capabilities.Attachment
+      host_cif:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_cif_cif_ims_core_0_port:
+      cpu.delta_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.
+      scalable_cif:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
-      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.
+      binding_cif_cif_ims_li_0_port:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
         occurrences:
-        - 1
+        - 0
         - UNBOUNDED
-      disk.capacity_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
-      network.outgoing.bytes_cif_cif_ims_core_0_port:
+      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.outgoing.bytes.rate_cif_cif_oam_0_port_1:
+      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
-      network.outpoing.packets_cif_cif_ims_li_0_port:
+      network.incoming.bytes.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.capacity_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
-      feature_cif_cif_ims_core_0_port:
-        type: tosca.capabilities.Node
+      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
-      feature_cif_cif_oam_0_port_3:
-        type: tosca.capabilities.Node
+      attachment_cif_cif_ims_core_0_port:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_cif_cif_ims_core_0_port:
+      network.outgoing.bytes.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
-      feature_cif_cif_oam_0_port_1:
-        type: tosca.capabilities.Node
+      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
-      network.incoming.packets.rate_cif_cif_oam_0_port_3:
+      network.outgoing.bytes.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_oam_0_port_1:
+      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.
         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.
+      feature_cif_cif_ims_core_0_port:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
@@ -8299,12 +8472,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      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
       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.
@@ -8329,18 +8496,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      feature_cif:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      binding_cif_cif_oam_0_port_1:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
   org.openecomp.resource.abstract.nodes.heat.cscf:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
@@ -8707,6 +8862,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cscf_internal_0_port_0:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       cpu.delta_cscf_server_0:
         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/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 1f222c16d4..fc9676cc7a 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
@@ -281,6 +281,9 @@ topology_template:
       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
@@ -392,6 +395,9 @@ topology_template:
       disk.allocation_cdi:
       - cdi
       - disk.allocation
+      forwarder_cdi_cdi_internal_0_port:
+      - cdi_cdi_internal_0_port
+      - forwarder
       scalable_cdi:
       - cdi
       - scalable
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 2e6c581f05..b543f90372 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
@@ -296,6 +296,9 @@ topology_template:
       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
@@ -398,6 +401,9 @@ topology_template:
       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
       scalable_cdi:
       - cdi
       - scalable
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 23bb1c8257..3c3da4e997 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
@@ -554,27 +554,12 @@ topology_template:
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.cif
     capabilities:
-      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
       binding_cif:
       - cif
       - binding
-      cpu_util_cif:
-      - cif
-      - cpu_util
       disk.device.read.requests_cif:
       - cif
       - disk.device.read.requests
-      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
       disk.latency_cif:
       - cif
       - disk.latency
@@ -596,54 +581,30 @@ topology_template:
       network.incoming.bytes.rate_cif_cif_oam_0_port_1:
       - cif_cif_oam_0_port_1
       - network.incoming.bytes.rate
-      feature_cif_cif_internal_0_port:
-      - cif_cif_internal_0_port
-      - feature
       network.outgoing.packets.rate_cif_cif_internal_0_port:
       - cif_cif_internal_0_port
       - network.outgoing.packets.rate
-      network.incoming.packets_cif_cif_oam_0_port_1:
-      - cif_cif_oam_0_port_1
-      - network.incoming.packets
-      network.incoming.packets_cif_cif_oam_0_port_3:
-      - cif_cif_oam_0_port_3
-      - network.incoming.packets
       network.outgoing.bytes.rate_cif_cif_ims_li_0_port:
       - cif_cif_ims_li_0_port
       - network.outgoing.bytes.rate
       instance_cif:
       - cif
       - instance
-      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
+      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_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.bytes.rate_cif_cif_oam_0_port_3:
       - cif_cif_oam_0_port_3
       - network.outgoing.bytes.rate
-      disk.allocation_cif:
-      - cif
-      - disk.allocation
       network.outpoing.packets_cif_cif_oam_0_port_3:
       - cif_cif_oam_0_port_3
       - network.outpoing.packets
       network.outpoing.packets_cif_cif_oam_0_port_1:
       - cif_cif_oam_0_port_1
       - network.outpoing.packets
-      disk.device.iops_cif:
-      - cif
-      - disk.device.iops
       network.incoming.packets.rate_cif_cif_ims_li_0_port:
       - cif_cif_ims_li_0_port
       - network.incoming.packets.rate
@@ -653,33 +614,18 @@ topology_template:
       disk.root.size_cif:
       - cif
       - disk.root.size
-      disk.device.write.requests_cif:
-      - cif
-      - disk.device.write.requests
       memory.resident_cif:
       - cif
       - memory.resident
-      network.outpoing.packets_cif_cif_internal_0_port:
-      - cif_cif_internal_0_port
-      - network.outpoing.packets
       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.packets.rate_cif_cif_oam_0_port_3:
-      - cif_cif_oam_0_port_3
-      - network.outgoing.packets.rate
       disk.usage_cif:
       - cif
       - disk.usage
-      disk.write.bytes.rate_cif:
-      - cif
-      - disk.write.bytes.rate
-      host_cif:
-      - cif
-      - host
       disk.ephemeral.size_cif:
       - cif
       - disk.ephemeral.size
@@ -689,15 +635,9 @@ topology_template:
       disk.write.requests.rate_cif:
       - cif
       - disk.write.requests.rate
-      cpu.delta_cif:
-      - cif
-      - cpu.delta
       disk.read.bytes_cif:
       - cif
       - disk.read.bytes
-      scalable_cif:
-      - cif
-      - scalable
       disk.device.read.requests.rate_cif:
       - cif
       - disk.device.read.requests.rate
@@ -719,9 +659,6 @@ topology_template:
       network.outgoing.packets.rate_cif_cif_ims_core_0_port:
       - cif_cif_ims_core_0_port
       - network.outgoing.packets.rate
-      binding_cif_cif_ims_li_0_port:
-      - cif_cif_ims_li_0_port
-      - binding
       disk.device.read.bytes.rate_cif:
       - cif
       - disk.device.read.bytes.rate
@@ -731,72 +668,39 @@ topology_template:
       network.incoming.packets.rate_cif_cif_internal_0_port:
       - cif_cif_internal_0_port
       - network.incoming.packets.rate
-      disk.device.write.bytes.rate_cif:
-      - cif
-      - disk.device.write.bytes.rate
       endpoint_cif:
       - cif
       - endpoint
       disk.device.usage_cif:
       - cif
       - disk.device.usage
-      disk.iops_cif:
-      - cif
-      - disk.iops
-      disk.read.bytes.rate_cif:
-      - cif
-      - disk.read.bytes.rate
+      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.incoming.bytes.rate_cif_cif_ims_core_0_port:
-      - cif_cif_ims_core_0_port
-      - network.incoming.bytes.rate
       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
-      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.read.requests_cif:
       - cif
       - disk.read.requests
       disk.write.bytes_cif:
       - cif
       - disk.write.bytes
-      disk.capacity_cif:
-      - cif
-      - disk.capacity
       network.outgoing.bytes_cif_cif_ims_core_0_port:
       - cif_cif_ims_core_0_port
       - network.outgoing.bytes
-      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
       disk.device.capacity_cif:
       - cif
       - disk.device.capacity
-      feature_cif_cif_ims_core_0_port:
-      - cif_cif_ims_core_0_port
-      - feature
       feature_cif_cif_oam_0_port_3:
       - cif_cif_oam_0_port_3
       - feature
@@ -815,15 +719,132 @@ topology_template:
       cpu_cif:
       - cif
       - cpu
+      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
+      forwarder_cif_cif_oam_0_port_3:
+      - cif_cif_oam_0_port_3
+      - forwarder
+      feature_cif:
+      - cif
+      - feature
+      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
+      cpu_util_cif:
+      - cif
+      - cpu_util
+      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.packets_cif_cif_oam_0_port_1:
+      - cif_cif_oam_0_port_1
+      - network.incoming.packets
+      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
+      disk.allocation_cif:
+      - cif
+      - disk.allocation
+      disk.device.iops_cif:
+      - cif
+      - disk.device.iops
+      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
+      disk.write.bytes.rate_cif:
+      - cif
+      - disk.write.bytes.rate
+      host_cif:
+      - cif
+      - host
+      cpu.delta_cif:
+      - cif
+      - cpu.delta
+      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
+      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
+      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
       attachment_cif_cif_oam_0_port_3:
       - cif_cif_oam_0_port_3
       - attachment
       attachment_cif_cif_oam_0_port_1:
       - cif_cif_oam_0_port_1
       - attachment
-      disk.device.read.bytes_cif:
-      - cif
-      - disk.device.read.bytes
       disk.device.latency_cif:
       - cif
       - disk.device.latency
@@ -836,12 +857,6 @@ topology_template:
       network.outgoing.bytes.rate_cif_cif_internal_0_port:
       - cif_cif_internal_0_port
       - network.outgoing.bytes.rate
-      feature_cif:
-      - cif
-      - feature
-      binding_cif_cif_oam_0_port_1:
-      - cif_cif_oam_0_port_1
-      - binding
     requirements:
       link_cif_cif_ims_core_0_port:
       - cif_cif_ims_core_0_port
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 2d5ae8c10f..f1e5cf1023 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
@@ -557,21 +557,12 @@ topology_template:
       binding_cif:
       - cif
       - binding
-      cpu_util_cif:
-      - cif
-      - cpu_util
       disk.device.read.requests_cif:
       - cif
       - disk.device.read.requests
-      disk.device.write.bytes_cif:
-      - cif
-      - disk.device.write.bytes
       disk.latency_cif:
       - cif
       - disk.latency
-      feature_cif_cif_ims_li_1_port:
-      - cif_cif_ims_li_1_port
-      - feature
       os_cif:
       - cif
       - os
@@ -590,63 +581,33 @@ topology_template:
       feature_cif_cif_ims_core_1_port:
       - cif_cif_ims_core_1_port
       - feature
-      network.incoming.packets_cif_cif_oam_1_port_3:
-      - cif_cif_oam_1_port_3
-      - network.incoming.packets
       instance_cif:
       - cif
       - instance
       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_oam_1_port_3:
-      - cif_cif_oam_1_port_3
-      - network.outgoing.bytes
       network.outgoing.bytes_cif_cif_ims_li_1_port:
       - cif_cif_ims_li_1_port
       - network.outgoing.bytes
-      network.outgoing.bytes_cif_cif_oam_1_port_1:
-      - cif_cif_oam_1_port_1
-      - network.outgoing.bytes
-      disk.allocation_cif:
-      - cif
-      - disk.allocation
-      network.outgoing.bytes.rate_cif_cif_internal_1_port:
-      - cif_cif_internal_1_port
-      - network.outgoing.bytes.rate
       network.incoming.packets.rate_cif_cif_oam_1_port_1:
       - cif_cif_oam_1_port_1
       - network.incoming.packets.rate
-      disk.device.iops_cif:
-      - cif
-      - disk.device.iops
       feature_cif_cif_oam_1_port_3:
       - cif_cif_oam_1_port_3
       - feature
       disk.root.size_cif:
       - cif
       - disk.root.size
-      disk.device.write.requests_cif:
-      - cif
-      - disk.device.write.requests
       feature_cif_cif_oam_1_port_1:
       - cif_cif_oam_1_port_1
       - feature
       memory.resident_cif:
       - cif
       - memory.resident
-      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
       network.outgoing.bytes_cif_cif_ims_core_1_port:
       - cif_cif_ims_core_1_port
       - network.outgoing.bytes
-      attachment_cif_cif_ims_core_1_port:
-      - cif_cif_ims_core_1_port
-      - attachment
       network.incoming.packets.rate_cif_cif_oam_1_port_3:
       - cif_cif_oam_1_port_3
       - network.incoming.packets.rate
@@ -656,30 +617,15 @@ topology_template:
       network.incoming.bytes_cif_cif_oam_1_port_1:
       - cif_cif_oam_1_port_1
       - network.incoming.bytes
-      attachment_cif_cif_oam_1_port_3:
-      - cif_cif_oam_1_port_3
-      - attachment
       disk.usage_cif:
       - cif
       - disk.usage
-      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
       disk.ephemeral.size_cif:
       - cif
       - disk.ephemeral.size
       disk.write.requests.rate_cif:
       - cif
       - disk.write.requests.rate
-      cpu.delta_cif:
-      - cif
-      - cpu.delta
       disk.read.bytes_cif:
       - cif
       - disk.read.bytes
@@ -689,21 +635,9 @@ topology_template:
       network.outgoing.packets.rate_cif_cif_internal_1_port:
       - cif_cif_internal_1_port
       - network.outgoing.packets.rate
-      scalable_cif:
-      - cif
-      - scalable
       disk.device.read.requests.rate_cif:
       - cif
       - disk.device.read.requests.rate
-      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
-      binding_cif_cif_oam_1_port_1:
-      - cif_cif_oam_1_port_1
-      - binding
       disk.device.allocation_cif:
       - cif
       - disk.device.allocation
@@ -713,9 +647,6 @@ topology_template:
       vcpus_cif:
       - cif
       - vcpus
-      disk.device.write.bytes.rate_cif:
-      - cif
-      - disk.device.write.bytes.rate
       network.outgoing.packets.rate_cif_cif_ims_li_1_port:
       - cif_cif_ims_li_1_port
       - network.outgoing.packets.rate
@@ -731,12 +662,6 @@ topology_template:
       disk.device.usage_cif:
       - cif
       - disk.device.usage
-      disk.iops_cif:
-      - cif
-      - disk.iops
-      disk.read.bytes.rate_cif:
-      - cif
-      - disk.read.bytes.rate
       network.outpoing.packets_cif_cif_ims_core_1_port:
       - cif_cif_ims_core_1_port
       - network.outpoing.packets
@@ -752,36 +677,15 @@ topology_template:
       network.outgoing.packets.rate_cif_cif_oam_1_port_1:
       - cif_cif_oam_1_port_1
       - network.outgoing.packets.rate
-      disk.write.requests_cif:
-      - cif
-      - disk.write.requests
-      binding_cif_cif_ims_li_1_port:
-      - cif_cif_ims_li_1_port
-      - binding
-      memory_cif:
-      - cif
-      - memory
       disk.read.requests_cif:
       - cif
       - disk.read.requests
-      network.outgoing.packets.rate_cif_cif_ims_core_1_port:
-      - cif_cif_ims_core_1_port
-      - network.outgoing.packets.rate
-      network.outgoing.bytes.rate_cif_cif_oam_1_port_1:
-      - cif_cif_oam_1_port_1
-      - network.outgoing.bytes.rate
       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
-      disk.capacity_cif:
-      - cif
-      - disk.capacity
-      network.outgoing.bytes.rate_cif_cif_oam_1_port_3:
-      - cif_cif_oam_1_port_3
-      - network.outgoing.bytes.rate
       network.outgoing.bytes.rate_cif_cif_ims_li_1_port:
       - cif_cif_ims_li_1_port
       - network.outgoing.bytes.rate
@@ -797,12 +701,6 @@ topology_template:
       network.incoming.packets.rate_cif_cif_internal_1_port:
       - cif_cif_internal_1_port
       - network.incoming.packets.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
       cpu_cif:
       - cif
       - cpu
@@ -815,30 +713,147 @@ topology_template:
       disk.device.read.bytes_cif:
       - cif
       - disk.device.read.bytes
-      disk.device.latency_cif:
-      - cif
-      - disk.device.latency
       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
-      disk.device.write.requests.rate_cif:
-      - cif
-      - disk.device.write.requests.rate
       network.outpoing.packets_cif_cif_internal_1_port:
       - cif_cif_internal_1_port
       - network.outpoing.packets
       feature_cif:
       - cif
       - feature
-      attachment_cif_cif_internal_1_port:
-      - cif_cif_internal_1_port
-      - attachment
       network.incoming.bytes.rate_cif_cif_ims_core_1_port:
       - cif_cif_ims_core_1_port
       - network.incoming.bytes.rate
+      cpu_util_cif:
+      - cif
+      - cpu_util
+      disk.device.write.bytes_cif:
+      - cif
+      - disk.device.write.bytes
+      feature_cif_cif_ims_li_1_port:
+      - cif_cif_ims_li_1_port
+      - feature
+      network.incoming.packets_cif_cif_oam_1_port_3:
+      - cif_cif_oam_1_port_3
+      - network.incoming.packets
+      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
+      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
+      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
+      forwarder_cif_cif_oam_1_port_3:
+      - cif_cif_oam_1_port_3
+      - forwarder
+      forwarder_cif_cif_oam_1_port_1:
+      - cif_cif_oam_1_port_1
+      - forwarder
+      cpu.delta_cif:
+      - cif
+      - cpu.delta
+      scalable_cif:
+      - cif
+      - scalable
+      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
+      binding_cif_cif_oam_1_port_1:
+      - cif_cif_oam_1_port_1
+      - binding
+      disk.device.write.bytes.rate_cif:
+      - cif
+      - disk.device.write.bytes.rate
+      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
+      disk.write.requests_cif:
+      - cif
+      - disk.write.requests
+      binding_cif_cif_ims_li_1_port:
+      - cif_cif_ims_li_1_port
+      - binding
+      memory_cif:
+      - cif
+      - memory
+      network.outgoing.packets.rate_cif_cif_ims_core_1_port:
+      - cif_cif_ims_core_1_port
+      - network.outgoing.packets.rate
+      network.outgoing.bytes.rate_cif_cif_oam_1_port_1:
+      - cif_cif_oam_1_port_1
+      - network.outgoing.bytes.rate
+      disk.capacity_cif:
+      - cif
+      - disk.capacity
+      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
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 240c27f5b5..a2c4af5daf 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
@@ -454,6 +454,9 @@ topology_template:
       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
@@ -469,6 +472,9 @@ topology_template:
       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
@@ -487,6 +493,9 @@ topology_template:
       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
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 6a66369963..64e5bdd8eb 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
@@ -502,6 +502,9 @@ topology_template:
       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
+      - forwarder
       network.outgoing.bytes_lbd_lbd_internal_0_port:
       - lbd_lbd_internal_0_port
       - network.outgoing.bytes
@@ -553,9 +556,15 @@ topology_template:
       disk.device.write.bytes_lbd:
       - lbd
       - disk.device.write.bytes
+      forwarder_lbd_lbd_internal_0_port:
+      - lbd_lbd_internal_0_port
+      - forwarder
       disk.capacity_lbd:
       - lbd
       - disk.capacity
+      forwarder_lbd_lbd_dpdk_0_port:
+      - lbd_lbd_dpdk_0_port
+      - forwarder
       feature_lbd:
       - lbd
       - feature
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 4919d3bcb4..ec7944d0f8 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
@@ -302,6 +302,9 @@ topology_template:
       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
@@ -434,6 +437,9 @@ topology_template:
       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
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 71b1bb62c8..f9da32d654 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
@@ -296,6 +296,9 @@ 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
@@ -458,6 +461,9 @@ topology_template:
       disk.write.bytes_oam:
       - oam
       - disk.write.bytes
+      forwarder_oam_oam_oam_1_port:
+      - oam_oam_oam_1_port
+      - forwarder
       disk.read.requests_oam:
       - oam
       - disk.read.requests
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 f3ee061109..21a53aedc7 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
@@ -356,6 +356,9 @@ topology_template:
       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
@@ -374,6 +377,9 @@ topology_template:
       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
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 f6b8a5d5b3..658b0d62a4 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
@@ -354,6 +354,9 @@ topology_template:
       disk.write.bytes_cscf_server_0:
       - cscf_server_0
       - disk.write.bytes
+      forwarder_cscf_internal_0_port_0:
+      - cscf_internal_0_port_0
+      - forwarder
       cpu.delta_cscf_server_0:
       - cscf_server_0
       - cpu.delta
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 aa2336cd01..65e2fb86e9 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
@@ -380,6 +380,9 @@ topology_template:
       network.incoming.packets_tdcore_dpdk_0_port_1:
       - tdcore_dpdk_0_port_1
       - network.incoming.packets
+      forwarder_tdcore_dpdk_0_port_1:
+      - tdcore_dpdk_0_port_1
+      - forwarder
       vcpus_tdcore_server_0:
       - tdcore_server_0
       - vcpus
@@ -452,6 +455,9 @@ topology_template:
       disk.write.bytes.rate_tdcore_server_0:
       - tdcore_server_0
       - disk.write.bytes.rate
+      forwarder_tdcore_internal_0_port_0:
+      - tdcore_internal_0_port_0
+      - forwarder
       disk.device.capacity_tdcore_server_0:
       - tdcore_server_0
       - disk.device.capacity
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml
index d8c52bc864..bb22e72ef7 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -423,6 +423,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_vson_server_oam_net_port_10:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.write.bytes_vson_server_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -868,6 +873,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_vson_server_oam_net_port_0:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.iops_vson_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 +1238,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_vson_server_oam_net_port_00:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.outgoing.bytes.rate_vson_server_oam_net_port_00:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1728,6 +1743,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_vson_server_oam_net_port_00:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.outgoing.bytes.rate_vson_server_oam_net_port_00:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -2441,6 +2461,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_vson_server_oam_net_port_10:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.write.bytes_vson_server_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -2717,6 +2742,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_vson_server_oam_net_port_00:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.outgoing.bytes.rate_vson_server_oam_net_port_00:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -3217,6 +3247,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_vson_server_oam_net_port_00:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.outgoing.bytes.rate_vson_server_oam_net_port_00:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -3717,6 +3752,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_vson_server_oam_net_port_00:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.outgoing.bytes.rate_vson_server_oam_net_port_00:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -4344,6 +4384,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_vson_server_oam_net_port_20:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       feature_vson_server_1:
         type: tosca.capabilities.Node
         occurrences:
@@ -4843,6 +4888,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_vson_server_oam_net_port_20:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       feature_vson_server_1:
         type: tosca.capabilities.Node
         occurrences:
@@ -5433,6 +5483,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_vson_server_oam_net_port_10:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.write.bytes_vson_server_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -5509,4 +5564,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/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_serverServiceTemplate.yaml
index fa4b53a50a..0286b378ce 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_serverServiceTemplate.yaml
@@ -347,6 +347,9 @@ topology_template:
       os_vson_server_1:
       - vson_server_1
       - os
+      forwarder_vson_server_oam_net_port_20:
+      - vson_server_oam_net_port_20
+      - forwarder
       feature_vson_server_1:
       - vson_server_1
       - feature
@@ -449,4 +452,4 @@ topology_template:
       - dependency
       dependency_vson_server_1:
       - vson_server_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/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_server_from_volServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_server_from_volServiceTemplate.yaml
index 3ac286aba1..b53841145b 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_server_from_volServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_server_from_volServiceTemplate.yaml
@@ -385,6 +385,9 @@ topology_template:
       feature_vson_server_3:
       - vson_server_3
       - feature
+      forwarder_vson_server_oam_net_port_10:
+      - vson_server_oam_net_port_10
+      - forwarder
       disk.write.bytes_vson_server_3:
       - vson_server_3
       - disk.write.bytes
@@ -436,4 +439,4 @@ topology_template:
       - link
       dependency_vson_server_3:
       - vson_server_3
-      - 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/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_server_with_volServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_server_with_volServiceTemplate.yaml
index 8292248260..5f7bbc52f4 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_server_with_volServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_server_with_volServiceTemplate.yaml
@@ -286,6 +286,9 @@ topology_template:
       network.outpoing.packets_vson_server_oam_net_port_00:
       - vson_server_oam_net_port_00
       - network.outpoing.packets
+      forwarder_vson_server_oam_net_port_00:
+      - vson_server_oam_net_port_00
+      - forwarder
       network.outgoing.bytes.rate_vson_server_oam_net_port_00:
       - vson_server_oam_net_port_00
       - network.outgoing.bytes.rate
@@ -451,4 +454,4 @@ topology_template:
       - link
       dependency_vson_server_2:
       - vson_server_2
-      - 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/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_server_with_vol_dual_ip_stackServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_server_with_vol_dual_ip_stackServiceTemplate.yaml
index ba15ec28b4..806a09abf5 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_server_with_vol_dual_ip_stackServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_server_with_vol_dual_ip_stackServiceTemplate.yaml
@@ -385,6 +385,9 @@ topology_template:
       disk.device.capacity_vson_server:
       - vson_server
       - disk.device.capacity
+      forwarder_vson_server_oam_net_port_0:
+      - vson_server_oam_net_port_0
+      - forwarder
       disk.device.iops_vson_server:
       - vson_server
       - disk.device.iops
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 21183acb74..593d700c0f 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
@@ -612,6 +612,16 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_8:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      forwarder_cmaui_port_7:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.write.requests.rate_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1030,6 +1040,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_cmaui_port_5:
+        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.
@@ -1042,6 +1057,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_cmaui_port_6:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.write.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.
@@ -1632,12 +1652,22 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_cmaui_port_3:
+        type: org.openecomp.capabilities.Forwarder
+        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.
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_cmaui_port_4:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.incoming.bytes_cmaui_cmaui_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.
@@ -2349,19 +2379,24 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_4_test_nested2Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.incoming.packets_cmaui_port_4_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_7_test_nested4Level_test_nested3Level_test_nested2Level:
+      cpu_server_cmaui_4_test_nested4Level_test_nested3Level_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_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+      network.incoming.bytes_cmaui_port_7_test_nested4Level_test_nested3Level_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:
@@ -2385,17 +2420,17 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_cmaui_port_6_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
       network.incoming.packets.rate_cmaui_port_5_test_nested3Level_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_cmaui_port_6_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.Attachment
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.read.bytes_server_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.
@@ -2629,9 +2664,8 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.root.size_server_cmaui_3_test_nested3Level_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_port_5_test_nested3Level_test_nested2Level:
+        type: org.openecomp.capabilities.Forwarder
         occurrences:
         - 1
         - UNBOUNDED
@@ -2640,6 +2674,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      disk.root.size_server_cmaui_3_test_nested3Level_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_cmaui_4_test_nested4Level_test_nested3Level_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.
@@ -2703,12 +2743,22 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_2:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.usage_server_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_1:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.outgoing.packets.rate_cmaui_port_4_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.
@@ -2757,6 +2807,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_3_test_nested2Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.write.bytes_server_cmaui_3_test_nested3Level_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.
@@ -2792,6 +2847,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       vcpus_server_cmaui_4_test_nested4Level_test_nested3Level_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.
@@ -3036,6 +3096,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.usage_server_cmaui_4_test_nested4Level_test_nested3Level_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.
@@ -3149,13 +3214,13 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
+      network.outpoing.packets_cmaui_port_3_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_3_test_nested2Level:
+      network.outgoing.packets.rate_cmaui_port_8_test_nested4Level_test_nested3Level_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:
@@ -3495,13 +3560,13 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      feature_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.Node
+      binding_server_cmaui_2_test_nested2Level:
+        type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
-      binding_server_cmaui_2_test_nested2Level:
-        type: tosca.capabilities.network.Bindable
+      feature_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
@@ -3660,6 +3725,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_6_test_nested3Level_test_nested2Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level_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.
@@ -3933,6 +4003,16 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_cmaui_port_1:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      forwarder_cmaui_cmaui_port_2:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.incoming.bytes_cmaui_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.
@@ -4454,48 +4534,18 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.usage_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.usage_server_cmaui_4_test_nested4Level_test_nested3Level:
-        type: org.openecomp.capabilities.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_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_7_test_nested4Level_test_nested3Level:
-        type: org.openecomp.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_cmaui_4_test_nested4Level_test_nested3Level:
-        type: org.openecomp.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_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.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
       disk.read.requests_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -4520,58 +4570,24 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      endpoint_server_cmaui_4_test_nested4Level_test_nested3Level:
-        type: tosca.capabilities.Endpoint.Admin
-        occurrences:
-        - 1
-        - UNBOUNDED
       disk.read.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
-      cpu_util_server_cmaui_4_test_nested4Level_test_nested3Level:
-        type: org.openecomp.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_4_test_nested4Level_test_nested3Level:
         type: org.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_test_nested4Level_test_nested3Level:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      network.outgoing.bytes.rate_cmaui_port_8_test_nested4Level_test_nested3Level:
-        type: org.openecomp.capabilities.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_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_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.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_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_7_test_nested4Level_test_nested3Level:
         type: tosca.capabilities.Attachment
         occurrences:
@@ -4638,18 +4654,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      memory_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_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
       host_server_cmaui_3_test_nested3Level:
         type: tosca.capabilities.Container
         valid_source_types:
@@ -4657,42 +4661,18 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_cmaui_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.allocation_server_cmaui_3_test_nested3Level:
         type: org.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_cmaui_4_test_nested4Level_test_nested3Level:
-        type: org.openecomp.capabilities.metric.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_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_cmaui_port_6_test_nested3Level:
         type: org.openecomp.capabilities.metric.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_7_test_nested4Level_test_nested3Level:
-        type: org.openecomp.capabilities.metric.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_6_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -4723,24 +4703,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.capacity_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_cmaui_port_6_test_nested3Level:
-        type: org.openecomp.capabilities.metric.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_8_test_nested4Level_test_nested3Level:
-        type: org.openecomp.capabilities.metric.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_6_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -4759,12 +4721,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.iops_server_cmaui_4_test_nested4Level_test_nested3Level:
-        type: org.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_3:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
@@ -4772,12 +4728,6 @@ node_types:
         occurrences:
         - 0
         - 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.
-        occurrences:
-        - 1
-        - UNBOUNDED
       binding_cmaui_port_4:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
@@ -4807,752 +4757,912 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_cmaui_port_6_test_nested3Level:
+      disk.device.write.bytes.rate_server_cmaui_3_test_nested3Level:
         type: org.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_cmaui_3_test_nested3Level:
-        type: tosca.capabilities.Node
+      binding_cmaui_port_6_test_nested3Level:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
         occurrences:
-        - 1
+        - 0
         - UNBOUNDED
-      network.outgoing.bytes.rate_cmaui_port_3:
+      disk.usage_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.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_3_test_nested3Level:
+      network.incoming.bytes_cmaui_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.root.size_server_cmaui_3_test_nested3Level:
+      network.incoming.bytes_cmaui_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.rate_cmaui_port_4:
+      disk.device.latency_server_cmaui_3_test_nested3Level:
         type: org.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_6_test_nested3Level:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
-      disk.usage_server_cmaui_3_test_nested3Level:
+      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
-      os_server_cmaui_4_test_nested4Level_test_nested3Level:
-        type: tosca.capabilities.OperatingSystem
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.device.write.requests_server_cmaui_3_test_nested3Level:
+      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.bytes_cmaui_port_4:
+      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.bytes_cmaui_port_3:
+      vcpus_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.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_3_test_nested3Level:
+      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
-      disk.device.latency_server_cmaui_3_test_nested3Level:
+      network.incoming.packets.rate_cmaui_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
-      cpu_util_server_cmaui_2:
+      cpu_server_cmaui_3_test_nested3Level:
         type: org.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_cmaui_4_test_nested4Level_test_nested3Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
+      feature_cmaui_port_3:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.incoming.packets.rate_cmaui_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.device.write.requests.rate_server_cmaui_3_test_nested3Level:
+      feature_cmaui_port_4:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.allocation_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.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_8_test_nested4Level_test_nested3Level:
+      binding_server_cmaui_2:
+        type: tosca.capabilities.network.Bindable
+        occurrences:
+        - 1
+        - UNBOUNDED
+      scalable_server_cmaui_2:
+        type: tosca.capabilities.Scalable
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.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.packets.rate_cmaui_port_5_test_nested3Level:
         type: org.openecomp.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:
+      network.outpoing.packets_cmaui_port_7_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.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_cmaui_4_test_nested4Level_test_nested3Level:
+      feature_server_cmaui_4_test_nested4Level_test_nested3Level:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.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_cmaui_4_test_nested4Level_test_nested3Level:
+      endpoint_server_cmaui_2:
+        type: tosca.capabilities.Endpoint.Admin
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.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_8_test_nested4Level_test_nested3Level:
+      forwarder_cmaui_port_4:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      scalable_server_cmaui_4_test_nested4Level_test_nested3Level:
+        type: tosca.capabilities.Scalable
+        occurrences:
+        - 1
+        - UNBOUNDED
+      forwarder_cmaui_port_3:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.incoming.packets.rate_cmaui_port_8_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.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:
+      disk.device.allocation_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_7_test_nested4Level_test_nested3Level:
-        type: tosca.capabilities.Node
+      disk.device.latency_server_cmaui_4_test_nested4Level_test_nested3Level:
+        type: org.openecomp.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_3_test_nested3Level:
+      disk.read.bytes_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.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_3:
+      disk.device.allocation_server_cmaui_3_test_nested3Level:
         type: org.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_cmaui_3_test_nested3Level:
+      network.incoming.bytes.rate_cmaui_port_5_test_nested3Level:
         type: org.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_3:
-        type: tosca.capabilities.Node
+      os_server_cmaui_3_test_nested3Level:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes_server_cmaui_2:
+      network.incoming.packets_cmaui_port_8_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.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_4:
+      cpu_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.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_cmaui_2:
-        type: tosca.capabilities.Node
+      disk.device.write.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
+        type: org.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_4:
-        type: tosca.capabilities.Node
+      attachment_cmaui_port_8_test_nested4Level_test_nested3Level:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_cmaui_port_6_test_nested3Level:
-        type: tosca.capabilities.Attachment
+      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.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_6_test_nested3Level:
+      disk.device.iops_server_cmaui_3_test_nested3Level:
         type: org.openecomp.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_cmaui_2:
+      network.incoming.bytes_cmaui_port_5_test_nested3Level:
         type: org.openecomp.capabilities.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_cmaui_4_test_nested4Level_test_nested3Level:
+      network.outpoing.packets_cmaui_port_6_test_nested3Level:
         type: org.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_2:
+      network.outgoing.packets.rate_cmaui_port_7_test_nested4Level_test_nested3Level:
+        type: org.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_5_test_nested3Level:
         type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
+      disk.device.write.bytes_server_cmaui_3_test_nested3Level:
+        type: org.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_cmaui_2:
+      network.outgoing.bytes_cmaui_port_5_test_nested3Level:
         type: org.openecomp.capabilities.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_4:
+      disk.device.read.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
-      instance_server_cmaui_3_test_nested3Level:
+      network.outpoing.packets_cmaui_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_cmaui_port_3:
-        type: tosca.capabilities.Attachment
+      disk.capacity_server_cmaui_3_test_nested3Level:
+        type: org.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_4:
-        type: tosca.capabilities.Attachment
+      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
-      scalable_server_cmaui_2:
-        type: tosca.capabilities.Scalable
+      network.outpoing.packets_cmaui_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.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
+      network.incoming.bytes.rate_cmaui_port_7_test_nested4Level_test_nested3Level:
         type: org.openecomp.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_4_test_nested4Level_test_nested3Level:
+      disk.device.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.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_3:
+      binding_cmaui_port_8_test_nested4Level_test_nested3Level:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
+      disk.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.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_cmaui_3_test_nested3Level:
+      network.outgoing.packets.rate_cmaui_port_5_test_nested3Level:
         type: org.openecomp.capabilities.metric.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_5_test_nested3Level:
+      disk.device.read.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.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_2:
+      disk.device.read.bytes_server_cmaui_3_test_nested3Level:
         type: org.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_4_test_nested4Level_test_nested3Level:
+      memory.resident_server_cmaui_3_test_nested3Level:
         type: org.openecomp.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_7_test_nested4Level_test_nested3Level:
+      disk.device.usage_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.usage_server_cmaui_2:
+      disk.device.usage_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.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_cmaui_3_test_nested3Level:
+      network.incoming.bytes_cmaui_port_7_test_nested4Level_test_nested3Level:
         type: org.openecomp.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_cmaui_3_test_nested3Level:
+      disk.usage_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.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_cmaui_4_test_nested4Level_test_nested3Level:
-        type: tosca.capabilities.Node
+      forwarder_cmaui_port_6_test_nested3Level:
+        type: org.openecomp.capabilities.Forwarder
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_cmaui_port_8_test_nested4Level_test_nested3Level:
+      disk.device.write.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
-      binding_cmaui_port_7_test_nested4Level_test_nested3Level:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+      forwarder_cmaui_port_7_test_nested4Level_test_nested3Level:
+        type: org.openecomp.capabilities.Forwarder
         occurrences:
-        - 0
+        - 1
         - UNBOUNDED
-      disk.write.requests.rate_server_cmaui_3_test_nested3Level:
+      endpoint_server_cmaui_4_test_nested4Level_test_nested3Level:
+        type: tosca.capabilities.Endpoint.Admin
+        occurrences:
+        - 1
+        - UNBOUNDED
+      cpu_util_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.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_cmaui_4_test_nested4Level_test_nested3Level:
+      feature_test_nested4Level_test_nested3Level:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.outgoing.bytes.rate_cmaui_port_8_test_nested4Level_test_nested3Level:
         type: org.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_cmaui_2:
-        type: tosca.capabilities.Endpoint.Admin
+      disk.device.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
-      network.incoming.bytes_cmaui_port_6_test_nested3Level:
+      disk.device.capacity_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
-      os_server_cmaui_2:
-        type: tosca.capabilities.OperatingSystem
+      memory_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.requests_server_cmaui_4_test_nested4Level_test_nested3Level:
+      cpu_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
-      scalable_server_cmaui_4_test_nested4Level_test_nested3Level:
-        type: tosca.capabilities.Scalable
+      network.incoming.packets_cmaui_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_cmaui_port_8_test_nested4Level_test_nested3Level:
+      memory_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.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_5_test_nested3Level:
-        type: tosca.capabilities.Attachment
+      forwarder_cmaui_port_8_test_nested4Level_test_nested3Level:
+        type: org.openecomp.capabilities.Forwarder
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.allocation_server_cmaui_2:
+      network.incoming.packets_cmaui_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.incoming.packets_cmaui_port_7_test_nested4Level_test_nested3Level:
+      network.outgoing.bytes_cmaui_port_7_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.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_cmaui_4_test_nested4Level_test_nested3Level:
+      disk.capacity_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_server_cmaui_3_test_nested3Level:
+      network.incoming.packets_cmaui_port_6_test_nested3Level:
         type: org.openecomp.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_cmaui_4_test_nested4Level_test_nested3Level:
+      network.incoming.bytes_cmaui_port_8_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.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_cmaui_3_test_nested3Level:
+      disk.device.iops_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.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_5_test_nested3Level:
+      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
-      host_server_cmaui_2:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
+      network.incoming.bytes.rate_cmaui_port_6_test_nested3Level:
+        type: org.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_cmaui_3_test_nested3Level:
-        type: tosca.capabilities.OperatingSystem
+      feature_server_cmaui_3_test_nested3Level:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level:
+      network.outgoing.bytes.rate_cmaui_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.write.requests_server_cmaui_4_test_nested4Level_test_nested3Level:
+      disk.root.size_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.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_8_test_nested4Level_test_nested3Level:
+      network.outgoing.bytes.rate_cmaui_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_server_cmaui_3_test_nested3Level:
-        type: tosca.capabilities.network.Bindable
+      os_server_cmaui_4_test_nested4Level_test_nested3Level:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      feature_test_nested3Level:
-        type: tosca.capabilities.Node
+      disk.device.write.requests_server_cmaui_3_test_nested3Level:
+        type: org.openecomp.capabilities.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_8_test_nested4Level_test_nested3Level:
+      disk.device.read.requests.rate_server_cmaui_3_test_nested3Level:
         type: org.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_cmaui_4_test_nested4Level_test_nested3Level:
+      memory.usage_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.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_3_test_nested3Level:
+      disk.device.write.requests.rate_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.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_cmaui_3_test_nested3Level:
+      network.outgoing.bytes_cmaui_port_8_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.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_4_test_nested4Level_test_nested3Level:
+      disk.device.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.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_8_test_nested4Level_test_nested3Level:
+      network.outpoing.packets_cmaui_port_8_test_nested4Level_test_nested3Level:
+        type: org.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_7_test_nested4Level_test_nested3Level:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.iops_server_cmaui_3_test_nested3Level:
+        type: org.openecomp.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_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_cmaui_2:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      attachment_cmaui_port_6_test_nested3Level:
         type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      scalable_server_cmaui_3_test_nested3Level:
-        type: tosca.capabilities.Scalable
+      network.outgoing.packets.rate_cmaui_port_6_test_nested3Level:
+        type: org.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_cmaui_2:
+      disk.allocation_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.iops_server_cmaui_3_test_nested3Level:
+      vcpus_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.outgoing.bytes.rate_cmaui_port_7_test_nested4Level_test_nested3Level:
+      network.outgoing.packets.rate_cmaui_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.incoming.bytes_cmaui_port_5_test_nested3Level:
+      instance_server_cmaui_3_test_nested3Level:
         type: org.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_cmaui_3_test_nested3Level:
-        type: tosca.capabilities.Endpoint.Admin
+      attachment_cmaui_port_3:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      vcpus_server_cmaui_3_test_nested3Level:
+      attachment_cmaui_port_4:
+        type: tosca.capabilities.Attachment
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.capacity_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.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_7_test_nested4Level_test_nested3Level:
+      network.outgoing.packets.rate_cmaui_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.allocation_server_cmaui_4_test_nested4Level_test_nested3Level:
+      disk.device.read.bytes.rate_server_cmaui_3_test_nested3Level:
         type: org.openecomp.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_6_test_nested3Level:
+      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
-      network.outgoing.bytes_cmaui_port_4:
+      memory.resident_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.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_7_test_nested4Level_test_nested3Level:
+      disk.usage_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
-      binding_cmaui_port_5_test_nested3Level:
+      disk.device.usage_server_cmaui_3_test_nested3Level:
+        type: org.openecomp.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_cmaui_3_test_nested3Level:
+        type: org.openecomp.capabilities.metric.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_8_test_nested4Level_test_nested3Level:
+        type: org.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_7_test_nested4Level_test_nested3Level:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
         - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
         occurrences:
         - 0
         - UNBOUNDED
-      network.incoming.bytes.rate_cmaui_port_3:
+      disk.write.requests.rate_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.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_4:
+      network.incoming.bytes_cmaui_port_6_test_nested3Level:
         type: org.openecomp.capabilities.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_3_test_nested3Level:
+      os_server_cmaui_2:
+        type: tosca.capabilities.OperatingSystem
+        occurrences:
+        - 1
+        - UNBOUNDED
+      attachment_cmaui_port_5_test_nested3Level:
+        type: tosca.capabilities.Attachment
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.incoming.packets_cmaui_port_7_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.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_5_test_nested3Level:
+      disk.latency_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.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_2:
+      host_server_cmaui_2:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.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_4_test_nested4Level_test_nested3Level:
+      disk.write.requests_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.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:
+      binding_server_cmaui_3_test_nested3Level:
+        type: tosca.capabilities.network.Bindable
+        occurrences:
+        - 1
+        - UNBOUNDED
+      feature_test_nested3Level:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.outgoing.packets.rate_cmaui_port_8_test_nested4Level_test_nested3Level:
         type: org.openecomp.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_3:
+      cpu.delta_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.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_4_test_nested4Level_test_nested3Level:
+      disk.device.capacity_server_cmaui_3_test_nested3Level:
         type: org.openecomp.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_3_test_nested3Level:
+      scalable_server_cmaui_3_test_nested3Level:
+        type: tosca.capabilities.Scalable
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.outgoing.bytes.rate_cmaui_port_7_test_nested4Level_test_nested3Level:
         type: org.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:
+      endpoint_server_cmaui_3_test_nested3Level:
+        type: tosca.capabilities.Endpoint.Admin
+        occurrences:
+        - 1
+        - UNBOUNDED
+      vcpus_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.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.incoming.packets.rate_cmaui_port_7_test_nested4Level_test_nested3Level:
         type: org.openecomp.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_4:
+      disk.allocation_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.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_4_test_nested4Level_test_nested3Level:
-        type: tosca.capabilities.network.Bindable
+      network.outgoing.bytes_cmaui_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.incoming.bytes.rate_cmaui_port_7_test_nested4Level_test_nested3Level:
+      network.incoming.bytes.rate_cmaui_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.resident_server_cmaui_2:
+      network.incoming.bytes.rate_cmaui_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.device.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
+      disk.device.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.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_8_test_nested4Level_test_nested3Level:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+      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:
-        - 0
+        - 1
         - UNBOUNDED
-      disk.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level:
+      disk.device.write.requests_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.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_3_test_nested3Level:
+      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
-      feature_cmaui_port_5_test_nested3Level:
-        type: tosca.capabilities.Node
+      binding_server_cmaui_4_test_nested4Level_test_nested3Level:
+        type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_cmaui_port_5_test_nested3Level:
+      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.latency_server_cmaui_2:
+      disk.device.read.requests_server_cmaui_3_test_nested3Level:
         type: org.openecomp.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_3_test_nested3Level:
-        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_port_5_test_nested3Level:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_5_test_nested3Level:
+      network.incoming.packets_cmaui_port_5_test_nested3Level:
         type: org.openecomp.capabilities.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_4_test_nested4Level_test_nested3Level:
+      disk.latency_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.bytes_server_cmaui_3_test_nested3Level:
+      disk.ephemeral.size_server_cmaui_3_test_nested3Level:
         type: org.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_3_test_nested3Level:
-        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_port_5_test_nested3Level:
+        type: org.openecomp.capabilities.Forwarder
         occurrences:
         - 1
         - UNBOUNDED
@@ -5728,12 +5838,22 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_7_test_nested4Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.read.requests_server_cmaui_4_test_nested4Level:
         type: org.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_8_test_nested4Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.root.size_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -6279,6 +6399,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_6:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.read.requests.rate_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -6291,6 +6416,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_5:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.allocation_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -6452,4 +6582,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_cmauiServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmauiServiceTemplate.yaml
index 19b136037d..c73e74aaca 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmauiServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmauiServiceTemplate.yaml
@@ -234,12 +234,18 @@ topology_template:
       disk.device.write.bytes_cmaui:
       - cmaui
       - disk.device.write.bytes
+      forwarder_cmaui_cmaui_port_5:
+      - cmaui_cmaui_port_5
+      - forwarder
       disk.device.iops_cmaui:
       - cmaui
       - disk.device.iops
       memory.resident_cmaui:
       - cmaui
       - memory.resident
+      forwarder_cmaui_cmaui_port_6:
+      - cmaui_cmaui_port_6
+      - forwarder
       disk.write.bytes.rate_cmaui:
       - cmaui
       - disk.write.bytes.rate
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_1ServiceTemplate.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_1ServiceTemplate.yaml
index 56e45c96f1..cea4ae985c 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_1ServiceTemplate.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_1ServiceTemplate.yaml
@@ -252,9 +252,15 @@ topology_template:
       network.incoming.bytes_cmaui_cmaui_port_4:
       - cmaui_cmaui_port_4
       - network.incoming.bytes
+      forwarder_cmaui_cmaui_port_3:
+      - cmaui_cmaui_port_3
+      - forwarder
       disk.read.bytes_cmaui:
       - cmaui
       - disk.read.bytes
+      forwarder_cmaui_cmaui_port_4:
+      - cmaui_cmaui_port_4
+      - forwarder
       network.incoming.bytes_cmaui_cmaui_port_3:
       - cmaui_cmaui_port_3
       - network.incoming.bytes
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 3414e296bc..3c0a520290 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
@@ -252,6 +252,12 @@ topology_template:
       disk.device.allocation_cmaui:
       - cmaui
       - disk.device.allocation
+      forwarder_cmaui_cmaui_port_1:
+      - cmaui_cmaui_port_1
+      - forwarder
+      forwarder_cmaui_cmaui_port_2:
+      - cmaui_cmaui_port_2
+      - forwarder
       network.incoming.bytes_cmaui_cmaui_port_2:
       - cmaui_cmaui_port_2
       - network.incoming.bytes
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested1ServiceTemplate.yaml
index ace6aa3818..e543c21f8e 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested1ServiceTemplate.yaml
@@ -228,15 +228,18 @@ topology_template:
       disk.device.read.bytes_server_cmaui_2_test_nested2Level:
       - test_nested2Level
       - disk.device.read.bytes_server_cmaui_2
+      forwarder_cmaui_port_4_test_nested2Level:
+      - test_nested2Level
+      - forwarder_cmaui_port_4
       network.incoming.packets_cmaui_port_4_test_nested2Level:
       - test_nested2Level
       - network.incoming.packets_cmaui_port_4
-      network.incoming.bytes_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - network.incoming.bytes_cmaui_port_7_test_nested4Level_test_nested3Level
       cpu_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - cpu_server_cmaui_4_test_nested4Level_test_nested3Level
+      network.incoming.bytes_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - network.incoming.bytes_cmaui_port_7_test_nested4Level_test_nested3Level
       disk.device.write.requests.rate_server_cmaui_2_test_nested2Level:
       - test_nested2Level
       - disk.device.write.requests.rate_server_cmaui_2
@@ -246,12 +249,12 @@ topology_template:
       network.incoming.bytes_cmaui_port_3_test_nested2Level:
       - test_nested2Level
       - network.incoming.bytes_cmaui_port_3
-      attachment_cmaui_port_6_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - attachment_cmaui_port_6_test_nested3Level
       network.incoming.packets.rate_cmaui_port_5_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.incoming.packets.rate_cmaui_port_5_test_nested3Level
+      attachment_cmaui_port_6_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - attachment_cmaui_port_6_test_nested3Level
       disk.read.bytes_server_cmaui_2_test_nested2Level:
       - test_nested2Level
       - disk.read.bytes_server_cmaui_2
@@ -369,12 +372,15 @@ topology_template:
       binding_server_cmaui_1:
       - abstract_cmaui_2
       - binding_cmaui
-      disk.root.size_server_cmaui_3_test_nested3Level_test_nested2Level:
+      forwarder_cmaui_port_5_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.root.size_server_cmaui_3_test_nested3Level
+      - forwarder_cmaui_port_5_test_nested3Level
       os_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - os_server_cmaui_3_test_nested3Level
+      disk.root.size_server_cmaui_3_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - disk.root.size_server_cmaui_3_test_nested3Level
       disk.device.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - disk.device.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level
@@ -408,9 +414,15 @@ topology_template:
       os_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - os_server_cmaui_4_test_nested4Level_test_nested3Level
+      forwarder_cmaui_port_2:
+      - abstract_cmaui_2
+      - forwarder_cmaui_cmaui_port_2
       disk.usage_server_cmaui_2_test_nested2Level:
       - test_nested2Level
       - disk.usage_server_cmaui_2
+      forwarder_cmaui_port_1:
+      - abstract_cmaui_2
+      - forwarder_cmaui_cmaui_port_1
       network.outgoing.packets.rate_cmaui_port_4_test_nested2Level:
       - test_nested2Level
       - network.outgoing.packets.rate_cmaui_port_4
@@ -435,6 +447,9 @@ topology_template:
       memory_server_cmaui_1:
       - abstract_cmaui_2
       - memory_cmaui
+      forwarder_cmaui_port_3_test_nested2Level:
+      - test_nested2Level
+      - forwarder_cmaui_port_3
       disk.device.write.bytes_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - disk.device.write.bytes_server_cmaui_3_test_nested3Level
@@ -453,6 +468,9 @@ topology_template:
       disk.read.requests_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - disk.read.requests_server_cmaui_3_test_nested3Level
+      forwarder_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - forwarder_cmaui_port_8_test_nested4Level_test_nested3Level
       vcpus_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - vcpus_server_cmaui_4_test_nested4Level_test_nested3Level
@@ -579,6 +597,9 @@ topology_template:
       disk.device.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - disk.device.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level
+      forwarder_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - forwarder_cmaui_port_7_test_nested4Level_test_nested3Level
       disk.device.usage_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - disk.device.usage_server_cmaui_4_test_nested4Level_test_nested3Level
@@ -636,12 +657,12 @@ topology_template:
       scalable_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - scalable_server_cmaui_4_test_nested4Level_test_nested3Level
-      network.outgoing.packets.rate_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - network.outgoing.packets.rate_cmaui_port_8_test_nested4Level_test_nested3Level
       network.outpoing.packets_cmaui_port_3_test_nested2Level:
       - test_nested2Level
       - network.outpoing.packets_cmaui_port_3
+      network.outgoing.packets.rate_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - network.outgoing.packets.rate_cmaui_port_8_test_nested4Level_test_nested3Level
       network.incoming.packets_cmaui_port_6_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.incoming.packets_cmaui_port_6_test_nested3Level
@@ -813,12 +834,12 @@ topology_template:
       host_server_cmaui_1:
       - abstract_cmaui_2
       - host_cmaui
-      feature_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - feature_cmaui_port_7_test_nested4Level_test_nested3Level
       binding_server_cmaui_2_test_nested2Level:
       - test_nested2Level
       - binding_server_cmaui_2
+      feature_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - feature_cmaui_port_7_test_nested4Level_test_nested3Level
       cpu.delta_server_cmaui_2_test_nested2Level:
       - test_nested2Level
       - cpu.delta_server_cmaui_2
@@ -897,6 +918,9 @@ topology_template:
       memory.resident_server_cmaui_1:
       - abstract_cmaui_2
       - memory.resident_cmaui
+      forwarder_cmaui_port_6_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - forwarder_cmaui_port_6_test_nested3Level
       disk.device.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - disk.device.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level
@@ -990,4 +1014,4 @@ topology_template:
       - dependency_cmaui
       dependency_cmaui_port_4_test_nested2Level:
       - test_nested2Level
-      - dependency_cmaui_port_4
\ No newline at end of file
+      - dependency_cmaui_port_4
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested2ServiceTemplate.yaml
index 33ae55e5cd..67af3b2fa7 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested2ServiceTemplate.yaml
@@ -160,27 +160,12 @@ topology_template:
       cpu_util_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - cpu_util_server_cmaui_3
-      disk.device.usage_server_cmaui_2:
-      - abstract_cmaui_1
-      - disk.device.usage_cmaui
-      disk.device.usage_server_cmaui_4_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.device.usage_server_cmaui_4_test_nested4Level
       disk.device.latency_server_cmaui_2:
       - abstract_cmaui_1
       - disk.device.latency_cmaui
-      network.incoming.bytes_cmaui_port_7_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - network.incoming.bytes_cmaui_port_7_test_nested4Level
-      disk.usage_server_cmaui_4_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.usage_server_cmaui_4_test_nested4Level
       disk.root.size_server_cmaui_2:
       - abstract_cmaui_1
       - disk.root.size_cmaui
-      disk.device.write.requests.rate_server_cmaui_2:
-      - abstract_cmaui_1
-      - disk.device.write.requests.rate_cmaui
       disk.read.requests_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - disk.read.requests_server_cmaui_3
@@ -193,33 +178,15 @@ topology_template:
       network.outgoing.bytes_cmaui_port_3:
       - abstract_cmaui_1
       - network.outgoing.bytes_cmaui_cmaui_port_3
-      endpoint_server_cmaui_4_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - endpoint_server_cmaui_4_test_nested4Level
       disk.read.requests_server_cmaui_2:
       - abstract_cmaui_1
       - disk.read.requests_cmaui
-      cpu_util_server_cmaui_4_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - cpu_util_server_cmaui_4_test_nested4Level
       disk.write.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - disk.write.bytes.rate_server_cmaui_4_test_nested4Level
-      feature_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - feature_test_nested4Level
-      network.outgoing.bytes.rate_cmaui_port_8_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - network.outgoing.bytes.rate_cmaui_port_8_test_nested4Level
-      disk.device.iops_server_cmaui_2:
-      - abstract_cmaui_1
-      - disk.device.iops_cmaui
       disk.device.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - disk.device.write.bytes_server_cmaui_4_test_nested4Level
-      disk.device.capacity_server_cmaui_2:
-      - abstract_cmaui_1
-      - disk.device.capacity_cmaui
       attachment_cmaui_port_7_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - attachment_cmaui_port_7_test_nested4Level
@@ -253,33 +220,15 @@ topology_template:
       network.outgoing.bytes.rate_cmaui_port_5_test_nested3Level:
       - test_nested3Level
       - network.outgoing.bytes.rate_cmaui_port_5
-      memory_server_cmaui_2:
-      - abstract_cmaui_1
-      - memory_cmaui
-      cpu_server_cmaui_2:
-      - abstract_cmaui_1
-      - cpu_cmaui
       host_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - host_server_cmaui_3
-      network.incoming.packets_cmaui_port_3:
-      - abstract_cmaui_1
-      - network.incoming.packets_cmaui_cmaui_port_3
       disk.allocation_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - disk.allocation_server_cmaui_3
-      memory_server_cmaui_4_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - memory_server_cmaui_4_test_nested4Level
-      network.incoming.packets_cmaui_port_4:
-      - abstract_cmaui_1
-      - network.incoming.packets_cmaui_cmaui_port_4
       network.outgoing.bytes_cmaui_port_6_test_nested3Level:
       - test_nested3Level
       - network.outgoing.bytes_cmaui_port_6
-      network.outgoing.bytes_cmaui_port_7_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - network.outgoing.bytes_cmaui_port_7_test_nested4Level
       network.incoming.packets.rate_cmaui_port_6_test_nested3Level:
       - test_nested3Level
       - network.incoming.packets.rate_cmaui_port_6
@@ -295,15 +244,6 @@ topology_template:
       network.outpoing.packets_cmaui_port_5_test_nested3Level:
       - test_nested3Level
       - network.outpoing.packets_cmaui_port_5
-      disk.capacity_server_cmaui_2:
-      - abstract_cmaui_1
-      - disk.capacity_cmaui
-      network.incoming.packets_cmaui_port_6_test_nested3Level:
-      - test_nested3Level
-      - network.incoming.packets_cmaui_port_6
-      network.incoming.bytes_cmaui_port_8_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - network.incoming.bytes_cmaui_port_8_test_nested4Level
       network.outgoing.bytes.rate_cmaui_port_6_test_nested3Level:
       - test_nested3Level
       - network.outgoing.bytes.rate_cmaui_port_6
@@ -313,15 +253,9 @@ topology_template:
       disk.read.bytes.rate_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - disk.read.bytes.rate_server_cmaui_3
-      disk.device.iops_server_cmaui_4_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.device.iops_server_cmaui_4_test_nested4Level
       binding_cmaui_port_3:
       - abstract_cmaui_1
       - binding_cmaui_cmaui_port_3
-      disk.iops_server_cmaui_2:
-      - abstract_cmaui_1
-      - disk.iops_cmaui
       binding_cmaui_port_4:
       - abstract_cmaui_1
       - binding_cmaui_cmaui_port_4
@@ -337,6 +271,264 @@ topology_template:
       memory_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - memory_server_cmaui_3
+      disk.device.write.bytes.rate_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.device.write.bytes.rate_server_cmaui_3
+      binding_cmaui_port_6_test_nested3Level:
+      - test_nested3Level
+      - binding_cmaui_port_6
+      disk.usage_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.usage_server_cmaui_3
+      network.incoming.bytes_cmaui_port_4:
+      - abstract_cmaui_1
+      - network.incoming.bytes_cmaui_cmaui_port_4
+      network.incoming.bytes_cmaui_port_3:
+      - abstract_cmaui_1
+      - network.incoming.bytes_cmaui_cmaui_port_3
+      disk.device.latency_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.device.latency_server_cmaui_3
+      cpu_util_server_cmaui_2:
+      - abstract_cmaui_1
+      - cpu_util_cmaui
+      disk.device.write.bytes.rate_server_cmaui_2:
+      - abstract_cmaui_1
+      - disk.device.write.bytes.rate_cmaui
+      disk.write.bytes.rate_server_cmaui_2:
+      - abstract_cmaui_1
+      - disk.write.bytes.rate_cmaui
+      vcpus_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - vcpus_server_cmaui_4_test_nested4Level
+      disk.device.write.bytes_server_cmaui_2:
+      - abstract_cmaui_1
+      - disk.device.write.bytes_cmaui
+      network.incoming.packets.rate_cmaui_port_3:
+      - abstract_cmaui_1
+      - network.incoming.packets.rate_cmaui_cmaui_port_3
+      cpu_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - cpu_server_cmaui_3
+      feature_cmaui_port_3:
+      - abstract_cmaui_1
+      - feature_cmaui_cmaui_port_3
+      network.incoming.packets.rate_cmaui_port_4:
+      - abstract_cmaui_1
+      - network.incoming.packets.rate_cmaui_cmaui_port_4
+      feature_cmaui_port_4:
+      - abstract_cmaui_1
+      - feature_cmaui_cmaui_port_4
+      disk.device.allocation_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.device.allocation_server_cmaui_4_test_nested4Level
+      binding_server_cmaui_2:
+      - abstract_cmaui_1
+      - binding_cmaui
+      scalable_server_cmaui_2:
+      - abstract_cmaui_1
+      - scalable_cmaui
+      disk.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.write.requests.rate_server_cmaui_4_test_nested4Level
+      network.incoming.packets.rate_cmaui_port_5_test_nested3Level:
+      - test_nested3Level
+      - network.incoming.packets.rate_cmaui_port_5
+      network.outpoing.packets_cmaui_port_7_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - network.outpoing.packets_cmaui_port_7_test_nested4Level
+      feature_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - feature_server_cmaui_4_test_nested4Level
+      disk.device.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.device.read.bytes_server_cmaui_4_test_nested4Level
+      endpoint_server_cmaui_2:
+      - abstract_cmaui_1
+      - endpoint_cmaui
+      disk.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.read.requests_server_cmaui_4_test_nested4Level
+      forwarder_cmaui_port_4:
+      - abstract_cmaui_1
+      - forwarder_cmaui_cmaui_port_4
+      scalable_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - scalable_server_cmaui_4_test_nested4Level
+      forwarder_cmaui_port_3:
+      - abstract_cmaui_1
+      - forwarder_cmaui_cmaui_port_3
+      network.incoming.packets.rate_cmaui_port_8_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - network.incoming.packets.rate_cmaui_port_8_test_nested4Level
+      disk.device.allocation_server_cmaui_2:
+      - abstract_cmaui_1
+      - disk.device.allocation_cmaui
+      disk.device.latency_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.device.latency_server_cmaui_4_test_nested4Level
+      disk.read.bytes_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.read.bytes_server_cmaui_3
+      disk.device.allocation_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.device.allocation_server_cmaui_3
+      network.incoming.bytes.rate_cmaui_port_5_test_nested3Level:
+      - test_nested3Level
+      - network.incoming.bytes.rate_cmaui_port_5
+      os_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - os_server_cmaui_3
+      network.incoming.packets_cmaui_port_8_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - network.incoming.packets_cmaui_port_8_test_nested4Level
+      cpu_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - cpu_server_cmaui_4_test_nested4Level
+      disk.device.write.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.device.write.bytes.rate_server_cmaui_4_test_nested4Level
+      attachment_cmaui_port_8_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - attachment_cmaui_port_8_test_nested4Level
+      instance_server_cmaui_2:
+      - abstract_cmaui_1
+      - instance_cmaui
+      disk.device.iops_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.device.iops_server_cmaui_3
+      network.incoming.bytes_cmaui_port_5_test_nested3Level:
+      - test_nested3Level
+      - network.incoming.bytes_cmaui_port_5
+      network.outpoing.packets_cmaui_port_6_test_nested3Level:
+      - test_nested3Level
+      - network.outpoing.packets_cmaui_port_6
+      network.outgoing.packets.rate_cmaui_port_7_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - network.outgoing.packets.rate_cmaui_port_7_test_nested4Level
+      binding_cmaui_port_5_test_nested3Level:
+      - test_nested3Level
+      - binding_cmaui_port_5
+      disk.device.write.bytes_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.device.write.bytes_server_cmaui_3
+      network.outgoing.bytes_cmaui_port_5_test_nested3Level:
+      - test_nested3Level
+      - network.outgoing.bytes_cmaui_port_5
+      disk.device.read.requests_server_cmaui_2:
+      - abstract_cmaui_1
+      - disk.device.read.requests_cmaui
+      network.outpoing.packets_cmaui_port_3:
+      - abstract_cmaui_1
+      - network.outpoing.packets_cmaui_cmaui_port_3
+      disk.capacity_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.capacity_server_cmaui_3
+      cpu.delta_server_cmaui_2:
+      - abstract_cmaui_1
+      - cpu.delta_cmaui
+      network.outpoing.packets_cmaui_port_4:
+      - abstract_cmaui_1
+      - network.outpoing.packets_cmaui_cmaui_port_4
+      network.incoming.bytes.rate_cmaui_port_7_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - network.incoming.bytes.rate_cmaui_port_7_test_nested4Level
+      disk.device.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.device.write.requests.rate_server_cmaui_4_test_nested4Level
+      binding_cmaui_port_8_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - binding_cmaui_port_8_test_nested4Level
+      disk.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.write.bytes_server_cmaui_4_test_nested4Level
+      network.outgoing.packets.rate_cmaui_port_5_test_nested3Level:
+      - test_nested3Level
+      - network.outgoing.packets.rate_cmaui_port_5
+      disk.device.read.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.device.read.requests.rate_server_cmaui_4_test_nested4Level
+      disk.device.read.bytes_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.device.read.bytes_server_cmaui_3
+      memory.resident_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - memory.resident_server_cmaui_3
+      disk.device.usage_server_cmaui_2:
+      - abstract_cmaui_1
+      - disk.device.usage_cmaui
+      disk.device.usage_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.device.usage_server_cmaui_4_test_nested4Level
+      network.incoming.bytes_cmaui_port_7_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - network.incoming.bytes_cmaui_port_7_test_nested4Level
+      disk.usage_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.usage_server_cmaui_4_test_nested4Level
+      forwarder_cmaui_port_6_test_nested3Level:
+      - test_nested3Level
+      - forwarder_cmaui_port_6
+      disk.device.write.requests.rate_server_cmaui_2:
+      - abstract_cmaui_1
+      - disk.device.write.requests.rate_cmaui
+      forwarder_cmaui_port_7_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - forwarder_cmaui_port_7_test_nested4Level
+      endpoint_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - endpoint_server_cmaui_4_test_nested4Level
+      cpu_util_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - cpu_util_server_cmaui_4_test_nested4Level
+      feature_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - feature_test_nested4Level
+      network.outgoing.bytes.rate_cmaui_port_8_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - network.outgoing.bytes.rate_cmaui_port_8_test_nested4Level
+      disk.device.iops_server_cmaui_2:
+      - abstract_cmaui_1
+      - disk.device.iops_cmaui
+      disk.device.capacity_server_cmaui_2:
+      - abstract_cmaui_1
+      - disk.device.capacity_cmaui
+      memory_server_cmaui_2:
+      - abstract_cmaui_1
+      - memory_cmaui
+      cpu_server_cmaui_2:
+      - abstract_cmaui_1
+      - cpu_cmaui
+      network.incoming.packets_cmaui_port_3:
+      - abstract_cmaui_1
+      - network.incoming.packets_cmaui_cmaui_port_3
+      memory_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - memory_server_cmaui_4_test_nested4Level
+      forwarder_cmaui_port_8_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - forwarder_cmaui_port_8_test_nested4Level
+      network.incoming.packets_cmaui_port_4:
+      - abstract_cmaui_1
+      - network.incoming.packets_cmaui_cmaui_port_4
+      network.outgoing.bytes_cmaui_port_7_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - network.outgoing.bytes_cmaui_port_7_test_nested4Level
+      disk.capacity_server_cmaui_2:
+      - abstract_cmaui_1
+      - disk.capacity_cmaui
+      network.incoming.packets_cmaui_port_6_test_nested3Level:
+      - test_nested3Level
+      - network.incoming.packets_cmaui_port_6
+      network.incoming.bytes_cmaui_port_8_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - network.incoming.bytes_cmaui_port_8_test_nested4Level
+      disk.device.iops_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.device.iops_server_cmaui_4_test_nested4Level
+      disk.iops_server_cmaui_2:
+      - abstract_cmaui_1
+      - disk.iops_cmaui
       network.incoming.bytes.rate_cmaui_port_6_test_nested3Level:
       - test_nested3Level
       - network.incoming.bytes.rate_cmaui_port_6
@@ -346,42 +538,21 @@ topology_template:
       network.outgoing.bytes.rate_cmaui_port_3:
       - abstract_cmaui_1
       - network.outgoing.bytes.rate_cmaui_cmaui_port_3
-      disk.device.write.bytes.rate_server_cmaui_3_test_nested3Level:
-      - test_nested3Level
-      - disk.device.write.bytes.rate_server_cmaui_3
       disk.root.size_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - disk.root.size_server_cmaui_3
       network.outgoing.bytes.rate_cmaui_port_4:
       - abstract_cmaui_1
       - network.outgoing.bytes.rate_cmaui_cmaui_port_4
-      binding_cmaui_port_6_test_nested3Level:
-      - test_nested3Level
-      - binding_cmaui_port_6
-      disk.usage_server_cmaui_3_test_nested3Level:
-      - test_nested3Level
-      - disk.usage_server_cmaui_3
       os_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - os_server_cmaui_4_test_nested4Level
       disk.device.write.requests_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - disk.device.write.requests_server_cmaui_3
-      network.incoming.bytes_cmaui_port_4:
-      - abstract_cmaui_1
-      - network.incoming.bytes_cmaui_cmaui_port_4
-      network.incoming.bytes_cmaui_port_3:
-      - abstract_cmaui_1
-      - network.incoming.bytes_cmaui_cmaui_port_3
       disk.device.read.requests.rate_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - disk.device.read.requests.rate_server_cmaui_3
-      disk.device.latency_server_cmaui_3_test_nested3Level:
-      - test_nested3Level
-      - disk.device.latency_server_cmaui_3
-      cpu_util_server_cmaui_2:
-      - abstract_cmaui_1
-      - cpu_util_cmaui
       memory.usage_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - memory.usage_server_cmaui_4_test_nested4Level
@@ -391,51 +562,24 @@ topology_template:
       network.outgoing.bytes_cmaui_port_8_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.outgoing.bytes_cmaui_port_8_test_nested4Level
-      disk.device.write.bytes.rate_server_cmaui_2:
-      - abstract_cmaui_1
-      - disk.device.write.bytes.rate_cmaui
-      disk.write.bytes.rate_server_cmaui_2:
-      - abstract_cmaui_1
-      - disk.write.bytes.rate_cmaui
       disk.device.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - disk.device.read.bytes.rate_server_cmaui_4_test_nested4Level
-      vcpus_server_cmaui_4_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - vcpus_server_cmaui_4_test_nested4Level
       network.outpoing.packets_cmaui_port_8_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.outpoing.packets_cmaui_port_8_test_nested4Level
-      disk.device.write.bytes_server_cmaui_2:
-      - abstract_cmaui_1
-      - disk.device.write.bytes_cmaui
       feature_cmaui_port_7_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - feature_cmaui_port_7_test_nested4Level
       disk.iops_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - disk.iops_server_cmaui_3
-      network.incoming.packets.rate_cmaui_port_3:
-      - abstract_cmaui_1
-      - network.incoming.packets.rate_cmaui_cmaui_port_3
-      cpu_server_cmaui_3_test_nested3Level:
-      - test_nested3Level
-      - cpu_server_cmaui_3
-      feature_cmaui_port_3:
-      - abstract_cmaui_1
-      - feature_cmaui_cmaui_port_3
       disk.write.bytes_server_cmaui_2:
       - abstract_cmaui_1
       - disk.write.bytes_cmaui
-      network.incoming.packets.rate_cmaui_port_4:
-      - abstract_cmaui_1
-      - network.incoming.packets.rate_cmaui_cmaui_port_4
       feature_server_cmaui_2:
       - abstract_cmaui_1
       - feature_cmaui
-      feature_cmaui_port_4:
-      - abstract_cmaui_1
-      - feature_cmaui_cmaui_port_4
       attachment_cmaui_port_6_test_nested3Level:
       - test_nested3Level
       - attachment_cmaui_port_6
@@ -445,12 +589,6 @@ topology_template:
       disk.allocation_server_cmaui_2:
       - abstract_cmaui_1
       - disk.allocation_cmaui
-      disk.device.allocation_server_cmaui_4_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.device.allocation_server_cmaui_4_test_nested4Level
-      binding_server_cmaui_2:
-      - abstract_cmaui_1
-      - binding_cmaui
       vcpus_server_cmaui_2:
       - abstract_cmaui_1
       - vcpus_cmaui
@@ -466,12 +604,6 @@ topology_template:
       attachment_cmaui_port_4:
       - abstract_cmaui_1
       - attachment_cmaui_cmaui_port_4
-      scalable_server_cmaui_2:
-      - abstract_cmaui_1
-      - scalable_cmaui
-      disk.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.write.requests.rate_server_cmaui_4_test_nested4Level
       disk.capacity_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - disk.capacity_server_cmaui_4_test_nested4Level
@@ -481,18 +613,12 @@ topology_template:
       disk.device.read.bytes.rate_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - disk.device.read.bytes.rate_server_cmaui_3
-      network.incoming.packets.rate_cmaui_port_5_test_nested3Level:
-      - test_nested3Level
-      - network.incoming.packets.rate_cmaui_port_5
       disk.write.requests_server_cmaui_2:
       - abstract_cmaui_1
       - disk.write.requests_cmaui
       memory.resident_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - memory.resident_server_cmaui_4_test_nested4Level
-      network.outpoing.packets_cmaui_port_7_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - network.outpoing.packets_cmaui_port_7_test_nested4Level
       disk.usage_server_cmaui_2:
       - abstract_cmaui_1
       - disk.usage_cmaui
@@ -502,9 +628,6 @@ topology_template:
       disk.write.bytes_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - disk.write.bytes_server_cmaui_3
-      feature_server_cmaui_4_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - feature_server_cmaui_4_test_nested4Level
       network.incoming.bytes.rate_cmaui_port_8_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.incoming.bytes.rate_cmaui_port_8_test_nested4Level
@@ -514,66 +637,30 @@ topology_template:
       disk.write.requests.rate_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - disk.write.requests.rate_server_cmaui_3
-      disk.device.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.device.read.bytes_server_cmaui_4_test_nested4Level
-      endpoint_server_cmaui_2:
-      - abstract_cmaui_1
-      - endpoint_cmaui
       network.incoming.bytes_cmaui_port_6_test_nested3Level:
       - test_nested3Level
       - network.incoming.bytes_cmaui_port_6
       os_server_cmaui_2:
       - abstract_cmaui_1
       - os_cmaui
-      disk.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.read.requests_server_cmaui_4_test_nested4Level
-      scalable_server_cmaui_4_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - scalable_server_cmaui_4_test_nested4Level
-      network.incoming.packets.rate_cmaui_port_8_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - network.incoming.packets.rate_cmaui_port_8_test_nested4Level
       attachment_cmaui_port_5_test_nested3Level:
       - test_nested3Level
       - attachment_cmaui_port_5
-      disk.device.allocation_server_cmaui_2:
-      - abstract_cmaui_1
-      - disk.device.allocation_cmaui
       network.incoming.packets_cmaui_port_7_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.incoming.packets_cmaui_port_7_test_nested4Level
-      disk.device.latency_server_cmaui_4_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.device.latency_server_cmaui_4_test_nested4Level
-      disk.read.bytes_server_cmaui_3_test_nested3Level:
-      - test_nested3Level
-      - disk.read.bytes_server_cmaui_3
       disk.latency_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - disk.latency_server_cmaui_4_test_nested4Level
-      disk.device.allocation_server_cmaui_3_test_nested3Level:
-      - test_nested3Level
-      - disk.device.allocation_server_cmaui_3
-      network.incoming.bytes.rate_cmaui_port_5_test_nested3Level:
-      - test_nested3Level
-      - network.incoming.bytes.rate_cmaui_port_5
       host_server_cmaui_2:
       - abstract_cmaui_1
       - host_cmaui
-      os_server_cmaui_3_test_nested3Level:
-      - test_nested3Level
-      - os_server_cmaui_3
       disk.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - disk.read.bytes_server_cmaui_4_test_nested4Level
       disk.write.requests_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - disk.write.requests_server_cmaui_4_test_nested4Level
-      network.incoming.packets_cmaui_port_8_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - network.incoming.packets_cmaui_port_8_test_nested4Level
       binding_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - binding_server_cmaui_3
@@ -583,36 +670,18 @@ topology_template:
       network.outgoing.packets.rate_cmaui_port_8_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.outgoing.packets.rate_cmaui_port_8_test_nested4Level
-      cpu_server_cmaui_4_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - cpu_server_cmaui_4_test_nested4Level
       cpu.delta_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - cpu.delta_server_cmaui_3
       disk.device.capacity_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - disk.device.capacity_server_cmaui_3
-      disk.device.write.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.device.write.bytes.rate_server_cmaui_4_test_nested4Level
-      attachment_cmaui_port_8_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - attachment_cmaui_port_8_test_nested4Level
       scalable_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - scalable_server_cmaui_3
-      instance_server_cmaui_2:
-      - abstract_cmaui_1
-      - instance_cmaui
-      disk.device.iops_server_cmaui_3_test_nested3Level:
-      - test_nested3Level
-      - disk.device.iops_server_cmaui_3
       network.outgoing.bytes.rate_cmaui_port_7_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.outgoing.bytes.rate_cmaui_port_7_test_nested4Level
-      network.incoming.bytes_cmaui_port_5_test_nested3Level:
-      - test_nested3Level
-      - network.incoming.bytes_cmaui_port_5
       endpoint_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - endpoint_server_cmaui_3
@@ -625,75 +694,33 @@ topology_template:
       disk.allocation_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - disk.allocation_server_cmaui_4_test_nested4Level
-      network.outpoing.packets_cmaui_port_6_test_nested3Level:
-      - test_nested3Level
-      - network.outpoing.packets_cmaui_port_6
       network.outgoing.bytes_cmaui_port_4:
       - abstract_cmaui_1
       - network.outgoing.bytes_cmaui_cmaui_port_4
-      network.outgoing.packets.rate_cmaui_port_7_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - network.outgoing.packets.rate_cmaui_port_7_test_nested4Level
-      binding_cmaui_port_5_test_nested3Level:
-      - test_nested3Level
-      - binding_cmaui_port_5
       network.incoming.bytes.rate_cmaui_port_3:
       - abstract_cmaui_1
       - network.incoming.bytes.rate_cmaui_cmaui_port_3
       network.incoming.bytes.rate_cmaui_port_4:
       - abstract_cmaui_1
       - network.incoming.bytes.rate_cmaui_cmaui_port_4
-      disk.device.write.bytes_server_cmaui_3_test_nested3Level:
-      - test_nested3Level
-      - disk.device.write.bytes_server_cmaui_3
-      network.outgoing.bytes_cmaui_port_5_test_nested3Level:
-      - test_nested3Level
-      - network.outgoing.bytes_cmaui_port_5
-      disk.device.read.requests_server_cmaui_2:
-      - abstract_cmaui_1
-      - disk.device.read.requests_cmaui
       disk.device.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - disk.device.read.requests_server_cmaui_4_test_nested4Level
       disk.read.bytes.rate_server_cmaui_2:
       - abstract_cmaui_1
       - disk.read.bytes.rate_cmaui
-      network.outpoing.packets_cmaui_port_3:
-      - abstract_cmaui_1
-      - network.outpoing.packets_cmaui_cmaui_port_3
       disk.device.write.requests_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - disk.device.write.requests_server_cmaui_4_test_nested4Level
-      disk.capacity_server_cmaui_3_test_nested3Level:
-      - test_nested3Level
-      - disk.capacity_server_cmaui_3
-      cpu.delta_server_cmaui_2:
-      - abstract_cmaui_1
-      - cpu.delta_cmaui
       disk.device.read.requests.rate_server_cmaui_2:
       - abstract_cmaui_1
       - disk.device.read.requests.rate_cmaui
-      network.outpoing.packets_cmaui_port_4:
-      - abstract_cmaui_1
-      - network.outpoing.packets_cmaui_cmaui_port_4
       binding_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - binding_server_cmaui_4_test_nested4Level
-      network.incoming.bytes.rate_cmaui_port_7_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - network.incoming.bytes.rate_cmaui_port_7_test_nested4Level
       memory.resident_server_cmaui_2:
       - abstract_cmaui_1
       - memory.resident_cmaui
-      disk.device.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.device.write.requests.rate_server_cmaui_4_test_nested4Level
-      binding_cmaui_port_8_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - binding_cmaui_port_8_test_nested4Level
-      disk.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.write.bytes_server_cmaui_4_test_nested4Level
       disk.device.read.requests_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - disk.device.read.requests_server_cmaui_3
@@ -709,18 +736,9 @@ topology_template:
       disk.ephemeral.size_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - disk.ephemeral.size_server_cmaui_3
-      network.outgoing.packets.rate_cmaui_port_5_test_nested3Level:
-      - test_nested3Level
-      - network.outgoing.packets.rate_cmaui_port_5
-      disk.device.read.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
+      forwarder_cmaui_port_5_test_nested3Level:
       - test_nested3Level
-      - disk.device.read.requests.rate_server_cmaui_4_test_nested4Level
-      disk.device.read.bytes_server_cmaui_3_test_nested3Level:
-      - test_nested3Level
-      - disk.device.read.bytes_server_cmaui_3
-      memory.resident_server_cmaui_3_test_nested3Level:
-      - test_nested3Level
-      - memory.resident_server_cmaui_3
+      - forwarder_cmaui_port_5
       memory.usage_server_cmaui_2:
       - abstract_cmaui_1
       - memory.usage_cmaui
@@ -784,4 +802,4 @@ topology_template:
       - dependency_cmaui_cmaui_port_3
       dependency_cmaui_port_5_test_nested3Level:
       - test_nested3Level
-      - dependency_cmaui_port_5
\ No newline at end of file
+      - dependency_cmaui_port_5
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested3ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested3ServiceTemplate.yaml
index d8eca3f7f0..a68045fcea 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested3ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested3ServiceTemplate.yaml
@@ -176,9 +176,15 @@ topology_template:
       disk.device.latency_server_cmaui_3:
       - abstract_cmaui
       - disk.device.latency_cmaui
+      forwarder_cmaui_port_7_test_nested4Level:
+      - test_nested4Level
+      - forwarder_cmaui_port_7
       disk.read.requests_server_cmaui_4_test_nested4Level:
       - test_nested4Level
       - disk.read.requests_server_cmaui_4
+      forwarder_cmaui_port_8_test_nested4Level:
+      - test_nested4Level
+      - forwarder_cmaui_port_8
       disk.root.size_server_cmaui_3:
       - abstract_cmaui
       - disk.root.size_cmaui
@@ -458,12 +464,18 @@ topology_template:
       disk.device.latency_server_cmaui_4_test_nested4Level:
       - test_nested4Level
       - disk.device.latency_server_cmaui_4
+      forwarder_cmaui_port_6:
+      - abstract_cmaui
+      - forwarder_cmaui_cmaui_port_6
       disk.device.read.requests.rate_server_cmaui_4_test_nested4Level:
       - test_nested4Level
       - disk.device.read.requests.rate_server_cmaui_4
       disk.ephemeral.size_server_cmaui_4_test_nested4Level:
       - test_nested4Level
       - disk.ephemeral.size_server_cmaui_4
+      forwarder_cmaui_port_5:
+      - abstract_cmaui
+      - forwarder_cmaui_cmaui_port_5
       disk.device.allocation_server_cmaui_3:
       - abstract_cmaui
       - disk.device.allocation_cmaui
@@ -584,4 +596,4 @@ topology_template:
       - dependency_cmaui
       dependency_cmaui_port_5:
       - abstract_cmaui
-      - dependency_cmaui_cmaui_port_5
\ No newline at end of file
+      - dependency_cmaui_cmaui_port_5
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested4ServiceTemplate.yaml
index 1d43dd817b..257d8c7722 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested4ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested4ServiceTemplate.yaml
@@ -297,6 +297,12 @@ topology_template:
       disk.device.allocation_server_cmaui_4:
       - server_cmaui_4
       - disk.device.allocation
+      forwarder_cmaui_port_8:
+      - cmaui_port_8
+      - forwarder
+      forwarder_cmaui_port_7:
+      - cmaui_port_7
+      - forwarder
       disk.write.requests.rate_server_cmaui_4:
       - server_cmaui_4
       - disk.write.requests.rate
@@ -417,4 +423,4 @@ topology_template:
       - dependency
       local_storage_server_cmaui_4:
       - server_cmaui_4
-      - 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/nestedNodesConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 90dfb74a67..938583febf 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -292,6 +292,16 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_oam_port_0:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      forwarder_oam_port_1:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.usage_server_oam:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1007,6 +1017,16 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pcm_port_0:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      forwarder_pcm_port_1:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.read.bytes.rate_server_pcm:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1430,6 +1450,16 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_oam_port_0:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      forwarder_oam_port_1:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.usage_server_oam:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -2145,6 +2175,16 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pcm_port_0:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      forwarder_pcm_port_1:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.read.bytes.rate_server_pcm:
         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/nestedSingleCompute/nestedNodesConnectedIn/out/nested-oam_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/nested-oam_v0.1ServiceTemplate.yaml
index 1ea3bef5af..37a35b6a53 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/nested-oam_v0.1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/nested-oam_v0.1ServiceTemplate.yaml
@@ -293,6 +293,12 @@ topology_template:
       network.outgoing.bytes.rate_oam_port_1:
       - oam_port_1
       - network.outgoing.bytes.rate
+      forwarder_oam_port_0:
+      - oam_port_0
+      - forwarder
+      forwarder_oam_port_1:
+      - oam_port_1
+      - forwarder
       disk.device.usage_server_oam:
       - server_oam
       - disk.device.usage
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/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/nestedNodesConnectedIn/out/nested-pcm_v0.1ServiceTemplate.yaml
index c858e3ec56..ed7bb6c11e 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/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/nestedNodesConnectedIn/out/nested-pcm_v0.1ServiceTemplate.yaml
@@ -369,6 +369,12 @@ topology_template:
       disk.iops_server_pcm:
       - server_pcm
       - disk.iops
+      forwarder_pcm_port_0:
+      - pcm_port_0
+      - forwarder
+      forwarder_pcm_port_1:
+      - pcm_port_1
+      - forwarder
       disk.read.bytes.rate_server_pcm:
       - server_pcm
       - disk.read.bytes.rate
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 2a56194be9..19bf6af97c 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -443,6 +443,16 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pcm_port_0:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      forwarder_pcm_port_1:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.read.bytes.rate_server_pcm:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1091,6 +1101,16 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pcm_port_00:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      forwarder_pcm_port_01:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.latency_server_oam:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1576,6 +1596,16 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pcm_port_0:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      forwarder_pcm_port_1:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.read.bytes.rate_server_pcm:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -2016,4 +2046,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/nestedNodesGetAttrIn/out/nested-oam_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/nested-oam_v0.1ServiceTemplate.yaml
index 5abcd8ca3b..bb22e48d0a 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/nested-oam_v0.1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/nested-oam_v0.1ServiceTemplate.yaml
@@ -402,6 +402,12 @@ topology_template:
       disk.device.capacity_server_oam:
       - server_oam
       - disk.device.capacity
+      forwarder_pcm_port_00:
+      - pcm_port_00
+      - forwarder
+      forwarder_pcm_port_01:
+      - pcm_port_01
+      - forwarder
       disk.latency_server_oam:
       - server_oam
       - disk.latency
@@ -444,4 +450,4 @@ topology_template:
       - link
       dependency_server_oam:
       - server_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/nestedSingleCompute/nestedNodesGetAttrIn/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/nestedNodesGetAttrIn/out/nested-pcm_v0.1ServiceTemplate.yaml
index bd196677ef..4ae500bb53 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/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/nestedNodesGetAttrIn/out/nested-pcm_v0.1ServiceTemplate.yaml
@@ -376,6 +376,12 @@ topology_template:
       disk.iops_server_pcm:
       - server_pcm
       - disk.iops
+      forwarder_pcm_port_0:
+      - pcm_port_0
+      - forwarder
+      forwarder_pcm_port_1:
+      - pcm_port_1
+      - forwarder
       disk.read.bytes.rate_server_pcm:
       - server_pcm
       - disk.read.bytes.rate
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
index cf58502a77..7a2181b31f 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -438,6 +438,16 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pcm_port_0:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      forwarder_pcm_port_1:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.read.bytes.rate_server_pcm:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1086,6 +1096,16 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pcm_port_00:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      forwarder_pcm_port_01:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.latency_server_oam:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1566,6 +1586,16 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pcm_port_0:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      forwarder_pcm_port_1:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.read.bytes.rate_server_pcm:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1994,4 +2024,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/nestedOutputParamGetAttrIn/out/nested-oam_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/nested-oam_v0.1ServiceTemplate.yaml
index 5abcd8ca3b..bb22e48d0a 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/nested-oam_v0.1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/nested-oam_v0.1ServiceTemplate.yaml
@@ -402,6 +402,12 @@ topology_template:
       disk.device.capacity_server_oam:
       - server_oam
       - disk.device.capacity
+      forwarder_pcm_port_00:
+      - pcm_port_00
+      - forwarder
+      forwarder_pcm_port_01:
+      - pcm_port_01
+      - forwarder
       disk.latency_server_oam:
       - server_oam
       - disk.latency
@@ -444,4 +450,4 @@ topology_template:
       - link
       dependency_server_oam:
       - server_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/nestedSingleCompute/nestedOutputParamGetAttrIn/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/nestedOutputParamGetAttrIn/out/nested-pcm_v0.1ServiceTemplate.yaml
index 63ed0d5319..00424ac7af 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/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/nestedOutputParamGetAttrIn/out/nested-pcm_v0.1ServiceTemplate.yaml
@@ -370,6 +370,12 @@ topology_template:
       disk.iops_server_pcm:
       - server_pcm
       - disk.iops
+      forwarder_pcm_port_0:
+      - pcm_port_0
+      - forwarder
+      forwarder_pcm_port_1:
+      - pcm_port_1
+      - forwarder
       disk.read.bytes.rate_server_pcm:
       - server_pcm
       - disk.read.bytes.rate
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 16dda32915..8e4a86e326 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
@@ -428,6 +428,16 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pcm_port_0:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      forwarder_pcm_port_1:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.read.bytes.rate_server_pcm:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -802,6 +812,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_compute_compute_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.incoming.packets_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.
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 fc08135089..e067cb55ac 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
@@ -207,6 +207,9 @@ topology_template:
       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
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-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/nested-pcm_v0.1ServiceTemplate.yaml
index d999e227be..f9522f3c5c 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/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/nestedWithOneCompute/out/nested-pcm_v0.1ServiceTemplate.yaml
@@ -358,6 +358,12 @@ topology_template:
       disk.iops_server_pcm:
       - server_pcm
       - disk.iops
+      forwarder_pcm_port_0:
+      - pcm_port_0
+      - forwarder
+      forwarder_pcm_port_1:
+      - pcm_port_1
+      - forwarder
       disk.read.bytes.rate_server_pcm:
       - server_pcm
       - disk.read.bytes.rate
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneComputeDiffPortType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneComputeDiffPortType/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 060e2ed852..ca53e2c90c 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneComputeDiffPortType/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneComputeDiffPortType/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -287,6 +287,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pcm_2port_1:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.incoming.packets_pcm_2port_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -364,6 +369,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pcm_1port_0:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.read.bytes_server_pcm:
         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/nestedSingleCompute/nestedWithOneComputeDiffPortType/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/nestedWithOneComputeDiffPortType/out/nested-pcm_v0.1ServiceTemplate.yaml
index ce637db1de..866ceacfb4 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneComputeDiffPortType/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/nestedWithOneComputeDiffPortType/out/nested-pcm_v0.1ServiceTemplate.yaml
@@ -286,6 +286,9 @@ topology_template:
       disk.allocation_server_pcm:
       - server_pcm
       - disk.allocation
+      forwarder_pcm_2port_1:
+      - pcm_2port_1
+      - forwarder
       network.incoming.packets_pcm_2port_1:
       - pcm_2port_1
       - network.incoming.packets
@@ -325,6 +328,9 @@ topology_template:
       disk.read.bytes_server_pcm:
       - server_pcm
       - disk.read.bytes
+      forwarder_pcm_1port_0:
+      - pcm_1port_0
+      - forwarder
       disk.device.read.bytes_server_pcm:
       - server_pcm
       - disk.device.read.bytes
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 181027f032..ea59bc8bfe 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
@@ -296,6 +296,11 @@ node_types:
         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.
@@ -1045,6 +1050,16 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pcm_port_0:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      forwarder_pcm_port_1:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.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.
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 25680dacf9..4252b6221d 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
@@ -232,6 +232,9 @@ topology_template:
       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
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 2a3be24233..bb6490a5ef 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
@@ -430,6 +430,12 @@ topology_template:
       cpu.delta_server_pcm_2:
       - abstract_pcm_server_0
       - cpu.delta_pcm_server
+      forwarder_pcm_port_0:
+      - abstract_pcm_server_1
+      - forwarder_pcm_server_pcm_port
+      forwarder_pcm_port_1:
+      - abstract_pcm_server_0
+      - forwarder_pcm_server_pcm_port
       disk.device.write.requests.rate_server_pcm_2:
       - abstract_pcm_server_0
       - disk.device.write.requests.rate_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 fb024af4d2..84d7863050 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
@@ -131,6 +131,11 @@ node_types:
         - 1
         - 1
     capabilities:
+      forwarder_pd_server_pcm_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       scalable_pd_server:
         type: tosca.capabilities.Scalable
         occurrences:
@@ -729,6 +734,11 @@ node_types:
         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.
@@ -1482,6 +1492,16 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pcm_port_0:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      forwarder_pcm_port_1:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       memory.resident_server_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.
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 25680dacf9..4252b6221d 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
@@ -232,6 +232,9 @@ topology_template:
       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
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 a24126f7b2..8d5b37f4cb 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
@@ -148,6 +148,9 @@ 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
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 a2031c2812..8e26dac997 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
@@ -442,6 +442,12 @@ topology_template:
       cpu.delta_server_pcm_0:
       - abstract_pcm_server
       - cpu.delta_pcm_server
+      forwarder_pcm_port_0:
+      - abstract_pcm_server
+      - forwarder_pcm_server_pcm_port
+      forwarder_pcm_port_1:
+      - abstract_pd_server
+      - forwarder_pd_server_pcm_port
       memory.resident_server_pd_0:
       - abstract_pd_server
       - memory.resident_pd_server
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 2ebfbde147..eeb29c1c14 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -410,6 +410,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pcm_port_11:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.read.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.
@@ -506,6 +511,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pcm_port_01:
+        type: org.openecomp.capabilities.Forwarder
+        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.
@@ -969,6 +979,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pcm_port_12:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.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.
@@ -1059,6 +1074,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pcm_port_02:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       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.
@@ -1546,6 +1566,16 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pcm_port_0:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      forwarder_pcm_port_1:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.read.bytes.rate_server_pcm:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1681,4 +1711,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/threeNestedPointingToThreeDiffNestedFilesSameComputeType/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/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.1ServiceTemplate.yaml
index 8f2e3460e3..38642e8085 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/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/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.1ServiceTemplate.yaml
@@ -358,6 +358,12 @@ topology_template:
       disk.iops_server_pcm:
       - server_pcm
       - disk.iops
+      forwarder_pcm_port_0:
+      - pcm_port_0
+      - forwarder
+      forwarder_pcm_port_1:
+      - pcm_port_1
+      - forwarder
       disk.read.bytes.rate_server_pcm:
       - server_pcm
       - disk.read.bytes.rate
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.2ServiceTemplate.yaml
index 57edbcf4aa..cb42268375 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.2ServiceTemplate.yaml
@@ -349,6 +349,9 @@ topology_template:
       disk.device.capacity_server_pcm_1:
       - server_pcm_1
       - disk.device.capacity
+      forwarder_pcm_port_11:
+      - pcm_port_11
+      - forwarder
       disk.read.requests_server_pcm_1:
       - server_pcm_1
       - disk.read.requests
@@ -397,6 +400,9 @@ topology_template:
       disk.device.write.requests_server_pcm_1:
       - server_pcm_1
       - disk.device.write.requests
+      forwarder_pcm_port_01:
+      - pcm_port_01
+      - forwarder
       disk.write.bytes_server_pcm_1:
       - server_pcm_1
       - disk.write.bytes
@@ -445,4 +451,4 @@ topology_template:
       - link
       local_storage_server_pcm_1:
       - server_pcm_1
-      - 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/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.3ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.3ServiceTemplate.yaml
index a938a898f4..e4e97f1d85 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.3ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.3ServiceTemplate.yaml
@@ -349,6 +349,9 @@ topology_template:
       cpu.delta_server_pcm_2:
       - server_pcm_2
       - cpu.delta
+      forwarder_pcm_port_12:
+      - pcm_port_12
+      - forwarder
       disk.device.write.requests.rate_server_pcm_2:
       - server_pcm_2
       - disk.device.write.requests.rate
@@ -394,6 +397,9 @@ topology_template:
       disk.device.usage_server_pcm_2:
       - server_pcm_2
       - disk.device.usage
+      forwarder_pcm_port_02:
+      - pcm_port_02
+      - forwarder
       disk.device.write.requests_server_pcm_2:
       - server_pcm_2
       - disk.device.write.requests
@@ -445,4 +451,4 @@ topology_template:
       - link
       local_storage_server_pcm_2:
       - server_pcm_2
-      - 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/threeNestedSameTypeTwoPointingOnSameNestedFile/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 0c714840ed..f902040da6 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -410,6 +410,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pcm_port_11:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.read.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.
@@ -506,6 +511,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pcm_port_01:
+        type: org.openecomp.capabilities.Forwarder
+        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.
@@ -987,6 +997,16 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pcm_port_0:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      forwarder_pcm_port_1:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.read.bytes.rate_server_pcm:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1528,6 +1548,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pcm_port_11:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.read.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.
@@ -1624,6 +1649,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pcm_port_01:
+        type: org.openecomp.capabilities.Forwarder
+        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.
@@ -1681,4 +1711,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/threeNestedSameTypeTwoPointingOnSameNestedFile/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/threeNestedSameTypeTwoPointingOnSameNestedFile/out/nested-pcm_v0.1ServiceTemplate.yaml
index 1e198d3bda..31241fa35d 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/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/threeNestedSameTypeTwoPointingOnSameNestedFile/out/nested-pcm_v0.1ServiceTemplate.yaml
@@ -349,6 +349,9 @@ topology_template:
       disk.device.capacity_server_pcm_1:
       - server_pcm_1
       - disk.device.capacity
+      forwarder_pcm_port_11:
+      - pcm_port_11
+      - forwarder
       disk.read.requests_server_pcm_1:
       - server_pcm_1
       - disk.read.requests
@@ -397,6 +400,9 @@ topology_template:
       disk.device.write.requests_server_pcm_1:
       - server_pcm_1
       - disk.device.write.requests
+      forwarder_pcm_port_01:
+      - pcm_port_01
+      - forwarder
       disk.write.bytes_server_pcm_1:
       - server_pcm_1
       - disk.write.bytes
@@ -445,4 +451,4 @@ topology_template:
       - link
       local_storage_server_pcm_1:
       - server_pcm_1
-      - 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/threeNestedSameTypeTwoPointingOnSameNestedFile/out/nested-pcm_v0.2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/nested-pcm_v0.2ServiceTemplate.yaml
index 95920310e1..7e16cca168 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/nested-pcm_v0.2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/nested-pcm_v0.2ServiceTemplate.yaml
@@ -358,6 +358,12 @@ topology_template:
       disk.iops_server_pcm:
       - server_pcm
       - disk.iops
+      forwarder_pcm_port_0:
+      - pcm_port_0
+      - forwarder
+      forwarder_pcm_port_1:
+      - pcm_port_1
+      - forwarder
       disk.read.bytes.rate_server_pcm:
       - server_pcm
       - disk.read.bytes.rate
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/twoNestedNodeTemplatesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/twoNestedNodeTemplatesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 92ea0fa5e7..c5748afcc2 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/twoNestedNodeTemplatesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/twoNestedNodeTemplatesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -428,6 +428,16 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pcm_port_0:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      forwarder_pcm_port_1:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.read.bytes.rate_server_pcm:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -987,6 +997,16 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pcm_port_0:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      forwarder_pcm_port_1:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.read.bytes.rate_server_pcm:
         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/nestedSingleCompute/twoNestedNodeTemplatesWithSameComputeType/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/twoNestedNodeTemplatesWithSameComputeType/out/nested-pcm_v0.1ServiceTemplate.yaml
index d999e227be..f9522f3c5c 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/twoNestedNodeTemplatesWithSameComputeType/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/twoNestedNodeTemplatesWithSameComputeType/out/nested-pcm_v0.1ServiceTemplate.yaml
@@ -358,6 +358,12 @@ topology_template:
       disk.iops_server_pcm:
       - server_pcm
       - disk.iops
+      forwarder_pcm_port_0:
+      - pcm_port_0
+      - forwarder
+      forwarder_pcm_port_1:
+      - pcm_port_1
+      - forwarder
       disk.read.bytes.rate_server_pcm:
       - server_pcm
       - disk.read.bytes.rate
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 a1c235a298..2aab911a51 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
@@ -373,6 +373,11 @@ node_types:
         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.
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 0697590ca1..934495ab29 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
@@ -261,6 +261,9 @@ topology_template:
       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
@@ -300,4 +303,4 @@ topology_template:
       - dependency
       dependency_pd_server:
       - pd_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/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 d5852c9cff..0cab2c17b7 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
@@ -383,6 +383,11 @@ node_types:
         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.
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 c7acba7304..e83e81c207 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
@@ -280,6 +280,9 @@ topology_template:
       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
@@ -319,4 +322,4 @@ topology_template:
       - dependency
       dependency_pd_server:
       - pd_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/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 d4331dac27..992a6c7131 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
@@ -379,6 +379,11 @@ node_types:
         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.
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 ba05594fba..cfe0c56ce1 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
@@ -270,6 +270,9 @@ topology_template:
       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
@@ -309,4 +312,4 @@ topology_template:
       - dependency
       dependency_pd_server:
       - pd_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/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 712c687aad..63a1e1964a 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
@@ -361,6 +361,11 @@ node_types:
         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.
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 95d23bdd9a..36669edf18 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
@@ -251,6 +251,9 @@ topology_template:
       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
@@ -290,4 +293,4 @@ topology_template:
       - dependency
       dependency_pd_server:
       - pd_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/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 0d04a1e8fc..413b91c5ce 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
@@ -379,6 +379,11 @@ node_types:
         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.
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 397b51d417..ba596578fc 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
@@ -270,6 +270,9 @@ topology_template:
       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
@@ -309,4 +312,4 @@ topology_template:
       - dependency
       dependency_pd_server:
       - pd_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/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 a1c235a298..2aab911a51 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
@@ -373,6 +373,11 @@ node_types:
         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.
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 0697590ca1..934495ab29 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
@@ -261,6 +261,9 @@ topology_template:
       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
@@ -300,4 +303,4 @@ topology_template:
       - dependency
       dependency_pd_server:
       - pd_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/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 ddf141a6e9..136beed812 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
@@ -379,6 +379,11 @@ node_types:
         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.
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 3e84b50667..3930dd96bd 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
@@ -270,6 +270,9 @@ topology_template:
       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
@@ -309,4 +312,4 @@ topology_template:
       - dependency
       dependency_pd_server:
       - pd_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/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 de1531b142..cec889b729 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
@@ -383,6 +383,11 @@ node_types:
         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.
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 e44b91264d..2c5375f7a2 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
@@ -280,6 +280,9 @@ topology_template:
       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
@@ -319,4 +322,4 @@ topology_template:
       - dependency
       dependency_pd_server:
       - pd_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/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 ef0e8f7dba..367c3bb280 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
@@ -373,6 +373,11 @@ node_types:
         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.
@@ -794,6 +799,11 @@ node_types:
         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.
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 0697590ca1..934495ab29 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
@@ -261,6 +261,9 @@ topology_template:
       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
@@ -300,4 +303,4 @@ topology_template:
       - dependency
       dependency_pd_server:
       - pd_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/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 aa5603bd24..fe95a3ba16 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
@@ -261,6 +261,9 @@ topology_template:
       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
@@ -300,4 +303,4 @@ topology_template:
       - dependency
       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/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 8e61b49e92..1d716d84ee 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
@@ -377,6 +377,11 @@ node_types:
         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.
@@ -802,6 +807,11 @@ node_types:
         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.
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 98994bed1f..2926457146 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
@@ -268,6 +268,9 @@ topology_template:
       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
@@ -307,4 +310,4 @@ topology_template:
       - dependency
       dependency_pd_server:
       - pd_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/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 dc0249cf2b..0f7eac2983 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
@@ -268,6 +268,9 @@ topology_template:
       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
@@ -307,4 +310,4 @@ topology_template:
       - dependency
       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 b484bfb791..7dbab7d7a4 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
@@ -344,6 +344,11 @@ 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.
@@ -475,6 +480,11 @@ node_types:
         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.
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 0d10b90596..00419c0525 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
@@ -274,6 +274,9 @@ topology_template:
       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
@@ -340,6 +343,9 @@ topology_template:
       attachment_pd_server_pd02_port:
       - pd_server_pd02_port
       - attachment
+      forwarder_pd_server_pd01_port:
+      - pd_server_pd01_port
+      - forwarder
       disk.write.requests.rate_pd_server:
       - pd_server
       - disk.write.requests.rate
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/GlobalSubstitutionTypesServiceTemplate.yaml
index b88f5d84f4..5514ce8ca4 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -198,6 +198,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_smp_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       host_smp:
         type: tosca.capabilities.Container
         valid_source_types:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/Nested_smpServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/Nested_smpServiceTemplate.yaml
index 6277e3744c..643df5c578 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/Nested_smpServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/Nested_smpServiceTemplate.yaml
@@ -186,6 +186,9 @@ topology_template:
       instance_smp:
       - smp
       - instance
+      forwarder_smp_port:
+      - smp_port
+      - forwarder
       host_smp:
       - smp
       - host
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 087649ff59..dd48197c81 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
@@ -368,6 +368,11 @@ 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.
@@ -499,6 +504,11 @@ node_types:
         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.
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 5857ef7b5a..06a1b7af44 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
@@ -310,6 +310,9 @@ topology_template:
       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
@@ -376,6 +379,9 @@ topology_template:
       attachment_pd_server_pd02_port:
       - pd_server_pd02_port
       - attachment
+      forwarder_pd_server_pd01_port:
+      - pd_server_pd01_port
+      - forwarder
       disk.write.requests.rate_pd_server:
       - pd_server
       - disk.write.requests.rate
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 9be0ebfb48..6731149a49 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
@@ -356,6 +356,11 @@ 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.
@@ -487,6 +492,11 @@ node_types:
         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.
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 fe4e93f71c..928c92c06a 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
@@ -292,6 +292,9 @@ topology_template:
       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
@@ -358,6 +361,9 @@ topology_template:
       attachment_pd_server_pd02_port:
       - pd_server_pd02_port
       - attachment
+      forwarder_pd_server_pd01_port:
+      - pd_server_pd01_port
+      - forwarder
       disk.write.requests.rate_pd_server:
       - pd_server
       - disk.write.requests.rate
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 3bdd9e6fc1..10c7550905 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
@@ -375,6 +375,16 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pd_server_pd01_port_0:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      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.
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 350c40b3db..c747cc3d9f 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
@@ -313,6 +313,12 @@ topology_template:
       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
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 50a0b6a382..8add335fc5 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
@@ -363,6 +363,16 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pd_server_pd01_port_0:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      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.
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 0e86d21f05..7c391c928b 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
@@ -295,6 +295,12 @@ topology_template:
       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
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 023b48b2a7..fd377108d4 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
@@ -344,6 +344,11 @@ 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.
@@ -475,6 +480,11 @@ node_types:
         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.
@@ -995,6 +1005,16 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pcm_port_0:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      forwarder_pcm_port_1:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.read.bytes.rate_server_pcm:
         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/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 0d10b90596..00419c0525 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
@@ -274,6 +274,9 @@ topology_template:
       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
@@ -340,6 +343,9 @@ topology_template:
       attachment_pd_server_pd02_port:
       - pd_server_pd02_port
       - attachment
+      forwarder_pd_server_pd01_port:
+      - pd_server_pd01_port
+      - forwarder
       disk.write.requests.rate_pd_server:
       - pd_server
       - disk.write.requests.rate
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-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/nested-pcm_v0.1ServiceTemplate.yaml
index c5f8fcc241..b31492fa74 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/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/singleSubstitution/computewithtwodiffporttypesandnested/out/nested-pcm_v0.1ServiceTemplate.yaml
@@ -385,6 +385,12 @@ topology_template:
       disk.iops_server_pcm:
       - server_pcm
       - disk.iops
+      forwarder_pcm_port_0:
+      - pcm_port_0
+      - forwarder
+      forwarder_pcm_port_1:
+      - pcm_port_1
+      - forwarder
       disk.read.bytes.rate_server_pcm:
       - server_pcm
       - disk.read.bytes.rate
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 5278a654c0..4fd00d5da4 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
@@ -351,6 +351,16 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pd_server_pd01_port_0:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      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.
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 5e077ce856..0d10fd3cc9 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
@@ -277,6 +277,12 @@ topology_template:
       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
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes2/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes2/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 20df35a8e9..7ddb4b000a 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes2/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes2/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -349,6 +349,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pd_server_pd_2_port_1:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       binding_pd_server:
         type: tosca.capabilities.network.Bindable
         occurrences:
@@ -540,3 +545,8 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pd_server_pd_1_port_0:
+        type: org.openecomp.capabilities.Forwarder
+        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/computewithtwosameporttypes2/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/computewithtwosameporttypes2/out/Nested_pd_serverServiceTemplate.yaml
index 5a050d8fd3..e8e3a93ee6 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes2/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/computewithtwosameporttypes2/out/Nested_pd_serverServiceTemplate.yaml
@@ -277,6 +277,9 @@ topology_template:
       disk.allocation_pd_server:
       - pd_server
       - disk.allocation
+      forwarder_pd_server_pd_2_port_1:
+      - pd_server_pd_2_port_1
+      - forwarder
       binding_pd_server:
       - pd_server
       - binding
@@ -373,6 +376,9 @@ topology_template:
       disk.device.iops_pd_server:
       - pd_server
       - disk.device.iops
+      forwarder_pd_server_pd_1_port_0:
+      - pd_server_pd_1_port_0
+      - forwarder
     requirements:
       local_storage_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/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 30969f017c..8959f2fece 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
@@ -220,12 +220,22 @@ node_types:
         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:
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 580e287e32..105dabef73 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
@@ -211,9 +211,15 @@ topology_template:
       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
       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
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes4/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes4/out/GlobalSubstitutionTypesServiceTemplate.yaml
index f247a660e4..76856f62be 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes4/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes4/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -345,6 +345,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pd_server_pd01_port1:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.incoming.packets_pd_server_pd01_port2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -356,6 +361,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pd_server_pd01_port2:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - 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.
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes4/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/computewithtwosameporttypes4/out/Nested_pd_serverServiceTemplate.yaml
index 5bbc5b78f2..322991e37b 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes4/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/computewithtwosameporttypes4/out/Nested_pd_serverServiceTemplate.yaml
@@ -274,12 +274,18 @@ topology_template:
       network.outgoing.packets.rate_pd_server_pd01_port2:
       - pd_server_pd01_port2
       - network.outgoing.packets.rate
+      forwarder_pd_server_pd01_port1:
+      - pd_server_pd01_port1
+      - forwarder
       network.incoming.packets_pd_server_pd01_port2:
       - pd_server_pd01_port2
       - network.incoming.packets
       binding_pd_server:
       - pd_server
       - binding
+      forwarder_pd_server_pd01_port2:
+      - pd_server_pd01_port2
+      - forwarder
       disk.read.requests_pd_server:
       - pd_server
       - disk.read.requests
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 e68bf0fb94..b46537506a 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
@@ -354,6 +354,11 @@ 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.
@@ -485,6 +490,11 @@ node_types:
         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.
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 3886ccdec3..a5e8295de3 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
@@ -293,6 +293,9 @@ topology_template:
       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
@@ -359,6 +362,9 @@ topology_template:
       attachment_pd_server_pd02_port:
       - pd_server_pd02_port
       - attachment
+      forwarder_pd_server_pd01_port:
+      - pd_server_pd01_port
+      - forwarder
       disk.write.requests.rate_pd_server:
       - pd_server
       - disk.write.requests.rate
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 6f8a16604a..4ba9976dee 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
@@ -765,6 +765,11 @@ node_types:
         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:
@@ -772,6 +777,11 @@ node_types:
         occurrences:
         - 0
         - 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.
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 803161a283..d27e8377ac 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
@@ -813,9 +813,15 @@ topology_template:
       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
       disk.write.requests.rate_pd_server:
       - pd_server
       - disk.write.requests.rate
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 31466870a4..d63c125f33 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
@@ -351,6 +351,11 @@ 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.
@@ -482,6 +487,11 @@ node_types:
         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.
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 df8aa8b721..0f136e5c38 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
@@ -287,6 +287,9 @@ topology_template:
       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
@@ -353,6 +356,9 @@ topology_template:
       attachment_pd_server_pd02_port:
       - pd_server_pd02_port
       - attachment
+      forwarder_pd_server_pd01_port:
+      - pd_server_pd01_port
+      - forwarder
       disk.write.requests.rate_pd_server:
       - pd_server
       - disk.write.requests.rate
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 b484bfb791..7dbab7d7a4 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
@@ -344,6 +344,11 @@ 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.
@@ -475,6 +480,11 @@ node_types:
         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.
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 0d10b90596..00419c0525 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
@@ -274,6 +274,9 @@ topology_template:
       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
@@ -340,6 +343,9 @@ topology_template:
       attachment_pd_server_pd02_port:
       - pd_server_pd02_port
       - attachment
+      forwarder_pd_server_pd01_port:
+      - pd_server_pd01_port
+      - forwarder
       disk.write.requests.rate_pd_server:
       - pd_server
       - disk.write.requests.rate
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 5278a654c0..4fd00d5da4 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
@@ -351,6 +351,16 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pd_server_pd01_port_0:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      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.
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 5e077ce856..0d10fd3cc9 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
@@ -277,6 +277,12 @@ topology_template:
       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
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 deb8b3db25..7629f5d14d 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
@@ -361,6 +361,16 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pd_server_pd01_port_0:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      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.
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 5463958e8b..c74bb74310 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
@@ -296,6 +296,12 @@ topology_template:
       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
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 3cf557e3a7..7c21a09074 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
@@ -361,6 +361,16 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pd_server_pd01_port_0:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      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.
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 05c23cd4c6..54aaaadf4b 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
@@ -296,6 +296,12 @@ topology_template:
       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
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 242eb47cbc..d68f8cb73e 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
@@ -386,6 +386,11 @@ node_types:
         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.
@@ -642,6 +647,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_oam_server_pd01_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       cpu_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.
@@ -1117,6 +1127,11 @@ node_types:
         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.
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 df2ae323fb..265f7f8dd7 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
@@ -187,6 +187,9 @@ topology_template:
       disk.write.requests_oam_server:
       - oam_server
       - disk.write.requests
+      forwarder_oam_server_pd01_port:
+      - oam_server_pd01_port
+      - forwarder
       cpu_oam_server:
       - oam_server
       - cpu
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 492b3a70e9..fda77955e2 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
@@ -283,6 +283,9 @@ topology_template:
       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
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 c2b5fb8501..36ae71b0d3 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
@@ -214,6 +214,9 @@ topology_template:
       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
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 ca9a33c87d..2ef752e55a 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
@@ -367,6 +367,11 @@ node_types:
         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.
@@ -607,6 +612,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_oam_server_pd01_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       cpu_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.
@@ -1063,6 +1073,11 @@ node_types:
         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.
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 c0a3980ab0..d723dc7db3 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
@@ -162,6 +162,9 @@ topology_template:
       disk.write.requests_oam_server:
       - oam_server
       - disk.write.requests
+      forwarder_oam_server_pd01_port:
+      - oam_server_pd01_port
+      - forwarder
       cpu_oam_server:
       - oam_server
       - cpu
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 0e0768c3c7..3d9ebd74ae 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
@@ -252,6 +252,9 @@ topology_template:
       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
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 aa9928dd53..b81ce072c3 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
@@ -183,6 +183,9 @@ topology_template:
       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
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 8a723e741d..817b61213e 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
@@ -361,6 +361,11 @@ node_types:
         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.
@@ -770,6 +775,11 @@ node_types:
         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.
@@ -1185,6 +1195,11 @@ node_types:
         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.
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 500f39ef1b..76a8b65cea 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
@@ -247,6 +247,9 @@ topology_template:
       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
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 17041c4d1c..3a972e27d4 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
@@ -247,6 +247,9 @@ topology_template:
       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
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 df51575d93..5a33098b0f 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
@@ -252,6 +252,9 @@ topology_template:
       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
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 892749544e..b75037b55b 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
@@ -367,6 +367,11 @@ node_types:
         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.
@@ -782,6 +787,11 @@ node_types:
         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.
@@ -1009,6 +1019,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pd_server_pd01_port_2:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       binding_pd_server_pd01_port_2:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
@@ -1016,6 +1031,11 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
+      forwarder_pd_server_pd01_port_3:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       binding_pd_server_pd01_port_3:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
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 0e0768c3c7..3d9ebd74ae 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
@@ -252,6 +252,9 @@ topology_template:
       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
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 a215d7a7fc..7dcab1874c 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
@@ -252,6 +252,9 @@ topology_template:
       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
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 b61051e289..9e80f46126 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
@@ -190,9 +190,15 @@ 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
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 0521146745..ee557cbfd7 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
@@ -371,6 +371,11 @@ node_types:
         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.
@@ -790,6 +795,11 @@ node_types:
         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.
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 7c76373e7f..6307a03202 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
@@ -259,6 +259,9 @@ topology_template:
       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
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 702fed35a9..bb6d0b7219 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
@@ -259,6 +259,9 @@ topology_template:
       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
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 8080962bc4..4ed112bddd 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
@@ -367,6 +367,11 @@ node_types:
         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.
@@ -782,6 +787,11 @@ node_types:
         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.
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 0e0768c3c7..3d9ebd74ae 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
@@ -252,6 +252,9 @@ topology_template:
       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
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 19bd905af0..03c433e0f4 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
@@ -252,6 +252,9 @@ topology_template:
       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
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/heatPseudoParameters/usedFromMainHeat/expectedoutputfiles/VSR_CPM_base_template_nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/heatPseudoParameters/usedFromMainHeat/expectedoutputfiles/VSR_CPM_base_template_nestedServiceTemplate.yaml
index 6cfd40fb6b..f400f5025c 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/heatPseudoParameters/usedFromMainHeat/expectedoutputfiles/VSR_CPM_base_template_nestedServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/heatPseudoParameters/usedFromMainHeat/expectedoutputfiles/VSR_CPM_base_template_nestedServiceTemplate.yaml
@@ -260,6 +260,9 @@ topology_template:
       disk.device.latency_CPM:
       - CPM
       - disk.device.latency
+      forwarder_cpm_mgt_0_port:
+      - cpm_mgt_0_port
+      - forwarder
       feature_CPM:
       - CPM
       - feature
@@ -314,6 +317,9 @@ topology_template:
       network.incoming.packets_cpm_mgt_0_port:
       - cpm_mgt_0_port
       - network.incoming.packets
+      forwarder_cpm_ctrl_fabric_0_port:
+      - cpm_ctrl_fabric_0_port
+      - forwarder
       feature_cpm_ctrl_fabric_0_port:
       - cpm_ctrl_fabric_0_port
       - feature
@@ -404,4 +410,4 @@ topology_template:
       - link
       link_cpm_ctrl_fabric_0_port:
       - cpm_ctrl_fabric_0_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/heatPseudoParameters/usedFromMainHeat/expectedoutputfiles/VSR_IOM_template_nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/heatPseudoParameters/usedFromMainHeat/expectedoutputfiles/VSR_IOM_template_nestedServiceTemplate.yaml
index fda8b20838..b384057c2a 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/heatPseudoParameters/usedFromMainHeat/expectedoutputfiles/VSR_IOM_template_nestedServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/heatPseudoParameters/usedFromMainHeat/expectedoutputfiles/VSR_IOM_template_nestedServiceTemplate.yaml
@@ -343,6 +343,9 @@ topology_template:
       binding_iom_ctrl_fabric_0_port:
       - iom_ctrl_fabric_0_port
       - binding
+      forwarder_iom_data_0_port:
+      - iom_data_0_port
+      - forwarder
       disk.read.bytes_IOM:
       - IOM
       - disk.read.bytes
@@ -412,6 +415,9 @@ topology_template:
       disk.write.requests.rate_IOM:
       - IOM
       - disk.write.requests.rate
+      forwarder_iom_data_1_port:
+      - iom_data_1_port
+      - forwarder
       network.incoming.packets_iom_ctrl_fabric_0_port:
       - iom_ctrl_fabric_0_port
       - network.incoming.packets
@@ -532,6 +538,9 @@ topology_template:
       network.outpoing.packets_iom_data_0_port:
       - iom_data_0_port
       - network.outpoing.packets
+      forwarder_iom_mgt_0_port:
+      - iom_mgt_0_port
+      - forwarder
       disk.device.write.bytes.rate_IOM:
       - IOM
       - disk.device.write.bytes.rate
@@ -541,6 +550,9 @@ topology_template:
       network.outgoing.packets.rate_iom_data_1_port:
       - iom_data_1_port
       - network.outgoing.packets.rate
+      forwarder_iom_data_3_port:
+      - iom_data_3_port
+      - forwarder
       disk.device.allocation_IOM:
       - IOM
       - disk.device.allocation
@@ -601,6 +613,9 @@ topology_template:
       disk.device.write.requests.rate_IOM:
       - IOM
       - disk.device.write.requests.rate
+      forwarder_iom_ctrl_fabric_0_port:
+      - iom_ctrl_fabric_0_port
+      - forwarder
       network.incoming.bytes_iom_data_1_port:
       - iom_data_1_port
       - network.incoming.bytes
@@ -640,6 +655,9 @@ topology_template:
       network.outgoing.bytes.rate_iom_data_3_port:
       - iom_data_3_port
       - network.outgoing.bytes.rate
+      forwarder_iom_data_2_port:
+      - iom_data_2_port
+      - forwarder
       memory_IOM:
       - IOM
       - memory
@@ -691,4 +709,4 @@ topology_template:
       - link
       local_storage_IOM:
       - IOM
-      - 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/heatPseudoParameters/usedFromNestedHeat/expectedoutputfiles/VSR_CPM_base_template_nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/heatPseudoParameters/usedFromNestedHeat/expectedoutputfiles/VSR_CPM_base_template_nestedServiceTemplate.yaml
index 6cfd40fb6b..f400f5025c 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/heatPseudoParameters/usedFromNestedHeat/expectedoutputfiles/VSR_CPM_base_template_nestedServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/heatPseudoParameters/usedFromNestedHeat/expectedoutputfiles/VSR_CPM_base_template_nestedServiceTemplate.yaml
@@ -260,6 +260,9 @@ topology_template:
       disk.device.latency_CPM:
       - CPM
       - disk.device.latency
+      forwarder_cpm_mgt_0_port:
+      - cpm_mgt_0_port
+      - forwarder
       feature_CPM:
       - CPM
       - feature
@@ -314,6 +317,9 @@ topology_template:
       network.incoming.packets_cpm_mgt_0_port:
       - cpm_mgt_0_port
       - network.incoming.packets
+      forwarder_cpm_ctrl_fabric_0_port:
+      - cpm_ctrl_fabric_0_port
+      - forwarder
       feature_cpm_ctrl_fabric_0_port:
       - cpm_ctrl_fabric_0_port
       - feature
@@ -404,4 +410,4 @@ topology_template:
       - link
       link_cpm_ctrl_fabric_0_port:
       - cpm_ctrl_fabric_0_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/heatPseudoParameters/usedFromNestedHeat/expectedoutputfiles/VSR_IOM_template_nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/heatPseudoParameters/usedFromNestedHeat/expectedoutputfiles/VSR_IOM_template_nestedServiceTemplate.yaml
index c6bb428b31..aefe6d5b4a 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/heatPseudoParameters/usedFromNestedHeat/expectedoutputfiles/VSR_IOM_template_nestedServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/heatPseudoParameters/usedFromNestedHeat/expectedoutputfiles/VSR_IOM_template_nestedServiceTemplate.yaml
@@ -347,6 +347,9 @@ topology_template:
       binding_iom_ctrl_fabric_0_port:
       - iom_ctrl_fabric_0_port
       - binding
+      forwarder_iom_data_0_port:
+      - iom_data_0_port
+      - forwarder
       disk.read.bytes_IOM:
       - IOM
       - disk.read.bytes
@@ -416,6 +419,9 @@ topology_template:
       disk.write.requests.rate_IOM:
       - IOM
       - disk.write.requests.rate
+      forwarder_iom_data_1_port:
+      - iom_data_1_port
+      - forwarder
       network.incoming.packets_iom_ctrl_fabric_0_port:
       - iom_ctrl_fabric_0_port
       - network.incoming.packets
@@ -536,6 +542,9 @@ topology_template:
       network.outpoing.packets_iom_data_0_port:
       - iom_data_0_port
       - network.outpoing.packets
+      forwarder_iom_mgt_0_port:
+      - iom_mgt_0_port
+      - forwarder
       disk.device.write.bytes.rate_IOM:
       - IOM
       - disk.device.write.bytes.rate
@@ -545,6 +554,9 @@ topology_template:
       network.outgoing.packets.rate_iom_data_1_port:
       - iom_data_1_port
       - network.outgoing.packets.rate
+      forwarder_iom_data_3_port:
+      - iom_data_3_port
+      - forwarder
       disk.device.allocation_IOM:
       - IOM
       - disk.device.allocation
@@ -605,6 +617,9 @@ topology_template:
       disk.device.write.requests.rate_IOM:
       - IOM
       - disk.device.write.requests.rate
+      forwarder_iom_ctrl_fabric_0_port:
+      - iom_ctrl_fabric_0_port
+      - forwarder
       network.incoming.bytes_iom_data_1_port:
       - iom_data_1_port
       - network.incoming.bytes
@@ -644,6 +659,9 @@ topology_template:
       network.outgoing.bytes.rate_iom_data_3_port:
       - iom_data_3_port
       - network.outgoing.bytes.rate
+      forwarder_iom_data_2_port:
+      - iom_data_2_port
+      - forwarder
       memory_IOM:
       - IOM
       - memory
@@ -695,4 +713,4 @@ topology_template:
       - link
       local_storage_IOM:
       - IOM
-      - 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/hot-nimbus-oam-volumes_v1.0/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/hot-nimbus-oam-volumes_v1.0/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 0e28138a0d..acb2ecf5ea 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/hot-nimbus-oam-volumes_v1.0/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/hot-nimbus-oam-volumes_v1.0/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -366,6 +366,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pcrf_pps_port_0:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.outpoing.packets_pcrf_pps_port_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -888,12 +893,27 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pcrf_ppd_port_7:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.outgoing.bytes.rate_pcrf_ppd_port_7:
         type: org.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_pcrf_ppd_port_6:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      forwarder_pcrf_ppd_port_5:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.outgoing.bytes.rate_pcrf_ppd_port_5:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -911,17 +931,42 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pcrf_ppd_port_4:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      forwarder_pcrf_ppd_port_3:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      forwarder_pcrf_ppd_port_2:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       os_pcrf_server_ppd:
         type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pcrf_ppd_port_1:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.capacity_pcrf_server_ppd:
         type: org.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_pcrf_ppd_port_0:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       endpoint_pcrf_server_ppd:
         type: tosca.capabilities.Endpoint.Admin
         occurrences:
@@ -1882,12 +1927,22 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pcrf_pcm_port_0:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       cpu_pcrf_server_pcm:
         type: org.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_pcrf_pcm_port_1:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.incoming.bytes.rate_pcrf_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.
@@ -2393,6 +2448,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pcrf_oam_port_1:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.outgoing.bytes_pcrf_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.
@@ -2428,6 +2488,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pcrf_oam_port_0:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
   org.openecomp.resource.abstract.nodes.heat.nested-psm_v1.0:
     derived_from: org.openecomp.resource.abstract.nodes.AbstractSubstitute
     properties:
@@ -2535,6 +2600,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_psm01_port_0:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.outgoing.bytes.rate_psm01_port_0:
         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/hot-nimbus-oam-volumes_v1.0/out/nested-oam_v1.0ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/hot-nimbus-oam-volumes_v1.0/out/nested-oam_v1.0ServiceTemplate.yaml
index d2c15dd6ca..dd402da1fb 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/hot-nimbus-oam-volumes_v1.0/out/nested-oam_v1.0ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/hot-nimbus-oam-volumes_v1.0/out/nested-oam_v1.0ServiceTemplate.yaml
@@ -359,6 +359,9 @@ topology_template:
       memory.usage_pcrf_server_oam:
       - pcrf_server_oam
       - memory.usage
+      forwarder_pcrf_oam_port_1:
+      - pcrf_oam_port_1
+      - forwarder
       network.outgoing.bytes_pcrf_oam_port_0:
       - pcrf_oam_port_0
       - network.outgoing.bytes
@@ -377,6 +380,9 @@ topology_template:
       network.outpoing.packets_pcrf_oam_port_1:
       - pcrf_oam_port_1
       - network.outpoing.packets
+      forwarder_pcrf_oam_port_0:
+      - pcrf_oam_port_0
+      - forwarder
     requirements:
       dependency_pcrf_server_oam:
       - pcrf_server_oam
@@ -395,4 +401,4 @@ topology_template:
       - dependency
       dependency_pcrf_oam_port_0:
       - pcrf_oam_port_0
-      - 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/hot-nimbus-oam-volumes_v1.0/out/nested-pcm_v1.0ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/hot-nimbus-oam-volumes_v1.0/out/nested-pcm_v1.0ServiceTemplate.yaml
index 71550c19cd..53e049a6f7 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/hot-nimbus-oam-volumes_v1.0/out/nested-pcm_v1.0ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/hot-nimbus-oam-volumes_v1.0/out/nested-pcm_v1.0ServiceTemplate.yaml
@@ -344,9 +344,15 @@ topology_template:
       network.incoming.bytes.rate_pcrf_pcm_port_1:
       - pcrf_pcm_port_1
       - network.incoming.bytes.rate
+      forwarder_pcrf_pcm_port_0:
+      - pcrf_pcm_port_0
+      - forwarder
       cpu_pcrf_server_pcm:
       - pcrf_server_pcm
       - cpu
+      forwarder_pcrf_pcm_port_1:
+      - pcrf_pcm_port_1
+      - forwarder
       network.incoming.bytes.rate_pcrf_pcm_port_0:
       - pcrf_pcm_port_0
       - network.incoming.bytes.rate
@@ -386,4 +392,4 @@ topology_template:
       - link
       link_pcrf_pcm_port_1:
       - pcrf_pcm_port_1
-      - 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/hot-nimbus-oam-volumes_v1.0/out/nested-ppd_v1.0ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/hot-nimbus-oam-volumes_v1.0/out/nested-ppd_v1.0ServiceTemplate.yaml
index fb5ab01933..a1591c5a42 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/hot-nimbus-oam-volumes_v1.0/out/nested-ppd_v1.0ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/hot-nimbus-oam-volumes_v1.0/out/nested-ppd_v1.0ServiceTemplate.yaml
@@ -553,9 +553,18 @@ topology_template:
       memory.resident_pcrf_server_ppd:
       - pcrf_server_ppd
       - memory.resident
+      forwarder_pcrf_ppd_port_7:
+      - pcrf_ppd_port_7
+      - forwarder
       network.outgoing.bytes.rate_pcrf_ppd_port_7:
       - pcrf_ppd_port_7
       - network.outgoing.bytes.rate
+      forwarder_pcrf_ppd_port_6:
+      - pcrf_ppd_port_6
+      - forwarder
+      forwarder_pcrf_ppd_port_5:
+      - pcrf_ppd_port_5
+      - forwarder
       network.outgoing.bytes.rate_pcrf_ppd_port_5:
       - pcrf_ppd_port_5
       - network.outgoing.bytes.rate
@@ -565,12 +574,27 @@ topology_template:
       network.outgoing.bytes.rate_pcrf_ppd_port_6:
       - pcrf_ppd_port_6
       - network.outgoing.bytes.rate
+      forwarder_pcrf_ppd_port_4:
+      - pcrf_ppd_port_4
+      - forwarder
+      forwarder_pcrf_ppd_port_3:
+      - pcrf_ppd_port_3
+      - forwarder
+      forwarder_pcrf_ppd_port_2:
+      - pcrf_ppd_port_2
+      - forwarder
       os_pcrf_server_ppd:
       - pcrf_server_ppd
       - os
+      forwarder_pcrf_ppd_port_1:
+      - pcrf_ppd_port_1
+      - forwarder
       disk.capacity_pcrf_server_ppd:
       - pcrf_server_ppd
       - disk.capacity
+      forwarder_pcrf_ppd_port_0:
+      - pcrf_ppd_port_0
+      - forwarder
       endpoint_pcrf_server_ppd:
       - pcrf_server_ppd
       - endpoint
@@ -892,4 +916,4 @@ topology_template:
       - dependency
       local_storage_pcrf_server_ppd:
       - pcrf_server_ppd
-      - 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/hot-nimbus-oam-volumes_v1.0/out/nested-pps_v1.0ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/hot-nimbus-oam-volumes_v1.0/out/nested-pps_v1.0ServiceTemplate.yaml
index 7b3334c368..3d7777ac8e 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/hot-nimbus-oam-volumes_v1.0/out/nested-pps_v1.0ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/hot-nimbus-oam-volumes_v1.0/out/nested-pps_v1.0ServiceTemplate.yaml
@@ -263,6 +263,9 @@ topology_template:
       memory_pcrf_server_pps:
       - pcrf_server_pps
       - memory
+      forwarder_pcrf_pps_port_0:
+      - pcrf_pps_port_0
+      - forwarder
       network.outpoing.packets_pcrf_pps_port_0:
       - pcrf_pps_port_0
       - network.outpoing.packets
@@ -287,4 +290,4 @@ topology_template:
       - dependency
       local_storage_pcrf_server_pps:
       - pcrf_server_pps
-      - 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/hot-nimbus-oam-volumes_v1.0/out/nested-psm_v1.0ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/hot-nimbus-oam-volumes_v1.0/out/nested-psm_v1.0ServiceTemplate.yaml
index 08e9ecc28e..a4ec4f30be 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/hot-nimbus-oam-volumes_v1.0/out/nested-psm_v1.0ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/hot-nimbus-oam-volumes_v1.0/out/nested-psm_v1.0ServiceTemplate.yaml
@@ -134,6 +134,9 @@ topology_template:
       disk.device.write.bytes.rate_pcrf_server_psm:
       - pcrf_server_psm
       - disk.device.write.bytes.rate
+      forwarder_psm01_port_0:
+      - psm01_port_0
+      - forwarder
       network.outgoing.bytes.rate_psm01_port_0:
       - psm01_port_0
       - network.outgoing.bytes.rate
@@ -287,4 +290,4 @@ topology_template:
       - dependency
       link_psm01_port_0:
       - psm01_port_0
-      - 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/novatovolumeconnection/innerHeatVolNestedMultiLevel/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innerHeatVolNestedMultiLevel/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index 3fc881856b..4ae2e898e9 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innerHeatVolNestedMultiLevel/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innerHeatVolNestedMultiLevel/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -426,6 +426,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_4_test_nested2Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.incoming.packets_cmaui_port_4_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.
@@ -679,6 +684,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_5_test_nested3Level_test_nested2Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.write.requests.rate_server_cmaui5_test_nested3Level_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.
@@ -805,6 +815,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_3_test_nested2Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.incoming.packets_cmaui_port_7_test_nested4Level_test_nested3Level_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.
@@ -1104,6 +1119,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.latency_server_cmaui5_test_nested3Level_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.
@@ -1585,6 +1605,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_6_test_nested3Level_test_nested2Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       memory_server_cmaui8_test_nested4Level_test_nested3Level_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.
@@ -1968,12 +1993,22 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_2:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.read.requests.rate_server_cmaui8_test_nested4Level_test_nested3Level_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_1:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.usage_server_cmaui1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -2062,6 +2097,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.capacity_server_cmaui4_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.
@@ -3605,6 +3645,16 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_4:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      forwarder_cmaui_port_3:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.latency_server_cmaui6_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -4025,12 +4075,22 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_6_test_nested3Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       memory_server_cmaui4:
         type: org.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_7_test_nested4Level_test_nested3Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.usage_server_cmaui6_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -4135,6 +4195,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_8_test_nested4Level_test_nested3Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.incoming.packets_cmaui_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.
@@ -4836,6 +4901,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_5_test_nested3Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       memory.usage_server_cmaui6_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -5056,12 +5126,22 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_7_test_nested4Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.capacity_server_cmaui8_test_nested4Level:
         type: org.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_8_test_nested4Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.allocation_server_cmaui8_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -5442,6 +5522,16 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_6:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      forwarder_cmaui_port_5:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.read.bytes_server_cmaui6:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -6773,6 +6863,16 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_8:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      forwarder_cmaui_port_7:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.allocation_server_cmaui8:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -6955,4 +7055,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/novatovolumeconnection/innerHeatVolNestedMultiLevel/expectedoutputfiles/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innerHeatVolNestedMultiLevel/expectedoutputfiles/nested1ServiceTemplate.yaml
index 0ff3b96235..a815a7d021 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innerHeatVolNestedMultiLevel/expectedoutputfiles/nested1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innerHeatVolNestedMultiLevel/expectedoutputfiles/nested1ServiceTemplate.yaml
@@ -233,6 +233,9 @@ topology_template:
       disk.allocation_server_cmaui8_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - disk.allocation_server_cmaui8_test_nested4Level_test_nested3Level
+      forwarder_cmaui_port_4_test_nested2Level:
+      - test_nested2Level
+      - forwarder_cmaui_port_4
       network.incoming.packets_cmaui_port_4_test_nested2Level:
       - test_nested2Level
       - network.incoming.packets_cmaui_port_4
@@ -362,6 +365,9 @@ topology_template:
       disk.write.bytes_server_cmaui8_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - disk.write.bytes_server_cmaui8_test_nested4Level_test_nested3Level
+      forwarder_cmaui_port_5_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - forwarder_cmaui_port_5_test_nested3Level
       disk.write.requests.rate_server_cmaui5_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - disk.write.requests.rate_server_cmaui5_test_nested3Level
@@ -425,6 +431,9 @@ topology_template:
       disk.device.read.bytes.rate_server_cmaui6_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - disk.device.read.bytes.rate_server_cmaui6_test_nested3Level
+      forwarder_cmaui_port_3_test_nested2Level:
+      - test_nested2Level
+      - forwarder_cmaui_port_3
       network.incoming.packets_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.incoming.packets_cmaui_port_7_test_nested4Level_test_nested3Level
@@ -578,6 +587,9 @@ topology_template:
       cpu.delta_server_cmaui6_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - cpu.delta_server_cmaui6_test_nested3Level
+      forwarder_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - forwarder_cmaui_port_7_test_nested4Level_test_nested3Level
       disk.device.latency_server_cmaui5_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - disk.device.latency_server_cmaui5_test_nested3Level
@@ -824,6 +836,9 @@ topology_template:
       disk.read.bytes.rate_server_cmaui4_test_nested2Level:
       - test_nested2Level
       - disk.read.bytes.rate_server_cmaui4
+      forwarder_cmaui_port_6_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - forwarder_cmaui_port_6_test_nested3Level
       memory_server_cmaui8_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - memory_server_cmaui8_test_nested4Level_test_nested3Level
@@ -1019,9 +1034,15 @@ topology_template:
       os_server_cmaui8_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - os_server_cmaui8_test_nested4Level_test_nested3Level
+      forwarder_cmaui_port_2:
+      - cmaui_port_2
+      - forwarder
       disk.device.read.requests.rate_server_cmaui8_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - disk.device.read.requests.rate_server_cmaui8_test_nested4Level_test_nested3Level
+      forwarder_cmaui_port_1:
+      - cmaui_port_1
+      - forwarder
       disk.device.usage_server_cmaui1:
       - server_cmaui1
       - disk.device.usage
@@ -1067,6 +1088,9 @@ topology_template:
       endpoint_server_cmaui2:
       - server_cmaui2
       - endpoint
+      forwarder_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - forwarder_cmaui_port_8_test_nested4Level_test_nested3Level
       disk.capacity_server_cmaui4_test_nested2Level:
       - test_nested2Level
       - disk.capacity_server_cmaui4
@@ -1529,4 +1553,4 @@ topology_template:
       - dependency_cmaui_port_4
       dependency_server_cmaui5_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - dependency_server_cmaui5_test_nested3Level
\ No newline at end of file
+      - dependency_server_cmaui5_test_nested3Level
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innerHeatVolNestedMultiLevel/expectedoutputfiles/nested2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innerHeatVolNestedMultiLevel/expectedoutputfiles/nested2ServiceTemplate.yaml
index b6c066b812..44ebbfff92 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innerHeatVolNestedMultiLevel/expectedoutputfiles/nested2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innerHeatVolNestedMultiLevel/expectedoutputfiles/nested2ServiceTemplate.yaml
@@ -481,6 +481,12 @@ topology_template:
       cpu.delta_server_cmaui8_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - cpu.delta_server_cmaui8_test_nested4Level
+      forwarder_cmaui_port_4:
+      - cmaui_port_4
+      - forwarder
+      forwarder_cmaui_port_3:
+      - cmaui_port_3
+      - forwarder
       disk.device.latency_server_cmaui6_test_nested3Level:
       - test_nested3Level
       - disk.device.latency_server_cmaui6
@@ -694,9 +700,15 @@ topology_template:
       memory_server_cmaui3:
       - server_cmaui3
       - memory
+      forwarder_cmaui_port_6_test_nested3Level:
+      - test_nested3Level
+      - forwarder_cmaui_port_6
       memory_server_cmaui4:
       - server_cmaui4
       - memory
+      forwarder_cmaui_port_7_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - forwarder_cmaui_port_7_test_nested4Level
       disk.usage_server_cmaui6_test_nested3Level:
       - test_nested3Level
       - disk.usage_server_cmaui6
@@ -751,6 +763,9 @@ topology_template:
       disk.allocation_server_cmaui3:
       - server_cmaui3
       - disk.allocation
+      forwarder_cmaui_port_8_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - forwarder_cmaui_port_8_test_nested4Level
       network.incoming.packets_cmaui_port_4:
       - cmaui_port_4
       - network.incoming.packets
@@ -1108,6 +1123,9 @@ topology_template:
       disk.device.read.requests.rate_server_cmaui3:
       - server_cmaui3
       - disk.device.read.requests.rate
+      forwarder_cmaui_port_5_test_nested3Level:
+      - test_nested3Level
+      - forwarder_cmaui_port_5
       memory.usage_server_cmaui6_test_nested3Level:
       - test_nested3Level
       - memory.usage_server_cmaui6
@@ -1189,4 +1207,4 @@ topology_template:
       - link_cmaui_port_7_test_nested4Level
       dependency_cmaui_port_5_test_nested3Level:
       - test_nested3Level
-      - dependency_cmaui_port_5
\ No newline at end of file
+      - dependency_cmaui_port_5
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innerHeatVolNestedMultiLevel/expectedoutputfiles/nested3ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innerHeatVolNestedMultiLevel/expectedoutputfiles/nested3ServiceTemplate.yaml
index 920856d15d..738262e312 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innerHeatVolNestedMultiLevel/expectedoutputfiles/nested3ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innerHeatVolNestedMultiLevel/expectedoutputfiles/nested3ServiceTemplate.yaml
@@ -189,9 +189,15 @@ topology_template:
       host_server_cmaui6:
       - server_cmaui6
       - host
+      forwarder_cmaui_port_7_test_nested4Level:
+      - test_nested4Level
+      - forwarder_cmaui_port_7
       disk.device.capacity_server_cmaui8_test_nested4Level:
       - test_nested4Level
       - disk.device.capacity_server_cmaui8
+      forwarder_cmaui_port_8_test_nested4Level:
+      - test_nested4Level
+      - forwarder_cmaui_port_8
       disk.device.allocation_server_cmaui8_test_nested4Level:
       - test_nested4Level
       - disk.device.allocation_server_cmaui8
@@ -387,6 +393,12 @@ topology_template:
       memory.resident_server_cmaui7_test_nested4Level:
       - test_nested4Level
       - memory.resident_server_cmaui7
+      forwarder_cmaui_port_6:
+      - cmaui_port_6
+      - forwarder
+      forwarder_cmaui_port_5:
+      - cmaui_port_5
+      - forwarder
       disk.device.read.bytes_server_cmaui6:
       - server_cmaui6
       - disk.device.read.bytes
@@ -843,4 +855,4 @@ topology_template:
       - dependency
       dependency_server_cmaui6:
       - server_cmaui6
-      - 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/novatovolumeconnection/innerHeatVolNestedMultiLevel/expectedoutputfiles/nested4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innerHeatVolNestedMultiLevel/expectedoutputfiles/nested4ServiceTemplate.yaml
index d518dc0cf4..c7e191959f 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innerHeatVolNestedMultiLevel/expectedoutputfiles/nested4ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innerHeatVolNestedMultiLevel/expectedoutputfiles/nested4ServiceTemplate.yaml
@@ -368,6 +368,12 @@ topology_template:
       disk.device.capacity_server_cmaui7:
       - server_cmaui7
       - disk.device.capacity
+      forwarder_cmaui_port_8:
+      - cmaui_port_8
+      - forwarder
+      forwarder_cmaui_port_7:
+      - cmaui_port_7
+      - forwarder
       disk.device.allocation_server_cmaui8:
       - server_cmaui8
       - disk.device.allocation
@@ -485,4 +491,4 @@ topology_template:
       - dependency
       dependency_server_cmaui8:
       - server_cmaui8
-      - 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/novatovolumeconnection/innernestedconnection/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innernestedconnection/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index e597cd7ff1..0f15ce0877 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innernestedconnection/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innernestedconnection/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -607,6 +607,16 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_0:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      forwarder_cmaui_port_2:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.usage_server_cmaui1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -778,4 +788,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/novatovolumeconnection/innernestedconnection/expectedoutputfiles/nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innernestedconnection/expectedoutputfiles/nestedServiceTemplate.yaml
index bd995dbf48..9d41cfd560 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innernestedconnection/expectedoutputfiles/nestedServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innernestedconnection/expectedoutputfiles/nestedServiceTemplate.yaml
@@ -455,6 +455,12 @@ topology_template:
       disk.read.bytes_server_cmaui1:
       - server_cmaui1
       - disk.read.bytes
+      forwarder_cmaui_port_0:
+      - cmaui_port_0
+      - forwarder
+      forwarder_cmaui_port_2:
+      - cmaui_port_2
+      - forwarder
       disk.device.usage_server_cmaui1:
       - server_cmaui1
       - disk.device.usage
@@ -566,4 +572,4 @@ topology_template:
       - dependency
       local_storage_server_cmaui1:
       - server_cmaui1
-      - 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/novatovolumeconnection/nestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index 3fc881856b..4ae2e898e9 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -426,6 +426,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_4_test_nested2Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.incoming.packets_cmaui_port_4_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.
@@ -679,6 +684,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_5_test_nested3Level_test_nested2Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.write.requests.rate_server_cmaui5_test_nested3Level_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.
@@ -805,6 +815,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_3_test_nested2Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.incoming.packets_cmaui_port_7_test_nested4Level_test_nested3Level_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.
@@ -1104,6 +1119,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.latency_server_cmaui5_test_nested3Level_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.
@@ -1585,6 +1605,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_6_test_nested3Level_test_nested2Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       memory_server_cmaui8_test_nested4Level_test_nested3Level_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.
@@ -1968,12 +1993,22 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_2:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.read.requests.rate_server_cmaui8_test_nested4Level_test_nested3Level_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_1:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.usage_server_cmaui1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -2062,6 +2097,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.capacity_server_cmaui4_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.
@@ -3605,6 +3645,16 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_4:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      forwarder_cmaui_port_3:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.latency_server_cmaui6_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -4025,12 +4075,22 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_6_test_nested3Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       memory_server_cmaui4:
         type: org.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_7_test_nested4Level_test_nested3Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.usage_server_cmaui6_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -4135,6 +4195,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_8_test_nested4Level_test_nested3Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.incoming.packets_cmaui_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.
@@ -4836,6 +4901,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_5_test_nested3Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       memory.usage_server_cmaui6_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -5056,12 +5126,22 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_7_test_nested4Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.capacity_server_cmaui8_test_nested4Level:
         type: org.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_8_test_nested4Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.allocation_server_cmaui8_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -5442,6 +5522,16 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_6:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      forwarder_cmaui_port_5:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.read.bytes_server_cmaui6:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -6773,6 +6863,16 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_8:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      forwarder_cmaui_port_7:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.allocation_server_cmaui8:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -6955,4 +7055,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/novatovolumeconnection/nestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml
index 0ff3b96235..a815a7d021 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml
@@ -233,6 +233,9 @@ topology_template:
       disk.allocation_server_cmaui8_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - disk.allocation_server_cmaui8_test_nested4Level_test_nested3Level
+      forwarder_cmaui_port_4_test_nested2Level:
+      - test_nested2Level
+      - forwarder_cmaui_port_4
       network.incoming.packets_cmaui_port_4_test_nested2Level:
       - test_nested2Level
       - network.incoming.packets_cmaui_port_4
@@ -362,6 +365,9 @@ topology_template:
       disk.write.bytes_server_cmaui8_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - disk.write.bytes_server_cmaui8_test_nested4Level_test_nested3Level
+      forwarder_cmaui_port_5_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - forwarder_cmaui_port_5_test_nested3Level
       disk.write.requests.rate_server_cmaui5_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - disk.write.requests.rate_server_cmaui5_test_nested3Level
@@ -425,6 +431,9 @@ topology_template:
       disk.device.read.bytes.rate_server_cmaui6_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - disk.device.read.bytes.rate_server_cmaui6_test_nested3Level
+      forwarder_cmaui_port_3_test_nested2Level:
+      - test_nested2Level
+      - forwarder_cmaui_port_3
       network.incoming.packets_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.incoming.packets_cmaui_port_7_test_nested4Level_test_nested3Level
@@ -578,6 +587,9 @@ topology_template:
       cpu.delta_server_cmaui6_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - cpu.delta_server_cmaui6_test_nested3Level
+      forwarder_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - forwarder_cmaui_port_7_test_nested4Level_test_nested3Level
       disk.device.latency_server_cmaui5_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - disk.device.latency_server_cmaui5_test_nested3Level
@@ -824,6 +836,9 @@ topology_template:
       disk.read.bytes.rate_server_cmaui4_test_nested2Level:
       - test_nested2Level
       - disk.read.bytes.rate_server_cmaui4
+      forwarder_cmaui_port_6_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - forwarder_cmaui_port_6_test_nested3Level
       memory_server_cmaui8_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - memory_server_cmaui8_test_nested4Level_test_nested3Level
@@ -1019,9 +1034,15 @@ topology_template:
       os_server_cmaui8_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - os_server_cmaui8_test_nested4Level_test_nested3Level
+      forwarder_cmaui_port_2:
+      - cmaui_port_2
+      - forwarder
       disk.device.read.requests.rate_server_cmaui8_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - disk.device.read.requests.rate_server_cmaui8_test_nested4Level_test_nested3Level
+      forwarder_cmaui_port_1:
+      - cmaui_port_1
+      - forwarder
       disk.device.usage_server_cmaui1:
       - server_cmaui1
       - disk.device.usage
@@ -1067,6 +1088,9 @@ topology_template:
       endpoint_server_cmaui2:
       - server_cmaui2
       - endpoint
+      forwarder_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - forwarder_cmaui_port_8_test_nested4Level_test_nested3Level
       disk.capacity_server_cmaui4_test_nested2Level:
       - test_nested2Level
       - disk.capacity_server_cmaui4
@@ -1529,4 +1553,4 @@ topology_template:
       - dependency_cmaui_port_4
       dependency_server_cmaui5_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - dependency_server_cmaui5_test_nested3Level
\ No newline at end of file
+      - dependency_server_cmaui5_test_nested3Level
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml
index b6c066b812..44ebbfff92 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml
@@ -481,6 +481,12 @@ topology_template:
       cpu.delta_server_cmaui8_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - cpu.delta_server_cmaui8_test_nested4Level
+      forwarder_cmaui_port_4:
+      - cmaui_port_4
+      - forwarder
+      forwarder_cmaui_port_3:
+      - cmaui_port_3
+      - forwarder
       disk.device.latency_server_cmaui6_test_nested3Level:
       - test_nested3Level
       - disk.device.latency_server_cmaui6
@@ -694,9 +700,15 @@ topology_template:
       memory_server_cmaui3:
       - server_cmaui3
       - memory
+      forwarder_cmaui_port_6_test_nested3Level:
+      - test_nested3Level
+      - forwarder_cmaui_port_6
       memory_server_cmaui4:
       - server_cmaui4
       - memory
+      forwarder_cmaui_port_7_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - forwarder_cmaui_port_7_test_nested4Level
       disk.usage_server_cmaui6_test_nested3Level:
       - test_nested3Level
       - disk.usage_server_cmaui6
@@ -751,6 +763,9 @@ topology_template:
       disk.allocation_server_cmaui3:
       - server_cmaui3
       - disk.allocation
+      forwarder_cmaui_port_8_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - forwarder_cmaui_port_8_test_nested4Level
       network.incoming.packets_cmaui_port_4:
       - cmaui_port_4
       - network.incoming.packets
@@ -1108,6 +1123,9 @@ topology_template:
       disk.device.read.requests.rate_server_cmaui3:
       - server_cmaui3
       - disk.device.read.requests.rate
+      forwarder_cmaui_port_5_test_nested3Level:
+      - test_nested3Level
+      - forwarder_cmaui_port_5
       memory.usage_server_cmaui6_test_nested3Level:
       - test_nested3Level
       - memory.usage_server_cmaui6
@@ -1189,4 +1207,4 @@ topology_template:
       - link_cmaui_port_7_test_nested4Level
       dependency_cmaui_port_5_test_nested3Level:
       - test_nested3Level
-      - dependency_cmaui_port_5
\ No newline at end of file
+      - dependency_cmaui_port_5
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml
index 920856d15d..738262e312 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml
@@ -189,9 +189,15 @@ topology_template:
       host_server_cmaui6:
       - server_cmaui6
       - host
+      forwarder_cmaui_port_7_test_nested4Level:
+      - test_nested4Level
+      - forwarder_cmaui_port_7
       disk.device.capacity_server_cmaui8_test_nested4Level:
       - test_nested4Level
       - disk.device.capacity_server_cmaui8
+      forwarder_cmaui_port_8_test_nested4Level:
+      - test_nested4Level
+      - forwarder_cmaui_port_8
       disk.device.allocation_server_cmaui8_test_nested4Level:
       - test_nested4Level
       - disk.device.allocation_server_cmaui8
@@ -387,6 +393,12 @@ topology_template:
       memory.resident_server_cmaui7_test_nested4Level:
       - test_nested4Level
       - memory.resident_server_cmaui7
+      forwarder_cmaui_port_6:
+      - cmaui_port_6
+      - forwarder
+      forwarder_cmaui_port_5:
+      - cmaui_port_5
+      - forwarder
       disk.device.read.bytes_server_cmaui6:
       - server_cmaui6
       - disk.device.read.bytes
@@ -843,4 +855,4 @@ topology_template:
       - dependency
       dependency_server_cmaui6:
       - server_cmaui6
-      - 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/novatovolumeconnection/nestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml
index d518dc0cf4..c7e191959f 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml
@@ -368,6 +368,12 @@ topology_template:
       disk.device.capacity_server_cmaui7:
       - server_cmaui7
       - disk.device.capacity
+      forwarder_cmaui_port_8:
+      - cmaui_port_8
+      - forwarder
+      forwarder_cmaui_port_7:
+      - cmaui_port_7
+      - forwarder
       disk.device.allocation_server_cmaui8:
       - server_cmaui8
       - disk.device.allocation
@@ -485,4 +491,4 @@ topology_template:
       - dependency
       dependency_server_cmaui8:
       - server_cmaui8
-      - 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/novatovolumeconnection/nestedconnection/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestedconnection/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index f349889ec2..3aba31e26e 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestedconnection/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestedconnection/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -234,6 +234,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_0:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       memory_server_cmaui:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -386,4 +391,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/novatovolumeconnection/nestedconnection/expectedoutputfiles/nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestedconnection/expectedoutputfiles/nestedServiceTemplate.yaml
index c84ce20669..70f0e2ebbc 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestedconnection/expectedoutputfiles/nestedServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestedconnection/expectedoutputfiles/nestedServiceTemplate.yaml
@@ -186,6 +186,9 @@ topology_template:
       disk.device.read.bytes_server_cmaui:
       - server_cmaui
       - disk.device.read.bytes
+      forwarder_cmaui_port_0:
+      - cmaui_port_0
+      - forwarder
       memory_server_cmaui:
       - server_cmaui
       - memory
@@ -276,4 +279,4 @@ topology_template:
       - dependency
       link_cmaui_port_0:
       - cmaui_port_0
-      - 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/novatovolumeconnection/nestednotconnected/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestednotconnected/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index f349889ec2..3aba31e26e 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestednotconnected/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestednotconnected/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -234,6 +234,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_0:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       memory_server_cmaui:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -386,4 +391,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/novatovolumeconnection/nestednotconnected/expectedoutputfiles/nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestednotconnected/expectedoutputfiles/nestedServiceTemplate.yaml
index c84ce20669..70f0e2ebbc 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestednotconnected/expectedoutputfiles/nestedServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestednotconnected/expectedoutputfiles/nestedServiceTemplate.yaml
@@ -186,6 +186,9 @@ topology_template:
       disk.device.read.bytes_server_cmaui:
       - server_cmaui
       - disk.device.read.bytes
+      forwarder_cmaui_port_0:
+      - cmaui_port_0
+      - forwarder
       memory_server_cmaui:
       - server_cmaui
       - memory
@@ -276,4 +279,4 @@ topology_template:
       - dependency
       link_cmaui_port_0:
       - cmaui_port_0
-      - 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/novatovolumeconnection/sharedNestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharedNestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index 3fc881856b..4ae2e898e9 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharedNestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharedNestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -426,6 +426,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_4_test_nested2Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.incoming.packets_cmaui_port_4_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.
@@ -679,6 +684,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_5_test_nested3Level_test_nested2Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.write.requests.rate_server_cmaui5_test_nested3Level_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.
@@ -805,6 +815,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_3_test_nested2Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.incoming.packets_cmaui_port_7_test_nested4Level_test_nested3Level_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.
@@ -1104,6 +1119,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.latency_server_cmaui5_test_nested3Level_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.
@@ -1585,6 +1605,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_6_test_nested3Level_test_nested2Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       memory_server_cmaui8_test_nested4Level_test_nested3Level_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.
@@ -1968,12 +1993,22 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_2:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.read.requests.rate_server_cmaui8_test_nested4Level_test_nested3Level_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_1:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.usage_server_cmaui1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -2062,6 +2097,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.capacity_server_cmaui4_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.
@@ -3605,6 +3645,16 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_4:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      forwarder_cmaui_port_3:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.latency_server_cmaui6_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -4025,12 +4075,22 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_6_test_nested3Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       memory_server_cmaui4:
         type: org.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_7_test_nested4Level_test_nested3Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.usage_server_cmaui6_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -4135,6 +4195,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_8_test_nested4Level_test_nested3Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.incoming.packets_cmaui_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.
@@ -4836,6 +4901,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_5_test_nested3Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       memory.usage_server_cmaui6_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -5056,12 +5126,22 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_7_test_nested4Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.capacity_server_cmaui8_test_nested4Level:
         type: org.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_8_test_nested4Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.allocation_server_cmaui8_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -5442,6 +5522,16 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_6:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      forwarder_cmaui_port_5:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.read.bytes_server_cmaui6:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -6773,6 +6863,16 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_8:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      forwarder_cmaui_port_7:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.allocation_server_cmaui8:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -6955,4 +7055,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/novatovolumeconnection/sharedNestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharedNestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml
index 0ff3b96235..a815a7d021 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharedNestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharedNestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml
@@ -233,6 +233,9 @@ topology_template:
       disk.allocation_server_cmaui8_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - disk.allocation_server_cmaui8_test_nested4Level_test_nested3Level
+      forwarder_cmaui_port_4_test_nested2Level:
+      - test_nested2Level
+      - forwarder_cmaui_port_4
       network.incoming.packets_cmaui_port_4_test_nested2Level:
       - test_nested2Level
       - network.incoming.packets_cmaui_port_4
@@ -362,6 +365,9 @@ topology_template:
       disk.write.bytes_server_cmaui8_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - disk.write.bytes_server_cmaui8_test_nested4Level_test_nested3Level
+      forwarder_cmaui_port_5_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - forwarder_cmaui_port_5_test_nested3Level
       disk.write.requests.rate_server_cmaui5_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - disk.write.requests.rate_server_cmaui5_test_nested3Level
@@ -425,6 +431,9 @@ topology_template:
       disk.device.read.bytes.rate_server_cmaui6_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - disk.device.read.bytes.rate_server_cmaui6_test_nested3Level
+      forwarder_cmaui_port_3_test_nested2Level:
+      - test_nested2Level
+      - forwarder_cmaui_port_3
       network.incoming.packets_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.incoming.packets_cmaui_port_7_test_nested4Level_test_nested3Level
@@ -578,6 +587,9 @@ topology_template:
       cpu.delta_server_cmaui6_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - cpu.delta_server_cmaui6_test_nested3Level
+      forwarder_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - forwarder_cmaui_port_7_test_nested4Level_test_nested3Level
       disk.device.latency_server_cmaui5_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - disk.device.latency_server_cmaui5_test_nested3Level
@@ -824,6 +836,9 @@ topology_template:
       disk.read.bytes.rate_server_cmaui4_test_nested2Level:
       - test_nested2Level
       - disk.read.bytes.rate_server_cmaui4
+      forwarder_cmaui_port_6_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - forwarder_cmaui_port_6_test_nested3Level
       memory_server_cmaui8_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - memory_server_cmaui8_test_nested4Level_test_nested3Level
@@ -1019,9 +1034,15 @@ topology_template:
       os_server_cmaui8_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - os_server_cmaui8_test_nested4Level_test_nested3Level
+      forwarder_cmaui_port_2:
+      - cmaui_port_2
+      - forwarder
       disk.device.read.requests.rate_server_cmaui8_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - disk.device.read.requests.rate_server_cmaui8_test_nested4Level_test_nested3Level
+      forwarder_cmaui_port_1:
+      - cmaui_port_1
+      - forwarder
       disk.device.usage_server_cmaui1:
       - server_cmaui1
       - disk.device.usage
@@ -1067,6 +1088,9 @@ topology_template:
       endpoint_server_cmaui2:
       - server_cmaui2
       - endpoint
+      forwarder_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - forwarder_cmaui_port_8_test_nested4Level_test_nested3Level
       disk.capacity_server_cmaui4_test_nested2Level:
       - test_nested2Level
       - disk.capacity_server_cmaui4
@@ -1529,4 +1553,4 @@ topology_template:
       - dependency_cmaui_port_4
       dependency_server_cmaui5_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - dependency_server_cmaui5_test_nested3Level
\ No newline at end of file
+      - dependency_server_cmaui5_test_nested3Level
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharedNestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharedNestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml
index b6c066b812..44ebbfff92 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharedNestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharedNestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml
@@ -481,6 +481,12 @@ topology_template:
       cpu.delta_server_cmaui8_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - cpu.delta_server_cmaui8_test_nested4Level
+      forwarder_cmaui_port_4:
+      - cmaui_port_4
+      - forwarder
+      forwarder_cmaui_port_3:
+      - cmaui_port_3
+      - forwarder
       disk.device.latency_server_cmaui6_test_nested3Level:
       - test_nested3Level
       - disk.device.latency_server_cmaui6
@@ -694,9 +700,15 @@ topology_template:
       memory_server_cmaui3:
       - server_cmaui3
       - memory
+      forwarder_cmaui_port_6_test_nested3Level:
+      - test_nested3Level
+      - forwarder_cmaui_port_6
       memory_server_cmaui4:
       - server_cmaui4
       - memory
+      forwarder_cmaui_port_7_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - forwarder_cmaui_port_7_test_nested4Level
       disk.usage_server_cmaui6_test_nested3Level:
       - test_nested3Level
       - disk.usage_server_cmaui6
@@ -751,6 +763,9 @@ topology_template:
       disk.allocation_server_cmaui3:
       - server_cmaui3
       - disk.allocation
+      forwarder_cmaui_port_8_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - forwarder_cmaui_port_8_test_nested4Level
       network.incoming.packets_cmaui_port_4:
       - cmaui_port_4
       - network.incoming.packets
@@ -1108,6 +1123,9 @@ topology_template:
       disk.device.read.requests.rate_server_cmaui3:
       - server_cmaui3
       - disk.device.read.requests.rate
+      forwarder_cmaui_port_5_test_nested3Level:
+      - test_nested3Level
+      - forwarder_cmaui_port_5
       memory.usage_server_cmaui6_test_nested3Level:
       - test_nested3Level
       - memory.usage_server_cmaui6
@@ -1189,4 +1207,4 @@ topology_template:
       - link_cmaui_port_7_test_nested4Level
       dependency_cmaui_port_5_test_nested3Level:
       - test_nested3Level
-      - dependency_cmaui_port_5
\ No newline at end of file
+      - dependency_cmaui_port_5
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharedNestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharedNestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml
index 920856d15d..738262e312 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharedNestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharedNestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml
@@ -189,9 +189,15 @@ topology_template:
       host_server_cmaui6:
       - server_cmaui6
       - host
+      forwarder_cmaui_port_7_test_nested4Level:
+      - test_nested4Level
+      - forwarder_cmaui_port_7
       disk.device.capacity_server_cmaui8_test_nested4Level:
       - test_nested4Level
       - disk.device.capacity_server_cmaui8
+      forwarder_cmaui_port_8_test_nested4Level:
+      - test_nested4Level
+      - forwarder_cmaui_port_8
       disk.device.allocation_server_cmaui8_test_nested4Level:
       - test_nested4Level
       - disk.device.allocation_server_cmaui8
@@ -387,6 +393,12 @@ topology_template:
       memory.resident_server_cmaui7_test_nested4Level:
       - test_nested4Level
       - memory.resident_server_cmaui7
+      forwarder_cmaui_port_6:
+      - cmaui_port_6
+      - forwarder
+      forwarder_cmaui_port_5:
+      - cmaui_port_5
+      - forwarder
       disk.device.read.bytes_server_cmaui6:
       - server_cmaui6
       - disk.device.read.bytes
@@ -843,4 +855,4 @@ topology_template:
       - dependency
       dependency_server_cmaui6:
       - server_cmaui6
-      - 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/novatovolumeconnection/sharedNestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharedNestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml
index d518dc0cf4..c7e191959f 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharedNestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharedNestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml
@@ -368,6 +368,12 @@ topology_template:
       disk.device.capacity_server_cmaui7:
       - server_cmaui7
       - disk.device.capacity
+      forwarder_cmaui_port_8:
+      - cmaui_port_8
+      - forwarder
+      forwarder_cmaui_port_7:
+      - cmaui_port_7
+      - forwarder
       disk.device.allocation_server_cmaui8:
       - server_cmaui8
       - disk.device.allocation
@@ -485,4 +491,4 @@ topology_template:
       - dependency
       dependency_server_cmaui8:
       - server_cmaui8
-      - 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/novatovolumeconnection/sharednestedconnection/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharednestedconnection/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index 9d971de1e5..2d6cfe6cb6 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharednestedconnection/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharednestedconnection/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -554,6 +554,16 @@ 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.usage_server_cmaui1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -725,4 +735,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/novatovolumeconnection/sharednestedconnection/expectedoutputfiles/nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharednestedconnection/expectedoutputfiles/nestedServiceTemplate.yaml
index 72de5fec5d..23f6189612 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharednestedconnection/expectedoutputfiles/nestedServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharednestedconnection/expectedoutputfiles/nestedServiceTemplate.yaml
@@ -380,6 +380,12 @@ topology_template:
       disk.read.bytes_server_cmaui1:
       - server_cmaui1
       - disk.read.bytes
+      forwarder_cmaui_port_2:
+      - cmaui_port_2
+      - forwarder
+      forwarder_cmaui_port_1:
+      - cmaui_port_1
+      - forwarder
       disk.device.usage_server_cmaui1:
       - server_cmaui1
       - disk.device.usage
@@ -491,4 +497,4 @@ topology_template:
       - dependency
       local_storage_server_cmaui1:
       - server_cmaui1
-      - 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/novatovolumeconnection/sharednestednotconnected/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharednestednotconnected/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index 9d971de1e5..2d6cfe6cb6 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharednestednotconnected/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharednestednotconnected/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -554,6 +554,16 @@ 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.usage_server_cmaui1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -725,4 +735,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/novatovolumeconnection/sharednestednotconnected/expectedoutputfiles/nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharednestednotconnected/expectedoutputfiles/nestedServiceTemplate.yaml
index 72de5fec5d..23f6189612 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharednestednotconnected/expectedoutputfiles/nestedServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharednestednotconnected/expectedoutputfiles/nestedServiceTemplate.yaml
@@ -380,6 +380,12 @@ topology_template:
       disk.read.bytes_server_cmaui1:
       - server_cmaui1
       - disk.read.bytes
+      forwarder_cmaui_port_2:
+      - cmaui_port_2
+      - forwarder
+      forwarder_cmaui_port_1:
+      - cmaui_port_1
+      - forwarder
       disk.device.usage_server_cmaui1:
       - server_cmaui1
       - disk.device.usage
@@ -491,4 +497,4 @@ topology_template:
       - dependency
       local_storage_server_cmaui1:
       - server_cmaui1
-      - 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/porttocontrailv2virtualnetworkconnection/nested/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttocontrailv2virtualnetworkconnection/nested/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index c600a5f1f9..780b3f7abe 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttocontrailv2virtualnetworkconnection/nested/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttocontrailv2virtualnetworkconnection/nested/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -229,6 +229,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_0:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       memory_server_cmaui:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -381,4 +386,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/porttocontrailv2virtualnetworkconnection/nested/expectedoutputfiles/nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttocontrailv2virtualnetworkconnection/nested/expectedoutputfiles/nestedServiceTemplate.yaml
index 95669eaeba..4f0f43aafc 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttocontrailv2virtualnetworkconnection/nested/expectedoutputfiles/nestedServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttocontrailv2virtualnetworkconnection/nested/expectedoutputfiles/nestedServiceTemplate.yaml
@@ -181,6 +181,9 @@ topology_template:
       disk.device.read.bytes_server_cmaui:
       - server_cmaui
       - disk.device.read.bytes
+      forwarder_cmaui_port_0:
+      - cmaui_port_0
+      - forwarder
       memory_server_cmaui:
       - server_cmaui
       - memory
@@ -271,4 +274,4 @@ topology_template:
       - dependency
       link_cmaui_port_0:
       - cmaui_port_0
-      - 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/porttocontrailv2virtualnetworkconnection/shared/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttocontrailv2virtualnetworkconnection/shared/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index 8512e8ac6e..bc281b6a89 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttocontrailv2virtualnetworkconnection/shared/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttocontrailv2virtualnetworkconnection/shared/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -185,6 +185,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_abc_port_1:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.root.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.
@@ -310,6 +315,16 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_11:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      forwarder_cmaui_port_12:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       feature_cmaui_port_12:
         type: tosca.capabilities.Node
         occurrences:
@@ -1141,6 +1156,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_21:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       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.
@@ -1194,4 +1214,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/porttocontrailv2virtualnetworkconnection/shared/expectedoutputfiles/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttocontrailv2virtualnetworkconnection/shared/expectedoutputfiles/nested1ServiceTemplate.yaml
index ca425196ac..c765547771 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttocontrailv2virtualnetworkconnection/shared/expectedoutputfiles/nested1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttocontrailv2virtualnetworkconnection/shared/expectedoutputfiles/nested1ServiceTemplate.yaml
@@ -222,6 +222,9 @@ topology_template:
       disk.device.usage_server_abc:
       - server_abc
       - disk.device.usage
+      forwarder_abc_port_1:
+      - abc_port_1
+      - forwarder
       disk.root.size_server_cmaui_1:
       - server_cmaui_1
       - disk.root.size
@@ -285,6 +288,12 @@ topology_template:
       disk.capacity_server_cmaui_1:
       - server_cmaui_1
       - disk.capacity
+      forwarder_cmaui_port_11:
+      - cmaui_port_11
+      - forwarder
+      forwarder_cmaui_port_12:
+      - cmaui_port_12
+      - forwarder
       feature_cmaui_port_12:
       - cmaui_port_12
       - feature
@@ -573,4 +582,4 @@ topology_template:
       - local_storage
       local_storage_server_abc:
       - server_abc
-      - 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/porttocontrailv2virtualnetworkconnection/shared/expectedoutputfiles/nested2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttocontrailv2virtualnetworkconnection/shared/expectedoutputfiles/nested2ServiceTemplate.yaml
index 33bcd18ae7..2a6f61ed22 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttocontrailv2virtualnetworkconnection/shared/expectedoutputfiles/nested2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttocontrailv2virtualnetworkconnection/shared/expectedoutputfiles/nested2ServiceTemplate.yaml
@@ -233,6 +233,9 @@ topology_template:
       disk.device.read.requests_server_cmaui_2:
       - server_cmaui_2
       - disk.device.read.requests
+      forwarder_cmaui_port_21:
+      - cmaui_port_21
+      - forwarder
       disk.read.bytes.rate_server_cmaui_2:
       - server_cmaui_2
       - disk.read.bytes.rate
@@ -272,4 +275,4 @@ topology_template:
       - local_storage
       dependency_server_cmaui_2:
       - server_cmaui_2
-      - 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/porttonetconnection/nested/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/nested/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index 53137592ad..1d33c5d59c 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/nested/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/nested/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -270,6 +270,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_0:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       memory_server_cmaui:
         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 +292,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_1:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.read.requests.rate_server_cmaui:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -459,4 +469,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/porttonetconnection/nested/expectedoutputfiles/nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/nested/expectedoutputfiles/nestedServiceTemplate.yaml
index 299788856f..6afdedbb92 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/nested/expectedoutputfiles/nestedServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/nested/expectedoutputfiles/nestedServiceTemplate.yaml
@@ -226,6 +226,9 @@ topology_template:
       disk.device.read.bytes_server_cmaui:
       - server_cmaui
       - disk.device.read.bytes
+      forwarder_cmaui_port_0:
+      - cmaui_port_0
+      - forwarder
       memory_server_cmaui:
       - server_cmaui
       - memory
@@ -235,6 +238,9 @@ topology_template:
       binding_server_cmaui:
       - server_cmaui
       - binding
+      forwarder_cmaui_port_1:
+      - cmaui_port_1
+      - forwarder
       disk.device.read.requests.rate_server_cmaui:
       - server_cmaui
       - disk.device.read.requests.rate
@@ -340,4 +346,4 @@ topology_template:
       - link
       link_cmaui_port_1:
       - cmaui_port_1
-      - 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/porttonetconnection/nestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/nestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index 24aae93214..e7801f0522 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/nestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/nestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -239,26 +239,31 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_43_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - 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.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_cmaui_port_33_test_nested3Level_test_nested2Level:
+      disk.device.latency_server_cmaui_3_test_nested3Level_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_cmaui_port_32_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.Node
+      network.outpoing.packets_cmaui_port_33_test_nested3Level_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_cmaui_3_test_nested3Level_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.
+      feature_cmaui_port_32_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
@@ -285,6 +290,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_42_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: org.openecomp.capabilities.Forwarder
+        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.
@@ -437,6 +447,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_10:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.capacity_server_cmaui_4_test_nested4Level_test_nested3Level_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.
@@ -598,14 +613,14 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.root.size_server_cmaui_3_test_nested3Level_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_cmaui_3_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      os_server_cmaui_3_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.OperatingSystem
+      disk.root.size_server_cmaui_3_test_nested3Level_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
@@ -649,13 +664,13 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      os_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.OperatingSystem
+      feature_cmaui_port_21_test_nested2Level:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      feature_cmaui_port_21_test_nested2Level:
-        type: tosca.capabilities.Node
+      os_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
@@ -677,13 +692,13 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_33_test_nested3Level_test_nested2Level:
+      disk.read.bytes.rate_server_cmaui_3_test_nested3Level_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.rate_server_cmaui_3_test_nested3Level_test_nested2Level:
+      network.outgoing.packets.rate_cmaui_port_33_test_nested3Level_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:
@@ -1006,6 +1021,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_33_test_nested3Level_test_nested2Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.incoming.packets.rate_cmaui_port_21_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.
@@ -1118,6 +1138,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_32_test_nested3Level_test_nested2Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       attachment_cmaui_port_22_test_nested2Level:
         type: tosca.capabilities.Attachment
         occurrences:
@@ -1187,6 +1212,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_22_test_nested2Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.incoming.packets.rate_cmaui_port_32_test_nested3Level_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.
@@ -1491,6 +1521,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_21_test_nested2Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       scalable_server_cmaui_2_test_nested2Level:
         type: tosca.capabilities.Scalable
         occurrences:
@@ -1859,11 +1894,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      feature_cmaui_port_42_test_nested4Level_test_nested3Level:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
       memory.usage_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1876,48 +1906,18 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_cmaui_port_43_test_nested4Level_test_nested3Level:
-        type: org.openecomp.capabilities.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_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.usage_server_cmaui_4_test_nested4Level_test_nested3Level:
-        type: org.openecomp.capabilities.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_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_cmaui_4_test_nested4Level_test_nested3Level:
-        type: org.openecomp.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_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.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
       network.incoming.packets.rate_cmaui_port_22:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1954,23 +1954,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      endpoint_server_cmaui_4_test_nested4Level_test_nested3Level:
-        type: tosca.capabilities.Endpoint.Admin
-        occurrences:
-        - 1
-        - UNBOUNDED
       disk.read.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
-      cpu_util_server_cmaui_4_test_nested4Level_test_nested3Level:
-        type: org.openecomp.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_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1983,40 +1972,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      feature_test_nested4Level_test_nested3Level:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      network.outpoing.packets_cmaui_port_32_test_nested3Level:
-        type: org.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_43_test_nested4Level_test_nested3Level:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.device.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
       disk.device.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.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_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
       host_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: tosca.capabilities.Container
         valid_source_types:
@@ -2078,12 +2039,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_cmaui_port_22:
-        type: org.openecomp.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_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -2096,18 +2051,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_33_test_nested3Level:
-        type: org.openecomp.capabilities.metric.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_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.write.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.
@@ -2120,18 +2063,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      memory_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_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
       host_server_cmaui_3_test_nested3Level:
         type: tosca.capabilities.Container
         valid_source_types:
@@ -2156,18 +2087,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      memory_server_cmaui_4_test_nested4Level_test_nested3Level:
-        type: org.openecomp.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_33_test_nested3Level:
-        type: org.openecomp.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:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -2199,775 +2118,921 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_32_test_nested3Level:
+      network.incoming.bytes_cmaui_port_42_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.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_33_test_nested3Level:
+      disk.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.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_2:
+      disk.read.bytes.rate_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.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_42_test_nested4Level_test_nested3Level:
+      binding_cmaui_port_43_test_nested4Level_test_nested3Level:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
+      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.outgoing.bytes_cmaui_port_32_test_nested3Level:
+      network.outgoing.bytes_cmaui_port_42_test_nested4Level_test_nested3Level:
         type: org.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_33_test_nested3Level:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+      forwarder_cmaui_port_21:
+        type: org.openecomp.capabilities.Forwarder
         occurrences:
-        - 0
+        - 1
         - UNBOUNDED
-      disk.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
-        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_port_22:
+        type: org.openecomp.capabilities.Forwarder
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes.rate_server_cmaui_3_test_nested3Level:
+      memory_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.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_4_test_nested4Level_test_nested3Level:
+      disk.device.write.bytes.rate_server_cmaui_3_test_nested3Level:
         type: org.openecomp.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_2:
+      disk.usage_server_cmaui_3_test_nested3Level:
         type: org.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_43_test_nested4Level_test_nested3Level:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
-      disk.device.write.requests_server_cmaui_2:
+      disk.device.latency_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.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_42_test_nested4Level_test_nested3Level:
+      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
-      memory_server_cmaui_3_test_nested3Level:
+      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
-      feature_server_cmaui_3_test_nested3Level:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      network.outgoing.bytes_cmaui_port_21:
+      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
-      feature_cmaui_port_32_test_nested3Level:
-        type: tosca.capabilities.Node
+      vcpus_server_cmaui_4_test_nested4Level_test_nested3Level:
+        type: org.openecomp.capabilities.metric.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_32_test_nested3Level:
+      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
-      disk.device.write.bytes.rate_server_cmaui_3_test_nested3Level:
+      network.incoming.packets.rate_cmaui_port_43_test_nested4Level_test_nested3Level:
         type: org.openecomp.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_cmaui_3_test_nested3Level:
+      cpu_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.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_22:
+      disk.device.allocation_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.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_cmaui_3_test_nested3Level:
-        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_cmaui_2:
+        type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
-      os_server_cmaui_4_test_nested4Level_test_nested3Level:
-        type: tosca.capabilities.OperatingSystem
+      scalable_server_cmaui_2:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests_server_cmaui_3_test_nested3Level:
+      disk.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.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_3_test_nested3Level:
-        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_port_33_test_nested3Level:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.latency_server_cmaui_3_test_nested3Level:
+      network.outgoing.bytes.rate_cmaui_port_22:
         type: org.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.bytes_cmaui_port_33_test_nested3Level:
         type: org.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_cmaui_4_test_nested4Level_test_nested3Level:
+      network.outpoing.packets_cmaui_port_22:
         type: org.openecomp.capabilities.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_cmaui_3_test_nested3Level:
+      network.outpoing.packets_cmaui_port_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.write.bytes.rate_server_cmaui_2:
+      feature_server_cmaui_4_test_nested4Level_test_nested3Level:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.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:
+      endpoint_server_cmaui_2:
+        type: tosca.capabilities.Endpoint.Admin
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.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_cmaui_4_test_nested4Level_test_nested3Level:
+      feature_cmaui_port_22:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      feature_cmaui_port_21:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      scalable_server_cmaui_4_test_nested4Level_test_nested3Level:
+        type: tosca.capabilities.Scalable
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.incoming.bytes_cmaui_port_32_test_nested3Level:
         type: org.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_cmaui_4_test_nested4Level_test_nested3Level:
+      network.outgoing.bytes.rate_cmaui_port_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.write.bytes_server_cmaui_2:
+      disk.device.allocation_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_33_test_nested3Level:
-        type: tosca.capabilities.Node
+      forwarder_cmaui_port_33_test_nested3Level:
+        type: org.openecomp.capabilities.Forwarder
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_22:
+      disk.device.latency_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.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_22:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+      disk.read.bytes_server_cmaui_3_test_nested3Level:
+        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_server_cmaui_3_test_nested3Level:
+      disk.device.allocation_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.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_43_test_nested4Level_test_nested3Level:
+      os_server_cmaui_3_test_nested3Level:
+        type: tosca.capabilities.OperatingSystem
+        occurrences:
+        - 1
+        - UNBOUNDED
+      cpu_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.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_cmaui_3_test_nested3Level:
+      disk.device.write.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.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_cmaui_2:
+      network.outgoing.bytes_cmaui_port_33_test_nested3Level:
         type: org.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_cmaui_2:
-        type: tosca.capabilities.Node
+      network.incoming.bytes.rate_cmaui_port_43_test_nested4Level_test_nested3Level:
+        type: org.openecomp.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_cmaui_2:
+      network.incoming.packets_cmaui_port_43_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.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_cmaui_4_test_nested4Level_test_nested3Level:
+      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.
         occurrences:
         - 1
         - UNBOUNDED
-      binding_server_cmaui_2:
-        type: tosca.capabilities.network.Bindable
+      disk.device.iops_server_cmaui_3_test_nested3Level:
+        type: org.openecomp.capabilities.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_21:
+      network.incoming.packets_cmaui_port_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
-      binding_cmaui_port_21:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+      network.incoming.packets_cmaui_port_22:
+        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
-      vcpus_server_cmaui_2:
+      forwarder_cmaui_port_43_test_nested4Level_test_nested3Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.write.bytes_server_cmaui_3_test_nested3Level:
         type: org.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_cmaui_3_test_nested3Level:
+      network.incoming.packets.rate_cmaui_port_33_test_nested3Level:
         type: org.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_cmaui_2:
-        type: tosca.capabilities.Scalable
+      disk.device.read.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
-      disk.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
+      attachment_cmaui_port_42_test_nested4Level_test_nested3Level:
+        type: tosca.capabilities.Attachment
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.capacity_server_cmaui_3_test_nested3Level:
         type: org.openecomp.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_4_test_nested4Level_test_nested3Level:
+      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
-      network.incoming.packets.rate_cmaui_port_42_test_nested4Level_test_nested3Level:
+      disk.device.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.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_33_test_nested3Level:
-        type: tosca.capabilities.Attachment
+      disk.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level:
+        type: org.openecomp.capabilities.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_cmaui_3_test_nested3Level:
+      disk.device.read.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.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_2:
+      disk.device.read.bytes_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.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_22:
+      memory.resident_server_cmaui_3_test_nested3Level:
         type: org.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_4_test_nested4Level_test_nested3Level:
+      feature_cmaui_port_42_test_nested4Level_test_nested3Level:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.outpoing.packets_cmaui_port_43_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.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_33_test_nested3Level:
+      disk.device.usage_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.usage_server_cmaui_2:
+      disk.device.usage_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.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_cmaui_3_test_nested3Level:
+      disk.usage_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.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_22:
+      disk.device.write.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
-      disk.write.bytes_server_cmaui_3_test_nested3Level:
+      endpoint_server_cmaui_4_test_nested4Level_test_nested3Level:
+        type: tosca.capabilities.Endpoint.Admin
+        occurrences:
+        - 1
+        - UNBOUNDED
+      cpu_util_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.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_21:
+      feature_test_nested4Level_test_nested3Level:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.outpoing.packets_cmaui_port_32_test_nested3Level:
         type: org.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_cmaui_4_test_nested4Level_test_nested3Level:
+      feature_cmaui_port_43_test_nested4Level_test_nested3Level:
         type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests.rate_server_cmaui_3_test_nested3Level:
+      disk.device.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
-      disk.device.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level:
+      disk.device.capacity_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
-      endpoint_server_cmaui_2:
-        type: tosca.capabilities.Endpoint.Admin
+      network.incoming.bytes.rate_cmaui_port_22:
+        type: org.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_cmaui_2:
-        type: tosca.capabilities.OperatingSystem
+      network.outgoing.packets.rate_cmaui_port_33_test_nested3Level:
+        type: org.openecomp.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_4_test_nested4Level_test_nested3Level:
+      network.incoming.bytes.rate_cmaui_port_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
-      feature_cmaui_port_22:
-        type: tosca.capabilities.Node
+      memory_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_21:
-        type: tosca.capabilities.Node
+      cpu_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
-      scalable_server_cmaui_4_test_nested4Level_test_nested3Level:
-        type: tosca.capabilities.Scalable
+      memory_server_cmaui_4_test_nested4Level_test_nested3Level:
+        type: org.openecomp.capabilities.metric.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_32_test_nested3Level:
+      network.outpoing.packets_cmaui_port_33_test_nested3Level:
         type: org.openecomp.capabilities.metric.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_21:
+      network.outgoing.packets.rate_cmaui_port_32_test_nested3Level:
         type: org.openecomp.capabilities.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_cmaui_2:
+      network.outgoing.bytes.rate_cmaui_port_33_test_nested3Level:
         type: org.openecomp.capabilities.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_cmaui_4_test_nested4Level_test_nested3Level:
+      disk.capacity_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_server_cmaui_3_test_nested3Level:
+      network.outgoing.bytes_cmaui_port_32_test_nested3Level:
         type: org.openecomp.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_cmaui_4_test_nested4Level_test_nested3Level:
+      binding_cmaui_port_33_test_nested3Level:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
+      disk.device.iops_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.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_cmaui_3_test_nested3Level:
+      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
-      host_server_cmaui_2:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
+      feature_server_cmaui_3_test_nested3Level:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      os_server_cmaui_3_test_nested3Level:
-        type: tosca.capabilities.OperatingSystem
+      network.outgoing.bytes_cmaui_port_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.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level:
+      feature_cmaui_port_32_test_nested3Level:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.incoming.packets.rate_cmaui_port_32_test_nested3Level:
         type: org.openecomp.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_4_test_nested4Level_test_nested3Level:
+      disk.root.size_server_cmaui_3_test_nested3Level:
         type: org.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_3_test_nested3Level:
-        type: tosca.capabilities.network.Bindable
+      network.outgoing.bytes_cmaui_port_22:
+        type: org.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_test_nested3Level:
-        type: tosca.capabilities.Node
+      os_server_cmaui_4_test_nested4Level_test_nested3Level:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_server_cmaui_4_test_nested4Level_test_nested3Level:
+      disk.device.write.requests_server_cmaui_3_test_nested3Level:
         type: org.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_3_test_nested3Level:
+      disk.device.read.requests.rate_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.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_cmaui_3_test_nested3Level:
+      memory.usage_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.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_4_test_nested4Level_test_nested3Level:
+      disk.device.write.requests.rate_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.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_33_test_nested3Level:
+      disk.device.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.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_43_test_nested4Level_test_nested3Level:
+      feature_cmaui_port_33_test_nested3Level:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.outgoing.packets.rate_cmaui_port_22:
         type: org.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_21:
-        type: tosca.capabilities.Attachment
+      binding_cmaui_port_22:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
+      disk.iops_server_cmaui_3_test_nested3Level:
+        type: org.openecomp.capabilities.metric.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_43_test_nested4Level_test_nested3Level:
+      disk.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
-      attachment_cmaui_port_22:
-        type: tosca.capabilities.Attachment
+      feature_server_cmaui_2:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      scalable_server_cmaui_3_test_nested3Level:
-        type: tosca.capabilities.Scalable
+      forwarder_cmaui_port_32_test_nested3Level:
+        type: org.openecomp.capabilities.Forwarder
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_cmaui_port_21:
+      disk.allocation_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
-      instance_server_cmaui_2:
+      network.outgoing.packets.rate_cmaui_port_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.iops_server_cmaui_3_test_nested3Level:
+      binding_cmaui_port_21:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
+      vcpus_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.rate_cmaui_port_42_test_nested4Level_test_nested3Level:
+      instance_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.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_21:
+      disk.capacity_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.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_22:
+      network.incoming.packets.rate_cmaui_port_42_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.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_22:
+      disk.device.read.bytes.rate_server_cmaui_3_test_nested3Level:
         type: org.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_cmaui_3_test_nested3Level:
-        type: tosca.capabilities.Endpoint.Admin
+      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
-      vcpus_server_cmaui_3_test_nested3Level:
+      memory.resident_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.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_42_test_nested4Level_test_nested3Level:
+      disk.usage_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.allocation_server_cmaui_4_test_nested4Level_test_nested3Level:
+      disk.device.usage_server_cmaui_3_test_nested3Level:
         type: org.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_32_test_nested3Level:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+      disk.write.bytes_server_cmaui_3_test_nested3Level:
+        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.bytes.rate_cmaui_port_32_test_nested3Level:
+      disk.write.requests.rate_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.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_3_test_nested3Level:
+      os_server_cmaui_2:
+        type: tosca.capabilities.OperatingSystem
+        occurrences:
+        - 1
+        - UNBOUNDED
+      forwarder_cmaui_port_42_test_nested4Level_test_nested3Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.latency_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.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_33_test_nested3Level:
+      host_server_cmaui_2:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.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_2:
+      disk.write.requests_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.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_42_test_nested4Level_test_nested3Level:
-        type: tosca.capabilities.Attachment
+      binding_server_cmaui_3_test_nested3Level:
+        type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level:
+      feature_test_nested3Level:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      cpu.delta_server_cmaui_3_test_nested3Level:
         type: org.openecomp.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.capacity_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.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_4_test_nested4Level_test_nested3Level:
+      attachment_cmaui_port_21:
+        type: tosca.capabilities.Attachment
+        occurrences:
+        - 1
+        - UNBOUNDED
+      attachment_cmaui_port_22:
+        type: tosca.capabilities.Attachment
+        occurrences:
+        - 1
+        - UNBOUNDED
+      scalable_server_cmaui_3_test_nested3Level:
+        type: tosca.capabilities.Scalable
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.incoming.bytes_cmaui_port_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.capacity_server_cmaui_3_test_nested3Level:
+      network.incoming.bytes.rate_cmaui_port_42_test_nested4Level_test_nested3Level:
         type: org.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:
+      network.incoming.bytes_cmaui_port_22:
         type: org.openecomp.capabilities.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:
+      endpoint_server_cmaui_3_test_nested3Level:
+        type: tosca.capabilities.Endpoint.Admin
+        occurrences:
+        - 1
+        - UNBOUNDED
+      vcpus_server_cmaui_3_test_nested3Level:
         type: org.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_4_test_nested4Level_test_nested3Level:
-        type: tosca.capabilities.network.Bindable
+      network.outpoing.packets_cmaui_port_42_test_nested4Level_test_nested3Level:
+        type: org.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:
+      disk.allocation_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.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_32_test_nested3Level:
-        type: tosca.capabilities.Attachment
+      binding_cmaui_port_32_test_nested3Level:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
+      network.outgoing.bytes.rate_cmaui_port_32_test_nested3Level:
+        type: org.openecomp.capabilities.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_cmaui_4_test_nested4Level_test_nested3Level:
+      disk.device.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.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_32_test_nested3Level:
+      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.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level:
+      disk.device.write.requests_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.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_3_test_nested3Level:
+      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
-      network.incoming.packets_cmaui_port_42_test_nested4Level_test_nested3Level:
+      binding_server_cmaui_4_test_nested4Level_test_nested3Level:
+        type: tosca.capabilities.network.Bindable
+        occurrences:
+        - 1
+        - UNBOUNDED
+      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.latency_server_cmaui_2:
+      attachment_cmaui_port_32_test_nested3Level:
+        type: tosca.capabilities.Attachment
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.incoming.packets_cmaui_port_32_test_nested3Level:
         type: org.openecomp.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_3_test_nested3Level:
+      disk.device.read.requests_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.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_4_test_nested4Level_test_nested3Level:
+      network.incoming.packets_cmaui_port_42_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.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_cmaui_3_test_nested3Level:
+      disk.latency_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
-      memory.resident_server_cmaui_3_test_nested3Level:
+      disk.ephemeral.size_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -3140,6 +3205,16 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_32:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      forwarder_cmaui_port_33:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.latency_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -3392,6 +3467,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_43_test_nested4Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       scalable_server_cmaui_4_test_nested4Level:
         type: tosca.capabilities.Scalable
         occurrences:
@@ -3765,6 +3845,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_42_test_nested4Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.write.requests_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -4091,6 +4176,16 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_42:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      forwarder_cmaui_port_43:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       endpoint_server_cmaui_4:
         type: tosca.capabilities.Endpoint.Admin
         occurrences:
@@ -4324,4 +4419,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/porttonetconnection/nestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/nestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml
index a93950d5ef..ec777b1687 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/nestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/nestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml
@@ -126,18 +126,21 @@ topology_template:
       memory.resident_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - memory.resident_server_cmaui_4_test_nested4Level_test_nested3Level
+      forwarder_cmaui_port_43_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - forwarder_cmaui_port_43_test_nested4Level_test_nested3Level
       disk.device.latency_server_cmaui_1:
       - server_cmaui_1
       - disk.device.latency
+      disk.device.latency_server_cmaui_3_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - disk.device.latency_server_cmaui_3_test_nested3Level
       network.outpoing.packets_cmaui_port_33_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.outpoing.packets_cmaui_port_33_test_nested3Level
       feature_cmaui_port_32_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - feature_cmaui_port_32_test_nested3Level
-      disk.device.latency_server_cmaui_3_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.device.latency_server_cmaui_3_test_nested3Level
       disk.device.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - disk.device.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level
@@ -150,6 +153,9 @@ topology_template:
       network.incoming.bytes_cmaui_port_22_test_nested2Level:
       - test_nested2Level
       - network.incoming.bytes_cmaui_port_22
+      forwarder_cmaui_port_42_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - forwarder_cmaui_port_42_test_nested4Level_test_nested3Level
       disk.read.requests_server_cmaui_1:
       - server_cmaui_1
       - disk.read.requests
@@ -228,6 +234,9 @@ topology_template:
       disk.device.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - disk.device.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level
+      forwarder_cmaui_port_10:
+      - cmaui_port_10
+      - forwarder
       disk.device.capacity_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - disk.device.capacity_server_cmaui_4_test_nested4Level_test_nested3Level
@@ -309,12 +318,12 @@ topology_template:
       binding_server_cmaui_1:
       - server_cmaui_1
       - binding
-      disk.root.size_server_cmaui_3_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.root.size_server_cmaui_3_test_nested3Level
       os_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - os_server_cmaui_3_test_nested3Level
+      disk.root.size_server_cmaui_3_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - disk.root.size_server_cmaui_3_test_nested3Level
       disk.device.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - disk.device.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level
@@ -336,12 +345,12 @@ topology_template:
       endpoint_server_cmaui_1:
       - server_cmaui_1
       - endpoint
-      os_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - os_server_cmaui_4_test_nested4Level_test_nested3Level
       feature_cmaui_port_21_test_nested2Level:
       - test_nested2Level
       - feature_cmaui_port_21
+      os_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - os_server_cmaui_4_test_nested4Level_test_nested3Level
       network.outpoing.packets_cmaui_port_43_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.outpoing.packets_cmaui_port_43_test_nested4Level_test_nested3Level
@@ -351,12 +360,12 @@ topology_template:
       disk.device.read.requests.rate_server_cmaui_2_test_nested2Level:
       - test_nested2Level
       - disk.device.read.requests.rate_server_cmaui_2
-      network.outgoing.packets.rate_cmaui_port_33_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - network.outgoing.packets.rate_cmaui_port_33_test_nested3Level
       disk.read.bytes.rate_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - disk.read.bytes.rate_server_cmaui_3_test_nested3Level
+      network.outgoing.packets.rate_cmaui_port_33_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - network.outgoing.packets.rate_cmaui_port_33_test_nested3Level
       disk.device.iops_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - disk.device.iops_server_cmaui_4_test_nested4Level_test_nested3Level
@@ -519,6 +528,9 @@ topology_template:
       disk.device.write.bytes.rate_server_cmaui_2_test_nested2Level:
       - test_nested2Level
       - disk.device.write.bytes.rate_server_cmaui_2
+      forwarder_cmaui_port_33_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - forwarder_cmaui_port_33_test_nested3Level
       network.incoming.packets.rate_cmaui_port_21_test_nested2Level:
       - test_nested2Level
       - network.incoming.packets.rate_cmaui_port_21
@@ -576,6 +588,9 @@ topology_template:
       network.outgoing.bytes_cmaui_port_33_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.outgoing.bytes_cmaui_port_33_test_nested3Level
+      forwarder_cmaui_port_32_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - forwarder_cmaui_port_32_test_nested3Level
       attachment_cmaui_port_22_test_nested2Level:
       - test_nested2Level
       - attachment_cmaui_port_22
@@ -612,6 +627,9 @@ topology_template:
       network.outgoing.packets.rate_cmaui_port_43_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.outgoing.packets.rate_cmaui_port_43_test_nested4Level_test_nested3Level
+      forwarder_cmaui_port_22_test_nested2Level:
+      - test_nested2Level
+      - forwarder_cmaui_port_22
       network.incoming.packets.rate_cmaui_port_32_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.incoming.packets.rate_cmaui_port_32_test_nested3Level
@@ -765,6 +783,9 @@ topology_template:
       memory.usage_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - memory.usage_server_cmaui_3_test_nested3Level
+      forwarder_cmaui_port_21_test_nested2Level:
+      - test_nested2Level
+      - forwarder_cmaui_port_21
       scalable_server_cmaui_2_test_nested2Level:
       - test_nested2Level
       - scalable_server_cmaui_2
@@ -930,4 +951,4 @@ topology_template:
       - link_cmaui_port_42_test_nested4Level_test_nested3Level
       link_cmaui_port_33_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - link_cmaui_port_33_test_nested3Level
\ No newline at end of file
+      - link_cmaui_port_33_test_nested3Level
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/nestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/nestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml
index 849c1879e3..17ada7bd4c 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/nestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/nestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml
@@ -153,36 +153,18 @@ topology_template:
       instance_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - instance_server_cmaui_4_test_nested4Level
-      feature_cmaui_port_42_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - feature_cmaui_port_42_test_nested4Level
       memory.usage_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - memory.usage_server_cmaui_3
       cpu_util_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - cpu_util_server_cmaui_3
-      network.outpoing.packets_cmaui_port_43_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - network.outpoing.packets_cmaui_port_43_test_nested4Level
-      disk.device.usage_server_cmaui_2:
-      - server_cmaui_2
-      - disk.device.usage
-      disk.device.usage_server_cmaui_4_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.device.usage_server_cmaui_4_test_nested4Level
       disk.device.latency_server_cmaui_2:
       - server_cmaui_2
       - disk.device.latency
-      disk.usage_server_cmaui_4_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.usage_server_cmaui_4_test_nested4Level
       disk.root.size_server_cmaui_2:
       - server_cmaui_2
       - disk.root.size
-      disk.device.write.requests.rate_server_cmaui_2:
-      - server_cmaui_2
-      - disk.device.write.requests.rate
       network.incoming.packets.rate_cmaui_port_22:
       - cmaui_port_22
       - network.incoming.packets.rate
@@ -201,39 +183,18 @@ topology_template:
       disk.write.bytes.rate_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - disk.write.bytes.rate_server_cmaui_3
-      endpoint_server_cmaui_4_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - endpoint_server_cmaui_4_test_nested4Level
       disk.read.requests_server_cmaui_2:
       - server_cmaui_2
       - disk.read.requests
-      cpu_util_server_cmaui_4_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - cpu_util_server_cmaui_4_test_nested4Level
       disk.write.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - disk.write.bytes.rate_server_cmaui_4_test_nested4Level
       network.incoming.packets_cmaui_port_33_test_nested3Level:
       - test_nested3Level
       - network.incoming.packets_cmaui_port_33
-      feature_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - feature_test_nested4Level
-      network.outpoing.packets_cmaui_port_32_test_nested3Level:
-      - test_nested3Level
-      - network.outpoing.packets_cmaui_port_32
-      feature_cmaui_port_43_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - feature_cmaui_port_43_test_nested4Level
-      disk.device.iops_server_cmaui_2:
-      - server_cmaui_2
-      - disk.device.iops
       disk.device.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - disk.device.write.bytes_server_cmaui_4_test_nested4Level
-      disk.device.capacity_server_cmaui_2:
-      - server_cmaui_2
-      - disk.device.capacity
       host_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - host_server_cmaui_4_test_nested4Level
@@ -264,33 +225,18 @@ topology_template:
       disk.device.capacity_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - disk.device.capacity_server_cmaui_4_test_nested4Level
-      network.incoming.bytes.rate_cmaui_port_22:
-      - cmaui_port_22
-      - network.incoming.bytes.rate
       disk.root.size_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - disk.root.size_server_cmaui_4_test_nested4Level
       network.incoming.bytes_cmaui_port_43_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.incoming.bytes_cmaui_port_43_test_nested4Level
-      network.outgoing.packets.rate_cmaui_port_33_test_nested3Level:
-      - test_nested3Level
-      - network.outgoing.packets.rate_cmaui_port_33
-      network.incoming.bytes.rate_cmaui_port_21:
-      - cmaui_port_21
-      - network.incoming.bytes.rate
       disk.write.requests.rate_server_cmaui_2:
       - server_cmaui_2
       - disk.write.requests.rate
       disk.iops_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - disk.iops_server_cmaui_4_test_nested4Level
-      memory_server_cmaui_2:
-      - server_cmaui_2
-      - memory
-      cpu_server_cmaui_2:
-      - server_cmaui_2
-      - cpu
       host_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - host_server_cmaui_3
@@ -303,12 +249,6 @@ topology_template:
       network.outgoing.bytes_cmaui_port_43_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.outgoing.bytes_cmaui_port_43_test_nested4Level
-      memory_server_cmaui_4_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - memory_server_cmaui_4_test_nested4Level
-      network.outpoing.packets_cmaui_port_33_test_nested3Level:
-      - test_nested3Level
-      - network.outpoing.packets_cmaui_port_33
       disk.ephemeral.size_server_cmaui_2:
       - server_cmaui_2
       - disk.ephemeral.size
@@ -324,36 +264,15 @@ topology_template:
       binding_cmaui_port_42_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - binding_cmaui_port_42_test_nested4Level
-      network.outgoing.packets.rate_cmaui_port_32_test_nested3Level:
-      - test_nested3Level
-      - network.outgoing.packets.rate_cmaui_port_32
-      network.outgoing.bytes.rate_cmaui_port_33_test_nested3Level:
-      - test_nested3Level
-      - network.outgoing.bytes.rate_cmaui_port_33
-      disk.capacity_server_cmaui_2:
-      - server_cmaui_2
-      - disk.capacity
       network.incoming.bytes_cmaui_port_42_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.incoming.bytes_cmaui_port_42_test_nested4Level
-      network.outgoing.bytes_cmaui_port_32_test_nested3Level:
-      - test_nested3Level
-      - network.outgoing.bytes_cmaui_port_32
-      binding_cmaui_port_33_test_nested3Level:
-      - test_nested3Level
-      - binding_cmaui_port_33
       disk.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - disk.read.bytes.rate_server_cmaui_4_test_nested4Level
       disk.read.bytes.rate_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - disk.read.bytes.rate_server_cmaui_3
-      disk.device.iops_server_cmaui_4_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.device.iops_server_cmaui_4_test_nested4Level
-      disk.iops_server_cmaui_2:
-      - server_cmaui_2
-      - disk.iops
       binding_cmaui_port_43_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - binding_cmaui_port_43_test_nested4Level
@@ -363,9 +282,261 @@ topology_template:
       network.outgoing.bytes_cmaui_port_42_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.outgoing.bytes_cmaui_port_42_test_nested4Level
+      forwarder_cmaui_port_21:
+      - cmaui_port_21
+      - forwarder
+      forwarder_cmaui_port_22:
+      - cmaui_port_22
+      - forwarder
       memory_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - memory_server_cmaui_3
+      disk.device.write.bytes.rate_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.device.write.bytes.rate_server_cmaui_3
+      disk.usage_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.usage_server_cmaui_3
+      disk.device.latency_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.device.latency_server_cmaui_3
+      cpu_util_server_cmaui_2:
+      - server_cmaui_2
+      - cpu_util
+      disk.device.write.bytes.rate_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.write.bytes.rate
+      disk.write.bytes.rate_server_cmaui_2:
+      - server_cmaui_2
+      - disk.write.bytes.rate
+      vcpus_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - vcpus_server_cmaui_4_test_nested4Level
+      disk.device.write.bytes_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.write.bytes
+      network.incoming.packets.rate_cmaui_port_43_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - network.incoming.packets.rate_cmaui_port_43_test_nested4Level
+      cpu_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - cpu_server_cmaui_3
+      disk.device.allocation_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.device.allocation_server_cmaui_4_test_nested4Level
+      binding_server_cmaui_2:
+      - server_cmaui_2
+      - binding
+      scalable_server_cmaui_2:
+      - server_cmaui_2
+      - scalable
+      disk.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.write.requests.rate_server_cmaui_4_test_nested4Level
+      attachment_cmaui_port_33_test_nested3Level:
+      - test_nested3Level
+      - attachment_cmaui_port_33
+      network.outgoing.bytes.rate_cmaui_port_22:
+      - cmaui_port_22
+      - network.outgoing.bytes.rate
+      network.incoming.bytes_cmaui_port_33_test_nested3Level:
+      - test_nested3Level
+      - network.incoming.bytes_cmaui_port_33
+      network.outpoing.packets_cmaui_port_22:
+      - cmaui_port_22
+      - network.outpoing.packets
+      network.outpoing.packets_cmaui_port_21:
+      - cmaui_port_21
+      - network.outpoing.packets
+      feature_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - feature_server_cmaui_4_test_nested4Level
+      disk.device.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.device.read.bytes_server_cmaui_4_test_nested4Level
+      endpoint_server_cmaui_2:
+      - server_cmaui_2
+      - endpoint
+      disk.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.read.requests_server_cmaui_4_test_nested4Level
+      feature_cmaui_port_22:
+      - cmaui_port_22
+      - feature
+      feature_cmaui_port_21:
+      - cmaui_port_21
+      - feature
+      scalable_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - scalable_server_cmaui_4_test_nested4Level
+      network.incoming.bytes_cmaui_port_32_test_nested3Level:
+      - test_nested3Level
+      - network.incoming.bytes_cmaui_port_32
+      network.outgoing.bytes.rate_cmaui_port_21:
+      - cmaui_port_21
+      - network.outgoing.bytes.rate
+      disk.device.allocation_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.allocation
+      forwarder_cmaui_port_33_test_nested3Level:
+      - test_nested3Level
+      - forwarder_cmaui_port_33
+      disk.device.latency_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.device.latency_server_cmaui_4_test_nested4Level
+      disk.read.bytes_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.read.bytes_server_cmaui_3
+      disk.device.allocation_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.device.allocation_server_cmaui_3
+      os_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - os_server_cmaui_3
+      cpu_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - cpu_server_cmaui_4_test_nested4Level
+      disk.device.write.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.device.write.bytes.rate_server_cmaui_4_test_nested4Level
+      network.outgoing.bytes_cmaui_port_33_test_nested3Level:
+      - test_nested3Level
+      - network.outgoing.bytes_cmaui_port_33
+      network.incoming.bytes.rate_cmaui_port_43_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - network.incoming.bytes.rate_cmaui_port_43_test_nested4Level
+      network.incoming.packets_cmaui_port_43_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - network.incoming.packets_cmaui_port_43_test_nested4Level
+      instance_server_cmaui_2:
+      - server_cmaui_2
+      - instance
+      disk.device.iops_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.device.iops_server_cmaui_3
+      network.incoming.packets_cmaui_port_21:
+      - cmaui_port_21
+      - network.incoming.packets
+      network.incoming.packets_cmaui_port_22:
+      - cmaui_port_22
+      - network.incoming.packets
+      forwarder_cmaui_port_43_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - forwarder_cmaui_port_43_test_nested4Level
+      disk.device.write.bytes_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.device.write.bytes_server_cmaui_3
+      network.incoming.packets.rate_cmaui_port_33_test_nested3Level:
+      - test_nested3Level
+      - network.incoming.packets.rate_cmaui_port_33
+      disk.device.read.requests_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.read.requests
+      attachment_cmaui_port_42_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - attachment_cmaui_port_42_test_nested4Level
+      disk.capacity_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.capacity_server_cmaui_3
+      cpu.delta_server_cmaui_2:
+      - server_cmaui_2
+      - cpu.delta
+      disk.device.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.device.write.requests.rate_server_cmaui_4_test_nested4Level
+      disk.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.write.bytes_server_cmaui_4_test_nested4Level
+      disk.device.read.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.device.read.requests.rate_server_cmaui_4_test_nested4Level
+      disk.device.read.bytes_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.device.read.bytes_server_cmaui_3
+      memory.resident_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - memory.resident_server_cmaui_3
+      feature_cmaui_port_42_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - feature_cmaui_port_42_test_nested4Level
+      network.outpoing.packets_cmaui_port_43_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - network.outpoing.packets_cmaui_port_43_test_nested4Level
+      disk.device.usage_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.usage
+      disk.device.usage_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.device.usage_server_cmaui_4_test_nested4Level
+      disk.usage_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.usage_server_cmaui_4_test_nested4Level
+      disk.device.write.requests.rate_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.write.requests.rate
+      endpoint_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - endpoint_server_cmaui_4_test_nested4Level
+      cpu_util_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - cpu_util_server_cmaui_4_test_nested4Level
+      feature_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - feature_test_nested4Level
+      network.outpoing.packets_cmaui_port_32_test_nested3Level:
+      - test_nested3Level
+      - network.outpoing.packets_cmaui_port_32
+      feature_cmaui_port_43_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - feature_cmaui_port_43_test_nested4Level
+      disk.device.iops_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.iops
+      disk.device.capacity_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.capacity
+      network.incoming.bytes.rate_cmaui_port_22:
+      - cmaui_port_22
+      - network.incoming.bytes.rate
+      network.outgoing.packets.rate_cmaui_port_33_test_nested3Level:
+      - test_nested3Level
+      - network.outgoing.packets.rate_cmaui_port_33
+      network.incoming.bytes.rate_cmaui_port_21:
+      - cmaui_port_21
+      - network.incoming.bytes.rate
+      memory_server_cmaui_2:
+      - server_cmaui_2
+      - memory
+      cpu_server_cmaui_2:
+      - server_cmaui_2
+      - cpu
+      memory_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - memory_server_cmaui_4_test_nested4Level
+      network.outpoing.packets_cmaui_port_33_test_nested3Level:
+      - test_nested3Level
+      - network.outpoing.packets_cmaui_port_33
+      network.outgoing.packets.rate_cmaui_port_32_test_nested3Level:
+      - test_nested3Level
+      - network.outgoing.packets.rate_cmaui_port_32
+      network.outgoing.bytes.rate_cmaui_port_33_test_nested3Level:
+      - test_nested3Level
+      - network.outgoing.bytes.rate_cmaui_port_33
+      disk.capacity_server_cmaui_2:
+      - server_cmaui_2
+      - disk.capacity
+      network.outgoing.bytes_cmaui_port_32_test_nested3Level:
+      - test_nested3Level
+      - network.outgoing.bytes_cmaui_port_32
+      binding_cmaui_port_33_test_nested3Level:
+      - test_nested3Level
+      - binding_cmaui_port_33
+      disk.device.iops_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.device.iops_server_cmaui_4_test_nested4Level
+      disk.iops_server_cmaui_2:
+      - server_cmaui_2
+      - disk.iops
       feature_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - feature_server_cmaui_3
@@ -378,18 +549,12 @@ topology_template:
       network.incoming.packets.rate_cmaui_port_32_test_nested3Level:
       - test_nested3Level
       - network.incoming.packets.rate_cmaui_port_32
-      disk.device.write.bytes.rate_server_cmaui_3_test_nested3Level:
-      - test_nested3Level
-      - disk.device.write.bytes.rate_server_cmaui_3
       disk.root.size_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - disk.root.size_server_cmaui_3
       network.outgoing.bytes_cmaui_port_22:
       - cmaui_port_22
       - network.outgoing.bytes
-      disk.usage_server_cmaui_3_test_nested3Level:
-      - test_nested3Level
-      - disk.usage_server_cmaui_3
       os_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - os_server_cmaui_4_test_nested4Level
@@ -399,33 +564,15 @@ topology_template:
       disk.device.read.requests.rate_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - disk.device.read.requests.rate_server_cmaui_3
-      disk.device.latency_server_cmaui_3_test_nested3Level:
-      - test_nested3Level
-      - disk.device.latency_server_cmaui_3
-      cpu_util_server_cmaui_2:
-      - server_cmaui_2
-      - cpu_util
       memory.usage_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - memory.usage_server_cmaui_4_test_nested4Level
       disk.device.write.requests.rate_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - disk.device.write.requests.rate_server_cmaui_3
-      disk.device.write.bytes.rate_server_cmaui_2:
-      - server_cmaui_2
-      - disk.device.write.bytes.rate
-      disk.write.bytes.rate_server_cmaui_2:
-      - server_cmaui_2
-      - disk.write.bytes.rate
       disk.device.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - disk.device.read.bytes.rate_server_cmaui_4_test_nested4Level
-      vcpus_server_cmaui_4_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - vcpus_server_cmaui_4_test_nested4Level
-      disk.device.write.bytes_server_cmaui_2:
-      - server_cmaui_2
-      - disk.device.write.bytes
       feature_cmaui_port_33_test_nested3Level:
       - test_nested3Level
       - feature_cmaui_port_33
@@ -438,27 +585,18 @@ topology_template:
       disk.iops_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - disk.iops_server_cmaui_3
-      network.incoming.packets.rate_cmaui_port_43_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - network.incoming.packets.rate_cmaui_port_43_test_nested4Level
-      cpu_server_cmaui_3_test_nested3Level:
-      - test_nested3Level
-      - cpu_server_cmaui_3
       disk.write.bytes_server_cmaui_2:
       - server_cmaui_2
       - disk.write.bytes
       feature_server_cmaui_2:
       - server_cmaui_2
       - feature
+      forwarder_cmaui_port_32_test_nested3Level:
+      - test_nested3Level
+      - forwarder_cmaui_port_32
       disk.allocation_server_cmaui_2:
       - server_cmaui_2
       - disk.allocation
-      disk.device.allocation_server_cmaui_4_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.device.allocation_server_cmaui_4_test_nested4Level
-      binding_server_cmaui_2:
-      - server_cmaui_2
-      - binding
       network.outgoing.packets.rate_cmaui_port_21:
       - cmaui_port_21
       - network.outgoing.packets.rate
@@ -471,105 +609,45 @@ topology_template:
       instance_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - instance_server_cmaui_3
-      scalable_server_cmaui_2:
-      - server_cmaui_2
-      - scalable
-      disk.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.write.requests.rate_server_cmaui_4_test_nested4Level
       disk.capacity_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - disk.capacity_server_cmaui_4_test_nested4Level
       network.incoming.packets.rate_cmaui_port_42_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.incoming.packets.rate_cmaui_port_42_test_nested4Level
-      attachment_cmaui_port_33_test_nested3Level:
-      - test_nested3Level
-      - attachment_cmaui_port_33
       disk.device.read.bytes.rate_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - disk.device.read.bytes.rate_server_cmaui_3
       disk.write.requests_server_cmaui_2:
       - server_cmaui_2
       - disk.write.requests
-      network.outgoing.bytes.rate_cmaui_port_22:
-      - cmaui_port_22
-      - network.outgoing.bytes.rate
       memory.resident_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - memory.resident_server_cmaui_4_test_nested4Level
-      network.incoming.bytes_cmaui_port_33_test_nested3Level:
-      - test_nested3Level
-      - network.incoming.bytes_cmaui_port_33
       disk.usage_server_cmaui_2:
       - server_cmaui_2
       - disk.usage
       disk.device.usage_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - disk.device.usage_server_cmaui_3
-      network.outpoing.packets_cmaui_port_22:
-      - cmaui_port_22
-      - network.outpoing.packets
       disk.write.bytes_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - disk.write.bytes_server_cmaui_3
-      network.outpoing.packets_cmaui_port_21:
-      - cmaui_port_21
-      - network.outpoing.packets
-      feature_server_cmaui_4_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - feature_server_cmaui_4_test_nested4Level
       disk.write.requests.rate_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - disk.write.requests.rate_server_cmaui_3
-      disk.device.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.device.read.bytes_server_cmaui_4_test_nested4Level
-      endpoint_server_cmaui_2:
-      - server_cmaui_2
-      - endpoint
       os_server_cmaui_2:
       - server_cmaui_2
       - os
-      disk.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level:
+      forwarder_cmaui_port_42_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - disk.read.requests_server_cmaui_4_test_nested4Level
-      feature_cmaui_port_22:
-      - cmaui_port_22
-      - feature
-      feature_cmaui_port_21:
-      - cmaui_port_21
-      - feature
-      scalable_server_cmaui_4_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - scalable_server_cmaui_4_test_nested4Level
-      network.incoming.bytes_cmaui_port_32_test_nested3Level:
-      - test_nested3Level
-      - network.incoming.bytes_cmaui_port_32
-      network.outgoing.bytes.rate_cmaui_port_21:
-      - cmaui_port_21
-      - network.outgoing.bytes.rate
-      disk.device.allocation_server_cmaui_2:
-      - server_cmaui_2
-      - disk.device.allocation
-      disk.device.latency_server_cmaui_4_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.device.latency_server_cmaui_4_test_nested4Level
-      disk.read.bytes_server_cmaui_3_test_nested3Level:
-      - test_nested3Level
-      - disk.read.bytes_server_cmaui_3
+      - forwarder_cmaui_port_42_test_nested4Level
       disk.latency_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - disk.latency_server_cmaui_4_test_nested4Level
-      disk.device.allocation_server_cmaui_3_test_nested3Level:
-      - test_nested3Level
-      - disk.device.allocation_server_cmaui_3
       host_server_cmaui_2:
       - server_cmaui_2
       - host
-      os_server_cmaui_3_test_nested3Level:
-      - test_nested3Level
-      - os_server_cmaui_3
       disk.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - disk.read.bytes_server_cmaui_4_test_nested4Level
@@ -582,30 +660,15 @@ topology_template:
       feature_test_nested3Level:
       - test_nested3Level
       - feature
-      cpu_server_cmaui_4_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - cpu_server_cmaui_4_test_nested4Level
       cpu.delta_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - cpu.delta_server_cmaui_3
       disk.device.capacity_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - disk.device.capacity_server_cmaui_3
-      disk.device.write.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.device.write.bytes.rate_server_cmaui_4_test_nested4Level
-      network.outgoing.bytes_cmaui_port_33_test_nested3Level:
-      - test_nested3Level
-      - network.outgoing.bytes_cmaui_port_33
-      network.incoming.bytes.rate_cmaui_port_43_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - network.incoming.bytes.rate_cmaui_port_43_test_nested4Level
       attachment_cmaui_port_21:
       - cmaui_port_21
       - attachment
-      network.incoming.packets_cmaui_port_43_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - network.incoming.packets_cmaui_port_43_test_nested4Level
       attachment_cmaui_port_22:
       - cmaui_port_22
       - attachment
@@ -615,21 +678,9 @@ topology_template:
       network.incoming.bytes_cmaui_port_21:
       - cmaui_port_21
       - network.incoming.bytes
-      instance_server_cmaui_2:
-      - server_cmaui_2
-      - instance
-      disk.device.iops_server_cmaui_3_test_nested3Level:
-      - test_nested3Level
-      - disk.device.iops_server_cmaui_3
       network.incoming.bytes.rate_cmaui_port_42_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.incoming.bytes.rate_cmaui_port_42_test_nested4Level
-      network.incoming.packets_cmaui_port_21:
-      - cmaui_port_21
-      - network.incoming.packets
-      network.incoming.packets_cmaui_port_22:
-      - cmaui_port_22
-      - network.incoming.packets
       network.incoming.bytes_cmaui_port_22:
       - cmaui_port_22
       - network.incoming.bytes
@@ -651,18 +702,6 @@ topology_template:
       network.outgoing.bytes.rate_cmaui_port_32_test_nested3Level:
       - test_nested3Level
       - network.outgoing.bytes.rate_cmaui_port_32
-      disk.device.write.bytes_server_cmaui_3_test_nested3Level:
-      - test_nested3Level
-      - disk.device.write.bytes_server_cmaui_3
-      network.incoming.packets.rate_cmaui_port_33_test_nested3Level:
-      - test_nested3Level
-      - network.incoming.packets.rate_cmaui_port_33
-      disk.device.read.requests_server_cmaui_2:
-      - server_cmaui_2
-      - disk.device.read.requests
-      attachment_cmaui_port_42_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - attachment_cmaui_port_42_test_nested4Level
       disk.device.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - disk.device.read.requests_server_cmaui_4_test_nested4Level
@@ -672,12 +711,6 @@ topology_template:
       disk.device.write.requests_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - disk.device.write.requests_server_cmaui_4_test_nested4Level
-      disk.capacity_server_cmaui_3_test_nested3Level:
-      - test_nested3Level
-      - disk.capacity_server_cmaui_3
-      cpu.delta_server_cmaui_2:
-      - server_cmaui_2
-      - cpu.delta
       disk.device.read.requests.rate_server_cmaui_2:
       - server_cmaui_2
       - disk.device.read.requests.rate
@@ -690,15 +723,9 @@ topology_template:
       attachment_cmaui_port_32_test_nested3Level:
       - test_nested3Level
       - attachment_cmaui_port_32
-      disk.device.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.device.write.requests.rate_server_cmaui_4_test_nested4Level
       network.incoming.packets_cmaui_port_32_test_nested3Level:
       - test_nested3Level
       - network.incoming.packets_cmaui_port_32
-      disk.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.write.bytes_server_cmaui_4_test_nested4Level
       disk.device.read.requests_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - disk.device.read.requests_server_cmaui_3
@@ -711,15 +738,6 @@ topology_template:
       disk.ephemeral.size_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - disk.ephemeral.size_server_cmaui_3
-      disk.device.read.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.device.read.requests.rate_server_cmaui_4_test_nested4Level
-      disk.device.read.bytes_server_cmaui_3_test_nested3Level:
-      - test_nested3Level
-      - disk.device.read.bytes_server_cmaui_3
-      memory.resident_server_cmaui_3_test_nested3Level:
-      - test_nested3Level
-      - memory.resident_server_cmaui_3
       memory.usage_server_cmaui_2:
       - server_cmaui_2
       - memory.usage
@@ -786,4 +804,4 @@ topology_template:
       - dependency
       dependency_cmaui_port_32_test_nested3Level:
       - test_nested3Level
-      - dependency_cmaui_port_32
\ No newline at end of file
+      - dependency_cmaui_port_32
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/nestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/nestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml
index fa9b3d38ba..a7237a75d4 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/nestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/nestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml
@@ -163,6 +163,12 @@ topology_template:
       disk.device.usage_server_cmaui_3:
       - server_cmaui_3
       - disk.device.usage
+      forwarder_cmaui_port_32:
+      - cmaui_port_32
+      - forwarder
+      forwarder_cmaui_port_33:
+      - cmaui_port_33
+      - forwarder
       disk.device.latency_server_cmaui_3:
       - server_cmaui_3
       - disk.device.latency
@@ -292,6 +298,9 @@ topology_template:
       disk.device.capacity_server_cmaui_4_test_nested4Level:
       - test_nested4Level
       - disk.device.capacity_server_cmaui_4
+      forwarder_cmaui_port_43_test_nested4Level:
+      - test_nested4Level
+      - forwarder_cmaui_port_43
       scalable_server_cmaui_4_test_nested4Level:
       - test_nested4Level
       - scalable_server_cmaui_4
@@ -481,6 +490,9 @@ topology_template:
       network.outpoing.packets_cmaui_port_32:
       - cmaui_port_32
       - network.outpoing.packets
+      forwarder_cmaui_port_42_test_nested4Level:
+      - test_nested4Level
+      - forwarder_cmaui_port_42
       disk.write.requests_server_cmaui_4_test_nested4Level:
       - test_nested4Level
       - disk.write.requests_server_cmaui_4
@@ -571,4 +583,4 @@ topology_template:
       - dependency_cmaui_port_43
       dependency_server_cmaui_3:
       - server_cmaui_3
-      - 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/porttonetconnection/nestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/nestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml
index 2483f9f297..e83f84a38d 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/nestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/nestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml
@@ -207,6 +207,12 @@ topology_template:
       disk.device.read.bytes.rate_server_cmaui_4:
       - server_cmaui_4
       - disk.device.read.bytes.rate
+      forwarder_cmaui_port_42:
+      - cmaui_port_42
+      - forwarder
+      forwarder_cmaui_port_43:
+      - cmaui_port_43
+      - forwarder
       endpoint_server_cmaui_4:
       - server_cmaui_4
       - endpoint
@@ -342,4 +348,4 @@ topology_template:
       - link
       local_storage_server_cmaui_4:
       - server_cmaui_4
-      - 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/porttonetconnection/shared/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/shared/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index d22a743aeb..5d2cc3df5d 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/shared/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/shared/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -185,6 +185,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_abc_port_1:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.root.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.
@@ -310,6 +315,16 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_11:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      forwarder_cmaui_port_12:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       feature_cmaui_port_12:
         type: tosca.capabilities.Node
         occurrences:
@@ -1059,6 +1074,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_1:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.read.requests.rate_server_cmaui:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1194,4 +1214,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/porttonetconnection/shared/expectedoutputfiles/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/shared/expectedoutputfiles/nested1ServiceTemplate.yaml
index 246a6cddc8..4b336ed76d 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/shared/expectedoutputfiles/nested1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/shared/expectedoutputfiles/nested1ServiceTemplate.yaml
@@ -222,6 +222,9 @@ topology_template:
       disk.device.usage_server_abc:
       - server_abc
       - disk.device.usage
+      forwarder_abc_port_1:
+      - abc_port_1
+      - forwarder
       disk.root.size_server_cmaui_1:
       - server_cmaui_1
       - disk.root.size
@@ -285,6 +288,12 @@ topology_template:
       disk.capacity_server_cmaui_1:
       - server_cmaui_1
       - disk.capacity
+      forwarder_cmaui_port_11:
+      - cmaui_port_11
+      - forwarder
+      forwarder_cmaui_port_12:
+      - cmaui_port_12
+      - forwarder
       feature_cmaui_port_12:
       - cmaui_port_12
       - feature
@@ -573,4 +582,4 @@ topology_template:
       - local_storage
       local_storage_server_abc:
       - server_abc
-      - 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/porttonetconnection/shared/expectedoutputfiles/nested2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/shared/expectedoutputfiles/nested2ServiceTemplate.yaml
index 1d2d9ada48..4d6da778c1 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/shared/expectedoutputfiles/nested2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/shared/expectedoutputfiles/nested2ServiceTemplate.yaml
@@ -191,6 +191,9 @@ topology_template:
       binding_server_cmaui:
       - server_cmaui
       - binding
+      forwarder_cmaui_port_1:
+      - cmaui_port_1
+      - forwarder
       disk.device.read.requests.rate_server_cmaui:
       - server_cmaui
       - disk.device.read.requests.rate
@@ -272,4 +275,4 @@ topology_template:
       - dependency
       link_cmaui_port_1:
       - cmaui_port_1
-      - 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/porttonetconnection/sharedNestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/sharedNestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index 713b80e73a..6445858558 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/sharedNestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/sharedNestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -239,26 +239,31 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_43_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - 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.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_cmaui_port_33_test_nested3Level_test_nested2Level:
+      disk.device.latency_server_cmaui_3_test_nested3Level_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_cmaui_port_32_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.Node
+      network.outpoing.packets_cmaui_port_33_test_nested3Level_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_cmaui_3_test_nested3Level_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.
+      feature_cmaui_port_32_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
@@ -285,6 +290,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_42_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: org.openecomp.capabilities.Forwarder
+        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.
@@ -616,14 +626,14 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.root.size_server_cmaui_3_test_nested3Level_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_cmaui_3_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      os_server_cmaui_3_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.OperatingSystem
+      disk.root.size_server_cmaui_3_test_nested3Level_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
@@ -667,8 +677,8 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      os_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.OperatingSystem
+      forwarder_cmaui_port_0:
+        type: org.openecomp.capabilities.Forwarder
         occurrences:
         - 1
         - UNBOUNDED
@@ -677,6 +687,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      os_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.OperatingSystem
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.outpoing.packets_cmaui_port_43_test_nested4Level_test_nested3Level_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.
@@ -695,13 +710,13 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_33_test_nested3Level_test_nested2Level:
+      disk.read.bytes.rate_server_cmaui_3_test_nested3Level_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.rate_server_cmaui_3_test_nested3Level_test_nested2Level:
+      network.outgoing.packets.rate_cmaui_port_33_test_nested3Level_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:
@@ -1018,6 +1033,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_33_test_nested3Level_test_nested2Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.incoming.packets.rate_cmaui_port_21_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.
@@ -1119,6 +1139,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_32_test_nested3Level_test_nested2Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       attachment_cmaui_port_22_test_nested2Level:
         type: tosca.capabilities.Attachment
         occurrences:
@@ -1194,6 +1219,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_22_test_nested2Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.incoming.packets.rate_cmaui_port_32_test_nested3Level_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.
@@ -1509,6 +1539,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_21_test_nested2Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       scalable_server_cmaui_2_test_nested2Level:
         type: tosca.capabilities.Scalable
         occurrences:
@@ -1859,11 +1894,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      feature_cmaui_port_42_test_nested4Level_test_nested3Level:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
       memory.usage_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1876,48 +1906,18 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_cmaui_port_43_test_nested4Level_test_nested3Level:
-        type: org.openecomp.capabilities.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_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.usage_server_cmaui_4_test_nested4Level_test_nested3Level:
-        type: org.openecomp.capabilities.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_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_cmaui_4_test_nested4Level_test_nested3Level:
-        type: org.openecomp.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_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.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
       network.incoming.packets.rate_cmaui_port_22:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1954,23 +1954,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      endpoint_server_cmaui_4_test_nested4Level_test_nested3Level:
-        type: tosca.capabilities.Endpoint.Admin
-        occurrences:
-        - 1
-        - UNBOUNDED
       disk.read.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
-      cpu_util_server_cmaui_4_test_nested4Level_test_nested3Level:
-        type: org.openecomp.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_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1983,40 +1972,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      feature_test_nested4Level_test_nested3Level:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      network.outpoing.packets_cmaui_port_32_test_nested3Level:
-        type: org.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_43_test_nested4Level_test_nested3Level:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.device.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
       disk.device.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.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_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
       host_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: tosca.capabilities.Container
         valid_source_types:
@@ -2078,12 +2039,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_cmaui_port_22:
-        type: org.openecomp.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_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -2096,18 +2051,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_33_test_nested3Level:
-        type: org.openecomp.capabilities.metric.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_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.write.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.
@@ -2120,18 +2063,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      memory_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_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
       host_server_cmaui_3_test_nested3Level:
         type: tosca.capabilities.Container
         valid_source_types:
@@ -2156,18 +2087,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      memory_server_cmaui_4_test_nested4Level_test_nested3Level:
-        type: org.openecomp.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_33_test_nested3Level:
-        type: org.openecomp.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:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -2199,775 +2118,921 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_32_test_nested3Level:
+      network.incoming.bytes_cmaui_port_42_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.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_33_test_nested3Level:
+      disk.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.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_2:
+      disk.read.bytes.rate_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.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_42_test_nested4Level_test_nested3Level:
+      binding_cmaui_port_43_test_nested4Level_test_nested3Level:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
+      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.outgoing.bytes_cmaui_port_32_test_nested3Level:
+      network.outgoing.bytes_cmaui_port_42_test_nested4Level_test_nested3Level:
         type: org.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_33_test_nested3Level:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+      forwarder_cmaui_port_21:
+        type: org.openecomp.capabilities.Forwarder
         occurrences:
-        - 0
+        - 1
         - UNBOUNDED
-      disk.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
-        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_port_22:
+        type: org.openecomp.capabilities.Forwarder
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes.rate_server_cmaui_3_test_nested3Level:
+      memory_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.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_4_test_nested4Level_test_nested3Level:
+      disk.device.write.bytes.rate_server_cmaui_3_test_nested3Level:
         type: org.openecomp.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_2:
+      disk.usage_server_cmaui_3_test_nested3Level:
         type: org.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_43_test_nested4Level_test_nested3Level:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
-      disk.device.write.requests_server_cmaui_2:
+      disk.device.latency_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.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_42_test_nested4Level_test_nested3Level:
+      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
-      memory_server_cmaui_3_test_nested3Level:
+      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
-      feature_server_cmaui_3_test_nested3Level:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      network.outgoing.bytes_cmaui_port_21:
+      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
-      feature_cmaui_port_32_test_nested3Level:
-        type: tosca.capabilities.Node
+      vcpus_server_cmaui_4_test_nested4Level_test_nested3Level:
+        type: org.openecomp.capabilities.metric.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_32_test_nested3Level:
+      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
-      disk.device.write.bytes.rate_server_cmaui_3_test_nested3Level:
+      network.incoming.packets.rate_cmaui_port_43_test_nested4Level_test_nested3Level:
         type: org.openecomp.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_cmaui_3_test_nested3Level:
+      cpu_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.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_22:
+      disk.device.allocation_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.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_cmaui_3_test_nested3Level:
-        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_cmaui_2:
+        type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
-      os_server_cmaui_4_test_nested4Level_test_nested3Level:
-        type: tosca.capabilities.OperatingSystem
+      scalable_server_cmaui_2:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests_server_cmaui_3_test_nested3Level:
+      disk.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.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_3_test_nested3Level:
-        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_port_33_test_nested3Level:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.latency_server_cmaui_3_test_nested3Level:
+      network.outgoing.bytes.rate_cmaui_port_22:
         type: org.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.bytes_cmaui_port_33_test_nested3Level:
         type: org.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_cmaui_4_test_nested4Level_test_nested3Level:
+      network.outpoing.packets_cmaui_port_22:
         type: org.openecomp.capabilities.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_cmaui_3_test_nested3Level:
+      network.outpoing.packets_cmaui_port_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.write.bytes.rate_server_cmaui_2:
+      feature_server_cmaui_4_test_nested4Level_test_nested3Level:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.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:
+      endpoint_server_cmaui_2:
+        type: tosca.capabilities.Endpoint.Admin
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.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_cmaui_4_test_nested4Level_test_nested3Level:
+      feature_cmaui_port_22:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      feature_cmaui_port_21:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      scalable_server_cmaui_4_test_nested4Level_test_nested3Level:
+        type: tosca.capabilities.Scalable
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.incoming.bytes_cmaui_port_32_test_nested3Level:
         type: org.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_cmaui_4_test_nested4Level_test_nested3Level:
+      network.outgoing.bytes.rate_cmaui_port_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.write.bytes_server_cmaui_2:
+      disk.device.allocation_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_33_test_nested3Level:
-        type: tosca.capabilities.Node
+      forwarder_cmaui_port_33_test_nested3Level:
+        type: org.openecomp.capabilities.Forwarder
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_22:
+      disk.device.latency_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.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_22:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+      disk.read.bytes_server_cmaui_3_test_nested3Level:
+        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_server_cmaui_3_test_nested3Level:
+      disk.device.allocation_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.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_43_test_nested4Level_test_nested3Level:
+      os_server_cmaui_3_test_nested3Level:
+        type: tosca.capabilities.OperatingSystem
+        occurrences:
+        - 1
+        - UNBOUNDED
+      cpu_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.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_cmaui_3_test_nested3Level:
+      disk.device.write.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.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_cmaui_2:
+      network.outgoing.bytes_cmaui_port_33_test_nested3Level:
         type: org.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_cmaui_2:
-        type: tosca.capabilities.Node
+      network.incoming.bytes.rate_cmaui_port_43_test_nested4Level_test_nested3Level:
+        type: org.openecomp.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_cmaui_2:
+      network.incoming.packets_cmaui_port_43_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.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_cmaui_4_test_nested4Level_test_nested3Level:
+      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.
         occurrences:
         - 1
         - UNBOUNDED
-      binding_server_cmaui_2:
-        type: tosca.capabilities.network.Bindable
+      disk.device.iops_server_cmaui_3_test_nested3Level:
+        type: org.openecomp.capabilities.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_21:
+      network.incoming.packets_cmaui_port_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
-      binding_cmaui_port_21:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+      network.incoming.packets_cmaui_port_22:
+        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
-      vcpus_server_cmaui_2:
+      forwarder_cmaui_port_43_test_nested4Level_test_nested3Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.write.bytes_server_cmaui_3_test_nested3Level:
         type: org.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_cmaui_3_test_nested3Level:
+      network.incoming.packets.rate_cmaui_port_33_test_nested3Level:
         type: org.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_cmaui_2:
-        type: tosca.capabilities.Scalable
+      disk.device.read.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
-      disk.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
+      attachment_cmaui_port_42_test_nested4Level_test_nested3Level:
+        type: tosca.capabilities.Attachment
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.capacity_server_cmaui_3_test_nested3Level:
         type: org.openecomp.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_4_test_nested4Level_test_nested3Level:
+      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
-      network.incoming.packets.rate_cmaui_port_42_test_nested4Level_test_nested3Level:
+      disk.device.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.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_33_test_nested3Level:
-        type: tosca.capabilities.Attachment
+      disk.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level:
+        type: org.openecomp.capabilities.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_cmaui_3_test_nested3Level:
+      disk.device.read.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.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_2:
+      disk.device.read.bytes_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.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_22:
+      memory.resident_server_cmaui_3_test_nested3Level:
         type: org.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_4_test_nested4Level_test_nested3Level:
+      feature_cmaui_port_42_test_nested4Level_test_nested3Level:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.outpoing.packets_cmaui_port_43_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.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_33_test_nested3Level:
+      disk.device.usage_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.usage_server_cmaui_2:
+      disk.device.usage_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.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_cmaui_3_test_nested3Level:
+      disk.usage_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.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_22:
+      disk.device.write.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
-      disk.write.bytes_server_cmaui_3_test_nested3Level:
+      endpoint_server_cmaui_4_test_nested4Level_test_nested3Level:
+        type: tosca.capabilities.Endpoint.Admin
+        occurrences:
+        - 1
+        - UNBOUNDED
+      cpu_util_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.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_21:
+      feature_test_nested4Level_test_nested3Level:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.outpoing.packets_cmaui_port_32_test_nested3Level:
         type: org.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_cmaui_4_test_nested4Level_test_nested3Level:
+      feature_cmaui_port_43_test_nested4Level_test_nested3Level:
         type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests.rate_server_cmaui_3_test_nested3Level:
+      disk.device.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
-      disk.device.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level:
+      disk.device.capacity_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
-      endpoint_server_cmaui_2:
-        type: tosca.capabilities.Endpoint.Admin
+      network.incoming.bytes.rate_cmaui_port_22:
+        type: org.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_cmaui_2:
-        type: tosca.capabilities.OperatingSystem
+      network.outgoing.packets.rate_cmaui_port_33_test_nested3Level:
+        type: org.openecomp.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_4_test_nested4Level_test_nested3Level:
+      network.incoming.bytes.rate_cmaui_port_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
-      feature_cmaui_port_22:
-        type: tosca.capabilities.Node
+      memory_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_21:
-        type: tosca.capabilities.Node
+      cpu_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
-      scalable_server_cmaui_4_test_nested4Level_test_nested3Level:
-        type: tosca.capabilities.Scalable
+      memory_server_cmaui_4_test_nested4Level_test_nested3Level:
+        type: org.openecomp.capabilities.metric.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_32_test_nested3Level:
+      network.outpoing.packets_cmaui_port_33_test_nested3Level:
         type: org.openecomp.capabilities.metric.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_21:
+      network.outgoing.packets.rate_cmaui_port_32_test_nested3Level:
         type: org.openecomp.capabilities.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_cmaui_2:
+      network.outgoing.bytes.rate_cmaui_port_33_test_nested3Level:
         type: org.openecomp.capabilities.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_cmaui_4_test_nested4Level_test_nested3Level:
+      disk.capacity_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_server_cmaui_3_test_nested3Level:
+      network.outgoing.bytes_cmaui_port_32_test_nested3Level:
         type: org.openecomp.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_cmaui_4_test_nested4Level_test_nested3Level:
+      binding_cmaui_port_33_test_nested3Level:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
+      disk.device.iops_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.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_cmaui_3_test_nested3Level:
+      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
-      host_server_cmaui_2:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
+      feature_server_cmaui_3_test_nested3Level:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      os_server_cmaui_3_test_nested3Level:
-        type: tosca.capabilities.OperatingSystem
+      network.outgoing.bytes_cmaui_port_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.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level:
+      feature_cmaui_port_32_test_nested3Level:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.incoming.packets.rate_cmaui_port_32_test_nested3Level:
         type: org.openecomp.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_4_test_nested4Level_test_nested3Level:
+      disk.root.size_server_cmaui_3_test_nested3Level:
         type: org.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_3_test_nested3Level:
-        type: tosca.capabilities.network.Bindable
+      network.outgoing.bytes_cmaui_port_22:
+        type: org.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_test_nested3Level:
-        type: tosca.capabilities.Node
+      os_server_cmaui_4_test_nested4Level_test_nested3Level:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_server_cmaui_4_test_nested4Level_test_nested3Level:
+      disk.device.write.requests_server_cmaui_3_test_nested3Level:
         type: org.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_3_test_nested3Level:
+      disk.device.read.requests.rate_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.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_cmaui_3_test_nested3Level:
+      memory.usage_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.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_4_test_nested4Level_test_nested3Level:
+      disk.device.write.requests.rate_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.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_33_test_nested3Level:
+      disk.device.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.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_43_test_nested4Level_test_nested3Level:
+      feature_cmaui_port_33_test_nested3Level:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.outgoing.packets.rate_cmaui_port_22:
         type: org.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_21:
-        type: tosca.capabilities.Attachment
+      binding_cmaui_port_22:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
+      disk.iops_server_cmaui_3_test_nested3Level:
+        type: org.openecomp.capabilities.metric.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_43_test_nested4Level_test_nested3Level:
+      disk.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
-      attachment_cmaui_port_22:
-        type: tosca.capabilities.Attachment
+      feature_server_cmaui_2:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      scalable_server_cmaui_3_test_nested3Level:
-        type: tosca.capabilities.Scalable
+      forwarder_cmaui_port_32_test_nested3Level:
+        type: org.openecomp.capabilities.Forwarder
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_cmaui_port_21:
+      disk.allocation_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
-      instance_server_cmaui_2:
+      network.outgoing.packets.rate_cmaui_port_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.iops_server_cmaui_3_test_nested3Level:
+      binding_cmaui_port_21:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
+      vcpus_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.rate_cmaui_port_42_test_nested4Level_test_nested3Level:
+      instance_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.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_21:
+      disk.capacity_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.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_22:
+      network.incoming.packets.rate_cmaui_port_42_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.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_22:
+      disk.device.read.bytes.rate_server_cmaui_3_test_nested3Level:
         type: org.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_cmaui_3_test_nested3Level:
-        type: tosca.capabilities.Endpoint.Admin
+      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
-      vcpus_server_cmaui_3_test_nested3Level:
+      memory.resident_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.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_42_test_nested4Level_test_nested3Level:
+      disk.usage_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.allocation_server_cmaui_4_test_nested4Level_test_nested3Level:
+      disk.device.usage_server_cmaui_3_test_nested3Level:
         type: org.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_32_test_nested3Level:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+      disk.write.bytes_server_cmaui_3_test_nested3Level:
+        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.bytes.rate_cmaui_port_32_test_nested3Level:
+      disk.write.requests.rate_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.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_3_test_nested3Level:
+      os_server_cmaui_2:
+        type: tosca.capabilities.OperatingSystem
+        occurrences:
+        - 1
+        - UNBOUNDED
+      forwarder_cmaui_port_42_test_nested4Level_test_nested3Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.latency_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.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_33_test_nested3Level:
+      host_server_cmaui_2:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.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_2:
+      disk.write.requests_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.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_42_test_nested4Level_test_nested3Level:
-        type: tosca.capabilities.Attachment
+      binding_server_cmaui_3_test_nested3Level:
+        type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level:
+      feature_test_nested3Level:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      cpu.delta_server_cmaui_3_test_nested3Level:
         type: org.openecomp.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.capacity_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.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_4_test_nested4Level_test_nested3Level:
+      attachment_cmaui_port_21:
+        type: tosca.capabilities.Attachment
+        occurrences:
+        - 1
+        - UNBOUNDED
+      attachment_cmaui_port_22:
+        type: tosca.capabilities.Attachment
+        occurrences:
+        - 1
+        - UNBOUNDED
+      scalable_server_cmaui_3_test_nested3Level:
+        type: tosca.capabilities.Scalable
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.incoming.bytes_cmaui_port_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.capacity_server_cmaui_3_test_nested3Level:
+      network.incoming.bytes.rate_cmaui_port_42_test_nested4Level_test_nested3Level:
         type: org.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:
+      network.incoming.bytes_cmaui_port_22:
         type: org.openecomp.capabilities.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:
+      endpoint_server_cmaui_3_test_nested3Level:
+        type: tosca.capabilities.Endpoint.Admin
+        occurrences:
+        - 1
+        - UNBOUNDED
+      vcpus_server_cmaui_3_test_nested3Level:
         type: org.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_4_test_nested4Level_test_nested3Level:
-        type: tosca.capabilities.network.Bindable
+      network.outpoing.packets_cmaui_port_42_test_nested4Level_test_nested3Level:
+        type: org.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:
+      disk.allocation_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.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_32_test_nested3Level:
-        type: tosca.capabilities.Attachment
+      binding_cmaui_port_32_test_nested3Level:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
+      network.outgoing.bytes.rate_cmaui_port_32_test_nested3Level:
+        type: org.openecomp.capabilities.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_cmaui_4_test_nested4Level_test_nested3Level:
+      disk.device.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.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_32_test_nested3Level:
+      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.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level:
+      disk.device.write.requests_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.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_3_test_nested3Level:
+      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
-      network.incoming.packets_cmaui_port_42_test_nested4Level_test_nested3Level:
+      binding_server_cmaui_4_test_nested4Level_test_nested3Level:
+        type: tosca.capabilities.network.Bindable
+        occurrences:
+        - 1
+        - UNBOUNDED
+      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.latency_server_cmaui_2:
+      attachment_cmaui_port_32_test_nested3Level:
+        type: tosca.capabilities.Attachment
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.incoming.packets_cmaui_port_32_test_nested3Level:
         type: org.openecomp.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_3_test_nested3Level:
+      disk.device.read.requests_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.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_4_test_nested4Level_test_nested3Level:
+      network.incoming.packets_cmaui_port_42_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.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_cmaui_3_test_nested3Level:
+      disk.latency_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
-      memory.resident_server_cmaui_3_test_nested3Level:
+      disk.ephemeral.size_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -3140,6 +3205,16 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_32:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      forwarder_cmaui_port_33:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.latency_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -3392,6 +3467,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_43_test_nested4Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       scalable_server_cmaui_4_test_nested4Level:
         type: tosca.capabilities.Scalable
         occurrences:
@@ -3765,6 +3845,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_42_test_nested4Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.write.requests_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -4091,6 +4176,16 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_42:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      forwarder_cmaui_port_43:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       endpoint_server_cmaui_4:
         type: tosca.capabilities.Endpoint.Admin
         occurrences:
@@ -4324,4 +4419,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/porttonetconnection/sharedNestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/sharedNestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml
index 3395b33c0d..8f88be74b4 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/sharedNestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/sharedNestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml
@@ -126,18 +126,21 @@ topology_template:
       memory.resident_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - memory.resident_server_cmaui_4_test_nested4Level_test_nested3Level
+      forwarder_cmaui_port_43_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - forwarder_cmaui_port_43_test_nested4Level_test_nested3Level
       disk.device.latency_server_cmaui_1:
       - server_cmaui_1
       - disk.device.latency
+      disk.device.latency_server_cmaui_3_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - disk.device.latency_server_cmaui_3_test_nested3Level
       network.outpoing.packets_cmaui_port_33_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.outpoing.packets_cmaui_port_33_test_nested3Level
       feature_cmaui_port_32_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - feature_cmaui_port_32_test_nested3Level
-      disk.device.latency_server_cmaui_3_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.device.latency_server_cmaui_3_test_nested3Level
       disk.device.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - disk.device.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level
@@ -150,6 +153,9 @@ topology_template:
       network.incoming.bytes_cmaui_port_22_test_nested2Level:
       - test_nested2Level
       - network.incoming.bytes_cmaui_port_22
+      forwarder_cmaui_port_42_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - forwarder_cmaui_port_42_test_nested4Level_test_nested3Level
       disk.read.requests_server_cmaui_1:
       - server_cmaui_1
       - disk.read.requests
@@ -318,12 +324,12 @@ topology_template:
       feature_cmaui_port_0:
       - cmaui_port_0
       - feature
-      disk.root.size_server_cmaui_3_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.root.size_server_cmaui_3_test_nested3Level
       os_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - os_server_cmaui_3_test_nested3Level
+      disk.root.size_server_cmaui_3_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - disk.root.size_server_cmaui_3_test_nested3Level
       disk.device.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - disk.device.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level
@@ -345,12 +351,15 @@ topology_template:
       endpoint_server_cmaui_1:
       - server_cmaui_1
       - endpoint
-      os_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - os_server_cmaui_4_test_nested4Level_test_nested3Level
+      forwarder_cmaui_port_0:
+      - cmaui_port_0
+      - forwarder
       feature_cmaui_port_21_test_nested2Level:
       - test_nested2Level
       - feature_cmaui_port_21
+      os_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - os_server_cmaui_4_test_nested4Level_test_nested3Level
       network.outpoing.packets_cmaui_port_43_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.outpoing.packets_cmaui_port_43_test_nested4Level_test_nested3Level
@@ -360,12 +369,12 @@ topology_template:
       disk.device.read.requests.rate_server_cmaui_2_test_nested2Level:
       - test_nested2Level
       - disk.device.read.requests.rate_server_cmaui_2
-      network.outgoing.packets.rate_cmaui_port_33_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - network.outgoing.packets.rate_cmaui_port_33_test_nested3Level
       disk.read.bytes.rate_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - disk.read.bytes.rate_server_cmaui_3_test_nested3Level
+      network.outgoing.packets.rate_cmaui_port_33_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - network.outgoing.packets.rate_cmaui_port_33_test_nested3Level
       disk.device.iops_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - disk.device.iops_server_cmaui_4_test_nested4Level_test_nested3Level
@@ -525,6 +534,9 @@ topology_template:
       disk.device.write.bytes.rate_server_cmaui_2_test_nested2Level:
       - test_nested2Level
       - disk.device.write.bytes.rate_server_cmaui_2
+      forwarder_cmaui_port_33_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - forwarder_cmaui_port_33_test_nested3Level
       network.incoming.packets.rate_cmaui_port_21_test_nested2Level:
       - test_nested2Level
       - network.incoming.packets.rate_cmaui_port_21
@@ -576,6 +588,9 @@ topology_template:
       network.outgoing.bytes_cmaui_port_33_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.outgoing.bytes_cmaui_port_33_test_nested3Level
+      forwarder_cmaui_port_32_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - forwarder_cmaui_port_32_test_nested3Level
       attachment_cmaui_port_22_test_nested2Level:
       - test_nested2Level
       - attachment_cmaui_port_22
@@ -615,6 +630,9 @@ topology_template:
       network.outgoing.packets.rate_cmaui_port_43_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.outgoing.packets.rate_cmaui_port_43_test_nested4Level_test_nested3Level
+      forwarder_cmaui_port_22_test_nested2Level:
+      - test_nested2Level
+      - forwarder_cmaui_port_22
       network.incoming.packets.rate_cmaui_port_32_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.incoming.packets.rate_cmaui_port_32_test_nested3Level
@@ -774,6 +792,9 @@ topology_template:
       memory.usage_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - memory.usage_server_cmaui_3_test_nested3Level
+      forwarder_cmaui_port_21_test_nested2Level:
+      - test_nested2Level
+      - forwarder_cmaui_port_21
       scalable_server_cmaui_2_test_nested2Level:
       - test_nested2Level
       - scalable_server_cmaui_2
@@ -930,4 +951,4 @@ topology_template:
       - link_cmaui_port_42_test_nested4Level_test_nested3Level
       link_cmaui_port_33_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - link_cmaui_port_33_test_nested3Level
\ No newline at end of file
+      - link_cmaui_port_33_test_nested3Level
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/sharedNestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/sharedNestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml
index 3c8d24f36b..c278666d03 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/sharedNestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/sharedNestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml
@@ -153,36 +153,18 @@ topology_template:
       instance_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - instance_server_cmaui_4_test_nested4Level
-      feature_cmaui_port_42_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - feature_cmaui_port_42_test_nested4Level
       memory.usage_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - memory.usage_server_cmaui_3
       cpu_util_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - cpu_util_server_cmaui_3
-      network.outpoing.packets_cmaui_port_43_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - network.outpoing.packets_cmaui_port_43_test_nested4Level
-      disk.device.usage_server_cmaui_2:
-      - server_cmaui_2
-      - disk.device.usage
-      disk.device.usage_server_cmaui_4_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.device.usage_server_cmaui_4_test_nested4Level
       disk.device.latency_server_cmaui_2:
       - server_cmaui_2
       - disk.device.latency
-      disk.usage_server_cmaui_4_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.usage_server_cmaui_4_test_nested4Level
       disk.root.size_server_cmaui_2:
       - server_cmaui_2
       - disk.root.size
-      disk.device.write.requests.rate_server_cmaui_2:
-      - server_cmaui_2
-      - disk.device.write.requests.rate
       network.incoming.packets.rate_cmaui_port_22:
       - cmaui_port_22
       - network.incoming.packets.rate
@@ -201,39 +183,18 @@ topology_template:
       disk.write.bytes.rate_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - disk.write.bytes.rate_server_cmaui_3
-      endpoint_server_cmaui_4_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - endpoint_server_cmaui_4_test_nested4Level
       disk.read.requests_server_cmaui_2:
       - server_cmaui_2
       - disk.read.requests
-      cpu_util_server_cmaui_4_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - cpu_util_server_cmaui_4_test_nested4Level
       disk.write.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - disk.write.bytes.rate_server_cmaui_4_test_nested4Level
       network.incoming.packets_cmaui_port_33_test_nested3Level:
       - test_nested3Level
       - network.incoming.packets_cmaui_port_33
-      feature_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - feature_test_nested4Level
-      network.outpoing.packets_cmaui_port_32_test_nested3Level:
-      - test_nested3Level
-      - network.outpoing.packets_cmaui_port_32
-      feature_cmaui_port_43_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - feature_cmaui_port_43_test_nested4Level
-      disk.device.iops_server_cmaui_2:
-      - server_cmaui_2
-      - disk.device.iops
       disk.device.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - disk.device.write.bytes_server_cmaui_4_test_nested4Level
-      disk.device.capacity_server_cmaui_2:
-      - server_cmaui_2
-      - disk.device.capacity
       host_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - host_server_cmaui_4_test_nested4Level
@@ -264,33 +225,18 @@ topology_template:
       disk.device.capacity_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - disk.device.capacity_server_cmaui_4_test_nested4Level
-      network.incoming.bytes.rate_cmaui_port_22:
-      - cmaui_port_22
-      - network.incoming.bytes.rate
       disk.root.size_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - disk.root.size_server_cmaui_4_test_nested4Level
       network.incoming.bytes_cmaui_port_43_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.incoming.bytes_cmaui_port_43_test_nested4Level
-      network.outgoing.packets.rate_cmaui_port_33_test_nested3Level:
-      - test_nested3Level
-      - network.outgoing.packets.rate_cmaui_port_33
-      network.incoming.bytes.rate_cmaui_port_21:
-      - cmaui_port_21
-      - network.incoming.bytes.rate
       disk.write.requests.rate_server_cmaui_2:
       - server_cmaui_2
       - disk.write.requests.rate
       disk.iops_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - disk.iops_server_cmaui_4_test_nested4Level
-      memory_server_cmaui_2:
-      - server_cmaui_2
-      - memory
-      cpu_server_cmaui_2:
-      - server_cmaui_2
-      - cpu
       host_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - host_server_cmaui_3
@@ -303,12 +249,6 @@ topology_template:
       network.outgoing.bytes_cmaui_port_43_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.outgoing.bytes_cmaui_port_43_test_nested4Level
-      memory_server_cmaui_4_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - memory_server_cmaui_4_test_nested4Level
-      network.outpoing.packets_cmaui_port_33_test_nested3Level:
-      - test_nested3Level
-      - network.outpoing.packets_cmaui_port_33
       disk.ephemeral.size_server_cmaui_2:
       - server_cmaui_2
       - disk.ephemeral.size
@@ -324,36 +264,15 @@ topology_template:
       binding_cmaui_port_42_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - binding_cmaui_port_42_test_nested4Level
-      network.outgoing.packets.rate_cmaui_port_32_test_nested3Level:
-      - test_nested3Level
-      - network.outgoing.packets.rate_cmaui_port_32
-      network.outgoing.bytes.rate_cmaui_port_33_test_nested3Level:
-      - test_nested3Level
-      - network.outgoing.bytes.rate_cmaui_port_33
-      disk.capacity_server_cmaui_2:
-      - server_cmaui_2
-      - disk.capacity
       network.incoming.bytes_cmaui_port_42_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.incoming.bytes_cmaui_port_42_test_nested4Level
-      network.outgoing.bytes_cmaui_port_32_test_nested3Level:
-      - test_nested3Level
-      - network.outgoing.bytes_cmaui_port_32
-      binding_cmaui_port_33_test_nested3Level:
-      - test_nested3Level
-      - binding_cmaui_port_33
       disk.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - disk.read.bytes.rate_server_cmaui_4_test_nested4Level
       disk.read.bytes.rate_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - disk.read.bytes.rate_server_cmaui_3
-      disk.device.iops_server_cmaui_4_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.device.iops_server_cmaui_4_test_nested4Level
-      disk.iops_server_cmaui_2:
-      - server_cmaui_2
-      - disk.iops
       binding_cmaui_port_43_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - binding_cmaui_port_43_test_nested4Level
@@ -363,9 +282,261 @@ topology_template:
       network.outgoing.bytes_cmaui_port_42_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.outgoing.bytes_cmaui_port_42_test_nested4Level
+      forwarder_cmaui_port_21:
+      - cmaui_port_21
+      - forwarder
+      forwarder_cmaui_port_22:
+      - cmaui_port_22
+      - forwarder
       memory_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - memory_server_cmaui_3
+      disk.device.write.bytes.rate_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.device.write.bytes.rate_server_cmaui_3
+      disk.usage_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.usage_server_cmaui_3
+      disk.device.latency_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.device.latency_server_cmaui_3
+      cpu_util_server_cmaui_2:
+      - server_cmaui_2
+      - cpu_util
+      disk.device.write.bytes.rate_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.write.bytes.rate
+      disk.write.bytes.rate_server_cmaui_2:
+      - server_cmaui_2
+      - disk.write.bytes.rate
+      vcpus_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - vcpus_server_cmaui_4_test_nested4Level
+      disk.device.write.bytes_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.write.bytes
+      network.incoming.packets.rate_cmaui_port_43_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - network.incoming.packets.rate_cmaui_port_43_test_nested4Level
+      cpu_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - cpu_server_cmaui_3
+      disk.device.allocation_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.device.allocation_server_cmaui_4_test_nested4Level
+      binding_server_cmaui_2:
+      - server_cmaui_2
+      - binding
+      scalable_server_cmaui_2:
+      - server_cmaui_2
+      - scalable
+      disk.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.write.requests.rate_server_cmaui_4_test_nested4Level
+      attachment_cmaui_port_33_test_nested3Level:
+      - test_nested3Level
+      - attachment_cmaui_port_33
+      network.outgoing.bytes.rate_cmaui_port_22:
+      - cmaui_port_22
+      - network.outgoing.bytes.rate
+      network.incoming.bytes_cmaui_port_33_test_nested3Level:
+      - test_nested3Level
+      - network.incoming.bytes_cmaui_port_33
+      network.outpoing.packets_cmaui_port_22:
+      - cmaui_port_22
+      - network.outpoing.packets
+      network.outpoing.packets_cmaui_port_21:
+      - cmaui_port_21
+      - network.outpoing.packets
+      feature_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - feature_server_cmaui_4_test_nested4Level
+      disk.device.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.device.read.bytes_server_cmaui_4_test_nested4Level
+      endpoint_server_cmaui_2:
+      - server_cmaui_2
+      - endpoint
+      disk.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.read.requests_server_cmaui_4_test_nested4Level
+      feature_cmaui_port_22:
+      - cmaui_port_22
+      - feature
+      feature_cmaui_port_21:
+      - cmaui_port_21
+      - feature
+      scalable_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - scalable_server_cmaui_4_test_nested4Level
+      network.incoming.bytes_cmaui_port_32_test_nested3Level:
+      - test_nested3Level
+      - network.incoming.bytes_cmaui_port_32
+      network.outgoing.bytes.rate_cmaui_port_21:
+      - cmaui_port_21
+      - network.outgoing.bytes.rate
+      disk.device.allocation_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.allocation
+      forwarder_cmaui_port_33_test_nested3Level:
+      - test_nested3Level
+      - forwarder_cmaui_port_33
+      disk.device.latency_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.device.latency_server_cmaui_4_test_nested4Level
+      disk.read.bytes_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.read.bytes_server_cmaui_3
+      disk.device.allocation_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.device.allocation_server_cmaui_3
+      os_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - os_server_cmaui_3
+      cpu_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - cpu_server_cmaui_4_test_nested4Level
+      disk.device.write.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.device.write.bytes.rate_server_cmaui_4_test_nested4Level
+      network.outgoing.bytes_cmaui_port_33_test_nested3Level:
+      - test_nested3Level
+      - network.outgoing.bytes_cmaui_port_33
+      network.incoming.bytes.rate_cmaui_port_43_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - network.incoming.bytes.rate_cmaui_port_43_test_nested4Level
+      network.incoming.packets_cmaui_port_43_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - network.incoming.packets_cmaui_port_43_test_nested4Level
+      instance_server_cmaui_2:
+      - server_cmaui_2
+      - instance
+      disk.device.iops_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.device.iops_server_cmaui_3
+      network.incoming.packets_cmaui_port_21:
+      - cmaui_port_21
+      - network.incoming.packets
+      network.incoming.packets_cmaui_port_22:
+      - cmaui_port_22
+      - network.incoming.packets
+      forwarder_cmaui_port_43_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - forwarder_cmaui_port_43_test_nested4Level
+      disk.device.write.bytes_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.device.write.bytes_server_cmaui_3
+      network.incoming.packets.rate_cmaui_port_33_test_nested3Level:
+      - test_nested3Level
+      - network.incoming.packets.rate_cmaui_port_33
+      disk.device.read.requests_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.read.requests
+      attachment_cmaui_port_42_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - attachment_cmaui_port_42_test_nested4Level
+      disk.capacity_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.capacity_server_cmaui_3
+      cpu.delta_server_cmaui_2:
+      - server_cmaui_2
+      - cpu.delta
+      disk.device.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.device.write.requests.rate_server_cmaui_4_test_nested4Level
+      disk.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.write.bytes_server_cmaui_4_test_nested4Level
+      disk.device.read.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.device.read.requests.rate_server_cmaui_4_test_nested4Level
+      disk.device.read.bytes_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.device.read.bytes_server_cmaui_3
+      memory.resident_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - memory.resident_server_cmaui_3
+      feature_cmaui_port_42_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - feature_cmaui_port_42_test_nested4Level
+      network.outpoing.packets_cmaui_port_43_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - network.outpoing.packets_cmaui_port_43_test_nested4Level
+      disk.device.usage_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.usage
+      disk.device.usage_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.device.usage_server_cmaui_4_test_nested4Level
+      disk.usage_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.usage_server_cmaui_4_test_nested4Level
+      disk.device.write.requests.rate_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.write.requests.rate
+      endpoint_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - endpoint_server_cmaui_4_test_nested4Level
+      cpu_util_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - cpu_util_server_cmaui_4_test_nested4Level
+      feature_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - feature_test_nested4Level
+      network.outpoing.packets_cmaui_port_32_test_nested3Level:
+      - test_nested3Level
+      - network.outpoing.packets_cmaui_port_32
+      feature_cmaui_port_43_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - feature_cmaui_port_43_test_nested4Level
+      disk.device.iops_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.iops
+      disk.device.capacity_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.capacity
+      network.incoming.bytes.rate_cmaui_port_22:
+      - cmaui_port_22
+      - network.incoming.bytes.rate
+      network.outgoing.packets.rate_cmaui_port_33_test_nested3Level:
+      - test_nested3Level
+      - network.outgoing.packets.rate_cmaui_port_33
+      network.incoming.bytes.rate_cmaui_port_21:
+      - cmaui_port_21
+      - network.incoming.bytes.rate
+      memory_server_cmaui_2:
+      - server_cmaui_2
+      - memory
+      cpu_server_cmaui_2:
+      - server_cmaui_2
+      - cpu
+      memory_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - memory_server_cmaui_4_test_nested4Level
+      network.outpoing.packets_cmaui_port_33_test_nested3Level:
+      - test_nested3Level
+      - network.outpoing.packets_cmaui_port_33
+      network.outgoing.packets.rate_cmaui_port_32_test_nested3Level:
+      - test_nested3Level
+      - network.outgoing.packets.rate_cmaui_port_32
+      network.outgoing.bytes.rate_cmaui_port_33_test_nested3Level:
+      - test_nested3Level
+      - network.outgoing.bytes.rate_cmaui_port_33
+      disk.capacity_server_cmaui_2:
+      - server_cmaui_2
+      - disk.capacity
+      network.outgoing.bytes_cmaui_port_32_test_nested3Level:
+      - test_nested3Level
+      - network.outgoing.bytes_cmaui_port_32
+      binding_cmaui_port_33_test_nested3Level:
+      - test_nested3Level
+      - binding_cmaui_port_33
+      disk.device.iops_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.device.iops_server_cmaui_4_test_nested4Level
+      disk.iops_server_cmaui_2:
+      - server_cmaui_2
+      - disk.iops
       feature_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - feature_server_cmaui_3
@@ -378,18 +549,12 @@ topology_template:
       network.incoming.packets.rate_cmaui_port_32_test_nested3Level:
       - test_nested3Level
       - network.incoming.packets.rate_cmaui_port_32
-      disk.device.write.bytes.rate_server_cmaui_3_test_nested3Level:
-      - test_nested3Level
-      - disk.device.write.bytes.rate_server_cmaui_3
       disk.root.size_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - disk.root.size_server_cmaui_3
       network.outgoing.bytes_cmaui_port_22:
       - cmaui_port_22
       - network.outgoing.bytes
-      disk.usage_server_cmaui_3_test_nested3Level:
-      - test_nested3Level
-      - disk.usage_server_cmaui_3
       os_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - os_server_cmaui_4_test_nested4Level
@@ -399,33 +564,15 @@ topology_template:
       disk.device.read.requests.rate_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - disk.device.read.requests.rate_server_cmaui_3
-      disk.device.latency_server_cmaui_3_test_nested3Level:
-      - test_nested3Level
-      - disk.device.latency_server_cmaui_3
-      cpu_util_server_cmaui_2:
-      - server_cmaui_2
-      - cpu_util
       memory.usage_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - memory.usage_server_cmaui_4_test_nested4Level
       disk.device.write.requests.rate_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - disk.device.write.requests.rate_server_cmaui_3
-      disk.device.write.bytes.rate_server_cmaui_2:
-      - server_cmaui_2
-      - disk.device.write.bytes.rate
-      disk.write.bytes.rate_server_cmaui_2:
-      - server_cmaui_2
-      - disk.write.bytes.rate
       disk.device.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - disk.device.read.bytes.rate_server_cmaui_4_test_nested4Level
-      vcpus_server_cmaui_4_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - vcpus_server_cmaui_4_test_nested4Level
-      disk.device.write.bytes_server_cmaui_2:
-      - server_cmaui_2
-      - disk.device.write.bytes
       feature_cmaui_port_33_test_nested3Level:
       - test_nested3Level
       - feature_cmaui_port_33
@@ -438,27 +585,18 @@ topology_template:
       disk.iops_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - disk.iops_server_cmaui_3
-      network.incoming.packets.rate_cmaui_port_43_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - network.incoming.packets.rate_cmaui_port_43_test_nested4Level
-      cpu_server_cmaui_3_test_nested3Level:
-      - test_nested3Level
-      - cpu_server_cmaui_3
       disk.write.bytes_server_cmaui_2:
       - server_cmaui_2
       - disk.write.bytes
       feature_server_cmaui_2:
       - server_cmaui_2
       - feature
+      forwarder_cmaui_port_32_test_nested3Level:
+      - test_nested3Level
+      - forwarder_cmaui_port_32
       disk.allocation_server_cmaui_2:
       - server_cmaui_2
       - disk.allocation
-      disk.device.allocation_server_cmaui_4_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.device.allocation_server_cmaui_4_test_nested4Level
-      binding_server_cmaui_2:
-      - server_cmaui_2
-      - binding
       network.outgoing.packets.rate_cmaui_port_21:
       - cmaui_port_21
       - network.outgoing.packets.rate
@@ -471,105 +609,45 @@ topology_template:
       instance_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - instance_server_cmaui_3
-      scalable_server_cmaui_2:
-      - server_cmaui_2
-      - scalable
-      disk.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.write.requests.rate_server_cmaui_4_test_nested4Level
       disk.capacity_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - disk.capacity_server_cmaui_4_test_nested4Level
       network.incoming.packets.rate_cmaui_port_42_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.incoming.packets.rate_cmaui_port_42_test_nested4Level
-      attachment_cmaui_port_33_test_nested3Level:
-      - test_nested3Level
-      - attachment_cmaui_port_33
       disk.device.read.bytes.rate_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - disk.device.read.bytes.rate_server_cmaui_3
       disk.write.requests_server_cmaui_2:
       - server_cmaui_2
       - disk.write.requests
-      network.outgoing.bytes.rate_cmaui_port_22:
-      - cmaui_port_22
-      - network.outgoing.bytes.rate
       memory.resident_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - memory.resident_server_cmaui_4_test_nested4Level
-      network.incoming.bytes_cmaui_port_33_test_nested3Level:
-      - test_nested3Level
-      - network.incoming.bytes_cmaui_port_33
       disk.usage_server_cmaui_2:
       - server_cmaui_2
       - disk.usage
       disk.device.usage_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - disk.device.usage_server_cmaui_3
-      network.outpoing.packets_cmaui_port_22:
-      - cmaui_port_22
-      - network.outpoing.packets
       disk.write.bytes_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - disk.write.bytes_server_cmaui_3
-      network.outpoing.packets_cmaui_port_21:
-      - cmaui_port_21
-      - network.outpoing.packets
-      feature_server_cmaui_4_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - feature_server_cmaui_4_test_nested4Level
       disk.write.requests.rate_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - disk.write.requests.rate_server_cmaui_3
-      disk.device.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.device.read.bytes_server_cmaui_4_test_nested4Level
-      endpoint_server_cmaui_2:
-      - server_cmaui_2
-      - endpoint
       os_server_cmaui_2:
       - server_cmaui_2
       - os
-      disk.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level:
+      forwarder_cmaui_port_42_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - disk.read.requests_server_cmaui_4_test_nested4Level
-      feature_cmaui_port_22:
-      - cmaui_port_22
-      - feature
-      feature_cmaui_port_21:
-      - cmaui_port_21
-      - feature
-      scalable_server_cmaui_4_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - scalable_server_cmaui_4_test_nested4Level
-      network.incoming.bytes_cmaui_port_32_test_nested3Level:
-      - test_nested3Level
-      - network.incoming.bytes_cmaui_port_32
-      network.outgoing.bytes.rate_cmaui_port_21:
-      - cmaui_port_21
-      - network.outgoing.bytes.rate
-      disk.device.allocation_server_cmaui_2:
-      - server_cmaui_2
-      - disk.device.allocation
-      disk.device.latency_server_cmaui_4_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.device.latency_server_cmaui_4_test_nested4Level
-      disk.read.bytes_server_cmaui_3_test_nested3Level:
-      - test_nested3Level
-      - disk.read.bytes_server_cmaui_3
+      - forwarder_cmaui_port_42_test_nested4Level
       disk.latency_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - disk.latency_server_cmaui_4_test_nested4Level
-      disk.device.allocation_server_cmaui_3_test_nested3Level:
-      - test_nested3Level
-      - disk.device.allocation_server_cmaui_3
       host_server_cmaui_2:
       - server_cmaui_2
       - host
-      os_server_cmaui_3_test_nested3Level:
-      - test_nested3Level
-      - os_server_cmaui_3
       disk.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - disk.read.bytes_server_cmaui_4_test_nested4Level
@@ -582,30 +660,15 @@ topology_template:
       feature_test_nested3Level:
       - test_nested3Level
       - feature
-      cpu_server_cmaui_4_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - cpu_server_cmaui_4_test_nested4Level
       cpu.delta_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - cpu.delta_server_cmaui_3
       disk.device.capacity_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - disk.device.capacity_server_cmaui_3
-      disk.device.write.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.device.write.bytes.rate_server_cmaui_4_test_nested4Level
-      network.outgoing.bytes_cmaui_port_33_test_nested3Level:
-      - test_nested3Level
-      - network.outgoing.bytes_cmaui_port_33
-      network.incoming.bytes.rate_cmaui_port_43_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - network.incoming.bytes.rate_cmaui_port_43_test_nested4Level
       attachment_cmaui_port_21:
       - cmaui_port_21
       - attachment
-      network.incoming.packets_cmaui_port_43_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - network.incoming.packets_cmaui_port_43_test_nested4Level
       attachment_cmaui_port_22:
       - cmaui_port_22
       - attachment
@@ -615,21 +678,9 @@ topology_template:
       network.incoming.bytes_cmaui_port_21:
       - cmaui_port_21
       - network.incoming.bytes
-      instance_server_cmaui_2:
-      - server_cmaui_2
-      - instance
-      disk.device.iops_server_cmaui_3_test_nested3Level:
-      - test_nested3Level
-      - disk.device.iops_server_cmaui_3
       network.incoming.bytes.rate_cmaui_port_42_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.incoming.bytes.rate_cmaui_port_42_test_nested4Level
-      network.incoming.packets_cmaui_port_21:
-      - cmaui_port_21
-      - network.incoming.packets
-      network.incoming.packets_cmaui_port_22:
-      - cmaui_port_22
-      - network.incoming.packets
       network.incoming.bytes_cmaui_port_22:
       - cmaui_port_22
       - network.incoming.bytes
@@ -651,18 +702,6 @@ topology_template:
       network.outgoing.bytes.rate_cmaui_port_32_test_nested3Level:
       - test_nested3Level
       - network.outgoing.bytes.rate_cmaui_port_32
-      disk.device.write.bytes_server_cmaui_3_test_nested3Level:
-      - test_nested3Level
-      - disk.device.write.bytes_server_cmaui_3
-      network.incoming.packets.rate_cmaui_port_33_test_nested3Level:
-      - test_nested3Level
-      - network.incoming.packets.rate_cmaui_port_33
-      disk.device.read.requests_server_cmaui_2:
-      - server_cmaui_2
-      - disk.device.read.requests
-      attachment_cmaui_port_42_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - attachment_cmaui_port_42_test_nested4Level
       disk.device.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - disk.device.read.requests_server_cmaui_4_test_nested4Level
@@ -672,12 +711,6 @@ topology_template:
       disk.device.write.requests_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - disk.device.write.requests_server_cmaui_4_test_nested4Level
-      disk.capacity_server_cmaui_3_test_nested3Level:
-      - test_nested3Level
-      - disk.capacity_server_cmaui_3
-      cpu.delta_server_cmaui_2:
-      - server_cmaui_2
-      - cpu.delta
       disk.device.read.requests.rate_server_cmaui_2:
       - server_cmaui_2
       - disk.device.read.requests.rate
@@ -690,15 +723,9 @@ topology_template:
       attachment_cmaui_port_32_test_nested3Level:
       - test_nested3Level
       - attachment_cmaui_port_32
-      disk.device.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.device.write.requests.rate_server_cmaui_4_test_nested4Level
       network.incoming.packets_cmaui_port_32_test_nested3Level:
       - test_nested3Level
       - network.incoming.packets_cmaui_port_32
-      disk.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.write.bytes_server_cmaui_4_test_nested4Level
       disk.device.read.requests_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - disk.device.read.requests_server_cmaui_3
@@ -711,15 +738,6 @@ topology_template:
       disk.ephemeral.size_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - disk.ephemeral.size_server_cmaui_3
-      disk.device.read.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.device.read.requests.rate_server_cmaui_4_test_nested4Level
-      disk.device.read.bytes_server_cmaui_3_test_nested3Level:
-      - test_nested3Level
-      - disk.device.read.bytes_server_cmaui_3
-      memory.resident_server_cmaui_3_test_nested3Level:
-      - test_nested3Level
-      - memory.resident_server_cmaui_3
       memory.usage_server_cmaui_2:
       - server_cmaui_2
       - memory.usage
@@ -786,4 +804,4 @@ topology_template:
       - dependency
       dependency_cmaui_port_32_test_nested3Level:
       - test_nested3Level
-      - dependency_cmaui_port_32
\ No newline at end of file
+      - dependency_cmaui_port_32
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/sharedNestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/sharedNestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml
index 1b5d69b6c9..81f5a1a7ca 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/sharedNestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/sharedNestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml
@@ -163,6 +163,12 @@ topology_template:
       disk.device.usage_server_cmaui_3:
       - server_cmaui_3
       - disk.device.usage
+      forwarder_cmaui_port_32:
+      - cmaui_port_32
+      - forwarder
+      forwarder_cmaui_port_33:
+      - cmaui_port_33
+      - forwarder
       disk.device.latency_server_cmaui_3:
       - server_cmaui_3
       - disk.device.latency
@@ -292,6 +298,9 @@ topology_template:
       disk.device.capacity_server_cmaui_4_test_nested4Level:
       - test_nested4Level
       - disk.device.capacity_server_cmaui_4
+      forwarder_cmaui_port_43_test_nested4Level:
+      - test_nested4Level
+      - forwarder_cmaui_port_43
       scalable_server_cmaui_4_test_nested4Level:
       - test_nested4Level
       - scalable_server_cmaui_4
@@ -481,6 +490,9 @@ topology_template:
       network.outpoing.packets_cmaui_port_32:
       - cmaui_port_32
       - network.outpoing.packets
+      forwarder_cmaui_port_42_test_nested4Level:
+      - test_nested4Level
+      - forwarder_cmaui_port_42
       disk.write.requests_server_cmaui_4_test_nested4Level:
       - test_nested4Level
       - disk.write.requests_server_cmaui_4
@@ -571,4 +583,4 @@ topology_template:
       - dependency_cmaui_port_43
       dependency_server_cmaui_3:
       - server_cmaui_3
-      - 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/porttonetconnection/sharedNestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/sharedNestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml
index 517bd40ca7..596cdf338d 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/sharedNestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/sharedNestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml
@@ -207,6 +207,12 @@ topology_template:
       disk.device.read.bytes.rate_server_cmaui_4:
       - server_cmaui_4
       - disk.device.read.bytes.rate
+      forwarder_cmaui_port_42:
+      - cmaui_port_42
+      - forwarder
+      forwarder_cmaui_port_43:
+      - cmaui_port_43
+      - forwarder
       endpoint_server_cmaui_4:
       - server_cmaui_4
       - endpoint
@@ -342,4 +348,4 @@ topology_template:
       - link
       local_storage_server_cmaui_4:
       - server_cmaui_4
-      - 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/porttonetresourcegroupconnection/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetresourcegroupconnection/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index c600a5f1f9..86581389e2 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetresourcegroupconnection/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetresourcegroupconnection/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -229,6 +229,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_0:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       memory_server_cmaui:
         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/porttonetresourcegroupconnection/expectedoutputfiles/nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetresourcegroupconnection/expectedoutputfiles/nestedServiceTemplate.yaml
index 95669eaeba..39b990c6c5 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetresourcegroupconnection/expectedoutputfiles/nestedServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetresourcegroupconnection/expectedoutputfiles/nestedServiceTemplate.yaml
@@ -181,6 +181,9 @@ topology_template:
       disk.device.read.bytes_server_cmaui:
       - server_cmaui
       - disk.device.read.bytes
+      forwarder_cmaui_port_0:
+      - cmaui_port_0
+      - forwarder
       memory_server_cmaui:
       - server_cmaui
       - memory
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttosharednetresourcegrouplinking/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttosharednetresourcegrouplinking/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index d7dac6ebc8..a8416b7f21 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttosharednetresourcegrouplinking/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttosharednetresourcegrouplinking/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -209,6 +209,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_abc_port_1:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       cpu_util_server_cmaui:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -599,6 +604,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_2:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       binding_server_cmaui:
         type: tosca.capabilities.network.Bindable
         occurrences:
@@ -610,6 +620,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_1:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.read.requests_server_abc:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -816,4 +831,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/porttosharednetresourcegrouplinking/expectedoutputfiles/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttosharednetresourcegrouplinking/expectedoutputfiles/nested1ServiceTemplate.yaml
index 15e635979b..2256009421 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttosharednetresourcegrouplinking/expectedoutputfiles/nested1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttosharednetresourcegrouplinking/expectedoutputfiles/nested1ServiceTemplate.yaml
@@ -234,6 +234,9 @@ topology_template:
       host_server_cmaui:
       - server_cmaui
       - host
+      forwarder_abc_port_1:
+      - abc_port_1
+      - forwarder
       cpu_util_server_cmaui:
       - server_cmaui
       - cpu_util
@@ -432,12 +435,18 @@ topology_template:
       disk.device.read.bytes_server_abc:
       - server_abc
       - disk.device.read.bytes
+      forwarder_cmaui_port_2:
+      - cmaui_port_2
+      - forwarder
       binding_server_cmaui:
       - server_cmaui
       - binding
       memory.usage_server_abc:
       - server_abc
       - memory.usage
+      forwarder_cmaui_port_1:
+      - cmaui_port_1
+      - forwarder
       disk.read.requests_server_abc:
       - server_abc
       - disk.read.requests
@@ -573,4 +582,4 @@ topology_template:
       - dependency
       local_storage_server_abc:
       - server_abc
-      - 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/securityrulestoportconnection/nestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index e73e81a437..d7f5ae6fc1 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -405,19 +405,24 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_4_test_nested2Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.incoming.packets_cmaui_port_4_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_7_test_nested4Level_test_nested3Level_test_nested2Level:
+      cpu_server_cmaui_4_test_nested4Level_test_nested3Level_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_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+      network.incoming.bytes_cmaui_port_7_test_nested4Level_test_nested3Level_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:
@@ -441,17 +446,17 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_cmaui_port_6_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
       network.incoming.packets.rate_cmaui_port_5_test_nested3Level_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_cmaui_port_6_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.Attachment
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.read.bytes_server_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.
@@ -685,9 +690,8 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.root.size_server_cmaui_3_test_nested3Level_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_port_5_test_nested3Level_test_nested2Level:
+        type: org.openecomp.capabilities.Forwarder
         occurrences:
         - 1
         - UNBOUNDED
@@ -696,6 +700,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      disk.root.size_server_cmaui_3_test_nested3Level_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_cmaui_4_test_nested4Level_test_nested3Level_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.
@@ -759,12 +769,22 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_2:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.usage_server_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_1:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.outgoing.packets.rate_cmaui_port_4_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.
@@ -813,6 +833,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_3_test_nested2Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.write.bytes_server_cmaui_3_test_nested3Level_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.
@@ -848,6 +873,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       vcpus_server_cmaui_4_test_nested4Level_test_nested3Level_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.
@@ -1092,6 +1122,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.usage_server_cmaui_4_test_nested4Level_test_nested3Level_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.
@@ -1205,13 +1240,13 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
+      network.outpoing.packets_cmaui_port_3_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_3_test_nested2Level:
+      network.outgoing.packets.rate_cmaui_port_8_test_nested4Level_test_nested3Level_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:
@@ -1551,13 +1586,13 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      feature_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.Node
+      binding_server_cmaui_2_test_nested2Level:
+        type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
-      binding_server_cmaui_2_test_nested2Level:
-        type: tosca.capabilities.network.Bindable
+      feature_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
@@ -1716,6 +1751,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_6_test_nested3Level_test_nested2Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level_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.
@@ -1945,48 +1985,18 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.usage_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.usage_server_cmaui_4_test_nested4Level_test_nested3Level:
-        type: org.openecomp.capabilities.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_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_7_test_nested4Level_test_nested3Level:
-        type: org.openecomp.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_cmaui_4_test_nested4Level_test_nested3Level:
-        type: org.openecomp.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_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.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
       disk.read.requests_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -2011,58 +2021,24 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      endpoint_server_cmaui_4_test_nested4Level_test_nested3Level:
-        type: tosca.capabilities.Endpoint.Admin
-        occurrences:
-        - 1
-        - UNBOUNDED
       disk.read.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
-      cpu_util_server_cmaui_4_test_nested4Level_test_nested3Level:
-        type: org.openecomp.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_4_test_nested4Level_test_nested3Level:
         type: org.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_test_nested4Level_test_nested3Level:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      network.outgoing.bytes.rate_cmaui_port_8_test_nested4Level_test_nested3Level:
-        type: org.openecomp.capabilities.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_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_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.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_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_7_test_nested4Level_test_nested3Level:
         type: tosca.capabilities.Attachment
         occurrences:
@@ -2129,18 +2105,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      memory_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_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
       host_server_cmaui_3_test_nested3Level:
         type: tosca.capabilities.Container
         valid_source_types:
@@ -2148,42 +2112,18 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_cmaui_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.allocation_server_cmaui_3_test_nested3Level:
         type: org.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_cmaui_4_test_nested4Level_test_nested3Level:
-        type: org.openecomp.capabilities.metric.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_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_cmaui_port_6_test_nested3Level:
         type: org.openecomp.capabilities.metric.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_7_test_nested4Level_test_nested3Level:
-        type: org.openecomp.capabilities.metric.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_6_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -2214,24 +2154,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.capacity_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_cmaui_port_6_test_nested3Level:
-        type: org.openecomp.capabilities.metric.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_8_test_nested4Level_test_nested3Level:
-        type: org.openecomp.capabilities.metric.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_6_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -2250,12 +2172,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.iops_server_cmaui_4_test_nested4Level_test_nested3Level:
-        type: org.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_3:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
@@ -2263,12 +2179,6 @@ node_types:
         occurrences:
         - 0
         - 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.
-        occurrences:
-        - 1
-        - UNBOUNDED
       binding_cmaui_port_4:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
@@ -2298,752 +2208,912 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_cmaui_port_6_test_nested3Level:
+      disk.device.write.bytes.rate_server_cmaui_3_test_nested3Level:
         type: org.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_cmaui_3_test_nested3Level:
-        type: tosca.capabilities.Node
+      binding_cmaui_port_6_test_nested3Level:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
         occurrences:
-        - 1
+        - 0
         - UNBOUNDED
-      network.outgoing.bytes.rate_cmaui_port_3:
+      disk.usage_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.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_3_test_nested3Level:
+      network.incoming.bytes_cmaui_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.root.size_server_cmaui_3_test_nested3Level:
+      network.incoming.bytes_cmaui_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.rate_cmaui_port_4:
+      disk.device.latency_server_cmaui_3_test_nested3Level:
         type: org.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_6_test_nested3Level:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
-      disk.usage_server_cmaui_3_test_nested3Level:
+      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
-      os_server_cmaui_4_test_nested4Level_test_nested3Level:
-        type: tosca.capabilities.OperatingSystem
+      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
-      disk.device.write.requests_server_cmaui_3_test_nested3Level:
+      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.bytes_cmaui_port_4:
+      vcpus_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.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_3:
+      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
-      disk.device.read.requests.rate_server_cmaui_3_test_nested3Level:
+      network.incoming.packets.rate_cmaui_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.latency_server_cmaui_3_test_nested3Level:
+      cpu_server_cmaui_3_test_nested3Level:
         type: org.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:
-        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_port_3:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      memory.usage_server_cmaui_4_test_nested4Level_test_nested3Level:
+      network.incoming.packets.rate_cmaui_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.device.write.requests.rate_server_cmaui_3_test_nested3Level:
-        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_port_4:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_cmaui_port_8_test_nested4Level_test_nested3Level:
+      disk.device.allocation_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.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:
-        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_cmaui_2:
+        type: tosca.capabilities.network.Bindable
         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.
+      scalable_server_cmaui_2:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
+      disk.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.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_cmaui_4_test_nested4Level_test_nested3Level:
+      network.incoming.packets.rate_cmaui_port_5_test_nested3Level:
         type: org.openecomp.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_8_test_nested4Level_test_nested3Level:
+      network.outpoing.packets_cmaui_port_7_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.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:
+      feature_server_cmaui_4_test_nested4Level_test_nested3Level:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.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_7_test_nested4Level_test_nested3Level:
-        type: tosca.capabilities.Node
+      endpoint_server_cmaui_2:
+        type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
-      disk.iops_server_cmaui_3_test_nested3Level:
+      disk.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.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_3:
+      forwarder_cmaui_port_4:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      scalable_server_cmaui_4_test_nested4Level_test_nested3Level:
+        type: tosca.capabilities.Scalable
+        occurrences:
+        - 1
+        - UNBOUNDED
+      forwarder_cmaui_port_3:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.incoming.packets.rate_cmaui_port_8_test_nested4Level_test_nested3Level:
         type: org.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_cmaui_3_test_nested3Level:
+      disk.device.allocation_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_3:
-        type: tosca.capabilities.Node
+      disk.device.latency_server_cmaui_4_test_nested4Level_test_nested3Level:
+        type: org.openecomp.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_cmaui_2:
+      disk.read.bytes_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.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_4:
+      disk.device.allocation_server_cmaui_3_test_nested3Level:
         type: org.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_cmaui_2:
-        type: tosca.capabilities.Node
+      network.incoming.bytes.rate_cmaui_port_5_test_nested3Level:
+        type: org.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_4:
-        type: tosca.capabilities.Node
+      os_server_cmaui_3_test_nested3Level:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_cmaui_port_6_test_nested3Level:
+      network.incoming.packets_cmaui_port_8_test_nested4Level_test_nested3Level:
+        type: org.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_cmaui_4_test_nested4Level_test_nested3Level:
+        type: org.openecomp.capabilities.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_4_test_nested4Level_test_nested3Level:
+        type: org.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_8_test_nested4Level_test_nested3Level:
         type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_6_test_nested3Level:
+      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.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.allocation_server_cmaui_2:
+      disk.device.iops_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.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_cmaui_4_test_nested4Level_test_nested3Level:
+      network.incoming.bytes_cmaui_port_5_test_nested3Level:
         type: org.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_2:
+      network.outpoing.packets_cmaui_port_6_test_nested3Level:
+        type: org.openecomp.capabilities.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_7_test_nested4Level_test_nested3Level:
+        type: org.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_5_test_nested3Level:
         type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
+      disk.device.write.bytes_server_cmaui_3_test_nested3Level:
+        type: org.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_cmaui_2:
+      network.outgoing.bytes_cmaui_port_5_test_nested3Level:
         type: org.openecomp.capabilities.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_4:
+      disk.device.read.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
-      instance_server_cmaui_3_test_nested3Level:
+      network.outpoing.packets_cmaui_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_cmaui_port_3:
-        type: tosca.capabilities.Attachment
+      disk.capacity_server_cmaui_3_test_nested3Level:
+        type: org.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_4:
-        type: tosca.capabilities.Attachment
+      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
-      scalable_server_cmaui_2:
-        type: tosca.capabilities.Scalable
+      network.outpoing.packets_cmaui_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.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
+      network.incoming.bytes.rate_cmaui_port_7_test_nested4Level_test_nested3Level:
         type: org.openecomp.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_4_test_nested4Level_test_nested3Level:
+      disk.device.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.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_3:
+      binding_cmaui_port_8_test_nested4Level_test_nested3Level:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
+      disk.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.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_cmaui_3_test_nested3Level:
+      network.outgoing.packets.rate_cmaui_port_5_test_nested3Level:
         type: org.openecomp.capabilities.metric.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_5_test_nested3Level:
+      disk.device.read.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.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_2:
+      disk.device.read.bytes_server_cmaui_3_test_nested3Level:
         type: org.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_4_test_nested4Level_test_nested3Level:
+      memory.resident_server_cmaui_3_test_nested3Level:
         type: org.openecomp.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_7_test_nested4Level_test_nested3Level:
+      disk.device.usage_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.usage_server_cmaui_2:
+      disk.device.usage_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.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_cmaui_3_test_nested3Level:
+      network.incoming.bytes_cmaui_port_7_test_nested4Level_test_nested3Level:
         type: org.openecomp.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_cmaui_3_test_nested3Level:
+      disk.usage_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.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_cmaui_4_test_nested4Level_test_nested3Level:
-        type: tosca.capabilities.Node
+      forwarder_cmaui_port_6_test_nested3Level:
+        type: org.openecomp.capabilities.Forwarder
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_cmaui_port_8_test_nested4Level_test_nested3Level:
+      disk.device.write.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
-      binding_cmaui_port_7_test_nested4Level_test_nested3Level:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+      forwarder_cmaui_port_7_test_nested4Level_test_nested3Level:
+        type: org.openecomp.capabilities.Forwarder
         occurrences:
-        - 0
+        - 1
         - UNBOUNDED
-      disk.write.requests.rate_server_cmaui_3_test_nested3Level:
+      endpoint_server_cmaui_4_test_nested4Level_test_nested3Level:
+        type: tosca.capabilities.Endpoint.Admin
+        occurrences:
+        - 1
+        - UNBOUNDED
+      cpu_util_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.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_cmaui_4_test_nested4Level_test_nested3Level:
+      feature_test_nested4Level_test_nested3Level:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.outgoing.bytes.rate_cmaui_port_8_test_nested4Level_test_nested3Level:
         type: org.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_cmaui_2:
-        type: tosca.capabilities.Endpoint.Admin
+      disk.device.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
-      network.incoming.bytes_cmaui_port_6_test_nested3Level:
+      disk.device.capacity_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
-      os_server_cmaui_2:
-        type: tosca.capabilities.OperatingSystem
+      memory_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.requests_server_cmaui_4_test_nested4Level_test_nested3Level:
+      cpu_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
-      scalable_server_cmaui_4_test_nested4Level_test_nested3Level:
-        type: tosca.capabilities.Scalable
+      network.incoming.packets_cmaui_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_cmaui_port_8_test_nested4Level_test_nested3Level:
+      memory_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.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_5_test_nested3Level:
-        type: tosca.capabilities.Attachment
+      forwarder_cmaui_port_8_test_nested4Level_test_nested3Level:
+        type: org.openecomp.capabilities.Forwarder
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.allocation_server_cmaui_2:
+      network.incoming.packets_cmaui_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.incoming.packets_cmaui_port_7_test_nested4Level_test_nested3Level:
+      network.outgoing.bytes_cmaui_port_7_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.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_cmaui_4_test_nested4Level_test_nested3Level:
+      disk.capacity_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_server_cmaui_3_test_nested3Level:
+      network.incoming.packets_cmaui_port_6_test_nested3Level:
         type: org.openecomp.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_cmaui_4_test_nested4Level_test_nested3Level:
+      network.incoming.bytes_cmaui_port_8_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.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_cmaui_3_test_nested3Level:
+      disk.device.iops_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.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_5_test_nested3Level:
+      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
-      host_server_cmaui_2:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
+      network.incoming.bytes.rate_cmaui_port_6_test_nested3Level:
+        type: org.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_cmaui_3_test_nested3Level:
-        type: tosca.capabilities.OperatingSystem
+      feature_server_cmaui_3_test_nested3Level:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level:
+      network.outgoing.bytes.rate_cmaui_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.write.requests_server_cmaui_4_test_nested4Level_test_nested3Level:
+      disk.root.size_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.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_8_test_nested4Level_test_nested3Level:
+      network.outgoing.bytes.rate_cmaui_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_server_cmaui_3_test_nested3Level:
-        type: tosca.capabilities.network.Bindable
+      os_server_cmaui_4_test_nested4Level_test_nested3Level:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      feature_test_nested3Level:
-        type: tosca.capabilities.Node
+      disk.device.write.requests_server_cmaui_3_test_nested3Level:
+        type: org.openecomp.capabilities.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_8_test_nested4Level_test_nested3Level:
+      disk.device.read.requests.rate_server_cmaui_3_test_nested3Level:
         type: org.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_cmaui_4_test_nested4Level_test_nested3Level:
+      memory.usage_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.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_3_test_nested3Level:
+      disk.device.write.requests.rate_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.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_cmaui_3_test_nested3Level:
+      network.outgoing.bytes_cmaui_port_8_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.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_4_test_nested4Level_test_nested3Level:
+      disk.device.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.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_8_test_nested4Level_test_nested3Level:
+      network.outpoing.packets_cmaui_port_8_test_nested4Level_test_nested3Level:
+        type: org.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_7_test_nested4Level_test_nested3Level:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.iops_server_cmaui_3_test_nested3Level:
+        type: org.openecomp.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_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_cmaui_2:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      attachment_cmaui_port_6_test_nested3Level:
         type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      scalable_server_cmaui_3_test_nested3Level:
-        type: tosca.capabilities.Scalable
+      network.outgoing.packets.rate_cmaui_port_6_test_nested3Level:
+        type: org.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_cmaui_2:
+      disk.allocation_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.iops_server_cmaui_3_test_nested3Level:
+      vcpus_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.outgoing.bytes.rate_cmaui_port_7_test_nested4Level_test_nested3Level:
+      network.outgoing.packets.rate_cmaui_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.incoming.bytes_cmaui_port_5_test_nested3Level:
+      instance_server_cmaui_3_test_nested3Level:
         type: org.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_cmaui_3_test_nested3Level:
-        type: tosca.capabilities.Endpoint.Admin
+      attachment_cmaui_port_3:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      vcpus_server_cmaui_3_test_nested3Level:
+      attachment_cmaui_port_4:
+        type: tosca.capabilities.Attachment
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.capacity_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.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_7_test_nested4Level_test_nested3Level:
+      network.outgoing.packets.rate_cmaui_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.allocation_server_cmaui_4_test_nested4Level_test_nested3Level:
+      disk.device.read.bytes.rate_server_cmaui_3_test_nested3Level:
         type: org.openecomp.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_6_test_nested3Level:
+      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
-      network.outgoing.bytes_cmaui_port_4:
+      memory.resident_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.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_7_test_nested4Level_test_nested3Level:
+      disk.usage_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
-      binding_cmaui_port_5_test_nested3Level:
+      disk.device.usage_server_cmaui_3_test_nested3Level:
+        type: org.openecomp.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_cmaui_3_test_nested3Level:
+        type: org.openecomp.capabilities.metric.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_8_test_nested4Level_test_nested3Level:
+        type: org.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_7_test_nested4Level_test_nested3Level:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
         - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
         occurrences:
         - 0
         - UNBOUNDED
-      network.incoming.bytes.rate_cmaui_port_3:
+      disk.write.requests.rate_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.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_4:
+      network.incoming.bytes_cmaui_port_6_test_nested3Level:
         type: org.openecomp.capabilities.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_3_test_nested3Level:
+      os_server_cmaui_2:
+        type: tosca.capabilities.OperatingSystem
+        occurrences:
+        - 1
+        - UNBOUNDED
+      attachment_cmaui_port_5_test_nested3Level:
+        type: tosca.capabilities.Attachment
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.incoming.packets_cmaui_port_7_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.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_5_test_nested3Level:
+      disk.latency_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.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_2:
+      host_server_cmaui_2:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.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_4_test_nested4Level_test_nested3Level:
+      disk.write.requests_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.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:
+      binding_server_cmaui_3_test_nested3Level:
+        type: tosca.capabilities.network.Bindable
+        occurrences:
+        - 1
+        - UNBOUNDED
+      feature_test_nested3Level:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.outgoing.packets.rate_cmaui_port_8_test_nested4Level_test_nested3Level:
         type: org.openecomp.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_3:
+      cpu.delta_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.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_4_test_nested4Level_test_nested3Level:
+      disk.device.capacity_server_cmaui_3_test_nested3Level:
         type: org.openecomp.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_3_test_nested3Level:
+      scalable_server_cmaui_3_test_nested3Level:
+        type: tosca.capabilities.Scalable
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.outgoing.bytes.rate_cmaui_port_7_test_nested4Level_test_nested3Level:
         type: org.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:
+      endpoint_server_cmaui_3_test_nested3Level:
+        type: tosca.capabilities.Endpoint.Admin
+        occurrences:
+        - 1
+        - UNBOUNDED
+      vcpus_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.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.incoming.packets.rate_cmaui_port_7_test_nested4Level_test_nested3Level:
         type: org.openecomp.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_4:
+      disk.allocation_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.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_4_test_nested4Level_test_nested3Level:
-        type: tosca.capabilities.network.Bindable
+      network.outgoing.bytes_cmaui_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.incoming.bytes.rate_cmaui_port_7_test_nested4Level_test_nested3Level:
+      network.incoming.bytes.rate_cmaui_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.resident_server_cmaui_2:
+      network.incoming.bytes.rate_cmaui_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.device.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
+      disk.device.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.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_8_test_nested4Level_test_nested3Level:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+      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:
-        - 0
+        - 1
         - UNBOUNDED
-      disk.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level:
+      disk.device.write.requests_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.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_3_test_nested3Level:
+      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
-      feature_cmaui_port_5_test_nested3Level:
-        type: tosca.capabilities.Node
+      binding_server_cmaui_4_test_nested4Level_test_nested3Level:
+        type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_cmaui_port_5_test_nested3Level:
+      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.latency_server_cmaui_2:
+      disk.device.read.requests_server_cmaui_3_test_nested3Level:
         type: org.openecomp.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_3_test_nested3Level:
-        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_port_5_test_nested3Level:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_5_test_nested3Level:
+      network.incoming.packets_cmaui_port_5_test_nested3Level:
         type: org.openecomp.capabilities.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_4_test_nested4Level_test_nested3Level:
+      disk.latency_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.bytes_server_cmaui_3_test_nested3Level:
+      disk.ephemeral.size_server_cmaui_3_test_nested3Level:
         type: org.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_3_test_nested3Level:
-        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_port_5_test_nested3Level:
+        type: org.openecomp.capabilities.Forwarder
         occurrences:
         - 1
         - UNBOUNDED
@@ -3219,12 +3289,22 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_7_test_nested4Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.read.requests_server_cmaui_4_test_nested4Level:
         type: org.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_8_test_nested4Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.root.size_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -3770,6 +3850,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_6:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.read.requests.rate_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -3782,6 +3867,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_5:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.allocation_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -4200,6 +4290,16 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_8:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      forwarder_cmaui_port_7:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.write.requests.rate_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -4406,4 +4506,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/securityrulestoportconnection/nestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml
index 41205547a5..f544e9313e 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml
@@ -237,15 +237,18 @@ topology_template:
       disk.device.read.bytes_server_cmaui_2_test_nested2Level:
       - test_nested2Level
       - disk.device.read.bytes_server_cmaui_2
+      forwarder_cmaui_port_4_test_nested2Level:
+      - test_nested2Level
+      - forwarder_cmaui_port_4
       network.incoming.packets_cmaui_port_4_test_nested2Level:
       - test_nested2Level
       - network.incoming.packets_cmaui_port_4
-      network.incoming.bytes_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - network.incoming.bytes_cmaui_port_7_test_nested4Level_test_nested3Level
       cpu_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - cpu_server_cmaui_4_test_nested4Level_test_nested3Level
+      network.incoming.bytes_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - network.incoming.bytes_cmaui_port_7_test_nested4Level_test_nested3Level
       disk.device.write.requests.rate_server_cmaui_2_test_nested2Level:
       - test_nested2Level
       - disk.device.write.requests.rate_server_cmaui_2
@@ -255,12 +258,12 @@ topology_template:
       network.incoming.bytes_cmaui_port_3_test_nested2Level:
       - test_nested2Level
       - network.incoming.bytes_cmaui_port_3
-      attachment_cmaui_port_6_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - attachment_cmaui_port_6_test_nested3Level
       network.incoming.packets.rate_cmaui_port_5_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.incoming.packets.rate_cmaui_port_5_test_nested3Level
+      attachment_cmaui_port_6_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - attachment_cmaui_port_6_test_nested3Level
       disk.read.bytes_server_cmaui_2_test_nested2Level:
       - test_nested2Level
       - disk.read.bytes_server_cmaui_2
@@ -378,12 +381,15 @@ topology_template:
       binding_server_cmaui_1:
       - server_cmaui_1
       - binding
-      disk.root.size_server_cmaui_3_test_nested3Level_test_nested2Level:
+      forwarder_cmaui_port_5_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.root.size_server_cmaui_3_test_nested3Level
+      - forwarder_cmaui_port_5_test_nested3Level
       os_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - os_server_cmaui_3_test_nested3Level
+      disk.root.size_server_cmaui_3_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - disk.root.size_server_cmaui_3_test_nested3Level
       disk.device.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - disk.device.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level
@@ -417,9 +423,15 @@ topology_template:
       os_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - os_server_cmaui_4_test_nested4Level_test_nested3Level
+      forwarder_cmaui_port_2:
+      - cmaui_port_2
+      - forwarder
       disk.usage_server_cmaui_2_test_nested2Level:
       - test_nested2Level
       - disk.usage_server_cmaui_2
+      forwarder_cmaui_port_1:
+      - cmaui_port_1
+      - forwarder
       network.outgoing.packets.rate_cmaui_port_4_test_nested2Level:
       - test_nested2Level
       - network.outgoing.packets.rate_cmaui_port_4
@@ -444,6 +456,9 @@ topology_template:
       memory_server_cmaui_1:
       - server_cmaui_1
       - memory
+      forwarder_cmaui_port_3_test_nested2Level:
+      - test_nested2Level
+      - forwarder_cmaui_port_3
       disk.device.write.bytes_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - disk.device.write.bytes_server_cmaui_3_test_nested3Level
@@ -462,6 +477,9 @@ topology_template:
       disk.read.requests_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - disk.read.requests_server_cmaui_3_test_nested3Level
+      forwarder_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - forwarder_cmaui_port_8_test_nested4Level_test_nested3Level
       vcpus_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - vcpus_server_cmaui_4_test_nested4Level_test_nested3Level
@@ -588,6 +606,9 @@ topology_template:
       disk.device.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - disk.device.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level
+      forwarder_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - forwarder_cmaui_port_7_test_nested4Level_test_nested3Level
       disk.device.usage_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - disk.device.usage_server_cmaui_4_test_nested4Level_test_nested3Level
@@ -645,12 +666,12 @@ topology_template:
       scalable_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - scalable_server_cmaui_4_test_nested4Level_test_nested3Level
-      network.outgoing.packets.rate_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - network.outgoing.packets.rate_cmaui_port_8_test_nested4Level_test_nested3Level
       network.outpoing.packets_cmaui_port_3_test_nested2Level:
       - test_nested2Level
       - network.outpoing.packets_cmaui_port_3
+      network.outgoing.packets.rate_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - network.outgoing.packets.rate_cmaui_port_8_test_nested4Level_test_nested3Level
       network.incoming.packets_cmaui_port_6_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.incoming.packets_cmaui_port_6_test_nested3Level
@@ -822,12 +843,12 @@ topology_template:
       host_server_cmaui_1:
       - server_cmaui_1
       - host
-      feature_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - feature_cmaui_port_7_test_nested4Level_test_nested3Level
       binding_server_cmaui_2_test_nested2Level:
       - test_nested2Level
       - binding_server_cmaui_2
+      feature_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - feature_cmaui_port_7_test_nested4Level_test_nested3Level
       cpu.delta_server_cmaui_2_test_nested2Level:
       - test_nested2Level
       - cpu.delta_server_cmaui_2
@@ -906,6 +927,9 @@ topology_template:
       memory.resident_server_cmaui_1:
       - server_cmaui_1
       - memory.resident
+      forwarder_cmaui_port_6_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - forwarder_cmaui_port_6_test_nested3Level
       disk.device.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - disk.device.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level
@@ -999,4 +1023,4 @@ topology_template:
       - dependency
       dependency_cmaui_port_4_test_nested2Level:
       - test_nested2Level
-      - dependency_cmaui_port_4
\ No newline at end of file
+      - dependency_cmaui_port_4
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml
index 2d592aa6e9..26dc2647ae 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml
@@ -169,27 +169,12 @@ topology_template:
       cpu_util_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - cpu_util_server_cmaui_3
-      disk.device.usage_server_cmaui_2:
-      - server_cmaui_2
-      - disk.device.usage
-      disk.device.usage_server_cmaui_4_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.device.usage_server_cmaui_4_test_nested4Level
       disk.device.latency_server_cmaui_2:
       - server_cmaui_2
       - disk.device.latency
-      network.incoming.bytes_cmaui_port_7_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - network.incoming.bytes_cmaui_port_7_test_nested4Level
-      disk.usage_server_cmaui_4_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.usage_server_cmaui_4_test_nested4Level
       disk.root.size_server_cmaui_2:
       - server_cmaui_2
       - disk.root.size
-      disk.device.write.requests.rate_server_cmaui_2:
-      - server_cmaui_2
-      - disk.device.write.requests.rate
       disk.read.requests_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - disk.read.requests_server_cmaui_3
@@ -202,33 +187,15 @@ topology_template:
       network.outgoing.bytes_cmaui_port_3:
       - cmaui_port_3
       - network.outgoing.bytes
-      endpoint_server_cmaui_4_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - endpoint_server_cmaui_4_test_nested4Level
       disk.read.requests_server_cmaui_2:
       - server_cmaui_2
       - disk.read.requests
-      cpu_util_server_cmaui_4_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - cpu_util_server_cmaui_4_test_nested4Level
       disk.write.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - disk.write.bytes.rate_server_cmaui_4_test_nested4Level
-      feature_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - feature_test_nested4Level
-      network.outgoing.bytes.rate_cmaui_port_8_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - network.outgoing.bytes.rate_cmaui_port_8_test_nested4Level
-      disk.device.iops_server_cmaui_2:
-      - server_cmaui_2
-      - disk.device.iops
       disk.device.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - disk.device.write.bytes_server_cmaui_4_test_nested4Level
-      disk.device.capacity_server_cmaui_2:
-      - server_cmaui_2
-      - disk.device.capacity
       attachment_cmaui_port_7_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - attachment_cmaui_port_7_test_nested4Level
@@ -262,33 +229,15 @@ topology_template:
       network.outgoing.bytes.rate_cmaui_port_5_test_nested3Level:
       - test_nested3Level
       - network.outgoing.bytes.rate_cmaui_port_5
-      memory_server_cmaui_2:
-      - server_cmaui_2
-      - memory
-      cpu_server_cmaui_2:
-      - server_cmaui_2
-      - cpu
       host_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - host_server_cmaui_3
-      network.incoming.packets_cmaui_port_3:
-      - cmaui_port_3
-      - network.incoming.packets
       disk.allocation_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - disk.allocation_server_cmaui_3
-      memory_server_cmaui_4_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - memory_server_cmaui_4_test_nested4Level
-      network.incoming.packets_cmaui_port_4:
-      - cmaui_port_4
-      - network.incoming.packets
       network.outgoing.bytes_cmaui_port_6_test_nested3Level:
       - test_nested3Level
       - network.outgoing.bytes_cmaui_port_6
-      network.outgoing.bytes_cmaui_port_7_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - network.outgoing.bytes_cmaui_port_7_test_nested4Level
       network.incoming.packets.rate_cmaui_port_6_test_nested3Level:
       - test_nested3Level
       - network.incoming.packets.rate_cmaui_port_6
@@ -304,15 +253,6 @@ topology_template:
       network.outpoing.packets_cmaui_port_5_test_nested3Level:
       - test_nested3Level
       - network.outpoing.packets_cmaui_port_5
-      disk.capacity_server_cmaui_2:
-      - server_cmaui_2
-      - disk.capacity
-      network.incoming.packets_cmaui_port_6_test_nested3Level:
-      - test_nested3Level
-      - network.incoming.packets_cmaui_port_6
-      network.incoming.bytes_cmaui_port_8_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - network.incoming.bytes_cmaui_port_8_test_nested4Level
       network.outgoing.bytes.rate_cmaui_port_6_test_nested3Level:
       - test_nested3Level
       - network.outgoing.bytes.rate_cmaui_port_6
@@ -322,15 +262,9 @@ topology_template:
       disk.read.bytes.rate_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - disk.read.bytes.rate_server_cmaui_3
-      disk.device.iops_server_cmaui_4_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.device.iops_server_cmaui_4_test_nested4Level
       binding_cmaui_port_3:
       - cmaui_port_3
       - binding
-      disk.iops_server_cmaui_2:
-      - server_cmaui_2
-      - disk.iops
       binding_cmaui_port_4:
       - cmaui_port_4
       - binding
@@ -346,6 +280,264 @@ topology_template:
       memory_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - memory_server_cmaui_3
+      disk.device.write.bytes.rate_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.device.write.bytes.rate_server_cmaui_3
+      binding_cmaui_port_6_test_nested3Level:
+      - test_nested3Level
+      - binding_cmaui_port_6
+      disk.usage_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.usage_server_cmaui_3
+      network.incoming.bytes_cmaui_port_4:
+      - cmaui_port_4
+      - network.incoming.bytes
+      network.incoming.bytes_cmaui_port_3:
+      - cmaui_port_3
+      - network.incoming.bytes
+      disk.device.latency_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.device.latency_server_cmaui_3
+      cpu_util_server_cmaui_2:
+      - server_cmaui_2
+      - cpu_util
+      disk.device.write.bytes.rate_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.write.bytes.rate
+      disk.write.bytes.rate_server_cmaui_2:
+      - server_cmaui_2
+      - disk.write.bytes.rate
+      vcpus_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - vcpus_server_cmaui_4_test_nested4Level
+      disk.device.write.bytes_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.write.bytes
+      network.incoming.packets.rate_cmaui_port_3:
+      - cmaui_port_3
+      - network.incoming.packets.rate
+      cpu_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - cpu_server_cmaui_3
+      feature_cmaui_port_3:
+      - cmaui_port_3
+      - feature
+      network.incoming.packets.rate_cmaui_port_4:
+      - cmaui_port_4
+      - network.incoming.packets.rate
+      feature_cmaui_port_4:
+      - cmaui_port_4
+      - feature
+      disk.device.allocation_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.device.allocation_server_cmaui_4_test_nested4Level
+      binding_server_cmaui_2:
+      - server_cmaui_2
+      - binding
+      scalable_server_cmaui_2:
+      - server_cmaui_2
+      - scalable
+      disk.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.write.requests.rate_server_cmaui_4_test_nested4Level
+      network.incoming.packets.rate_cmaui_port_5_test_nested3Level:
+      - test_nested3Level
+      - network.incoming.packets.rate_cmaui_port_5
+      network.outpoing.packets_cmaui_port_7_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - network.outpoing.packets_cmaui_port_7_test_nested4Level
+      feature_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - feature_server_cmaui_4_test_nested4Level
+      disk.device.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.device.read.bytes_server_cmaui_4_test_nested4Level
+      endpoint_server_cmaui_2:
+      - server_cmaui_2
+      - endpoint
+      disk.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.read.requests_server_cmaui_4_test_nested4Level
+      forwarder_cmaui_port_4:
+      - cmaui_port_4
+      - forwarder
+      scalable_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - scalable_server_cmaui_4_test_nested4Level
+      forwarder_cmaui_port_3:
+      - cmaui_port_3
+      - forwarder
+      network.incoming.packets.rate_cmaui_port_8_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - network.incoming.packets.rate_cmaui_port_8_test_nested4Level
+      disk.device.allocation_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.allocation
+      disk.device.latency_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.device.latency_server_cmaui_4_test_nested4Level
+      disk.read.bytes_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.read.bytes_server_cmaui_3
+      disk.device.allocation_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.device.allocation_server_cmaui_3
+      network.incoming.bytes.rate_cmaui_port_5_test_nested3Level:
+      - test_nested3Level
+      - network.incoming.bytes.rate_cmaui_port_5
+      os_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - os_server_cmaui_3
+      network.incoming.packets_cmaui_port_8_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - network.incoming.packets_cmaui_port_8_test_nested4Level
+      cpu_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - cpu_server_cmaui_4_test_nested4Level
+      disk.device.write.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.device.write.bytes.rate_server_cmaui_4_test_nested4Level
+      attachment_cmaui_port_8_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - attachment_cmaui_port_8_test_nested4Level
+      instance_server_cmaui_2:
+      - server_cmaui_2
+      - instance
+      disk.device.iops_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.device.iops_server_cmaui_3
+      network.incoming.bytes_cmaui_port_5_test_nested3Level:
+      - test_nested3Level
+      - network.incoming.bytes_cmaui_port_5
+      network.outpoing.packets_cmaui_port_6_test_nested3Level:
+      - test_nested3Level
+      - network.outpoing.packets_cmaui_port_6
+      network.outgoing.packets.rate_cmaui_port_7_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - network.outgoing.packets.rate_cmaui_port_7_test_nested4Level
+      binding_cmaui_port_5_test_nested3Level:
+      - test_nested3Level
+      - binding_cmaui_port_5
+      disk.device.write.bytes_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.device.write.bytes_server_cmaui_3
+      network.outgoing.bytes_cmaui_port_5_test_nested3Level:
+      - test_nested3Level
+      - network.outgoing.bytes_cmaui_port_5
+      disk.device.read.requests_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.read.requests
+      network.outpoing.packets_cmaui_port_3:
+      - cmaui_port_3
+      - network.outpoing.packets
+      disk.capacity_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.capacity_server_cmaui_3
+      cpu.delta_server_cmaui_2:
+      - server_cmaui_2
+      - cpu.delta
+      network.outpoing.packets_cmaui_port_4:
+      - cmaui_port_4
+      - network.outpoing.packets
+      network.incoming.bytes.rate_cmaui_port_7_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - network.incoming.bytes.rate_cmaui_port_7_test_nested4Level
+      disk.device.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.device.write.requests.rate_server_cmaui_4_test_nested4Level
+      binding_cmaui_port_8_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - binding_cmaui_port_8_test_nested4Level
+      disk.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.write.bytes_server_cmaui_4_test_nested4Level
+      network.outgoing.packets.rate_cmaui_port_5_test_nested3Level:
+      - test_nested3Level
+      - network.outgoing.packets.rate_cmaui_port_5
+      disk.device.read.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.device.read.requests.rate_server_cmaui_4_test_nested4Level
+      disk.device.read.bytes_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.device.read.bytes_server_cmaui_3
+      memory.resident_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - memory.resident_server_cmaui_3
+      disk.device.usage_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.usage
+      disk.device.usage_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.device.usage_server_cmaui_4_test_nested4Level
+      network.incoming.bytes_cmaui_port_7_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - network.incoming.bytes_cmaui_port_7_test_nested4Level
+      disk.usage_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.usage_server_cmaui_4_test_nested4Level
+      forwarder_cmaui_port_6_test_nested3Level:
+      - test_nested3Level
+      - forwarder_cmaui_port_6
+      disk.device.write.requests.rate_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.write.requests.rate
+      forwarder_cmaui_port_7_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - forwarder_cmaui_port_7_test_nested4Level
+      endpoint_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - endpoint_server_cmaui_4_test_nested4Level
+      cpu_util_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - cpu_util_server_cmaui_4_test_nested4Level
+      feature_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - feature_test_nested4Level
+      network.outgoing.bytes.rate_cmaui_port_8_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - network.outgoing.bytes.rate_cmaui_port_8_test_nested4Level
+      disk.device.iops_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.iops
+      disk.device.capacity_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.capacity
+      memory_server_cmaui_2:
+      - server_cmaui_2
+      - memory
+      cpu_server_cmaui_2:
+      - server_cmaui_2
+      - cpu
+      network.incoming.packets_cmaui_port_3:
+      - cmaui_port_3
+      - network.incoming.packets
+      memory_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - memory_server_cmaui_4_test_nested4Level
+      forwarder_cmaui_port_8_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - forwarder_cmaui_port_8_test_nested4Level
+      network.incoming.packets_cmaui_port_4:
+      - cmaui_port_4
+      - network.incoming.packets
+      network.outgoing.bytes_cmaui_port_7_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - network.outgoing.bytes_cmaui_port_7_test_nested4Level
+      disk.capacity_server_cmaui_2:
+      - server_cmaui_2
+      - disk.capacity
+      network.incoming.packets_cmaui_port_6_test_nested3Level:
+      - test_nested3Level
+      - network.incoming.packets_cmaui_port_6
+      network.incoming.bytes_cmaui_port_8_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - network.incoming.bytes_cmaui_port_8_test_nested4Level
+      disk.device.iops_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.device.iops_server_cmaui_4_test_nested4Level
+      disk.iops_server_cmaui_2:
+      - server_cmaui_2
+      - disk.iops
       network.incoming.bytes.rate_cmaui_port_6_test_nested3Level:
       - test_nested3Level
       - network.incoming.bytes.rate_cmaui_port_6
@@ -355,42 +547,21 @@ topology_template:
       network.outgoing.bytes.rate_cmaui_port_3:
       - cmaui_port_3
       - network.outgoing.bytes.rate
-      disk.device.write.bytes.rate_server_cmaui_3_test_nested3Level:
-      - test_nested3Level
-      - disk.device.write.bytes.rate_server_cmaui_3
       disk.root.size_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - disk.root.size_server_cmaui_3
       network.outgoing.bytes.rate_cmaui_port_4:
       - cmaui_port_4
       - network.outgoing.bytes.rate
-      binding_cmaui_port_6_test_nested3Level:
-      - test_nested3Level
-      - binding_cmaui_port_6
-      disk.usage_server_cmaui_3_test_nested3Level:
-      - test_nested3Level
-      - disk.usage_server_cmaui_3
       os_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - os_server_cmaui_4_test_nested4Level
       disk.device.write.requests_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - disk.device.write.requests_server_cmaui_3
-      network.incoming.bytes_cmaui_port_4:
-      - cmaui_port_4
-      - network.incoming.bytes
-      network.incoming.bytes_cmaui_port_3:
-      - cmaui_port_3
-      - network.incoming.bytes
       disk.device.read.requests.rate_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - disk.device.read.requests.rate_server_cmaui_3
-      disk.device.latency_server_cmaui_3_test_nested3Level:
-      - test_nested3Level
-      - disk.device.latency_server_cmaui_3
-      cpu_util_server_cmaui_2:
-      - server_cmaui_2
-      - cpu_util
       memory.usage_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - memory.usage_server_cmaui_4_test_nested4Level
@@ -400,51 +571,24 @@ topology_template:
       network.outgoing.bytes_cmaui_port_8_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.outgoing.bytes_cmaui_port_8_test_nested4Level
-      disk.device.write.bytes.rate_server_cmaui_2:
-      - server_cmaui_2
-      - disk.device.write.bytes.rate
-      disk.write.bytes.rate_server_cmaui_2:
-      - server_cmaui_2
-      - disk.write.bytes.rate
       disk.device.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - disk.device.read.bytes.rate_server_cmaui_4_test_nested4Level
-      vcpus_server_cmaui_4_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - vcpus_server_cmaui_4_test_nested4Level
       network.outpoing.packets_cmaui_port_8_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.outpoing.packets_cmaui_port_8_test_nested4Level
-      disk.device.write.bytes_server_cmaui_2:
-      - server_cmaui_2
-      - disk.device.write.bytes
       feature_cmaui_port_7_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - feature_cmaui_port_7_test_nested4Level
       disk.iops_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - disk.iops_server_cmaui_3
-      network.incoming.packets.rate_cmaui_port_3:
-      - cmaui_port_3
-      - network.incoming.packets.rate
-      cpu_server_cmaui_3_test_nested3Level:
-      - test_nested3Level
-      - cpu_server_cmaui_3
-      feature_cmaui_port_3:
-      - cmaui_port_3
-      - feature
       disk.write.bytes_server_cmaui_2:
       - server_cmaui_2
       - disk.write.bytes
-      network.incoming.packets.rate_cmaui_port_4:
-      - cmaui_port_4
-      - network.incoming.packets.rate
       feature_server_cmaui_2:
       - server_cmaui_2
       - feature
-      feature_cmaui_port_4:
-      - cmaui_port_4
-      - feature
       attachment_cmaui_port_6_test_nested3Level:
       - test_nested3Level
       - attachment_cmaui_port_6
@@ -454,12 +598,6 @@ topology_template:
       disk.allocation_server_cmaui_2:
       - server_cmaui_2
       - disk.allocation
-      disk.device.allocation_server_cmaui_4_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.device.allocation_server_cmaui_4_test_nested4Level
-      binding_server_cmaui_2:
-      - server_cmaui_2
-      - binding
       vcpus_server_cmaui_2:
       - server_cmaui_2
       - vcpus
@@ -475,12 +613,6 @@ topology_template:
       attachment_cmaui_port_4:
       - cmaui_port_4
       - attachment
-      scalable_server_cmaui_2:
-      - server_cmaui_2
-      - scalable
-      disk.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.write.requests.rate_server_cmaui_4_test_nested4Level
       disk.capacity_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - disk.capacity_server_cmaui_4_test_nested4Level
@@ -490,18 +622,12 @@ topology_template:
       disk.device.read.bytes.rate_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - disk.device.read.bytes.rate_server_cmaui_3
-      network.incoming.packets.rate_cmaui_port_5_test_nested3Level:
-      - test_nested3Level
-      - network.incoming.packets.rate_cmaui_port_5
       disk.write.requests_server_cmaui_2:
       - server_cmaui_2
       - disk.write.requests
       memory.resident_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - memory.resident_server_cmaui_4_test_nested4Level
-      network.outpoing.packets_cmaui_port_7_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - network.outpoing.packets_cmaui_port_7_test_nested4Level
       disk.usage_server_cmaui_2:
       - server_cmaui_2
       - disk.usage
@@ -511,9 +637,6 @@ topology_template:
       disk.write.bytes_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - disk.write.bytes_server_cmaui_3
-      feature_server_cmaui_4_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - feature_server_cmaui_4_test_nested4Level
       network.incoming.bytes.rate_cmaui_port_8_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.incoming.bytes.rate_cmaui_port_8_test_nested4Level
@@ -523,66 +646,30 @@ topology_template:
       disk.write.requests.rate_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - disk.write.requests.rate_server_cmaui_3
-      disk.device.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.device.read.bytes_server_cmaui_4_test_nested4Level
-      endpoint_server_cmaui_2:
-      - server_cmaui_2
-      - endpoint
       network.incoming.bytes_cmaui_port_6_test_nested3Level:
       - test_nested3Level
       - network.incoming.bytes_cmaui_port_6
       os_server_cmaui_2:
       - server_cmaui_2
       - os
-      disk.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.read.requests_server_cmaui_4_test_nested4Level
-      scalable_server_cmaui_4_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - scalable_server_cmaui_4_test_nested4Level
-      network.incoming.packets.rate_cmaui_port_8_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - network.incoming.packets.rate_cmaui_port_8_test_nested4Level
       attachment_cmaui_port_5_test_nested3Level:
       - test_nested3Level
       - attachment_cmaui_port_5
-      disk.device.allocation_server_cmaui_2:
-      - server_cmaui_2
-      - disk.device.allocation
       network.incoming.packets_cmaui_port_7_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.incoming.packets_cmaui_port_7_test_nested4Level
-      disk.device.latency_server_cmaui_4_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.device.latency_server_cmaui_4_test_nested4Level
-      disk.read.bytes_server_cmaui_3_test_nested3Level:
-      - test_nested3Level
-      - disk.read.bytes_server_cmaui_3
       disk.latency_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - disk.latency_server_cmaui_4_test_nested4Level
-      disk.device.allocation_server_cmaui_3_test_nested3Level:
-      - test_nested3Level
-      - disk.device.allocation_server_cmaui_3
-      network.incoming.bytes.rate_cmaui_port_5_test_nested3Level:
-      - test_nested3Level
-      - network.incoming.bytes.rate_cmaui_port_5
       host_server_cmaui_2:
       - server_cmaui_2
       - host
-      os_server_cmaui_3_test_nested3Level:
-      - test_nested3Level
-      - os_server_cmaui_3
       disk.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - disk.read.bytes_server_cmaui_4_test_nested4Level
       disk.write.requests_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - disk.write.requests_server_cmaui_4_test_nested4Level
-      network.incoming.packets_cmaui_port_8_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - network.incoming.packets_cmaui_port_8_test_nested4Level
       binding_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - binding_server_cmaui_3
@@ -592,36 +679,18 @@ topology_template:
       network.outgoing.packets.rate_cmaui_port_8_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.outgoing.packets.rate_cmaui_port_8_test_nested4Level
-      cpu_server_cmaui_4_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - cpu_server_cmaui_4_test_nested4Level
       cpu.delta_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - cpu.delta_server_cmaui_3
       disk.device.capacity_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - disk.device.capacity_server_cmaui_3
-      disk.device.write.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.device.write.bytes.rate_server_cmaui_4_test_nested4Level
-      attachment_cmaui_port_8_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - attachment_cmaui_port_8_test_nested4Level
       scalable_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - scalable_server_cmaui_3
-      instance_server_cmaui_2:
-      - server_cmaui_2
-      - instance
-      disk.device.iops_server_cmaui_3_test_nested3Level:
-      - test_nested3Level
-      - disk.device.iops_server_cmaui_3
       network.outgoing.bytes.rate_cmaui_port_7_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.outgoing.bytes.rate_cmaui_port_7_test_nested4Level
-      network.incoming.bytes_cmaui_port_5_test_nested3Level:
-      - test_nested3Level
-      - network.incoming.bytes_cmaui_port_5
       endpoint_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - endpoint_server_cmaui_3
@@ -634,75 +703,33 @@ topology_template:
       disk.allocation_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - disk.allocation_server_cmaui_4_test_nested4Level
-      network.outpoing.packets_cmaui_port_6_test_nested3Level:
-      - test_nested3Level
-      - network.outpoing.packets_cmaui_port_6
       network.outgoing.bytes_cmaui_port_4:
       - cmaui_port_4
       - network.outgoing.bytes
-      network.outgoing.packets.rate_cmaui_port_7_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - network.outgoing.packets.rate_cmaui_port_7_test_nested4Level
-      binding_cmaui_port_5_test_nested3Level:
-      - test_nested3Level
-      - binding_cmaui_port_5
       network.incoming.bytes.rate_cmaui_port_3:
       - cmaui_port_3
       - network.incoming.bytes.rate
       network.incoming.bytes.rate_cmaui_port_4:
       - cmaui_port_4
       - network.incoming.bytes.rate
-      disk.device.write.bytes_server_cmaui_3_test_nested3Level:
-      - test_nested3Level
-      - disk.device.write.bytes_server_cmaui_3
-      network.outgoing.bytes_cmaui_port_5_test_nested3Level:
-      - test_nested3Level
-      - network.outgoing.bytes_cmaui_port_5
-      disk.device.read.requests_server_cmaui_2:
-      - server_cmaui_2
-      - disk.device.read.requests
       disk.device.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - disk.device.read.requests_server_cmaui_4_test_nested4Level
       disk.read.bytes.rate_server_cmaui_2:
       - server_cmaui_2
       - disk.read.bytes.rate
-      network.outpoing.packets_cmaui_port_3:
-      - cmaui_port_3
-      - network.outpoing.packets
       disk.device.write.requests_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - disk.device.write.requests_server_cmaui_4_test_nested4Level
-      disk.capacity_server_cmaui_3_test_nested3Level:
-      - test_nested3Level
-      - disk.capacity_server_cmaui_3
-      cpu.delta_server_cmaui_2:
-      - server_cmaui_2
-      - cpu.delta
       disk.device.read.requests.rate_server_cmaui_2:
       - server_cmaui_2
       - disk.device.read.requests.rate
-      network.outpoing.packets_cmaui_port_4:
-      - cmaui_port_4
-      - network.outpoing.packets
       binding_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - binding_server_cmaui_4_test_nested4Level
-      network.incoming.bytes.rate_cmaui_port_7_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - network.incoming.bytes.rate_cmaui_port_7_test_nested4Level
       memory.resident_server_cmaui_2:
       - server_cmaui_2
       - memory.resident
-      disk.device.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.device.write.requests.rate_server_cmaui_4_test_nested4Level
-      binding_cmaui_port_8_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - binding_cmaui_port_8_test_nested4Level
-      disk.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.write.bytes_server_cmaui_4_test_nested4Level
       disk.device.read.requests_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - disk.device.read.requests_server_cmaui_3
@@ -718,18 +745,9 @@ topology_template:
       disk.ephemeral.size_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - disk.ephemeral.size_server_cmaui_3
-      network.outgoing.packets.rate_cmaui_port_5_test_nested3Level:
-      - test_nested3Level
-      - network.outgoing.packets.rate_cmaui_port_5
-      disk.device.read.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
+      forwarder_cmaui_port_5_test_nested3Level:
       - test_nested3Level
-      - disk.device.read.requests.rate_server_cmaui_4_test_nested4Level
-      disk.device.read.bytes_server_cmaui_3_test_nested3Level:
-      - test_nested3Level
-      - disk.device.read.bytes_server_cmaui_3
-      memory.resident_server_cmaui_3_test_nested3Level:
-      - test_nested3Level
-      - memory.resident_server_cmaui_3
+      - forwarder_cmaui_port_5
       memory.usage_server_cmaui_2:
       - server_cmaui_2
       - memory.usage
@@ -793,4 +811,4 @@ topology_template:
       - dependency
       dependency_cmaui_port_5_test_nested3Level:
       - test_nested3Level
-      - dependency_cmaui_port_5
\ No newline at end of file
+      - dependency_cmaui_port_5
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml
index 9bc5ccc78a..878aa80f9c 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml
@@ -167,9 +167,15 @@ topology_template:
       disk.device.latency_server_cmaui_3:
       - server_cmaui_3
       - disk.device.latency
+      forwarder_cmaui_port_7_test_nested4Level:
+      - test_nested4Level
+      - forwarder_cmaui_port_7
       disk.read.requests_server_cmaui_4_test_nested4Level:
       - test_nested4Level
       - disk.read.requests_server_cmaui_4
+      forwarder_cmaui_port_8_test_nested4Level:
+      - test_nested4Level
+      - forwarder_cmaui_port_8
       disk.root.size_server_cmaui_3:
       - server_cmaui_3
       - disk.root.size
@@ -449,12 +455,18 @@ topology_template:
       disk.device.latency_server_cmaui_4_test_nested4Level:
       - test_nested4Level
       - disk.device.latency_server_cmaui_4
+      forwarder_cmaui_port_6:
+      - cmaui_port_6
+      - forwarder
       disk.device.read.requests.rate_server_cmaui_4_test_nested4Level:
       - test_nested4Level
       - disk.device.read.requests.rate_server_cmaui_4
       disk.ephemeral.size_server_cmaui_4_test_nested4Level:
       - test_nested4Level
       - disk.ephemeral.size_server_cmaui_4
+      forwarder_cmaui_port_5:
+      - cmaui_port_5
+      - forwarder
       disk.device.allocation_server_cmaui_3:
       - server_cmaui_3
       - disk.device.allocation
@@ -575,4 +587,4 @@ topology_template:
       - dependency
       dependency_cmaui_port_5:
       - cmaui_port_5
-      - 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/securityrulestoportconnection/nestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml
index c5b92cbd65..27ccfc5867 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml
@@ -227,6 +227,12 @@ topology_template:
       disk.device.allocation_server_cmaui_4:
       - server_cmaui_4
       - disk.device.allocation
+      forwarder_cmaui_port_8:
+      - cmaui_port_8
+      - forwarder
+      forwarder_cmaui_port_7:
+      - cmaui_port_7
+      - forwarder
       disk.write.requests.rate_server_cmaui_4:
       - server_cmaui_4
       - disk.write.requests.rate
@@ -347,4 +353,4 @@ topology_template:
       - dependency
       local_storage_server_cmaui_4:
       - server_cmaui_4
-      - 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/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_QRouterTemplateServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_QRouterTemplateServiceTemplate.yaml
index 9ca9550e5a..82b8920144 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_QRouterTemplateServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_QRouterTemplateServiceTemplate.yaml
@@ -460,6 +460,9 @@ topology_template:
       memory_QRouter1:
       - QRouter1
       - memory
+      forwarder_oam_private_net_network_port:
+      - oam_private_net_network_port
+      - forwarder
       disk.usage_QRouter1:
       - QRouter1
       - disk.usage
@@ -475,6 +478,9 @@ topology_template:
       network.incoming.bytes_cdr_network_port_1:
       - cdr_network_port_1
       - network.incoming.bytes
+      forwarder_cdr_network_port_1:
+      - cdr_network_port_1
+      - forwarder
       disk.write.bytes_QRouter1:
       - QRouter1
       - disk.write.bytes
@@ -562,4 +568,4 @@ topology_template:
       - dependency
       dependency_cdr_network_port_1:
       - cdr_network_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/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_vLBAgentTemplateServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_vLBAgentTemplateServiceTemplate.yaml
index 5d0b6433cd..13f06302f7 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_vLBAgentTemplateServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_vLBAgentTemplateServiceTemplate.yaml
@@ -474,6 +474,9 @@ topology_template:
       network.outpoing.packets_oam_private_net_network_port_3:
       - oam_private_net_network_port_3
       - network.outpoing.packets
+      forwarder_packet_mirror_network_port_1:
+      - packet_mirror_network_port_1
+      - forwarder
       binding_packet_internal_network_port:
       - packet_internal_network_port
       - binding
@@ -489,6 +492,9 @@ topology_template:
       binding_oam_private_net_network_port_3:
       - oam_private_net_network_port_3
       - binding
+      forwarder_packet_internal_network_port:
+      - packet_internal_network_port
+      - forwarder
       endpoint_vLBAgentInstance:
       - vLBAgentInstance
       - endpoint
@@ -609,6 +615,9 @@ topology_template:
       network.outgoing.bytes_oam_private_net_network_port_3:
       - oam_private_net_network_port_3
       - network.outgoing.bytes
+      forwarder_oam_private_net_network_port_3:
+      - oam_private_net_network_port_3
+      - forwarder
       cpu.delta_vLBAgentInstance:
       - vLBAgentInstance
       - cpu.delta
@@ -687,4 +696,4 @@ topology_template:
       - link
       local_storage_vLBAgentInstance:
       - vLBAgentInstance
-      - 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/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_vLBTemplateServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_vLBTemplateServiceTemplate.yaml
index e3896b2be6..af4eef130d 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_vLBTemplateServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_vLBTemplateServiceTemplate.yaml
@@ -496,6 +496,9 @@ topology_template:
       network.incoming.bytes.rate_packet_internal_network_port_2:
       - packet_internal_network_port_2
       - network.incoming.bytes.rate
+      forwarder_packet_mirror_network_port:
+      - packet_mirror_network_port
+      - forwarder
       cpu.delta_vLBInstance:
       - vLBInstance
       - cpu.delta
@@ -589,6 +592,12 @@ topology_template:
       disk.device.write.requests.rate_vLBInstance:
       - vLBInstance
       - disk.device.write.requests.rate
+      forwarder_packet_internal_network_port_2:
+      - packet_internal_network_port_2
+      - forwarder
+      forwarder_oam_private_net_network_port_2:
+      - oam_private_net_network_port_2
+      - forwarder
       disk.read.bytes_vLBInstance:
       - vLBInstance
       - disk.read.bytes
@@ -664,4 +673,4 @@ topology_template:
       - link
       link_packet_internal_network_port_2:
       - packet_internal_network_port_2
-      - 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/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_vProbeTemplateServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_vProbeTemplateServiceTemplate.yaml
index 5edca0a8d6..2aaf8e5688 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_vProbeTemplateServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_vProbeTemplateServiceTemplate.yaml
@@ -625,6 +625,12 @@ topology_template:
       network.incoming.bytes_oam_private_net_network_port_1:
       - oam_private_net_network_port_1
       - network.incoming.bytes
+      forwarder_packet_internal_network_port_1:
+      - packet_internal_network_port_1
+      - forwarder
+      forwarder_oam_private_net_network_port_1:
+      - oam_private_net_network_port_1
+      - forwarder
       disk.device.read.requests.rate_ProbeInstance:
       - ProbeInstance
       - disk.device.read.requests.rate
@@ -643,6 +649,9 @@ topology_template:
       disk.usage_ProbeInstance:
       - ProbeInstance
       - disk.usage
+      forwarder_cdr_network_port:
+      - cdr_network_port
+      - forwarder
       binding_cdr_network_port:
       - cdr_network_port
       - binding
@@ -691,4 +700,4 @@ topology_template:
       - link
       dependency_vprobe_volume_2:
       - vprobe_volume_2
-      - 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/securityrulestoportconnection/securityRulesToPortGetResource/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 01329a4aab..4d8b9ab2f7 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -446,6 +446,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_oam_private_net_network_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.usage_QRouter1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -477,6 +482,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cdr_network_port_1:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.write.bytes_QRouter1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -932,6 +942,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_packet_mirror_network_port_1:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       binding_packet_internal_network_port:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
@@ -963,6 +978,11 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
+      forwarder_packet_internal_network_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       endpoint_vLBAgentInstance:
         type: tosca.capabilities.Endpoint.Admin
         occurrences:
@@ -1195,6 +1215,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_oam_private_net_network_port_3:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       cpu.delta_vLBAgentInstance:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1705,6 +1730,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_packet_mirror_network_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       cpu.delta_vLBInstance:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1884,6 +1914,16 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_packet_internal_network_port_2:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      forwarder_oam_private_net_network_port_2:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.read.bytes_vLBInstance:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -2592,6 +2632,16 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_packet_internal_network_port_1:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      forwarder_oam_private_net_network_port_1:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.read.requests.rate_ProbeInstance:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -2628,6 +2678,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cdr_network_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       binding_cdr_network_port:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
@@ -2658,4 +2713,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/securityrulestoportconnection/securityrulestoportnestedconnection/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityrulestoportnestedconnection/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index aa5edaeda1..94df836148 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityrulestoportnestedconnection/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityrulestoportnestedconnection/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -315,6 +315,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_0:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       memory_server_cmaui:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -327,11 +332,21 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_3:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       binding_server_cmaui:
         type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_1:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.read.requests.rate_server_cmaui:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -541,4 +556,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/securityrulestoportconnection/securityrulestoportnestedconnection/expectedoutputfiles/nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityrulestoportnestedconnection/expectedoutputfiles/nestedServiceTemplate.yaml
index ca93e1639f..95d9ed636b 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityrulestoportnestedconnection/expectedoutputfiles/nestedServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityrulestoportnestedconnection/expectedoutputfiles/nestedServiceTemplate.yaml
@@ -274,15 +274,24 @@ topology_template:
       disk.device.read.bytes_server_cmaui:
       - server_cmaui
       - disk.device.read.bytes
+      forwarder_cmaui_port_0:
+      - cmaui_port_0
+      - forwarder
       memory_server_cmaui:
       - server_cmaui
       - memory
       disk.root.size_server_cmaui:
       - server_cmaui
       - disk.root.size
+      forwarder_cmaui_port_3:
+      - cmaui_port_3
+      - forwarder
       binding_server_cmaui:
       - server_cmaui
       - binding
+      forwarder_cmaui_port_1:
+      - cmaui_port_1
+      - forwarder
       disk.device.read.requests.rate_server_cmaui:
       - server_cmaui
       - disk.device.read.requests.rate
@@ -412,4 +421,4 @@ topology_template:
       - dependency
       link_cmaui_port_3:
       - cmaui_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/securityrulestoportconnection/securityruletosharedportlinking/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityruletosharedportlinking/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index 9a271b018d..6fdd7c78b8 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityruletosharedportlinking/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityruletosharedportlinking/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -286,11 +286,21 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_2:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       binding_server_cmaui:
         type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_1:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.read.requests.rate_server_cmaui:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -463,4 +473,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/securityrulestoportconnection/securityruletosharedportlinking/expectedoutputfiles/nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityruletosharedportlinking/expectedoutputfiles/nestedServiceTemplate.yaml
index 37943d1bc0..737ac588f5 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityruletosharedportlinking/expectedoutputfiles/nestedServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityruletosharedportlinking/expectedoutputfiles/nestedServiceTemplate.yaml
@@ -235,9 +235,15 @@ topology_template:
       disk.root.size_server_cmaui:
       - server_cmaui
       - disk.root.size
+      forwarder_cmaui_port_2:
+      - cmaui_port_2
+      - forwarder
       binding_server_cmaui:
       - server_cmaui
       - binding
+      forwarder_cmaui_port_1:
+      - cmaui_port_1
+      - forwarder
       disk.device.read.requests.rate_server_cmaui:
       - server_cmaui
       - disk.device.read.requests.rate
@@ -343,4 +349,4 @@ topology_template:
       - link
       dependency_cmaui_port_2:
       - cmaui_port_2
-      - 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/securityrulestoportconnection/sharedNestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index e73e81a437..d7f5ae6fc1 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -405,19 +405,24 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_4_test_nested2Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.incoming.packets_cmaui_port_4_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_7_test_nested4Level_test_nested3Level_test_nested2Level:
+      cpu_server_cmaui_4_test_nested4Level_test_nested3Level_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_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+      network.incoming.bytes_cmaui_port_7_test_nested4Level_test_nested3Level_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:
@@ -441,17 +446,17 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_cmaui_port_6_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
       network.incoming.packets.rate_cmaui_port_5_test_nested3Level_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_cmaui_port_6_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.Attachment
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.read.bytes_server_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.
@@ -685,9 +690,8 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.root.size_server_cmaui_3_test_nested3Level_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_port_5_test_nested3Level_test_nested2Level:
+        type: org.openecomp.capabilities.Forwarder
         occurrences:
         - 1
         - UNBOUNDED
@@ -696,6 +700,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      disk.root.size_server_cmaui_3_test_nested3Level_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_cmaui_4_test_nested4Level_test_nested3Level_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.
@@ -759,12 +769,22 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_2:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.usage_server_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_1:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.outgoing.packets.rate_cmaui_port_4_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.
@@ -813,6 +833,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_3_test_nested2Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.write.bytes_server_cmaui_3_test_nested3Level_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.
@@ -848,6 +873,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       vcpus_server_cmaui_4_test_nested4Level_test_nested3Level_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.
@@ -1092,6 +1122,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.usage_server_cmaui_4_test_nested4Level_test_nested3Level_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.
@@ -1205,13 +1240,13 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
+      network.outpoing.packets_cmaui_port_3_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_3_test_nested2Level:
+      network.outgoing.packets.rate_cmaui_port_8_test_nested4Level_test_nested3Level_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:
@@ -1551,13 +1586,13 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      feature_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.Node
+      binding_server_cmaui_2_test_nested2Level:
+        type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
-      binding_server_cmaui_2_test_nested2Level:
-        type: tosca.capabilities.network.Bindable
+      feature_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
@@ -1716,6 +1751,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_6_test_nested3Level_test_nested2Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level_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.
@@ -1945,48 +1985,18 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.usage_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.usage_server_cmaui_4_test_nested4Level_test_nested3Level:
-        type: org.openecomp.capabilities.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_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_7_test_nested4Level_test_nested3Level:
-        type: org.openecomp.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_cmaui_4_test_nested4Level_test_nested3Level:
-        type: org.openecomp.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_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.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
       disk.read.requests_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -2011,58 +2021,24 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      endpoint_server_cmaui_4_test_nested4Level_test_nested3Level:
-        type: tosca.capabilities.Endpoint.Admin
-        occurrences:
-        - 1
-        - UNBOUNDED
       disk.read.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
-      cpu_util_server_cmaui_4_test_nested4Level_test_nested3Level:
-        type: org.openecomp.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_4_test_nested4Level_test_nested3Level:
         type: org.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_test_nested4Level_test_nested3Level:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      network.outgoing.bytes.rate_cmaui_port_8_test_nested4Level_test_nested3Level:
-        type: org.openecomp.capabilities.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_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_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.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_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_7_test_nested4Level_test_nested3Level:
         type: tosca.capabilities.Attachment
         occurrences:
@@ -2129,18 +2105,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      memory_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_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
       host_server_cmaui_3_test_nested3Level:
         type: tosca.capabilities.Container
         valid_source_types:
@@ -2148,42 +2112,18 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_cmaui_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.allocation_server_cmaui_3_test_nested3Level:
         type: org.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_cmaui_4_test_nested4Level_test_nested3Level:
-        type: org.openecomp.capabilities.metric.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_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_cmaui_port_6_test_nested3Level:
         type: org.openecomp.capabilities.metric.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_7_test_nested4Level_test_nested3Level:
-        type: org.openecomp.capabilities.metric.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_6_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -2214,24 +2154,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.capacity_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_cmaui_port_6_test_nested3Level:
-        type: org.openecomp.capabilities.metric.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_8_test_nested4Level_test_nested3Level:
-        type: org.openecomp.capabilities.metric.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_6_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -2250,12 +2172,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.iops_server_cmaui_4_test_nested4Level_test_nested3Level:
-        type: org.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_3:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
@@ -2263,12 +2179,6 @@ node_types:
         occurrences:
         - 0
         - 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.
-        occurrences:
-        - 1
-        - UNBOUNDED
       binding_cmaui_port_4:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
@@ -2298,752 +2208,912 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_cmaui_port_6_test_nested3Level:
+      disk.device.write.bytes.rate_server_cmaui_3_test_nested3Level:
         type: org.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_cmaui_3_test_nested3Level:
-        type: tosca.capabilities.Node
+      binding_cmaui_port_6_test_nested3Level:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
         occurrences:
-        - 1
+        - 0
         - UNBOUNDED
-      network.outgoing.bytes.rate_cmaui_port_3:
+      disk.usage_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.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_3_test_nested3Level:
+      network.incoming.bytes_cmaui_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.root.size_server_cmaui_3_test_nested3Level:
+      network.incoming.bytes_cmaui_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.rate_cmaui_port_4:
+      disk.device.latency_server_cmaui_3_test_nested3Level:
         type: org.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_6_test_nested3Level:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
-      disk.usage_server_cmaui_3_test_nested3Level:
+      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
-      os_server_cmaui_4_test_nested4Level_test_nested3Level:
-        type: tosca.capabilities.OperatingSystem
+      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
-      disk.device.write.requests_server_cmaui_3_test_nested3Level:
+      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.bytes_cmaui_port_4:
+      vcpus_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.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_3:
+      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
-      disk.device.read.requests.rate_server_cmaui_3_test_nested3Level:
+      network.incoming.packets.rate_cmaui_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.latency_server_cmaui_3_test_nested3Level:
+      cpu_server_cmaui_3_test_nested3Level:
         type: org.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:
-        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_port_3:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      memory.usage_server_cmaui_4_test_nested4Level_test_nested3Level:
+      network.incoming.packets.rate_cmaui_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.device.write.requests.rate_server_cmaui_3_test_nested3Level:
-        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_port_4:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_cmaui_port_8_test_nested4Level_test_nested3Level:
+      disk.device.allocation_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.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:
-        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_cmaui_2:
+        type: tosca.capabilities.network.Bindable
         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.
+      scalable_server_cmaui_2:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
+      disk.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.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_cmaui_4_test_nested4Level_test_nested3Level:
+      network.incoming.packets.rate_cmaui_port_5_test_nested3Level:
         type: org.openecomp.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_8_test_nested4Level_test_nested3Level:
+      network.outpoing.packets_cmaui_port_7_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.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:
+      feature_server_cmaui_4_test_nested4Level_test_nested3Level:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.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_7_test_nested4Level_test_nested3Level:
-        type: tosca.capabilities.Node
+      endpoint_server_cmaui_2:
+        type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
-      disk.iops_server_cmaui_3_test_nested3Level:
+      disk.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.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_3:
+      forwarder_cmaui_port_4:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      scalable_server_cmaui_4_test_nested4Level_test_nested3Level:
+        type: tosca.capabilities.Scalable
+        occurrences:
+        - 1
+        - UNBOUNDED
+      forwarder_cmaui_port_3:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.incoming.packets.rate_cmaui_port_8_test_nested4Level_test_nested3Level:
         type: org.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_cmaui_3_test_nested3Level:
+      disk.device.allocation_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_3:
-        type: tosca.capabilities.Node
+      disk.device.latency_server_cmaui_4_test_nested4Level_test_nested3Level:
+        type: org.openecomp.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_cmaui_2:
+      disk.read.bytes_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.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_4:
+      disk.device.allocation_server_cmaui_3_test_nested3Level:
         type: org.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_cmaui_2:
-        type: tosca.capabilities.Node
+      network.incoming.bytes.rate_cmaui_port_5_test_nested3Level:
+        type: org.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_4:
-        type: tosca.capabilities.Node
+      os_server_cmaui_3_test_nested3Level:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_cmaui_port_6_test_nested3Level:
+      network.incoming.packets_cmaui_port_8_test_nested4Level_test_nested3Level:
+        type: org.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_cmaui_4_test_nested4Level_test_nested3Level:
+        type: org.openecomp.capabilities.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_4_test_nested4Level_test_nested3Level:
+        type: org.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_8_test_nested4Level_test_nested3Level:
         type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_6_test_nested3Level:
+      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.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.allocation_server_cmaui_2:
+      disk.device.iops_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.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_cmaui_4_test_nested4Level_test_nested3Level:
+      network.incoming.bytes_cmaui_port_5_test_nested3Level:
         type: org.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_2:
+      network.outpoing.packets_cmaui_port_6_test_nested3Level:
+        type: org.openecomp.capabilities.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_7_test_nested4Level_test_nested3Level:
+        type: org.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_5_test_nested3Level:
         type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
+      disk.device.write.bytes_server_cmaui_3_test_nested3Level:
+        type: org.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_cmaui_2:
+      network.outgoing.bytes_cmaui_port_5_test_nested3Level:
         type: org.openecomp.capabilities.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_4:
+      disk.device.read.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
-      instance_server_cmaui_3_test_nested3Level:
+      network.outpoing.packets_cmaui_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_cmaui_port_3:
-        type: tosca.capabilities.Attachment
+      disk.capacity_server_cmaui_3_test_nested3Level:
+        type: org.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_4:
-        type: tosca.capabilities.Attachment
+      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
-      scalable_server_cmaui_2:
-        type: tosca.capabilities.Scalable
+      network.outpoing.packets_cmaui_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.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
+      network.incoming.bytes.rate_cmaui_port_7_test_nested4Level_test_nested3Level:
         type: org.openecomp.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_4_test_nested4Level_test_nested3Level:
+      disk.device.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.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_3:
+      binding_cmaui_port_8_test_nested4Level_test_nested3Level:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
+      disk.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.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_cmaui_3_test_nested3Level:
+      network.outgoing.packets.rate_cmaui_port_5_test_nested3Level:
         type: org.openecomp.capabilities.metric.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_5_test_nested3Level:
+      disk.device.read.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.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_2:
+      disk.device.read.bytes_server_cmaui_3_test_nested3Level:
         type: org.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_4_test_nested4Level_test_nested3Level:
+      memory.resident_server_cmaui_3_test_nested3Level:
         type: org.openecomp.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_7_test_nested4Level_test_nested3Level:
+      disk.device.usage_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.usage_server_cmaui_2:
+      disk.device.usage_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.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_cmaui_3_test_nested3Level:
+      network.incoming.bytes_cmaui_port_7_test_nested4Level_test_nested3Level:
         type: org.openecomp.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_cmaui_3_test_nested3Level:
+      disk.usage_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.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_cmaui_4_test_nested4Level_test_nested3Level:
-        type: tosca.capabilities.Node
+      forwarder_cmaui_port_6_test_nested3Level:
+        type: org.openecomp.capabilities.Forwarder
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_cmaui_port_8_test_nested4Level_test_nested3Level:
+      disk.device.write.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
-      binding_cmaui_port_7_test_nested4Level_test_nested3Level:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+      forwarder_cmaui_port_7_test_nested4Level_test_nested3Level:
+        type: org.openecomp.capabilities.Forwarder
         occurrences:
-        - 0
+        - 1
         - UNBOUNDED
-      disk.write.requests.rate_server_cmaui_3_test_nested3Level:
+      endpoint_server_cmaui_4_test_nested4Level_test_nested3Level:
+        type: tosca.capabilities.Endpoint.Admin
+        occurrences:
+        - 1
+        - UNBOUNDED
+      cpu_util_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.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_cmaui_4_test_nested4Level_test_nested3Level:
+      feature_test_nested4Level_test_nested3Level:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.outgoing.bytes.rate_cmaui_port_8_test_nested4Level_test_nested3Level:
         type: org.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_cmaui_2:
-        type: tosca.capabilities.Endpoint.Admin
+      disk.device.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
-      network.incoming.bytes_cmaui_port_6_test_nested3Level:
+      disk.device.capacity_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
-      os_server_cmaui_2:
-        type: tosca.capabilities.OperatingSystem
+      memory_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.requests_server_cmaui_4_test_nested4Level_test_nested3Level:
+      cpu_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
-      scalable_server_cmaui_4_test_nested4Level_test_nested3Level:
-        type: tosca.capabilities.Scalable
+      network.incoming.packets_cmaui_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_cmaui_port_8_test_nested4Level_test_nested3Level:
+      memory_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.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_5_test_nested3Level:
-        type: tosca.capabilities.Attachment
+      forwarder_cmaui_port_8_test_nested4Level_test_nested3Level:
+        type: org.openecomp.capabilities.Forwarder
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.allocation_server_cmaui_2:
+      network.incoming.packets_cmaui_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.incoming.packets_cmaui_port_7_test_nested4Level_test_nested3Level:
+      network.outgoing.bytes_cmaui_port_7_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.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_cmaui_4_test_nested4Level_test_nested3Level:
+      disk.capacity_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_server_cmaui_3_test_nested3Level:
+      network.incoming.packets_cmaui_port_6_test_nested3Level:
         type: org.openecomp.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_cmaui_4_test_nested4Level_test_nested3Level:
+      network.incoming.bytes_cmaui_port_8_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.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_cmaui_3_test_nested3Level:
+      disk.device.iops_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.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_5_test_nested3Level:
+      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
-      host_server_cmaui_2:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
+      network.incoming.bytes.rate_cmaui_port_6_test_nested3Level:
+        type: org.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_cmaui_3_test_nested3Level:
-        type: tosca.capabilities.OperatingSystem
+      feature_server_cmaui_3_test_nested3Level:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level:
+      network.outgoing.bytes.rate_cmaui_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.write.requests_server_cmaui_4_test_nested4Level_test_nested3Level:
+      disk.root.size_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.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_8_test_nested4Level_test_nested3Level:
+      network.outgoing.bytes.rate_cmaui_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_server_cmaui_3_test_nested3Level:
-        type: tosca.capabilities.network.Bindable
+      os_server_cmaui_4_test_nested4Level_test_nested3Level:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      feature_test_nested3Level:
-        type: tosca.capabilities.Node
+      disk.device.write.requests_server_cmaui_3_test_nested3Level:
+        type: org.openecomp.capabilities.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_8_test_nested4Level_test_nested3Level:
+      disk.device.read.requests.rate_server_cmaui_3_test_nested3Level:
         type: org.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_cmaui_4_test_nested4Level_test_nested3Level:
+      memory.usage_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.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_3_test_nested3Level:
+      disk.device.write.requests.rate_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.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_cmaui_3_test_nested3Level:
+      network.outgoing.bytes_cmaui_port_8_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.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_4_test_nested4Level_test_nested3Level:
+      disk.device.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.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_8_test_nested4Level_test_nested3Level:
+      network.outpoing.packets_cmaui_port_8_test_nested4Level_test_nested3Level:
+        type: org.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_7_test_nested4Level_test_nested3Level:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.iops_server_cmaui_3_test_nested3Level:
+        type: org.openecomp.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_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_cmaui_2:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      attachment_cmaui_port_6_test_nested3Level:
         type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      scalable_server_cmaui_3_test_nested3Level:
-        type: tosca.capabilities.Scalable
+      network.outgoing.packets.rate_cmaui_port_6_test_nested3Level:
+        type: org.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_cmaui_2:
+      disk.allocation_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.iops_server_cmaui_3_test_nested3Level:
+      vcpus_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.outgoing.bytes.rate_cmaui_port_7_test_nested4Level_test_nested3Level:
+      network.outgoing.packets.rate_cmaui_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.incoming.bytes_cmaui_port_5_test_nested3Level:
+      instance_server_cmaui_3_test_nested3Level:
         type: org.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_cmaui_3_test_nested3Level:
-        type: tosca.capabilities.Endpoint.Admin
+      attachment_cmaui_port_3:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      vcpus_server_cmaui_3_test_nested3Level:
+      attachment_cmaui_port_4:
+        type: tosca.capabilities.Attachment
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.capacity_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.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_7_test_nested4Level_test_nested3Level:
+      network.outgoing.packets.rate_cmaui_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.allocation_server_cmaui_4_test_nested4Level_test_nested3Level:
+      disk.device.read.bytes.rate_server_cmaui_3_test_nested3Level:
         type: org.openecomp.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_6_test_nested3Level:
+      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
-      network.outgoing.bytes_cmaui_port_4:
+      memory.resident_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.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_7_test_nested4Level_test_nested3Level:
+      disk.usage_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
-      binding_cmaui_port_5_test_nested3Level:
+      disk.device.usage_server_cmaui_3_test_nested3Level:
+        type: org.openecomp.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_cmaui_3_test_nested3Level:
+        type: org.openecomp.capabilities.metric.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_8_test_nested4Level_test_nested3Level:
+        type: org.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_7_test_nested4Level_test_nested3Level:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
         - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
         occurrences:
         - 0
         - UNBOUNDED
-      network.incoming.bytes.rate_cmaui_port_3:
+      disk.write.requests.rate_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.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_4:
+      network.incoming.bytes_cmaui_port_6_test_nested3Level:
         type: org.openecomp.capabilities.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_3_test_nested3Level:
+      os_server_cmaui_2:
+        type: tosca.capabilities.OperatingSystem
+        occurrences:
+        - 1
+        - UNBOUNDED
+      attachment_cmaui_port_5_test_nested3Level:
+        type: tosca.capabilities.Attachment
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.incoming.packets_cmaui_port_7_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.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_5_test_nested3Level:
+      disk.latency_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.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_2:
+      host_server_cmaui_2:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.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_4_test_nested4Level_test_nested3Level:
+      disk.write.requests_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.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:
+      binding_server_cmaui_3_test_nested3Level:
+        type: tosca.capabilities.network.Bindable
+        occurrences:
+        - 1
+        - UNBOUNDED
+      feature_test_nested3Level:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.outgoing.packets.rate_cmaui_port_8_test_nested4Level_test_nested3Level:
         type: org.openecomp.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_3:
+      cpu.delta_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.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_4_test_nested4Level_test_nested3Level:
+      disk.device.capacity_server_cmaui_3_test_nested3Level:
         type: org.openecomp.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_3_test_nested3Level:
+      scalable_server_cmaui_3_test_nested3Level:
+        type: tosca.capabilities.Scalable
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.outgoing.bytes.rate_cmaui_port_7_test_nested4Level_test_nested3Level:
         type: org.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:
+      endpoint_server_cmaui_3_test_nested3Level:
+        type: tosca.capabilities.Endpoint.Admin
+        occurrences:
+        - 1
+        - UNBOUNDED
+      vcpus_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.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.incoming.packets.rate_cmaui_port_7_test_nested4Level_test_nested3Level:
         type: org.openecomp.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_4:
+      disk.allocation_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.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_4_test_nested4Level_test_nested3Level:
-        type: tosca.capabilities.network.Bindable
+      network.outgoing.bytes_cmaui_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.incoming.bytes.rate_cmaui_port_7_test_nested4Level_test_nested3Level:
+      network.incoming.bytes.rate_cmaui_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.resident_server_cmaui_2:
+      network.incoming.bytes.rate_cmaui_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.device.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
+      disk.device.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.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_8_test_nested4Level_test_nested3Level:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+      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:
-        - 0
+        - 1
         - UNBOUNDED
-      disk.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level:
+      disk.device.write.requests_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.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_3_test_nested3Level:
+      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
-      feature_cmaui_port_5_test_nested3Level:
-        type: tosca.capabilities.Node
+      binding_server_cmaui_4_test_nested4Level_test_nested3Level:
+        type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_cmaui_port_5_test_nested3Level:
+      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.latency_server_cmaui_2:
+      disk.device.read.requests_server_cmaui_3_test_nested3Level:
         type: org.openecomp.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_3_test_nested3Level:
-        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_port_5_test_nested3Level:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_5_test_nested3Level:
+      network.incoming.packets_cmaui_port_5_test_nested3Level:
         type: org.openecomp.capabilities.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_4_test_nested4Level_test_nested3Level:
+      disk.latency_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.bytes_server_cmaui_3_test_nested3Level:
+      disk.ephemeral.size_server_cmaui_3_test_nested3Level:
         type: org.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_3_test_nested3Level:
-        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_port_5_test_nested3Level:
+        type: org.openecomp.capabilities.Forwarder
         occurrences:
         - 1
         - UNBOUNDED
@@ -3219,12 +3289,22 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_7_test_nested4Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.read.requests_server_cmaui_4_test_nested4Level:
         type: org.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_8_test_nested4Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.root.size_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -3770,6 +3850,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_6:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.read.requests.rate_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -3782,6 +3867,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_5:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.allocation_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -4200,6 +4290,16 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_8:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      forwarder_cmaui_port_7:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.write.requests.rate_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -4406,4 +4506,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/securityrulestoportconnection/sharedNestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml
index 41205547a5..f544e9313e 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml
@@ -237,15 +237,18 @@ topology_template:
       disk.device.read.bytes_server_cmaui_2_test_nested2Level:
       - test_nested2Level
       - disk.device.read.bytes_server_cmaui_2
+      forwarder_cmaui_port_4_test_nested2Level:
+      - test_nested2Level
+      - forwarder_cmaui_port_4
       network.incoming.packets_cmaui_port_4_test_nested2Level:
       - test_nested2Level
       - network.incoming.packets_cmaui_port_4
-      network.incoming.bytes_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - network.incoming.bytes_cmaui_port_7_test_nested4Level_test_nested3Level
       cpu_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - cpu_server_cmaui_4_test_nested4Level_test_nested3Level
+      network.incoming.bytes_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - network.incoming.bytes_cmaui_port_7_test_nested4Level_test_nested3Level
       disk.device.write.requests.rate_server_cmaui_2_test_nested2Level:
       - test_nested2Level
       - disk.device.write.requests.rate_server_cmaui_2
@@ -255,12 +258,12 @@ topology_template:
       network.incoming.bytes_cmaui_port_3_test_nested2Level:
       - test_nested2Level
       - network.incoming.bytes_cmaui_port_3
-      attachment_cmaui_port_6_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - attachment_cmaui_port_6_test_nested3Level
       network.incoming.packets.rate_cmaui_port_5_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.incoming.packets.rate_cmaui_port_5_test_nested3Level
+      attachment_cmaui_port_6_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - attachment_cmaui_port_6_test_nested3Level
       disk.read.bytes_server_cmaui_2_test_nested2Level:
       - test_nested2Level
       - disk.read.bytes_server_cmaui_2
@@ -378,12 +381,15 @@ topology_template:
       binding_server_cmaui_1:
       - server_cmaui_1
       - binding
-      disk.root.size_server_cmaui_3_test_nested3Level_test_nested2Level:
+      forwarder_cmaui_port_5_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.root.size_server_cmaui_3_test_nested3Level
+      - forwarder_cmaui_port_5_test_nested3Level
       os_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - os_server_cmaui_3_test_nested3Level
+      disk.root.size_server_cmaui_3_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - disk.root.size_server_cmaui_3_test_nested3Level
       disk.device.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - disk.device.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level
@@ -417,9 +423,15 @@ topology_template:
       os_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - os_server_cmaui_4_test_nested4Level_test_nested3Level
+      forwarder_cmaui_port_2:
+      - cmaui_port_2
+      - forwarder
       disk.usage_server_cmaui_2_test_nested2Level:
       - test_nested2Level
       - disk.usage_server_cmaui_2
+      forwarder_cmaui_port_1:
+      - cmaui_port_1
+      - forwarder
       network.outgoing.packets.rate_cmaui_port_4_test_nested2Level:
       - test_nested2Level
       - network.outgoing.packets.rate_cmaui_port_4
@@ -444,6 +456,9 @@ topology_template:
       memory_server_cmaui_1:
       - server_cmaui_1
       - memory
+      forwarder_cmaui_port_3_test_nested2Level:
+      - test_nested2Level
+      - forwarder_cmaui_port_3
       disk.device.write.bytes_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - disk.device.write.bytes_server_cmaui_3_test_nested3Level
@@ -462,6 +477,9 @@ topology_template:
       disk.read.requests_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - disk.read.requests_server_cmaui_3_test_nested3Level
+      forwarder_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - forwarder_cmaui_port_8_test_nested4Level_test_nested3Level
       vcpus_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - vcpus_server_cmaui_4_test_nested4Level_test_nested3Level
@@ -588,6 +606,9 @@ topology_template:
       disk.device.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - disk.device.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level
+      forwarder_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - forwarder_cmaui_port_7_test_nested4Level_test_nested3Level
       disk.device.usage_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - disk.device.usage_server_cmaui_4_test_nested4Level_test_nested3Level
@@ -645,12 +666,12 @@ topology_template:
       scalable_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - scalable_server_cmaui_4_test_nested4Level_test_nested3Level
-      network.outgoing.packets.rate_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - network.outgoing.packets.rate_cmaui_port_8_test_nested4Level_test_nested3Level
       network.outpoing.packets_cmaui_port_3_test_nested2Level:
       - test_nested2Level
       - network.outpoing.packets_cmaui_port_3
+      network.outgoing.packets.rate_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - network.outgoing.packets.rate_cmaui_port_8_test_nested4Level_test_nested3Level
       network.incoming.packets_cmaui_port_6_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.incoming.packets_cmaui_port_6_test_nested3Level
@@ -822,12 +843,12 @@ topology_template:
       host_server_cmaui_1:
       - server_cmaui_1
       - host
-      feature_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - feature_cmaui_port_7_test_nested4Level_test_nested3Level
       binding_server_cmaui_2_test_nested2Level:
       - test_nested2Level
       - binding_server_cmaui_2
+      feature_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - feature_cmaui_port_7_test_nested4Level_test_nested3Level
       cpu.delta_server_cmaui_2_test_nested2Level:
       - test_nested2Level
       - cpu.delta_server_cmaui_2
@@ -906,6 +927,9 @@ topology_template:
       memory.resident_server_cmaui_1:
       - server_cmaui_1
       - memory.resident
+      forwarder_cmaui_port_6_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - forwarder_cmaui_port_6_test_nested3Level
       disk.device.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - disk.device.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level
@@ -999,4 +1023,4 @@ topology_template:
       - dependency
       dependency_cmaui_port_4_test_nested2Level:
       - test_nested2Level
-      - dependency_cmaui_port_4
\ No newline at end of file
+      - dependency_cmaui_port_4
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml
index 2d592aa6e9..26dc2647ae 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml
@@ -169,27 +169,12 @@ topology_template:
       cpu_util_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - cpu_util_server_cmaui_3
-      disk.device.usage_server_cmaui_2:
-      - server_cmaui_2
-      - disk.device.usage
-      disk.device.usage_server_cmaui_4_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.device.usage_server_cmaui_4_test_nested4Level
       disk.device.latency_server_cmaui_2:
       - server_cmaui_2
       - disk.device.latency
-      network.incoming.bytes_cmaui_port_7_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - network.incoming.bytes_cmaui_port_7_test_nested4Level
-      disk.usage_server_cmaui_4_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.usage_server_cmaui_4_test_nested4Level
       disk.root.size_server_cmaui_2:
       - server_cmaui_2
       - disk.root.size
-      disk.device.write.requests.rate_server_cmaui_2:
-      - server_cmaui_2
-      - disk.device.write.requests.rate
       disk.read.requests_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - disk.read.requests_server_cmaui_3
@@ -202,33 +187,15 @@ topology_template:
       network.outgoing.bytes_cmaui_port_3:
       - cmaui_port_3
       - network.outgoing.bytes
-      endpoint_server_cmaui_4_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - endpoint_server_cmaui_4_test_nested4Level
       disk.read.requests_server_cmaui_2:
       - server_cmaui_2
       - disk.read.requests
-      cpu_util_server_cmaui_4_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - cpu_util_server_cmaui_4_test_nested4Level
       disk.write.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - disk.write.bytes.rate_server_cmaui_4_test_nested4Level
-      feature_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - feature_test_nested4Level
-      network.outgoing.bytes.rate_cmaui_port_8_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - network.outgoing.bytes.rate_cmaui_port_8_test_nested4Level
-      disk.device.iops_server_cmaui_2:
-      - server_cmaui_2
-      - disk.device.iops
       disk.device.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - disk.device.write.bytes_server_cmaui_4_test_nested4Level
-      disk.device.capacity_server_cmaui_2:
-      - server_cmaui_2
-      - disk.device.capacity
       attachment_cmaui_port_7_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - attachment_cmaui_port_7_test_nested4Level
@@ -262,33 +229,15 @@ topology_template:
       network.outgoing.bytes.rate_cmaui_port_5_test_nested3Level:
       - test_nested3Level
       - network.outgoing.bytes.rate_cmaui_port_5
-      memory_server_cmaui_2:
-      - server_cmaui_2
-      - memory
-      cpu_server_cmaui_2:
-      - server_cmaui_2
-      - cpu
       host_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - host_server_cmaui_3
-      network.incoming.packets_cmaui_port_3:
-      - cmaui_port_3
-      - network.incoming.packets
       disk.allocation_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - disk.allocation_server_cmaui_3
-      memory_server_cmaui_4_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - memory_server_cmaui_4_test_nested4Level
-      network.incoming.packets_cmaui_port_4:
-      - cmaui_port_4
-      - network.incoming.packets
       network.outgoing.bytes_cmaui_port_6_test_nested3Level:
       - test_nested3Level
       - network.outgoing.bytes_cmaui_port_6
-      network.outgoing.bytes_cmaui_port_7_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - network.outgoing.bytes_cmaui_port_7_test_nested4Level
       network.incoming.packets.rate_cmaui_port_6_test_nested3Level:
       - test_nested3Level
       - network.incoming.packets.rate_cmaui_port_6
@@ -304,15 +253,6 @@ topology_template:
       network.outpoing.packets_cmaui_port_5_test_nested3Level:
       - test_nested3Level
       - network.outpoing.packets_cmaui_port_5
-      disk.capacity_server_cmaui_2:
-      - server_cmaui_2
-      - disk.capacity
-      network.incoming.packets_cmaui_port_6_test_nested3Level:
-      - test_nested3Level
-      - network.incoming.packets_cmaui_port_6
-      network.incoming.bytes_cmaui_port_8_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - network.incoming.bytes_cmaui_port_8_test_nested4Level
       network.outgoing.bytes.rate_cmaui_port_6_test_nested3Level:
       - test_nested3Level
       - network.outgoing.bytes.rate_cmaui_port_6
@@ -322,15 +262,9 @@ topology_template:
       disk.read.bytes.rate_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - disk.read.bytes.rate_server_cmaui_3
-      disk.device.iops_server_cmaui_4_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.device.iops_server_cmaui_4_test_nested4Level
       binding_cmaui_port_3:
       - cmaui_port_3
       - binding
-      disk.iops_server_cmaui_2:
-      - server_cmaui_2
-      - disk.iops
       binding_cmaui_port_4:
       - cmaui_port_4
       - binding
@@ -346,6 +280,264 @@ topology_template:
       memory_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - memory_server_cmaui_3
+      disk.device.write.bytes.rate_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.device.write.bytes.rate_server_cmaui_3
+      binding_cmaui_port_6_test_nested3Level:
+      - test_nested3Level
+      - binding_cmaui_port_6
+      disk.usage_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.usage_server_cmaui_3
+      network.incoming.bytes_cmaui_port_4:
+      - cmaui_port_4
+      - network.incoming.bytes
+      network.incoming.bytes_cmaui_port_3:
+      - cmaui_port_3
+      - network.incoming.bytes
+      disk.device.latency_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.device.latency_server_cmaui_3
+      cpu_util_server_cmaui_2:
+      - server_cmaui_2
+      - cpu_util
+      disk.device.write.bytes.rate_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.write.bytes.rate
+      disk.write.bytes.rate_server_cmaui_2:
+      - server_cmaui_2
+      - disk.write.bytes.rate
+      vcpus_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - vcpus_server_cmaui_4_test_nested4Level
+      disk.device.write.bytes_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.write.bytes
+      network.incoming.packets.rate_cmaui_port_3:
+      - cmaui_port_3
+      - network.incoming.packets.rate
+      cpu_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - cpu_server_cmaui_3
+      feature_cmaui_port_3:
+      - cmaui_port_3
+      - feature
+      network.incoming.packets.rate_cmaui_port_4:
+      - cmaui_port_4
+      - network.incoming.packets.rate
+      feature_cmaui_port_4:
+      - cmaui_port_4
+      - feature
+      disk.device.allocation_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.device.allocation_server_cmaui_4_test_nested4Level
+      binding_server_cmaui_2:
+      - server_cmaui_2
+      - binding
+      scalable_server_cmaui_2:
+      - server_cmaui_2
+      - scalable
+      disk.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.write.requests.rate_server_cmaui_4_test_nested4Level
+      network.incoming.packets.rate_cmaui_port_5_test_nested3Level:
+      - test_nested3Level
+      - network.incoming.packets.rate_cmaui_port_5
+      network.outpoing.packets_cmaui_port_7_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - network.outpoing.packets_cmaui_port_7_test_nested4Level
+      feature_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - feature_server_cmaui_4_test_nested4Level
+      disk.device.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.device.read.bytes_server_cmaui_4_test_nested4Level
+      endpoint_server_cmaui_2:
+      - server_cmaui_2
+      - endpoint
+      disk.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.read.requests_server_cmaui_4_test_nested4Level
+      forwarder_cmaui_port_4:
+      - cmaui_port_4
+      - forwarder
+      scalable_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - scalable_server_cmaui_4_test_nested4Level
+      forwarder_cmaui_port_3:
+      - cmaui_port_3
+      - forwarder
+      network.incoming.packets.rate_cmaui_port_8_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - network.incoming.packets.rate_cmaui_port_8_test_nested4Level
+      disk.device.allocation_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.allocation
+      disk.device.latency_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.device.latency_server_cmaui_4_test_nested4Level
+      disk.read.bytes_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.read.bytes_server_cmaui_3
+      disk.device.allocation_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.device.allocation_server_cmaui_3
+      network.incoming.bytes.rate_cmaui_port_5_test_nested3Level:
+      - test_nested3Level
+      - network.incoming.bytes.rate_cmaui_port_5
+      os_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - os_server_cmaui_3
+      network.incoming.packets_cmaui_port_8_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - network.incoming.packets_cmaui_port_8_test_nested4Level
+      cpu_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - cpu_server_cmaui_4_test_nested4Level
+      disk.device.write.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.device.write.bytes.rate_server_cmaui_4_test_nested4Level
+      attachment_cmaui_port_8_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - attachment_cmaui_port_8_test_nested4Level
+      instance_server_cmaui_2:
+      - server_cmaui_2
+      - instance
+      disk.device.iops_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.device.iops_server_cmaui_3
+      network.incoming.bytes_cmaui_port_5_test_nested3Level:
+      - test_nested3Level
+      - network.incoming.bytes_cmaui_port_5
+      network.outpoing.packets_cmaui_port_6_test_nested3Level:
+      - test_nested3Level
+      - network.outpoing.packets_cmaui_port_6
+      network.outgoing.packets.rate_cmaui_port_7_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - network.outgoing.packets.rate_cmaui_port_7_test_nested4Level
+      binding_cmaui_port_5_test_nested3Level:
+      - test_nested3Level
+      - binding_cmaui_port_5
+      disk.device.write.bytes_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.device.write.bytes_server_cmaui_3
+      network.outgoing.bytes_cmaui_port_5_test_nested3Level:
+      - test_nested3Level
+      - network.outgoing.bytes_cmaui_port_5
+      disk.device.read.requests_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.read.requests
+      network.outpoing.packets_cmaui_port_3:
+      - cmaui_port_3
+      - network.outpoing.packets
+      disk.capacity_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.capacity_server_cmaui_3
+      cpu.delta_server_cmaui_2:
+      - server_cmaui_2
+      - cpu.delta
+      network.outpoing.packets_cmaui_port_4:
+      - cmaui_port_4
+      - network.outpoing.packets
+      network.incoming.bytes.rate_cmaui_port_7_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - network.incoming.bytes.rate_cmaui_port_7_test_nested4Level
+      disk.device.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.device.write.requests.rate_server_cmaui_4_test_nested4Level
+      binding_cmaui_port_8_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - binding_cmaui_port_8_test_nested4Level
+      disk.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.write.bytes_server_cmaui_4_test_nested4Level
+      network.outgoing.packets.rate_cmaui_port_5_test_nested3Level:
+      - test_nested3Level
+      - network.outgoing.packets.rate_cmaui_port_5
+      disk.device.read.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.device.read.requests.rate_server_cmaui_4_test_nested4Level
+      disk.device.read.bytes_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.device.read.bytes_server_cmaui_3
+      memory.resident_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - memory.resident_server_cmaui_3
+      disk.device.usage_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.usage
+      disk.device.usage_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.device.usage_server_cmaui_4_test_nested4Level
+      network.incoming.bytes_cmaui_port_7_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - network.incoming.bytes_cmaui_port_7_test_nested4Level
+      disk.usage_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.usage_server_cmaui_4_test_nested4Level
+      forwarder_cmaui_port_6_test_nested3Level:
+      - test_nested3Level
+      - forwarder_cmaui_port_6
+      disk.device.write.requests.rate_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.write.requests.rate
+      forwarder_cmaui_port_7_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - forwarder_cmaui_port_7_test_nested4Level
+      endpoint_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - endpoint_server_cmaui_4_test_nested4Level
+      cpu_util_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - cpu_util_server_cmaui_4_test_nested4Level
+      feature_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - feature_test_nested4Level
+      network.outgoing.bytes.rate_cmaui_port_8_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - network.outgoing.bytes.rate_cmaui_port_8_test_nested4Level
+      disk.device.iops_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.iops
+      disk.device.capacity_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.capacity
+      memory_server_cmaui_2:
+      - server_cmaui_2
+      - memory
+      cpu_server_cmaui_2:
+      - server_cmaui_2
+      - cpu
+      network.incoming.packets_cmaui_port_3:
+      - cmaui_port_3
+      - network.incoming.packets
+      memory_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - memory_server_cmaui_4_test_nested4Level
+      forwarder_cmaui_port_8_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - forwarder_cmaui_port_8_test_nested4Level
+      network.incoming.packets_cmaui_port_4:
+      - cmaui_port_4
+      - network.incoming.packets
+      network.outgoing.bytes_cmaui_port_7_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - network.outgoing.bytes_cmaui_port_7_test_nested4Level
+      disk.capacity_server_cmaui_2:
+      - server_cmaui_2
+      - disk.capacity
+      network.incoming.packets_cmaui_port_6_test_nested3Level:
+      - test_nested3Level
+      - network.incoming.packets_cmaui_port_6
+      network.incoming.bytes_cmaui_port_8_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - network.incoming.bytes_cmaui_port_8_test_nested4Level
+      disk.device.iops_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.device.iops_server_cmaui_4_test_nested4Level
+      disk.iops_server_cmaui_2:
+      - server_cmaui_2
+      - disk.iops
       network.incoming.bytes.rate_cmaui_port_6_test_nested3Level:
       - test_nested3Level
       - network.incoming.bytes.rate_cmaui_port_6
@@ -355,42 +547,21 @@ topology_template:
       network.outgoing.bytes.rate_cmaui_port_3:
       - cmaui_port_3
       - network.outgoing.bytes.rate
-      disk.device.write.bytes.rate_server_cmaui_3_test_nested3Level:
-      - test_nested3Level
-      - disk.device.write.bytes.rate_server_cmaui_3
       disk.root.size_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - disk.root.size_server_cmaui_3
       network.outgoing.bytes.rate_cmaui_port_4:
       - cmaui_port_4
       - network.outgoing.bytes.rate
-      binding_cmaui_port_6_test_nested3Level:
-      - test_nested3Level
-      - binding_cmaui_port_6
-      disk.usage_server_cmaui_3_test_nested3Level:
-      - test_nested3Level
-      - disk.usage_server_cmaui_3
       os_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - os_server_cmaui_4_test_nested4Level
       disk.device.write.requests_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - disk.device.write.requests_server_cmaui_3
-      network.incoming.bytes_cmaui_port_4:
-      - cmaui_port_4
-      - network.incoming.bytes
-      network.incoming.bytes_cmaui_port_3:
-      - cmaui_port_3
-      - network.incoming.bytes
       disk.device.read.requests.rate_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - disk.device.read.requests.rate_server_cmaui_3
-      disk.device.latency_server_cmaui_3_test_nested3Level:
-      - test_nested3Level
-      - disk.device.latency_server_cmaui_3
-      cpu_util_server_cmaui_2:
-      - server_cmaui_2
-      - cpu_util
       memory.usage_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - memory.usage_server_cmaui_4_test_nested4Level
@@ -400,51 +571,24 @@ topology_template:
       network.outgoing.bytes_cmaui_port_8_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.outgoing.bytes_cmaui_port_8_test_nested4Level
-      disk.device.write.bytes.rate_server_cmaui_2:
-      - server_cmaui_2
-      - disk.device.write.bytes.rate
-      disk.write.bytes.rate_server_cmaui_2:
-      - server_cmaui_2
-      - disk.write.bytes.rate
       disk.device.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - disk.device.read.bytes.rate_server_cmaui_4_test_nested4Level
-      vcpus_server_cmaui_4_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - vcpus_server_cmaui_4_test_nested4Level
       network.outpoing.packets_cmaui_port_8_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.outpoing.packets_cmaui_port_8_test_nested4Level
-      disk.device.write.bytes_server_cmaui_2:
-      - server_cmaui_2
-      - disk.device.write.bytes
       feature_cmaui_port_7_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - feature_cmaui_port_7_test_nested4Level
       disk.iops_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - disk.iops_server_cmaui_3
-      network.incoming.packets.rate_cmaui_port_3:
-      - cmaui_port_3
-      - network.incoming.packets.rate
-      cpu_server_cmaui_3_test_nested3Level:
-      - test_nested3Level
-      - cpu_server_cmaui_3
-      feature_cmaui_port_3:
-      - cmaui_port_3
-      - feature
       disk.write.bytes_server_cmaui_2:
       - server_cmaui_2
       - disk.write.bytes
-      network.incoming.packets.rate_cmaui_port_4:
-      - cmaui_port_4
-      - network.incoming.packets.rate
       feature_server_cmaui_2:
       - server_cmaui_2
       - feature
-      feature_cmaui_port_4:
-      - cmaui_port_4
-      - feature
       attachment_cmaui_port_6_test_nested3Level:
       - test_nested3Level
       - attachment_cmaui_port_6
@@ -454,12 +598,6 @@ topology_template:
       disk.allocation_server_cmaui_2:
       - server_cmaui_2
       - disk.allocation
-      disk.device.allocation_server_cmaui_4_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.device.allocation_server_cmaui_4_test_nested4Level
-      binding_server_cmaui_2:
-      - server_cmaui_2
-      - binding
       vcpus_server_cmaui_2:
       - server_cmaui_2
       - vcpus
@@ -475,12 +613,6 @@ topology_template:
       attachment_cmaui_port_4:
       - cmaui_port_4
       - attachment
-      scalable_server_cmaui_2:
-      - server_cmaui_2
-      - scalable
-      disk.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.write.requests.rate_server_cmaui_4_test_nested4Level
       disk.capacity_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - disk.capacity_server_cmaui_4_test_nested4Level
@@ -490,18 +622,12 @@ topology_template:
       disk.device.read.bytes.rate_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - disk.device.read.bytes.rate_server_cmaui_3
-      network.incoming.packets.rate_cmaui_port_5_test_nested3Level:
-      - test_nested3Level
-      - network.incoming.packets.rate_cmaui_port_5
       disk.write.requests_server_cmaui_2:
       - server_cmaui_2
       - disk.write.requests
       memory.resident_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - memory.resident_server_cmaui_4_test_nested4Level
-      network.outpoing.packets_cmaui_port_7_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - network.outpoing.packets_cmaui_port_7_test_nested4Level
       disk.usage_server_cmaui_2:
       - server_cmaui_2
       - disk.usage
@@ -511,9 +637,6 @@ topology_template:
       disk.write.bytes_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - disk.write.bytes_server_cmaui_3
-      feature_server_cmaui_4_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - feature_server_cmaui_4_test_nested4Level
       network.incoming.bytes.rate_cmaui_port_8_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.incoming.bytes.rate_cmaui_port_8_test_nested4Level
@@ -523,66 +646,30 @@ topology_template:
       disk.write.requests.rate_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - disk.write.requests.rate_server_cmaui_3
-      disk.device.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.device.read.bytes_server_cmaui_4_test_nested4Level
-      endpoint_server_cmaui_2:
-      - server_cmaui_2
-      - endpoint
       network.incoming.bytes_cmaui_port_6_test_nested3Level:
       - test_nested3Level
       - network.incoming.bytes_cmaui_port_6
       os_server_cmaui_2:
       - server_cmaui_2
       - os
-      disk.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.read.requests_server_cmaui_4_test_nested4Level
-      scalable_server_cmaui_4_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - scalable_server_cmaui_4_test_nested4Level
-      network.incoming.packets.rate_cmaui_port_8_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - network.incoming.packets.rate_cmaui_port_8_test_nested4Level
       attachment_cmaui_port_5_test_nested3Level:
       - test_nested3Level
       - attachment_cmaui_port_5
-      disk.device.allocation_server_cmaui_2:
-      - server_cmaui_2
-      - disk.device.allocation
       network.incoming.packets_cmaui_port_7_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.incoming.packets_cmaui_port_7_test_nested4Level
-      disk.device.latency_server_cmaui_4_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.device.latency_server_cmaui_4_test_nested4Level
-      disk.read.bytes_server_cmaui_3_test_nested3Level:
-      - test_nested3Level
-      - disk.read.bytes_server_cmaui_3
       disk.latency_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - disk.latency_server_cmaui_4_test_nested4Level
-      disk.device.allocation_server_cmaui_3_test_nested3Level:
-      - test_nested3Level
-      - disk.device.allocation_server_cmaui_3
-      network.incoming.bytes.rate_cmaui_port_5_test_nested3Level:
-      - test_nested3Level
-      - network.incoming.bytes.rate_cmaui_port_5
       host_server_cmaui_2:
       - server_cmaui_2
       - host
-      os_server_cmaui_3_test_nested3Level:
-      - test_nested3Level
-      - os_server_cmaui_3
       disk.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - disk.read.bytes_server_cmaui_4_test_nested4Level
       disk.write.requests_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - disk.write.requests_server_cmaui_4_test_nested4Level
-      network.incoming.packets_cmaui_port_8_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - network.incoming.packets_cmaui_port_8_test_nested4Level
       binding_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - binding_server_cmaui_3
@@ -592,36 +679,18 @@ topology_template:
       network.outgoing.packets.rate_cmaui_port_8_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.outgoing.packets.rate_cmaui_port_8_test_nested4Level
-      cpu_server_cmaui_4_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - cpu_server_cmaui_4_test_nested4Level
       cpu.delta_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - cpu.delta_server_cmaui_3
       disk.device.capacity_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - disk.device.capacity_server_cmaui_3
-      disk.device.write.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.device.write.bytes.rate_server_cmaui_4_test_nested4Level
-      attachment_cmaui_port_8_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - attachment_cmaui_port_8_test_nested4Level
       scalable_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - scalable_server_cmaui_3
-      instance_server_cmaui_2:
-      - server_cmaui_2
-      - instance
-      disk.device.iops_server_cmaui_3_test_nested3Level:
-      - test_nested3Level
-      - disk.device.iops_server_cmaui_3
       network.outgoing.bytes.rate_cmaui_port_7_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.outgoing.bytes.rate_cmaui_port_7_test_nested4Level
-      network.incoming.bytes_cmaui_port_5_test_nested3Level:
-      - test_nested3Level
-      - network.incoming.bytes_cmaui_port_5
       endpoint_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - endpoint_server_cmaui_3
@@ -634,75 +703,33 @@ topology_template:
       disk.allocation_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - disk.allocation_server_cmaui_4_test_nested4Level
-      network.outpoing.packets_cmaui_port_6_test_nested3Level:
-      - test_nested3Level
-      - network.outpoing.packets_cmaui_port_6
       network.outgoing.bytes_cmaui_port_4:
       - cmaui_port_4
       - network.outgoing.bytes
-      network.outgoing.packets.rate_cmaui_port_7_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - network.outgoing.packets.rate_cmaui_port_7_test_nested4Level
-      binding_cmaui_port_5_test_nested3Level:
-      - test_nested3Level
-      - binding_cmaui_port_5
       network.incoming.bytes.rate_cmaui_port_3:
       - cmaui_port_3
       - network.incoming.bytes.rate
       network.incoming.bytes.rate_cmaui_port_4:
       - cmaui_port_4
       - network.incoming.bytes.rate
-      disk.device.write.bytes_server_cmaui_3_test_nested3Level:
-      - test_nested3Level
-      - disk.device.write.bytes_server_cmaui_3
-      network.outgoing.bytes_cmaui_port_5_test_nested3Level:
-      - test_nested3Level
-      - network.outgoing.bytes_cmaui_port_5
-      disk.device.read.requests_server_cmaui_2:
-      - server_cmaui_2
-      - disk.device.read.requests
       disk.device.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - disk.device.read.requests_server_cmaui_4_test_nested4Level
       disk.read.bytes.rate_server_cmaui_2:
       - server_cmaui_2
       - disk.read.bytes.rate
-      network.outpoing.packets_cmaui_port_3:
-      - cmaui_port_3
-      - network.outpoing.packets
       disk.device.write.requests_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - disk.device.write.requests_server_cmaui_4_test_nested4Level
-      disk.capacity_server_cmaui_3_test_nested3Level:
-      - test_nested3Level
-      - disk.capacity_server_cmaui_3
-      cpu.delta_server_cmaui_2:
-      - server_cmaui_2
-      - cpu.delta
       disk.device.read.requests.rate_server_cmaui_2:
       - server_cmaui_2
       - disk.device.read.requests.rate
-      network.outpoing.packets_cmaui_port_4:
-      - cmaui_port_4
-      - network.outpoing.packets
       binding_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - binding_server_cmaui_4_test_nested4Level
-      network.incoming.bytes.rate_cmaui_port_7_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - network.incoming.bytes.rate_cmaui_port_7_test_nested4Level
       memory.resident_server_cmaui_2:
       - server_cmaui_2
       - memory.resident
-      disk.device.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.device.write.requests.rate_server_cmaui_4_test_nested4Level
-      binding_cmaui_port_8_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - binding_cmaui_port_8_test_nested4Level
-      disk.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.write.bytes_server_cmaui_4_test_nested4Level
       disk.device.read.requests_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - disk.device.read.requests_server_cmaui_3
@@ -718,18 +745,9 @@ topology_template:
       disk.ephemeral.size_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - disk.ephemeral.size_server_cmaui_3
-      network.outgoing.packets.rate_cmaui_port_5_test_nested3Level:
-      - test_nested3Level
-      - network.outgoing.packets.rate_cmaui_port_5
-      disk.device.read.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
+      forwarder_cmaui_port_5_test_nested3Level:
       - test_nested3Level
-      - disk.device.read.requests.rate_server_cmaui_4_test_nested4Level
-      disk.device.read.bytes_server_cmaui_3_test_nested3Level:
-      - test_nested3Level
-      - disk.device.read.bytes_server_cmaui_3
-      memory.resident_server_cmaui_3_test_nested3Level:
-      - test_nested3Level
-      - memory.resident_server_cmaui_3
+      - forwarder_cmaui_port_5
       memory.usage_server_cmaui_2:
       - server_cmaui_2
       - memory.usage
@@ -793,4 +811,4 @@ topology_template:
       - dependency
       dependency_cmaui_port_5_test_nested3Level:
       - test_nested3Level
-      - dependency_cmaui_port_5
\ No newline at end of file
+      - dependency_cmaui_port_5
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml
index 9bc5ccc78a..878aa80f9c 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml
@@ -167,9 +167,15 @@ topology_template:
       disk.device.latency_server_cmaui_3:
       - server_cmaui_3
       - disk.device.latency
+      forwarder_cmaui_port_7_test_nested4Level:
+      - test_nested4Level
+      - forwarder_cmaui_port_7
       disk.read.requests_server_cmaui_4_test_nested4Level:
       - test_nested4Level
       - disk.read.requests_server_cmaui_4
+      forwarder_cmaui_port_8_test_nested4Level:
+      - test_nested4Level
+      - forwarder_cmaui_port_8
       disk.root.size_server_cmaui_3:
       - server_cmaui_3
       - disk.root.size
@@ -449,12 +455,18 @@ topology_template:
       disk.device.latency_server_cmaui_4_test_nested4Level:
       - test_nested4Level
       - disk.device.latency_server_cmaui_4
+      forwarder_cmaui_port_6:
+      - cmaui_port_6
+      - forwarder
       disk.device.read.requests.rate_server_cmaui_4_test_nested4Level:
       - test_nested4Level
       - disk.device.read.requests.rate_server_cmaui_4
       disk.ephemeral.size_server_cmaui_4_test_nested4Level:
       - test_nested4Level
       - disk.ephemeral.size_server_cmaui_4
+      forwarder_cmaui_port_5:
+      - cmaui_port_5
+      - forwarder
       disk.device.allocation_server_cmaui_3:
       - server_cmaui_3
       - disk.device.allocation
@@ -575,4 +587,4 @@ topology_template:
       - dependency
       dependency_cmaui_port_5:
       - cmaui_port_5
-      - 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/securityrulestoportconnection/sharedNestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml
index c5b92cbd65..27ccfc5867 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml
@@ -227,6 +227,12 @@ topology_template:
       disk.device.allocation_server_cmaui_4:
       - server_cmaui_4
       - disk.device.allocation
+      forwarder_cmaui_port_8:
+      - cmaui_port_8
+      - forwarder
+      forwarder_cmaui_port_7:
+      - cmaui_port_7
+      - forwarder
       disk.write.requests.rate_server_cmaui_4:
       - server_cmaui_4
       - disk.write.requests.rate
@@ -347,4 +353,4 @@ topology_template:
       - dependency
       local_storage_server_cmaui_4:
       - server_cmaui_4
-      - 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/securityruletosharedportresourcegrouplinking/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityruletosharedportresourcegrouplinking/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index 6270231f88..448082322f 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityruletosharedportresourcegrouplinking/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityruletosharedportresourcegrouplinking/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -285,11 +285,21 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_2:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       binding_server_cmaui:
         type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_1:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.read.requests.rate_server_cmaui:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -462,4 +472,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/securityruletosharedportresourcegrouplinking/expectedoutputfiles/nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityruletosharedportresourcegrouplinking/expectedoutputfiles/nestedServiceTemplate.yaml
index e3a89fd3a3..0181ef5e73 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityruletosharedportresourcegrouplinking/expectedoutputfiles/nestedServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityruletosharedportresourcegrouplinking/expectedoutputfiles/nestedServiceTemplate.yaml
@@ -234,9 +234,15 @@ topology_template:
       disk.root.size_server_cmaui:
       - server_cmaui
       - disk.root.size
+      forwarder_cmaui_port_2:
+      - cmaui_port_2
+      - forwarder
       binding_server_cmaui:
       - server_cmaui
       - binding
+      forwarder_cmaui_port_1:
+      - cmaui_port_1
+      - forwarder
       disk.device.read.requests.rate_server_cmaui:
       - server_cmaui
       - disk.device.read.requests.rate
@@ -342,4 +348,4 @@ topology_template:
       - link
       dependency_cmaui_port_2:
       - cmaui_port_2
-      - 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/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 ab82c14e0b..a7b33349d1 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
@@ -399,6 +399,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_FSB1_FSB1_OAM:
+        type: org.openecomp.capabilities.Forwarder
+        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.
@@ -411,6 +416,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_FSB1_FSB1_Internal:
+        type: org.openecomp.capabilities.Forwarder
+        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.
@@ -677,6 +687,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_FSB1_FSB2_Internal2:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       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.
@@ -689,6 +704,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_FSB1_FSB2_Internal1:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       endpoint_FSB1:
         type: tosca.capabilities.Endpoint.Admin
         occurrences:
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 3506a90468..ced7dda003 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
@@ -384,12 +384,18 @@ topology_template:
       network.outgoing.bytes_FSB1_FSB1_Internal:
       - FSB1_FSB1_Internal
       - network.outgoing.bytes
+      forwarder_FSB1_FSB1_OAM:
+      - FSB1_FSB1_OAM
+      - forwarder
       memory.resident_FSB1:
       - FSB1
       - memory.resident
       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
@@ -525,12 +531,18 @@ topology_template:
       network.incoming.bytes_FSB1_FSB1_Internal:
       - FSB1_FSB1_Internal
       - network.incoming.bytes
+      forwarder_FSB1_FSB2_Internal2:
+      - FSB1_FSB2_Internal2
+      - forwarder
       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
+      forwarder_FSB1_FSB2_Internal1:
+      - FSB1_FSB2_Internal1
+      - forwarder
       endpoint_FSB1:
       - FSB1
       - endpoint
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 ee57af5513..0546cb65fd 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
@@ -312,6 +312,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_FSB1_FSB2_Internal:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       feature_FSB1:
         type: tosca.capabilities.Node
         occurrences:
@@ -345,6 +350,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_FSB1_FSB1_OAM:
+        type: org.openecomp.capabilities.Forwarder
+        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.
@@ -357,6 +367,11 @@ 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.
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 372637f9e9..275c862d1c 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
@@ -303,6 +303,9 @@ topology_template:
       disk.root.size_FSB1:
       - FSB1
       - disk.root.size
+      forwarder_FSB1_FSB2_Internal:
+      - FSB1_FSB2_Internal
+      - forwarder
       feature_FSB1:
       - FSB1
       - feature
@@ -321,12 +324,18 @@ topology_template:
       network.incoming.packets_FSB1_FSB2_Internal:
       - FSB1_FSB2_Internal
       - network.incoming.packets
+      forwarder_FSB1_FSB1_OAM:
+      - FSB1_FSB1_OAM
+      - forwarder
       memory.resident_FSB1:
       - FSB1
       - memory.resident
       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
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 83ade4a8b1..c3a6a59520 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
@@ -260,6 +260,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_FSB1_FSB2_Internal:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       feature_FSB1:
         type: tosca.capabilities.Node
         occurrences:
@@ -299,6 +304,11 @@ 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.
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 d2665c4897..204735824e 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
@@ -277,6 +277,9 @@ topology_template:
       disk.root.size_FSB1:
       - FSB1
       - disk.root.size
+      forwarder_FSB1_FSB2_Internal:
+      - FSB1_FSB2_Internal
+      - forwarder
       feature_FSB1:
       - FSB1
       - feature
@@ -298,6 +301,9 @@ topology_template:
       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
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 b11b6f002b..e1dd79c964 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
@@ -336,6 +336,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_FSB1_FSB2_Internal:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       feature_FSB1:
         type: tosca.capabilities.Node
         occurrences:
@@ -369,6 +374,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_FSB1_FSB1_OAM:
+        type: org.openecomp.capabilities.Forwarder
+        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.
@@ -381,6 +391,11 @@ 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.
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 3d5452f348..75d268da56 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
@@ -348,6 +348,9 @@ topology_template:
       disk.root.size_FSB1:
       - FSB1
       - disk.root.size
+      forwarder_FSB1_FSB2_Internal:
+      - FSB1_FSB2_Internal
+      - forwarder
       feature_FSB1:
       - FSB1
       - feature
@@ -366,12 +369,18 @@ topology_template:
       network.incoming.packets_FSB1_FSB2_Internal:
       - FSB1_FSB2_Internal
       - network.incoming.packets
+      forwarder_FSB1_FSB1_OAM:
+      - FSB1_FSB1_OAM
+      - forwarder
       memory.resident_FSB1:
       - FSB1
       - memory.resident
       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
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 7c1d5352a9..ad9573238a 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
@@ -254,6 +254,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_FSB1_FSB2_Internal:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       feature_FSB1:
         type: tosca.capabilities.Node
         occurrences:
@@ -293,6 +298,11 @@ 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.
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 9a9b57d6a9..2f63c6194a 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
@@ -276,6 +276,9 @@ topology_template:
       disk.root.size_FSB1:
       - FSB1
       - disk.root.size
+      forwarder_FSB1_FSB2_Internal:
+      - FSB1_FSB2_Internal
+      - forwarder
       feature_FSB1:
       - FSB1
       - feature
@@ -297,6 +300,9 @@ topology_template:
       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
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 1066c6e948..d6f327951c 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
@@ -318,6 +318,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_FSB1_FSB2_Internal:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       feature_FSB1:
         type: tosca.capabilities.Node
         occurrences:
@@ -351,6 +356,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_FSB1_FSB1_OAM:
+        type: org.openecomp.capabilities.Forwarder
+        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.
@@ -363,6 +373,11 @@ 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.
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 d72f1f9355..843fe6c3b9 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
@@ -328,6 +328,9 @@ topology_template:
       disk.root.size_FSB1:
       - FSB1
       - disk.root.size
+      forwarder_FSB1_FSB2_Internal:
+      - FSB1_FSB2_Internal
+      - forwarder
       feature_FSB1:
       - FSB1
       - feature
@@ -346,12 +349,18 @@ topology_template:
       network.incoming.packets_FSB1_FSB2_Internal:
       - FSB1_FSB2_Internal
       - network.incoming.packets
+      forwarder_FSB1_FSB1_OAM:
+      - FSB1_FSB1_OAM
+      - forwarder
       memory.resident_FSB1:
       - FSB1
       - memory.resident
       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
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/vol_attach/nested_with_inner_vol/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/vol_attach/nested_with_inner_vol/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 9ef461e1de..ba88f63df6 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/vol_attach/nested_with_inner_vol/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/vol_attach/nested_with_inner_vol/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -287,6 +287,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_0:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.read.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.
@@ -454,4 +459,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/vol_attach/nested_with_inner_vol/out/nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/vol_attach/nested_with_inner_vol/out/nestedServiceTemplate.yaml
index 9da203c466..ae852574f3 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/vol_attach/nested_with_inner_vol/out/nestedServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/vol_attach/nested_with_inner_vol/out/nestedServiceTemplate.yaml
@@ -276,6 +276,9 @@ topology_template:
       os_server_cmaui_2:
       - server_cmaui_2
       - os
+      forwarder_cmaui_port_0:
+      - cmaui_port_0
+      - forwarder
       disk.device.read.bytes_server_cmaui_2:
       - server_cmaui_2
       - disk.device.read.bytes
@@ -375,4 +378,4 @@ topology_template:
       - dependency
       dependency_cmaui_volume:
       - cmaui_volume
-      - dependency
\ No newline at end of file
+      - dependency
-- 
cgit 1.2.3-korg